From bcb4fd1799485afbb2391aa312f4d947274bd7d4 Mon Sep 17 00:00:00 2001 From: Shannon Barber Date: Tue, 13 Jan 2026 06:28:41 +0000 Subject: [PATCH 01/12] gitk: use config settings for head/tag colors The drawtags procedure currently uses headfgcolor for all label text, ignoring the tagfgcolor setting. The call to create the outline polygon for (non-tag) heads currently has the color for headoutlinecolor hardcoded to black. This patch maintains the variables for the non-tag refs so that heads are colored differently from non-head (non-tag) refs. The outline and fill colors for the non-head refs remain hardcoded to the prior values, black & #ddddff. Signed-off-by: Shannon Barber Signed-off-by: Johannes Sixt --- gitk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gitk b/gitk index 7f62c8041d1c77..0415abd873633e 100755 --- a/gitk +++ b/gitk @@ -6831,16 +6831,18 @@ proc drawtags {id x xt y1} { } else { # draw a head or other ref if {[incr nheads -1] >= 0} { - set col $headbgcolor + set refoutlinecol $headoutlinecolor + set reffillcol $headbgcolor if {$tag eq $mainhead} { set font mainfontbold } } else { - set col "#ddddff" + set refoutlinecol black + set reffillcol "#ddddff" } set xl [expr {$xl - $delta/2}] $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \ - -width 1 -outline black -fill $col -tags tag.$id + -width 1 -outline $refoutlinecol -fill $reffillcol -tags tag.$id if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} { set rwid [font measure mainfont $remoteprefix] set xi [expr {$x + 1}] @@ -6850,7 +6852,8 @@ proc drawtags {id x xt y1} { -width 0 -fill $remotebgcolor -tags tag.$id } } - set t [$canv create text $xl $y1 -anchor w -text $tag -fill $headfgcolor \ + set textfgcolor [expr {$ntags >= 0 ? $tagfgcolor : $headfgcolor}] + set t [$canv create text $xl $y1 -anchor w -text $tag -fill $textfgcolor \ -font $font -tags [list tag.$id text]] if {$ntags >= 0} { $canv bind $t <1> $tagclick From d5139f34cec36864be90a7add024f1156af31c0f Mon Sep 17 00:00:00 2001 From: Chris Idema Date: Thu, 29 Jan 2026 11:09:04 +0000 Subject: [PATCH 02/12] git-gui: shift tabstops to account for the first column of patch text When reviewing a change before staging, it is desirable to see text after tabstops aligned the same way as in the text editor. However, since there is always an additional character in column one in patch text ('+', '-', or space), the alignment is broken if text before the first tab character is just long enough to push the stop to the next tab position. Commit a43c5f51a4b1 (git-gui: add configurable tab size to the diff view, 2012-02-12) added infrastructure that manipulates the tabstop positions of the Tk text widget. However, it does so only when a 3-way diff is shown and only so that it takes into account the one additional markup at the beginning of lines. This only achieved that alignment does not get worse for 3-way diffs compared to regular patch text, but left misaligned text in regular patch text unmodified. Use and modify this infrastructure to shift tabstops by one position for regular patch text and two positions for 3-way diffs. Existing code already resets the tabstops to an unshifted position when contents of untracked files are displayed. Signed-off-by: Chris Idema [j6t: extend commit message] Signed-off-by: Johannes Sixt --- lib/diff.tcl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/diff.tcl b/lib/diff.tcl index 442737ba4f260b..8be1a613fbe01f 100644 --- a/lib/diff.tcl +++ b/lib/diff.tcl @@ -385,6 +385,8 @@ proc read_diff {fd conflict_size cont_info} { # if {[string match {@@@ *} $line]} { set is_3way_diff 1 + apply_tab_size 2 + } elseif {[string match {@@ *} $line]} { apply_tab_size 1 } From 31d235c4c72666dec71a104d3bcd37cc7bd71ec5 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Tue, 10 Feb 2026 13:45:17 +0100 Subject: [PATCH 03/12] git-gui: fix use of GIT_CEILING_DIRECTORIES The GIT-VERSION-GEN script sets up GIT_CEILING_DIRECTORIES so that we won't accidentally parse version information from an unrelated parent repository. The ceiling is derived from the source directory by simply appendign "/.." to it, which mean that we'll only consider the current directory for repository discovery. This works alright in the case where git-gui is built as a standalone project, but it breaks when git-gui is embedded into a _related_ parent project. This is for example how git-gui is distributed via Git. Interestingly enough, the version information is still derived properly when building git-gui via Git's Makefile. In that case we eventually end up specifying the ceiling directory as "./.." as we use relative paths there, and that seems to not restrict the repository discovery. But when building via Meson we specify the source directory as an absolute path, and if so the repository discovery _is_ stopped. The consequence is that we won't be able to derive the version in that case. Fix the issue by adding a new optional parameter to GIT-VERSION-GEN that allows the caller to override the parent project directory and wire up new build options for Meson and Make that allows users to specify it. Note that by default we won't set the parent project directory. This isn't required for Meson anyway as we already use absolute paths there, but for our Makefile it means that we still end up with "./.." as ceiling directory, which is ineffective. But using e.g. pwd(1) as the default value would break downstream's version generation, unless we updated git-gui and the Makefile at the same point in time. Signed-off-by: Patrick Steinhardt --- GIT-VERSION-GEN | 16 ++++++++++++---- Makefile | 2 +- meson.build | 1 + meson_options.txt | 2 ++ 4 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 meson_options.txt diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index c2767b4136cbbf..2f729de4bb5584 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -5,19 +5,27 @@ DEF_VER=0.21.GITGUI LF=' ' -if test "$#" -ne 2 +if test "$#" -lt 2 then - echo >&2 "usage: $0 " + echo >&2 "usage: $0 []" exit 1 fi SOURCE_DIR="$1" OUTPUT="$2" +PARENT_PROJECT_DIR="$3" # Protect us from reading Git version information outside of the Git directory # in case it is not a repository itself, but embedded in an unrelated -# repository. -GIT_CEILING_DIRECTORIES="$SOURCE_DIR/.." +# repository. The PARENT_PROJECT_DIR variable can be used to override this, for +# example when git-gui is included as a subproject. +if test -n "$PARENT_PROJECT_DIR" +then + GIT_CEILING_DIRECTORIES="$PARENT_PROJECT_DIR/.." +else + GIT_CEILING_DIRECTORIES="$SOURCE_DIR/.." +fi + export GIT_CEILING_DIRECTORIES tree_search () diff --git a/Makefile b/Makefile index 69b0b844352bc1..5679af62bdc0cc 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ all:: # GIT-VERSION-FILE: FORCE - @$(SHELL_PATH) ./GIT-VERSION-GEN . $@ + @$(SHELL_PATH) ./GIT-VERSION-GEN . $@ "$(PARENT_PROJECT_DIR)" uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') diff --git a/meson.build b/meson.build index 320ba09ecfeb32..4a604657531e34 100644 --- a/meson.build +++ b/meson.build @@ -34,6 +34,7 @@ version_file = custom_target( '@INPUT@', meson.current_source_dir(), '@OUTPUT@', + get_option('parent_project_dir'), ], build_always_stale: true, ) diff --git a/meson_options.txt b/meson_options.txt new file mode 100644 index 00000000000000..7591a34218ea9d --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,2 @@ +option('parent_project_dir', type: 'string', value: '', + description: 'The directory of the parent project. This is used so that the version can be determined even in case git-gui is included as a subtree.') From 8334d5e459de0386cf7b5b87cec136d62c14c3ad Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Tue, 10 Feb 2026 13:45:33 +0100 Subject: [PATCH 04/12] git-gui: prefer shell at "/bin/sh" with Meson Meson detects the path of the target shell via `find_program("sh")`, which essentially does a lookup via `PATH`. We know that almost all systems have "/bin/sh" available though, which makes it the superior choice as a default value. Adapt `find_program()` to prefer "/bin/sh" over any other "sh" executable. Signed-off-by: Patrick Steinhardt --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 4a604657531e34..a2156f01e3e89e 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project('git-gui', fs = import('fs') -shell = find_program('sh') +shell = find_program('/bin/sh', 'sh') tclsh = find_program('tclsh') wish = find_program('wish') From d4fa9a6aef48ec9660de2be937418ec1d802aad4 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Tue, 10 Feb 2026 14:18:04 +0100 Subject: [PATCH 05/12] git-gui: massage "git-gui--askyesno" with "generate-script.sh" In e749c87 (git-gui: provide question helper for retry fallback on Windows, 2025-08-28) we have introudced a new "git-gui--askyesno" helper script. While the script is conceptually similar to our existing helper script "git-gui--askpass", we don't massage it via "generate-script.sh". This means that build options like the path to the wish shell are not propagated correctly. Fix this issue. Signed-off-by: Patrick Steinhardt --- .gitignore | 1 + Makefile | 7 +++++-- git-gui--askyesno => git-gui--askyesno.sh | 0 3 files changed, 6 insertions(+), 2 deletions(-) rename git-gui--askyesno => git-gui--askyesno.sh (100%) diff --git a/.gitignore b/.gitignore index 5130b4f0189518..38a41ebc58237f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ GIT-GUI-BUILD-OPTIONS GIT-VERSION-FILE git-gui git-gui--askpass +git-gui--askyesno lib/tclIndex diff --git a/Makefile b/Makefile index 5679af62bdc0cc..ca01068810bbe6 100644 --- a/Makefile +++ b/Makefile @@ -177,10 +177,13 @@ GIT-GUI-BUILD-OPTIONS: FORCE git-gui--askpass: git-gui--askpass.sh GIT-GUI-BUILD-OPTIONS generate-script.sh $(QUIET_GEN)$(SHELL_PATH) generate-script.sh $@ $< ./GIT-GUI-BUILD-OPTIONS +git-gui--askyesno: git-gui--askyesno.sh GIT-GUI-BUILD-OPTIONS generate-script.sh + $(QUIET_GEN)$(SHELL_PATH) generate-script.sh $@ $< ./GIT-GUI-BUILD-OPTIONS + ifdef GITGUI_WINDOWS_WRAPPER all:: git-gui endif -all:: $(GITGUI_MAIN) git-gui--askpass lib/tclIndex $(ALL_MSGFILES) +all:: $(GITGUI_MAIN) git-gui--askpass git-gui--askyesno lib/tclIndex $(ALL_MSGFILES) install: all $(QUIET)$(INSTALL_D0)'$(DESTDIR_SQ)$(gitexecdir_SQ)' $(INSTALL_D1) @@ -221,7 +224,7 @@ dist-version: GIT-VERSION-FILE @sed 's|^GITGUI_VERSION=||' $(TARDIR)/version clean:: - $(RM_RF) $(GITGUI_MAIN) git-gui--askpass lib/tclIndex po/*.msg $(PO_TEMPLATE) + $(RM_RF) $(GITGUI_MAIN) git-gui--askpass git-gui--askyesno lib/tclIndex po/*.msg $(PO_TEMPLATE) $(RM_RF) GIT-VERSION-FILE GIT-GUI-BUILD-OPTIONS ifdef GITGUI_WINDOWS_WRAPPER $(RM_RF) git-gui diff --git a/git-gui--askyesno b/git-gui--askyesno.sh similarity index 100% rename from git-gui--askyesno rename to git-gui--askyesno.sh From 65d3a128842c4eedf4c91828061d948df1ae14f2 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Tue, 10 Feb 2026 14:19:28 +0100 Subject: [PATCH 06/12] git-gui: wire up "git-gui--askyesno" with Meson The new "git-gui--askyesno" helper script has only been wired up for our Makefile, not for Meson. Wire it up properly to bring both build systems on par with each other again. Signed-off-by: Patrick Steinhardt --- meson.build | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/meson.build b/meson.build index a2156f01e3e89e..a8119aa29fed95 100644 --- a/meson.build +++ b/meson.build @@ -54,19 +54,21 @@ if target_machine.system() == 'windows' ) endif -custom_target( - output: 'git-gui--askpass', - input: 'git-gui--askpass.sh', - command: [ - shell, - meson.current_source_dir() / 'generate-script.sh', - '@OUTPUT@', - '@INPUT@', - meson.current_build_dir() / 'GIT-GUI-BUILD-OPTIONS', - ], - install: true, - install_dir: get_option('libexecdir') / 'git-core', -) +foreach script : [ 'git-gui--askpass', 'git-gui--askyesno' ] + custom_target( + output: script, + input: script + '.sh', + command: [ + shell, + meson.current_source_dir() / 'generate-script.sh', + '@OUTPUT@', + '@INPUT@', + meson.current_build_dir() / 'GIT-GUI-BUILD-OPTIONS', + ], + install: true, + install_dir: get_option('libexecdir') / 'git-core', + ) +endforeach custom_target( input: 'git-gui.sh', From de4201af7d57b2da6981884e969fe1e6d327108c Mon Sep 17 00:00:00 2001 From: Wang Zichong Date: Sat, 28 Feb 2026 07:59:44 +0000 Subject: [PATCH 07/12] gitk: support link color in the Preferences dialog As a dark-theme user, I use the Preferences dialog to set colors for gitk. The only color I cannot change via that dialog is the link foreground color, which leads to using the default link color on a dark background that makes it hard to read. Make the link foreground color also configurable in the Gitk Preferences dialog's Color tab, so users won't need to dig into the code/manual to check if it is configurable and can simply set the color there. Signed-off-by: Wang Zichong Signed-off-by: Johannes Sixt --- gitk | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/gitk b/gitk index cbaaee994e0aa8..1c289174d51753 100755 --- a/gitk +++ b/gitk @@ -11796,7 +11796,7 @@ proc prefspage_general {notebook} { proc prefspage_colors {notebook} { global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor - global diffbgcolors + global diffbgcolors linkfgcolor global themeloader set page [create_prefs_page $notebook.colors] @@ -11873,6 +11873,11 @@ proc prefspage_colors {notebook} { -command [list choosecolor selectbgcolor {} $page [mc "background"]] grid x $page.selbgbut $page.selbgsep -sticky w + label $page.linkfg -padx 40 -relief sunk -background $linkfgcolor + ttk::button $page.linkfgbut -text [mc "Link"] \ + -command [list choosecolor linkfgcolor {} $page [mc "link"]] + grid x $page.linkfgbut $page.linkfg -sticky w + grid columnconfigure $page 2 -weight 1 return $page @@ -11880,7 +11885,7 @@ proc prefspage_colors {notebook} { proc prefspage_set_colorswatches {page} { global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor - global diffbgcolors + global diffbgcolors linkfgcolor $page.bg configure -background $bgcolor $page.fg configure -background $fgcolor @@ -11891,6 +11896,7 @@ proc prefspage_set_colorswatches {page} { $page.hunksep configure -background [lindex $diffcolors 2] $page.markbgsep configure -background $markbgcolor $page.selbgsep configure -background $selectbgcolor + $page.linkfg configure -background $linkfgcolor } proc prefspage_fonts {notebook} { From e7db0670ee0f66f7c975cd1ec3bd0f6898287b0c Mon Sep 17 00:00:00 2001 From: Johannes Sixt Date: Mon, 2 Mar 2026 09:14:48 +0100 Subject: [PATCH 08/12] gitk: commit translation files without file information File information in the translation files is only helpful for the translators, but is not needed to compile the message catalogs. On top of that, file information is rather volatile and leads to large patches that do not carry essential information. For this reason, Git project has opted to remove the file information from its translation files. Let's do that in this project, too. Rewrite the update-po target to generate *.po files that do contain file information for the benefit of translators. Configure a clean filter under the name "gettext-no-location", which is the same that the Git project uses. It is expected that translators have already configured their repository suitably. Nevertheless, write a reminder as part of the update-po target. Apply the clean-filter to the translation files. Signed-off-by: Johannes Sixt --- Makefile | 5 +- po/.gitattributes | 1 + po/ca.po | 310 ------------------------------------ po/de.po | 316 +------------------------------------ po/es.po | 310 ------------------------------------ po/fr.po | 339 +++------------------------------------ po/hu.po | 310 ------------------------------------ po/it.po | 310 ------------------------------------ po/ja.po | 325 +------------------------------------- po/pt_br.po | 310 ------------------------------------ po/pt_pt.po | 314 ------------------------------------ po/ru.po | 395 +++++++--------------------------------------- po/sv.po | 326 -------------------------------------- po/ta.po | 389 +++------------------------------------------ po/vi.po | 310 ------------------------------------ po/zh_cn.po | 372 +++++-------------------------------------- 16 files changed, 155 insertions(+), 4487 deletions(-) create mode 100644 po/.gitattributes diff --git a/Makefile b/Makefile index cc32dcab4b2a6b..dda9c2a456ccaf 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,10 @@ gitk-wish: gitk GIT-TCLTK-VARS $(PO_TEMPLATE): gitk $(XGETTEXT) -kmc -LTcl -o $@ gitk update-po:: $(PO_TEMPLATE) - $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; ) + $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U --add-location $p $(PO_TEMPLATE) ; ) + @echo "Before committing changes, ensure that a clean-filter is installed:"; \ + echo; \ + echo " git config filter.gettext-no-location.clean \"msgcat --no-location -\"" $(ALL_MSGFILES): %.msg : %.po @echo Generating catalog $@ $(MSGFMT) --statistics --tcl -l $(basename $(notdir $<)) -d $(dir $@) $< diff --git a/po/.gitattributes b/po/.gitattributes new file mode 100644 index 00000000000000..938309e6f43bf0 --- /dev/null +++ b/po/.gitattributes @@ -0,0 +1 @@ +/*.po filter=gettext-no-location diff --git a/po/ca.po b/po/ca.po index 87dfc18b4406b2..174f1ea653773c 100644 --- a/po/ca.po +++ b/po/ca.po @@ -19,33 +19,26 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.5\n" -#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "No s'ha pogut obtenir la llista de fitxers no fusionats:" -#: gitk:212 gitk:2381 msgid "Color words" msgstr "Colora les paraules" -#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "Marca les paraules" -#: gitk:324 msgid "Error parsing revisions:" msgstr "Error en analitzar les revisions:" -#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Error en executar l'ordre --argscmd:" -#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "No hi ha fitxers seleccionats: s'ha especificat --merge però cap fitxer està " "sense fusionar." -#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -53,314 +46,234 @@ msgstr "" "No hi ha fitxers seleccionats: s'ha especificat --merge però cap fitxer " "sense fusionar està dins del límit de fitxers." -#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Error en executar git log:" -#: gitk:436 gitk:582 msgid "Reading" msgstr "Llegint" -#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Llegint les revisions..." -#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Cap comissió seleccionada" -#: gitk:1445 gitk:4045 gitk:12432 msgid "Command line" msgstr "Línia d'ordres" -#: gitk:1511 msgid "Can't parse git log output:" msgstr "No es pot analitzar la sortida del git log:" -#: gitk:1740 msgid "No commit information available" msgstr "Cap informació de comissió disponible" -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "D'acord" -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 -#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Cancel·la" -#: gitk:2069 msgid "&Update" msgstr "Actualitza" -#: gitk:2070 msgid "&Reload" msgstr "Recarrega" -#: gitk:2071 msgid "Reread re&ferences" msgstr "Rellegeix les referències" -#: gitk:2072 msgid "&List references" msgstr "Llista les referències" -#: gitk:2074 msgid "Start git &gui" msgstr "Inicia el git gui" -#: gitk:2076 msgid "&Quit" msgstr "Surt" -#: gitk:2068 msgid "&File" msgstr "Fitxer" -#: gitk:2080 msgid "&Preferences" msgstr "Preferències" -#: gitk:2079 msgid "&Edit" msgstr "Edita" -#: gitk:2084 msgid "&New view..." msgstr "Vista nova..." -#: gitk:2085 msgid "&Edit view..." msgstr "Edita la vista..." -#: gitk:2086 msgid "&Delete view" msgstr "Suprimeix la vista" -#: gitk:2088 gitk:4043 msgid "&All files" msgstr "Tots els fitxers" -#: gitk:2083 gitk:4067 msgid "&View" msgstr "Vista" -#: gitk:2093 gitk:2103 gitk:3012 msgid "&About gitk" msgstr "Quant al gitk" -#: gitk:2094 gitk:2108 msgid "&Key bindings" msgstr "Associacions de tecles" -#: gitk:2092 gitk:2107 msgid "&Help" msgstr "Ajuda" -#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "ID SHA1:" -#: gitk:2229 msgid "Row" msgstr "Fila" -#: gitk:2267 msgid "Find" msgstr "Cerca" -#: gitk:2295 msgid "commit" msgstr "comissió" -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 -#: gitk:6912 msgid "containing:" msgstr "que contingui:" -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "que toqui els camins:" -#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "que afegeixi/elimini la cadena:" -#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "que tingui línies canviades coincidents amb:" -#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Exacte" -#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Ignora majúscula i minúscula" -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Regexp" -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Tots els camps" -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Titular" -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Comentaris" -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 -#: gitk:8845 msgid "Author" msgstr "Autor" -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Comitent" -#: gitk:2350 msgid "Search" msgstr "Cerca" -#: gitk:2358 msgid "Diff" msgstr "Diferència" -#: gitk:2360 msgid "Old version" msgstr "Versió antiga" -#: gitk:2362 msgid "New version" msgstr "Versió nova" -#: gitk:2364 msgid "Lines of context" msgstr "Línies de context" -#: gitk:2374 msgid "Ignore space change" msgstr "Ignora canvis d'espai" -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "Diferència de línies" -#: gitk:2445 msgid "Patch" msgstr "Pedaç" -#: gitk:2447 msgid "Tree" msgstr "Arbre" -#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Diferencia aquesta -> la seleccionada" -#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Diferencia la seleccionada -> aquesta" -#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Fes pedaç" -#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Crea etiqueta" -#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Escriu la comissió a un fitxer" -#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Crea una branca nova" -#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Recull aquesta comissió com a cirera" -#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Restableix la branca HEAD aquí" -#: gitk:2625 msgid "Mark this commit" msgstr "Marca aquesta comissió" -#: gitk:2626 msgid "Return to mark" msgstr "Torna a la marca" -#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Troba la descendent d'aquesta i marca-la" -#: gitk:2628 msgid "Compare with marked commit" msgstr "Compara amb la comissió marcada" -#: gitk:2629 gitk:2640 msgid "Diff this -> marked commit" msgstr "Diferencia aquesta -> la comissió marcada" -#: gitk:2630 gitk:2641 msgid "Diff marked commit -> this" msgstr "Diferencia la comissió seleccionada -> aquesta" -#: gitk:2631 msgid "Revert this commit" msgstr "Reverteix aquesta comissió" -#: gitk:2647 msgid "Check out this branch" msgstr "Agafa aquesta branca" -#: gitk:2648 msgid "Remove this branch" msgstr "Elimina aquesta branca" -#: gitk:2649 msgid "Copy branch name" msgstr "Copia el nom de branca" -#: gitk:2656 msgid "Highlight this too" msgstr "Ressalta aquest també" -#: gitk:2657 msgid "Highlight this only" msgstr "Ressalta només aquest" -#: gitk:2658 msgid "External diff" msgstr "Diferència externa" -#: gitk:2659 msgid "Blame parent commit" msgstr "Culpabilitat de la comissió mare" -#: gitk:2660 msgid "Copy path" msgstr "Copia el camí" -#: gitk:2667 msgid "Show origin of this line" msgstr "Mostra l'origen d'aquesta línia" -#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Executa git gui blame en aquesta línia" -#: gitk:3014 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -376,317 +289,245 @@ msgstr "" "\n" "Useu-lo i redistribuïu-lo sota els termes de la Llicència Pública General GNU" -#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Tanca" -#: gitk:3043 msgid "Gitk key bindings" msgstr "Associacions de tecles del Gitk" -#: gitk:3046 msgid "Gitk key bindings:" msgstr "Associacions de tecles del Gitk:" -#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tSurt" -#: gitk:3049 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tTanca la finestra" -#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tVés a la primera comissió" -#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tVés a l'última comissió" -#: gitk:3052 msgid ", p, k\tMove up one commit" msgstr ", p, k\tMou-te cap amunt per una comissió" -#: gitk:3053 msgid ", n, j\tMove down one commit" msgstr ", n, j\tMou-te cap avall per una comissió" -#: gitk:3054 msgid ", z, h\tGo back in history list" msgstr ", z, h\tRetrocedeix en la llista d'història" -#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tAvança en la llista d'història" -#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" "<%s-n>\tVés a l'enèsima mare de la comissió actual en la llista d'història" -#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tMou-te cap amunt per una pàgina en la llista de comissions" -#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tMou-te cap avall per una pàgina en la llista de comissions" -#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Inici>\tDesplaça't a la part superior de la llista de comissions" -#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-Fi>\tDesplaça't a la part inferior de la llista de comissions" -#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Amunt>\tDesplaça la llista de comissions cap amunt per una línia" -#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Avall>\tDesplaça la llista de comissions cap avall per una línia" -#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-RePàg>\tDesplaça la llista de comissions cap amunt per una pàgina" -#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-AvPàg>\tDesplaça la llista de comissions cap avall per una pàgina" -#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tCerca cap enrere (cap amunt, les comissions més noves)" -#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tCerca cap endavant (cap avall, les comissions més velles)" -#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tDesplaça la vista de diferència cap amunt per una pàgina" -#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tDesplaça la vista de diferència cap amunt per una pàgina" -#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\t\tDesplaça la vista de diferència cap avall per una pàgina" -#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tDesplaça la vista de diferència cap amunt per 18 línies" -#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tDesplaça la vista de diferència cap avall per 18 línies" -#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tCerca" -#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tMou-te a la propera coincidència de la cerca" -#: gitk:3074 msgid "\tMove to next find hit" msgstr "\tMou-te a la propera coincidència de la cerca" -#: gitk:3075 msgid "g\t\tGo to commit" msgstr "g\t\tVés a l'última comissió" -#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tPosa el focus a la caixa de cerca" -#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tMou a la coincidència prèvia de la cerca" -#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tDesplaça la vista de diferència al proper fitxer" -#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tCerca la propera coincidència en la vista de diferència" -#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tCerca la coincidència prèvia en la vista de diferència" -#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAugmenta la mida de lletra" -#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-més>\tAugmenta la mida de lletra" -#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDisminueix la mida de lletra" -#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-menys>\tDisminueix la mida de lletra" -#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tActualitza" -#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Error en crear el directori temporal %s:" -#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Error en obtenir \"%s\" de %s:" -#: gitk:3635 msgid "command failed:" msgstr "l'ordre ha fallat:" -#: gitk:3784 msgid "No such commit" msgstr "Cap comissió així" -#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: l'ordre ha fallat:" -#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "No s'ha pogut llegir el cap de fusió: %s" -#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Error en llegir l'índex: %s" -#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "No s'ha pogut iniciar el git blame: %s" -#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Cercant" -#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Error en executar el git blame: %s" -#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" "Aquella línia ve de la comissió %s, la qual no és en aquesta visualització" -#: gitk:3939 msgid "External diff viewer failed:" msgstr "El visualitzador de diferència extern ha fallat:" -#: gitk:4070 msgid "Gitk view definition" msgstr "Definició de vista del Gitk" -#: gitk:4074 msgid "Remember this view" msgstr "Recorda aquesta vista" -#: gitk:4075 msgid "References (space separated list):" msgstr "Referències (llista separada per espais)" -#: gitk:4076 msgid "Branches & tags:" msgstr "Branques i etiquetes:" -#: gitk:4077 msgid "All refs" msgstr "Totes les referències" -#: gitk:4078 msgid "All (local) branches" msgstr "Totes les branques (locals)" -#: gitk:4079 msgid "All tags" msgstr "Totes les etiquetes" -#: gitk:4080 msgid "All remote-tracking branches" msgstr "Totes les branques amb seguiment remot" -#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Informació de comissió (expressions regulars):" -#: gitk:4082 msgid "Author:" msgstr "Autor:" -#: gitk:4083 msgid "Committer:" msgstr "Comitent:" -#: gitk:4084 msgid "Commit Message:" msgstr "Missatge de comissió:" -#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Coincideix amb tots els criteris d'informació de comissió" -#: gitk:4086 msgid "Matches no Commit Info criteria" msgstr "No coincideix amb cap criteri d'informació de comissió" -#: gitk:4087 msgid "Changes to Files:" msgstr "Canvis als fitxers:" -#: gitk:4088 msgid "Fixed String" msgstr "Cadena fixa" -#: gitk:4089 msgid "Regular Expression" msgstr "Expressió regular" -#: gitk:4090 msgid "Search string:" msgstr "Cadena de cerca:" -#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -694,201 +535,153 @@ msgstr "" "Dates de comissió (\"fa 2 setmanes\", \"2009-03-17 15:27:38\", \"17 abr 2009 " "15:27:38\"):" -#: gitk:4092 msgid "Since:" msgstr "Des de:" -#: gitk:4093 msgid "Until:" msgstr "Fins:" -#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limita o salta un nombre de revisions (nombre enter positiu)" -#: gitk:4095 msgid "Number to show:" msgstr "Nombre a mostrar:" -#: gitk:4096 msgid "Number to skip:" msgstr "Nombre a saltar:" -#: gitk:4097 msgid "Miscellaneous options:" msgstr "Opcions miscel·lànies:" -#: gitk:4098 msgid "Strictly sort by date" msgstr "Ordena estrictament per data" -#: gitk:4099 msgid "Mark branch sides" msgstr "Marca els costats de les branques" -#: gitk:4100 msgid "Limit to first parent" msgstr "Limita a la primera mare" -#: gitk:4101 msgid "Simple history" msgstr "Història senzilla" -#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Paràmetres addicionals al git log:" -#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Introduïu els fitxers i directoris a incloure, un per línia:" -#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Ordre per a generar més comissions a incloure:" -#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: vista d'edició" -#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- criteris per a seleccionar les revisions" -#: gitk:4241 msgid "View Name" msgstr "Nom de vista" -#: gitk:4316 msgid "Apply (F5)" msgstr "Aplica (F5)" -#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Error en els paràmetres de selecció de comissions:" -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Cap" -#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Descendent" -#: gitk:5022 msgid "Not descendant" msgstr "No descendent" -#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Avantpassat" -#: gitk:5030 msgid "Not ancestor" msgstr "No avantpassat" -#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Canvis locals registrats en l'índex però no comesos" -#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Canvis locals sense cometre, no registrats en l'índex" -#: gitk:7134 msgid "and many more" msgstr "i moltes més" -#: gitk:7137 msgid "many" msgstr "moltes" -#: gitk:7328 msgid "Tags:" msgstr "Etiquetes:" -#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Mare" -#: gitk:7356 msgid "Child" msgstr "Filla" -#: gitk:7365 msgid "Branch" msgstr "Branca" -#: gitk:7368 msgid "Follows" msgstr "Segueix" -#: gitk:7371 msgid "Precedes" msgstr "Precedeix" -#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Error en obtenir les diferències: %s" -#: gitk:8650 msgid "Goto:" msgstr "Vés a:" -#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "L'id SHA1 curta %s és ambigua" -#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "La revisió %s és desconeguda" -#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "L'id SHA1 %s és desconeguda" -#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "La revisió %s no és en la vista actual" -#: gitk:8832 gitk:8847 msgid "Date" msgstr "Data" -#: gitk:8835 msgid "Children" msgstr "Filles" -#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Restableix la branca %s aquí" -#: gitk:8900 msgid "Detached head: can't reset" msgstr "Cap separat: no es pot restablir" -#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Saltant la comissió de fusió " -#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Error en obtenir l'ID de pedaç de " -#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - aturant\n" -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Comissió " -#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -896,7 +689,6 @@ msgstr "" " és el mateix pedaç que\n" " " -#: gitk:9043 msgid "" " differs from\n" " " @@ -904,7 +696,6 @@ msgstr "" " difereix de\n" " " -#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -912,131 +703,101 @@ msgstr "" "Diferència entre comissions:\n" "\n" -#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " té %s filles - aturant\n" -#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Error en escriure la comissió al fitxer: %s" -#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Error en diferenciar les comissions: %s" -#: gitk:9137 msgid "Top" msgstr "Part superior" -#: gitk:9138 msgid "From" msgstr "De" -#: gitk:9143 msgid "To" msgstr "A" -#: gitk:9167 msgid "Generate patch" msgstr "Genera pedaç" -#: gitk:9169 msgid "From:" msgstr "De:" -#: gitk:9178 msgid "To:" msgstr "A:" -#: gitk:9187 msgid "Reverse" msgstr "Inverteix" -#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Fitxer de sortida:" -#: gitk:9195 msgid "Generate" msgstr "Genera" -#: gitk:9233 msgid "Error creating patch:" msgstr "Error en crear el pedaç:" -#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9265 msgid "Tag name:" msgstr "Nom d'etiqueta:" -#: gitk:9268 msgid "Tag message is optional" msgstr "El missatge d'etiqueta és opcional" -#: gitk:9270 msgid "Tag message:" msgstr "Missatge d'etiqueta:" -#: gitk:9274 gitk:9439 msgid "Create" msgstr "Crea" -#: gitk:9292 msgid "No tag name specified" msgstr "No s'ha especificat cap nom d'etiqueta" -#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "L'etiqueta \"%s\" ja existeix" -#: gitk:9306 msgid "Error creating tag:" msgstr "Error en crear l'etiqueta:" -#: gitk:9382 msgid "Command:" msgstr "Ordre:" -#: gitk:9390 msgid "Write" msgstr "Escriu" -#: gitk:9408 msgid "Error writing commit:" msgstr "Error en escriure la comissió:" -#: gitk:9435 msgid "Name:" msgstr "Nom:" -#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Si us plau, especifiqueu un nom per a la branca nova" -#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "La branca '%s' ja existeix. Voleu sobreescriure?" -#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "La comissió %s ja està inclosa en la branca %s -- realment voleu tornar a " "aplicar-la?" -#: gitk:9535 msgid "Cherry-picking" msgstr "Recollint cireres" -#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1046,7 +807,6 @@ msgstr "" "Si us plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu a " "intentar." -#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1054,21 +814,17 @@ msgstr "" "El recull de cireres ha fallat a causa d'un conflicte de fusió.\n" "Voleu executar el git citool per a resoldre'l?" -#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Cap canvi comès" -#: gitk:9593 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "" "La comissió %s no s'inclou en la branca %s -- realment voleu revertir-la?" -#: gitk:9598 msgid "Reverting" msgstr "Revertint" -#: gitk:9606 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1078,7 +834,6 @@ msgstr "" "plau, cometeu, restabliu o emmagatzemeu els vostres canvis i torneu-ho a " "intentar." -#: gitk:9610 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1086,28 +841,22 @@ msgstr "" "La reversió ha fallat a causa d'un conflicte de fusió.\n" " Voleu executar el git citool per a resoldre'l?" -#: gitk:9653 msgid "Confirm reset" msgstr "Confirma el restabliment" -#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Voleu restablir la branca %s a %s?" -#: gitk:9657 msgid "Reset type:" msgstr "Tipus de restabliment:" -#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Suau: Deixa l'arbre de treball i l'índex sense tocar" -#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixt: Deixa l'arbre de treball sense tocar, restableix l'índex" -#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1115,19 +864,15 @@ msgstr "" "Dur: Restableix l'arbre de treball i l'índex\n" "(descarta TOTS els canvis locals)" -#: gitk:9683 msgid "Resetting" msgstr "Restablint" -#: gitk:9743 msgid "Checking out" msgstr "Agafant" -#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "No es pot suprimir la branca actualment agafada" -#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1136,16 +881,13 @@ msgstr "" "Les comissions en la branca %s no són en cap altra branca.\n" "Realment voleu suprimir la branca %s?" -#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Etiquetes i caps: %s" -#: gitk:9850 msgid "Filter" msgstr "Filtre" -#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1153,201 +895,152 @@ msgstr "" "Error en llegir la informació de topologia de comissió; la informació sobre " "branques i etiquetes precedents/següents serà incompleta." -#: gitk:11123 msgid "Tag" msgstr "Etiqueta" -#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11210 msgid "Gitk font chooser" msgstr "Selector de tipus de lletra del Gitk" -#: gitk:11227 msgid "B" msgstr "B" -#: gitk:11230 msgid "I" msgstr "I" -#: gitk:11348 msgid "Commit list display options" msgstr "Opcions de visualització de la llista de comissions" -#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Amplada màxima del gràfic (línies)" -#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Amplada màxima del gràfic (% del panell)" -#: gitk:11358 msgid "Show local changes" msgstr "Mostra els canvis locals" -#: gitk:11361 msgid "Auto-select SHA1 (length)" msgstr "Selecciona automàticament l'SHA1 (longitud)" -#: gitk:11365 msgid "Hide remote refs" msgstr "Amaga les referències remotes" -#: gitk:11369 msgid "Diff display options" msgstr "Opcions de visualització de diferència" -#: gitk:11371 msgid "Tab spacing" msgstr "Espaiat de tabulació" -#: gitk:11374 msgid "Display nearby tags/heads" msgstr "Mostra etiquetes/caps propers" -#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "Nombre màxim d'etiquetes/caps a mostrar" -#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Limita les diferències als camins llistats" -#: gitk:11383 msgid "Support per-file encodings" msgstr "Admet codificacions específiques per a cada fitxer" -#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Eina de diferència externa" -#: gitk:11390 msgid "Choose..." msgstr "Trieu..." -#: gitk:11395 msgid "General options" msgstr "Opcions generals" -#: gitk:11398 msgid "Use themed widgets" msgstr "Usa els ginys tematitzats" -#: gitk:11400 msgid "(change requires restart)" msgstr "(el canvi requereix reiniciar)" -#: gitk:11402 msgid "(currently unavailable)" msgstr "(actualment no disponible)" -#: gitk:11413 msgid "Colors: press to choose" msgstr "Colors: pressiona per a triar" -#: gitk:11416 msgid "Interface" msgstr "Interfície" -#: gitk:11417 msgid "interface" msgstr "interfície" -#: gitk:11420 msgid "Background" msgstr "Fons" -#: gitk:11421 gitk:11451 msgid "background" msgstr "fons" -#: gitk:11424 msgid "Foreground" msgstr "Primer pla" -#: gitk:11425 msgid "foreground" msgstr "primer pla" -#: gitk:11428 msgid "Diff: old lines" msgstr "Diferència: línies velles" -#: gitk:11429 msgid "diff old lines" msgstr "diferencia les línies velles" -#: gitk:11433 msgid "Diff: new lines" msgstr "Diferència: línies noves" -#: gitk:11434 msgid "diff new lines" msgstr "diferencia les línies noves" -#: gitk:11438 msgid "Diff: hunk header" msgstr "Diferència: capçalera de tros" -#: gitk:11440 msgid "diff hunk header" msgstr "diferencia la capçalera de tros" -#: gitk:11444 msgid "Marked line bg" msgstr "Fons de la línia marcada" -#: gitk:11446 msgid "marked line background" msgstr "fons de la línia marcada" -#: gitk:11450 msgid "Select bg" msgstr "Fons de la selecció" -#: gitk:11459 msgid "Fonts: press to choose" msgstr "Tipus de lletra: pressiona per a triar" -#: gitk:11461 msgid "Main font" msgstr "Tipus de lletra principal" -#: gitk:11462 msgid "Diff display font" msgstr "Tipus de lletra de visualització de diferència" -#: gitk:11463 msgid "User interface font" msgstr "Tipus de lletra de la interfície d'usuari" -#: gitk:11485 msgid "Gitk preferences" msgstr "Preferències del Gitk" -#: gitk:11494 msgid "General" msgstr "General" -#: gitk:11495 msgid "Colors" msgstr "Colors" -#: gitk:11496 msgid "Fonts" msgstr "Tipus de lletra" -#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: tria el color per a %s" -#: gitk:12059 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -1355,15 +1048,12 @@ msgstr "" "Perdó, el gitk no pot executar-se amb aquesta versió de Tcl/Tk.\n" " El Gitk requereix com a mínim el Tcl/Tk 8.4." -#: gitk:12269 msgid "Cannot find a git repository here." msgstr "No es pot trobar cap dipòsit de git aquí." -#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Paràmetre ambigu '%s': és tant revisió com nom de fitxer" -#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Paràmetres dolents al gitk:" diff --git a/po/de.po b/po/de.po index 5db38248289baa..b546f607876cbb 100644 --- a/po/de.po +++ b/po/de.po @@ -17,33 +17,26 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Liste der nicht zusammengeführten Dateien nicht gefunden:" -#: gitk:212 gitk:2381 msgid "Color words" msgstr "Wörter einfärben" -#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "Wörter kennzeichnen" -#: gitk:324 msgid "Error parsing revisions:" msgstr "Fehler beim Laden der Versionen:" -#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Fehler beim Ausführen des --argscmd-Kommandos:" -#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es existieren " "keine nicht zusammengeführten Dateien." -#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -51,314 +44,234 @@ msgstr "" "Keine Dateien ausgewählt: Es wurde --merge angegeben, aber es sind keine " "nicht zusammengeführten Dateien in der Dateiauswahl." -#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Fehler beim Ausführen von »git log«:" -#: gitk:436 gitk:582 msgid "Reading" msgstr "Lesen" -#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Versionen werden gelesen ..." -#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Keine Versionen ausgewählt" -#: gitk:1445 gitk:4045 gitk:12432 msgid "Command line" msgstr "Kommandozeile" -#: gitk:1511 msgid "Can't parse git log output:" msgstr "Ausgabe von »git log« kann nicht erkannt werden:" -#: gitk:1740 msgid "No commit information available" msgstr "Keine Versionsinformation verfügbar" -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "Ok" -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 -#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Abbrechen" -#: gitk:2069 msgid "&Update" msgstr "&Aktualisieren" -#: gitk:2070 msgid "&Reload" msgstr "&Neu laden" -#: gitk:2071 msgid "Reread re&ferences" msgstr "&Zweige neu laden" -#: gitk:2072 msgid "&List references" msgstr "Zweige/Markierungen auf&listen" -#: gitk:2074 msgid "Start git &gui" msgstr "»git &gui« starten" -#: gitk:2076 msgid "&Quit" msgstr "&Beenden" -#: gitk:2068 msgid "&File" msgstr "&Datei" -#: gitk:2080 msgid "&Preferences" msgstr "&Einstellungen" -#: gitk:2079 msgid "&Edit" msgstr "&Bearbeiten" -#: gitk:2084 msgid "&New view..." msgstr "&Neue Ansicht ..." -#: gitk:2085 msgid "&Edit view..." msgstr "Ansicht &bearbeiten ..." -#: gitk:2086 msgid "&Delete view" msgstr "Ansicht &entfernen" -#: gitk:2088 gitk:4043 msgid "&All files" msgstr "&Alle Dateien" -#: gitk:2083 gitk:4067 msgid "&View" msgstr "&Ansicht" -#: gitk:2093 gitk:2103 gitk:3012 msgid "&About gitk" msgstr "Über &gitk" -#: gitk:2094 gitk:2108 msgid "&Key bindings" msgstr "&Tastenkürzel" -#: gitk:2092 gitk:2107 msgid "&Help" msgstr "&Hilfe" -#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2229 msgid "Row" msgstr "Zeile" -#: gitk:2267 msgid "Find" msgstr "Suche" -#: gitk:2295 msgid "commit" msgstr "Version nach" -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 -#: gitk:6912 msgid "containing:" msgstr "Beschreibung:" -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "Dateien:" -#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "Änderungen:" -#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "Geänderte Zeilen entsprechen:" -#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Exakt" -#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Kein Groß/Klein" -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Regexp" -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Alle Felder" -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Überschrift" -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Beschreibung" -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 -#: gitk:8845 msgid "Author" msgstr "Autor" -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Eintragender" -#: gitk:2350 msgid "Search" msgstr "Suchen" -#: gitk:2358 msgid "Diff" msgstr "Vergleich" -#: gitk:2360 msgid "Old version" msgstr "Alte Version" -#: gitk:2362 msgid "New version" msgstr "Neue Version" -#: gitk:2364 msgid "Lines of context" msgstr "Kontextzeilen" -#: gitk:2374 msgid "Ignore space change" msgstr "Leerzeichenänderungen ignorieren" -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "Zeilenunterschied" -#: gitk:2445 msgid "Patch" msgstr "Patch" -#: gitk:2447 msgid "Tree" msgstr "Baum" -#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Vergleich: diese -> gewählte" -#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Vergleich: gewählte -> diese" -#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Patch erstellen" -#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Markierung erstellen" -#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Version in Datei schreiben" -#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Neuen Zweig erstellen" -#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Diese Version pflücken" -#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "HEAD-Zweig auf diese Version zurücksetzen" -#: gitk:2625 msgid "Mark this commit" msgstr "Lesezeichen setzen" -#: gitk:2626 msgid "Return to mark" msgstr "Zum Lesezeichen" -#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Abkömmling von Lesezeichen und dieser Version finden" -#: gitk:2628 msgid "Compare with marked commit" msgstr "Mit Lesezeichen vergleichen" -#: gitk:2629 gitk:2640 msgid "Diff this -> marked commit" msgstr "Vergleich: diese -> gewählte Version" -#: gitk:2630 gitk:2641 msgid "Diff marked commit -> this" msgstr "Vergleich: gewählte -> diese Version" -#: gitk:2631 msgid "Revert this commit" msgstr "Version umkehren" -#: gitk:2647 msgid "Check out this branch" msgstr "Auf diesen Zweig umstellen" -#: gitk:2648 msgid "Remove this branch" msgstr "Zweig löschen" -#: gitk:2649 msgid "Copy branch name" msgstr "Zweigname kopieren" -#: gitk:2656 msgid "Highlight this too" msgstr "Diesen auch hervorheben" -#: gitk:2657 msgid "Highlight this only" msgstr "Nur diesen hervorheben" -#: gitk:2658 msgid "External diff" msgstr "Externes Diff-Programm" -#: gitk:2659 msgid "Blame parent commit" msgstr "Annotieren der Elternversion" -#: gitk:2660 msgid "Copy path" msgstr "Pfad kopieren" -#: gitk:2667 msgid "Show origin of this line" msgstr "Herkunft dieser Zeile anzeigen" -#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Diese Zeile annotieren (»git gui blame«)" -#: gitk:3014 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -375,517 +288,397 @@ msgstr "" "Benutzung und Weiterverbreitung gemäß den Bedingungen der GNU General Public " "License" -#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Schließen" -#: gitk:3043 msgid "Gitk key bindings" msgstr "Gitk-Tastaturbelegung" -#: gitk:3046 msgid "Gitk key bindings:" msgstr "Gitk-Tastaturbelegung:" -#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tBeenden" -#: gitk:3049 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-F>\t\tFenster schließen" -#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tZur neuesten Version springen" -#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tZur ältesten Version springen" -#: gitk:3052 msgid ", p, k\tMove up one commit" msgstr ", p, k\tNächste neuere Version" -#: gitk:3053 msgid ", n, j\tMove down one commit" msgstr ", n, j\tNächste ältere Version" -#: gitk:3054 msgid ", z, h\tGo back in history list" msgstr ", z, h\tEine Version zurückgehen" -#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tEine Version weitergehen" -#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "<%s-n>\tZu n-ter Elternversion in Versionshistorie springen" -#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tEine Seite nach oben blättern" -#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tEine Seite nach unten blättern" -#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Pos1>\tZum oberen Ende der Versionsliste blättern" -#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-Ende>\tZum unteren Ende der Versionsliste blättern" -#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Hoch>\tVersionsliste eine Zeile nach oben blättern" -#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Runter>\tVersionsliste eine Zeile nach unten blättern" -#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-BildHoch>\tVersionsliste eine Seite nach oben blättern" -#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-BildRunter>\tVersionsliste eine Seite nach unten blättern" -#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tRückwärts suchen (nach oben; neuere Versionen)" -#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr " Suchen (nach unten; ältere Versionen)" -#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\t\tVergleich eine Seite nach oben blättern" -#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tVergleich eine Seite nach oben blättern" -#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\tVergleich eine Seite nach unten blättern" -#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tVergleich um 18 Zeilen nach oben blättern" -#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tVergleich um 18 Zeilen nach unten blättern" -#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tSuchen" -#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tWeitersuchen" -#: gitk:3074 msgid "\tMove to next find hit" msgstr "\tWeitersuchen" -#: gitk:3075 msgid "g\t\tGo to commit" msgstr "g\t\tZu Version springen" -#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tTastaturfokus ins Suchfeld" -#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tRückwärts weitersuchen" -#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tVergleich zur nächsten Datei blättern" -#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tWeitersuchen im Vergleich" -#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tRückwärts weitersuchen im Vergleich" -#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Nummerblock-Plus>\tSchrift vergrößern" -#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-Plus>\tSchrift vergrößern" -#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Nummernblock-Minus> Schrift verkleinern" -#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-Minus>\tSchrift verkleinern" -#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tAktualisieren" -#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Fehler beim Erzeugen des temporären Verzeichnisses »%s«:" -#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Fehler beim Holen von »%s« von »%s«:" -#: gitk:3635 msgid "command failed:" msgstr "Kommando fehlgeschlagen:" -#: gitk:3784 msgid "No such commit" msgstr "Version nicht gefunden" -#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: Kommando fehlgeschlagen:" -#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Zusammenführungs-Spitze konnte nicht gelesen werden: %s" -#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Fehler beim Lesen der Bereitstellung (»index«): %s" -#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "»git blame« konnte nicht gestartet werden: %s" -#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Suchen" -#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Fehler beim Ausführen von »git blame«: %s" -#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" "Diese Zeile stammt aus Version %s, die nicht in dieser Ansicht gezeigt wird" -#: gitk:3939 msgid "External diff viewer failed:" msgstr "Externes Diff-Programm fehlgeschlagen:" -#: gitk:4070 msgid "Gitk view definition" msgstr "Gitk-Ansichten" -#: gitk:4074 msgid "Remember this view" msgstr "Diese Ansicht speichern" -#: gitk:4075 msgid "References (space separated list):" msgstr "Zweige/Markierungen (durch Leerzeichen getrennte Liste):" -#: gitk:4076 msgid "Branches & tags:" msgstr "Zweige/Markierungen:" -#: gitk:4077 msgid "All refs" msgstr "Alle Markierungen und Zweige" -#: gitk:4078 msgid "All (local) branches" msgstr "Alle (lokalen) Zweige" -#: gitk:4079 msgid "All tags" msgstr "Alle Markierungen" -#: gitk:4080 msgid "All remote-tracking branches" msgstr "Alle Übernahmezweige" -#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Versionsinformationen (reguläre Ausdrücke):" -#: gitk:4082 msgid "Author:" msgstr "Autor:" -#: gitk:4083 msgid "Committer:" msgstr "Eintragender:" -#: gitk:4084 msgid "Commit Message:" msgstr "Versionsbeschreibung:" -#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Alle Versionsinformationen-Kriterien erfüllen" -#: gitk:4086 msgid "Matches no Commit Info criteria" msgstr "keine Versionsinformationen-Kriterien erfüllen" -#: gitk:4087 msgid "Changes to Files:" msgstr "Dateien:" -#: gitk:4088 msgid "Fixed String" msgstr "Zeichenkette" -#: gitk:4089 msgid "Regular Expression" msgstr "Regulärer Ausdruck" -#: gitk:4090 msgid "Search string:" msgstr "Suchausdruck:" -#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" msgstr "" "Datum (»2 weeks ago«, »2009-03-17 15:27:38«, »March 17, 2009 15:27:38«)" -#: gitk:4092 msgid "Since:" msgstr "Von:" -#: gitk:4093 msgid "Until:" msgstr "Bis:" -#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Versionsanzahl begrenzen oder einige überspringen (ganzzahliger Wert):" -#: gitk:4095 msgid "Number to show:" msgstr "Anzeigen:" -#: gitk:4096 msgid "Number to skip:" msgstr "Überspringen:" -#: gitk:4097 msgid "Miscellaneous options:" msgstr "Sonstiges:" -#: gitk:4098 msgid "Strictly sort by date" msgstr "Streng nach Datum sortieren" -#: gitk:4099 msgid "Mark branch sides" msgstr "Zweig-Seiten markieren" -#: gitk:4100 msgid "Limit to first parent" msgstr "Auf erste Elternversion beschränken" -#: gitk:4101 msgid "Simple history" msgstr "Einfache Historie" -#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Zusätzliche Argumente für »git log«:" -#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Folgende Dateien und Verzeichnisse anzeigen (eine pro Zeile):" -#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Versionsliste durch folgendes Kommando erzeugen lassen:" -#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: Ansicht bearbeiten" -#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- Auswahl der angezeigten Versionen" -#: gitk:4241 msgid "View Name" msgstr "Ansichtsname" -#: gitk:4316 msgid "Apply (F5)" msgstr "Anwenden (F5)" -#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Fehler in den ausgewählten Versionen:" -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Keine" -#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Abkömmling" -#: gitk:5022 msgid "Not descendant" msgstr "Kein Abkömmling" -#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Vorgänger" -#: gitk:5030 msgid "Not ancestor" msgstr "Kein Vorgänger" -#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Lokale Änderungen bereitgestellt, aber nicht eingetragen" -#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokale Änderungen, nicht bereitgestellt" -#: gitk:7134 msgid "and many more" msgstr "und weitere" -#: gitk:7137 msgid "many" msgstr "viele" -#: gitk:7328 msgid "Tags:" msgstr "Markierungen:" -#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Eltern" -#: gitk:7356 msgid "Child" msgstr "Kind" -#: gitk:7365 msgid "Branch" msgstr "Zweig" -#: gitk:7368 msgid "Follows" msgstr "Folgt auf" -#: gitk:7371 msgid "Precedes" msgstr "Vorgänger von" -#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Fehler beim Laden des Vergleichs: %s" -#: gitk:8650 msgid "Goto:" msgstr "Gehe zu:" -#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Kurzer SHA1-Hashwert »%s« ist mehrdeutig" -#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "Version »%s« ist unbekannt" -#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1-Hashwert »%s« ist unbekannt" -#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Version »%s« wird in der aktuellen Ansicht nicht angezeigt" -#: gitk:8832 gitk:8847 msgid "Date" msgstr "Datum" -#: gitk:8835 msgid "Children" msgstr "Kinder" -#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Zweig »%s« hierher zurücksetzen" -#: gitk:8900 msgid "Detached head: can't reset" msgstr "Zweigspitze ist abgetrennt: Zurücksetzen nicht möglich" -#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Überspringe Zusammenführungs-Version " -#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Fehler beim Holen der Patch-ID für " -#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - Abbruch.\n" -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Version " -#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -893,7 +686,6 @@ msgstr "" " ist das gleiche Patch wie\n" " " -#: gitk:9043 msgid "" " differs from\n" " " @@ -901,7 +693,6 @@ msgstr "" " ist unterschiedlich von\n" " " -#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -909,131 +700,101 @@ msgstr "" "Vergleich der Versionen:\n" "\n" -#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " hat %s Kinder. Abbruch\n" -#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Fehler beim Schreiben der Version in Datei: %s" -#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Fehler beim Vergleichen der Versionen: %s" -#: gitk:9137 msgid "Top" msgstr "Oben" -#: gitk:9138 msgid "From" msgstr "Von" -#: gitk:9143 msgid "To" msgstr "bis" -#: gitk:9167 msgid "Generate patch" msgstr "Patch erstellen" -#: gitk:9169 msgid "From:" msgstr "Von:" -#: gitk:9178 msgid "To:" msgstr "bis:" -#: gitk:9187 msgid "Reverse" msgstr "Umgekehrt" -#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Ausgabedatei:" -#: gitk:9195 msgid "Generate" msgstr "Erzeugen" -#: gitk:9233 msgid "Error creating patch:" msgstr "Fehler beim Erzeugen des Patches:" -#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9265 msgid "Tag name:" msgstr "Markierungsname:" -#: gitk:9268 msgid "Tag message is optional" msgstr "Eine Markierungsbeschreibung ist optional" -#: gitk:9270 msgid "Tag message:" msgstr "Markierungsbeschreibung:" -#: gitk:9274 gitk:9439 msgid "Create" msgstr "Erstellen" -#: gitk:9292 msgid "No tag name specified" msgstr "Kein Markierungsname angegeben" -#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Markierung »%s« existiert bereits." -#: gitk:9306 msgid "Error creating tag:" msgstr "Fehler beim Erstellen der Markierung:" -#: gitk:9382 msgid "Command:" msgstr "Kommando:" -#: gitk:9390 msgid "Write" msgstr "Schreiben" -#: gitk:9408 msgid "Error writing commit:" msgstr "Fehler beim Schreiben der Version:" -#: gitk:9435 msgid "Name:" msgstr "Name:" -#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Bitte geben Sie einen Namen für den neuen Zweig an." -#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Zweig »%s« existiert bereits. Soll er überschrieben werden?" -#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "Version »%s« ist bereits im Zweig »%s« enthalten -- trotzdem erneut " "eintragen?" -#: gitk:9535 msgid "Cherry-picking" msgstr "Version pflücken" -#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1043,7 +804,6 @@ msgstr "" "vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n" "zwischenspeichern (»git stash«) und dann erneut versuchen." -#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1052,21 +812,16 @@ msgstr "" "ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n" "werden, um diesen Konflikt aufzulösen?" -#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Keine Änderungen eingetragen" -#: gitk:9593 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" -msgstr "" -"Version »%s« ist nicht im Zweig »%s« enthalten -- trotzdem umkehren?" +msgstr "Version »%s« ist nicht im Zweig »%s« enthalten -- trotzdem umkehren?" -#: gitk:9598 msgid "Reverting" msgstr "Umkehren" -#: gitk:9606 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1076,7 +831,6 @@ msgstr "" "vorliegen. Bitte diese Änderungen eintragen, zurücksetzen oder\n" "zwischenspeichern (»git stash«) und dann erneut versuchen." -#: gitk:9610 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1085,30 +839,24 @@ msgstr "" "ist. Soll das Zusammenführungs-Werkzeug (»git citool«) aufgerufen\n" "werden, um diesen Konflikt aufzulösen?" -#: gitk:9653 msgid "Confirm reset" msgstr "Zurücksetzen bestätigen" -#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Zweig »%s« auf »%s« zurücksetzen?" -#: gitk:9657 msgid "Reset type:" msgstr "Art des Zurücksetzens:" -#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Harmlos: Arbeitskopie und Bereitstellung unverändert" -#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "" "Gemischt: Arbeitskopie unverändert,\n" "Bereitstellung zurückgesetzt" -#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1116,21 +864,17 @@ msgstr "" "Hart: Arbeitskopie und Bereitstellung\n" "(Alle lokalen Änderungen werden gelöscht)" -#: gitk:9683 msgid "Resetting" msgstr "Zurücksetzen" -#: gitk:9743 msgid "Checking out" msgstr "Umstellen" -#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "" "Der Zweig, auf den die Arbeitskopie momentan umgestellt ist, kann nicht " "gelöscht werden." -#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1139,16 +883,13 @@ msgstr "" "Die Versionen auf Zweig »%s« existieren auf keinem anderen Zweig.\n" "Zweig »%s« trotzdem löschen?" -#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Markierungen und Zweige: %s" -#: gitk:9850 msgid "Filter" msgstr "Filtern" -#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1156,218 +897,167 @@ msgstr "" "Fehler beim Lesen der Strukturinformationen; Zweige und Informationen zu " "Vorgänger/Nachfolger werden unvollständig sein." -#: gitk:11123 msgid "Tag" msgstr "Markierung" -#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11210 msgid "Gitk font chooser" msgstr "Gitk-Schriften wählen" -#: gitk:11227 msgid "B" msgstr "F" -#: gitk:11230 msgid "I" msgstr "K" -#: gitk:11348 msgid "Commit list display options" msgstr "Anzeige der Versionsliste" -#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Maximale Graphenbreite (Zeilen)" -#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximale Graphenbreite (% des Fensters)" -#: gitk:11358 msgid "Show local changes" msgstr "Lokale Änderungen anzeigen" -#: gitk:11361 msgid "Auto-select SHA1 (length)" msgstr "SHA1-Hashwert (Länge) automatisch auswählen" -#: gitk:11365 msgid "Hide remote refs" msgstr "Entfernte Zweige/Markierungen ausblenden" -#: gitk:11369 msgid "Diff display options" msgstr "Anzeige des Vergleichs" -#: gitk:11371 msgid "Tab spacing" msgstr "Tabulatorbreite" -#: gitk:11374 msgid "Display nearby tags/heads" msgstr "Naheliegende Markierungen/Zweigspitzen anzeigen" -#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "Maximale Anzahl anzuzeigender Markierungen/Zweigspitzen" -#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Vergleich nur für angezeigte Pfade" -#: gitk:11383 msgid "Support per-file encodings" msgstr "Zeichenkodierung pro Datei ermitteln" -#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Externes Diff-Programm" -#: gitk:11390 msgid "Choose..." msgstr "Wählen ..." -#: gitk:11395 msgid "General options" msgstr "Allgemeine Optionen" -#: gitk:11398 msgid "Use themed widgets" msgstr "Aussehen der Benutzeroberfläche durch Thema bestimmen" -#: gitk:11400 msgid "(change requires restart)" msgstr "(Änderungen werden erst nach Neustart wirksam)" -#: gitk:11402 msgid "(currently unavailable)" msgstr "(Momentan nicht verfügbar)" -#: gitk:11413 msgid "Colors: press to choose" msgstr "Farben: Klicken zum Wählen" -#: gitk:11416 msgid "Interface" msgstr "Benutzeroberfläche" -#: gitk:11417 msgid "interface" msgstr "Benutzeroberfläche" -#: gitk:11420 msgid "Background" msgstr "Hintergrund" -#: gitk:11421 gitk:11451 msgid "background" msgstr "Hintergrund" -#: gitk:11424 msgid "Foreground" msgstr "Vordergrund" -#: gitk:11425 msgid "foreground" msgstr "Vordergrund" -#: gitk:11428 msgid "Diff: old lines" msgstr "Vergleich: Alte Zeilen" -#: gitk:11429 msgid "diff old lines" msgstr "Vergleich - Alte Zeilen" -#: gitk:11433 msgid "Diff: new lines" msgstr "Vergleich: Neue Zeilen" -#: gitk:11434 msgid "diff new lines" msgstr "Vergleich - Neue Zeilen" -#: gitk:11438 msgid "Diff: hunk header" msgstr "Vergleich: Änderungstitel" -#: gitk:11440 msgid "diff hunk header" msgstr "Vergleich - Änderungstitel" -#: gitk:11444 msgid "Marked line bg" msgstr "Hintergrund für markierte Zeile" -#: gitk:11446 msgid "marked line background" msgstr "Hintergrund für markierte Zeile" -#: gitk:11450 msgid "Select bg" msgstr "Hintergrundfarbe auswählen" -#: gitk:11459 msgid "Fonts: press to choose" msgstr "Schriftart: Klicken zum Wählen" -#: gitk:11461 msgid "Main font" msgstr "Programmschriftart" -#: gitk:11462 msgid "Diff display font" msgstr "Schriftart für Vergleich" -#: gitk:11463 msgid "User interface font" msgstr "Beschriftungen" -#: gitk:11485 msgid "Gitk preferences" msgstr "Gitk-Einstellungen" -#: gitk:11494 msgid "General" msgstr "Allgemein" -#: gitk:11495 msgid "Colors" msgstr "Farben" -#: gitk:11496 msgid "Fonts" msgstr "Schriftarten" -#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: Farbe wählen für %s" -#: gitk:12059 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." msgstr "" -"Entschuldigung, gitk kann nicht mit dieser Tcl/Tk Version ausgeführt werden.\n" +"Entschuldigung, gitk kann nicht mit dieser Tcl/Tk Version ausgeführt " +"werden.\n" " Gitk erfordert mindestens Tcl/Tk 8.4." -#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Kein Git-Projektarchiv gefunden." -#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Mehrdeutige Angabe »%s«: Sowohl Version als auch Dateiname existiert." -#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Falsche Kommandozeilen-Parameter für gitk:" diff --git a/po/es.po b/po/es.po index fef3bbafeead3e..58b2504b07b5f8 100644 --- a/po/es.po +++ b/po/es.po @@ -17,34 +17,27 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Imposible obtener la lista de archivos pendientes de fusión:" -#: gitk:212 gitk:2381 msgid "Color words" msgstr "" -#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "" -#: gitk:324 #, fuzzy msgid "Error parsing revisions:" msgstr "Error al leer las diferencias de fusión:" -#: gitk:380 msgid "Error executing --argscmd command:" msgstr "" -#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "No hay archivos seleccionados: se seleccionó la opción --merge pero no hay " "archivos pendientes de fusión." -#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -52,319 +45,239 @@ msgstr "" "No hay archivos seleccionados: se seleccionó la opción --merge pero los " "archivos especificados no necesitan fusión." -#: gitk:418 gitk:566 #, fuzzy msgid "Error executing git log:" msgstr "Error al crear la etiqueta:" -#: gitk:436 gitk:582 msgid "Reading" msgstr "Leyendo" -#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Leyendo revisiones..." -#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "No se seleccionaron revisiones" -#: gitk:1445 gitk:4045 gitk:12432 msgid "Command line" msgstr "Línea de comandos" -#: gitk:1511 msgid "Can't parse git log output:" msgstr "Error analizando la salida de git log:" -#: gitk:1740 msgid "No commit information available" msgstr "Falta información sobre las revisiones" -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "Aceptar" -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 -#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Cancelar" -#: gitk:2069 msgid "&Update" msgstr "Actualizar" -#: gitk:2070 msgid "&Reload" msgstr "" -#: gitk:2071 msgid "Reread re&ferences" msgstr "Releer referencias" -#: gitk:2072 msgid "&List references" msgstr "Lista de referencias" -#: gitk:2074 msgid "Start git &gui" msgstr "" -#: gitk:2076 msgid "&Quit" msgstr "Salir" -#: gitk:2068 msgid "&File" msgstr "Archivo" -#: gitk:2080 msgid "&Preferences" msgstr "Preferencias" -#: gitk:2079 msgid "&Edit" msgstr "Editar" -#: gitk:2084 msgid "&New view..." msgstr "Nueva vista..." -#: gitk:2085 msgid "&Edit view..." msgstr "Modificar vista..." -#: gitk:2086 msgid "&Delete view" msgstr "Eliminar vista" -#: gitk:2088 gitk:4043 msgid "&All files" msgstr "Todos los archivos" -#: gitk:2083 gitk:4067 msgid "&View" msgstr "Vista" -#: gitk:2093 gitk:2103 gitk:3012 msgid "&About gitk" msgstr "Acerca de gitk" -#: gitk:2094 gitk:2108 msgid "&Key bindings" msgstr "Combinaciones de teclas" -#: gitk:2092 gitk:2107 msgid "&Help" msgstr "Ayuda" -#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2229 msgid "Row" msgstr "" -#: gitk:2267 msgid "Find" msgstr "Buscar" -#: gitk:2295 msgid "commit" msgstr "revisión" -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 -#: gitk:6912 msgid "containing:" msgstr "que contiene:" -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "que modifica la ruta:" -#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "que añade/elimina cadena:" -#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "" -#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Exacto" -#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "NoMayús" -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Regex" -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Todos los campos" -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Título" -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Comentarios" -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 -#: gitk:8845 msgid "Author" msgstr "Autor" -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "" -#: gitk:2350 msgid "Search" msgstr "Buscar" -#: gitk:2358 msgid "Diff" msgstr "Diferencia" -#: gitk:2360 msgid "Old version" msgstr "Versión antigua" -#: gitk:2362 msgid "New version" msgstr "Versión nueva" -#: gitk:2364 msgid "Lines of context" msgstr "Líneas de contexto" -#: gitk:2374 msgid "Ignore space change" msgstr "Ignora cambios de espaciado" -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "" -#: gitk:2445 msgid "Patch" msgstr "Parche" -#: gitk:2447 msgid "Tree" msgstr "Árbol" -#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Diferencia de esta -> seleccionada" -#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Diferencia de seleccionada -> esta" -#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Crear patch" -#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Crear etiqueta" -#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Escribir revisiones a archivo" -#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Crear nueva rama" -#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Añadir esta revisión a la rama actual (cherry-pick)" -#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Traer la rama HEAD aquí" -#: gitk:2625 #, fuzzy msgid "Mark this commit" msgstr "Añadir esta revisión a la rama actual (cherry-pick)" -#: gitk:2626 msgid "Return to mark" msgstr "" -#: gitk:2627 msgid "Find descendant of this and mark" msgstr "" -#: gitk:2628 msgid "Compare with marked commit" msgstr "" -#: gitk:2629 gitk:2640 #, fuzzy msgid "Diff this -> marked commit" msgstr "Diferencia de esta -> seleccionada" -#: gitk:2630 gitk:2641 #, fuzzy msgid "Diff marked commit -> this" msgstr "Diferencia de seleccionada -> esta" -#: gitk:2631 #, fuzzy msgid "Revert this commit" msgstr "Añadir esta revisión a la rama actual (cherry-pick)" -#: gitk:2647 msgid "Check out this branch" msgstr "Cambiar a esta rama" -#: gitk:2648 msgid "Remove this branch" msgstr "Eliminar esta rama" -#: gitk:2649 msgid "Copy branch name" msgstr "" -#: gitk:2656 msgid "Highlight this too" msgstr "Seleccionar también" -#: gitk:2657 msgid "Highlight this only" msgstr "Seleccionar sólo" -#: gitk:2658 msgid "External diff" msgstr "" -#: gitk:2659 msgid "Blame parent commit" msgstr "" -#: gitk:2660 msgid "Copy path" msgstr "" -#: gitk:2667 msgid "Show origin of this line" msgstr "" -#: gitk:2668 msgid "Run git gui blame on this line" msgstr "" -#: gitk:3014 #, fuzzy msgid "" "\n" @@ -382,733 +295,569 @@ msgstr "" "Uso y redistribución permitidos según los términos de la Licencia Pública " "General de GNU (GNU GPL)" -#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Cerrar" -#: gitk:3043 msgid "Gitk key bindings" msgstr "Combinaciones de tecla de Gitk" -#: gitk:3046 msgid "Gitk key bindings:" msgstr "Combinaciones de tecla de Gitk:" -#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tSalir" -#: gitk:3049 #, fuzzy, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-F>\t\tBuscar" -#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tIr a la primera revisión" -#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tIr a la última revisión" -#: gitk:3052 #, fuzzy msgid ", p, k\tMove up one commit" msgstr ", p, i\tSubir una revisión" -#: gitk:3053 #, fuzzy msgid ", n, j\tMove down one commit" msgstr ", n, k\tBajar una revisión" -#: gitk:3054 #, fuzzy msgid ", z, h\tGo back in history list" msgstr ", z, j\tRetroceder en la historia" -#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tAvanzar en la historia" -#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" -#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tSubir una página en la lista de revisiones" -#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tBajar una página en la lista de revisiones" -#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tDesplazarse al inicio de la lista de revisiones" -#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tDesplazarse al final de la lista de revisiones" -#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tDesplazar una línea hacia arriba la lista de revisiones" -#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tDesplazar una línea hacia abajo la lista de revisiones" -#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tDesplazar una página hacia arriba la lista de revisiones" -#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tDesplazar una página hacia abajo la lista de revisiones" -#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tBuscar hacia atrás (arriba, revisiones siguientes)" -#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tBuscar hacia adelante (abajo, revisiones anteriores)" -#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tDesplaza hacia arriba una página la vista de diferencias" -#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tDesplaza hacia arriba una página la vista de diferencias" -#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\t\tDesplaza hacia abajo una página la vista de diferencias" -#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tDesplaza hacia arriba 18 líneas la vista de diferencias" -#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tDesplaza hacia abajo 18 líneas la vista de diferencias" -#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tBuscar" -#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tBuscar el siguiente" -#: gitk:3074 msgid "\tMove to next find hit" msgstr "\tBuscar el siguiente" -#: gitk:3075 #, fuzzy msgid "g\t\tGo to commit" msgstr "\t\tIr a la última revisión" -#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "" -#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tBuscar el anterior" -#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente" -#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tBuscar siguiente en la vista de diferencias" -#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tBuscar anterior en la vista de diferencias" -#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumentar tamaño del texto" -#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAumentar tamaño del texto" -#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDisminuir tamaño del texto" -#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tDisminuir tamaño del texto" -#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tActualizar" -#: gitk:3550 gitk:3559 #, fuzzy, tcl-format msgid "Error creating temporary directory %s:" msgstr "Error en la creación del parche:" -#: gitk:3572 #, fuzzy, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Error al leer las diferencias de fusión:" -#: gitk:3635 #, fuzzy msgid "command failed:" msgstr "Línea de comandos" -#: gitk:3784 #, fuzzy msgid "No such commit" msgstr "No se han guardado cambios" -#: gitk:3798 msgid "git gui blame: command failed:" msgstr "" -#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "" -#: gitk:3837 #, fuzzy, tcl-format msgid "Error reading index: %s" msgstr "Error al crear la etiqueta:" -#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "" -#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Buscando" -#: gitk:3897 #, fuzzy, tcl-format msgid "Error running git blame: %s" msgstr "Error al crear la etiqueta:" -#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" -#: gitk:3939 #, fuzzy msgid "External diff viewer failed:" msgstr "f\t\tDesplazar la vista de diferencias al archivo siguiente" -#: gitk:4070 msgid "Gitk view definition" msgstr "Definición de vistas de Gitk" -#: gitk:4074 msgid "Remember this view" msgstr "Recordar esta vista" -#: gitk:4075 msgid "References (space separated list):" msgstr "" -#: gitk:4076 msgid "Branches & tags:" msgstr "" -#: gitk:4077 #, fuzzy msgid "All refs" msgstr "Todos los archivos" -#: gitk:4078 msgid "All (local) branches" msgstr "" -#: gitk:4079 msgid "All tags" msgstr "" -#: gitk:4080 msgid "All remote-tracking branches" msgstr "" -#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "" -#: gitk:4082 #, fuzzy msgid "Author:" msgstr "Autor" -#: gitk:4083 #, fuzzy msgid "Committer:" msgstr "revisión" -#: gitk:4084 msgid "Commit Message:" msgstr "" -#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "" -#: gitk:4086 msgid "Matches no Commit Info criteria" msgstr "" -#: gitk:4087 msgid "Changes to Files:" msgstr "" -#: gitk:4088 msgid "Fixed String" msgstr "" -#: gitk:4089 msgid "Regular Expression" msgstr "" -#: gitk:4090 #, fuzzy msgid "Search string:" msgstr "Buscando" -#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" msgstr "" -#: gitk:4092 msgid "Since:" msgstr "" -#: gitk:4093 msgid "Until:" msgstr "" -#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "" -#: gitk:4095 msgid "Number to show:" msgstr "" -#: gitk:4096 msgid "Number to skip:" msgstr "" -#: gitk:4097 msgid "Miscellaneous options:" msgstr "" -#: gitk:4098 msgid "Strictly sort by date" msgstr "" -#: gitk:4099 msgid "Mark branch sides" msgstr "" -#: gitk:4100 #, fuzzy msgid "Limit to first parent" msgstr "Limitar las diferencias a las rutas seleccionadas" -#: gitk:4101 msgid "Simple history" msgstr "" -#: gitk:4102 #, fuzzy msgid "Additional arguments to git log:" msgstr "Revisiones a incluir (argumentos a git log):" -#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Introducir archivos y directorios a incluir, uno por línea:" -#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Comando que genera más revisiones a incluir:" -#: gitk:4228 msgid "Gitk: edit view" msgstr "" -#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "" -#: gitk:4241 #, fuzzy msgid "View Name" msgstr "Vista" -#: gitk:4316 msgid "Apply (F5)" msgstr "" -#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Error en los argumentos de selección de las revisiones:" -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Ninguno" -#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Descendiente" -#: gitk:5022 msgid "Not descendant" msgstr "No descendiente" -#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Antepasado" -#: gitk:5030 msgid "Not ancestor" msgstr "No antepasado" -#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Cambios locales añadidos al índice pero sin completar revisión" -#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Cambios locales sin añadir al índice" -#: gitk:7134 msgid "and many more" msgstr "" -#: gitk:7137 msgid "many" msgstr "" -#: gitk:7328 msgid "Tags:" msgstr "Etiquetas:" -#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Padre" -#: gitk:7356 msgid "Child" msgstr "Hija" -#: gitk:7365 msgid "Branch" msgstr "Rama" -#: gitk:7368 msgid "Follows" msgstr "Sigue-a" -#: gitk:7371 msgid "Precedes" msgstr "Precede-a" -#: gitk:7966 #, fuzzy, tcl-format msgid "Error getting diffs: %s" msgstr "Error al leer las diferencias de fusión:" -#: gitk:8650 msgid "Goto:" msgstr "Ir a:" -#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "La id SHA1 abreviada %s es ambigua" -#: gitk:8678 #, fuzzy, tcl-format msgid "Revision %s is not known" msgstr "La id SHA1 %s es desconocida" -#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "La id SHA1 %s es desconocida" -#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "" -#: gitk:8832 gitk:8847 msgid "Date" msgstr "Fecha" -#: gitk:8835 msgid "Children" msgstr "Hijas" -#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Poner la rama %s en esta revisión" -#: gitk:8900 msgid "Detached head: can't reset" msgstr "" -#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "" -#: gitk:9020 gitk:9025 #, fuzzy msgid "Error getting patch ID for " msgstr "Error en la creación del parche:" -#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr "" -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 #, fuzzy msgid "Commit " msgstr "revisión" -#: gitk:9035 msgid "" " is the same patch as\n" " " msgstr "" -#: gitk:9043 msgid "" " differs from\n" " " msgstr "" -#: gitk:9045 msgid "" "Diff of commits:\n" "\n" msgstr "" -#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr "" -#: gitk:9085 #, fuzzy, tcl-format msgid "Error writing commit to file: %s" msgstr "Error al escribir revisión:" -#: gitk:9091 #, fuzzy, tcl-format msgid "Error diffing commits: %s" msgstr "Error al escribir revisión:" -#: gitk:9137 msgid "Top" msgstr "Origen" -#: gitk:9138 msgid "From" msgstr "De" -#: gitk:9143 msgid "To" msgstr "A" -#: gitk:9167 msgid "Generate patch" msgstr "Generar parche" -#: gitk:9169 msgid "From:" msgstr "De:" -#: gitk:9178 msgid "To:" msgstr "Para:" -#: gitk:9187 msgid "Reverse" msgstr "Invertir" -#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Escribir a archivo:" -#: gitk:9195 msgid "Generate" msgstr "Generar" -#: gitk:9233 msgid "Error creating patch:" msgstr "Error en la creación del parche:" -#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9265 msgid "Tag name:" msgstr "Nombre de etiqueta:" -#: gitk:9268 msgid "Tag message is optional" msgstr "" -#: gitk:9270 #, fuzzy msgid "Tag message:" msgstr "Nombre de etiqueta:" -#: gitk:9274 gitk:9439 msgid "Create" msgstr "Crear" -#: gitk:9292 msgid "No tag name specified" msgstr "No se ha especificado etiqueta" -#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "La etiqueta \"%s\" ya existe" -#: gitk:9306 msgid "Error creating tag:" msgstr "Error al crear la etiqueta:" -#: gitk:9382 msgid "Command:" msgstr "Comando:" -#: gitk:9390 msgid "Write" msgstr "Escribir" -#: gitk:9408 msgid "Error writing commit:" msgstr "Error al escribir revisión:" -#: gitk:9435 msgid "Name:" msgstr "Nombre:" -#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Especifique un nombre para la nueva rama" -#: gitk:9463 #, fuzzy, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "La etiqueta \"%s\" ya existe" -#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?" -#: gitk:9535 msgid "Cherry-picking" msgstr "Eligiendo revisiones (cherry-picking)" -#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" "Please commit, reset or stash your changes and try again." msgstr "" -#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" msgstr "" -#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "No se han guardado cambios" -#: gitk:9593 #, fuzzy, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "La revisión %s ya está incluida en la rama %s -- ¿Volver a aplicarla?" -#: gitk:9598 #, fuzzy msgid "Reverting" msgstr "Reponiendo" -#: gitk:9606 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " "commit, reset or stash your changes and try again." msgstr "" -#: gitk:9610 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" msgstr "" -#: gitk:9653 msgid "Confirm reset" msgstr "Confirmar git reset" -#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "¿Reponer la rama %s a %s?" -#: gitk:9657 msgid "Reset type:" msgstr "Tipo de reposición:" -#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Suave: No altera la copia de trabajo ni el índice" -#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixta: Actualiza el índice, no altera la copia de trabajo" -#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1116,19 +865,15 @@ msgstr "" "Dura: Actualiza el índice y la copia de trabajo\n" "(abandona TODAS las modificaciones locales)" -#: gitk:9683 msgid "Resetting" msgstr "Reponiendo" -#: gitk:9743 msgid "Checking out" msgstr "Creando copia de trabajo" -#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "No se puede borrar la rama actual" -#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1137,16 +882,13 @@ msgstr "" "Las revisiones de la rama %s no están presentes en otras ramas.\n" "¿Borrar la rama %s?" -#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Etiquetas y ramas: %s" -#: gitk:9850 msgid "Filter" msgstr "Filtro" -#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1154,211 +896,162 @@ msgstr "" "Error al leer la topología de revisiones: la información sobre las ramas y " "etiquetas precedentes y siguientes será incompleta." -#: gitk:11123 msgid "Tag" msgstr "Etiqueta" -#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11210 msgid "Gitk font chooser" msgstr "Selector de tipografías gitk" -#: gitk:11227 msgid "B" msgstr "B" -#: gitk:11230 msgid "I" msgstr "I" -#: gitk:11348 msgid "Commit list display options" msgstr "Opciones de visualización de la lista de revisiones" -#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Ancho máximo del gráfico (en líneas)" -#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Ancho máximo del gráfico (en % del panel)" -#: gitk:11358 msgid "Show local changes" msgstr "Mostrar cambios locales" -#: gitk:11361 #, fuzzy msgid "Auto-select SHA1 (length)" msgstr "Seleccionar automáticamente SHA1 hash" -#: gitk:11365 msgid "Hide remote refs" msgstr "" -#: gitk:11369 msgid "Diff display options" msgstr "Opciones de visualización de diferencias" -#: gitk:11371 msgid "Tab spacing" msgstr "Espaciado de tabulador" -#: gitk:11374 #, fuzzy msgid "Display nearby tags/heads" msgstr "Mostrar etiquetas cercanas" -#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "" -#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Limitar las diferencias a las rutas seleccionadas" -#: gitk:11383 msgid "Support per-file encodings" msgstr "" -#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "" -#: gitk:11390 msgid "Choose..." msgstr "" -#: gitk:11395 #, fuzzy msgid "General options" msgstr "Generar parche" -#: gitk:11398 msgid "Use themed widgets" msgstr "" -#: gitk:11400 msgid "(change requires restart)" msgstr "" -#: gitk:11402 msgid "(currently unavailable)" msgstr "" -#: gitk:11413 msgid "Colors: press to choose" msgstr "Colores: pulse para seleccionar" -#: gitk:11416 msgid "Interface" msgstr "" -#: gitk:11417 #, fuzzy msgid "interface" msgstr "Tipografía para interfaz de usuario" -#: gitk:11420 msgid "Background" msgstr "Fondo" -#: gitk:11421 gitk:11451 #, fuzzy msgid "background" msgstr "Fondo" -#: gitk:11424 msgid "Foreground" msgstr "Primer plano" -#: gitk:11425 #, fuzzy msgid "foreground" msgstr "Primer plano" -#: gitk:11428 msgid "Diff: old lines" msgstr "Diff: líneas viejas" -#: gitk:11429 #, fuzzy msgid "diff old lines" msgstr "Diff: líneas viejas" -#: gitk:11433 msgid "Diff: new lines" msgstr "Diff: líneas nuevas" -#: gitk:11434 #, fuzzy msgid "diff new lines" msgstr "Diff: líneas nuevas" -#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff: cabecera de fragmento" -#: gitk:11440 #, fuzzy msgid "diff hunk header" msgstr "Diff: cabecera de fragmento" -#: gitk:11444 msgid "Marked line bg" msgstr "" -#: gitk:11446 msgid "marked line background" msgstr "" -#: gitk:11450 msgid "Select bg" msgstr "Color de fondo de la selección" -#: gitk:11459 msgid "Fonts: press to choose" msgstr "Tipografías: pulse para elegir" -#: gitk:11461 msgid "Main font" msgstr "Tipografía principal" -#: gitk:11462 msgid "Diff display font" msgstr "Tipografía para diferencias" -#: gitk:11463 msgid "User interface font" msgstr "Tipografía para interfaz de usuario" -#: gitk:11485 msgid "Gitk preferences" msgstr "Preferencias de gitk" -#: gitk:11494 #, fuzzy msgid "General" msgstr "Generar" -#: gitk:11495 msgid "Colors" msgstr "" -#: gitk:11496 msgid "Fonts" msgstr "" -#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: elegir color para %s" -#: gitk:12059 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -1366,17 +1059,14 @@ msgstr "" "Esta versión de Tcl/Tk es demasiado antigua.\n" " Gitk requiere Tcl/Tk versión 8.4 o superior." -#: gitk:12269 msgid "Cannot find a git repository here." msgstr "No hay un repositorio git aquí." -#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "" "Argumento ambiguo: '%s' es tanto una revisión como un nombre de archivo" -#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Argumentos incorrectos a Gitk:" diff --git a/po/fr.po b/po/fr.po index e4fac932e5b0f6..dc31b709214e0b 100644 --- a/po/fr.po +++ b/po/fr.po @@ -19,355 +19,268 @@ msgstr "" "X-Poedit-Language: French\n" "X-Poedit-Country: FRANCE\n" -#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Impossible de récupérer la liste des fichiers non fusionnés :" -#: gitk:212 gitk:2399 msgid "Color words" msgstr "Colorier les mots différents" -#: gitk:217 gitk:2399 gitk:8239 gitk:8272 msgid "Markup words" msgstr "Marquer les mots différents" -#: gitk:324 msgid "Error parsing revisions:" msgstr "Erreur lors du parcours des révisions :" -#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Erreur à l'exécution de la commande --argscmd :" -#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Aucun fichier sélectionné : --merge précisé, mais tous les fichiers sont " "fusionnés." # FIXME : améliorer la traduction de 'file limite' -#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." -msgstr "Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné n'est dans la limite des fichiers." +msgstr "" +"Aucun fichier sélectionné : --merge précisé mais aucun fichier non fusionné " +"n'est dans la limite des fichiers." -#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Erreur à l'exécution de git log :" -#: gitk:436 gitk:582 msgid "Reading" msgstr "Lecture en cours" -#: gitk:496 gitk:4544 msgid "Reading commits..." msgstr "Lecture des commits..." -#: gitk:499 gitk:1637 gitk:4547 msgid "No commits selected" msgstr "Aucun commit sélectionné" -#: gitk:1445 gitk:4064 gitk:12469 msgid "Command line" msgstr "Ligne de commande" -#: gitk:1511 msgid "Can't parse git log output:" msgstr "Impossible de lire la sortie de git log :" -#: gitk:1740 msgid "No commit information available" msgstr "Aucune information disponible sur le commit" -#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554 msgid "OK" msgstr "OK" -#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704 -#: gitk:11275 gitk:11555 msgid "Cancel" msgstr "Annuler" -#: gitk:2083 msgid "&Update" msgstr "Mise à jour" -#: gitk:2084 msgid "&Reload" msgstr "&Recharger" -#: gitk:2085 msgid "Reread re&ferences" msgstr "Relire les ré&férences" -#: gitk:2086 msgid "&List references" msgstr "&Lister les références" -#: gitk:2088 msgid "Start git &gui" msgstr "Démarrer git &gui" -#: gitk:2090 msgid "&Quit" msgstr "&Quitter" -#: gitk:2082 msgid "&File" msgstr "&Fichier" -#: gitk:2094 msgid "&Preferences" msgstr "Préférences" -#: gitk:2093 msgid "&Edit" msgstr "&Éditer" -#: gitk:2098 msgid "&New view..." msgstr "&Nouvelle vue..." -#: gitk:2099 msgid "&Edit view..." msgstr "&Éditer la vue..." -#: gitk:2100 msgid "&Delete view" msgstr "Supprimer la vue" -#: gitk:2102 msgid "&All files" msgstr "Tous les fichiers" -#: gitk:2097 msgid "&View" msgstr "&Vue" -#: gitk:2107 gitk:2117 msgid "&About gitk" msgstr "À propos de gitk" -#: gitk:2108 gitk:2122 msgid "&Key bindings" msgstr "Raccourcis clavier" -#: gitk:2106 gitk:2121 msgid "&Help" msgstr "Aide" -#: gitk:2199 gitk:8671 msgid "SHA1 ID:" msgstr "Id SHA1 :" -#: gitk:2243 msgid "Row" msgstr "Colonne" -#: gitk:2281 msgid "Find" msgstr "Recherche" -#: gitk:2309 msgid "commit" msgstr "commit" -#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846 -#: gitk:6931 msgid "containing:" msgstr "contient :" -#: gitk:2316 gitk:3545 gitk:3550 gitk:4782 msgid "touching paths:" msgstr "chemins modifiés :" -#: gitk:2317 gitk:4796 msgid "adding/removing string:" msgstr "ajoute/supprime la chaîne :" -#: gitk:2318 gitk:4798 msgid "changing lines matching:" msgstr "modifie les lignes vérifiant :" -#: gitk:2327 gitk:2329 gitk:4785 msgid "Exact" msgstr "Exact" -#: gitk:2329 gitk:4873 gitk:6742 msgid "IgnCase" msgstr "Ignorer la casse" -#: gitk:2329 gitk:4755 gitk:4871 gitk:6738 msgid "Regexp" msgstr "Expression régulière" -#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935 msgid "All fields" msgstr "Tous les champs" -#: gitk:2332 gitk:4890 gitk:4923 gitk:6805 msgid "Headline" msgstr "Titre" -#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408 msgid "Comments" msgstr "Commentaires" -#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849 -#: gitk:8864 msgid "Author" msgstr "Auteur" -#: gitk:2333 gitk:4890 gitk:6805 gitk:7345 msgid "Committer" msgstr "Validateur" -#: gitk:2367 msgid "Search" msgstr "Rechercher" -#: gitk:2375 msgid "Diff" msgstr "Diff" -#: gitk:2377 msgid "Old version" msgstr "Ancienne version" -#: gitk:2379 msgid "New version" msgstr "Nouvelle version" -#: gitk:2382 msgid "Lines of context" msgstr "Lignes de contexte" -#: gitk:2392 msgid "Ignore space change" msgstr "Ignorer les modifications d'espace" -#: gitk:2396 gitk:2398 gitk:7978 gitk:8225 msgid "Line diff" msgstr "différence par ligne" -#: gitk:2463 msgid "Patch" msgstr "Patch" -#: gitk:2465 msgid "Tree" msgstr "Arbre" -#: gitk:2635 gitk:2656 msgid "Diff this -> selected" msgstr "Diff ceci -> la sélection" -#: gitk:2636 gitk:2657 msgid "Diff selected -> this" msgstr "Diff sélection -> ceci" -#: gitk:2637 gitk:2658 msgid "Make patch" msgstr "Créer patch" -#: gitk:2638 gitk:9273 msgid "Create tag" msgstr "Créer étiquette" -#: gitk:2639 msgid "Copy commit summary" msgstr "Copié le résumé du commit" -#: gitk:2640 gitk:9404 msgid "Write commit to file" msgstr "Écrire le commit dans un fichier" -#: gitk:2641 gitk:9461 msgid "Create new branch" msgstr "Créer une nouvelle branche" -#: gitk:2642 msgid "Cherry-pick this commit" msgstr "Cueillir (cherry-pick) ce commit" -#: gitk:2643 msgid "Reset HEAD branch to here" msgstr "Réinitialiser la branche HEAD vers cet état" -#: gitk:2644 msgid "Mark this commit" msgstr "Marquer ce commit" -#: gitk:2645 msgid "Return to mark" msgstr "Retourner à la marque" -#: gitk:2646 msgid "Find descendant of this and mark" msgstr "Chercher le descendant de ceci et le marquer" -#: gitk:2647 msgid "Compare with marked commit" msgstr "Comparer avec le commit marqué" -#: gitk:2648 gitk:2659 msgid "Diff this -> marked commit" msgstr "Diff ceci -> sélection" -#: gitk:2649 gitk:2660 msgid "Diff marked commit -> this" msgstr "Diff entre sélection -> ceci" -#: gitk:2650 msgid "Revert this commit" msgstr "Défaire ce commit" -#: gitk:2666 msgid "Check out this branch" msgstr "Récupérer cette branche" -#: gitk:2667 msgid "Remove this branch" msgstr "Supprimer cette branche" -#: gitk:2668 msgid "Copy branch name" msgstr "Copier la nom de la branche" -#: gitk:2675 msgid "Highlight this too" msgstr "Surligner également ceci" -#: gitk:2676 msgid "Highlight this only" msgstr "Surligner seulement ceci" -#: gitk:2677 msgid "External diff" msgstr "Diff externe" -#: gitk:2678 msgid "Blame parent commit" msgstr "Blâmer le commit parent" -#: gitk:2679 msgid "Copy path" msgstr "Copier le chemin" -#: gitk:2686 msgid "Show origin of this line" msgstr "Montrer l'origine de cette ligne" -#: gitk:2687 msgid "Run git gui blame on this line" msgstr "Exécuter git gui blame sur cette ligne" -#: gitk:3031 msgid "About gitk" msgstr "À propos de gitk" -#: gitk:3033 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -381,327 +294,254 @@ msgstr "" "\n" "Copyright \\u00a9 2005-2016 Paul Mackerras\n" "\n" -"Utilisation et redistribution soumises aux termes de la GNU General Public License" +"Utilisation et redistribution soumises aux termes de la GNU General Public " +"License" -#: gitk:3041 gitk:3108 gitk:9890 msgid "Close" msgstr "Fermer" -#: gitk:3062 msgid "Gitk key bindings" msgstr "Raccourcis clavier de Gitk" -#: gitk:3065 msgid "Gitk key bindings:" msgstr "Raccourcis clavier de Gitk :" -#: gitk:3067 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tQuitter" -#: gitk:3068 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tFermer la fenêtre" -#: gitk:3069 msgid "\t\tMove to first commit" msgstr "\t\tAller au premier commit" -#: gitk:3070 msgid "\t\tMove to last commit" msgstr "\t\tAller au dernier commit" -#: gitk:3071 msgid ", p, k\tMove up one commit" msgstr ", p, k\t Aller au commit précédent" -#: gitk:3072 msgid ", n, j\tMove down one commit" msgstr ", n, j\t Aller au commit suivant" -#: gitk:3073 msgid ", z, h\tGo back in history list" msgstr ", z, h\tReculer dans l'historique" -#: gitk:3074 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tAvancer dans l'historique" -#: gitk:3075 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "<%s-n>\tAller sur le n-ième parent du commit dans l'historique" -#: gitk:3076 msgid "\tMove up one page in commit list" msgstr "\tMonter d'une page dans la liste des commits" -#: gitk:3077 msgid "\tMove down one page in commit list" msgstr "\tDescendre d'une page dans la liste des commits" -#: gitk:3078 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Début>\tAller en haut de la liste des commits" -#: gitk:3079 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tAller en bas de la liste des commits" -#: gitk:3080 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tMonter d'une ligne dans la liste des commits" -#: gitk:3081 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tDescendre d'une ligne dans la liste des commits" -#: gitk:3082 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tMonter d'une page dans la liste des commits" -#: gitk:3083 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tDescendre d'une page dans la liste des commits" -#: gitk:3084 msgid "\tFind backwards (upwards, later commits)" msgstr "" "\tRecherche en arrière (vers l'avant, commits les plus anciens)" -#: gitk:3085 msgid "\tFind forwards (downwards, earlier commits)" msgstr "" "\tRecherche en avant (vers l'arrière, commit les plus récents)" -#: gitk:3086 msgid ", b\tScroll diff view up one page" msgstr ", b\tMonter d'une page dans la vue des diff" -#: gitk:3087 msgid "\tScroll diff view up one page" msgstr "\tMonter d'une page dans la vue des diff" -#: gitk:3088 msgid "\t\tScroll diff view down one page" msgstr "\t\tDescendre d'une page dans la vue des diff" -#: gitk:3089 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tMonter de 18 lignes dans la vue des diff" -#: gitk:3090 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tDescendre de 18 lignes dans la vue des diff" -#: gitk:3091 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tRechercher" -#: gitk:3092 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tAller au résultat de recherche suivant" -#: gitk:3093 msgid "\tMove to next find hit" msgstr "\t\tAller au résultat de recherche suivant" -#: gitk:3094 msgid "g\t\tGo to commit" msgstr "g\t\tAller au commit" -#: gitk:3095 msgid "/\t\tFocus the search box" msgstr "/\t\tFocus sur la zone de recherche" -#: gitk:3096 msgid "?\t\tMove to previous find hit" msgstr "?\t\tAller au résultat de recherche précédent" -#: gitk:3097 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tAller au prochain fichier dans la vue des diff" -#: gitk:3098 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tAller au résultat suivant dans la vue des diff" -#: gitk:3099 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tAller au résultat précédent dans la vue des diff" -#: gitk:3100 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAugmenter la taille de la police" -#: gitk:3101 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAugmenter la taille de la police" -#: gitk:3102 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDiminuer la taille de la police" -#: gitk:3103 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tDiminuer la taille de la police" -#: gitk:3104 msgid "\t\tUpdate" msgstr "\t\tMise à jour" -#: gitk:3569 gitk:3578 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Erreur lors de la création du répertoire temporaire %s :" -#: gitk:3591 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Erreur en obtenant \"%s\" de %s:" -#: gitk:3654 msgid "command failed:" msgstr "échec de la commande :" -#: gitk:3803 msgid "No such commit" msgstr "Commit inexistant" -#: gitk:3817 msgid "git gui blame: command failed:" msgstr "git gui blame : échec de la commande :" -#: gitk:3848 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Impossible de lire le head de la fusion : %s" -#: gitk:3856 #, tcl-format msgid "Error reading index: %s" msgstr "Erreur à la lecture de l'index : %s" -#: gitk:3881 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Impossible de démarrer git blame : %s" -#: gitk:3884 gitk:6773 msgid "Searching" msgstr "Recherche en cours" -#: gitk:3916 #, tcl-format msgid "Error running git blame: %s" msgstr "Erreur à l'exécution de git blame : %s" -#: gitk:3944 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Cette ligne est issue du commit %s, qui n'est pas dans cette vue" -#: gitk:3958 msgid "External diff viewer failed:" msgstr "Échec de l'outil externe de visualisation des diff :" -#: gitk:4062 msgid "All files" msgstr "Tous les fichiers" -#: gitk:4086 msgid "View" msgstr "Vue" -#: gitk:4089 msgid "Gitk view definition" msgstr "Définition des vues de Gitk" -#: gitk:4093 msgid "Remember this view" msgstr "Se souvenir de cette vue" -#: gitk:4094 msgid "References (space separated list):" msgstr "Références (liste d'éléments séparés par des espaces) :" -#: gitk:4095 msgid "Branches & tags:" msgstr "Branches & étiquettes :" -#: gitk:4096 msgid "All refs" msgstr "Toutes les références" -#: gitk:4097 msgid "All (local) branches" msgstr "Toutes les branches (locales)" -#: gitk:4098 msgid "All tags" msgstr "Toutes les étiquettes" -#: gitk:4099 msgid "All remote-tracking branches" msgstr "Toutes les branches de suivi à distance" -#: gitk:4100 msgid "Commit Info (regular expressions):" msgstr "Info sur les commits (expressions régulières) :" -#: gitk:4101 msgid "Author:" msgstr "Auteur :" -#: gitk:4102 msgid "Committer:" msgstr "Validateur :" -#: gitk:4103 msgid "Commit Message:" msgstr "Message de commit :" -#: gitk:4104 msgid "Matches all Commit Info criteria" msgstr "Correspond à tous les critères d'Info sur les commits" -#: gitk:4105 msgid "Matches no Commit Info criteria" msgstr "Ne correspond à aucun des critères d'Info sur les commits" -#: gitk:4106 msgid "Changes to Files:" msgstr "Changements des fichiers :" -#: gitk:4107 msgid "Fixed String" msgstr "Chaîne Figée" -#: gitk:4108 msgid "Regular Expression" msgstr "Expression Régulière" -#: gitk:4109 msgid "Search string:" msgstr "Recherche de la chaîne :" -#: gitk:4110 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -709,201 +549,153 @@ msgstr "" "Dates des commits (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, " "2009 15:27:38\") :" -#: gitk:4111 msgid "Since:" msgstr "Depuis :" -#: gitk:4112 msgid "Until:" msgstr "Jusqu'au :" -#: gitk:4113 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limiter et/ou sauter un certain nombre (entier positif) de révisions :" -#: gitk:4114 msgid "Number to show:" msgstr "Nombre à afficher :" -#: gitk:4115 msgid "Number to skip:" msgstr "Nombre à sauter :" -#: gitk:4116 msgid "Miscellaneous options:" msgstr "Options diverses :" -#: gitk:4117 msgid "Strictly sort by date" msgstr "Trier par date" -#: gitk:4118 msgid "Mark branch sides" msgstr "Indiquer les côtés des branches" -#: gitk:4119 msgid "Limit to first parent" msgstr "Limiter au premier ancêtre" -#: gitk:4120 msgid "Simple history" msgstr "Historique simple" -#: gitk:4121 msgid "Additional arguments to git log:" msgstr "Arguments supplémentaires de git log :" -#: gitk:4122 msgid "Enter files and directories to include, one per line:" msgstr "Saisir les fichiers et répertoires à inclure, un par ligne :" -#: gitk:4123 msgid "Command to generate more commits to include:" msgstr "Commande pour générer plus de commits à inclure :" -#: gitk:4247 msgid "Gitk: edit view" msgstr "Gitk : éditer la vue" -#: gitk:4255 msgid "-- criteria for selecting revisions" msgstr "-- critère pour la sélection des révisions" -#: gitk:4260 msgid "View Name" msgstr "Nom de la vue" -#: gitk:4335 msgid "Apply (F5)" msgstr "Appliquer (F5)" -#: gitk:4373 msgid "Error in commit selection arguments:" msgstr "Erreur dans les arguments de sélection des commits :" -#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411 msgid "None" msgstr "Aucun" -#: gitk:5040 gitk:5045 msgid "Descendant" msgstr "Descendant" -#: gitk:5041 msgid "Not descendant" msgstr "Pas un descendant" -#: gitk:5048 gitk:5053 msgid "Ancestor" msgstr "Ancêtre" -#: gitk:5049 msgid "Not ancestor" msgstr "Pas un ancêtre" -#: gitk:5343 msgid "Local changes checked in to index but not committed" msgstr "Modifications locales enregistrées dans l'index mais non validées" -#: gitk:5379 msgid "Local uncommitted changes, not checked in to index" msgstr "Modifications locales non enregistrées dans l'index et non validées" -#: gitk:7153 msgid "and many more" msgstr "et beaucoup plus" -#: gitk:7156 msgid "many" msgstr "nombreux" -#: gitk:7347 msgid "Tags:" msgstr "Étiquettes :" -#: gitk:7364 gitk:7370 gitk:8844 msgid "Parent" msgstr "Parent" -#: gitk:7375 msgid "Child" msgstr "Enfant" -#: gitk:7384 msgid "Branch" msgstr "Branche" -#: gitk:7387 msgid "Follows" msgstr "Suit" -#: gitk:7390 msgid "Precedes" msgstr "Précède" -#: gitk:7985 #, tcl-format msgid "Error getting diffs: %s" msgstr "Erreur lors de la récupération des diff : %s" -#: gitk:8669 msgid "Goto:" msgstr "Aller à :" -#: gitk:8690 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "L'id SHA1 court %s est ambigu" -#: gitk:8697 #, tcl-format msgid "Revision %s is not known" msgstr "La révision %s est inconnu" -#: gitk:8707 #, tcl-format msgid "SHA1 id %s is not known" msgstr "L'id SHA1 %s est inconnu" -#: gitk:8709 #, tcl-format msgid "Revision %s is not in the current view" msgstr "La révision %s n'est pas dans la vue courante" -#: gitk:8851 gitk:8866 msgid "Date" msgstr "Date" -#: gitk:8854 msgid "Children" msgstr "Enfants" -#: gitk:8917 #, tcl-format msgid "Reset %s branch to here" msgstr "Réinitialiser la branche %s vers cet état" -#: gitk:8919 msgid "Detached head: can't reset" msgstr "Head détaché : impossible de réinitialiser" -#: gitk:9024 gitk:9030 msgid "Skipping merge commit " msgstr "Éviter le commit de la fusion " -#: gitk:9039 gitk:9044 msgid "Error getting patch ID for " msgstr "Erreur à l'obtention de l'ID du patch pour " -#: gitk:9040 gitk:9045 msgid " - stopping\n" msgstr " - arrêt en cours\n" -#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084 msgid "Commit " msgstr "Commit " -#: gitk:9054 msgid "" " is the same patch as\n" " " @@ -911,7 +703,6 @@ msgstr "" "est le même patch que \n" " " -#: gitk:9062 msgid "" " differs from\n" " " @@ -919,146 +710,118 @@ msgstr "" " diffère de\n" " " -#: gitk:9064 msgid "" "Diff of commits:\n" "\n" -msgstr "Diff des commits :\n\n" +msgstr "" +"Diff des commits :\n" +"\n" -#: gitk:9076 gitk:9085 #, tcl-format msgid " has %s children - stopping\n" msgstr " a %s enfants - arrêt en cours\n" -#: gitk:9104 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Erreur à l'écriture du commit dans le fichier : %s" -#: gitk:9110 #, tcl-format msgid "Error diffing commits: %s" msgstr "Erreur à la différence des commits : %s" -#: gitk:9156 msgid "Top" msgstr "Haut" -#: gitk:9157 msgid "From" msgstr "De" -#: gitk:9162 msgid "To" msgstr "À" -#: gitk:9186 msgid "Generate patch" msgstr "Générer le patch" -#: gitk:9188 msgid "From:" msgstr "De :" -#: gitk:9197 msgid "To:" msgstr "À :" -#: gitk:9206 msgid "Reverse" msgstr "Inverser" -#: gitk:9208 gitk:9418 msgid "Output file:" msgstr "Fichier de sortie :" -#: gitk:9214 msgid "Generate" msgstr "Générer" -#: gitk:9252 msgid "Error creating patch:" msgstr "Erreur à la création du patch :" -#: gitk:9275 gitk:9406 gitk:9463 msgid "ID:" msgstr "ID :" -#: gitk:9284 msgid "Tag name:" msgstr "Nom de l'étiquette :" -#: gitk:9287 msgid "Tag message is optional" msgstr "Le message d'étiquette est optionnel" -#: gitk:9289 msgid "Tag message:" msgstr "Message d'étiquette :" -#: gitk:9293 gitk:9472 msgid "Create" msgstr "Créer" -#: gitk:9311 msgid "No tag name specified" msgstr "Aucun nom d'étiquette spécifié" -#: gitk:9315 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "L'étiquette \"%s\" existe déjà" -#: gitk:9325 msgid "Error creating tag:" msgstr "Erreur à la création de l'étiquette :" -#: gitk:9415 msgid "Command:" msgstr "Commande :" -#: gitk:9423 msgid "Write" msgstr "Écrire" -#: gitk:9441 msgid "Error writing commit:" msgstr "Erreur à l'ecriture du commit :" -#: gitk:9468 msgid "Name:" msgstr "Nom :" -#: gitk:9491 msgid "Please specify a name for the new branch" msgstr "Veuillez spécifier un nom pour la nouvelle branche" -#: gitk:9496 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "La branche '%s' existe déjà. Écraser?" -#: gitk:9563 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "Le Commit %s est déjà inclus dans la branche %s -- le ré-appliquer malgré " "tout?" -#: gitk:9568 msgid "Cherry-picking" msgstr "Picorer (Cherry-picking)" -#: gitk:9577 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" "Please commit, reset or stash your changes and try again." msgstr "" -"Le picorage (cherry-pick) a échouée à cause de modifications locales du fichier '%s'.\n" -"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de nouveau." +"Le picorage (cherry-pick) a échouée à cause de modifications locales du " +"fichier '%s'.\n" +"Veuillez commiter, réinitialiser ou stasher vos changements et essayer de " +"nouveau." -#: gitk:9583 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1066,27 +829,26 @@ msgstr "" "Le picorage (cherry-pick) a échouée à cause d'un conflit lors d'une fusion.\n" "Souhaitez-vous exécuter git citool pour le résoudre ?" -#: gitk:9599 gitk:9657 msgid "No changes committed" msgstr "Aucune modification validée" -#: gitk:9626 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" -msgstr "Le Commit %s n'est pas inclus dans la branche %s -- le défaire malgré tout?" +msgstr "" +"Le Commit %s n'est pas inclus dans la branche %s -- le défaire malgré tout?" -#: gitk:9631 msgid "Reverting" msgstr "Commit défait" -#: gitk:9639 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " "commit, reset or stash your changes and try again." -msgstr "Échec en tentant de défaire le commit à cause de modifications locales des fichiers : %s. Veuillez valider, réinitialiser ou remiser vos modifications et essayer de nouveau." +msgstr "" +"Échec en tentant de défaire le commit à cause de modifications locales des " +"fichiers : %s. Veuillez valider, réinitialiser ou remiser vos modifications " +"et essayer de nouveau." -#: gitk:9643 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1094,30 +856,24 @@ msgstr "" "Échec en tentant de défaire à cause d'un conflit de fusion.\n" "Souhaitez-vous exécuter git citool pour le résoudre ?" -#: gitk:9686 msgid "Confirm reset" msgstr "Confirmer la réinitialisation" -#: gitk:9688 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Réinitialiser la branche %s à %s?" -#: gitk:9690 msgid "Reset type:" msgstr "Type de réinitialisation :" -#: gitk:9693 msgid "Soft: Leave working tree and index untouched" msgstr "Douce : Laisse le répertoire de travail et l'index intacts" -#: gitk:9696 msgid "Mixed: Leave working tree untouched, reset index" msgstr "" "Hybride : Laisse le répertoire de travail dans son état courant, " "réinitialise l'index" -#: gitk:9699 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1125,20 +881,16 @@ msgstr "" "Dure : Réinitialise le répertoire de travail et l'index\n" "(abandonne TOUTES les modifications locale)" -#: gitk:9716 msgid "Resetting" msgstr "Réinitialisation" # Fixme: Récupération est-il vraiment une mauvaise traduction? -#: gitk:9776 msgid "Checking out" msgstr "Extraction" -#: gitk:9829 msgid "Cannot delete the currently checked-out branch" msgstr "Impossible de supprimer la branche extraite" -#: gitk:9835 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1147,16 +899,13 @@ msgstr "" "Les commits de la branche %s ne sont dans aucune autre branche.\n" "Voulez-vous vraiment supprimer cette branche %s ?" -#: gitk:9866 #, tcl-format msgid "Tags and heads: %s" msgstr "Étiquettes et heads : %s" -#: gitk:9883 msgid "Filter" msgstr "Filtrer" -#: gitk:10179 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1165,202 +914,153 @@ msgstr "" "informations sur les branches et les tags précédents/suivants seront " "incomplètes." -#: gitk:11156 msgid "Tag" msgstr "Étiquette" -#: gitk:11160 msgid "Id" msgstr "Id" -#: gitk:11243 msgid "Gitk font chooser" msgstr "Sélecteur de police de Gitk" -#: gitk:11260 msgid "B" msgstr "B" -#: gitk:11263 msgid "I" msgstr "I" -#: gitk:11381 msgid "Commit list display options" msgstr "Options d'affichage de la liste des commits" -#: gitk:11384 msgid "Maximum graph width (lines)" msgstr "Longueur maximum du graphe (lignes)" # FIXME : Traduction standard de "pane"? -#: gitk:11388 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Largeur maximum du graphe (% du panneau)" -#: gitk:11391 msgid "Show local changes" msgstr "Montrer les modifications locales" -#: gitk:11394 msgid "Auto-select SHA1 (length)" msgstr "Sélection auto. du SHA1 (longueur)" -#: gitk:11398 msgid "Hide remote refs" msgstr "Cacher les refs distantes" -#: gitk:11402 msgid "Diff display options" msgstr "Options d'affichage des diff" -#: gitk:11404 msgid "Tab spacing" msgstr "Taille des tabulations" -#: gitk:11407 msgid "Display nearby tags/heads" msgstr "Afficher les tags les plus proches" -#: gitk:11410 msgid "Maximum # tags/heads to show" msgstr "Nombre maximum d'étiquettes/heads à afficher" -#: gitk:11413 msgid "Limit diffs to listed paths" msgstr "Limiter les différences aux chemins listés" -#: gitk:11416 msgid "Support per-file encodings" msgstr "Support pour un encodage des caractères par fichier" -#: gitk:11422 gitk:11569 msgid "External diff tool" msgstr "Outil diff externe" -#: gitk:11423 msgid "Choose..." msgstr "Choisir..." -#: gitk:11428 msgid "General options" msgstr "Options générales" -#: gitk:11431 msgid "Use themed widgets" msgstr "Utiliser des widgets en thème" -#: gitk:11433 msgid "(change requires restart)" msgstr "(la modification nécessite un redémarrage)" -#: gitk:11435 msgid "(currently unavailable)" msgstr "(non disponible actuellement)" -#: gitk:11446 msgid "Colors: press to choose" msgstr "Couleurs : cliquer pour choisir" -#: gitk:11449 msgid "Interface" msgstr "Interface" -#: gitk:11450 msgid "interface" msgstr "interface" -#: gitk:11453 msgid "Background" msgstr "Arrière-plan" -#: gitk:11454 gitk:11484 msgid "background" msgstr "arrière-plan" -#: gitk:11457 msgid "Foreground" msgstr "Premier plan" -#: gitk:11458 msgid "foreground" msgstr "premier plan" -#: gitk:11461 msgid "Diff: old lines" msgstr "Diff : anciennes lignes" -#: gitk:11462 msgid "diff old lines" msgstr "diff anciennes lignes" -#: gitk:11466 msgid "Diff: new lines" msgstr "Diff : nouvelles lignes" -#: gitk:11467 msgid "diff new lines" msgstr "diff nouvelles lignes" -#: gitk:11471 msgid "Diff: hunk header" msgstr "Diff : entête du hunk" -#: gitk:11473 msgid "diff hunk header" msgstr "diff : entête du hunk" -#: gitk:11477 msgid "Marked line bg" msgstr "Fond de la ligne marquée" -#: gitk:11479 msgid "marked line background" msgstr "Fond de la ligne marquée" -#: gitk:11483 msgid "Select bg" msgstr "Sélectionner le fond" -#: gitk:11492 msgid "Fonts: press to choose" msgstr "Polices : cliquer pour choisir" -#: gitk:11494 msgid "Main font" msgstr "Police principale" -#: gitk:11495 msgid "Diff display font" msgstr "Police d'affichage des diff" -#: gitk:11496 msgid "User interface font" msgstr "Police de l'interface utilisateur" -#: gitk:11518 msgid "Gitk preferences" msgstr "Préférences de Gitk" -#: gitk:11527 msgid "General" msgstr "Général" -#: gitk:11528 msgid "Colors" msgstr "Couleurs" -#: gitk:11529 msgid "Fonts" msgstr "Polices" -#: gitk:11579 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk : choisir la couleur de %s" -#: gitk:12092 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -1368,16 +1068,13 @@ msgstr "" "Désolé, gitk ne peut être exécuté avec cette version de Tcl/Tk.\n" " Gitk requiert Tcl/Tk version 8.4 ou supérieur." -#: gitk:12302 msgid "Cannot find a git repository here." msgstr "Impossible de trouver un dépôt git ici." -#: gitk:12349 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Argument '%s' ambigu : à la fois une révision et un nom de fichier" -#: gitk:12361 msgid "Bad arguments to gitk:" msgstr "Arguments invalides pour gitk :" diff --git a/po/hu.po b/po/hu.po index 79ec5a565674b0..2170b45b57e15b 100644 --- a/po/hu.po +++ b/po/hu.po @@ -17,32 +17,25 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Nem sikerült letölteni az unmerged fájl listát:" -#: gitk:212 gitk:2381 msgid "Color words" msgstr "" -#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "" -#: gitk:324 msgid "Error parsing revisions:" msgstr "Hiba történt értelmezés közben:" -#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Hiba történt a végrehajtáskor --argscmd parancs:" -#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Nincsen fájl kiválasztva: --merge megadve, de egyetlen fájl sem unmerged." -#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -50,317 +43,237 @@ msgstr "" "Nincsen fájl kiválasztva: --merge megadva, de nincsenek unmerged fájlok a " "fájlon belül limit." -#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Hiba történt a git log végrehajtása közben:" -#: gitk:436 gitk:582 msgid "Reading" msgstr "Olvasás" -#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Commitok olvasása ..." -#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Nincsen commit kiválasztva" -#: gitk:1445 gitk:4045 gitk:12432 msgid "Command line" msgstr "Parancs sor" -#: gitk:1511 msgid "Can't parse git log output:" msgstr "Nem lehet értelmezni a git log kimenetét:" -#: gitk:1740 msgid "No commit information available" msgstr "Nincsen elérhető commit információ" -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "OK" -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 -#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Visszavonás" -#: gitk:2069 msgid "&Update" msgstr "Frissités" -#: gitk:2070 msgid "&Reload" msgstr "Újratöltés" -#: gitk:2071 msgid "Reread re&ferences" msgstr "Referenciák újraolvasása" -#: gitk:2072 msgid "&List references" msgstr "Referenciák listázása" -#: gitk:2074 msgid "Start git &gui" msgstr "Git gui indítása" -#: gitk:2076 msgid "&Quit" msgstr "Kilépés" -#: gitk:2068 msgid "&File" msgstr "Fájl" -#: gitk:2080 msgid "&Preferences" msgstr "Beállítások" -#: gitk:2079 msgid "&Edit" msgstr "Szerkesztés" -#: gitk:2084 msgid "&New view..." msgstr "Új nézet ..." -#: gitk:2085 msgid "&Edit view..." msgstr "Nézet szerkesztése ..." -#: gitk:2086 msgid "&Delete view" msgstr "Nézet törlése" -#: gitk:2088 gitk:4043 msgid "&All files" msgstr "Minden fájl" -#: gitk:2083 gitk:4067 msgid "&View" msgstr "Nézet" -#: gitk:2093 gitk:2103 gitk:3012 msgid "&About gitk" msgstr "Gitk névjegy" -#: gitk:2094 gitk:2108 msgid "&Key bindings" msgstr "Billentyűkombináció" -#: gitk:2092 gitk:2107 msgid "&Help" msgstr "Segítség" -#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2229 msgid "Row" msgstr "Sor" -#: gitk:2267 msgid "Find" msgstr "Keresés" -#: gitk:2295 msgid "commit" msgstr "commit" -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 -#: gitk:6912 msgid "containing:" msgstr "tartalmazás:" -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "érintendő útvonalak:" -#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "string hozzáadása/törlése:" -#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "" -#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Pontos" -#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Kis/nagy betű nem számít" -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Regexp" -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Minden mező" -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Főcím" -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Megjegyzések" -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 -#: gitk:8845 msgid "Author" msgstr "Szerző" -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Commitoló" -#: gitk:2350 msgid "Search" msgstr "Keresés" -#: gitk:2358 msgid "Diff" msgstr "Diff" -#: gitk:2360 msgid "Old version" msgstr "Régi verzió" -#: gitk:2362 msgid "New version" msgstr "Új verzió" -#: gitk:2364 msgid "Lines of context" msgstr "Tartalmi sorok" -#: gitk:2374 msgid "Ignore space change" msgstr "Space váltás mellőzése" -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "" -#: gitk:2445 msgid "Patch" msgstr "Patch" -#: gitk:2447 msgid "Tree" msgstr "Tree" -#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Diff ezeket -> kiválasztott" -#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Diff kiválasztottakat -> ezt" -#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Patch készítése" -#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Tag készítése" -#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Commit fáljba írása" -#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Új branch készítése" -#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Cherry-pick erre a commitra" -#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "HEAD branch újraindítása ide" -#: gitk:2625 msgid "Mark this commit" msgstr "Ezen commit megjelölése" -#: gitk:2626 msgid "Return to mark" msgstr "Visszatérés a megjelöléshez" -#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Találd meg ezen utódokat és jelöld meg" -#: gitk:2628 msgid "Compare with marked commit" msgstr "Összehasonlítás a megjelölt commit-tal" -#: gitk:2629 gitk:2640 #, fuzzy msgid "Diff this -> marked commit" msgstr "Diff ezeket -> kiválasztott" -#: gitk:2630 gitk:2641 #, fuzzy msgid "Diff marked commit -> this" msgstr "Diff kiválasztottakat -> ezt" -#: gitk:2631 #, fuzzy msgid "Revert this commit" msgstr "Ezen commit megjelölése" -#: gitk:2647 msgid "Check out this branch" msgstr "Check out ezt a branchot" -#: gitk:2648 msgid "Remove this branch" msgstr "Töröld ezt a branch-ot" -#: gitk:2649 msgid "Copy branch name" msgstr "" -#: gitk:2656 msgid "Highlight this too" msgstr "Emeld ki ezt is" -#: gitk:2657 msgid "Highlight this only" msgstr "Csak ezt emeld ki" -#: gitk:2658 msgid "External diff" msgstr "Külső diff" -#: gitk:2659 msgid "Blame parent commit" msgstr "Blame szülő kommitra" -#: gitk:2660 msgid "Copy path" msgstr "" -#: gitk:2667 msgid "Show origin of this line" msgstr "Mutasd meg ennek a sornak az eredetét" -#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Futtasd a git gui blame-t ezen a soron" -#: gitk:3014 #, fuzzy msgid "" "\n" @@ -377,321 +290,249 @@ msgstr "" "\n" "Használd és terjeszd a GNU General Public License feltételei mellett" -#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Bezárás" -#: gitk:3043 msgid "Gitk key bindings" msgstr "Gitk-billentyű hozzárendelés" -#: gitk:3046 msgid "Gitk key bindings:" msgstr "Gitk-billentyű hozzaárendelés:" -#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tKilépés" -#: gitk:3049 #, fuzzy, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-F>\t\tKeresés" -#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tElső commithoz" -#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tUtolsó commithoz" -#: gitk:3052 #, fuzzy msgid ", p, k\tMove up one commit" msgstr ", p, i\tEgy committal feljebb" -#: gitk:3053 #, fuzzy msgid ", n, j\tMove down one commit" msgstr ", n, k\tEgy committal lejjebb" -#: gitk:3054 #, fuzzy msgid ", z, h\tGo back in history list" msgstr ", z, j\tVissza a history listába" -#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tElőre a history listába" -#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" -#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tEgy lappal feljebb a commit listába" -#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tEgy lappal lejjebb a commit listába" -#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Pos1>\tGörgetés a commit lista tetejéhez" -#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-Ende>\tGörgetés a commit lista aljához" -#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Hoch>\tEgy sorral feljebb görgetés a commit listában" -#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Runter>\tEgy sorral lejjebb görgetés a commit listában" -#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-BildHoch>\tEgy lappal feljebb görgetés a commit listában" -#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-BildRunter>\tEgy sorral lejjebb görgetés a commit listában" -#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tKeresés visszafele (felfele, utolsó commitok)" -#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tKeresés előre (lefelé; korábbi commitok)" -#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\t\tEgy lappal feljebb görgetés a diff nézetben" -#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tEgy lappal feljebb görgetés a diff nézetben" -#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\tEgy lappal lejjebb görgetés a diff nézetben" -#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\t18 sorral felfelé görgetés diff nézetben" -#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\t18 sorral lejjebb görgetés a diff nézetben" -#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tKeresés" -#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tKövetkező találathoz" -#: gitk:3074 msgid "\tMove to next find hit" msgstr "\tKövetkező találathoz" -#: gitk:3075 #, fuzzy msgid "g\t\tGo to commit" msgstr "\t\tUtolsó commithoz" -#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tLépj a keresési mezőre" -#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tElőző találathoz" -#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tKövetkező fájlra görgetés diff nézetben" -#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tKövetkező találatra keresés diff nézetben" -#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tElőző találatra keresés diff nézetben" -#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Nummerblock-Plus>\tBetűméret növelése" -#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-Plus>\tBetűméret növelése" -#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Nummernblock-Minus> Betűméret csökkentése" -#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-Minus>\tBetűméret csökkentése" -#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tFrissítés" -#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Hiba történt az ideiglenes könyvtár létrehozása közben %s:" -#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Hiba történt \"%s\" letöltése közben %s-ről:" -#: gitk:3635 msgid "command failed:" msgstr "parancs hiba:" -#: gitk:3784 msgid "No such commit" msgstr "Nincs ilyen commit" -#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: parancs hiba:" -#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Nem sikerült a Merge head olvasása: %s" -#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Hiba történt az index olvasása közben: %s" -#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Nem sikerült a git blame indítása: %s" -#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Keresés" -#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Hiba történt a git blame futtatása közben: %s" -#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "" "A %s commitból származik az a sor, amelyik nem található ebben a nézetben" -#: gitk:3939 msgid "External diff viewer failed:" msgstr "Külső diff nézegető hiba:" -#: gitk:4070 msgid "Gitk view definition" msgstr "Gitk nézet meghatározása" -#: gitk:4074 msgid "Remember this view" msgstr "Maradj ennél a nézetnél" -#: gitk:4075 msgid "References (space separated list):" msgstr "Referenciák (szóközzel tagolt lista" -#: gitk:4076 msgid "Branches & tags:" msgstr "Branch-ek & tagek:" -#: gitk:4077 msgid "All refs" msgstr "Minden ref" -#: gitk:4078 msgid "All (local) branches" msgstr "Minden (helyi) branch" -#: gitk:4079 msgid "All tags" msgstr "Minden tag" -#: gitk:4080 msgid "All remote-tracking branches" msgstr "Minden távoli követő branch" -#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Commit Infó (reguláris kifejezés):" -#: gitk:4082 msgid "Author:" msgstr "Szerző:" -#: gitk:4083 msgid "Committer:" msgstr "Commitoló:" -#: gitk:4084 msgid "Commit Message:" msgstr "Commit üzenet:" -#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Egyezik minen Commit Infó feltétellel" -#: gitk:4086 #, fuzzy msgid "Matches no Commit Info criteria" msgstr "Egyezik minen Commit Infó feltétellel" -#: gitk:4087 msgid "Changes to Files:" msgstr "Fájl változások:" -#: gitk:4088 msgid "Fixed String" msgstr "Fix String" -#: gitk:4089 msgid "Regular Expression" msgstr "Reguláris kifejezés" -#: gitk:4090 msgid "Search string:" msgstr "Keresés szöveg:" -#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -699,203 +540,155 @@ msgstr "" "Commit Dátumok (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:4092 msgid "Since:" msgstr "Ettől:" -#: gitk:4093 msgid "Until:" msgstr "Eddig:" -#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limitálva és/vagy kihagyva egy adott számú revíziót (pozitív egész):" -#: gitk:4095 msgid "Number to show:" msgstr "Mutatandó szám:" -#: gitk:4096 msgid "Number to skip:" msgstr "Kihagyandó szám:" -#: gitk:4097 msgid "Miscellaneous options:" msgstr "Különféle opciók:" -#: gitk:4098 msgid "Strictly sort by date" msgstr "Szigorú rendezás dátum alapján" -#: gitk:4099 msgid "Mark branch sides" msgstr "Jelölje meg az ágakat" -#: gitk:4100 msgid "Limit to first parent" msgstr "Korlátozás az első szülőre" -#: gitk:4101 msgid "Simple history" msgstr "Egyszerű history" -#: gitk:4102 msgid "Additional arguments to git log:" msgstr "További argumentok a git log-hoz:" -#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Fájlok és könyvtárak bejegyzése amiket tartalmaz, soronként:" -#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Parancs több tartalmazó commit generálására:" -#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: szerkesztés nézet" -#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- kritériumok a revíziók kiválasztásához" -#: gitk:4241 msgid "View Name" msgstr "Nézet neve" -#: gitk:4316 msgid "Apply (F5)" msgstr "Alkalmaz (F5)" -#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Hiba történt a commit argumentumok kiválasztása közben:" -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Keine" -#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Leszármazott" -#: gitk:5022 msgid "Not descendant" msgstr "Nem leszármazott" -#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Előd" -#: gitk:5030 msgid "Not ancestor" msgstr "Nem előd" -#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "" "Lokális változtatások, melyek be vannak téve az indexbe, de még nincsenek " "commitolva" -#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokális nem commitolt változások, nincsenek betéve az indexbe" -#: gitk:7134 msgid "and many more" msgstr "" -#: gitk:7137 msgid "many" msgstr "sok" -#: gitk:7328 msgid "Tags:" msgstr "Tagek:" -#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Eltern" -#: gitk:7356 msgid "Child" msgstr "Gyerek" -#: gitk:7365 msgid "Branch" msgstr "Ág" -#: gitk:7368 msgid "Follows" msgstr "Következők" -#: gitk:7371 msgid "Precedes" msgstr "Megelőzők" -#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Hiba történt a diff-ek letöltése közben: %s" -#: gitk:8650 msgid "Goto:" msgstr "Menj:" -#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Rövid SHA1 id %s félreérthető" -#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "A(z) %s revízió nem ismert" -#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 id %s nem ismert" -#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "A(z) %s revízió nincs a jelenlegi nézetben" -#: gitk:8832 gitk:8847 msgid "Date" msgstr "Dátum" -#: gitk:8835 msgid "Children" msgstr "Gyerekek" -#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Állítsd vissza a %s branch-ot ide" -#: gitk:8900 msgid "Detached head: can't reset" msgstr "Elkülönített head: nem lehet visszaállítani" -#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Merge commit kihagyása " -#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Hiba történt a patch ID megszerzése közben a következőnél " -#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - abbahagyás\n" -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Commit " -#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -903,7 +696,6 @@ msgstr "" " Ugyanaz a patch mint\n" " " -#: gitk:9043 msgid "" " differs from\n" " " @@ -911,7 +703,6 @@ msgstr "" " különbözik innentől\n" " " -#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -919,132 +710,102 @@ msgstr "" "A commitok diffje:\n" "\n" -#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " %s gyereke van. abbahagyás\n" -#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Hiba történt a commit fájlba írása közben: %s" -#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Hiba történt a commitok diffelése közben: %s" -#: gitk:9137 msgid "Top" msgstr "Teteje" -#: gitk:9138 msgid "From" msgstr "Innen" -#: gitk:9143 msgid "To" msgstr "Ide" -#: gitk:9167 msgid "Generate patch" msgstr "Patch generálása" -#: gitk:9169 msgid "From:" msgstr "Innen:" -#: gitk:9178 msgid "To:" msgstr "Ide:" -#: gitk:9187 msgid "Reverse" msgstr "Visszafele" -#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Kimeneti fájl:" -#: gitk:9195 msgid "Generate" msgstr "Generálás" -#: gitk:9233 msgid "Error creating patch:" msgstr "Hiba törtét a patch készítése közben:" -#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9265 msgid "Tag name:" msgstr "Tag név:" -#: gitk:9268 msgid "Tag message is optional" msgstr "" -#: gitk:9270 #, fuzzy msgid "Tag message:" msgstr "Tag név:" -#: gitk:9274 gitk:9439 msgid "Create" msgstr "Létrehozás" -#: gitk:9292 msgid "No tag name specified" msgstr "A tag neve nincsen megadva" -#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "%s Tag már létezik" -#: gitk:9306 msgid "Error creating tag:" msgstr "Hiba történt a tag létrehozása közben:" -#: gitk:9382 msgid "Command:" msgstr "Parancs:" -#: gitk:9390 msgid "Write" msgstr "Írás" -#: gitk:9408 msgid "Error writing commit:" msgstr "Hiba történt a commit írása közben:" -#: gitk:9435 msgid "Name:" msgstr "Név:" -#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Kérem adja meg a nevét az új branchhoz" -#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "%s branch már létezik. Felülírja?" -#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?" "eintragen?" -#: gitk:9535 msgid "Cherry-picking" msgstr "Cherry-picking" -#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1054,7 +815,6 @@ msgstr "" "Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja " "újra." -#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1062,23 +822,19 @@ msgstr "" "Cherry-pick hiba történt merge konfliktus miatt.\n" "Kívánja futtatni a git citool-t a probléma megoldásához?" -#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Nincsen változás commitolva" -#: gitk:9593 #, fuzzy, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "" "%s commit már benne van a %s branchban -- biztos hogy újra csinálja ?" "eintragen?" -#: gitk:9598 #, fuzzy msgid "Reverting" msgstr "Újraindítás" -#: gitk:9606 #, fuzzy, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1088,7 +844,6 @@ msgstr "" "Kérem commitolja, indítsa újra vagy rejtse el a változtatásait és próbálja " "újra." -#: gitk:9610 #, fuzzy msgid "" "Revert failed because of merge conflict.\n" @@ -1097,28 +852,22 @@ msgstr "" "Cherry-pick hiba történt merge konfliktus miatt.\n" "Kívánja futtatni a git citool-t a probléma megoldásához?" -#: gitk:9653 msgid "Confirm reset" msgstr "Újraindítás megerősítése" -#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Újraindítja a %s branchot %s-ig?" -#: gitk:9657 msgid "Reset type:" msgstr "Újraindítás típusa:" -#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Hagyd a working tree-t és az indexet érintetlenül" -#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Kevert: Hagyd a working tree-t érintetlenül, töröld az indexet" -#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1126,19 +875,15 @@ msgstr "" "Hard: Indítsd újra a working tree-t és az indexet\n" "(MINDEN lokális változás eldobása)" -#: gitk:9683 msgid "Resetting" msgstr "Újraindítás" -#: gitk:9743 msgid "Checking out" msgstr "Kivesz" -#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Nem lehet a jelenleg kivett branch-ot törölni" -#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1147,16 +892,13 @@ msgstr "" "A %s branchon található commit nem található meg semelyik másik branchon.\n" "Tényleg törli a %s branchot?" -#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Tagek és headek: %s" -#: gitk:9850 msgid "Filter" msgstr "Szűrő" -#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1164,204 +906,155 @@ msgstr "" "Hiba történt a commit topológiai információ olvasása közben; branch ésa " "megelőző/következő információ nem lesz teljes." -#: gitk:11123 msgid "Tag" msgstr "Tag" -#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11210 msgid "Gitk font chooser" msgstr "Gitk-betű kiválasztó" -#: gitk:11227 msgid "B" msgstr "F" -#: gitk:11230 msgid "I" msgstr "K" -#: gitk:11348 msgid "Commit list display options" msgstr "Commit lista kijelzési opciók" -#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Maximális grafikon szélesség (sorok)" -#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximális grafikon szélesség (táble %-je)" -#: gitk:11358 msgid "Show local changes" msgstr "Mutasd a lokális változtatásokat" -#: gitk:11361 #, fuzzy msgid "Auto-select SHA1 (length)" msgstr "SHA1 Automatikus kiválasztása" -#: gitk:11365 msgid "Hide remote refs" msgstr "A távoli refek elrejtése" -#: gitk:11369 msgid "Diff display options" msgstr "Diff kijelző opciók" -#: gitk:11371 msgid "Tab spacing" msgstr "Tab sorköz" -#: gitk:11374 #, fuzzy msgid "Display nearby tags/heads" msgstr "Szomszédos tagek kijelzése" -#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "" -#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Korlátozott diffek a kilistázott útvonalakhoz" -#: gitk:11383 msgid "Support per-file encodings" msgstr "Fájlonkénti kódolás támgatása" -#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Külső diff alkalmazás" -#: gitk:11390 msgid "Choose..." msgstr "Válaszd ..." -#: gitk:11395 msgid "General options" msgstr "Általános opciók" -#: gitk:11398 msgid "Use themed widgets" msgstr "Témázott vezérlők használata" -#: gitk:11400 msgid "(change requires restart)" msgstr "(a változás újraindítást igényel)" -#: gitk:11402 msgid "(currently unavailable)" msgstr "(jelenleg nem elérhető)" -#: gitk:11413 msgid "Colors: press to choose" msgstr "Színek: nyomja meg a kiválasztáshoz" -#: gitk:11416 msgid "Interface" msgstr "Interfész" -#: gitk:11417 msgid "interface" msgstr "interfész" -#: gitk:11420 msgid "Background" msgstr "Háttér" -#: gitk:11421 gitk:11451 msgid "background" msgstr "háttér" -#: gitk:11424 msgid "Foreground" msgstr "Előtér" -#: gitk:11425 msgid "foreground" msgstr "előtér" -#: gitk:11428 msgid "Diff: old lines" msgstr "Diff: régi sorok" -#: gitk:11429 msgid "diff old lines" msgstr "diff régi sorok" -#: gitk:11433 msgid "Diff: new lines" msgstr "Diff: új sorok" -#: gitk:11434 msgid "diff new lines" msgstr "diff - új sorok" -#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff: nagy headerök" -#: gitk:11440 msgid "diff hunk header" msgstr "diff - nagy headerök" -#: gitk:11444 msgid "Marked line bg" msgstr "Megjelölt sor háttér" -#: gitk:11446 msgid "marked line background" msgstr "megjelölt sor háttér" -#: gitk:11450 msgid "Select bg" msgstr "Válasszon hátteret" -#: gitk:11459 msgid "Fonts: press to choose" msgstr "Betű: nyomja meg a kiválasztáshoz" -#: gitk:11461 msgid "Main font" msgstr "Fő betű" -#: gitk:11462 msgid "Diff display font" msgstr "Diff kijelző betű" -#: gitk:11463 msgid "User interface font" msgstr "Felhasználói interfész betű" -#: gitk:11485 msgid "Gitk preferences" msgstr "Gitk beállítások" -#: gitk:11494 #, fuzzy msgid "General" msgstr "Generálás" -#: gitk:11495 msgid "Colors" msgstr "" -#: gitk:11496 msgid "Fonts" msgstr "" -#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: válasszon színt a %s-ra" -#: gitk:12059 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -1369,16 +1062,13 @@ msgstr "" "Sajnáljuk, de a gitk nem futtatható ezzel a Tcl/Tk verzióval.\n" "Gitk futtatásához legalább Tcl/Tk 8.4 szükséges." -#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Nem találhatü git repository itt." -#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Félreérthető argumentum '%s': revízió és fájlnév is" -#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Rossz gitk argumentumok:" diff --git a/po/it.po b/po/it.po index b58d23eb2b9253..fa7f2850d272f7 100644 --- a/po/it.po +++ b/po/it.po @@ -17,33 +17,26 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Impossibile ottenere l'elenco dei file in attesa di fusione:" -#: gitk:212 gitk:2381 msgid "Color words" msgstr "" -#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "" -#: gitk:324 msgid "Error parsing revisions:" msgstr "Errore nella lettura delle revisioni:" -#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Errore nell'esecuzione del comando specificato con --argscmd:" -#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Nessun file selezionato: è stata specificata l'opzione --merge ma non ci " "sono file in attesa di fusione." -#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -51,317 +44,237 @@ msgstr "" "Nessun file selezionato: è stata specificata l'opzione --merge ma i file " "specificati non sono in attesa di fusione." -#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Errore nell'esecuzione di git log:" -#: gitk:436 gitk:582 msgid "Reading" msgstr "Lettura in corso" -#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Lettura delle revisioni in corso..." -#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Nessuna revisione selezionata" -#: gitk:1445 gitk:4045 gitk:12432 msgid "Command line" msgstr "Linea di comando" -#: gitk:1511 msgid "Can't parse git log output:" msgstr "Impossibile elaborare i dati di git log:" -#: gitk:1740 msgid "No commit information available" msgstr "Nessuna informazione disponibile sulle revisioni" -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "OK" -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 -#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Annulla" -#: gitk:2069 msgid "&Update" msgstr "Aggiorna" -#: gitk:2070 msgid "&Reload" msgstr "Ricarica" -#: gitk:2071 msgid "Reread re&ferences" msgstr "Rileggi riferimenti" -#: gitk:2072 msgid "&List references" msgstr "Elenca riferimenti" -#: gitk:2074 msgid "Start git &gui" msgstr "Avvia git gui" -#: gitk:2076 msgid "&Quit" msgstr "Esci" -#: gitk:2068 msgid "&File" msgstr "&File" -#: gitk:2080 msgid "&Preferences" msgstr "Preferenze" -#: gitk:2079 msgid "&Edit" msgstr "Modifica" -#: gitk:2084 msgid "&New view..." msgstr "Nuova vista..." -#: gitk:2085 msgid "&Edit view..." msgstr "Modifica vista..." -#: gitk:2086 msgid "&Delete view" msgstr "Elimina vista" -#: gitk:2088 gitk:4043 msgid "&All files" msgstr "Tutti i file" -#: gitk:2083 gitk:4067 msgid "&View" msgstr "Vista" -#: gitk:2093 gitk:2103 gitk:3012 msgid "&About gitk" msgstr "Informazioni su gitk" -#: gitk:2094 gitk:2108 msgid "&Key bindings" msgstr "Scorciatoie da tastiera" -#: gitk:2092 gitk:2107 msgid "&Help" msgstr "Aiuto" -#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2229 msgid "Row" msgstr "Riga" -#: gitk:2267 msgid "Find" msgstr "Trova" -#: gitk:2295 msgid "commit" msgstr "revisione" -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 -#: gitk:6912 msgid "containing:" msgstr "contenente:" -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "che riguarda i percorsi:" -#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "che aggiunge/rimuove la stringa:" -#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "" -#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Esatto" -#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "" -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "" -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Tutti i campi" -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Titolo" -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Commenti" -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 -#: gitk:8845 msgid "Author" msgstr "Autore" -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Revisione creata da" -#: gitk:2350 msgid "Search" msgstr "Cerca" -#: gitk:2358 msgid "Diff" msgstr "" -#: gitk:2360 msgid "Old version" msgstr "Vecchia versione" -#: gitk:2362 msgid "New version" msgstr "Nuova versione" -#: gitk:2364 msgid "Lines of context" msgstr "Linee di contesto" -#: gitk:2374 msgid "Ignore space change" msgstr "Ignora modifiche agli spazi" -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "" -#: gitk:2445 msgid "Patch" msgstr "Modifiche" -#: gitk:2447 msgid "Tree" msgstr "Directory" -#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Diff questo -> selezionato" -#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Diff selezionato -> questo" -#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Crea patch" -#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Crea etichetta" -#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Scrivi revisione in un file" -#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Crea un nuovo ramo" -#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Porta questa revisione in cima al ramo attuale" -#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Aggiorna il ramo HEAD a questa revisione" -#: gitk:2625 msgid "Mark this commit" msgstr "Segna questa revisione" -#: gitk:2626 msgid "Return to mark" msgstr "Torna alla revisione segnata" -#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Trova il discendente di questa revisione e di quella segnata" -#: gitk:2628 msgid "Compare with marked commit" msgstr "Confronta con la revisione segnata" -#: gitk:2629 gitk:2640 #, fuzzy msgid "Diff this -> marked commit" msgstr "Diff questo -> selezionato" -#: gitk:2630 gitk:2641 #, fuzzy msgid "Diff marked commit -> this" msgstr "Diff selezionato -> questo" -#: gitk:2631 #, fuzzy msgid "Revert this commit" msgstr "Segna questa revisione" -#: gitk:2647 msgid "Check out this branch" msgstr "Attiva questo ramo" -#: gitk:2648 msgid "Remove this branch" msgstr "Elimina questo ramo" -#: gitk:2649 msgid "Copy branch name" msgstr "" -#: gitk:2656 msgid "Highlight this too" msgstr "Evidenzia anche questo" -#: gitk:2657 msgid "Highlight this only" msgstr "Evidenzia solo questo" -#: gitk:2658 msgid "External diff" msgstr "Visualizza differenze in un altro programma" -#: gitk:2659 msgid "Blame parent commit" msgstr "Annota la revisione precedente" -#: gitk:2660 msgid "Copy path" msgstr "" -#: gitk:2667 msgid "Show origin of this line" msgstr "Mostra la provenienza di questa riga" -#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Esegui git gui blame su questa riga" -#: gitk:3014 #, fuzzy msgid "" "\n" @@ -379,321 +292,249 @@ msgstr "" "Utilizzo e redistribuzione permessi sotto i termini della GNU General Public " "License" -#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Chiudi" -#: gitk:3043 msgid "Gitk key bindings" msgstr "Scorciatoie da tastiera di Gitk" -#: gitk:3046 msgid "Gitk key bindings:" msgstr "Scorciatoie da tastiera di Gitk:" -#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tEsci" -#: gitk:3049 #, fuzzy, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-F>\t\tTrova" -#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tVai alla prima revisione" -#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tVai all'ultima revisione" -#: gitk:3052 #, fuzzy msgid ", p, k\tMove up one commit" msgstr ", p, i\tVai più in alto di una revisione" -#: gitk:3053 #, fuzzy msgid ", n, j\tMove down one commit" msgstr ", n, k\tVai più in basso di una revisione" -#: gitk:3054 #, fuzzy msgid ", z, h\tGo back in history list" msgstr ", z, j\tTorna indietro nella cronologia" -#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tVai avanti nella cronologia" -#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" -#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tVai più in alto di una pagina nella lista delle revisioni" -#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "" "\tVai più in basso di una pagina nella lista delle revisioni" -#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tScorri alla cima della lista delle revisioni" -#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tScorri alla fine della lista delle revisioni" -#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Su>\tScorri la lista delle revisioni in alto di una riga" -#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Giù>\tScorri la lista delle revisioni in basso di una riga" -#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PaginaSu>\tScorri la lista delle revisioni in alto di una pagina" -#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PaginaGiù>\tScorri la lista delle revisioni in basso di una pagina" -#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tTrova all'indietro (verso l'alto, revisioni successive)" -#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tTrova in avanti (verso il basso, revisioni precedenti)" -#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tScorri la vista delle differenze in alto di una pagina" -#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tScorri la vista delle differenze in alto di una pagina" -#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\t\tScorri la vista delle differenze in basso di una pagina" -#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tScorri la vista delle differenze in alto di 18 linee" -#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tScorri la vista delle differenze in basso di 18 linee" -#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tTrova" -#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tTrova in avanti" -#: gitk:3074 msgid "\tMove to next find hit" msgstr "\tTrova in avanti" -#: gitk:3075 #, fuzzy msgid "g\t\tGo to commit" msgstr "\t\tVai all'ultima revisione" -#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tCursore nel box di ricerca" -#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tTrova all'indietro" -#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tScorri la vista delle differenze al file successivo" -#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tCerca in avanti nella vista delle differenze" -#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tCerca all'indietro nella vista delle differenze" -#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumenta dimensione carattere" -#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-più>\tAumenta dimensione carattere" -#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDiminuisci dimensione carattere" -#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-meno>\tDiminuisci dimensione carattere" -#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tAggiorna" -#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Errore durante la creazione della directory temporanea %s:" -#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Errore nella lettura di \"%s\" da %s:" -#: gitk:3635 msgid "command failed:" msgstr "impossibile eseguire il comando:" -#: gitk:3784 msgid "No such commit" msgstr "Revisione inesistente" -#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: impossibile eseguire il comando:" -#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Impossibile leggere merge head: %s" -#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Errore nella lettura dell'indice: %s" -#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Impossibile eseguire git blame: %s" -#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Ricerca in corso" -#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Errore nell'esecuzione di git blame: %s" -#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Quella riga proviene dalla revisione %s, non presente in questa vista" -#: gitk:3939 msgid "External diff viewer failed:" msgstr "Impossibile eseguire il visualizzatore di differenze:" -#: gitk:4070 msgid "Gitk view definition" msgstr "Scelta vista Gitk" -#: gitk:4074 msgid "Remember this view" msgstr "Ricorda questa vista" -#: gitk:4075 msgid "References (space separated list):" msgstr "Riferimenti (lista di elementi separati da spazi)" -#: gitk:4076 msgid "Branches & tags:" msgstr "Rami ed etichette" -#: gitk:4077 msgid "All refs" msgstr "Tutti i riferimenti" -#: gitk:4078 msgid "All (local) branches" msgstr "Tutti i rami (locali)" -#: gitk:4079 msgid "All tags" msgstr "Tutte le etichette" -#: gitk:4080 msgid "All remote-tracking branches" msgstr "Tutti i rami remoti" -#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Informazioni sulla revisione (espressioni regolari):" -#: gitk:4082 msgid "Author:" msgstr "Autore:" -#: gitk:4083 msgid "Committer:" msgstr "Revisione creata da:" -#: gitk:4084 msgid "Commit Message:" msgstr "Messaggio di revisione:" -#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Risponde a tutti i criteri di ricerca sulle revisioni" -#: gitk:4086 #, fuzzy msgid "Matches no Commit Info criteria" msgstr "Risponde a tutti i criteri di ricerca sulle revisioni" -#: gitk:4087 msgid "Changes to Files:" msgstr "Modifiche ai file:" -#: gitk:4088 msgid "Fixed String" msgstr "Stringa fissa" -#: gitk:4089 msgid "Regular Expression" msgstr "Espressione regolare" -#: gitk:4090 msgid "Search string:" msgstr "Cerca stringa:" -#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -701,201 +542,153 @@ msgstr "" "Date di revisione (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, " "2009 15:27:38\"):" -#: gitk:4092 msgid "Since:" msgstr "Da:" -#: gitk:4093 msgid "Until:" msgstr "A:" -#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limita e/o salta N revisioni (intero positivo):" -#: gitk:4095 msgid "Number to show:" msgstr "Numero di revisioni da mostrare:" -#: gitk:4096 msgid "Number to skip:" msgstr "Numero di revisioni da saltare:" -#: gitk:4097 msgid "Miscellaneous options:" msgstr "Altre opzioni:" -#: gitk:4098 msgid "Strictly sort by date" msgstr "Ordina solo per data" -#: gitk:4099 msgid "Mark branch sides" msgstr "Segna i lati del ramo" -#: gitk:4100 msgid "Limit to first parent" msgstr "Limita al primo genitore" -#: gitk:4101 msgid "Simple history" msgstr "Cronologia semplificata" -#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Ulteriori argomenti da passare a git log:" -#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Inserire file e directory da includere, uno per riga:" -#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Comando che genera altre revisioni da visualizzare:" -#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: modifica vista" -#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- criteri per la scelta delle revisioni" -#: gitk:4241 msgid "View Name" msgstr "Nome vista" -#: gitk:4316 msgid "Apply (F5)" msgstr "Applica (F5)" -#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Errore negli argomenti di selezione delle revisioni:" -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Nessuno" -#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Discendente" -#: gitk:5022 msgid "Not descendant" msgstr "Non discendente" -#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Ascendente" -#: gitk:5030 msgid "Not ancestor" msgstr "Non ascendente" -#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Modifiche locali presenti nell'indice ma non nell'archivio" -#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Modifiche locali non presenti né nell'archivio né nell'indice" -#: gitk:7134 msgid "and many more" msgstr "" -#: gitk:7137 msgid "many" msgstr "molti" -#: gitk:7328 msgid "Tags:" msgstr "Etichette:" -#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Genitore" -#: gitk:7356 msgid "Child" msgstr "Figlio" -#: gitk:7365 msgid "Branch" msgstr "Ramo" -#: gitk:7368 msgid "Follows" msgstr "Segue" -#: gitk:7371 msgid "Precedes" msgstr "Precede" -#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Errore nella lettura delle differenze:" -#: gitk:8650 msgid "Goto:" msgstr "Vai a:" -#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "La SHA1 id abbreviata %s è ambigua" -#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "La revisione %s è sconosciuta" -#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "La SHA1 id %s è sconosciuta" -#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "La revisione %s non è presente nella vista attuale" -#: gitk:8832 gitk:8847 msgid "Date" msgstr "Data" -#: gitk:8835 msgid "Children" msgstr "Figli" -#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Aggiorna il ramo %s a questa revisione" -#: gitk:8900 msgid "Detached head: can't reset" msgstr "Nessun ramo attivo: reset impossibile" -#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Salto la revisione di fusione " -#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Errore nella identificazione della patch per " -#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - fine\n" -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "La revisione " -#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -903,7 +696,6 @@ msgstr "" " ha le stesse differenze di\n" " " -#: gitk:9043 msgid "" " differs from\n" " " @@ -911,7 +703,6 @@ msgstr "" " è diversa da\n" " " -#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -919,129 +710,99 @@ msgstr "" "Differenze tra le revisioni:\n" "\n" -#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " ha %s figli - fine\n" -#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Errore nella scrittura della revisione nel file: %s" -#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Errore nelle differenze tra le revisioni: %s" -#: gitk:9137 msgid "Top" msgstr "Inizio" -#: gitk:9138 msgid "From" msgstr "Da" -#: gitk:9143 msgid "To" msgstr "A" -#: gitk:9167 msgid "Generate patch" msgstr "Genera patch" -#: gitk:9169 msgid "From:" msgstr "Da:" -#: gitk:9178 msgid "To:" msgstr "A:" -#: gitk:9187 msgid "Reverse" msgstr "Inverti" -#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Scrivi sul file:" -#: gitk:9195 msgid "Generate" msgstr "Genera" -#: gitk:9233 msgid "Error creating patch:" msgstr "Errore nella creazione della patch:" -#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9265 msgid "Tag name:" msgstr "Nome etichetta:" -#: gitk:9268 msgid "Tag message is optional" msgstr "Il messaggio dell'etichetta è opzionale" -#: gitk:9270 msgid "Tag message:" msgstr "Messaggio dell'etichetta:" -#: gitk:9274 gitk:9439 msgid "Create" msgstr "Crea" -#: gitk:9292 msgid "No tag name specified" msgstr "Nessuna etichetta specificata" -#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "L'etichetta \"%s\" esiste già" -#: gitk:9306 msgid "Error creating tag:" msgstr "Errore nella creazione dell'etichetta:" -#: gitk:9382 msgid "Command:" msgstr "Comando:" -#: gitk:9390 msgid "Write" msgstr "Scrivi" -#: gitk:9408 msgid "Error writing commit:" msgstr "Errore nella scrittura della revisione:" -#: gitk:9435 msgid "Name:" msgstr "Nome:" -#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Specificare un nome per il nuovo ramo" -#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Il ramo '%s' esiste già. Sovrascrivere?" -#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?" -#: gitk:9535 msgid "Cherry-picking" msgstr "" -#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1052,7 +813,6 @@ msgstr "" "Prima di riprovare, bisogna creare una nuova revisione, annullare le " "modifiche o usare 'git stash'." -#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1060,21 +820,17 @@ msgstr "" "Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n" "Vuoi avviare git citool per risolverlo?" -#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Nessuna modifica archiviata" -#: gitk:9593 #, fuzzy, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "La revisione %s è già inclusa nel ramo %s -- applicarla di nuovo?" -#: gitk:9598 #, fuzzy msgid "Reverting" msgstr "git reset in corso" -#: gitk:9606 #, fuzzy, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1085,7 +841,6 @@ msgstr "" "Prima di riprovare, bisogna creare una nuova revisione, annullare le " "modifiche o usare 'git stash'." -#: gitk:9610 #, fuzzy msgid "" "Revert failed because of merge conflict.\n" @@ -1094,28 +849,22 @@ msgstr "" "Impossibile eseguire cherry-pick a causa di un conflitto nella fusione.\n" "Vuoi avviare git citool per risolverlo?" -#: gitk:9653 msgid "Confirm reset" msgstr "Conferma git reset" -#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Aggiornare il ramo %s a %s?" -#: gitk:9657 msgid "Reset type:" msgstr "Tipo di aggiornamento:" -#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: Lascia la direcory di lavoro e l'indice come sono" -#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: Lascia la directory di lavoro come è, aggiorna l'indice" -#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1123,19 +872,15 @@ msgstr "" "Hard: Aggiorna la directory di lavoro e l'indice\n" "(abbandona TUTTE le modifiche locali)" -#: gitk:9683 msgid "Resetting" msgstr "git reset in corso" -#: gitk:9743 msgid "Checking out" msgstr "Attivazione in corso" -#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Impossibile cancellare il ramo attualmente attivo" -#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1144,16 +889,13 @@ msgstr "" "Le revisioni nel ramo %s non sono presenti su altri rami.\n" "Cancellare il ramo %s?" -#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Etichette e rami: %s" -#: gitk:9850 msgid "Filter" msgstr "Filtro" -#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1161,219 +903,167 @@ msgstr "" "Errore nella lettura della topologia delle revisioni: le informazioni sul " "ramo e le etichette precedenti e seguenti saranno incomplete." -#: gitk:11123 msgid "Tag" msgstr "Etichetta" -#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11210 msgid "Gitk font chooser" msgstr "Scelta caratteri gitk" -#: gitk:11227 msgid "B" msgstr "B" -#: gitk:11230 msgid "I" msgstr "I" -#: gitk:11348 msgid "Commit list display options" msgstr "Opzioni visualizzazione dell'elenco revisioni" -#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Larghezza massima del grafico (in linee)" -#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Larghezza massima del grafico (% del pannello)" -#: gitk:11358 msgid "Show local changes" msgstr "Mostra modifiche locali" -#: gitk:11361 #, fuzzy msgid "Auto-select SHA1 (length)" msgstr "Seleziona automaticamente SHA1 hash" -#: gitk:11365 msgid "Hide remote refs" msgstr "Nascondi i riferimenti remoti" -#: gitk:11369 msgid "Diff display options" msgstr "Opzioni di visualizzazione delle differenze" -#: gitk:11371 msgid "Tab spacing" msgstr "Spaziatura tabulazioni" -#: gitk:11374 #, fuzzy msgid "Display nearby tags/heads" msgstr "Mostra etichette vicine" -#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "" -#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Limita le differenze ai percorsi elencati" -#: gitk:11383 msgid "Support per-file encodings" msgstr "Attiva codifica file per file" -#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Visualizzatore di differenze" -#: gitk:11390 msgid "Choose..." msgstr "Scegli..." -#: gitk:11395 msgid "General options" msgstr "Opzioni generali" -#: gitk:11398 msgid "Use themed widgets" msgstr "Utilizza interfaccia a tema" -#: gitk:11400 msgid "(change requires restart)" msgstr "(una modifica richiede il riavvio)" -#: gitk:11402 msgid "(currently unavailable)" msgstr "(momentaneamente non disponibile)" -#: gitk:11413 msgid "Colors: press to choose" msgstr "Colori: premere per scegliere" -#: gitk:11416 msgid "Interface" msgstr "Interfaccia" -#: gitk:11417 msgid "interface" msgstr "interfaccia" -#: gitk:11420 msgid "Background" msgstr "Sfondo" -#: gitk:11421 gitk:11451 msgid "background" msgstr "sfondo" -#: gitk:11424 msgid "Foreground" msgstr "Primo piano" -#: gitk:11425 msgid "foreground" msgstr "primo piano" -#: gitk:11428 msgid "Diff: old lines" msgstr "Diff: vecchie linee" -#: gitk:11429 msgid "diff old lines" msgstr "vecchie linee" -#: gitk:11433 msgid "Diff: new lines" msgstr "Diff: nuove linee" -#: gitk:11434 msgid "diff new lines" msgstr "nuove linee" -#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff: intestazione della sezione" -#: gitk:11440 msgid "diff hunk header" msgstr "intestazione della sezione" -#: gitk:11444 msgid "Marked line bg" msgstr "Sfondo riga selezionata" -#: gitk:11446 msgid "marked line background" msgstr "sfondo riga selezionata" -#: gitk:11450 msgid "Select bg" msgstr "Sfondo" -#: gitk:11459 msgid "Fonts: press to choose" msgstr "Carattere: premere per scegliere" -#: gitk:11461 msgid "Main font" msgstr "Carattere principale" -#: gitk:11462 msgid "Diff display font" msgstr "Carattere per differenze" -#: gitk:11463 msgid "User interface font" msgstr "Carattere per interfaccia utente" -#: gitk:11485 msgid "Gitk preferences" msgstr "Preferenze gitk" -#: gitk:11494 #, fuzzy msgid "General" msgstr "Genera" -#: gitk:11495 msgid "Colors" msgstr "" -#: gitk:11496 msgid "Fonts" msgstr "" -#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: scegliere un colore per %s" -#: gitk:12059 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." msgstr "" -#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Archivio git non trovato." -#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Argomento ambiguo: '%s' è sia revisione che nome di file" -#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Gitk: argomenti errati:" diff --git a/po/ja.po b/po/ja.po index ca3c29b457bd37..0f6d0b7fd698d3 100644 --- a/po/ja.po +++ b/po/ja.po @@ -20,33 +20,26 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "マージされていないファイルのリストを取得できません:" -#: gitk:212 gitk:2381 msgid "Color words" msgstr "変更を着色" -#: gitk:217 gitk:2381 gitk:8221 gitk:8254 msgid "Markup words" msgstr "変更をマークアップ" -#: gitk:324 msgid "Error parsing revisions:" msgstr "リビジョン解析エラー:" -#: gitk:380 msgid "Error executing --argscmd command:" msgstr "--argscmd コマンド実行エラー:" -#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "ファイル未選択: --merge が指定されましたが、マージされていないファイルはあり" "ません。" -#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -54,322 +47,240 @@ msgstr "" "ファイル未選択: --merge が指定されましたが、ファイル制限内にマージされていな" "いファイルはありません。" -#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "git log 実行エラー:" -#: gitk:436 gitk:582 msgid "Reading" msgstr "読み込み中" -#: gitk:496 gitk:4526 msgid "Reading commits..." msgstr "コミット読み込み中..." -#: gitk:499 gitk:1637 gitk:4529 msgid "No commits selected" msgstr "コミットが選択されていません" -#: gitk:1445 gitk:4046 gitk:12447 msgid "Command line" msgstr "コマンド行" -#: gitk:1511 msgid "Can't parse git log output:" msgstr "git log の出力を解析できません:" -#: gitk:1740 msgid "No commit information available" msgstr "有効なコミットの情報がありません" -#: gitk:1903 gitk:1932 gitk:4316 gitk:9684 gitk:11256 gitk:11536 msgid "OK" msgstr "OK" -#: gitk:1934 gitk:4318 gitk:9197 gitk:9276 gitk:9406 gitk:9455 gitk:9686 -#: gitk:11257 gitk:11537 msgid "Cancel" msgstr "キャンセル" -#: gitk:2069 msgid "&Update" msgstr "更新(&U)" -#: gitk:2070 msgid "&Reload" msgstr "リロード(&R)" -#: gitk:2071 msgid "Reread re&ferences" msgstr "リファレンスを再読み込み(&F)" -#: gitk:2072 msgid "&List references" msgstr "リファレンスリストを表示(&L)" -#: gitk:2074 msgid "Start git &gui" msgstr "git gui の開始(&G)" -#: gitk:2076 msgid "&Quit" msgstr "終了(&Q)" -#: gitk:2068 msgid "&File" msgstr "ファイル(&F)" -#: gitk:2080 msgid "&Preferences" msgstr "設定(&P)" -#: gitk:2079 msgid "&Edit" msgstr "編集(&E)" -#: gitk:2084 msgid "&New view..." msgstr "新規ビュー(&N)..." -#: gitk:2085 msgid "&Edit view..." msgstr "ビュー編集(&E)..." -#: gitk:2086 msgid "&Delete view" msgstr "ビュー削除(&D)" -#: gitk:2088 msgid "&All files" msgstr "全てのファイル(&A)" -#: gitk:2083 msgid "&View" msgstr "ビュー(&V)" -#: gitk:2093 gitk:2103 msgid "&About gitk" msgstr "gitk について(&A)" -#: gitk:2094 gitk:2108 msgid "&Key bindings" msgstr "キーバインディング(&K)" -#: gitk:2092 gitk:2107 msgid "&Help" msgstr "ヘルプ(&H)" -#: gitk:2185 gitk:8653 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2229 msgid "Row" msgstr "行" -#: gitk:2267 msgid "Find" msgstr "検索" -#: gitk:2295 msgid "commit" msgstr "コミット" -#: gitk:2299 gitk:2301 gitk:4688 gitk:4711 gitk:4735 gitk:6756 gitk:6828 -#: gitk:6913 msgid "containing:" msgstr "含む:" -#: gitk:2302 gitk:3527 gitk:3532 gitk:4764 msgid "touching paths:" msgstr "パスの一部:" -#: gitk:2303 gitk:4778 msgid "adding/removing string:" msgstr "追加/除去される文字列:" -#: gitk:2304 gitk:4780 msgid "changing lines matching:" msgstr "変更される文字列" -#: gitk:2313 gitk:2315 gitk:4767 msgid "Exact" msgstr "英字の大小を区別する" -#: gitk:2315 gitk:4855 gitk:6724 msgid "IgnCase" msgstr "英字の大小を区別しない" -#: gitk:2315 gitk:4737 gitk:4853 gitk:6720 msgid "Regexp" msgstr "正規表現" -#: gitk:2317 gitk:2318 gitk:4875 gitk:4905 gitk:4912 gitk:6849 gitk:6917 msgid "All fields" msgstr "全ての項目" -#: gitk:2318 gitk:4872 gitk:4905 gitk:6787 msgid "Headline" msgstr "ヘッドライン" -#: gitk:2319 gitk:4872 gitk:6787 gitk:6917 gitk:7390 msgid "Comments" msgstr "コメント" -#: gitk:2319 gitk:4872 gitk:4877 gitk:4912 gitk:6787 gitk:7325 gitk:8831 -#: gitk:8846 msgid "Author" msgstr "作者" -#: gitk:2319 gitk:4872 gitk:6787 gitk:7327 msgid "Committer" msgstr "コミット者" -#: gitk:2350 msgid "Search" msgstr "検索" -#: gitk:2358 msgid "Diff" msgstr "Diff" -#: gitk:2360 msgid "Old version" msgstr "旧バージョン" -#: gitk:2362 msgid "New version" msgstr "新バージョン" -#: gitk:2364 msgid "Lines of context" msgstr "文脈行数" -#: gitk:2374 msgid "Ignore space change" msgstr "空白の違いを無視" -#: gitk:2378 gitk:2380 gitk:7960 gitk:8207 msgid "Line diff" msgstr "行毎のdiff" -#: gitk:2445 msgid "Patch" msgstr "パッチ" -#: gitk:2447 msgid "Tree" msgstr "ツリー" -#: gitk:2617 gitk:2638 msgid "Diff this -> selected" msgstr "これと選択したコミットのdiffを見る" -#: gitk:2618 gitk:2639 msgid "Diff selected -> this" msgstr "選択したコミットとこれのdiffを見る" -#: gitk:2619 gitk:2640 msgid "Make patch" msgstr "パッチ作成" -#: gitk:2620 gitk:9255 msgid "Create tag" msgstr "タグ生成" -#: gitk:2621 msgid "Copy commit summary" msgstr "コミットの要約をコピーする" -#: gitk:2622 gitk:9386 msgid "Write commit to file" msgstr "コミットをファイルに書き出す" -#: gitk:2623 gitk:9443 msgid "Create new branch" msgstr "新規ブランチ生成" -#: gitk:2624 msgid "Cherry-pick this commit" msgstr "このコミットをチェリーピックする" -#: gitk:2625 msgid "Reset HEAD branch to here" msgstr "ブランチのHEADをここにリセットする" -#: gitk:2626 msgid "Mark this commit" msgstr "このコミットにマークをつける" -#: gitk:2627 msgid "Return to mark" msgstr "マークを付けた所に戻る" -#: gitk:2628 msgid "Find descendant of this and mark" msgstr "これとマークをつけた所との子孫を見つける" -#: gitk:2629 msgid "Compare with marked commit" msgstr "マークを付けたコミットと比較する" -#: gitk:2630 gitk:2641 msgid "Diff this -> marked commit" msgstr "これとマークを付けたコミットのdiffを見る" -#: gitk:2631 gitk:2642 msgid "Diff marked commit -> this" msgstr "マークを付けたコミットとこれのdiffを見る" -#: gitk:2632 msgid "Revert this commit" msgstr "このコミットを撤回する" -#: gitk:2648 msgid "Check out this branch" msgstr "このブランチをチェックアウトする" -#: gitk:2649 msgid "Remove this branch" msgstr "このブランチを除去する" -#: gitk:2650 msgid "Copy branch name" msgstr "ブランチ名をコピーする" -#: gitk:2657 msgid "Highlight this too" msgstr "これもハイライトさせる" -#: gitk:2658 msgid "Highlight this only" msgstr "これだけをハイライトさせる" -#: gitk:2659 msgid "External diff" msgstr "外部diffツール" -#: gitk:2660 msgid "Blame parent commit" msgstr "親コミットから blame をかける" -#: gitk:2661 msgid "Copy path" msgstr "パス名をコピーする" -#: gitk:2668 msgid "Show origin of this line" msgstr "この行の出自を表示する" -#: gitk:2669 msgid "Run git gui blame on this line" msgstr "この行に git gui で blame をかける" -#: gitk:3013 msgid "About gitk" msgstr "gitk について" -#: gitk:3015 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -385,323 +296,251 @@ msgstr "" "\n" "使用および再配布は GNU General Public License に従ってください" -#: gitk:3023 gitk:3090 gitk:9872 msgid "Close" msgstr "閉じる" -#: gitk:3044 msgid "Gitk key bindings" msgstr "Gitk キーバインディング" -#: gitk:3047 msgid "Gitk key bindings:" msgstr "Gitk キーバインディング:" -#: gitk:3049 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\t終了" -#: gitk:3050 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tウィンドウを閉じる" -#: gitk:3051 msgid "\t\tMove to first commit" msgstr "\t\t最初のコミットに移動" -#: gitk:3052 msgid "\t\tMove to last commit" msgstr "\t\t最後のコミットに移動" -#: gitk:3053 msgid ", p, k\tMove up one commit" msgstr ", p, k\t一つ上のコミットに移動" -#: gitk:3054 msgid ", n, j\tMove down one commit" msgstr ", n, j\t一つ下のコミットに移動" -#: gitk:3055 msgid ", z, h\tGo back in history list" msgstr ", z, h\t履歴の前に戻る" -#: gitk:3056 msgid ", x, l\tGo forward in history list" msgstr ", x, l\t履歴の次へ進む" -#: gitk:3057 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" -msgstr "<%s-n(数字)>\t履歴上で現在のコミットの親コミットの内のn(数字)番目のコミットへ移動" +msgstr "" +"<%s-n(数字)>\t履歴上で現在のコミットの親コミットの内のn(数字)番目のコミットへ" +"移動" -#: gitk:3058 msgid "\tMove up one page in commit list" msgstr "\tコミットリストの一つ上のページに移動" -#: gitk:3059 msgid "\tMove down one page in commit list" msgstr "\tコミットリストの一つ下のページに移動" -#: gitk:3060 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tコミットリストの一番上にスクロールする" -#: gitk:3061 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tコミットリストの一番下にスクロールする" -#: gitk:3062 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tコミットリストの一つ下の行にスクロールする" -#: gitk:3063 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tコミットリストの一つ下の行にスクロールする" -#: gitk:3064 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tコミットリストの上のページにスクロールする" -#: gitk:3065 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tコミットリストの下のページにスクロールする" -#: gitk:3066 msgid "\tFind backwards (upwards, later commits)" msgstr "\t後方を検索 (上方の・新しいコミット)" -#: gitk:3067 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\t前方を検索（下方の・古いコミット）" -#: gitk:3068 msgid ", b\tScroll diff view up one page" msgstr ", b\tdiff画面を上のページにスクロールする" -#: gitk:3069 msgid "\tScroll diff view up one page" msgstr "\tdiff画面を上のページにスクロールする" -#: gitk:3070 msgid "\t\tScroll diff view down one page" msgstr "\t\tdiff画面を下のページにスクロールする" -#: gitk:3071 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tdiff画面を上に18行スクロールする" -#: gitk:3072 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tdiff画面を下に18行スクロールする" -#: gitk:3073 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\t検索" -#: gitk:3074 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\t次を検索して移動" -#: gitk:3075 msgid "\tMove to next find hit" msgstr "\t次を検索して移動" -#: gitk:3076 msgid "g\t\tGo to commit" msgstr "g\t\t指定してコミットに移動" -#: gitk:3077 msgid "/\t\tFocus the search box" msgstr "/\t\t検索ボックスにフォーカス" -#: gitk:3078 msgid "?\t\tMove to previous find hit" msgstr "?\t\t前を検索して移動" -#: gitk:3079 msgid "f\t\tScroll diff view to next file" msgstr "f\t\t次のファイルにdiff画面をスクロールする" -#: gitk:3080 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tdiff画面の次を検索" -#: gitk:3081 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tdiff画面の前を検索" -#: gitk:3082 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\t文字サイズを拡大" -#: gitk:3083 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\t文字サイズを拡大" -#: gitk:3084 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\t文字サイズを縮小" -#: gitk:3085 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\t文字サイズを縮小" -#: gitk:3086 msgid "\t\tUpdate" msgstr "\t\t更新" -#: gitk:3551 gitk:3560 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "一時ディレクトリ %s 生成時エラー:" -#: gitk:3573 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "\"%s\" のエラーが %s に発生:" -#: gitk:3636 msgid "command failed:" msgstr "コマンド失敗:" -#: gitk:3785 msgid "No such commit" msgstr "そのようなコミットはありません" -#: gitk:3799 msgid "git gui blame: command failed:" msgstr "git gui blame: コマンド失敗:" -#: gitk:3830 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "マージする HEAD を読み込めません: %s" -#: gitk:3838 #, tcl-format msgid "Error reading index: %s" msgstr "インデックス読み込みエラー: %s" -#: gitk:3863 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "git blame を始められません: %s" -#: gitk:3866 gitk:6755 msgid "Searching" msgstr "検索中" -#: gitk:3898 #, tcl-format msgid "Error running git blame: %s" msgstr "git blame 実行エラー: %s" -#: gitk:3926 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "コミット %s に由来するその行は、このビューに表示されていません" -#: gitk:3940 msgid "External diff viewer failed:" msgstr "外部diffビューアが失敗:" -#: gitk:4044 msgid "All files" msgstr "全てのファイル" -#: gitk:4068 msgid "View" msgstr "ビュー" -#: gitk:4071 msgid "Gitk view definition" msgstr "Gitk ビュー定義" -#: gitk:4075 msgid "Remember this view" msgstr "このビューを記憶する" -#: gitk:4076 msgid "References (space separated list):" msgstr "リファレンス（スペース区切りのリスト）:" -#: gitk:4077 msgid "Branches & tags:" msgstr "ブランチ＆タグ:" -#: gitk:4078 msgid "All refs" msgstr "全てのリファレンス" -#: gitk:4079 msgid "All (local) branches" msgstr "全ての（ローカルな）ブランチ" -#: gitk:4080 msgid "All tags" msgstr "全てのタグ" -#: gitk:4081 msgid "All remote-tracking branches" msgstr "全てのリモート追跡ブランチ" -#: gitk:4082 msgid "Commit Info (regular expressions):" msgstr "コミット情報（正規表現）:" -#: gitk:4083 msgid "Author:" msgstr "作者:" -#: gitk:4084 msgid "Committer:" msgstr "コミット者:" -#: gitk:4085 msgid "Commit Message:" msgstr "コミットメッセージ:" -#: gitk:4086 msgid "Matches all Commit Info criteria" msgstr "コミット情報の全ての条件に一致" -#: gitk:4087 msgid "Matches no Commit Info criteria" msgstr "コミット情報の全ての条件に不一致" -#: gitk:4088 msgid "Changes to Files:" msgstr "変更したファイル:" -#: gitk:4089 msgid "Fixed String" msgstr "固定文字列" -#: gitk:4090 msgid "Regular Expression" msgstr "正規表現" -#: gitk:4091 msgid "Search string:" msgstr "検索文字列:" -#: gitk:4092 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -709,201 +548,153 @@ msgstr "" "コミット日時 (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:4093 msgid "Since:" msgstr "期間の始め:" -#: gitk:4094 msgid "Until:" msgstr "期間の終わり:" -#: gitk:4095 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "制限・省略するリビジョンの数（正の整数）:" -#: gitk:4096 msgid "Number to show:" msgstr "表示する数:" -#: gitk:4097 msgid "Number to skip:" msgstr "省略する数:" -#: gitk:4098 msgid "Miscellaneous options:" msgstr "その他のオプション:" -#: gitk:4099 msgid "Strictly sort by date" msgstr "厳密に日付順で並び替え" -#: gitk:4100 msgid "Mark branch sides" msgstr "側枝マーク" -#: gitk:4101 msgid "Limit to first parent" msgstr "最初の親に制限" -#: gitk:4102 msgid "Simple history" msgstr "簡易な履歴" -#: gitk:4103 msgid "Additional arguments to git log:" msgstr "git log への追加の引数:" -#: gitk:4104 msgid "Enter files and directories to include, one per line:" msgstr "含まれるファイル・ディレクトリを一行ごとに入力:" -#: gitk:4105 msgid "Command to generate more commits to include:" msgstr "コミット追加コマンド:" -#: gitk:4229 msgid "Gitk: edit view" msgstr "Gitk: ビュー編集" -#: gitk:4237 msgid "-- criteria for selecting revisions" msgstr "― リビジョンの選択条件" -#: gitk:4242 msgid "View Name" msgstr "ビュー名:" -#: gitk:4317 msgid "Apply (F5)" msgstr "適用 (F5)" -#: gitk:4355 msgid "Error in commit selection arguments:" msgstr "コミット選択引数のエラー:" -#: gitk:4410 gitk:4463 gitk:4925 gitk:4939 gitk:6209 gitk:12388 gitk:12389 msgid "None" msgstr "無し" -#: gitk:5022 gitk:5027 msgid "Descendant" msgstr "子孫" -#: gitk:5023 msgid "Not descendant" msgstr "非子孫" -#: gitk:5030 gitk:5035 msgid "Ancestor" msgstr "祖先" -#: gitk:5031 msgid "Not ancestor" msgstr "非祖先" -#: gitk:5325 msgid "Local changes checked in to index but not committed" msgstr "ステージされた、コミット前のローカルな変更" -#: gitk:5361 msgid "Local uncommitted changes, not checked in to index" msgstr "ステージされていない、コミット前のローカルな変更" -#: gitk:7135 msgid "and many more" msgstr "他多数" -#: gitk:7138 msgid "many" msgstr "多数" -#: gitk:7329 msgid "Tags:" msgstr "タグ:" -#: gitk:7346 gitk:7352 gitk:8826 msgid "Parent" msgstr "親" -#: gitk:7357 msgid "Child" msgstr "子" -#: gitk:7366 msgid "Branch" msgstr "ブランチ" -#: gitk:7369 msgid "Follows" msgstr "下位" -#: gitk:7372 msgid "Precedes" msgstr "上位" -#: gitk:7967 #, tcl-format msgid "Error getting diffs: %s" msgstr "diff取得エラー: %s" -#: gitk:8651 msgid "Goto:" msgstr "Goto:" -#: gitk:8672 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "%s を含む SHA1 ID は複数存在します" -#: gitk:8679 #, tcl-format msgid "Revision %s is not known" msgstr "リビジョン %s は不明です" -#: gitk:8689 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 id %s は不明です" -#: gitk:8691 #, tcl-format msgid "Revision %s is not in the current view" msgstr "リビジョン %s は現在のビューにはありません" -#: gitk:8833 gitk:8848 msgid "Date" msgstr "日付" -#: gitk:8836 msgid "Children" msgstr "子" -#: gitk:8899 #, tcl-format msgid "Reset %s branch to here" msgstr "%s ブランチをここにリセットする" -#: gitk:8901 msgid "Detached head: can't reset" msgstr "切り離されたHEAD: リセットできません" -#: gitk:9006 gitk:9012 msgid "Skipping merge commit " msgstr "コミットマージをスキップ: " -#: gitk:9021 gitk:9026 msgid "Error getting patch ID for " msgstr "パッチ取得エラー: ID " -#: gitk:9022 gitk:9027 msgid " - stopping\n" msgstr " - 停止\n" -#: gitk:9032 gitk:9035 gitk:9043 gitk:9057 gitk:9066 msgid "Commit " msgstr "コミット " -#: gitk:9036 msgid "" " is the same patch as\n" " " @@ -911,7 +702,6 @@ msgstr "" " は下記のパッチと同等\n" " " -#: gitk:9044 msgid "" " differs from\n" " " @@ -919,7 +709,6 @@ msgstr "" " 下記からのdiff\n" " " -#: gitk:9046 msgid "" "Diff of commits:\n" "\n" @@ -927,130 +716,100 @@ msgstr "" "コミットのdiff:\n" "\n" -#: gitk:9058 gitk:9067 #, tcl-format msgid " has %s children - stopping\n" msgstr " には %s の子があります - 停止\n" -#: gitk:9086 #, tcl-format msgid "Error writing commit to file: %s" msgstr "ファイルへのコミット書き出しエラー: %s" -#: gitk:9092 #, tcl-format msgid "Error diffing commits: %s" msgstr "コミットのdiff実行エラー: %s" -#: gitk:9138 msgid "Top" msgstr "Top" -#: gitk:9139 msgid "From" msgstr "From" -#: gitk:9144 msgid "To" msgstr "To" -#: gitk:9168 msgid "Generate patch" msgstr "パッチ生成" -#: gitk:9170 msgid "From:" msgstr "From:" -#: gitk:9179 msgid "To:" msgstr "To:" -#: gitk:9188 msgid "Reverse" msgstr "逆" -#: gitk:9190 gitk:9400 msgid "Output file:" msgstr "出力ファイル:" -#: gitk:9196 msgid "Generate" msgstr "生成" -#: gitk:9234 msgid "Error creating patch:" msgstr "パッチ生成エラー:" -#: gitk:9257 gitk:9388 gitk:9445 msgid "ID:" msgstr "ID:" -#: gitk:9266 msgid "Tag name:" msgstr "タグ名:" -#: gitk:9269 msgid "Tag message is optional" msgstr "タグメッセージを付ける事も出来ます" -#: gitk:9271 msgid "Tag message:" msgstr "タグメッセージ:" -#: gitk:9275 gitk:9454 msgid "Create" msgstr "生成" -#: gitk:9293 msgid "No tag name specified" msgstr "タグの名称が指定されていません" -#: gitk:9297 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "タグ \"%s\" は既に存在します" -#: gitk:9307 msgid "Error creating tag:" msgstr "タグ生成エラー:" -#: gitk:9397 msgid "Command:" msgstr "コマンド:" -#: gitk:9405 msgid "Write" msgstr "書き出し" -#: gitk:9423 msgid "Error writing commit:" msgstr "コミット書き出しエラー:" -#: gitk:9450 msgid "Name:" msgstr "名前:" -#: gitk:9473 msgid "Please specify a name for the new branch" msgstr "新しいブランチの名前を指定してください" -#: gitk:9478 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "ブランチ '%s' は既に存在します。上書きしますか？" -#: gitk:9545 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "コミット %s は既にブランチ %s に含まれています ― 本当にこれを再適用しますか？" -#: gitk:9550 msgid "Cherry-picking" msgstr "チェリーピック中" -#: gitk:9559 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1060,7 +819,6 @@ msgstr "" "あなたの変更に commit, reset, stash のいずれかを行ってからやり直してくださ" "い。" -#: gitk:9565 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1068,27 +826,25 @@ msgstr "" "マージの衝突によってチェリーピックは失敗しました。\n" "この解決のために git citool を実行したいですか？" -#: gitk:9581 gitk:9639 msgid "No changes committed" msgstr "何の変更もコミットされていません" -#: gitk:9608 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" -msgstr "コミット %s は既にブランチ %s に含まれています ― 本当にこれを撤回しますか？" +msgstr "" +"コミット %s は既にブランチ %s に含まれています ― 本当にこれを撤回しますか？" -#: gitk:9613 msgid "Reverting" msgstr "撤回中" -#: gitk:9621 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " "commit, reset or stash your changes and try again." -msgstr "ファイル '%s' のローカルな変更のために撤回は失敗しました。 あなたの変更に commit, reset, stash のいずれかを行ってからやり直してください。" +msgstr "" +"ファイル '%s' のローカルな変更のために撤回は失敗しました。 あなたの変更に " +"commit, reset, stash のいずれかを行ってからやり直してください。" -#: gitk:9625 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1096,28 +852,22 @@ msgstr "" "マージの衝突によって撤回は失敗しました。\n" "この解決のために git citool を実行したいですか？" -#: gitk:9668 msgid "Confirm reset" msgstr "確認を取り消す" -#: gitk:9670 #, tcl-format msgid "Reset branch %s to %s?" msgstr "ブランチ %s を %s にリセットしますか？" -#: gitk:9672 msgid "Reset type:" msgstr "Reset タイプ:" -#: gitk:9675 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: 作業ツリーもインデックスもそのままにする" -#: gitk:9678 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Mixed: 作業ツリーをそのままにして、インデックスをリセット" -#: gitk:9681 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1125,19 +875,15 @@ msgstr "" "Hard: 作業ツリーやインデックスをリセット\n" "（「全ての」ローカルな変更を破棄）" -#: gitk:9698 msgid "Resetting" msgstr "リセット中" -#: gitk:9758 msgid "Checking out" msgstr "チェックアウト" -#: gitk:9811 msgid "Cannot delete the currently checked-out branch" msgstr "現在チェックアウトされているブランチを削除することはできません" -#: gitk:9817 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1146,16 +892,13 @@ msgstr "" "ブランチ %s には他のブランチに存在しないコミットがあります。\n" "本当にブランチ %s を削除しますか？" -#: gitk:9848 #, tcl-format msgid "Tags and heads: %s" msgstr "タグとHEAD: %s" -#: gitk:9865 msgid "Filter" msgstr "フィルター" -#: gitk:10161 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1163,201 +906,152 @@ msgstr "" "コミット構造情報読み込みエラー; ブランチ及び上位/下位のタグ情報が不完全である" "ようです。" -#: gitk:11138 msgid "Tag" msgstr "タグ" -#: gitk:11142 msgid "Id" msgstr "ID" -#: gitk:11225 msgid "Gitk font chooser" msgstr "Gitk フォント選択" -#: gitk:11242 msgid "B" msgstr "B" -#: gitk:11245 msgid "I" msgstr "I" -#: gitk:11363 msgid "Commit list display options" msgstr "コミットリスト表示オプション" -#: gitk:11366 msgid "Maximum graph width (lines)" msgstr "最大グラフ幅（線の本数）" -#: gitk:11370 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "最大グラフ幅（ペインに対する％）" -#: gitk:11373 msgid "Show local changes" msgstr "ローカルな変更を表示" -#: gitk:11376 msgid "Auto-select SHA1 (length)" msgstr "SHA1 の自動選択 (選択文字数指定)" -#: gitk:11380 msgid "Hide remote refs" msgstr "リモートリファレンスを隠す" -#: gitk:11384 msgid "Diff display options" msgstr "diff表示オプション" -#: gitk:11386 msgid "Tab spacing" msgstr "タブ空白幅" -#: gitk:11389 msgid "Display nearby tags/heads" msgstr "近くの タグ/head を表示する" -#: gitk:11392 msgid "Maximum # tags/heads to show" msgstr "タグ/head の最大表示数" -#: gitk:11395 msgid "Limit diffs to listed paths" msgstr "diff をリストのパスに制限" -#: gitk:11398 msgid "Support per-file encodings" msgstr "ファイルごとのエンコーディングのサポート" -#: gitk:11404 gitk:11551 msgid "External diff tool" msgstr "外部diffツール" -#: gitk:11405 msgid "Choose..." msgstr "選択..." -#: gitk:11410 msgid "General options" msgstr "全体設定" -#: gitk:11413 msgid "Use themed widgets" msgstr "テーマウィジェットを使用する" -#: gitk:11415 msgid "(change requires restart)" msgstr "(変更には再起動が必要です)" -#: gitk:11417 msgid "(currently unavailable)" msgstr "(現在は使用出来ません)" -#: gitk:11428 msgid "Colors: press to choose" msgstr "色: ボタンを押して選択" -#: gitk:11431 msgid "Interface" msgstr "インターフェイス" -#: gitk:11432 msgid "interface" msgstr "インターフェイス" -#: gitk:11435 msgid "Background" msgstr "背景" -#: gitk:11436 gitk:11466 msgid "background" msgstr "背景" -#: gitk:11439 msgid "Foreground" msgstr "前景" -#: gitk:11440 msgid "foreground" msgstr "前景" -#: gitk:11443 msgid "Diff: old lines" msgstr "Diff: 旧バージョン" -#: gitk:11444 msgid "diff old lines" msgstr "diff 旧バージョン" -#: gitk:11448 msgid "Diff: new lines" msgstr "Diff: 新バージョン" -#: gitk:11449 msgid "diff new lines" msgstr "diff 新バージョン" -#: gitk:11453 msgid "Diff: hunk header" msgstr "Diff: hunkヘッダ" -#: gitk:11455 msgid "diff hunk header" msgstr "diff hunkヘッダ" -#: gitk:11459 msgid "Marked line bg" msgstr "マーク行の背景" -#: gitk:11461 msgid "marked line background" msgstr "マーク行の背景" -#: gitk:11465 msgid "Select bg" msgstr "選択の背景" -#: gitk:11474 msgid "Fonts: press to choose" msgstr "フォント: ボタンを押して選択" -#: gitk:11476 msgid "Main font" msgstr "主フォント" -#: gitk:11477 msgid "Diff display font" msgstr "Diff表示用フォント" -#: gitk:11478 msgid "User interface font" msgstr "UI用フォント" -#: gitk:11500 msgid "Gitk preferences" msgstr "Gitk 設定" -#: gitk:11509 msgid "General" msgstr "一般" -#: gitk:11510 msgid "Colors" msgstr "色" -#: gitk:11511 msgid "Fonts" msgstr "フォント" -#: gitk:11561 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: 「%s」 の色を選択" -#: gitk:12074 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -1365,15 +1059,12 @@ msgstr "" "申し訳ありませんが、このバージョンの Tcl/Tk では gitk を実行出来ません。\n" "Gitkの実行には Tcl/Tk 8.4 以上が必要です。" -#: gitk:12284 msgid "Cannot find a git repository here." msgstr "ここにはgitリポジトリがありません。" -#: gitk:12331 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "あいまいな引数 '%s': リビジョンとファイル名の両方に解釈できます" -#: gitk:12343 msgid "Bad arguments to gitk:" msgstr "gitkへの不正な引数:" diff --git a/po/pt_br.po b/po/pt_br.po index 1feb34854b32cc..2644be7e5bce3b 100644 --- a/po/pt_br.po +++ b/po/pt_br.po @@ -18,33 +18,26 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Não foi possível obter a lista dos arquivos não mesclados:" -#: gitk:212 gitk:2381 msgid "Color words" msgstr "" -#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "" -#: gitk:324 msgid "Error parsing revisions:" msgstr "Erro ao interpretar revisões:" -#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Erro ao executar o comando--argscmd:" -#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Nenhum arquivo foi selecionado: --merge especificado mas não há arquivos não-" "mesclados." -#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -52,317 +45,237 @@ msgstr "" "Nenhum arquivo foi selecionado: --merge especificado mas não há arquivos não-" "mesclados dentro dos limites." -#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Erro ao executar git log:" -#: gitk:436 gitk:582 msgid "Reading" msgstr "Lendo" -#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Lendo revisões..." -#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Nenhuma revisão foi selecionada" -#: gitk:1445 gitk:4045 gitk:12432 msgid "Command line" msgstr "Linha de comando" -#: gitk:1511 msgid "Can't parse git log output:" msgstr "Não foi possível interpretar a saída do \"git log\":" -#: gitk:1740 msgid "No commit information available" msgstr "Não há informações disponíveis sobre a revisão" -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "Ok" -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 -#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Cancelar" -#: gitk:2069 msgid "&Update" msgstr "Atualizar" -#: gitk:2070 msgid "&Reload" msgstr "Recarregar" -#: gitk:2071 msgid "Reread re&ferences" msgstr "Ler as referências novamente" -#: gitk:2072 msgid "&List references" msgstr "Listar referências" -#: gitk:2074 msgid "Start git &gui" msgstr "Iniciar Git GUI" -#: gitk:2076 msgid "&Quit" msgstr "Sair" -#: gitk:2068 msgid "&File" msgstr "Arquivo" -#: gitk:2080 msgid "&Preferences" msgstr "Preferências" -#: gitk:2079 msgid "&Edit" msgstr "Editar" -#: gitk:2084 msgid "&New view..." msgstr "Nova vista..." -#: gitk:2085 msgid "&Edit view..." msgstr "Editar vista..." -#: gitk:2086 msgid "&Delete view" msgstr "Apagar vista" -#: gitk:2088 gitk:4043 msgid "&All files" msgstr "Todos os arquivos" -#: gitk:2083 gitk:4067 msgid "&View" msgstr "Exibir" -#: gitk:2093 gitk:2103 gitk:3012 msgid "&About gitk" msgstr "Sobre o gitk" -#: gitk:2094 gitk:2108 msgid "&Key bindings" msgstr "Atalhos de teclado" -#: gitk:2092 gitk:2107 msgid "&Help" msgstr "Ajuda" -#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2229 msgid "Row" msgstr "Linha" -#: gitk:2267 msgid "Find" msgstr "Encontrar" -#: gitk:2295 msgid "commit" msgstr "Revisão" -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 -#: gitk:6912 msgid "containing:" msgstr "contendo:" -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "envolvendo os caminhos:" -#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "Adicionando/removendo texto:" -#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "" -#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Exatamente" -#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "Ignorar maiúsculas/minúsculas" -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "Expressão regular" -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Todos os campos" -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Assunto" -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Descrição da revisão" -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 -#: gitk:8845 msgid "Author" msgstr "Autor" -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Revisor" -#: gitk:2350 msgid "Search" msgstr "Buscar" -#: gitk:2358 msgid "Diff" msgstr "Diferenças" -#: gitk:2360 msgid "Old version" msgstr "Versão antiga" -#: gitk:2362 msgid "New version" msgstr "Versão nova" -#: gitk:2364 msgid "Lines of context" msgstr "Número de linhas de contexto" -#: gitk:2374 msgid "Ignore space change" msgstr "Ignorar mudanças de caixa" -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "" -#: gitk:2445 msgid "Patch" msgstr "Diferenças" -#: gitk:2447 msgid "Tree" msgstr "Árvore" -#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "Comparar esta revisão com a selecionada" -#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "Comparar a revisão selecionada com esta" -#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Criar patch" -#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Criar etiqueta" -#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Salvar revisão para um arquivo" -#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Criar novo ramo" -#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Fazer cherry-pick desta revisão" -#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Redefinir HEAD para cá" -#: gitk:2625 msgid "Mark this commit" msgstr "Marcar esta revisão" -#: gitk:2626 msgid "Return to mark" msgstr "Voltar à marca" -#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Encontrar descendente e marcar" -#: gitk:2628 msgid "Compare with marked commit" msgstr "Comparar com a revisão marcada" -#: gitk:2629 gitk:2640 #, fuzzy msgid "Diff this -> marked commit" msgstr "Comparar esta revisão com a selecionada" -#: gitk:2630 gitk:2641 #, fuzzy msgid "Diff marked commit -> this" msgstr "Comparar a revisão selecionada com esta" -#: gitk:2631 #, fuzzy msgid "Revert this commit" msgstr "Marcar esta revisão" -#: gitk:2647 msgid "Check out this branch" msgstr "Efetuar checkout deste ramo" -#: gitk:2648 msgid "Remove this branch" msgstr "Excluir este ramo" -#: gitk:2649 msgid "Copy branch name" msgstr "" -#: gitk:2656 msgid "Highlight this too" msgstr "Marcar este também" -#: gitk:2657 msgid "Highlight this only" msgstr "Marcar apenas este" -#: gitk:2658 msgid "External diff" msgstr "Diff externo" -#: gitk:2659 msgid "Blame parent commit" msgstr "Anotar revisão anterior" -#: gitk:2660 msgid "Copy path" msgstr "" -#: gitk:2667 msgid "Show origin of this line" msgstr "Exibir origem desta linha" -#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Executar 'git blame' nesta linha" -#: gitk:3014 #, fuzzy msgid "" "\n" @@ -379,320 +292,248 @@ msgstr "" "\n" "Uso e distribuição segundo os termos da Licença Pública Geral GNU" -#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Fechar" -#: gitk:3043 msgid "Gitk key bindings" msgstr "Atalhos de teclado" -#: gitk:3046 msgid "Gitk key bindings:" msgstr "Atalhos de teclado:" -#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tSair" -#: gitk:3049 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tFechar janela" -#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tIr para a primeira revisão" -#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tIr para a última revisão" -#: gitk:3052 #, fuzzy msgid ", p, k\tMove up one commit" msgstr ", p, i\tIr para uma revisão acima" -#: gitk:3053 #, fuzzy msgid ", n, j\tMove down one commit" msgstr ", n, k\tIr para uma revisão abaixo" -#: gitk:3054 #, fuzzy msgid ", z, h\tGo back in history list" msgstr ", z, j\tVoltar no histórico" -#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tAvançar no histórico" -#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" -#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tSubir uma página na lista de revisões" -#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tDescer uma página na lista de revisões" -#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tRolar para o início da lista de revisões" -#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tRolar para o final da lista de revisões" -#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tRolar uma linha acima na lista de revisões" -#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tRolar uma linha abaixo na lista de revisões" -#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tRolar uma página acima na lista de revisões" -#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tRolar uma página abaixo na lista de revisões" -#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tProcurar próxima (revisões mas recentes)" -#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tProcurar anterior (revisões mais antigas)" -#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tRola alterações uma página acima" -#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tRolar alterações uma página abaixo" -#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\t\tRolar alterações uma página abaixo" -#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tRolar alterações 18 linhas acima" -#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tRolar alterações 18 linhas abaixo" -#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tProcurar" -#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tIr para a próxima ocorrência" -#: gitk:3074 msgid "\tMove to next find hit" msgstr "\tIr para a próxima ocorrência" -#: gitk:3075 #, fuzzy msgid "g\t\tGo to commit" msgstr "\t\tIr para a última revisão" -#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tPor foco na caixa de busca" -#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tIr para a ocorrência anterior" -#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tRolar alterações para o próximo arquivo" -#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tProcurar a próxima ocorrência na lista de alterações" -#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tProcurar ocorrência anterior na lista de alterações" -#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumentar tamanho da fonte" -#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tAumentar tamanho da fonte" -#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tReduzir tamanho da fonte" -#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tReduzir tamanho da fonte" -#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tAtualizar" -#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Erro ao criar o diretório temporário %s:" -#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Erro ao ler \"%s\" de %s:" -#: gitk:3635 msgid "command failed:" msgstr "O comando falhou:" -#: gitk:3784 msgid "No such commit" msgstr "Revisão não encontrada" -#: gitk:3798 msgid "git gui blame: command failed:" msgstr "Comando 'git gui blame' falhou:" -#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Impossível ler merge head: %s" -#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Erro ao ler o índice: %s" -#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Não foi possível inciar o 'git blame': %s" -#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Procurando" -#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Erro ao executar 'git blame': %s" -#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Esta linha vem da revisão %s, que não está nesta vista" -#: gitk:3939 msgid "External diff viewer failed:" msgstr "Erro do visualizador de alterações externo:" -#: gitk:4070 msgid "Gitk view definition" msgstr "Definir vista" -#: gitk:4074 msgid "Remember this view" msgstr "Lembrar esta vista" -#: gitk:4075 msgid "References (space separated list):" msgstr "Referências (separar a lista com um espaço):" -#: gitk:4076 msgid "Branches & tags:" msgstr "Ramos & etiquetas:" -#: gitk:4077 msgid "All refs" msgstr "Todas as referências" -#: gitk:4078 msgid "All (local) branches" msgstr "Todos os ramos locais" -#: gitk:4079 msgid "All tags" msgstr "Todas as etiquetas" -#: gitk:4080 msgid "All remote-tracking branches" msgstr "Todos os ramos de rastreio" -#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Informações da revisão (expressões regulares):" -#: gitk:4082 msgid "Author:" msgstr "Autor:" -#: gitk:4083 msgid "Committer:" msgstr "Revisor:" -#: gitk:4084 msgid "Commit Message:" msgstr "Descrição da revisão:" -#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Coincidir todos os critérios de informações da revisão" -#: gitk:4086 #, fuzzy msgid "Matches no Commit Info criteria" msgstr "Coincidir todos os critérios de informações da revisão" -#: gitk:4087 msgid "Changes to Files:" msgstr "Mudanças para os arquivos:" -#: gitk:4088 msgid "Fixed String" msgstr "Texto fixo" -#: gitk:4089 msgid "Regular Expression" msgstr "Expressão regular" -#: gitk:4090 msgid "Search string:" msgstr "Texto de busca" -#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -700,201 +541,153 @@ msgstr "" "Datas de revisão (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:4092 msgid "Since:" msgstr "Desde:" -#: gitk:4093 msgid "Until:" msgstr "Até:" -#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limitar e/ou ignorar um número de revisões (inteiro positivo):" -#: gitk:4095 msgid "Number to show:" msgstr "Número para mostrar:" -#: gitk:4096 msgid "Number to skip:" msgstr "Número para ignorar:" -#: gitk:4097 msgid "Miscellaneous options:" msgstr "Opções diversas:" -#: gitk:4098 msgid "Strictly sort by date" msgstr "Ordenar estritamente pela data" -#: gitk:4099 msgid "Mark branch sides" msgstr "Marcar os dois lados do ramo" -#: gitk:4100 msgid "Limit to first parent" msgstr "Limitar ao primeiro antecessor" -#: gitk:4101 msgid "Simple history" msgstr "Histórico simplificado" -#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Argumentos adicionais para o 'git log':" -#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Arquivos e diretórios para incluir, um por linha" -#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Comando para gerar mais revisões para incluir:" -#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: editar vista" -#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- critérios para selecionar revisões" -#: gitk:4241 msgid "View Name" msgstr "Nome da vista" -#: gitk:4316 msgid "Apply (F5)" msgstr "Aplicar (F5)" -#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Erro nos argumentos de seleção de revisões:" -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Nenhum" -#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Descendente de" -#: gitk:5022 msgid "Not descendant" msgstr "Não descendente de" -#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Antecessor de" -#: gitk:5030 msgid "Not ancestor" msgstr "Não antecessor de" -#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "Mudanças locais marcadas, porém não salvas" -#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Mudanças locais não marcadas" -#: gitk:7134 msgid "and many more" msgstr "" -#: gitk:7137 msgid "many" msgstr "muitas" -#: gitk:7328 msgid "Tags:" msgstr "Etiquetas:" -#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Antecessor" -#: gitk:7356 msgid "Child" msgstr "Descendente" -#: gitk:7365 msgid "Branch" msgstr "Ramo" -#: gitk:7368 msgid "Follows" msgstr "Segue" -#: gitk:7371 msgid "Precedes" msgstr "Precede" -#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Erro ao obter diferenças: %s" -#: gitk:8650 msgid "Goto:" msgstr "Ir para:" -#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "O id SHA1 %s é ambíguo" -#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "Revisão %s desconhecida" -#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "Id SHA1 %s desconhecido" -#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "A revisão %s não está na vista atual" -#: gitk:8832 gitk:8847 msgid "Date" msgstr "Data" -#: gitk:8835 msgid "Children" msgstr "Descendentes" -#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Redefinir ramo %s para este ponto" -#: gitk:8900 msgid "Detached head: can't reset" msgstr "Detached head: impossível redefinir" -#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Saltando revisão de mesclagem" -#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Erro ao obter patch ID para" -#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr "- parando\n" -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Revisão" -#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -902,13 +695,11 @@ msgstr "" "é o mesmo patch que\n" " " -#: gitk:9043 msgid "" " differs from\n" " " msgstr "difere de" -#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -916,129 +707,99 @@ msgstr "" "Diferença de revisões:\n" "\n" -#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr "possui %s descendentes - parando\n" -#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Erro ao salvar revisão para o arquivo: %s" -#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Erro ao comparar revisões: %s" -#: gitk:9137 msgid "Top" msgstr "Início" -#: gitk:9138 msgid "From" msgstr "De" -#: gitk:9143 msgid "To" msgstr "Para" -#: gitk:9167 msgid "Generate patch" msgstr "Gerar patch" -#: gitk:9169 msgid "From:" msgstr "De:" -#: gitk:9178 msgid "To:" msgstr "Para:" -#: gitk:9187 msgid "Reverse" msgstr "Inverter" -#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Arquivo de saída:" -#: gitk:9195 msgid "Generate" msgstr "Gerar" -#: gitk:9233 msgid "Error creating patch:" msgstr "Erro ao criar patch:" -#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "ID:" -#: gitk:9265 msgid "Tag name:" msgstr "Nome da etiqueta:" -#: gitk:9268 msgid "Tag message is optional" msgstr "A descrição da etiqueta é opcional" -#: gitk:9270 msgid "Tag message:" msgstr "Descrição da etiqueta" -#: gitk:9274 gitk:9439 msgid "Create" msgstr "Criar" -#: gitk:9292 msgid "No tag name specified" msgstr "Nome da etiqueta não indicado" -#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Etiqueta \"%s\" já existe" -#: gitk:9306 msgid "Error creating tag:" msgstr "Erro ao criar etiqueta:" -#: gitk:9382 msgid "Command:" msgstr "Comando:" -#: gitk:9390 msgid "Write" msgstr "Exportar" -#: gitk:9408 msgid "Error writing commit:" msgstr "Erro ao exportar revisão" -#: gitk:9435 msgid "Name:" msgstr "Nome:" -#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Indique um nome para o novo ramo" -#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "O ramo \"%s\" já existe. Sobrescrever?" -#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?" -#: gitk:9535 msgid "Cherry-picking" msgstr "Cherry-picking" -#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1048,7 +809,6 @@ msgstr "" "Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente " "novamente." -#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1056,21 +816,17 @@ msgstr "" "O cherry-pick falhou porque houve um conflito na mesclagem.\n" "Executar o 'git citool' para resolvê-lo?" -#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Nenhuma revisão foi salva" -#: gitk:9593 #, fuzzy, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "Revisão %s já inclusa no ramo %s -- você realmente deseja reaplicá-la?" -#: gitk:9598 #, fuzzy msgid "Reverting" msgstr "Redefinindo" -#: gitk:9606 #, fuzzy, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1080,7 +836,6 @@ msgstr "" "Salve a uma revisão, redefina ou armazene (stash) suas mudanças e tente " "novamente." -#: gitk:9610 #, fuzzy msgid "" "Revert failed because of merge conflict.\n" @@ -1089,28 +844,22 @@ msgstr "" "O cherry-pick falhou porque houve um conflito na mesclagem.\n" "Executar o 'git citool' para resolvê-lo?" -#: gitk:9653 msgid "Confirm reset" msgstr "Confirmar redefinição" -#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Você realmente deseja redefinir o ramo %s para %s?" -#: gitk:9657 msgid "Reset type:" msgstr "Tipo de redefinição" -#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Soft: deixa a árvore de trabalho e o índice intocados" -#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Misto: Deixa a árvore de trabalho intocada, redefine o índice" -#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1118,19 +867,15 @@ msgstr "" "Hard: Redefine a árvore de trabalho e o índice\n" "(descarta TODAS as mudanças locais)" -#: gitk:9683 msgid "Resetting" msgstr "Redefinindo" -#: gitk:9743 msgid "Checking out" msgstr "Abrindo" -#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Impossível excluir o ramo atualmente aberto" -#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1139,16 +884,13 @@ msgstr "" "As revisões do ramo \"%s\" não existem em nenhum outro ramo.\n" "Você realmente deseja excluir ramo \"%s\"?" -#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Referências: %s" -#: gitk:9850 msgid "Filter" msgstr "Filtro" -#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1156,221 +898,169 @@ msgstr "" "Erro ao ler a topologia das revisões; as informações dos ramos e etiquetas " "antecessoras/sucessoras estarão incompletas" -#: gitk:11123 msgid "Tag" msgstr "Etiqueta" -#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11210 msgid "Gitk font chooser" msgstr "Selecionar fontes do Gitk" -#: gitk:11227 msgid "B" msgstr "B" -#: gitk:11230 msgid "I" msgstr "I" -#: gitk:11348 msgid "Commit list display options" msgstr "Opções da lista de revisões" -#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Largura máxima do grafo (linhas)" -#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Largura máxima do grafo (% do painel)" -#: gitk:11358 msgid "Show local changes" msgstr "Exibir mudanças locais" -#: gitk:11361 #, fuzzy msgid "Auto-select SHA1 (length)" msgstr "Selecionar o SHA1 automaticamente" -#: gitk:11365 msgid "Hide remote refs" msgstr "Ocultar referências remotas" -#: gitk:11369 msgid "Diff display options" msgstr "Opções de exibição das alterações" -#: gitk:11371 msgid "Tab spacing" msgstr "Espaços por tabulação" -#: gitk:11374 #, fuzzy msgid "Display nearby tags/heads" msgstr "Exibir etiquetas próximas" -#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "" -#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Limitar diferenças aos caminhos listados" -#: gitk:11383 msgid "Support per-file encodings" msgstr "Usar codificações distintas por arquivo" -#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Ferramenta 'diff' externa" -#: gitk:11390 msgid "Choose..." msgstr "Selecionar..." -#: gitk:11395 msgid "General options" msgstr "Opções gerais" -#: gitk:11398 msgid "Use themed widgets" msgstr "Usar temas para as janelas" -#: gitk:11400 msgid "(change requires restart)" msgstr "(exige reinicialização)" -#: gitk:11402 msgid "(currently unavailable)" msgstr "(atualmente indisponível)" -#: gitk:11413 msgid "Colors: press to choose" msgstr "Cores: clique para escolher" -#: gitk:11416 msgid "Interface" msgstr "Interface" -#: gitk:11417 msgid "interface" msgstr "interface" -#: gitk:11420 msgid "Background" msgstr "Segundo plano" -#: gitk:11421 gitk:11451 msgid "background" msgstr "segundo plano" -#: gitk:11424 msgid "Foreground" msgstr "Primeiro plano" -#: gitk:11425 msgid "foreground" msgstr "primeiro plano" -#: gitk:11428 msgid "Diff: old lines" msgstr "Diff: linhas excluídas" -#: gitk:11429 msgid "diff old lines" msgstr "linhas excluídas" -#: gitk:11433 msgid "Diff: new lines" msgstr "Diff: linhas adicionadas" -#: gitk:11434 msgid "diff new lines" msgstr "linhas adicionadas" -#: gitk:11438 msgid "Diff: hunk header" msgstr "Diff: cabeçalho do bloco" -#: gitk:11440 msgid "diff hunk header" msgstr "cabeçalho do bloco" -#: gitk:11444 msgid "Marked line bg" msgstr "2º plano da linha marcada" -#: gitk:11446 msgid "marked line background" msgstr "segundo plano da linha marcada" -#: gitk:11450 msgid "Select bg" msgstr "2º plano da seleção" -#: gitk:11459 msgid "Fonts: press to choose" msgstr "Fontes: clique para escolher" -#: gitk:11461 msgid "Main font" msgstr "Fonte principal" -#: gitk:11462 msgid "Diff display font" msgstr "Fonte da lista de mudanças" -#: gitk:11463 msgid "User interface font" msgstr "Fonte da interface" -#: gitk:11485 msgid "Gitk preferences" msgstr "Preferências do Gitk" -#: gitk:11494 #, fuzzy msgid "General" msgstr "Gerar" -#: gitk:11495 msgid "Colors" msgstr "" -#: gitk:11496 msgid "Fonts" msgstr "" -#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: selecionar cor para %s" -#: gitk:12059 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." msgstr "" -#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Não há nenhum repositório git aqui." -#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "" "O argumento \"%s\" é ambíguo (especifica tanto uma revisão e um nome de " "arquivo)" -#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Argumentos incorretos para o gitk:" diff --git a/po/pt_pt.po b/po/pt_pt.po index f680ea86aabd08..3d382724441fb3 100644 --- a/po/pt_pt.po +++ b/po/pt_pt.po @@ -17,33 +17,26 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Virtaal 0.7.1\n" -#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Não foi possível obter lista de ficheiros não integrados:" -#: gitk:212 gitk:2399 msgid "Color words" msgstr "Colorir palavras" -#: gitk:217 gitk:2399 gitk:8239 gitk:8272 msgid "Markup words" msgstr "Marcar palavras" -#: gitk:324 msgid "Error parsing revisions:" msgstr "Erro ao analisar revisões:" -#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Erro ao executar o comando de --argscmd:" -#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Nenhum ficheiro selecionado: --merge especificado mas não há ficheiros por " "integrar." -#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -51,322 +44,240 @@ msgstr "" "Nenhum ficheiro selecionado: --merge especificado mas não há ficheiros por " "integrar ao nível de ficheiro." -#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Erro ao executar git log:" -#: gitk:436 gitk:582 msgid "Reading" msgstr "A ler" -#: gitk:496 gitk:4544 msgid "Reading commits..." msgstr "A ler commits..." -#: gitk:499 gitk:1637 gitk:4547 msgid "No commits selected" msgstr "Nenhum commit selecionado" -#: gitk:1445 gitk:4064 gitk:12469 msgid "Command line" msgstr "Linha de comandos" -#: gitk:1511 msgid "Can't parse git log output:" msgstr "Não é possível analisar a saída de git log:" -#: gitk:1740 msgid "No commit information available" msgstr "Não há informação disponível sobre o commit" -#: gitk:1903 gitk:1932 gitk:4334 gitk:9702 gitk:11274 gitk:11554 msgid "OK" msgstr "OK" -#: gitk:1934 gitk:4336 gitk:9215 gitk:9294 gitk:9424 gitk:9473 gitk:9704 -#: gitk:11275 gitk:11555 msgid "Cancel" msgstr "Cancelar" -#: gitk:2083 msgid "&Update" msgstr "At&ualizar" -#: gitk:2084 msgid "&Reload" msgstr "&Recarregar" -#: gitk:2085 msgid "Reread re&ferences" msgstr "Reler re&ferências" -#: gitk:2086 msgid "&List references" msgstr "&Listar referências" -#: gitk:2088 msgid "Start git &gui" msgstr "Iniciar git &gui" -#: gitk:2090 msgid "&Quit" msgstr "&Sair" -#: gitk:2082 msgid "&File" msgstr "&Ficheiro" -#: gitk:2094 msgid "&Preferences" msgstr "&Preferências" -#: gitk:2093 msgid "&Edit" msgstr "&Editar" -#: gitk:2098 msgid "&New view..." msgstr "&Nova vista..." -#: gitk:2099 msgid "&Edit view..." msgstr "&Editar vista..." -#: gitk:2100 msgid "&Delete view" msgstr "Elimina&r vista" -#: gitk:2102 msgid "&All files" msgstr "&Todos os ficheiros" -#: gitk:2097 msgid "&View" msgstr "&Ver" -#: gitk:2107 gitk:2117 msgid "&About gitk" msgstr "&Sobre gitk" -#: gitk:2108 gitk:2122 msgid "&Key bindings" msgstr "&Atalhos" -#: gitk:2106 gitk:2121 msgid "&Help" msgstr "&Ajuda" -#: gitk:2199 gitk:8671 msgid "SHA1 ID:" msgstr "ID SHA1:" -#: gitk:2243 msgid "Row" msgstr "Linha" -#: gitk:2281 msgid "Find" msgstr "Procurar" -#: gitk:2309 msgid "commit" msgstr "commit" -#: gitk:2313 gitk:2315 gitk:4706 gitk:4729 gitk:4753 gitk:6774 gitk:6846 -#: gitk:6931 msgid "containing:" msgstr "contendo:" -#: gitk:2316 gitk:3545 gitk:3550 gitk:4782 msgid "touching paths:" msgstr "altera os caminhos:" -#: gitk:2317 gitk:4796 msgid "adding/removing string:" msgstr "adiciona/remove a cadeia:" -#: gitk:2318 gitk:4798 msgid "changing lines matching:" msgstr "altera linhas com:" -#: gitk:2327 gitk:2329 gitk:4785 msgid "Exact" msgstr "Exato" -#: gitk:2329 gitk:4873 gitk:6742 msgid "IgnCase" msgstr "IgnMaiúsculas" -#: gitk:2329 gitk:4755 gitk:4871 gitk:6738 msgid "Regexp" msgstr "Expr. regular" -#: gitk:2331 gitk:2332 gitk:4893 gitk:4923 gitk:4930 gitk:6867 gitk:6935 msgid "All fields" msgstr "Todos os campos" -#: gitk:2332 gitk:4890 gitk:4923 gitk:6805 msgid "Headline" msgstr "Cabeçalho" -#: gitk:2333 gitk:4890 gitk:6805 gitk:6935 gitk:7408 msgid "Comments" msgstr "Comentários" -#: gitk:2333 gitk:4890 gitk:4895 gitk:4930 gitk:6805 gitk:7343 gitk:8849 -#: gitk:8864 msgid "Author" msgstr "Autor" -#: gitk:2333 gitk:4890 gitk:6805 gitk:7345 msgid "Committer" msgstr "Committer" -#: gitk:2367 msgid "Search" msgstr "Pesquisar" -#: gitk:2375 msgid "Diff" msgstr "Diff" -#: gitk:2377 msgid "Old version" msgstr "Versão antiga" -#: gitk:2379 msgid "New version" msgstr "Versão nova" -#: gitk:2382 msgid "Lines of context" msgstr "Linhas de contexto" -#: gitk:2392 msgid "Ignore space change" msgstr "Ignorar espaços" -#: gitk:2396 gitk:2398 gitk:7978 gitk:8225 msgid "Line diff" msgstr "Diff de linha" -#: gitk:2463 msgid "Patch" msgstr "Patch" -#: gitk:2465 msgid "Tree" msgstr "Árvore" -#: gitk:2635 gitk:2656 msgid "Diff this -> selected" msgstr "Diff este -> seleção" -#: gitk:2636 gitk:2657 msgid "Diff selected -> this" msgstr "Diff seleção -> este" -#: gitk:2637 gitk:2658 msgid "Make patch" msgstr "Gerar patch" -#: gitk:2638 gitk:9273 msgid "Create tag" msgstr "Criar tag" -#: gitk:2639 msgid "Copy commit summary" msgstr "Copiar sumário do commit" -#: gitk:2640 gitk:9404 msgid "Write commit to file" msgstr "Escrever commit num ficheiro" -#: gitk:2641 gitk:9461 msgid "Create new branch" msgstr "Criar novo ramo" -#: gitk:2642 msgid "Cherry-pick this commit" msgstr "Efetuar cherry-pick deste commit" -#: gitk:2643 msgid "Reset HEAD branch to here" msgstr "Repor ramo HEAD para aqui" -#: gitk:2644 msgid "Mark this commit" msgstr "Marcar este commit" -#: gitk:2645 msgid "Return to mark" msgstr "Voltar à marca" -#: gitk:2646 msgid "Find descendant of this and mark" msgstr "Encontrar descendeste deste e da marca" -#: gitk:2647 msgid "Compare with marked commit" msgstr "Comparar com o commit marcado" -#: gitk:2648 gitk:2659 msgid "Diff this -> marked commit" msgstr "Diff este -> commit marcado" -#: gitk:2649 gitk:2660 msgid "Diff marked commit -> this" msgstr "Diff commit marcado -> este" -#: gitk:2650 msgid "Revert this commit" msgstr "Reverter este commit" -#: gitk:2666 msgid "Check out this branch" msgstr "Extrair este ramo" -#: gitk:2667 msgid "Remove this branch" msgstr "Remover este ramo" -#: gitk:2668 msgid "Copy branch name" msgstr "Copiar nome do ramo" -#: gitk:2675 msgid "Highlight this too" msgstr "Realçar este também" -#: gitk:2676 msgid "Highlight this only" msgstr "Realçar apenas este" -#: gitk:2677 msgid "External diff" msgstr "Diff externo" -#: gitk:2678 msgid "Blame parent commit" msgstr "Culpar commit pai" -#: gitk:2679 msgid "Copy path" msgstr "Copiar caminho" -#: gitk:2686 msgid "Show origin of this line" msgstr "Mostrar origem deste ficheiro" -#: gitk:2687 msgid "Run git gui blame on this line" msgstr "Executar git gui blame sobre esta linha" -#: gitk:3031 msgid "About gitk" msgstr "Sobre gitk" -#: gitk:3033 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -382,323 +293,249 @@ msgstr "" "\n" "Use e redistribua sob os termos da GNU General Public License" -#: gitk:3041 gitk:3108 gitk:9890 msgid "Close" msgstr "Fechar" -#: gitk:3062 msgid "Gitk key bindings" msgstr "Atalhos do gitk" -#: gitk:3065 msgid "Gitk key bindings:" msgstr "Atalhos do gitk:" -#: gitk:3067 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tSair" -#: gitk:3068 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tFechar janela" -#: gitk:3069 msgid "\t\tMove to first commit" msgstr "\t\tMover para o primeiro commit" -#: gitk:3070 msgid "\t\tMove to last commit" msgstr "\t\tMover para o último commit" -#: gitk:3071 msgid ", p, k\tMove up one commit" msgstr ", p, k\tMover para o commit acima" -#: gitk:3072 msgid ", n, j\tMove down one commit" msgstr ", n, j\tMover para o commit abaixo" -#: gitk:3073 msgid ", z, h\tGo back in history list" msgstr ", z, h\tRecuar no histórico" -#: gitk:3074 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tAvançar no histórico" -#: gitk:3075 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "<%s-n>\tIr para o n-ésimo pai do commit atual no histórico" -#: gitk:3076 msgid "\tMove up one page in commit list" msgstr "\tMover a lista de commits uma página para cima" -#: gitk:3077 msgid "\tMove down one page in commit list" msgstr "\tMover a lista de commits uma página para baixo" -#: gitk:3078 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tDeslocar para o topo da lista" -#: gitk:3079 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tDeslocar para o fim da lista" -#: gitk:3080 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Cima>\tDeslocar a lista de commits uma linha para cima" -#: gitk:3081 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Baixo>\tDeslocar a lista de commits uma linha para baixo" -#: gitk:3082 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tDeslocar a lista de commits uma página para cima" -#: gitk:3083 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tDeslocar a lista de commits uma página para baixo" -#: gitk:3084 msgid "\tFind backwards (upwards, later commits)" msgstr "\tProcurar para trás (para cima, commits posteriores)" -#: gitk:3085 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tProcurar para a frente (para baixo, commits anteriores)" -#: gitk:3086 msgid ", b\tScroll diff view up one page" msgstr ", b\tDeslocar vista diff uma página para cima" -#: gitk:3087 msgid "\tScroll diff view up one page" msgstr "\tDeslocar vista diff uma página para cima" -#: gitk:3088 msgid "\t\tScroll diff view down one page" msgstr "\tDeslocar vista diff uma página para baixo" -#: gitk:3089 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tDeslocar vista diff 18 linhas para cima" -#: gitk:3090 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tDeslocar vista diff 18 linhas para baixo" -#: gitk:3091 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tProcurar" -#: gitk:3092 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tMover para a ocorrência seguinte" -#: gitk:3093 msgid "\tMove to next find hit" msgstr "\tMover para a ocorrência seguinte" -#: gitk:3094 msgid "g\t\tGo to commit" msgstr "g\t\tIr para o commit" -#: gitk:3095 msgid "/\t\tFocus the search box" msgstr "/\t\tFocar a caixa de pesquisa" -#: gitk:3096 msgid "?\t\tMove to previous find hit" msgstr "?\t\tMover para a ocorrência anterior" -#: gitk:3097 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tDeslocar vista diff para o ficheiro seguinte" -#: gitk:3098 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tProcurar pela ocorrência seguinte na vista diff" -#: gitk:3099 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tProcurar pela ocorrência anterior na vista diff" -#: gitk:3100 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tAumentar o tamanho da letra" -#: gitk:3101 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-mais>\tAumentar o tamanho da letra" -#: gitk:3102 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tDiminuir o tamanho da letra" -#: gitk:3103 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-menos>\tDiminuir o tamanho da letra" -#: gitk:3104 msgid "\t\tUpdate" msgstr "\t\tAtualizar" -#: gitk:3569 gitk:3578 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Erro ao criar ficheiro temporário %s:" -#: gitk:3591 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Erro ao obter \"%s\" de %s:" -#: gitk:3654 msgid "command failed:" msgstr "o comando falhou:" -#: gitk:3803 msgid "No such commit" msgstr "Commit inexistente" -#: gitk:3817 msgid "git gui blame: command failed:" msgstr "git gui blame: o comando falhou:" -#: gitk:3848 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Não foi possível ler a cabeça de integração: %s" -#: gitk:3856 #, tcl-format msgid "Error reading index: %s" msgstr "Erro ao ler o índice: %s" -#: gitk:3881 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Não foi possível iniciar git blame: %s" -#: gitk:3884 gitk:6773 msgid "Searching" msgstr "A procurar" -#: gitk:3916 #, tcl-format msgid "Error running git blame: %s" msgstr "Erro ao executar git blame: %s" -#: gitk:3944 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Essa linha provém do commit %s, que não está nesta vista" -#: gitk:3958 msgid "External diff viewer failed:" msgstr "Visualizador diff externo falhou:" -#: gitk:4062 msgid "All files" msgstr "Todos os ficheiros" -#: gitk:4086 msgid "View" msgstr "Vista" -#: gitk:4089 msgid "Gitk view definition" msgstr "Definição de vistas do gitk" -#: gitk:4093 msgid "Remember this view" msgstr "Recordar esta vista" -#: gitk:4094 msgid "References (space separated list):" msgstr "Referências (lista separada por espaço):" -#: gitk:4095 msgid "Branches & tags:" msgstr "Ramos e tags:" -#: gitk:4096 msgid "All refs" msgstr "Todas as referências" -#: gitk:4097 msgid "All (local) branches" msgstr "Todos os ramos (locais)" -#: gitk:4098 msgid "All tags" msgstr "Todas as tags" -#: gitk:4099 msgid "All remote-tracking branches" msgstr "Todos os ramos remotos de monitorização" -#: gitk:4100 msgid "Commit Info (regular expressions):" msgstr "Informação Sobre o Commit (expressões regulares):" -#: gitk:4101 msgid "Author:" msgstr "Autor:" -#: gitk:4102 msgid "Committer:" msgstr "Committer:" -#: gitk:4103 msgid "Commit Message:" msgstr "Mensagem de Commit:" -#: gitk:4104 msgid "Matches all Commit Info criteria" msgstr "Corresponde a todos os critérios da Informação Sobre o Commit" -#: gitk:4105 msgid "Matches no Commit Info criteria" msgstr "Não corresponde a nenhum critério da Informação Sobre o Commit" -#: gitk:4106 msgid "Changes to Files:" msgstr "Alterações nos Ficheiros:" -#: gitk:4107 msgid "Fixed String" msgstr "Cadeia Fixa" -#: gitk:4108 msgid "Regular Expression" msgstr "Expressão Regular" -#: gitk:4109 msgid "Search string:" msgstr "Procurar pela cadeia:" -#: gitk:4110 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -706,201 +543,153 @@ msgstr "" "Datas de Commit (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:4111 msgid "Since:" msgstr "Desde:" -#: gitk:4112 msgid "Until:" msgstr "Até:" -#: gitk:4113 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Limitar e/ou ignorar um número de revisões (inteiro positivo):" -#: gitk:4114 msgid "Number to show:" msgstr "Número a mostrar:" -#: gitk:4115 msgid "Number to skip:" msgstr "Número a ignorar:" -#: gitk:4116 msgid "Miscellaneous options:" msgstr "Opções diversas:" -#: gitk:4117 msgid "Strictly sort by date" msgstr "Ordenar estritamente pela data" -#: gitk:4118 msgid "Mark branch sides" msgstr "Marcar lado dos ramos" -#: gitk:4119 msgid "Limit to first parent" msgstr "Restringir ao primeiro pai" -#: gitk:4120 msgid "Simple history" msgstr "Histórico simples" -#: gitk:4121 msgid "Additional arguments to git log:" msgstr "Argumentos adicionais ao git log:" -#: gitk:4122 msgid "Enter files and directories to include, one per line:" msgstr "Introduza ficheiros e diretórios para incluir, um por linha:" -#: gitk:4123 msgid "Command to generate more commits to include:" msgstr "Comando para gerar mais commits para incluir:" -#: gitk:4247 msgid "Gitk: edit view" msgstr "Gitk: editar vista" -#: gitk:4255 msgid "-- criteria for selecting revisions" msgstr "-- critério para selecionar revisões" -#: gitk:4260 msgid "View Name" msgstr "Nome da Vista" -#: gitk:4335 msgid "Apply (F5)" msgstr "Aplicar (F5)" -#: gitk:4373 msgid "Error in commit selection arguments:" msgstr "Erro nos argumentos de seleção de commits:" -#: gitk:4428 gitk:4481 gitk:4943 gitk:4957 gitk:6227 gitk:12410 gitk:12411 msgid "None" msgstr "Nenhum" -#: gitk:5040 gitk:5045 msgid "Descendant" msgstr "Descendente" -#: gitk:5041 msgid "Not descendant" msgstr "Não descendente" -#: gitk:5048 gitk:5053 msgid "Ancestor" msgstr "Antecessor" -#: gitk:5049 msgid "Not ancestor" msgstr "Não antecessor" -#: gitk:5343 msgid "Local changes checked in to index but not committed" msgstr "Alterações locais preparadas no índice mas não submetidas" -#: gitk:5379 msgid "Local uncommitted changes, not checked in to index" msgstr "Alterações locais não submetidas, não preparadas no índice" -#: gitk:7153 msgid "and many more" msgstr "e muitos mais" -#: gitk:7156 msgid "many" msgstr "muitos" -#: gitk:7347 msgid "Tags:" msgstr "Tags:" -#: gitk:7364 gitk:7370 gitk:8844 msgid "Parent" msgstr "Pai" -#: gitk:7375 msgid "Child" msgstr "Filho" -#: gitk:7384 msgid "Branch" msgstr "Ramo" -#: gitk:7387 msgid "Follows" msgstr "Sucede" -#: gitk:7390 msgid "Precedes" msgstr "Precede" -#: gitk:7985 #, tcl-format msgid "Error getting diffs: %s" msgstr "Erro ao obter diferenças: %s" -#: gitk:8669 msgid "Goto:" msgstr "Ir para:" -#: gitk:8690 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "O id SHA1 abreviado %s é ambíguo" -#: gitk:8697 #, tcl-format msgid "Revision %s is not known" msgstr "A revisão %s não é conhecida" -#: gitk:8707 #, tcl-format msgid "SHA1 id %s is not known" msgstr "O id SHA1 %s não é conhecido" -#: gitk:8709 #, tcl-format msgid "Revision %s is not in the current view" msgstr "A revisão %s não se encontra na vista atual" -#: gitk:8851 gitk:8866 msgid "Date" msgstr "Data" -#: gitk:8854 msgid "Children" msgstr "Filhos" -#: gitk:8917 #, tcl-format msgid "Reset %s branch to here" msgstr "Repor o ramo %s para aqui" -#: gitk:8919 msgid "Detached head: can't reset" msgstr "Cabeça destacada: não é possível repor" -#: gitk:9024 gitk:9030 msgid "Skipping merge commit " msgstr "A ignorar commit de integração " -#: gitk:9039 gitk:9044 msgid "Error getting patch ID for " msgstr "Erro ao obter ID de patch de " -#: gitk:9040 gitk:9045 msgid " - stopping\n" msgstr " - a interromper\n" -#: gitk:9050 gitk:9053 gitk:9061 gitk:9075 gitk:9084 msgid "Commit " msgstr "Commit " -#: gitk:9054 msgid "" " is the same patch as\n" " " @@ -908,7 +697,6 @@ msgstr "" " é o mesmo patch que\n" " " -#: gitk:9062 msgid "" " differs from\n" " " @@ -916,7 +704,6 @@ msgstr "" " difere de\n" " " -#: gitk:9064 msgid "" "Diff of commits:\n" "\n" @@ -924,129 +711,99 @@ msgstr "" "Diferença dos commits:\n" "\n" -#: gitk:9076 gitk:9085 #, tcl-format msgid " has %s children - stopping\n" msgstr " tem %s filhos - a interromper\n" -#: gitk:9104 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Erro ao escrever commit no ficheiro: %s" -#: gitk:9110 #, tcl-format msgid "Error diffing commits: %s" msgstr "Erro ao calcular as diferenças dos commits: %s" -#: gitk:9156 msgid "Top" msgstr "Topo" -#: gitk:9157 msgid "From" msgstr "De" -#: gitk:9162 msgid "To" msgstr "Para" -#: gitk:9186 msgid "Generate patch" msgstr "Gerar patch" -#: gitk:9188 msgid "From:" msgstr "De:" -#: gitk:9197 msgid "To:" msgstr "Para:" -#: gitk:9206 msgid "Reverse" msgstr "Reverter" -#: gitk:9208 gitk:9418 msgid "Output file:" msgstr "Ficheiro de saída:" -#: gitk:9214 msgid "Generate" msgstr "Gerar" -#: gitk:9252 msgid "Error creating patch:" msgstr "Erro ao criar patch:" -#: gitk:9275 gitk:9406 gitk:9463 msgid "ID:" msgstr "ID:" -#: gitk:9284 msgid "Tag name:" msgstr "Nome da tag:" -#: gitk:9287 msgid "Tag message is optional" msgstr "A mensagem da tag é opcional" -#: gitk:9289 msgid "Tag message:" msgstr "Mensagem da tag:" -#: gitk:9293 gitk:9472 msgid "Create" msgstr "Criar" -#: gitk:9311 msgid "No tag name specified" msgstr "Nenhum nome de tag especificado" -#: gitk:9315 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "A tag \"%s\" já existe" -#: gitk:9325 msgid "Error creating tag:" msgstr "Erro ao criar tag:" -#: gitk:9415 msgid "Command:" msgstr "Comando:" -#: gitk:9423 msgid "Write" msgstr "Escrever" -#: gitk:9441 msgid "Error writing commit:" msgstr "Erro ao escrever commit:" -#: gitk:9468 msgid "Name:" msgstr "Nome:" -#: gitk:9491 msgid "Please specify a name for the new branch" msgstr "Especifique um nome para o novo ramo" -#: gitk:9496 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "O ramo '%s' já existe. Substituí-lo?" -#: gitk:9563 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "O commit %s já está incluído no ramo %s -- reaplicá-lo mesmo assim?" -#: gitk:9568 msgid "Cherry-picking" msgstr "A efetuar cherry-pick" -#: gitk:9577 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1055,7 +812,6 @@ msgstr "" "Falha ao efetuar cherry-pick devido a alterações locais no ficheiro '%s'.\n" "Submeta, empilhe ou reponha as alterações e tente de novo." -#: gitk:9583 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1063,20 +819,16 @@ msgstr "" "Falha ao efetuar cherry-pick devido a conflito de integração.\n" "Deseja executar git citool para resolvê-lo?" -#: gitk:9599 gitk:9657 msgid "No changes committed" msgstr "Não foi submetida nenhum alteração" -#: gitk:9626 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "O commit %s não está incluído no ramo %s -- revertê-lo mesmo assim?" -#: gitk:9631 msgid "Reverting" msgstr "A reverter" -#: gitk:9639 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1085,7 +837,6 @@ msgstr "" "Falha ao reverter devido a alterações locais nos seguintes ficheiros:%s " "Submeta, empilhe ou reponha as alterações e tente de novo." -#: gitk:9643 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1093,28 +844,22 @@ msgstr "" "Falha ao reverter devido a conflito de integração.\n" "Deseja executar git citool para resolvê-lo?" -#: gitk:9686 msgid "Confirm reset" msgstr "Confirmar reposição" -#: gitk:9688 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Repor o ramo %s para %s?" -#: gitk:9690 msgid "Reset type:" msgstr "Tipo de reposição:" -#: gitk:9693 msgid "Soft: Leave working tree and index untouched" msgstr "Suave: Deixar a árvore de trabalho e o índice intactos" -#: gitk:9696 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Misto: Deixar a árvore de trabalho intacta, repor índice" -#: gitk:9699 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1122,19 +867,15 @@ msgstr "" "Forte: Repor árvore de trabalho e índice\n" "(descartar TODAS as alterações locais)" -#: gitk:9716 msgid "Resetting" msgstr "A repor" -#: gitk:9776 msgid "Checking out" msgstr "A extrair" -#: gitk:9829 msgid "Cannot delete the currently checked-out branch" msgstr "Não é possível eliminar o ramo atual extraído" -#: gitk:9835 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1143,16 +884,13 @@ msgstr "" "Os commits no ramo %s não estão presentes em mais nenhum ramo.\n" "Eliminar o ramo %s mesmo assim?" -#: gitk:9866 #, tcl-format msgid "Tags and heads: %s" msgstr "Tags e cabeças: %s" -#: gitk:9883 msgid "Filter" msgstr "Filtrar" -#: gitk:10179 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1160,201 +898,152 @@ msgstr "" "Erro ao ler informação de topologia do commit; a informação do ramo e da tag " "precedente/seguinte ficará incompleta." -#: gitk:11156 msgid "Tag" msgstr "Tag" -#: gitk:11160 msgid "Id" msgstr "Id" -#: gitk:11243 msgid "Gitk font chooser" msgstr "Escolha de tipo de letra do gitk" -#: gitk:11260 msgid "B" msgstr "B" -#: gitk:11263 msgid "I" msgstr "I" -#: gitk:11381 msgid "Commit list display options" msgstr "Opções de visualização da lista de commits" -#: gitk:11384 msgid "Maximum graph width (lines)" msgstr "Largura máxima do gráfico (linhas)" -#: gitk:11388 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Largura máxima do gráfico (% do painel)" -#: gitk:11391 msgid "Show local changes" msgstr "Mostrar alterações locais" -#: gitk:11394 msgid "Auto-select SHA1 (length)" msgstr "Selecionar automaticamente SHA1 (largura)" -#: gitk:11398 msgid "Hide remote refs" msgstr "Ocultar referências remotas" -#: gitk:11402 msgid "Diff display options" msgstr "Opções de visualização de diferenças" -#: gitk:11404 msgid "Tab spacing" msgstr "Espaçamento da tabulação" -#: gitk:11407 msgid "Display nearby tags/heads" msgstr "Mostrar tags/cabeças próximas" -#: gitk:11410 msgid "Maximum # tags/heads to show" msgstr "Nº máximo de tags/cabeças a mostrar" -#: gitk:11413 msgid "Limit diffs to listed paths" msgstr "Limitar diferenças aos caminhos listados" -#: gitk:11416 msgid "Support per-file encodings" msgstr "Suportar codificação por cada ficheiro" -#: gitk:11422 gitk:11569 msgid "External diff tool" msgstr "Ferramenta diff externa" -#: gitk:11423 msgid "Choose..." msgstr "Escolher..." -#: gitk:11428 msgid "General options" msgstr "Opções gerais" -#: gitk:11431 msgid "Use themed widgets" msgstr "Usar widgets com estilo" -#: gitk:11433 msgid "(change requires restart)" msgstr "(alteração exige reiniciar)" -#: gitk:11435 msgid "(currently unavailable)" msgstr "(não disponível de momento)" -#: gitk:11446 msgid "Colors: press to choose" msgstr "Cores: pressione para escolher" -#: gitk:11449 msgid "Interface" msgstr "Interface" -#: gitk:11450 msgid "interface" msgstr "interface" -#: gitk:11453 msgid "Background" msgstr "Fundo" -#: gitk:11454 gitk:11484 msgid "background" msgstr "fundo" -#: gitk:11457 msgid "Foreground" msgstr "Primeiro plano" -#: gitk:11458 msgid "foreground" msgstr "primeiro plano" -#: gitk:11461 msgid "Diff: old lines" msgstr "Diff: linhas antigas" -#: gitk:11462 msgid "diff old lines" msgstr "diff linhas antigas" -#: gitk:11466 msgid "Diff: new lines" msgstr "Diff: linhas novas" -#: gitk:11467 msgid "diff new lines" msgstr "diff linhas novas" -#: gitk:11471 msgid "Diff: hunk header" msgstr "Diff: cabeçalho do excerto" -#: gitk:11473 msgid "diff hunk header" msgstr "diff cabeçalho do excerto" -#: gitk:11477 msgid "Marked line bg" msgstr "Fundo da linha marcada" -#: gitk:11479 msgid "marked line background" msgstr "fundo da linha marcada" -#: gitk:11483 msgid "Select bg" msgstr "Selecionar fundo" -#: gitk:11492 msgid "Fonts: press to choose" msgstr "Tipo de letra: pressione para escolher" -#: gitk:11494 msgid "Main font" msgstr "Tipo de letra principal" -#: gitk:11495 msgid "Diff display font" msgstr "Tipo de letra ao mostrar diferenças" -#: gitk:11496 msgid "User interface font" msgstr "Tipo de letra da interface de utilizador" -#: gitk:11518 msgid "Gitk preferences" msgstr "Preferências do gitk" -#: gitk:11527 msgid "General" msgstr "Geral" -#: gitk:11528 msgid "Colors" msgstr "Cores" -#: gitk:11529 msgid "Fonts" msgstr "Tipos de letra" -#: gitk:11579 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: escolher cor de %s" -#: gitk:12092 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -1362,15 +1051,12 @@ msgstr "" "Não é possível executar o gitk com esta versão do Tcl/Tk.\n" "O gitk requer pelo menos Tcl/Tk 8.4." -#: gitk:12302 msgid "Cannot find a git repository here." msgstr "Não foi encontrado nenhum repositório git aqui." -#: gitk:12349 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Argumento '%s' ambíguo: pode ser uma revisão ou um ficheiro" -#: gitk:12361 msgid "Bad arguments to gitk:" msgstr "Argumentos do gitk incorretos:" diff --git a/po/ru.po b/po/ru.po index 9b08c263eadea7..fd709ca4265f56 100644 --- a/po/ru.po +++ b/po/ru.po @@ -13,363 +13,280 @@ msgstr "" "POT-Creation-Date: 2016-12-15 00:18+0200\n" "PO-Revision-Date: 2016-12-14 22:23+0000\n" "Last-Translator: Dimitriy Ryazantcev \n" -"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/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" +"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" -#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Невозможно получить список файлов незавершённой операции слияния:" -#: gitk:212 gitk:2403 msgid "Color words" msgstr "Цветные слова" -#: gitk:217 gitk:2403 gitk:8249 gitk:8282 msgid "Markup words" msgstr "Помеченые слова" -#: gitk:324 msgid "Error parsing revisions:" msgstr "Ошибка при разборе редакции:" -#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Ошибка выполнения команды заданной --argscmd:" -#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." -msgstr "Файлы не выбраны: указан --merge, но не было найдено ни одного файла где эта операция должна быть завершена." +msgstr "" +"Файлы не выбраны: указан --merge, но не было найдено ни одного файла где эта " +"операция должна быть завершена." -#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." -msgstr "Файлы не выбраны: указан --merge, но в рамках указанного ограничения на имена файлов нет ни одного где эта операция должна быть завершена." +msgstr "" +"Файлы не выбраны: указан --merge, но в рамках указанного ограничения на " +"имена файлов нет ни одного где эта операция должна быть завершена." -#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Ошибка запуска git log:" -#: gitk:436 gitk:582 msgid "Reading" msgstr "Чтение" -#: gitk:496 gitk:4549 msgid "Reading commits..." msgstr "Чтение коммитов..." -#: gitk:499 gitk:1641 gitk:4552 msgid "No commits selected" msgstr "Ничего не выбрано" -#: gitk:1449 gitk:4069 gitk:12583 msgid "Command line" msgstr "Командная строка" -#: gitk:1515 msgid "Can't parse git log output:" msgstr "Ошибка обработки вывода команды git log:" -#: gitk:1744 msgid "No commit information available" msgstr "Нет информации о коммите" -#: gitk:1907 gitk:1936 gitk:4339 gitk:9789 gitk:11388 gitk:11668 msgid "OK" msgstr "Ok" -#: gitk:1938 gitk:4341 gitk:9225 gitk:9304 gitk:9434 gitk:9520 gitk:9791 -#: gitk:11389 gitk:11669 msgid "Cancel" msgstr "Отмена" -#: gitk:2087 msgid "&Update" msgstr "Обновить" -#: gitk:2088 msgid "&Reload" msgstr "Перечитать" -#: gitk:2089 msgid "Reread re&ferences" msgstr "Обновить список ссылок" -#: gitk:2090 msgid "&List references" msgstr "Список ссылок" -#: gitk:2092 msgid "Start git &gui" msgstr "Запустить git gui" -#: gitk:2094 msgid "&Quit" msgstr "Завершить" -#: gitk:2086 msgid "&File" msgstr "Файл" -#: gitk:2098 msgid "&Preferences" msgstr "Настройки" -#: gitk:2097 msgid "&Edit" msgstr "Редактировать" -#: gitk:2102 msgid "&New view..." msgstr "Новое представление..." -#: gitk:2103 msgid "&Edit view..." msgstr "Редактировать представление..." -#: gitk:2104 msgid "&Delete view" msgstr "Удалить представление" -#: gitk:2106 msgid "&All files" msgstr "Все файлы" -#: gitk:2101 msgid "&View" msgstr "Представление" -#: gitk:2111 gitk:2121 msgid "&About gitk" msgstr "О gitk" -#: gitk:2112 gitk:2126 msgid "&Key bindings" msgstr "Назначения клавиатуры" -#: gitk:2110 gitk:2125 msgid "&Help" msgstr "Подсказка" -#: gitk:2203 gitk:8681 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2247 msgid "Row" msgstr "Строка" -#: gitk:2285 msgid "Find" msgstr "Поиск" -#: gitk:2313 msgid "commit" msgstr "коммит" -#: gitk:2317 gitk:2319 gitk:4711 gitk:4734 gitk:4758 gitk:6779 gitk:6851 -#: gitk:6936 msgid "containing:" msgstr "содержащее:" -#: gitk:2320 gitk:3550 gitk:3555 gitk:4787 msgid "touching paths:" msgstr "касательно файлов:" -#: gitk:2321 gitk:4801 msgid "adding/removing string:" msgstr "добавив/удалив строку:" -#: gitk:2322 gitk:4803 msgid "changing lines matching:" msgstr "изменяя совпадающие строки:" -#: gitk:2331 gitk:2333 gitk:4790 msgid "Exact" msgstr "Точно" -#: gitk:2333 gitk:4878 gitk:6747 msgid "IgnCase" msgstr "Игнорировать большие/маленькие" -#: gitk:2333 gitk:4760 gitk:4876 gitk:6743 msgid "Regexp" msgstr "Регулярные выражения" -#: gitk:2335 gitk:2336 gitk:4898 gitk:4928 gitk:4935 gitk:6872 gitk:6940 msgid "All fields" msgstr "Во всех полях" -#: gitk:2336 gitk:4895 gitk:4928 gitk:6810 msgid "Headline" msgstr "Заголовок" -#: gitk:2337 gitk:4895 gitk:6810 gitk:6940 gitk:7413 msgid "Comments" msgstr "Комментарии" -#: gitk:2337 gitk:4895 gitk:4900 gitk:4935 gitk:6810 gitk:7348 gitk:8859 -#: gitk:8874 msgid "Author" msgstr "Автор" -#: gitk:2337 gitk:4895 gitk:6810 gitk:7350 msgid "Committer" msgstr "Коммитер" -#: gitk:2371 msgid "Search" msgstr "Найти" -#: gitk:2379 msgid "Diff" msgstr "Сравнить" -#: gitk:2381 msgid "Old version" msgstr "Старая версия" -#: gitk:2383 msgid "New version" msgstr "Новая версия" -#: gitk:2386 msgid "Lines of context" msgstr "Строк контекста" -#: gitk:2396 msgid "Ignore space change" msgstr "Игнорировать пробелы" -#: gitk:2400 gitk:2402 gitk:7983 gitk:8235 msgid "Line diff" msgstr "Изменения строк" -#: gitk:2467 msgid "Patch" msgstr "Патч" -#: gitk:2469 msgid "Tree" msgstr "Файлы" -#: gitk:2639 gitk:2660 msgid "Diff this -> selected" msgstr "Сравнить этот коммит с выделенным" -#: gitk:2640 gitk:2661 msgid "Diff selected -> this" msgstr "Сравнить выделенный с этим коммитом" -#: gitk:2641 gitk:2662 msgid "Make patch" msgstr "Создать патч" -#: gitk:2642 gitk:9283 msgid "Create tag" msgstr "Создать метку" -#: gitk:2643 msgid "Copy commit summary" msgstr "Копировать информацию о коммите" -#: gitk:2644 gitk:9414 msgid "Write commit to file" msgstr "Сохранить коммит в файл" -#: gitk:2645 msgid "Create new branch" msgstr "Создать ветку" -#: gitk:2646 msgid "Cherry-pick this commit" msgstr "Копировать этот коммит в текущую ветку" -#: gitk:2647 msgid "Reset HEAD branch to here" msgstr "Установить HEAD на этот коммит" -#: gitk:2648 msgid "Mark this commit" msgstr "Пометить этот коммит" -#: gitk:2649 msgid "Return to mark" msgstr "Вернуться на пометку" -#: gitk:2650 msgid "Find descendant of this and mark" msgstr "Найти и пометить потомка этого коммита" -#: gitk:2651 msgid "Compare with marked commit" msgstr "Сравнить с помеченным коммитом" -#: gitk:2652 gitk:2663 msgid "Diff this -> marked commit" msgstr "Сравнить выделенное с помеченным коммитом" -#: gitk:2653 gitk:2664 msgid "Diff marked commit -> this" msgstr "Сравнить помеченный с этим коммитом" -#: gitk:2654 msgid "Revert this commit" msgstr "Обратить изменения этого коммита" -#: gitk:2670 msgid "Check out this branch" msgstr "Перейти на эту ветку" -#: gitk:2671 msgid "Rename this branch" msgstr "Переименовать эту ветку" -#: gitk:2672 msgid "Remove this branch" msgstr "Удалить эту ветку" -#: gitk:2673 msgid "Copy branch name" msgstr "Копировать имя ветки" -#: gitk:2680 msgid "Highlight this too" msgstr "Подсветить этот тоже" -#: gitk:2681 msgid "Highlight this only" msgstr "Подсветить только этот" -#: gitk:2682 msgid "External diff" msgstr "Программа сравнения" -#: gitk:2683 msgid "Blame parent commit" msgstr "Авторы изменений родительского коммита" -#: gitk:2684 msgid "Copy path" msgstr "Копировать путь" -#: gitk:2691 msgid "Show origin of this line" msgstr "Показать источник этой строки" -#: gitk:2692 msgid "Run git gui blame on this line" msgstr "Запустить git gui blame для этой строки" -#: gitk:3036 msgid "About gitk" msgstr "О gitk" -#: gitk:3038 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -377,995 +294,797 @@ msgid "" "Copyright © 2005-2016 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" -msgstr "\nGitk — программа просмотра истории репозиториев git\n\n© 2005-2016 Paul Mackerras\n\nИспользование и распространение согласно условиям GNU General Public License" +msgstr "" +"\n" +"Gitk — программа просмотра истории репозиториев git\n" +"\n" +"© 2005-2016 Paul Mackerras\n" +"\n" +"Использование и распространение согласно условиям GNU General Public License" -#: gitk:3046 gitk:3113 gitk:10004 msgid "Close" msgstr "Закрыть" -#: gitk:3067 msgid "Gitk key bindings" msgstr "Назначения клавиатуры в Gitk" -#: gitk:3070 msgid "Gitk key bindings:" msgstr "Назначения клавиатуры в Gitk:" -#: gitk:3072 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tЗавершить" -#: gitk:3073 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tЗакрыть окно" -#: gitk:3074 msgid "\t\tMove to first commit" msgstr "\t\tПерейти к первому коммиту" -#: gitk:3075 msgid "\t\tMove to last commit" msgstr "\t\tПерейти к последнему коммиту" -#: gitk:3076 msgid ", p, k\tMove up one commit" msgstr ", p, k\tПерейти на один коммит вверх" -#: gitk:3077 msgid ", n, j\tMove down one commit" msgstr ", n, j\tПерейти на один коммит вниз" -#: gitk:3078 msgid ", z, h\tGo back in history list" msgstr ", z, h\tПоказать ранее посещённое состояние" -#: gitk:3079 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tПоказать следующий посещённый коммит" -#: gitk:3080 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "<%s-n>\tПерейти на n родителя от текущего коммита" -#: gitk:3081 msgid "\tMove up one page in commit list" msgstr "\tПерейти на страницу выше в списке коммитов" -#: gitk:3082 msgid "\tMove down one page in commit list" msgstr "\tПерейти на страницу ниже в списке коммитов" -#: gitk:3083 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tПерейти на начало списка коммитов" -#: gitk:3084 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tПерейти на конец списка коммитов" -#: gitk:3085 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tПровернуть список коммитов вверх" -#: gitk:3086 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tПровернуть список коммитов вниз" -#: gitk:3087 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tПровернуть список коммитов на страницу вверх" -#: gitk:3088 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tПровернуть список коммитов на страницу вниз" -#: gitk:3089 msgid "\tFind backwards (upwards, later commits)" msgstr "\tПоиск в обратном порядке (вверх, среди новых коммитов)" -#: gitk:3090 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tПоиск (вниз, среди старых коммитов)" -#: gitk:3091 msgid ", b\tScroll diff view up one page" msgstr ", b\tПрокрутить список изменений на страницу выше" -#: gitk:3092 msgid "\tScroll diff view up one page" msgstr "\tПрокрутить список изменений на страницу выше" -#: gitk:3093 msgid "\t\tScroll diff view down one page" msgstr "\t\tПрокрутить список изменений на страницу ниже" -#: gitk:3094 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tПрокрутить список изменений на 18 строк вверх" -#: gitk:3095 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tПрокрутить список изменений на 18 строк вниз" -#: gitk:3096 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tПоиск" -#: gitk:3097 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tПерейти к следующему найденному коммиту" -#: gitk:3098 msgid "\tMove to next find hit" msgstr "\tПерейти к следующему найденному коммиту" -#: gitk:3099 msgid "g\t\tGo to commit" msgstr "g\t\tПерейти на коммит" -#: gitk:3100 msgid "/\t\tFocus the search box" msgstr "/\t\tПерейти к полю поиска" -#: gitk:3101 msgid "?\t\tMove to previous find hit" msgstr "?\t\tПерейти к предыдущему найденному коммиту" -#: gitk:3102 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tПрокрутить список изменений к следующему файлу" -#: gitk:3103 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tПродолжить поиск в списке изменений" -#: gitk:3104 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tПерейти к предыдущему найденному тексту в списке изменений" -#: gitk:3105 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tУвеличить размер шрифта" -#: gitk:3106 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tУвеличить размер шрифта" -#: gitk:3107 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tУменьшить размер шрифта" -#: gitk:3108 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tУменьшить размер шрифта" -#: gitk:3109 msgid "\t\tUpdate" msgstr "\t\tОбновить" -#: gitk:3574 gitk:3583 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Ошибка создания временного каталога %s:" -#: gitk:3596 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Ошибка получения «%s» из %s:" -#: gitk:3659 msgid "command failed:" msgstr "ошибка выполнения команды:" -#: gitk:3808 msgid "No such commit" msgstr "Коммит не найден" -#: gitk:3822 msgid "git gui blame: command failed:" msgstr "git gui blame: ошибка выполнения команды:" -#: gitk:3853 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Ошибка чтения MERGE_HEAD: %s" -#: gitk:3861 #, tcl-format msgid "Error reading index: %s" msgstr "Ошибка чтения индекса: %s" -#: gitk:3886 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Ошибка запуска git blame: %s" -#: gitk:3889 gitk:6778 msgid "Searching" msgstr "Поиск" -#: gitk:3921 #, tcl-format msgid "Error running git blame: %s" msgstr "Ошибка выполнения git blame: %s" -#: gitk:3949 #, tcl-format msgid "That line comes from commit %s, which is not in this view" -msgstr "Эта строка принадлежит коммиту %s, который не показан в этом представлении" +msgstr "" +"Эта строка принадлежит коммиту %s, который не показан в этом представлении" -#: gitk:3963 msgid "External diff viewer failed:" msgstr "Ошибка выполнения программы сравнения:" -#: gitk:4067 msgid "All files" msgstr "Все файлы" -#: gitk:4091 msgid "View" msgstr "Представление" -#: gitk:4094 msgid "Gitk view definition" msgstr "Gitk определение представлений" -#: gitk:4098 msgid "Remember this view" msgstr "Запомнить представление" -#: gitk:4099 msgid "References (space separated list):" msgstr "Ссылки (разделённые пробелом):" -#: gitk:4100 msgid "Branches & tags:" msgstr "Ветки и метки" -#: gitk:4101 msgid "All refs" msgstr "Все ссылки" -#: gitk:4102 msgid "All (local) branches" msgstr "Все (локальные) ветки" -#: gitk:4103 msgid "All tags" msgstr "Все метки" -#: gitk:4104 msgid "All remote-tracking branches" msgstr "Все внешние отслеживаемые ветки" -#: gitk:4105 msgid "Commit Info (regular expressions):" msgstr "Информация о коммите (регулярные выражения):" -#: gitk:4106 msgid "Author:" msgstr "Автор:" -#: gitk:4107 msgid "Committer:" msgstr "Коммитер:" -#: gitk:4108 msgid "Commit Message:" msgstr "Сообщение коммита:" -#: gitk:4109 msgid "Matches all Commit Info criteria" msgstr "Совпадает со всеми условиями информации о коммите" -#: gitk:4110 msgid "Matches no Commit Info criteria" msgstr "Не совпадает с условиями информации о коммите" -#: gitk:4111 msgid "Changes to Files:" msgstr "Изменения файлов:" -#: gitk:4112 msgid "Fixed String" msgstr "Обычная строка" -#: gitk:4113 msgid "Regular Expression" msgstr "Регулярное выражение:" -#: gitk:4114 msgid "Search string:" msgstr "Строка для поиска:" -#: gitk:4115 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -msgstr "Даты коммита («2 недели назад», «2009-03-17 15:27:38», «17 марта 2009 15:27:38»):" +msgstr "" +"Даты коммита («2 недели назад», «2009-03-17 15:27:38», «17 марта 2009 " +"15:27:38»):" -#: gitk:4116 msgid "Since:" msgstr "С даты:" -#: gitk:4117 msgid "Until:" msgstr "По дату:" -#: gitk:4118 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Ограничить и/или пропустить количество редакций (положительное число):" -#: gitk:4119 msgid "Number to show:" msgstr "Показать количество:" -#: gitk:4120 msgid "Number to skip:" msgstr "Пропустить количество:" -#: gitk:4121 msgid "Miscellaneous options:" msgstr "Различные опции:" -#: gitk:4122 msgid "Strictly sort by date" msgstr "Строгая сортировка по дате" -#: gitk:4123 msgid "Mark branch sides" msgstr "Отметить стороны веток" -#: gitk:4124 msgid "Limit to first parent" msgstr "Ограничить первым предком" -#: gitk:4125 msgid "Simple history" msgstr "Упрощенная история" -#: gitk:4126 msgid "Additional arguments to git log:" msgstr "Дополнительные аргументы для git log:" -#: gitk:4127 msgid "Enter files and directories to include, one per line:" msgstr "Файлы и каталоги для ограничения истории, по одному на строку:" -#: gitk:4128 msgid "Command to generate more commits to include:" msgstr "Дополнительная команда для списка коммитов:" -#: gitk:4252 msgid "Gitk: edit view" msgstr "Gitk: изменить представление" -#: gitk:4260 msgid "-- criteria for selecting revisions" msgstr "— критерий поиска редакций" -#: gitk:4265 msgid "View Name" msgstr "Имя представления" -#: gitk:4340 msgid "Apply (F5)" msgstr "Применить (F5)" -#: gitk:4378 msgid "Error in commit selection arguments:" msgstr "Ошибка в параметрах выбора коммитов:" -#: gitk:4433 gitk:4486 gitk:4948 gitk:4962 gitk:6232 gitk:12524 gitk:12525 msgid "None" msgstr "Ни одного" -#: gitk:5045 gitk:5050 msgid "Descendant" msgstr "Порождённое" -#: gitk:5046 msgid "Not descendant" msgstr "Не порождённое" -#: gitk:5053 gitk:5058 msgid "Ancestor" msgstr "Предок" -#: gitk:5054 msgid "Not ancestor" msgstr "Не предок" -#: gitk:5348 msgid "Local changes checked in to index but not committed" msgstr "Проиндексированные изменения" -#: gitk:5384 msgid "Local uncommitted changes, not checked in to index" msgstr "Непроиндексированные изменения" -#: gitk:7158 msgid "and many more" msgstr "и многое другое" -#: gitk:7161 msgid "many" msgstr "много" -#: gitk:7352 msgid "Tags:" msgstr "Метки:" -#: gitk:7369 gitk:7375 gitk:8854 msgid "Parent" msgstr "Предок" -#: gitk:7380 msgid "Child" msgstr "Потомок" -#: gitk:7389 msgid "Branch" msgstr "Ветка" -#: gitk:7392 msgid "Follows" msgstr "Следует за" -#: gitk:7395 msgid "Precedes" msgstr "Предшествует" -#: gitk:7990 #, tcl-format msgid "Error getting diffs: %s" msgstr "Ошибка получения изменений: %s" -#: gitk:8679 msgid "Goto:" msgstr "Перейти к:" -#: gitk:8700 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Сокращённый SHA1 идентификатор %s неоднозначен" -#: gitk:8707 #, tcl-format msgid "Revision %s is not known" msgstr "Редакция %s не найдена" -#: gitk:8717 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA1 идентификатор %s не найден" -#: gitk:8719 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Редакция %s не найдена в текущем представлении" -#: gitk:8861 gitk:8876 msgid "Date" msgstr "Дата" -#: gitk:8864 msgid "Children" msgstr "Потомки" -#: gitk:8927 #, tcl-format msgid "Reset %s branch to here" msgstr "Сбросить ветку %s на этот коммит" -#: gitk:8929 msgid "Detached head: can't reset" msgstr "Коммит не принадлежит ни одной ветке, сбросить невозможно" -#: gitk:9034 gitk:9040 msgid "Skipping merge commit " msgstr "Пропускаю коммит-слияние" -#: gitk:9049 gitk:9054 msgid "Error getting patch ID for " msgstr "Не удалось получить идентификатор патча для " -#: gitk:9050 gitk:9055 msgid " - stopping\n" msgstr " — останов\n" -#: gitk:9060 gitk:9063 gitk:9071 gitk:9085 gitk:9094 msgid "Commit " msgstr "Коммит" -#: gitk:9064 msgid "" " is the same patch as\n" " " -msgstr " такой же патч, как и\n " +msgstr "" +" такой же патч, как и\n" +" " -#: gitk:9072 msgid "" " differs from\n" " " -msgstr " отличается от\n " +msgstr "" +" отличается от\n" +" " -#: gitk:9074 msgid "" "Diff of commits:\n" "\n" -msgstr "Различия коммитов:\n\n" +msgstr "" +"Различия коммитов:\n" +"\n" -#: gitk:9086 gitk:9095 #, tcl-format msgid " has %s children - stopping\n" msgstr " является %s потомком — останов\n" -#: gitk:9114 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Произошла ошибка при записи коммита в файл: %s" -#: gitk:9120 #, tcl-format msgid "Error diffing commits: %s" msgstr "Произошла ошибка при выводе различий коммитов: %s" -#: gitk:9166 msgid "Top" msgstr "Верх" -#: gitk:9167 msgid "From" msgstr "От" -#: gitk:9172 msgid "To" msgstr "До" -#: gitk:9196 msgid "Generate patch" msgstr "Создать патч" -#: gitk:9198 msgid "From:" msgstr "От:" -#: gitk:9207 msgid "To:" msgstr "До:" -#: gitk:9216 msgid "Reverse" msgstr "В обратном порядке" -#: gitk:9218 gitk:9428 msgid "Output file:" msgstr "Файл для сохранения:" -#: gitk:9224 msgid "Generate" msgstr "Создать" -#: gitk:9262 msgid "Error creating patch:" msgstr "Ошибка создания патча:" -#: gitk:9285 gitk:9416 gitk:9504 msgid "ID:" msgstr "ID:" -#: gitk:9294 msgid "Tag name:" msgstr "Имя метки:" -#: gitk:9297 msgid "Tag message is optional" msgstr "Описание метки указывать не обязательно" -#: gitk:9299 msgid "Tag message:" msgstr "Описание метки:" -#: gitk:9303 gitk:9474 msgid "Create" msgstr "Создать" -#: gitk:9321 msgid "No tag name specified" msgstr "Не задано имя метки" -#: gitk:9325 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Метка «%s» уже существует" -#: gitk:9335 msgid "Error creating tag:" msgstr "Ошибка создания метки:" -#: gitk:9425 msgid "Command:" msgstr "Команда:" -#: gitk:9433 msgid "Write" msgstr "Запись" -#: gitk:9451 msgid "Error writing commit:" msgstr "Произошла ошибка при записи коммита:" -#: gitk:9473 msgid "Create branch" msgstr "Создать ветку" -#: gitk:9489 #, tcl-format msgid "Rename branch %s" msgstr "Переименовать ветку %s" -#: gitk:9490 msgid "Rename" msgstr "Переименовать" -#: gitk:9514 msgid "Name:" msgstr "Имя:" -#: gitk:9538 msgid "Please specify a name for the new branch" msgstr "Укажите имя для новой ветки" -#: gitk:9543 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Ветка «%s» уже существует. Переписать?" -#: gitk:9587 msgid "Please specify a new name for the branch" msgstr "Укажите имя для новой ветки" -#: gitk:9650 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "Коммит %s уже включён в ветку %s. Продолжить операцию?" -#: gitk:9655 msgid "Cherry-picking" msgstr "Копирование коммита" -#: gitk:9664 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" "Please commit, reset or stash your changes and try again." -msgstr "Копирование коммита невозможно из-за изменений в файле «%s».\nЗакоммитьте, сбросьте или спрячьте изменения и повторите операцию." +msgstr "" +"Копирование коммита невозможно из-за изменений в файле «%s».\n" +"Закоммитьте, сбросьте или спрячьте изменения и повторите операцию." -#: gitk:9670 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" -msgstr "Копирование изменений невозможно из-за незавершённой операции слияния.\nЗапустить git citool для завершения этой операции?" +msgstr "" +"Копирование изменений невозможно из-за незавершённой операции слияния.\n" +"Запустить git citool для завершения этой операции?" -#: gitk:9686 gitk:9744 msgid "No changes committed" msgstr "Изменения не закоммичены" -#: gitk:9713 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "Коммит %s не включён в ветку %s. Продолжить операцию?" -#: gitk:9718 msgid "Reverting" msgstr "Обращение изменений" -#: gitk:9726 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " "commit, reset or stash your changes and try again." -msgstr "Возврат изменений коммита не удался из-за локальных изменений в указанных файлах: %s\nЗакоммитьте, сбросьте или спрячьте изменения и повторите операцию." +msgstr "" +"Возврат изменений коммита не удался из-за локальных изменений в указанных " +"файлах: %s\n" +"Закоммитьте, сбросьте или спрячьте изменения и повторите операцию." -#: gitk:9730 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" -msgstr "Возврат изменений невозможен из-за незавершённой операции слияния.\nЗапустить git citool для завершения этой операции?" +msgstr "" +"Возврат изменений невозможен из-за незавершённой операции слияния.\n" +"Запустить git citool для завершения этой операции?" -#: gitk:9773 msgid "Confirm reset" msgstr "Подтвердите операцию перехода" -#: gitk:9775 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Сбросить ветку %s на коммит %s?" -#: gitk:9777 msgid "Reset type:" msgstr "Тип операции перехода:" -#: gitk:9780 msgid "Soft: Leave working tree and index untouched" msgstr "Лёгкий: оставить рабочий каталог и индекс неизменными" -#: gitk:9783 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Смешанный: оставить рабочий каталог неизменным, установить индекс" -#: gitk:9786 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" -msgstr "Жесткий: переписать индекс и рабочий каталог\n(все изменения в рабочем каталоге будут потеряны)" +msgstr "" +"Жесткий: переписать индекс и рабочий каталог\n" +"(все изменения в рабочем каталоге будут потеряны)" -#: gitk:9803 msgid "Resetting" msgstr "Сброс" -#: gitk:9876 #, tcl-format msgid "A local branch named %s exists already" msgstr "Локальная ветка с именем %s уже существует" -#: gitk:9884 msgid "Checking out" msgstr "Переход" -#: gitk:9943 msgid "Cannot delete the currently checked-out branch" msgstr "Активная ветка не может быть удалена" -#: gitk:9949 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" "Really delete branch %s?" -msgstr "Коммиты из ветки %s не принадлежат больше никакой другой ветке.\nДействительно удалить ветку %s?" +msgstr "" +"Коммиты из ветки %s не принадлежат больше никакой другой ветке.\n" +"Действительно удалить ветку %s?" -#: gitk:9980 #, tcl-format msgid "Tags and heads: %s" msgstr "Метки и ветки: %s" -#: gitk:9997 msgid "Filter" msgstr "Фильтровать" -#: gitk:10293 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." -msgstr "Ошибка чтения истории проекта; информация о ветках и коммитах вокруг меток (до/после) может быть неполной." +msgstr "" +"Ошибка чтения истории проекта; информация о ветках и коммитах вокруг меток " +"(до/после) может быть неполной." -#: gitk:11270 msgid "Tag" msgstr "Метка" -#: gitk:11274 msgid "Id" msgstr "Id" -#: gitk:11357 msgid "Gitk font chooser" msgstr "Шрифт Gitk" -#: gitk:11374 msgid "B" msgstr "Ж" -#: gitk:11377 msgid "I" msgstr "К" -#: gitk:11495 msgid "Commit list display options" msgstr "Параметры показа списка коммитов" -#: gitk:11498 msgid "Maximum graph width (lines)" msgstr "Макс. ширина графа (строк)" -#: gitk:11502 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Макс. ширина графа (% ширины панели)" -#: gitk:11505 msgid "Show local changes" msgstr "Показывать изменения в рабочем каталоге" -#: gitk:11508 msgid "Auto-select SHA1 (length)" msgstr "Автоматически выделить SHA1 (длинна)" -#: gitk:11512 msgid "Hide remote refs" msgstr "Скрыть внешние ссылки" -#: gitk:11516 msgid "Diff display options" msgstr "Параметры показа изменений" -#: gitk:11518 msgid "Tab spacing" msgstr "Ширина табуляции" -#: gitk:11521 msgid "Display nearby tags/heads" msgstr "Показывать близкие метки/ветки" -#: gitk:11524 msgid "Maximum # tags/heads to show" msgstr "Показывать максимальное количество меток/веток" -#: gitk:11527 msgid "Limit diffs to listed paths" msgstr "Ограничить показ изменений выбранными файлами" -#: gitk:11530 msgid "Support per-file encodings" msgstr "Поддержка кодировок в отдельных файлах" -#: gitk:11536 gitk:11683 msgid "External diff tool" msgstr "Программа для показа изменений" -#: gitk:11537 msgid "Choose..." msgstr "Выберите..." -#: gitk:11542 msgid "General options" msgstr "Общие опции" -#: gitk:11545 msgid "Use themed widgets" msgstr "Использовать стили виджетов" -#: gitk:11547 msgid "(change requires restart)" msgstr "(изменение потребует перезапуск)" -#: gitk:11549 msgid "(currently unavailable)" msgstr "(недоступно в данный момент)" -#: gitk:11560 msgid "Colors: press to choose" msgstr "Цвета: нажмите для выбора" -#: gitk:11563 msgid "Interface" msgstr "Интерфейс" -#: gitk:11564 msgid "interface" msgstr "интерфейс" -#: gitk:11567 msgid "Background" msgstr "Фон" -#: gitk:11568 gitk:11598 msgid "background" msgstr "фон" -#: gitk:11571 msgid "Foreground" msgstr "Передний план" -#: gitk:11572 msgid "foreground" msgstr "передний план" -#: gitk:11575 msgid "Diff: old lines" msgstr "Изменения: старый текст" -#: gitk:11576 msgid "diff old lines" msgstr "старый текст изменения" -#: gitk:11580 msgid "Diff: new lines" msgstr "Изменения: новый текст" -#: gitk:11581 msgid "diff new lines" msgstr "новый текст изменения" -#: gitk:11585 msgid "Diff: hunk header" msgstr "Изменения: заголовок блока" -#: gitk:11587 msgid "diff hunk header" msgstr "заголовок блока изменений" -#: gitk:11591 msgid "Marked line bg" msgstr "Фон выбранной строки" -#: gitk:11593 msgid "marked line background" msgstr "фон выбранной строки" -#: gitk:11597 msgid "Select bg" msgstr "Выберите фон" -#: gitk:11606 msgid "Fonts: press to choose" msgstr "Шрифт: нажмите для выбора" -#: gitk:11608 msgid "Main font" msgstr "Основной шрифт" -#: gitk:11609 msgid "Diff display font" msgstr "Шрифт показа изменений" -#: gitk:11610 msgid "User interface font" msgstr "Шрифт интерфейса" -#: gitk:11632 msgid "Gitk preferences" msgstr "Настройки Gitk" -#: gitk:11641 msgid "General" msgstr "Общие" -#: gitk:11642 msgid "Colors" msgstr "Цвета" -#: gitk:11643 msgid "Fonts" msgstr "Шрифты" -#: gitk:11693 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: выберите цвет для %s" -#: gitk:12206 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." -msgstr "К сожалению gitk не может работать с этой версий Tcl/Tk.\nТребуется как минимум Tcl/Tk 8.4." +msgstr "" +"К сожалению gitk не может работать с этой версий Tcl/Tk.\n" +"Требуется как минимум Tcl/Tk 8.4." -#: gitk:12416 msgid "Cannot find a git repository here." msgstr "Git-репозитарий не найден в текущем каталоге." -#: gitk:12463 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Неоднозначный аргумент «%s»: существует как редакция и как имя файла" -#: gitk:12475 msgid "Bad arguments to gitk:" msgstr "Неправильные аргументы для gitk:" diff --git a/po/sv.po b/po/sv.po index 5afbe6da1d6ab0..0744eb936387b0 100644 --- a/po/sv.po +++ b/po/sv.po @@ -20,33 +20,26 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 3.38.0\n" -#: gitk:139 msgid "Couldn't get list of unmerged files:" msgstr "Kunde inte hämta lista över ej sammanslagna filer:" -#: gitk:211 gitk:2406 msgid "Color words" msgstr "Färga ord" -#: gitk:216 gitk:2406 gitk:8307 gitk:8340 msgid "Markup words" msgstr "Märk upp ord" -#: gitk:323 msgid "Error parsing revisions:" msgstr "Fel vid tolkning av revisioner:" -#: gitk:379 msgid "Error executing --argscmd command:" msgstr "Fel vid körning av --argscmd-kommando:" -#: gitk:392 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Inga filer valdes: --merge angavs men det finns inga filer som inte har " "slagits samman." -#: gitk:395 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -54,326 +47,243 @@ msgstr "" "Inga filer valdes: --merge angavs men det finns inga filer inom " "filbegränsningen." -#: gitk:417 gitk:565 msgid "Error executing git log:" msgstr "Fel vid körning av git log:" -#: gitk:435 gitk:581 msgid "Reading" msgstr "Läser" -#: gitk:495 gitk:4572 msgid "Reading commits..." msgstr "Läser incheckningar..." -#: gitk:498 gitk:1640 gitk:4575 msgid "No commits selected" msgstr "Inga incheckningar markerade" -#: gitk:1448 gitk:4092 gitk:12674 msgid "Command line" msgstr "Kommandorad" -#: gitk:1514 msgid "Can't parse git log output:" msgstr "Kan inte tolka utdata från git log:" -#: gitk:1743 msgid "No commit information available" msgstr "Ingen incheckningsinformation är tillgänglig" -#: gitk:1910 gitk:1939 gitk:4362 gitk:9847 gitk:11451 gitk:11751 msgid "OK" msgstr "OK" -#: gitk:1941 gitk:4364 gitk:9283 gitk:9362 gitk:9492 gitk:9578 gitk:9849 -#: gitk:11452 gitk:11752 msgid "Cancel" msgstr "Avbryt" -#: gitk:2090 msgid "&Update" msgstr "&Uppdatera" -#: gitk:2091 msgid "&Reload" msgstr "Läs &om" -#: gitk:2092 msgid "Reread re&ferences" msgstr "Läs om &referenser" -#: gitk:2093 msgid "&List references" msgstr "&Visa referenser" -#: gitk:2095 msgid "Start git &gui" msgstr "Starta git &gui" -#: gitk:2097 msgid "&Quit" msgstr "&Avsluta" -#: gitk:2089 msgid "&File" msgstr "&Arkiv" -#: gitk:2101 msgid "&Preferences" msgstr "&Inställningar" -#: gitk:2100 msgid "&Edit" msgstr "&Redigera" -#: gitk:2105 msgid "&New view..." msgstr "&Ny vy..." -#: gitk:2106 msgid "&Edit view..." msgstr "&Ändra vy..." -#: gitk:2107 msgid "&Delete view" msgstr "&Ta bort vy" -#: gitk:2109 msgid "&All files" msgstr "&Alla filer" -#: gitk:2104 msgid "&View" msgstr "&Visa" -#: gitk:2114 gitk:2124 msgid "&About gitk" msgstr "&Om gitk" -#: gitk:2115 gitk:2129 msgid "&Key bindings" msgstr "&Tangentbordsbindningar" -#: gitk:2113 gitk:2128 msgid "&Help" msgstr "&Hjälp" -#: gitk:2206 gitk:8739 msgid "SHA1 ID:" msgstr "SHA1-id:" -#: gitk:2250 msgid "Row" msgstr "Rad" -#: gitk:2288 msgid "Find" msgstr "Sök" -#: gitk:2316 msgid "commit" msgstr "incheckning" -#: gitk:2320 gitk:2322 gitk:4734 gitk:4757 gitk:4781 gitk:6802 gitk:6874 -#: gitk:6959 msgid "containing:" msgstr "som innehåller:" -#: gitk:2323 gitk:3573 gitk:3578 gitk:4810 msgid "touching paths:" msgstr "som rör sökväg:" -#: gitk:2324 gitk:4824 msgid "adding/removing string:" msgstr "som lägger/till tar bort sträng:" -#: gitk:2325 gitk:4826 msgid "changing lines matching:" msgstr "ändrar rader som matchar:" -#: gitk:2334 gitk:2336 gitk:4813 msgid "Exact" msgstr "Exakt" -#: gitk:2336 gitk:4901 gitk:6770 msgid "IgnCase" msgstr "IgnVersaler" -#: gitk:2336 gitk:4783 gitk:4899 gitk:6766 msgid "Regexp" msgstr "Reg.uttr." -#: gitk:2338 gitk:2339 gitk:4921 gitk:4951 gitk:4958 gitk:6895 gitk:6963 msgid "All fields" msgstr "Alla fält" -#: gitk:2339 gitk:4918 gitk:4951 gitk:6833 msgid "Headline" msgstr "Rubrik" -#: gitk:2340 gitk:4918 gitk:6833 gitk:6963 gitk:7471 msgid "Comments" msgstr "Kommentarer" -#: gitk:2340 gitk:4918 gitk:4923 gitk:4958 gitk:6833 gitk:7406 gitk:8917 -#: gitk:8932 msgid "Author" msgstr "Författare" -#: gitk:2340 gitk:4918 gitk:6833 gitk:7408 msgid "Committer" msgstr "Incheckare" -#: gitk:2374 msgid "Search" msgstr "Sök" -#: gitk:2382 msgid "Diff" msgstr "Diff" -#: gitk:2384 msgid "Old version" msgstr "Gammal version" -#: gitk:2386 msgid "New version" msgstr "Ny version" -#: gitk:2389 msgid "Lines of context" msgstr "Rader sammanhang" -#: gitk:2399 msgid "Ignore space change" msgstr "Ignorera ändringar i blanksteg" -#: gitk:2403 gitk:2405 gitk:8041 gitk:8293 msgid "Line diff" msgstr "Rad-diff" -#: gitk:2478 msgid "Patch" msgstr "Patch" -#: gitk:2480 msgid "Tree" msgstr "Träd" -#: gitk:2650 gitk:2671 msgid "Diff this -> selected" msgstr "Diff denna -> markerad" -#: gitk:2651 gitk:2672 msgid "Diff selected -> this" msgstr "Diff markerad -> denna" -#: gitk:2652 gitk:2673 msgid "Make patch" msgstr "Skapa patch" -#: gitk:2653 gitk:9341 msgid "Create tag" msgstr "Skapa tagg" -#: gitk:2654 msgid "Copy commit reference" msgstr "Kopiera incheckningsreferens" -#: gitk:2655 gitk:9472 msgid "Write commit to file" msgstr "Skriv incheckning till fil" -#: gitk:2656 msgid "Create new branch" msgstr "Skapa ny gren" -#: gitk:2657 msgid "Cherry-pick this commit" msgstr "Plocka denna incheckning" -#: gitk:2658 msgid "Reset HEAD branch to here" msgstr "Återställ HEAD-grenen hit" -#: gitk:2659 msgid "Mark this commit" msgstr "Markera denna incheckning" -#: gitk:2660 msgid "Return to mark" msgstr "Återgå till markering" -#: gitk:2661 msgid "Find descendant of this and mark" msgstr "Hitta efterföljare till denna och markera" -#: gitk:2662 msgid "Compare with marked commit" msgstr "Jämför med markerad incheckning" -#: gitk:2663 gitk:2674 msgid "Diff this -> marked commit" msgstr "Diff denna -> markerad incheckning" -#: gitk:2664 gitk:2675 msgid "Diff marked commit -> this" msgstr "Diff markerad incheckning -> denna" -#: gitk:2665 msgid "Revert this commit" msgstr "Ångra denna incheckning" -#: gitk:2681 msgid "Check out this branch" msgstr "Checka ut denna gren" -#: gitk:2682 msgid "Rename this branch" msgstr "Byt namn på denna gren" -#: gitk:2683 msgid "Remove this branch" msgstr "Ta bort denna gren" -#: gitk:2684 msgid "Copy branch name" msgstr "Kopiera namn på gren" -#: gitk:2691 msgid "Highlight this too" msgstr "Markera även detta" -#: gitk:2692 msgid "Highlight this only" msgstr "Markera bara detta" -#: gitk:2693 msgid "External diff" msgstr "Extern diff" -#: gitk:2694 msgid "Blame parent commit" msgstr "Klandra föräldraincheckning" -#: gitk:2695 msgid "Copy path" msgstr "Kopiera sökväg" -#: gitk:2702 msgid "Show origin of this line" msgstr "Visa ursprunget för den här raden" -#: gitk:2703 msgid "Run git gui blame on this line" msgstr "Kör git gui blame på den här raden" -#: gitk:3057 msgid "About gitk" msgstr "Om gitk" -#: gitk:3059 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -389,323 +299,249 @@ msgstr "" "\n" "Använd och vidareförmedla enligt villkoren i GNU General Public License" -#: gitk:3067 gitk:3134 gitk:10062 msgid "Close" msgstr "Stäng" -#: gitk:3088 msgid "Gitk key bindings" msgstr "Tangentbordsbindningar för Gitk" -#: gitk:3091 msgid "Gitk key bindings:" msgstr "Tangentbordsbindningar för Gitk:" -#: gitk:3093 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tAvsluta" -#: gitk:3094 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tStäng fönster" -#: gitk:3095 msgid "\t\tMove to first commit" msgstr "\t\tGå till första incheckning" -#: gitk:3096 msgid "\t\tMove to last commit" msgstr "\t\tGå till sista incheckning" -#: gitk:3097 msgid ", p, k\tMove up one commit" msgstr ", p, k\tGå en incheckning upp" -#: gitk:3098 msgid ", n, j\tMove down one commit" msgstr ", n, j\tGå en incheckning ned" -#: gitk:3099 msgid ", z, h\tGo back in history list" msgstr ", z, h\tGå bakåt i historiken" -#: gitk:3100 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tGå framåt i historiken" -#: gitk:3101 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "<%s-n>\tGå till aktuell inchecknings n:te förälder i historielistan" -#: gitk:3102 msgid "\tMove up one page in commit list" msgstr "\tGå upp en sida i incheckningslistan" -#: gitk:3103 msgid "\tMove down one page in commit list" msgstr "\tGå ned en sida i incheckningslistan" -#: gitk:3104 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tRulla till början av incheckningslistan" -#: gitk:3105 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tRulla till slutet av incheckningslistan" -#: gitk:3106 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg" -#: gitk:3107 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg" -#: gitk:3108 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida" -#: gitk:3109 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida" -#: gitk:3110 msgid "\tFind backwards (upwards, later commits)" msgstr "\tSök bakåt (uppåt, senare incheckningar)" -#: gitk:3111 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\tSök framåt (nedåt, tidigare incheckningar)" -#: gitk:3112 msgid ", b\tScroll diff view up one page" msgstr ", b\tRulla diffvisningen upp en sida" -#: gitk:3113 msgid "\tScroll diff view up one page" msgstr "\tRulla diffvisningen upp en sida" -#: gitk:3114 msgid "\t\tScroll diff view down one page" msgstr "\tRulla diffvisningen ned en sida" -#: gitk:3115 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tRulla diffvisningen upp 18 rader" -#: gitk:3116 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tRulla diffvisningen ned 18 rader" -#: gitk:3117 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tSök" -#: gitk:3118 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tGå till nästa sökträff" -#: gitk:3119 msgid "\tMove to next find hit" msgstr "\t\tGå till nästa sökträff" -#: gitk:3120 msgid "g\t\tGo to commit" msgstr "g\t\tGå till incheckning" -#: gitk:3121 msgid "/\t\tFocus the search box" msgstr "/\t\tFokusera sökrutan" -#: gitk:3122 msgid "?\t\tMove to previous find hit" msgstr "?\t\tGå till föregående sökträff" -#: gitk:3123 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tRulla diffvisningen till nästa fil" -#: gitk:3124 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tGå till nästa sökträff i diffvisningen" -#: gitk:3125 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tGå till föregående sökträff i diffvisningen" -#: gitk:3126 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Num+>\tÖka teckenstorlek" -#: gitk:3127 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tÖka teckenstorlek" -#: gitk:3128 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Num->\tMinska teckenstorlek" -#: gitk:3129 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tMinska teckenstorlek" -#: gitk:3130 msgid "\t\tUpdate" msgstr "\t\tUppdatera" -#: gitk:3597 gitk:3606 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Fel vid skapande av temporär katalog %s:" -#: gitk:3619 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Fel vid hämtning av ”%s” från %s:" -#: gitk:3682 msgid "command failed:" msgstr "kommando misslyckades:" -#: gitk:3831 msgid "No such commit" msgstr "Incheckning saknas" -#: gitk:3845 msgid "git gui blame: command failed:" msgstr "git gui blame: kommando misslyckades:" -#: gitk:3876 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Kunde inte läsa sammanslagningshuvud: %s" -#: gitk:3884 #, tcl-format msgid "Error reading index: %s" msgstr "Fel vid läsning av index: %s" -#: gitk:3909 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Kunde inte starta git blame: %s" -#: gitk:3912 gitk:6801 msgid "Searching" msgstr "Söker" -#: gitk:3944 #, tcl-format msgid "Error running git blame: %s" msgstr "Fel vid körning av git blame: %s" -#: gitk:3972 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Raden kommer från incheckningen %s, som inte finns i denna vy" -#: gitk:3986 msgid "External diff viewer failed:" msgstr "Externt diff-verktyg misslyckades:" -#: gitk:4090 msgid "All files" msgstr "Alla filer" -#: gitk:4114 msgid "View" msgstr "Visa" -#: gitk:4117 msgid "Gitk view definition" msgstr "Definition av Gitk-vy" -#: gitk:4121 msgid "Remember this view" msgstr "Spara denna vy" -#: gitk:4122 msgid "References (space separated list):" msgstr "Referenser (blankstegsavdelad lista):" -#: gitk:4123 msgid "Branches & tags:" msgstr "Grenar & taggar:" -#: gitk:4124 msgid "All refs" msgstr "Alla referenser" -#: gitk:4125 msgid "All (local) branches" msgstr "Alla (lokala) grenar" -#: gitk:4126 msgid "All tags" msgstr "Alla taggar" -#: gitk:4127 msgid "All remote-tracking branches" msgstr "Alla fjärrspårande grenar" -#: gitk:4128 msgid "Commit Info (regular expressions):" msgstr "Incheckningsinfo (reguljära uttryck):" -#: gitk:4129 msgid "Author:" msgstr "Författare:" -#: gitk:4130 msgid "Committer:" msgstr "Incheckare:" -#: gitk:4131 msgid "Commit Message:" msgstr "Incheckningsmeddelande:" -#: gitk:4132 msgid "Matches all Commit Info criteria" msgstr "Motsvarar alla kriterier för incheckningsinfo" -#: gitk:4133 msgid "Matches no Commit Info criteria" msgstr "Motsvarar inga kriterier för incheckningsinfo" -#: gitk:4134 msgid "Changes to Files:" msgstr "Ändringar av filer:" -#: gitk:4135 msgid "Fixed String" msgstr "Fast sträng" -#: gitk:4136 msgid "Regular Expression" msgstr "Reguljärt uttryck" -#: gitk:4137 msgid "Search string:" msgstr "Söksträng:" -#: gitk:4138 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -713,205 +549,156 @@ msgstr "" "Incheckningsdatum (”2 weeks ago”, ”2009-03-17 15:27:38”, ”March 17, 2009 " "15:27:38”):" -#: gitk:4139 msgid "Since:" msgstr "Från:" -#: gitk:4140 msgid "Until:" msgstr "Till:" -#: gitk:4141 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):" -#: gitk:4142 msgid "Number to show:" msgstr "Antal att visa:" -#: gitk:4143 msgid "Number to skip:" msgstr "Antal att hoppa över:" -#: gitk:4144 msgid "Miscellaneous options:" msgstr "Diverse alternativ:" -#: gitk:4145 msgid "Strictly sort by date" msgstr "Strikt datumsortering" -#: gitk:4146 msgid "Mark branch sides" msgstr "Markera sidogrenar" -#: gitk:4147 msgid "Limit to first parent" msgstr "Begränsa till första förälder" -#: gitk:4148 msgid "Simple history" msgstr "Enkel historik" -#: gitk:4149 msgid "Additional arguments to git log:" msgstr "Ytterligare argument till git log:" -#: gitk:4150 msgid "Enter files and directories to include, one per line:" msgstr "Ange filer och kataloger att ta med, en per rad:" -#: gitk:4151 msgid "Command to generate more commits to include:" msgstr "Kommando för att generera fler incheckningar att ta med:" -#: gitk:4275 msgid "Gitk: edit view" msgstr "Gitk: redigera vy" -#: gitk:4283 msgid "-- criteria for selecting revisions" msgstr " - kriterier för val av revisioner" -#: gitk:4288 msgid "View Name" msgstr "Namn på vy" -#: gitk:4363 msgid "Apply (F5)" msgstr "Använd (F5)" -#: gitk:4401 msgid "Error in commit selection arguments:" msgstr "Fel i argument för val av incheckningar:" -#: gitk:4456 gitk:4509 gitk:4971 gitk:4985 gitk:6255 gitk:12615 gitk:12616 msgid "None" msgstr "Inget" -#: gitk:5068 gitk:5073 msgid "Descendant" msgstr "Avkomling" -#: gitk:5069 msgid "Not descendant" msgstr "Inte avkomling" -#: gitk:5076 gitk:5081 msgid "Ancestor" msgstr "Förfader" -#: gitk:5077 msgid "Not ancestor" msgstr "Inte förfader" -#: gitk:5371 msgid "Local changes checked in to index but not committed" msgstr "Lokala ändringar sparade i indexet men inte incheckade" -#: gitk:5407 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokala ändringar, ej sparade i indexet" -#: gitk:7155 msgid "Error starting web browser:" msgstr "Fel när webbläsaren skulle startas:" -#: gitk:7216 msgid "and many more" msgstr "med många flera" -#: gitk:7219 msgid "many" msgstr "många" -#: gitk:7410 msgid "Tags:" msgstr "Taggar:" -#: gitk:7427 gitk:7433 gitk:8912 msgid "Parent" msgstr "Förälder" -#: gitk:7438 msgid "Child" msgstr "Barn" -#: gitk:7447 msgid "Branch" msgstr "Gren" -#: gitk:7450 msgid "Follows" msgstr "Följer" -#: gitk:7453 msgid "Precedes" msgstr "Föregår" -#: gitk:8048 #, tcl-format msgid "Error getting diffs: %s" msgstr "Fel vid hämtning av diff: %s" -#: gitk:8737 msgid "Goto:" msgstr "Gå till:" -#: gitk:8758 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Förkortat SHA1-id %s är tvetydigt" -#: gitk:8765 #, tcl-format msgid "Revision %s is not known" msgstr "Revisionen %s är inte känd" -#: gitk:8775 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA-id:t %s är inte känt" -#: gitk:8777 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Revisionen %s finns inte i den nuvarande vyn" -#: gitk:8919 gitk:8934 msgid "Date" msgstr "Datum" -#: gitk:8922 msgid "Children" msgstr "Barn" -#: gitk:8985 #, tcl-format msgid "Reset %s branch to here" msgstr "Återställ grenen %s hit" -#: gitk:8987 msgid "Detached head: can't reset" msgstr "Frånkopplad head: kan inte återställa" -#: gitk:9092 gitk:9098 msgid "Skipping merge commit " msgstr "Hoppar över sammanslagningsincheckning " -#: gitk:9107 gitk:9112 msgid "Error getting patch ID for " msgstr "Fel vid hämtning av patch-id för " -#: gitk:9108 gitk:9113 msgid " - stopping\n" msgstr " - stannar\n" -#: gitk:9118 gitk:9121 gitk:9129 gitk:9143 gitk:9152 msgid "Commit " msgstr "Incheckning " -#: gitk:9122 msgid "" " is the same patch as\n" " " @@ -919,7 +706,6 @@ msgstr "" " är samma patch som\n" " " -#: gitk:9130 msgid "" " differs from\n" " " @@ -927,7 +713,6 @@ msgstr "" " skiljer sig från\n" " " -#: gitk:9132 msgid "" "Diff of commits:\n" "\n" @@ -935,148 +720,114 @@ msgstr "" "Skillnad mellan incheckningar:\n" "\n" -#: gitk:9144 gitk:9153 #, tcl-format msgid " has %s children - stopping\n" msgstr " har %s barn - stannar\n" -#: gitk:9172 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Fel vid skrivning av incheckning till fil: %s" -#: gitk:9178 #, tcl-format msgid "Error diffing commits: %s" msgstr "Fel vid jämförelse av incheckningar: %s" -#: gitk:9224 msgid "Top" msgstr "Topp" -#: gitk:9225 msgid "From" msgstr "Från" -#: gitk:9230 msgid "To" msgstr "Till" -#: gitk:9254 msgid "Generate patch" msgstr "Generera patch" -#: gitk:9256 msgid "From:" msgstr "Från:" -#: gitk:9265 msgid "To:" msgstr "Till:" -#: gitk:9274 msgid "Reverse" msgstr "Vänd" -#: gitk:9276 gitk:9486 msgid "Output file:" msgstr "Utdatafil:" -#: gitk:9282 msgid "Generate" msgstr "Generera" -#: gitk:9320 msgid "Error creating patch:" msgstr "Fel vid generering av patch:" -#: gitk:9343 gitk:9474 gitk:9562 msgid "ID:" msgstr "Id:" -#: gitk:9352 msgid "Tag name:" msgstr "Taggnamn:" -#: gitk:9355 msgid "Tag message is optional" msgstr "Taggmeddelandet är valfritt" -#: gitk:9357 msgid "Tag message:" msgstr "Taggmeddelande:" -#: gitk:9361 gitk:9532 msgid "Create" msgstr "Skapa" -#: gitk:9379 msgid "No tag name specified" msgstr "Inget taggnamn angavs" -#: gitk:9383 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Taggen ”%s” finns redan" -#: gitk:9393 msgid "Error creating tag:" msgstr "Fel vid skapande av tagg:" -#: gitk:9483 msgid "Command:" msgstr "Kommando:" -#: gitk:9491 msgid "Write" msgstr "Skriv" -#: gitk:9509 msgid "Error writing commit:" msgstr "Fel vid skrivning av incheckning:" -#: gitk:9531 msgid "Create branch" msgstr "Skapa gren" -#: gitk:9547 #, tcl-format msgid "Rename branch %s" msgstr "Byt namn på grenen %s" -#: gitk:9548 msgid "Rename" msgstr "Byt namn" -#: gitk:9572 msgid "Name:" msgstr "Namn:" -#: gitk:9596 msgid "Please specify a name for the new branch" msgstr "Ange ett namn för den nya grenen" -#: gitk:9601 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Grenen ”%s” finns redan. Skriva över?" -#: gitk:9645 msgid "Please specify a new name for the branch" msgstr "Ange ett nytt namn för grenen" -#: gitk:9708 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras " "på nytt?" -#: gitk:9713 msgid "Cherry-picking" msgstr "Plockar" -#: gitk:9722 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1086,7 +837,6 @@ msgstr "" "Checka in, återställ eller spara undan (stash) dina ändringar och försök " "igen." -#: gitk:9728 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1094,20 +844,16 @@ msgstr "" "Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n" "Vill du köra git citool för att lösa den?" -#: gitk:9744 gitk:9802 msgid "No changes committed" msgstr "Inga ändringar incheckade" -#: gitk:9771 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "Incheckningen %s finns inte på grenen %s -- vill du verkligen ångra?" -#: gitk:9776 msgid "Reverting" msgstr "Ångrar" -#: gitk:9784 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1117,7 +863,6 @@ msgstr "" "Checka in, återställ eller spara undan (stash) dina ändringar och försök " "igen." -#: gitk:9788 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1125,28 +870,22 @@ msgstr "" "Misslyckades med att ångra på grund av en sammanslagningskonflikt.\n" " Vill du köra git citool för att lösa den?" -#: gitk:9831 msgid "Confirm reset" msgstr "Bekräfta återställning" -#: gitk:9833 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Återställa grenen %s till %s?" -#: gitk:9835 msgid "Reset type:" msgstr "Typ av återställning:" -#: gitk:9838 msgid "Soft: Leave working tree and index untouched" msgstr "Mjuk: Rör inte utcheckning och index" -#: gitk:9841 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Blandad: Rör inte utcheckning, återställ index" -#: gitk:9844 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1154,24 +893,19 @@ msgstr "" "Hård: Återställ utcheckning och index\n" "(förkastar ALLA lokala ändringar)" -#: gitk:9861 msgid "Resetting" msgstr "Återställer" -#: gitk:9934 #, tcl-format msgid "A local branch named %s exists already" msgstr "Det finns redan en lokal gren som heter %s" -#: gitk:9942 msgid "Checking out" msgstr "Checkar ut" -#: gitk:10001 msgid "Cannot delete the currently checked-out branch" msgstr "Kan inte ta bort den just nu utcheckade grenen" -#: gitk:10007 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1180,16 +914,13 @@ msgstr "" "Incheckningarna på grenen %s existerar inte på någon annan gren.\n" "Vill du verkligen ta bort grenen %s?" -#: gitk:10038 #, tcl-format msgid "Tags and heads: %s" msgstr "Taggar och huvuden: %s" -#: gitk:10055 msgid "Filter" msgstr "Filter" -#: gitk:10356 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1197,221 +928,167 @@ msgstr "" "Fel vid läsning av information om incheckningstopologi; information om " "grenar och föregående/senare taggar kommer inte vara komplett." -#: gitk:11333 msgid "Tag" msgstr "Tagg" -#: gitk:11337 msgid "Id" msgstr "Id" -#: gitk:11420 msgid "Gitk font chooser" msgstr "Teckensnittsväljare för Gitk" -#: gitk:11437 msgid "B" msgstr "F" -#: gitk:11440 msgid "I" msgstr "K" -#: gitk:11558 msgid "Commit list display options" msgstr "Alternativ för incheckningslistvy" -#: gitk:11561 msgid "Maximum graph width (lines)" msgstr "Maximal grafbredd (rader)" -#: gitk:11565 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximal grafbredd (% av ruta)" -#: gitk:11568 msgid "Show local changes" msgstr "Visa lokala ändringar" -#: gitk:11571 msgid "Auto-select SHA1 (length)" msgstr "Välj SHA1 (längd) automatiskt" -#: gitk:11575 msgid "Hide remote refs" msgstr "Dölj fjärr-referenser" -#: gitk:11579 msgid "Diff display options" msgstr "Alternativ för diffvy" -#: gitk:11581 msgid "Tab spacing" msgstr "Blanksteg för tabulatortecken" -#: gitk:11584 msgid "Display nearby tags/heads" msgstr "Visa närliggande taggar/huvuden" -#: gitk:11587 msgid "Maximum # tags/heads to show" msgstr "Maximalt antal taggar/huvuden att visa" -#: gitk:11590 msgid "Limit diffs to listed paths" msgstr "Begränsa diff till listade sökvägar" -#: gitk:11593 msgid "Support per-file encodings" msgstr "Stöd för filspecifika teckenkodningar" -#: gitk:11599 gitk:11766 msgid "External diff tool" msgstr "Externt diff-verktyg" -#: gitk:11600 msgid "Choose..." msgstr "Välj..." -#: gitk:11607 msgid "Web browser" msgstr "Webbläsare" -#: gitk:11612 msgid "General options" msgstr "Allmänna inställningar" -#: gitk:11615 msgid "Use themed widgets" msgstr "Använd tema på fönsterelement" -#: gitk:11617 msgid "(change requires restart)" msgstr "(ändringen kräver omstart)" -#: gitk:11619 msgid "(currently unavailable)" msgstr "(för närvarande inte tillgängligt)" -#: gitk:11631 msgid "Colors: press to choose" msgstr "Färger: tryck för att välja" -#: gitk:11634 msgid "Interface" msgstr "Gränssnitt" -#: gitk:11635 msgid "interface" msgstr "gränssnitt" -#: gitk:11638 msgid "Background" msgstr "Bakgrund" -#: gitk:11639 gitk:11681 msgid "background" msgstr "bakgrund" -#: gitk:11642 msgid "Foreground" msgstr "Förgrund" -#: gitk:11643 msgid "foreground" msgstr "förgrund" -#: gitk:11646 msgid "Diff: old lines" msgstr "Diff: gamla rader" -#: gitk:11647 msgid "diff old lines" msgstr "diff gamla rader" -#: gitk:11651 msgid "Diff: old lines bg" msgstr "Diff: gamla rader bg" -#: gitk:11653 msgid "diff old lines bg" msgstr "diff gamla rader bg" -#: gitk:11657 msgid "Diff: new lines" msgstr "Diff: nya rader" -#: gitk:11658 msgid "diff new lines" msgstr "diff nya rader" -#: gitk:11662 msgid "Diff: new lines bg" msgstr "Diff: nya rader bg" -#: gitk:11664 msgid "diff new lines bg" msgstr "diff nya rader bg" -#: gitk:11668 msgid "Diff: hunk header" msgstr "Diff: delhuvud" -#: gitk:11670 msgid "diff hunk header" msgstr "diff delhuvud" -#: gitk:11674 msgid "Marked line bg" msgstr "Markerad rad bakgrund" -#: gitk:11676 msgid "marked line background" msgstr "markerad rad bakgrund" -#: gitk:11680 msgid "Select bg" msgstr "Markerad bakgrund" -#: gitk:11689 msgid "Fonts: press to choose" msgstr "Teckensnitt: tryck för att välja" -#: gitk:11691 msgid "Main font" msgstr "Huvudteckensnitt" -#: gitk:11692 msgid "Diff display font" msgstr "Teckensnitt för diffvisning" -#: gitk:11693 msgid "User interface font" msgstr "Teckensnitt för användargränssnitt" -#: gitk:11715 msgid "Gitk preferences" msgstr "Inställningar för Gitk" -#: gitk:11724 msgid "General" msgstr "Allmänt" -#: gitk:11725 msgid "Colors" msgstr "Färger" -#: gitk:11726 msgid "Fonts" msgstr "Teckensnitt" -#: gitk:11776 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: välj färg för %s" -#: gitk:12289 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -1419,15 +1096,12 @@ msgstr "" "Gitk kan tyvärr inte köra med denna version av Tcl/Tk.\n" " Gitk kräver åtminstone Tcl/Tk 8.4." -#: gitk:12507 msgid "Cannot find a git repository here." msgstr "Hittar inget git-arkiv här." -#: gitk:12554 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Tvetydigt argument ”%s”: både revision och filnamn" -#: gitk:12566 msgid "Bad arguments to gitk:" msgstr "Felaktiga argument till gitk:" diff --git a/po/ta.po b/po/ta.po index 0e390c51531602..89afebf1e6cbfd 100644 --- a/po/ta.po +++ b/po/ta.po @@ -17,360 +17,270 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: gitk:274 msgid "Couldn't get list of unmerged files:" msgstr "ஒருங்கிணைக்கப்படாத கோப்புகளின் பட்டியலைப் பெற முடியவில்லை:" -#: gitk:346 gitk:2565 msgid "Color words" msgstr "வண்ண சொற்கள்" -#: gitk:351 gitk:2565 gitk:8476 gitk:8509 msgid "Markup words" msgstr "குறிக்கப்பட்ட சொற்கள்" -#: gitk:458 msgid "Error parsing revisions:" msgstr "பிழைகளை பாகுபடுத்துதல்:" -#: gitk:524 msgid "Error executing --argscmd command:" msgstr "--argscmd கட்டளையை இயக்குவதில் பிழை:" -#: gitk:537 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" -"கோப்புகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை: --ஒன்றிணை குறிப்பிடப்பட்டுள்ளது, " -"ஆனால் கோப்புகள் எதுவும் அவிழ்க்கப்படவில்லை." +"கோப்புகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை: --ஒன்றிணை குறிப்பிடப்பட்டுள்ளது, ஆனால் கோப்புகள் " +"எதுவும் அவிழ்க்கப்படவில்லை." -#: gitk:540 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." msgstr "" -"கோப்புகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை: --ஒன்றிணை குறிப்பிடப்பட்டுள்ளது, " -"ஆனால் அவிழ்க்கப்படாத கோப்புகள் எதுவும் கோப்பு வரம்பிற்குள் இல்லை." +"கோப்புகள் எதுவும் தேர்ந்தெடுக்கப்படவில்லை: --ஒன்றிணை குறிப்பிடப்பட்டுள்ளது, ஆனால் " +"அவிழ்க்கப்படாத கோப்புகள் எதுவும் கோப்பு வரம்பிற்குள் இல்லை." -#: gitk:565 gitk:720 msgid "Error executing git log:" msgstr "அறிவிலி பதிவை இயக்குவதில் பிழை:" -#: gitk:583 gitk:736 msgid "Reading" msgstr "படித்தல்" -#: gitk:643 gitk:4736 msgid "Reading commits..." msgstr "உறுதிமொழிகளைப் படித்தல்..." -#: gitk:646 gitk:1795 gitk:4739 msgid "No commits selected" msgstr "எந்த உறுதிமொழிகளும் தேர்ந்தெடுக்கப்படவில்லை" -#: gitk:1603 gitk:4256 gitk:12883 msgid "Command line" msgstr "கட்டளை வரி" -#: gitk:1669 msgid "Can't parse git log output:" msgstr "அறிவிலி பதிவு வெளியீட்டை அலச முடியாது:" -#: gitk:1898 msgid "No commit information available" msgstr "உறுதிமொழி செய்தி எதுவும் கிடைக்கவில்லை" -#: gitk:2065 gitk:2094 gitk:4526 gitk:10016 gitk:11626 gitk:11946 msgid "OK" msgstr "சரி" -#: gitk:2096 gitk:4528 gitk:9452 gitk:9531 gitk:9661 gitk:9747 gitk:10018 -#: gitk:11627 gitk:11947 msgid "Cancel" msgstr "நீக்கறல்" -#: gitk:2249 msgid "&Update" msgstr "புதுப்பித்தல்" -#: gitk:2250 msgid "&Reload" msgstr "மீண்டும் ஏற்று" -#: gitk:2251 msgid "Reread re&ferences" msgstr "குறிப்புகளை மீண்டும் படி" -#: gitk:2252 msgid "&List references" msgstr "பட்டியல் குறிப்புகள்" -#: gitk:2254 msgid "Start git &gui" msgstr "அறிவிலி இடைமுகத்தைத் தொடங்கு" -#: gitk:2256 msgid "&Quit" msgstr "வெளியேறு" -#: gitk:2248 msgid "&File" msgstr "கோப்பு" -#: gitk:2260 msgid "&Preferences" msgstr "விருப்பத்தேர்வுகள்" -#: gitk:2259 msgid "&Edit" msgstr "திருத்து" -#: gitk:2264 msgid "&New view..." msgstr "புதிய பார்வை..." -#: gitk:2265 msgid "&Edit view..." msgstr "பார்வையைத் திருத்து..." -#: gitk:2266 msgid "&Delete view" msgstr "பார்வையை நீக்கு" -#: gitk:2268 msgid "&All files" msgstr "அனைத்து கோப்புகளும்" -#: gitk:2263 msgid "&View" msgstr "காண்க" -#: gitk:2273 gitk:2283 msgid "&About gitk" msgstr "அறிவிலிகே பற்றி" -#: gitk:2274 gitk:2288 msgid "&Key bindings" msgstr "முக்கிய பிணைப்புகள்" -#: gitk:2272 gitk:2287 msgid "&Help" msgstr "உதவி" -#: gitk:2365 gitk:8908 msgid "Commit ID:" msgstr "உறுதிமொழி அடையாளம்:" -#: gitk:2409 msgid "Row" msgstr "நிரை" -#: gitk:2447 msgid "Find" msgstr "கண்டுபிடி" -#: gitk:2475 msgid "commit" msgstr "உறுதிமொழி" -#: gitk:2479 gitk:2481 gitk:4898 gitk:4921 gitk:4945 gitk:6966 gitk:7038 -#: gitk:7123 msgid "containing:" msgstr "கொண்டிருக்கிறது:" -#: gitk:2482 gitk:3737 gitk:3742 gitk:4974 msgid "touching paths:" msgstr "தொடும் பாதைகள்:" -#: gitk:2483 gitk:4988 msgid "adding/removing string:" msgstr "சரத்தைச் சேர்ப்பது/அகற்றுவது:" -#: gitk:2484 gitk:4990 msgid "changing lines matching:" msgstr "பொருந்தக்கூடிய வரிகளை மாற்றுதல்:" -#: gitk:2493 gitk:2495 gitk:4977 msgid "Exact" msgstr "சரியான" -#: gitk:2495 gitk:5065 gitk:6934 msgid "IgnCase" msgstr "வழக்குதவிர்" -#: gitk:2495 gitk:4947 gitk:5063 gitk:6930 msgid "Regexp" msgstr "வழக்கவெளி" -#: gitk:2497 gitk:2498 gitk:5085 gitk:5115 gitk:5122 gitk:7059 gitk:7127 msgid "All fields" msgstr "அனைத்து புலங்களும்" -#: gitk:2498 gitk:5082 gitk:5115 gitk:6997 msgid "Headline" msgstr "தலைப்பு" -#: gitk:2499 gitk:5082 gitk:6997 gitk:7127 gitk:7639 msgid "Comments" msgstr "கருத்துகள்" -#: gitk:2499 gitk:5082 gitk:5087 gitk:5122 gitk:6997 gitk:7574 gitk:9086 -#: gitk:9101 msgid "Author" msgstr "நூலாசிரியர்" -#: gitk:2499 gitk:5082 gitk:6997 gitk:7576 msgid "Committer" msgstr "உறுதிமொழிபவர்" -#: gitk:2533 msgid "Search" msgstr "தேடு" -#: gitk:2541 msgid "Diff" msgstr "வேறுபாடு" -#: gitk:2543 msgid "Old version" msgstr "பழைய பதிப்பு" -#: gitk:2545 msgid "New version" msgstr "புதிய பதிப்பு" -#: gitk:2548 msgid "Lines of context" msgstr "சூழலின் வரிகள்" -#: gitk:2558 msgid "Ignore space change" msgstr "இடைவெளி மாற்றத்தை புறக்கணி" -#: gitk:2562 gitk:2564 gitk:8209 gitk:8462 msgid "Line diff" msgstr "வரி வேறுபாடு" -#: gitk:2637 msgid "Patch" msgstr "ஒட்டு" -#: gitk:2639 msgid "Tree" msgstr "மரம்" -#: gitk:2814 gitk:2835 msgid "Diff this -> selected" msgstr "இதை வேறுபடுத்துங்கள் -> தேர்ந்தெடுக்கப்பட்டது" -#: gitk:2815 gitk:2836 msgid "Diff selected -> this" msgstr "வேறுபாடு தேர்ந்தெடுக்கப்பட்டது -> இது" -#: gitk:2816 gitk:2837 msgid "Make patch" msgstr "ஒட்டு செய்" -#: gitk:2817 gitk:9510 msgid "Create tag" msgstr "குறிச்சொல்லை உருவாக்கு" -#: gitk:2818 msgid "Copy commit reference" msgstr "உறுதிமொழி குறிப்பு நகலெடு" -#: gitk:2819 gitk:9641 msgid "Write commit to file" msgstr "கோப்பில் உறவை எழுதுங்கள்" -#: gitk:2820 msgid "Create new branch" msgstr "புதிய கிளையை உருவாக்கு" -#: gitk:2821 msgid "Cherry-pick this commit" msgstr "கனி-எடு இந்த உறுதிமொழி" -#: gitk:2822 msgid "Reset HEAD branch to here" msgstr "தலை கிளையை இங்கே மீட்டமை" -#: gitk:2823 msgid "Mark this commit" msgstr "இந்த உறுதிமொழியைக் குறி" -#: gitk:2824 msgid "Return to mark" msgstr "மார்க்குக்குத் திரும்பு" -#: gitk:2825 msgid "Find descendant of this and mark" msgstr "இதன் வழித்தோன்றலைக் கண்டுபிடித்து குறி" -#: gitk:2826 msgid "Compare with marked commit" msgstr "குறிக்கப்பட்ட உறுதிப்பாட்டுடன் ஒப்பிடுக" -#: gitk:2827 gitk:2838 msgid "Diff this -> marked commit" msgstr "இதை வேறுபடுத்துங்கள் -> குறிக்கப்பட்ட உறுதிமொழி" -#: gitk:2828 gitk:2839 msgid "Diff marked commit -> this" msgstr "வேறுபாடு குறிக்கப்பட்ட உறுதிமொழி -> இது" -#: gitk:2829 msgid "Revert this commit" msgstr "இந்த உறுதிப்பாட்டை மாற்றவும்" -#: gitk:2845 msgid "Check out this branch" msgstr "இந்த கிளையைப் பாருங்கள்" -#: gitk:2846 msgid "Rename this branch" msgstr "இந்த கிளையை மறுபெயரிடு" -#: gitk:2847 msgid "Remove this branch" msgstr "இந்த கிளையை அகற்று" -#: gitk:2848 msgid "Copy branch name" msgstr "கிளை பெயரை நகலெடு" -#: gitk:2855 msgid "Highlight this too" msgstr "இதை முன்னிலைப்படுத்து" -#: gitk:2856 msgid "Highlight this only" msgstr "இதை முன்னிலைப்படுத்து" -#: gitk:2857 msgid "External diff" msgstr "வெளிப்புற வேறுபாடு" -#: gitk:2858 msgid "Blame parent commit" msgstr "பெற்றோரை குற்றம் சாட்டு" -#: gitk:2859 msgid "Copy path" msgstr "நகல் பாதை" -#: gitk:2866 msgid "Show origin of this line" msgstr "இந்த வரியின் தோற்றத்தைக் காட்டு" -#: gitk:2867 msgid "Run git gui blame on this line" msgstr "இந்த வரியில் அறிவிலி இடைமுகம் பழியை இயக்கு" -#: gitk:3221 msgid "About gitk" msgstr "அறிவிலிகே பற்றி" -#: gitk:3223 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -386,697 +296,533 @@ msgstr "" "\n" "குனு பொது பொதுமக்கள் உரிமத்தின் விதிமுறைகளின் கீழ் பயன்படுத்தவும் மறுபகிர்வு செய்யவும்" -#: gitk:3231 gitk:3298 gitk:10231 msgid "Close" msgstr "மூடு" -#: gitk:3252 msgid "Gitk key bindings" msgstr "அறிவிலிகே விசை பிணைப்புகள்" -#: gitk:3255 msgid "Gitk key bindings:" msgstr "அறிவிலிகே விசை பிணைப்புகள்:" -#: gitk:3257 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tவெளியேறு" -#: gitk:3258 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-w>\t\tசாளரத்தை மூடு" -#: gitk:3259 msgid "\t\tMove to first commit" msgstr "<வீடு> முதல் உறுதிமொழிக்கு நகர்த்து" -#: gitk:3260 msgid "\t\tMove to last commit" msgstr "<முடி> கடைசி உறுதிமொழிக்கு நகர்த்து" -#: gitk:3261 msgid ", p, k\tMove up one commit" msgstr "<மேலே>, பி, கே\tஒரு உறுதிமொழியை மேலே நகர்த்து" -#: gitk:3262 msgid ", n, j\tMove down one commit" msgstr "<கீழ்>, n, j\tஒரு உறுதிமொழியை கீழே நகர்த்து" -#: gitk:3263 msgid ", z, h\tGo back in history list" msgstr "<இடது>, z, h\tவரலாற்று பட்டியலில் திரும்பிச் செல்" -#: gitk:3264 msgid ", x, l\tGo forward in history list" msgstr "<வலது>, x, l\tவரலாற்று பட்டியலில் முன்னோக்கி செல்" -#: gitk:3265 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" -msgstr "" -"<%s-n> வரலாற்று பட்டியலில் தற்போதைய உறுதிப்பாட்டின் n- வது பெற்றோரிடம் " -"செல்" +msgstr "<%s-n> வரலாற்று பட்டியலில் தற்போதைய உறுதிப்பாட்டின் n- வது பெற்றோரிடம் செல்" -#: gitk:3266 msgid "\tMove up one page in commit list" msgstr "<பக்கம்மேல்>\tஉறுதிமொழி பட்டியலில் ஒரு பக்கத்தை நகர்த்து" -#: gitk:3267 msgid "\tMove down one page in commit list" msgstr "<பக்கம்கீழ்>\tஉறுதிமொழி பட்டியலில் ஒரு பக்கத்தை நகர்த்து" -#: gitk:3268 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-வீடு>\tஉறுதிமொழி பட்டியலை மேல் பகுதிக்கு உருட்டவும்" -#: gitk:3269 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-முடி> உறுதிமொழி பட்டியலின் கீழ் பகுதிக்கு உருட்டவும்" -#: gitk:3270 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-மேலே>\tஉறுதிமொழி பட்டியலை ஒரு வரி மேலே உருட்டவும்" -#: gitk:3271 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-கீழ்>\tஉறுதிமொழி பட்டியலை ஒரு வரி கீழே உருட்டவும்" -#: gitk:3272 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-பக்கம்மேலே>\tஉறுதிமொழி பட்டியலை ஒரு பக்கம் மேலே உருட்டவும்" -#: gitk:3273 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-பக்கம்கீழ்>\tஉறுதிமொழி பட்டியலை ஒரு பக்கம் கீழே உருட்டவும்" -#: gitk:3274 msgid "\tFind backwards (upwards, later commits)" msgstr "<உயர்த்து-மேலே>\tபின்னோக்கி கண்டுபிடி (மேல்நோக்கி, பின்னர் உறுதிமொழிகள்)" -#: gitk:3275 msgid "\tFind forwards (downwards, earlier commits)" -msgstr "" -"<உயர்த்து-கீழே>\tமுன்னோக்குகளைக் கண்டறியவும் (கீழ்நோக்கி, முந்தைய " -"உறுதிமொழிகள்)" +msgstr "<உயர்த்து-கீழே>\tமுன்னோக்குகளைக் கண்டறியவும் (கீழ்நோக்கி, முந்தைய உறுதிமொழிகள்)" -#: gitk:3276 msgid ", b\tScroll diff view up one page" msgstr "<நீக்கு>, b\tசுருள் வேறுபாடு ஒரு பக்கத்தை மேலே காண்க" -#: gitk:3277 msgid "\tScroll diff view up one page" msgstr "<பின்வெளி>\tசுருள் வேறுபாடு ஒரு பக்கத்தை மேலே காண்க" -#: gitk:3278 msgid "\t\tScroll diff view down one page" msgstr "\t\tசுருள் வேறுபாடு ஒரு பக்கத்தைக் கீழே காண்க" -#: gitk:3279 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tசுருள் வேறுபாடு 18 வரிகளை மேலே காண்க" -#: gitk:3280 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tசுருள் வேறுபாடு 18 வரிகளைக் கீழே காண்க" -#: gitk:3281 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tகண்டுபிடி" -#: gitk:3282 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tஅடுத்த கண்டுபிடிப்பு வெற்றிக்கு செல்" -#: gitk:3283 msgid "\tMove to next find hit" msgstr "<திரும்பு>\tஅடுத்ததைக் கண்டுபிடி" -#: gitk:3284 msgid "g\t\tGo to commit" msgstr "g\t\tஉறுதிமொழிக்கு செல்" -#: gitk:3285 msgid "/\t\tFocus the search box" msgstr "/\t\tதேடல் பெட்டியில் கவனம் செலுத்து" -#: gitk:3286 msgid "?\t\tMove to previous find hit" msgstr "?\t\tமுந்தைய கண்டுபிடிப்பு வெற்றிக்கு செல்" -#: gitk:3287 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tஅடுத்த கோப்பிற்கு உருள் வேறுபாடு பார்வை" -#: gitk:3288 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tவேறுபாடு பார்வையில் அடுத்த வெற்றியைத் தேடுங்கள்" -#: gitk:3289 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-r> வேறுபட்ட பார்வையில் முந்தைய வெற்றியைத் தேடுங்கள்" -#: gitk:3290 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tஎழுத்துரு அளவை அதிகரி" -#: gitk:3291 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tஎழுத்துரு அளவை அதிகரி" -#: gitk:3292 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tஎழுத்துரு அளவைக் குறை" -#: gitk:3293 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tஎழுத்துரு அளவைக் குறை" -#: gitk:3294 msgid "\t\tUpdate" msgstr "\t\tபுதுப்பிப்பு" -#: gitk:3761 gitk:3770 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "தற்காலிக அடைவு %s ஐ உருவாக்குவது பிழை:" -#: gitk:3783 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "%s இலிருந்து \" %s\" பெறுவது பிழை:" -#: gitk:3846 msgid "command failed:" msgstr "கட்டளை தோல்வியுற்றது:" -#: gitk:3995 msgid "No such commit" msgstr "அத்தகைய உறுதிமொழி இல்லை" -#: gitk:4009 msgid "git gui blame: command failed:" msgstr "அறிவிலி இடைமுக பழி: கட்டளை தோல்வியுற்றது:" -#: gitk:4040 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "ஒன்றிணைப்பு தலையைப் படிக்க முடியவில்லை: %s" -#: gitk:4048 #, tcl-format msgid "Error reading index: %s" msgstr "பிழை வாசிப்பு குறியீடு: %s" -#: gitk:4073 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "அறிவிலி பழியைத் தொடங்க முடியவில்லை: %s" -#: gitk:4076 gitk:6965 msgid "Searching" msgstr "தேடுகிறது" -#: gitk:4108 #, tcl-format msgid "Error running git blame: %s" msgstr "பிழை இயங்கும் அறிவிலி பழி: %s" -#: gitk:4136 #, tcl-format msgid "That line comes from commit %s, which is not in this view" -msgstr "" -"அந்த வரி உறுதிமொழி %s என்பதிலிருந்து வருகிறது, இது இந்த பார்வையில் இல்லை" +msgstr "அந்த வரி உறுதிமொழி %s என்பதிலிருந்து வருகிறது, இது இந்த பார்வையில் இல்லை" -#: gitk:4150 msgid "External diff viewer failed:" msgstr "வெளிப்புற வேறுபாடு பார்வையாளர் தோல்வியுற்றது:" -#: gitk:4254 msgid "All files" msgstr "அனைத்து கோப்புகளும்" -#: gitk:4278 msgid "View" msgstr "காண்க" -#: gitk:4281 msgid "Gitk view definition" msgstr "அறிவிலிகே பார்வை வரையறை" -#: gitk:4285 msgid "Remember this view" msgstr "இந்த பார்வையை நினைவில் கொள்ளுங்கள்" -#: gitk:4286 msgid "References (space separated list):" msgstr "குறிப்புகள் (இடைவெளி பிரிக்கப்பட்ட பட்டியல்):" -#: gitk:4287 msgid "Branches & tags:" msgstr "கிளைகள் மற்றும் குறிச்சொற்கள்:" -#: gitk:4288 msgid "All refs" msgstr "அனைத்து குறிப்புகள்" -#: gitk:4289 msgid "All (local) branches" msgstr "அனைத்து (உள்ளக) கிளைகளும்" -#: gitk:4290 msgid "All tags" msgstr "அனைத்து குறிச்சொற்களும்" -#: gitk:4291 msgid "All remote-tracking branches" msgstr "அனைத்து தொலை-கண்காணிப்பு கிளைகளும்" -#: gitk:4292 msgid "Commit Info (regular expressions):" msgstr "உறுதிமொழி செய்தி (வழக்கமான வெளிப்பாடுகள்):" -#: gitk:4293 msgid "Author:" msgstr "ஆசிரியர்:" -#: gitk:4294 msgid "Committer:" msgstr "உறுதிமொழிபவர்:" -#: gitk:4295 msgid "Commit Message:" msgstr "உறுதிமொழி செய்தி:" -#: gitk:4296 msgid "Matches all Commit Info criteria" msgstr "அனைத்து உறுதிமொழி செய்தி அளவுகோல்களையும் பொருத்துகிறது" -#: gitk:4297 msgid "Matches no Commit Info criteria" msgstr "உறுதிமொழி செய்தி அளவுகோல்களுடன் பொருந்தவில்லை" -#: gitk:4298 msgid "Changes to Files:" msgstr "கோப்புகளில் மாற்றங்கள்:" -#: gitk:4299 msgid "Fixed String" msgstr "நிலையான சரம்" -#: gitk:4300 msgid "Regular Expression" msgstr "வழக்கமான வெளிப்பாடு" -#: gitk:4301 msgid "Search string:" msgstr "தேடல் சரம்:" -#: gitk:4302 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" msgstr "" -"உறுதிமொழி தேதிகள் (\"2 வாரங்களுக்கு முன்பு\", \"2009-01-16 15:27:38\", \"மார்ச் 17, " -"2009 15:27:38\"):" +"உறுதிமொழி தேதிகள் (\"2 வாரங்களுக்கு முன்பு\", \"2009-01-16 15:27:38\", \"மார்ச் " +"17, 2009 15:27:38\"):" -#: gitk:4303 msgid "Since:" msgstr "பின்னர்:" -#: gitk:4304 msgid "Until:" msgstr "வரை:" -#: gitk:4305 msgid "Limit and/or skip a number of revisions (positive integer):" -msgstr "" -"பல திருத்தங்களை (நேர்மறை முழு எண்) கட்டுப்படுத்து மற்றும்/அல்லது தவிர்:" +msgstr "பல திருத்தங்களை (நேர்மறை முழு எண்) கட்டுப்படுத்து மற்றும்/அல்லது தவிர்:" -#: gitk:4306 msgid "Number to show:" msgstr "காண்பிக்க எண்:" -#: gitk:4307 msgid "Number to skip:" msgstr "தவிர்க்க எண்:" -#: gitk:4308 msgid "Miscellaneous options:" msgstr "இதர விருப்பங்கள்:" -#: gitk:4309 msgid "Strictly sort by date" msgstr "கண்டிப்பாக தேதியின்படி வரிசைப்படுத்து" -#: gitk:4310 msgid "Mark branch sides" msgstr "கிளை பக்கங்களைக் குறி" -#: gitk:4311 msgid "Limit to first parent" msgstr "முதல் பெற்றோருக்கு வரம்பு" -#: gitk:4312 msgid "Simple history" msgstr "எளிய வரலாறு" -#: gitk:4313 msgid "Additional arguments to git log:" msgstr "அறிவிலி பதிவுக்கு கூடுதல் வாதங்கள்:" -#: gitk:4314 msgid "Enter files and directories to include, one per line:" msgstr "சேர்க்க கோப்புகள் மற்றும் கோப்பகங்களை உள்ளிடவும், ஒரு வரிக்கு ஒன்று:" -#: gitk:4315 msgid "Command to generate more commits to include:" msgstr "சேர்க்க கூடுதல் உறுதிமொழிகளை உருவாக்க கட்டளை:" -#: gitk:4439 msgid "Gitk: edit view" msgstr "அறிவிலிகே: திருத்து பார்வை" -#: gitk:4447 msgid "-- criteria for selecting revisions" msgstr "-- திருத்தங்களைத் தேர்ந்தெடுப்பதற்கான அளவுகோல்கள்" -#: gitk:4452 msgid "View Name" msgstr "பெயரைக் காண்க" -#: gitk:4527 msgid "Apply (F5)" msgstr "இடு (F5)" -#: gitk:4565 msgid "Error in commit selection arguments:" msgstr "உறுதிமொழி தேர்வு வாதங்களில் பிழை:" -#: gitk:4620 gitk:4673 gitk:5135 gitk:5149 gitk:6419 gitk:12820 gitk:12821 msgid "None" msgstr "எதுவுமில்லை" -#: gitk:5232 gitk:5237 msgid "Descendant" msgstr "வழித்தோன்றல்" -#: gitk:5233 msgid "Not descendant" msgstr "வழித்தோன்றல் அல்ல" -#: gitk:5240 gitk:5245 msgid "Ancestor" msgstr "மூதாதையர்" -#: gitk:5241 msgid "Not ancestor" msgstr "மூதாதையர் அல்ல" -#: gitk:5535 msgid "Local changes checked in to index but not committed" -msgstr "" -"உள்ளக மாற்றங்கள் குறியீட்டில் சரிபார்க்கப்பட்டன, ஆனால் உறுதிமொழியவில்லை" +msgstr "உள்ளக மாற்றங்கள் குறியீட்டில் சரிபார்க்கப்பட்டன, ஆனால் உறுதிமொழியவில்லை" -#: gitk:5571 msgid "Local uncommitted changes, not checked in to index" msgstr "உள்ளக உறுதிமொழியாத மாற்றங்கள், குறியீட்டில் சரிபார்க்கப்படவில்லை" -#: gitk:7319 msgid "Error starting web browser:" msgstr "வலை உலாவியைத் தொடங்குவதில் பிழை:" -#: gitk:7380 msgid "and many more" msgstr "மற்றும் மேலும் பல" -#: gitk:7383 msgid "many" msgstr "பல" -#: gitk:7578 msgid "Tags:" msgstr "குறிச்சொற்கள்:" -#: gitk:7595 gitk:7601 gitk:9081 msgid "Parent" msgstr "பெற்றோர்" -#: gitk:7606 msgid "Child" msgstr "குழந்தை" -#: gitk:7615 msgid "Branch" msgstr "கிளை" -#: gitk:7618 msgid "Follows" msgstr "பின்வருமாறு" -#: gitk:7621 msgid "Precedes" msgstr "முன்னால்" -#: gitk:8216 #, tcl-format msgid "Error getting diffs: %s" msgstr "வேறுபாடு பெறுவதில் பிழை: %s" -#: gitk:8906 msgid "Goto:" msgstr "செல்:" -#: gitk:8927 #, tcl-format msgid "Short commit ID %s is ambiguous" msgstr "குறுகிய உறுதிமொழி அடையாளம் %s தெளிவற்றவை" -#: gitk:8934 #, tcl-format msgid "Revision %s is not known" msgstr "திருத்தம் %s தெரியவில்லை" -#: gitk:8944 #, tcl-format msgid "Commit ID %s is not known" msgstr "உறுதிமொழி அடையாளம் %s அறியப்படவில்லை" -#: gitk:8946 #, tcl-format msgid "Revision %s is not in the current view" msgstr "திருத்தம் %s தற்போதைய பார்வையில் இல்லை" -#: gitk:9088 gitk:9103 msgid "Date" msgstr "திகதி" -#: gitk:9091 msgid "Children" msgstr "குழந்தைகள்" -#: gitk:9154 #, tcl-format msgid "Reset %s branch to here" msgstr "%s கிளையை இங்கே மீட்டமை" -#: gitk:9156 msgid "Detached head: can't reset" msgstr "பிரிக்கப்பட்ட தலை: மீட்டமைக்க முடியாது" -#: gitk:9261 gitk:9267 msgid "Skipping merge commit " msgstr "ஒன்றிணை உறுதிமொழியை தவர்கிறது " -#: gitk:9276 gitk:9281 msgid "Error getting patch ID for " msgstr "ஒட்டு அடையாளத்தைப் பெறுவதில் பிழை" -#: gitk:9277 gitk:9282 msgid " - stopping\n" msgstr "- நிறுத்துதல்\n" -#: gitk:9287 gitk:9290 gitk:9298 gitk:9312 gitk:9321 msgid "Commit " msgstr "உறுதிமொழி" -#: gitk:9291 msgid "" " is the same patch as\n" " " -msgstr "அதே ஒட்டு\n" +msgstr "" +"அதே ஒட்டு\n" " " -#: gitk:9299 msgid "" " differs from\n" " " -msgstr "இருந்து வேறுபடுகிறது\n" +msgstr "" +"இருந்து வேறுபடுகிறது\n" " " -#: gitk:9301 msgid "" "Diff of commits:\n" "\n" -msgstr "உறுதிமொழியின் வேறுபாடு:\n" +msgstr "" +"உறுதிமொழியின் வேறுபாடு:\n" "\n" -#: gitk:9313 gitk:9322 #, tcl-format msgid " has %s children - stopping\n" msgstr "%s குழந்தைகள் உள்ளனர் - நிறுத்துதல்\n" -#: gitk:9341 #, tcl-format msgid "Error writing commit to file: %s" msgstr "உறுதிமொழி கோப்பில் எழுதுதல் பிழை: %s" -#: gitk:9347 #, tcl-format msgid "Error diffing commits: %s" msgstr "உறுதிமொழிகள் வேறுபாடு பிழை: %s" -#: gitk:9393 msgid "Top" msgstr "மேலே" -#: gitk:9394 msgid "From" msgstr "இருந்து" -#: gitk:9399 msgid "To" msgstr "பெறுநர்" -#: gitk:9423 msgid "Generate patch" msgstr "ஒட்டை உருவாக்கு" -#: gitk:9425 msgid "From:" msgstr "இருந்து:" -#: gitk:9434 msgid "To:" msgstr "இதற்கு:" -#: gitk:9443 msgid "Reverse" msgstr "தலைகீழ்" -#: gitk:9445 gitk:9655 msgid "Output file:" msgstr "வெளியீட்டு கோப்பு:" -#: gitk:9451 msgid "Generate" msgstr "உருவாக்கு" -#: gitk:9489 msgid "Error creating patch:" msgstr "ஒட்டை உருவாக்கு பிழை:" -#: gitk:9512 gitk:9643 gitk:9731 msgid "ID:" msgstr "அடையாளம்:" -#: gitk:9521 msgid "Tag name:" msgstr "குறிச்சொல் பெயர்:" -#: gitk:9524 msgid "Tag message is optional" msgstr "குறிச்சொல் செய்தி விருப்பமானது" -#: gitk:9526 msgid "Tag message:" msgstr "குறிச்சொல் செய்தி:" -#: gitk:9530 gitk:9701 msgid "Create" msgstr "உருவாக்கு" -#: gitk:9548 msgid "No tag name specified" msgstr "குறிச்சொல் பெயர் குறிப்பிடப்படவில்லை" -#: gitk:9552 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "குறிச்சொல் \"%s\" ஏற்கனவே உள்ளது" -#: gitk:9562 msgid "Error creating tag:" msgstr "குறிச்சொல்லை உருவாக்கு பிழை:" -#: gitk:9652 msgid "Command:" msgstr "கட்டளை:" -#: gitk:9660 msgid "Write" msgstr "எழுது" -#: gitk:9678 msgid "Error writing commit:" msgstr "பிழை எழுதுதல் உறுதிமொழி:" -#: gitk:9700 msgid "Create branch" msgstr "கிளையை உருவாக்கு" -#: gitk:9716 #, tcl-format msgid "Rename branch %s" msgstr "%s கிளையை மறுபெயரிடு" -#: gitk:9717 msgid "Rename" msgstr "மறுபெயரிடு" -#: gitk:9741 msgid "Name:" msgstr "பெயர்:" -#: gitk:9765 msgid "Please specify a name for the new branch" msgstr "புதிய கிளைக்கு ஒரு பெயரைக் குறிப்பிடு" -#: gitk:9770 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "கிளை '%s' ஏற்கனவே உள்ளது. மேலெழுதவா?" -#: gitk:9814 msgid "Please specify a new name for the branch" msgstr "கிளைக்கு ஒரு புதிய பெயரைக் குறிப்பிடு" -#: gitk:9877 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" -msgstr "" -"உறுதிமொழி %s ஏற்கனவே கிளை %s சேர்க்கப்பட்டுள்ளன-உண்மையில் அதை மீண்டும் இடவா?" +msgstr "உறுதிமொழி %s ஏற்கனவே கிளை %s சேர்க்கப்பட்டுள்ளன-உண்மையில் அதை மீண்டும் இடவா?" -#: gitk:9882 msgid "Cherry-picking" msgstr "கனி எடுக்கும்" -#: gitk:9891 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1085,7 +831,6 @@ msgstr "" "'%s' கோப்பில் உள்ளக மாற்றங்கள் காரணமாக கனி-எடு தோல்வியடைந்தது. \n" "தயவுசெய்து உங்கள் மாற்றங்களைச் உறுதிமொழி, மீட்டமை அல்லது சேமி பிறகு மீண்டும் முயற்சி." -#: gitk:9897 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1093,31 +838,24 @@ msgstr "" "ஒன்றிணைக்கும் மோதல் காரணமாக கனி-எடு தோல்வியடைந்தது. \n" "அதை தீர்க்க அறிவிலி சிஐகருவியை இயக்க விரும்புகிறீர்களா?" -#: gitk:9913 gitk:9971 msgid "No changes committed" msgstr "எந்த மாற்றங்களும் உறுதிமொழியப்படவில்லை" -#: gitk:9940 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" -msgstr "" -"உறுதிமொழி %s கிளை %s சேர்க்கப்படவில்லை - உண்மையில் அதை மீட்டெடுக்கவா?" +msgstr "உறுதிமொழி %s கிளை %s சேர்க்கப்படவில்லை - உண்மையில் அதை மீட்டெடுக்கவா?" -#: gitk:9945 msgid "Reverting" msgstr "மீட்டெடுத்தல்" -#: gitk:9953 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " "commit, reset or stash your changes and try again." msgstr "" -"பின்வரும் கோப்புகளில் உள்ளக மாற்றங்கள் காரணமாக மீட்டெடு தோல்வியுற்றது:%s " -"தயவுசெய்து உங்கள் மாற்றங்களைச் உறுதிமொழி, மீட்டமை அல்லது " -"சேமி மற்றும் மீண்டும் முயற்சி." +"பின்வரும் கோப்புகளில் உள்ளக மாற்றங்கள் காரணமாக மீட்டெடு தோல்வியுற்றது:%s தயவுசெய்து உங்கள் " +"மாற்றங்களைச் உறுதிமொழி, மீட்டமை அல்லது சேமி மற்றும் மீண்டும் முயற்சி." -#: gitk:9957 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1125,30 +863,22 @@ msgstr "" "ஒன்றிணைக்கும் மோதல் காரணமாக மீட்டெடு தோல்வியடைந்தது. \n" "அதை தீர்க்க அறிவிலி சிஐகருவியை இயக்க விரும்புகிறீர்களா?" -#: gitk:10000 msgid "Confirm reset" msgstr "மீட்டமைப்பை உறுதிப்படுத்து" -#: gitk:10002 #, tcl-format msgid "Reset branch %s to %s?" msgstr "%s கிளையை %s க்கு மீட்டமைக்கவா?" -#: gitk:10004 msgid "Reset type:" msgstr "மீட்டமை வகை:" -#: gitk:10007 msgid "Soft: Leave working tree and index untouched" -msgstr "" -"மென்மை: வேலை செய்யும் மரம் மற்றும் குறியீட்டைத் தீண்டாமல் விடு" +msgstr "மென்மை: வேலை செய்யும் மரம் மற்றும் குறியீட்டைத் தீண்டாமல் விடு" -#: gitk:10010 msgid "Mixed: Leave working tree untouched, reset index" -msgstr "" -"கலப்பு: வேலை செய்யும் மரத்தை தீண்டாமல் விடு, குறியீட்டை மீட்டமை" +msgstr "கலப்பு: வேலை செய்யும் மரத்தை தீண்டாமல் விடு, குறியீட்டை மீட்டமை" -#: gitk:10013 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1156,24 +886,19 @@ msgstr "" "கடினம்: வேலை செய்யும் மரம் மற்றும் குறியீட்டை மீட்டமை \n" "(அனைத்து உள்ளக மாற்றங்களையும் நிராகரி)" -#: gitk:10030 msgid "Resetting" msgstr "மீட்டமைத்தல்" -#: gitk:10103 #, tcl-format msgid "A local branch named %s exists already" msgstr "%s என்ற உள்ளக கிளை ஏற்கனவே உள்ளது" -#: gitk:10111 msgid "Checking out" msgstr "சரிபார்" -#: gitk:10170 msgid "Cannot delete the currently checked-out branch" msgstr "தற்போது சரிபார்க்கப்பட்ட கிளையை நீக்க முடியாது" -#: gitk:10176 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1182,254 +907,193 @@ msgstr "" "கிளை %s மீதான உறுதிமொழிகள் வேறு எந்த கிளையிலும் இல்லை. \n" "உண்மையில் கிளை %s நீக்கவா?" -#: gitk:10207 #, tcl-format msgid "Tags and heads: %s" msgstr "குறிச்சொற்கள் மற்றும் தலைகள்: %s" -#: gitk:10224 msgid "Filter" msgstr "வடிப்பி" -#: gitk:10531 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." msgstr "" -"உறுதிமொழி இடவியல் தகவலை படிப்பதில் பிழை; கிளை மற்றும் அதற்கு " -"முந்தைய/பின்வரும் குறிச்சொல் செய்தி முழுமையடையாது." +"உறுதிமொழி இடவியல் தகவலை படிப்பதில் பிழை; கிளை மற்றும் அதற்கு முந்தைய/பின்வரும் " +"குறிச்சொல் செய்தி முழுமையடையாது." -#: gitk:11508 msgid "Tag" msgstr "குறிச்சொல்" -#: gitk:11512 msgid "Id" msgstr "அடையாளம்" -#: gitk:11595 msgid "Gitk font chooser" msgstr "அறிவிலிகே எழுத்துரு தேர்வு" -#: gitk:11612 msgid "B" msgstr "பி" -#: gitk:11615 msgid "I" msgstr "ஐ" -#: gitk:11734 msgid "Commit list display options" msgstr "உறுதிமொழி பட்டியல் காட்சி விருப்பங்கள்" -#: gitk:11737 msgid "Maximum graph width (lines)" msgstr "அதிகபட்ச வரைபட அகலம் (கோடுகள்)" -#: gitk:11741 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "அதிகபட்ச வரைபட அகலம் (பலகத்தின் %)" -#: gitk:11744 msgid "Show local changes" msgstr "உள்ளக மாற்றங்களைக் காட்டு" -#: gitk:11747 msgid "Hide remote refs" msgstr "தொலை குறிகளை மறை" -#: gitk:11751 msgid "Copy commit ID to clipboard" msgstr "இடைநிலைப்பலகைக்கு அடையாளத்தை நகலெடு" -#: gitk:11755 msgid "Copy commit ID to X11 selection" msgstr "உறுதிமொழி அடையாளத்தை ஃ11 பகுதிக்கு நகலெடு" -#: gitk:11760 msgid "Length of commit ID to copy" msgstr "நகலெடுக்க உறுதிமொழி அடையாளத்தின் நீளம்" -#: gitk:11763 msgid "Diff display options" msgstr "வேறுபாடு காட்சி விருப்பங்கள்" -#: gitk:11765 msgid "Tab spacing" msgstr "தாவல் இடைவெளி" -#: gitk:11769 msgid "Wrap comment text" msgstr "கருத்து உரையை மடி" -#: gitk:11774 msgid "Wrap other text" msgstr "மற்ற உரையை மடி" -#: gitk:11779 msgid "Display nearby tags/heads" msgstr "அருகிலுள்ள குறிச்சொற்கள்/தலைகளைக் காண்பி" -#: gitk:11782 msgid "Maximum # tags/heads to show" msgstr "காண்பிக்க அதிகபட்ச # குறிச்சொற்கள்/தலைகள்" -#: gitk:11785 msgid "Limit diffs to listed paths" msgstr "பட்டியலிடப்பட்ட பாதைகளுக்கு வரம்பு வேறுபடுகிறது" -#: gitk:11788 msgid "Support per-file encodings" msgstr "ஒரு கோப்பு குறியீடுகளை ஆதரி" -#: gitk:11794 gitk:11961 msgid "External diff tool" msgstr "வெளிப்புற வேறுபாடு கருவி" -#: gitk:11795 msgid "Choose..." msgstr "தேர்வு..." -#: gitk:11802 msgid "Web browser" msgstr "வலை உலாவி" -#: gitk:11807 msgid "General options" msgstr "பொது விருப்பங்கள்" -#: gitk:11810 msgid "Use themed widgets" msgstr "கருப்பொருள் நிரல்பலகைகளைப் பயன்படுத்து" -#: gitk:11812 msgid "(change requires restart)" msgstr "(மாற்றத்திற்கு மறுதொடக்கம் தேவை)" -#: gitk:11814 msgid "(currently unavailable)" msgstr "(தற்போது கிடைக்கவில்லை)" -#: gitk:11826 msgid "Colors: press to choose" msgstr "நிறங்கள்: தேர்வு செய்ய அழுத்தவும்" -#: gitk:11829 msgid "Interface" msgstr "இடைமுகம்" -#: gitk:11830 msgid "interface" msgstr "இடைமுகம்" -#: gitk:11833 msgid "Background" msgstr "பின்னணி" -#: gitk:11834 gitk:11876 msgid "background" msgstr "பின்னணி" -#: gitk:11837 msgid "Foreground" msgstr "முன்புறம்" -#: gitk:11838 msgid "foreground" msgstr "முன்புறம்" -#: gitk:11841 msgid "Diff: old lines" msgstr "வேறுபாடு: பழைய வரிகள்" -#: gitk:11842 msgid "diff old lines" msgstr "பழைய வரிகள் வேறுபாடு" -#: gitk:11846 msgid "Diff: old lines bg" msgstr "வேறுபாடு: பழைய வரிகள் பின்ணனி" -#: gitk:11848 msgid "diff old lines bg" msgstr "பழைய வரிகள் பின்ணனி வேறுபாடு" -#: gitk:11852 msgid "Diff: new lines" msgstr "வேறுபாடு: புதிய கோடுகள்" -#: gitk:11853 msgid "diff new lines" msgstr "புதிய வரிகள் வேறுபாடு" -#: gitk:11857 msgid "Diff: new lines bg" msgstr "வேறுபாடு: புதிய வரிகள் பின்ணனி" -#: gitk:11859 msgid "diff new lines bg" msgstr "புதிய வரிகளை பின்ணனி வேறுபாடு" -#: gitk:11863 msgid "Diff: hunk header" msgstr "வேறுபாடு: அங்க் தலைப்பு" -#: gitk:11865 msgid "diff hunk header" msgstr "அங்க் தலைப்பு வேறுபாடு" -#: gitk:11869 msgid "Marked line bg" msgstr "குறிக்கப்பட்ட வரி பின்னணி" -#: gitk:11871 msgid "marked line background" msgstr "குறிக்கப்பட்ட வரி பின்னணி" -#: gitk:11875 msgid "Select bg" msgstr "பின்னணி தேர்வு" -#: gitk:11884 msgid "Fonts: press to choose" msgstr "எழுத்துருக்கள்: தேர்வு செய்ய அழுத்து" -#: gitk:11886 msgid "Main font" msgstr "முதன்மையான எழுத்துரு" -#: gitk:11887 msgid "Diff display font" msgstr "காட்சி எழுத்துரு வேறுபாடு" -#: gitk:11888 msgid "User interface font" msgstr "பயனர் இடைமுக எழுத்துரு" -#: gitk:11910 msgid "Gitk preferences" msgstr "அறிவிலிகே விருப்பத்தேர்வுகள்" -#: gitk:11919 msgid "General" msgstr "பொது" -#: gitk:11920 msgid "Colors" msgstr "நிறங்கள்" -#: gitk:11921 msgid "Fonts" msgstr "எழுத்துருக்கள்" -#: gitk:11971 #, tcl-format msgid "Gitk: choose color for %s" msgstr "அறிவிலிகே: %s க்கு வண்ணத்தைத் தேர்வுசெய்க" -#: gitk:12490 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -1437,16 +1101,13 @@ msgstr "" "மன்னிக்கவும், டிசிஎல்/டிகேயின் இந்த பதிப்பைக் கொண்டு அறிவிலிகே இயக்க முடியாது. \n" "அறிவிலிகேவுக்கு குறைந்தபட்சம் டிசிஎல்/டிகே 8.4 தேவைப்படுகிறது." -#: gitk:12711 msgid "Cannot find a git repository here." msgstr "இங்கே ஒரு அறிவிலி களஞ்சியத்தைக் கண்டுபிடிக்க முடியவில்லை." -#: gitk:12758 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "தெளிவற்ற வாதம் '%s': திருத்தம் மற்றும் கோப்பு பெயர்" -#: gitk:12770 msgid "Bad arguments to gitk:" msgstr "அறிவிலிகேவிற்கு மோசமான வாதங்கள்:" diff --git a/po/vi.po b/po/vi.po index 59674986604891..c12a7dff775234 100644 --- a/po/vi.po +++ b/po/vi.po @@ -18,32 +18,25 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Gtranslator 2.91.7\n" -#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Không thể lấy danh sách các tập-tin chưa được hòa trộn:" -#: gitk:212 gitk:2381 msgid "Color words" msgstr "Tô màu chữ" -#: gitk:217 gitk:2381 gitk:8220 gitk:8253 msgid "Markup words" msgstr "Đánh dấu chữ" -#: gitk:324 msgid "Error parsing revisions:" msgstr "Gặp lỗi khi phân tích điểm xét duyệt:" -#: gitk:380 msgid "Error executing --argscmd command:" msgstr "Gặp lỗi khi thực hiện lệnh --argscmd:" -#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Chưa chọn tập tin: --merge đã chỉ định nhưng không có tập tin chưa hòa trộn." -#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -51,314 +44,234 @@ msgstr "" "Chưa chọn tập tin: --merge đã chỉ định nhưng không có tập tin chưa hòa trộn " "trong giới hạn tập tin." -#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "Gặp lỗi khi thực hiện lệnh git log:" -#: gitk:436 gitk:582 msgid "Reading" msgstr "Đang đọc" -#: gitk:496 gitk:4525 msgid "Reading commits..." msgstr "Đang đọc các lần chuyển giao…" -#: gitk:499 gitk:1637 gitk:4528 msgid "No commits selected" msgstr "Chưa chọn các lần chuyển giao" -#: gitk:1445 gitk:4045 gitk:12432 msgid "Command line" msgstr "Dòng lệnh" -#: gitk:1511 msgid "Can't parse git log output:" msgstr "Không thể phân tích kết xuất từ lệnh git log:" -#: gitk:1740 msgid "No commit information available" msgstr "Không có thông tin về lần chuyển giao nào" -#: gitk:1903 gitk:1932 gitk:4315 gitk:9669 gitk:11241 gitk:11521 msgid "OK" msgstr "Đồng ý" -#: gitk:1934 gitk:4317 gitk:9196 gitk:9275 gitk:9391 gitk:9440 gitk:9671 -#: gitk:11242 gitk:11522 msgid "Cancel" msgstr "Thôi" -#: gitk:2069 msgid "&Update" msgstr "Cập nhật" -#: gitk:2070 msgid "&Reload" msgstr "Tải lại" -#: gitk:2071 msgid "Reread re&ferences" msgstr "Đọc lại tham chiếu" -#: gitk:2072 msgid "&List references" msgstr "Liệt kê các tham chiếu" -#: gitk:2074 msgid "Start git &gui" msgstr "Khởi chạy git gui" -#: gitk:2076 msgid "&Quit" msgstr "Thoát" -#: gitk:2068 msgid "&File" msgstr "Chính" -#: gitk:2080 msgid "&Preferences" msgstr "Tùy thích" -#: gitk:2079 msgid "&Edit" msgstr "Chỉnh sửa" -#: gitk:2084 msgid "&New view..." msgstr "Thêm trình bày mới…" -#: gitk:2085 msgid "&Edit view..." msgstr "Sửa cách trình bày…" -#: gitk:2086 msgid "&Delete view" msgstr "Xóa cách trình bày" -#: gitk:2088 gitk:4043 msgid "&All files" msgstr "Mọi tập tin" -#: gitk:2083 gitk:4067 msgid "&View" msgstr "Trình bày" -#: gitk:2093 gitk:2103 gitk:3012 msgid "&About gitk" msgstr "Giới thiệu về gitk" -#: gitk:2094 gitk:2108 msgid "&Key bindings" msgstr "Tổ hợp phím" -#: gitk:2092 gitk:2107 msgid "&Help" msgstr "Trợ giúp" -#: gitk:2185 gitk:8652 msgid "SHA1 ID:" msgstr "SHA1 ID:" -#: gitk:2229 msgid "Row" msgstr "Hàng" -#: gitk:2267 msgid "Find" msgstr "Tìm" -#: gitk:2295 msgid "commit" msgstr "lần chuyển giao" -#: gitk:2299 gitk:2301 gitk:4687 gitk:4710 gitk:4734 gitk:6755 gitk:6827 -#: gitk:6912 msgid "containing:" msgstr "có chứa:" -#: gitk:2302 gitk:3526 gitk:3531 gitk:4763 msgid "touching paths:" msgstr "đang chạm đường dẫn:" -#: gitk:2303 gitk:4777 msgid "adding/removing string:" msgstr "thêm/gỡ bỏ chuỗi:" -#: gitk:2304 gitk:4779 msgid "changing lines matching:" msgstr "những dòng thay đổi khớp mẫu:" -#: gitk:2313 gitk:2315 gitk:4766 msgid "Exact" msgstr "Chính xác" -#: gitk:2315 gitk:4854 gitk:6723 msgid "IgnCase" msgstr "BquaHt" -#: gitk:2315 gitk:4736 gitk:4852 gitk:6719 msgid "Regexp" msgstr "BTCQ" -#: gitk:2317 gitk:2318 gitk:4874 gitk:4904 gitk:4911 gitk:6848 gitk:6916 msgid "All fields" msgstr "Mọi trường" -#: gitk:2318 gitk:4871 gitk:4904 gitk:6786 msgid "Headline" msgstr "Nội dung chính" -#: gitk:2319 gitk:4871 gitk:6786 gitk:6916 gitk:7389 msgid "Comments" msgstr "Ghi chú" -#: gitk:2319 gitk:4871 gitk:4876 gitk:4911 gitk:6786 gitk:7324 gitk:8830 -#: gitk:8845 msgid "Author" msgstr "Tác giả" -#: gitk:2319 gitk:4871 gitk:6786 gitk:7326 msgid "Committer" msgstr "Người chuyển giao" -#: gitk:2350 msgid "Search" msgstr "Tìm kiếm" -#: gitk:2358 msgid "Diff" msgstr "So sánh" -#: gitk:2360 msgid "Old version" msgstr "Phiên bản cũ" -#: gitk:2362 msgid "New version" msgstr "Phiên bản mới" -#: gitk:2364 msgid "Lines of context" msgstr "Các dòng của nội dung" -#: gitk:2374 msgid "Ignore space change" msgstr "Không xét đến thay đổi do khoảng trắng" -#: gitk:2378 gitk:2380 gitk:7959 gitk:8206 msgid "Line diff" msgstr "Khác biệt theo dòng" -#: gitk:2445 msgid "Patch" msgstr "Vá" -#: gitk:2447 msgid "Tree" msgstr "Cây" -#: gitk:2617 gitk:2637 msgid "Diff this -> selected" msgstr "So sánh cái này -> cái đã chọn" -#: gitk:2618 gitk:2638 msgid "Diff selected -> this" msgstr "So sánh cái đã chọn -> cái này" -#: gitk:2619 gitk:2639 msgid "Make patch" msgstr "Tạo miếng vá" -#: gitk:2620 gitk:9254 msgid "Create tag" msgstr "Tạo thẻ" -#: gitk:2621 gitk:9371 msgid "Write commit to file" msgstr "Ghi lần chuyển giao ra tập tin" -#: gitk:2622 gitk:9428 msgid "Create new branch" msgstr "Tạo nhánh mới" -#: gitk:2623 msgid "Cherry-pick this commit" msgstr "Cherry-pick lần chuyển giao này" -#: gitk:2624 msgid "Reset HEAD branch to here" msgstr "Đặt lại HEAD của nhánh vào đây" -#: gitk:2625 msgid "Mark this commit" msgstr "Đánh dấu lần chuyển giao này" -#: gitk:2626 msgid "Return to mark" msgstr "Quay lại vị trí dấu" -#: gitk:2627 msgid "Find descendant of this and mark" msgstr "Tìm con cháu của cái này và cái đã đánh dấu" -#: gitk:2628 msgid "Compare with marked commit" msgstr "So sánh với lần chuyển giao đã đánh dấu" -#: gitk:2629 gitk:2640 msgid "Diff this -> marked commit" msgstr "So sánh cái này -> lần chuyển giao đã đánh dấu" -#: gitk:2630 gitk:2641 msgid "Diff marked commit -> this" msgstr "So sánh lần chuyển giao đã đánh dấu -> cái này" -#: gitk:2631 msgid "Revert this commit" msgstr "Hoàn lại lần chuyển giao này" -#: gitk:2647 msgid "Check out this branch" msgstr "Lấy ra nhánh này" -#: gitk:2648 msgid "Remove this branch" msgstr "Gỡ bỏ nhánh này" -#: gitk:2649 msgid "Copy branch name" msgstr "Chép tên nhánh" -#: gitk:2656 msgid "Highlight this too" msgstr "Cũng tô sáng nó" -#: gitk:2657 msgid "Highlight this only" msgstr "Chỉ tô sáng cái này" -#: gitk:2658 msgid "External diff" msgstr "diff từ bên ngoài" -#: gitk:2659 msgid "Blame parent commit" msgstr "Xem công trạng lần chuyển giao cha mẹ" -#: gitk:2660 msgid "Copy path" msgstr "Chép đường dẫn" -#: gitk:2667 msgid "Show origin of this line" msgstr "Hiển thị nguyên gốc của dòng này" -#: gitk:2668 msgid "Run git gui blame on this line" msgstr "Chạy lệnh git gui blame cho dòng này" -#: gitk:3014 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -374,318 +287,246 @@ msgstr "" "\n" "Dùng và phân phối lại phần mềm này theo các điều khoản của Giấy Phép Công GNU" -#: gitk:3022 gitk:3089 gitk:9857 msgid "Close" msgstr "Đóng" -#: gitk:3043 msgid "Gitk key bindings" msgstr "Tổ hợp phím gitk" -#: gitk:3046 msgid "Gitk key bindings:" msgstr "Tổ hợp phím gitk:" -#: gitk:3048 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tThoát" -#: gitk:3049 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tĐóng cửa sổ" -#: gitk:3050 msgid "\t\tMove to first commit" msgstr "\t\tChuyển đến lần chuyển giao đầu tiên" -#: gitk:3051 msgid "\t\tMove to last commit" msgstr "\t\tChuyển đến lần chuyển giao cuối" -#: gitk:3052 msgid ", p, k\tMove up one commit" msgstr ", p, k\tDi chuyển lên một lần chuyển giao" -#: gitk:3053 msgid ", n, j\tMove down one commit" msgstr ", n, j\tDi chuyển xuống một lần chuyển giao" -#: gitk:3054 msgid ", z, h\tGo back in history list" msgstr ", z, h\tQuay trở lại danh sách lịch sử" -#: gitk:3055 msgid ", x, l\tGo forward in history list" msgstr ", x, l\tDi chuyển tiếp trong danh sách lịch sử" -#: gitk:3056 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "" "<%s-n>\tĐến cha thứ n của lần chuyển giao hiện tại trong danh sách lịch sử" -#: gitk:3057 msgid "\tMove up one page in commit list" msgstr "\tDi chuyển lên một trang trong danh sách lần chuyển giao" -#: gitk:3058 msgid "\tMove down one page in commit list" msgstr "\tDi chuyển xuống một trang trong danh sách lần chuyển giao" -#: gitk:3059 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tCuộn lên trên cùng của danh sách lần chuyển giao" -#: gitk:3060 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tCuộn xuống dưới cùng của danh sách lần chuyển giao" -#: gitk:3061 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\tCuộn danh sách lần chuyển giao lên một dòng" -#: gitk:3062 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\tCuộn danh sách lần chuyển giao xuống một dòng" -#: gitk:3063 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tCuộn danh sách lần chuyển giao lên một trang" -#: gitk:3064 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tCuộn danh sách lần chuyển giao xuống một trang" -#: gitk:3065 msgid "\tFind backwards (upwards, later commits)" msgstr "\tTìm về phía sau (hướng lên trên, lần chuyển giao sau này)" -#: gitk:3066 msgid "\tFind forwards (downwards, earlier commits)" msgstr "" "\tTìm về phía trước (hướng xuống dưới, lần chuyển giao trước đây)" -#: gitk:3067 msgid ", b\tScroll diff view up one page" msgstr ", b\tCuộn phần trình bày diff lên một trang" -#: gitk:3068 msgid "\tScroll diff view up one page" msgstr "\tCuộn phần trình bày diff lên một trang" -#: gitk:3069 msgid "\t\tScroll diff view down one page" msgstr "\t\tCuộn phần trình bày diff xuống một trang" -#: gitk:3070 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tCuộn phần trình bày diff lên 18 dòng" -#: gitk:3071 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tCuộn phần trình bày diff xuống 18 dòng" -#: gitk:3072 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tTìm kiếm" -#: gitk:3073 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tDi chuyển đến chỗ gặp kế tiếp" -#: gitk:3074 msgid "\tMove to next find hit" msgstr "\t\tDi chuyển đến chỗ gặp kế tiếp" -#: gitk:3075 msgid "g\t\tGo to commit" msgstr "g\t\tChuyển đến lần chuyển giao" -#: gitk:3076 msgid "/\t\tFocus the search box" msgstr "/\t\tĐưa con trỏ chuột vào ô tìm kiếm" -#: gitk:3077 msgid "?\t\tMove to previous find hit" msgstr "?\t\tDi chuyển đến chỗ gặp kế trước" -#: gitk:3078 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tCuộn phần trình bày diff sang tập-tin kế" -#: gitk:3079 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tTìm đến chỗ khác biệt kế tiếp" -#: gitk:3080 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tTìm đến chỗ khác biệt kế trước" -#: gitk:3081 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\tTăng cỡ chữ" -#: gitk:3082 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tTăng cỡ chữ" -#: gitk:3083 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\tGiảm cỡ chữ" -#: gitk:3084 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tGiảm cỡ chữ" -#: gitk:3085 msgid "\t\tUpdate" msgstr "\t\tCập nhật" -#: gitk:3550 gitk:3559 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Gặp lỗi khi tạo thư mục tạm %s:" -#: gitk:3572 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Lỗi chào hỏi \"%s\" từ %s:" -#: gitk:3635 msgid "command failed:" msgstr "lệnh gặp lỗi:" -#: gitk:3784 msgid "No such commit" msgstr "Không có lần chuyển giao như vậy" -#: gitk:3798 msgid "git gui blame: command failed:" msgstr "git gui blame: lệnh gặp lỗi:" -#: gitk:3829 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Không thể độc đầu của hòa trộn: %s" # tcl-format -#: gitk:3837 #, tcl-format msgid "Error reading index: %s" msgstr "Gặp lỗi khi đọc chỉ mục: %s" -#: gitk:3862 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Không thể khởi chạy git blame: %s" -#: gitk:3865 gitk:6754 msgid "Searching" msgstr "Đang tìm kiếm" -#: gitk:3897 #, tcl-format msgid "Error running git blame: %s" msgstr "Gặp lỗi khi chạy git blame: %s" -#: gitk:3925 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Dòng đến từ lần chuyển giao %s, cái mà không trong trình bày này" -#: gitk:3939 msgid "External diff viewer failed:" msgstr "Bộ trình bày diff từ bên ngoài gặp lỗi:" -#: gitk:4070 msgid "Gitk view definition" msgstr "Định nghĩa cách trình bày gitk" -#: gitk:4074 msgid "Remember this view" msgstr "Nhớ cách trình bày này" -#: gitk:4075 msgid "References (space separated list):" msgstr "Tham chiếu (danh sách ngăn cách bằng dấu cách):" -#: gitk:4076 msgid "Branches & tags:" msgstr "Nhánh & thẻ:" -#: gitk:4077 msgid "All refs" msgstr "Mọi tham chiếu" -#: gitk:4078 msgid "All (local) branches" msgstr "Mọi nhánh (nội bộ)" -#: gitk:4079 msgid "All tags" msgstr "Mọi thẻ" -#: gitk:4080 msgid "All remote-tracking branches" msgstr "Mọi nhánh remote-tracking" -#: gitk:4081 msgid "Commit Info (regular expressions):" msgstr "Thông tin chuyển giao (biểu thức chính quy):" -#: gitk:4082 msgid "Author:" msgstr "Tác giả:" -#: gitk:4083 msgid "Committer:" msgstr "Người chuyển giao:" -#: gitk:4084 msgid "Commit Message:" msgstr "Chú thích của lần chuyển giao:" -#: gitk:4085 msgid "Matches all Commit Info criteria" msgstr "Khớp mọi điều kiện Thông tin Chuyển giao" -#: gitk:4086 msgid "Matches no Commit Info criteria" msgstr "Khớp không điều kiện Thông tin Chuyển giao" -#: gitk:4087 msgid "Changes to Files:" msgstr "Đổi thành Tập tin:" -#: gitk:4088 msgid "Fixed String" msgstr "Chuỗi cố định" -#: gitk:4089 msgid "Regular Expression" msgstr "Biểu thức chính quy" -#: gitk:4090 msgid "Search string:" msgstr "Chuỗi tìm kiếm:" -#: gitk:4091 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -693,203 +534,155 @@ msgstr "" "Ngày chuyển giao (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:4092 msgid "Since:" msgstr "Kể từ:" -#: gitk:4093 msgid "Until:" msgstr "Đến:" -#: gitk:4094 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Giới hạn và/hoặc bỏ số của điểm xét (số nguyên âm):" -#: gitk:4095 msgid "Number to show:" msgstr "Số lượng hiển thị:" -#: gitk:4096 msgid "Number to skip:" msgstr "Số lượng sẽ bỏ qua:" -#: gitk:4097 msgid "Miscellaneous options:" msgstr "Tùy chọn hỗn hợp:" -#: gitk:4098 msgid "Strictly sort by date" msgstr "Sắp xếp chặt chẽ theo ngày" -#: gitk:4099 msgid "Mark branch sides" msgstr "Đánh dấu các cạnh nhánh" -#: gitk:4100 msgid "Limit to first parent" msgstr "Giới hạn thành cha mẹ đầu tiên" -#: gitk:4101 msgid "Simple history" msgstr "Lịch sử dạng đơn giản" -#: gitk:4102 msgid "Additional arguments to git log:" msgstr "Đối số bổ xung cho lệnh git log:" -#: gitk:4103 msgid "Enter files and directories to include, one per line:" msgstr "Nhập vào các tập tin và thư mục bao gồm, mỗi dòng một cái:" -#: gitk:4104 msgid "Command to generate more commits to include:" msgstr "Lệnh tạo ra nhiều lần chuyển giao hơn bao gồm:" -#: gitk:4228 msgid "Gitk: edit view" msgstr "Gitk: sửa cách trình bày" -#: gitk:4236 msgid "-- criteria for selecting revisions" msgstr "-- tiêu chuẩn chọn điểm xét duyệt" -#: gitk:4241 msgid "View Name" msgstr "Tên cách trình bày" -#: gitk:4316 msgid "Apply (F5)" msgstr "Áp dụng (F5)" -#: gitk:4354 msgid "Error in commit selection arguments:" msgstr "Lỗi trong các đối số chọn chuyển giao:" -#: gitk:4409 gitk:4462 gitk:4924 gitk:4938 gitk:6208 gitk:12373 gitk:12374 msgid "None" msgstr "Không" -#: gitk:5021 gitk:5026 msgid "Descendant" msgstr "Con cháu" -#: gitk:5022 msgid "Not descendant" msgstr "Không có con cháu" -#: gitk:5029 gitk:5034 msgid "Ancestor" msgstr "Tổ tiên chung" -#: gitk:5030 msgid "Not ancestor" msgstr "Không có chung tổ tiên" -#: gitk:5324 msgid "Local changes checked in to index but not committed" msgstr "" "Có thay đổi nội bộ đã được đưa vào bảng mục lục, nhưng chưa được chuyển giao" -#: gitk:5360 msgid "Local uncommitted changes, not checked in to index" msgstr "Có thay đổi nội bộ, nhưng chưa được đưa vào bảng mục lục" -#: gitk:7134 msgid "and many more" msgstr "và nhiều nữa" -#: gitk:7137 msgid "many" msgstr "nhiều" -#: gitk:7328 msgid "Tags:" msgstr "Thẻ:" -#: gitk:7345 gitk:7351 gitk:8825 msgid "Parent" msgstr "Cha" -#: gitk:7356 msgid "Child" msgstr "Con" -#: gitk:7365 msgid "Branch" msgstr "Nhánh" -#: gitk:7368 msgid "Follows" msgstr "Đứng sau" -#: gitk:7371 msgid "Precedes" msgstr "Đứng trước" # tcl-format -#: gitk:7966 #, tcl-format msgid "Error getting diffs: %s" msgstr "Lỗi lấy diff: %s" -#: gitk:8650 msgid "Goto:" msgstr "Nhảy tới:" -#: gitk:8671 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Định danh SHA1 dạng ngắn %s là chưa đủ rõ ràng" -#: gitk:8678 #, tcl-format msgid "Revision %s is not known" msgstr "Không hiểu điểm xét duyệt %s" -#: gitk:8688 #, tcl-format msgid "SHA1 id %s is not known" msgstr "Không hiểu định danh SHA1 %s" -#: gitk:8690 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Điểm %s không ở trong phần hiển thị hiện tại" -#: gitk:8832 gitk:8847 msgid "Date" msgstr "Ngày" -#: gitk:8835 msgid "Children" msgstr "Con cháu" -#: gitk:8898 #, tcl-format msgid "Reset %s branch to here" msgstr "Đặt lại nhánh %s tại đây" -#: gitk:8900 msgid "Detached head: can't reset" msgstr "Head đã bị tách rời: không thể đặt lại" -#: gitk:9005 gitk:9011 msgid "Skipping merge commit " msgstr "Bỏ qua lần chuyển giao hòa trộn " -#: gitk:9020 gitk:9025 msgid "Error getting patch ID for " msgstr "Gặp lỗi khi lấy ID miếng vá cho " -#: gitk:9021 gitk:9026 msgid " - stopping\n" msgstr " - dừng\n" -#: gitk:9031 gitk:9034 gitk:9042 gitk:9056 gitk:9065 msgid "Commit " msgstr "Commit " -#: gitk:9035 msgid "" " is the same patch as\n" " " @@ -897,7 +690,6 @@ msgstr "" " là cùng một miếng vá với\n" " " -#: gitk:9043 msgid "" " differs from\n" " " @@ -905,7 +697,6 @@ msgstr "" " khác biệt từ\n" " " -#: gitk:9045 msgid "" "Diff of commits:\n" "\n" @@ -913,131 +704,101 @@ msgstr "" "Khác biệt của lần chuyển giao (commit):\n" "\n" -#: gitk:9057 gitk:9066 #, tcl-format msgid " has %s children - stopping\n" msgstr " có %s con - dừng\n" -#: gitk:9085 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Gặp lỗi trong quá trình ghi lần chuyển giao vào tập tin: %s" -#: gitk:9091 #, tcl-format msgid "Error diffing commits: %s" msgstr "Gặp lỗi khi so sánh sự khác biệt giữa các lần chuyển giao: %s" -#: gitk:9137 msgid "Top" msgstr "Đỉnh" -#: gitk:9138 msgid "From" msgstr "Từ" -#: gitk:9143 msgid "To" msgstr "Đến" -#: gitk:9167 msgid "Generate patch" msgstr "Tạo miếng vá" -#: gitk:9169 msgid "From:" msgstr "Từ:" -#: gitk:9178 msgid "To:" msgstr "Đến:" -#: gitk:9187 msgid "Reverse" msgstr "Đảo ngược" -#: gitk:9189 gitk:9385 msgid "Output file:" msgstr "Tập tin kết xuất:" -#: gitk:9195 msgid "Generate" msgstr "Tạo" -#: gitk:9233 msgid "Error creating patch:" msgstr "Gặp lỗi khi tạo miếng vá:" -#: gitk:9256 gitk:9373 gitk:9430 msgid "ID:" msgstr "Mã số:" -#: gitk:9265 msgid "Tag name:" msgstr "Tên thẻ:" -#: gitk:9268 msgid "Tag message is optional" msgstr "Ghi chú thẻ chỉ là tùy chọn" -#: gitk:9270 msgid "Tag message:" msgstr "Ghi chú cho thẻ:" -#: gitk:9274 gitk:9439 msgid "Create" msgstr "Tạo" -#: gitk:9292 msgid "No tag name specified" msgstr "Chưa chỉ ra tên của thẻ" -#: gitk:9296 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Thẻ “%s” đã có sẵn rồi" -#: gitk:9306 msgid "Error creating tag:" msgstr "Gặp lỗi khi tạo thẻ:" -#: gitk:9382 msgid "Command:" msgstr "Lệnh:" -#: gitk:9390 msgid "Write" msgstr "Ghi" -#: gitk:9408 msgid "Error writing commit:" msgstr "Gặp lỗi trong quá trình ghi chuyển giao:" -#: gitk:9435 msgid "Name:" msgstr "Tên:" -#: gitk:9458 msgid "Please specify a name for the new branch" msgstr "Vui lòng chỉ định tên cho nhánh mới" -#: gitk:9463 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Nhánh “%s” đã có từ trước rồi. Ghi đè?" -#: gitk:9530 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "Lần chuyển giao %s đã sẵn được bao gồm trong nhánh %s -- bạn có thực sự muốn " "áp dụng lại nó không?" -#: gitk:9535 msgid "Cherry-picking" msgstr "Đang cherry-pick" -#: gitk:9544 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1046,7 +807,6 @@ msgstr "" "Cherry-pick gặp lỗi bởi vì các thay đổi nội bộ tập tin “%s”.\n" "Xin hãy chuyển giao, reset hay stash các thay đổi của bạn sau đó thử lại." -#: gitk:9550 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1054,22 +814,18 @@ msgstr "" "Cherry-pick gặp lỗi bởi vì xung đột trong hòa trộn.\n" "Bạn có muốn chạy lệnh “git citool” để giải quyết vấn đề này không?" -#: gitk:9566 gitk:9624 msgid "No changes committed" msgstr "Không có thay đổi nào cần chuyển giao" -#: gitk:9593 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "" "Lần chuyển giao %s không được bao gồm trong nhánh %s -- bạn có thực sự muốn " "“revert” nó không?" -#: gitk:9598 msgid "Reverting" msgstr "Đang hoàn tác" -#: gitk:9606 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " @@ -1078,7 +834,6 @@ msgstr "" "Revert gặp lỗi bởi vì tập tin sau đã được thay đổi nội bộ:%s\n" "Xin hãy chạy lệnh “commit”, “reset” hoặc “stash” rồi thử lại." -#: gitk:9610 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" @@ -1086,29 +841,23 @@ msgstr "" "Revert gặp lỗi bởi vì xung đột hòa trộn.\n" " Bạn có muốn chạy lệnh “git citool” để phân giải nó không?" -#: gitk:9653 msgid "Confirm reset" msgstr "Xác nhật đặt lại" -#: gitk:9655 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Đặt lại nhánh “%s” thành “%s”?" -#: gitk:9657 msgid "Reset type:" msgstr "Kiểu đặt lại:" -#: gitk:9660 msgid "Soft: Leave working tree and index untouched" msgstr "Mềm: Không động đến thư mục làm việc và bảng mục lục" -#: gitk:9663 msgid "Mixed: Leave working tree untouched, reset index" msgstr "" "Pha trộn: Không động chạm đến thư mục làm việc nhưng đặt lại bảng mục lục" -#: gitk:9666 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1116,19 +865,15 @@ msgstr "" "Hard: Đặt lại cây làm việc và mục lục\n" "(hủy bỏ MỌI thay đổi nội bộ)" -#: gitk:9683 msgid "Resetting" msgstr "Đang đặt lại" -#: gitk:9743 msgid "Checking out" msgstr "Đang checkout" -#: gitk:9796 msgid "Cannot delete the currently checked-out branch" msgstr "Không thể xóa nhánh hiện tại đang được lấy ra" -#: gitk:9802 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1137,16 +882,13 @@ msgstr "" "Các lần chuyển giao trên nhánh %s không ở trên nhánh khác.\n" "Thực sự muốn xóa nhánh %s?" -#: gitk:9833 #, tcl-format msgid "Tags and heads: %s" msgstr "Thẻ và Đầu: %s" -#: gitk:9850 msgid "Filter" msgstr "Bộ lọc" -#: gitk:10146 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1154,201 +896,152 @@ msgstr "" "Gặp lỗi khi đọc thông tin hình học lần chuyển giao; thông tin nhánh và thẻ " "trước/sau sẽ không hoàn thiện." -#: gitk:11123 msgid "Tag" msgstr "Thẻ" -#: gitk:11127 msgid "Id" msgstr "Id" -#: gitk:11210 msgid "Gitk font chooser" msgstr "Hộp thoại chọn phông Gitk" -#: gitk:11227 msgid "B" msgstr "B" -#: gitk:11230 msgid "I" msgstr "I" -#: gitk:11348 msgid "Commit list display options" msgstr "Các tùy chọn về hiển thị danh sách lần chuyển giao" -#: gitk:11351 msgid "Maximum graph width (lines)" msgstr "Độ rộng biểu đồ tối đa (dòng)" -#: gitk:11355 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "Độ rộng đồ thị tối đa (% của bảng)" -#: gitk:11358 msgid "Show local changes" msgstr "Hiển thị các thay đổi nội bộ" -#: gitk:11361 msgid "Auto-select SHA1 (length)" msgstr "Tự chọn (độ dài) SHA1" -#: gitk:11365 msgid "Hide remote refs" msgstr "Ẩn tham chiếu đến máy chủ" -#: gitk:11369 msgid "Diff display options" msgstr "Các tùy chọn trình bày các khác biệt" -#: gitk:11371 msgid "Tab spacing" msgstr "Khoảng cách tab" -#: gitk:11374 msgid "Display nearby tags/heads" msgstr "Hiển thị các thẻ/đầu xung quanh" -#: gitk:11377 msgid "Maximum # tags/heads to show" msgstr "Số lượng thẻ/đầu tối đa sẽ hiển thị" -#: gitk:11380 msgid "Limit diffs to listed paths" msgstr "Giới hạn các khác biệt cho đường dẫn đã liệt kê" -#: gitk:11383 msgid "Support per-file encodings" msgstr "Hỗ trợ mã hóa mỗi-dòng" -#: gitk:11389 gitk:11536 msgid "External diff tool" msgstr "Công cụ so sánh từ bên ngoài" -#: gitk:11390 msgid "Choose..." msgstr "Chọn…" -#: gitk:11395 msgid "General options" msgstr "Các tùy chọn chung" -#: gitk:11398 msgid "Use themed widgets" msgstr "Dùng các widget chủ đề" -#: gitk:11400 msgid "(change requires restart)" msgstr "(để thay đổi cần khởi động lại)" -#: gitk:11402 msgid "(currently unavailable)" msgstr "(hiện tại không sẵn sàng)" -#: gitk:11413 msgid "Colors: press to choose" msgstr "Màu sắc: bấm vào nút phía dưới để chọn màu" -#: gitk:11416 msgid "Interface" msgstr "Giao diện" -#: gitk:11417 msgid "interface" msgstr "giao diện" -#: gitk:11420 msgid "Background" msgstr "Nền" -#: gitk:11421 gitk:11451 msgid "background" msgstr "nền" -#: gitk:11424 msgid "Foreground" msgstr "Tiền cảnh" -#: gitk:11425 msgid "foreground" msgstr "tiền cảnh" -#: gitk:11428 msgid "Diff: old lines" msgstr "So sánh: dòng cũ" -#: gitk:11429 msgid "diff old lines" msgstr "diff dòng cũ" -#: gitk:11433 msgid "Diff: new lines" msgstr "So sánh: dòng mới" -#: gitk:11434 msgid "diff new lines" msgstr "màu dòng mới" -#: gitk:11438 msgid "Diff: hunk header" msgstr "So sánh: phần đầu của đoạn" -#: gitk:11440 msgid "diff hunk header" msgstr "màu của phần đầu của đoạn khi so sánh" -#: gitk:11444 msgid "Marked line bg" msgstr "Nền dòng đánh dấu" -#: gitk:11446 msgid "marked line background" msgstr "nền dòng được đánh dấu" -#: gitk:11450 msgid "Select bg" msgstr "Màu nền" -#: gitk:11459 msgid "Fonts: press to choose" msgstr "Phông chữ: bấm vào các nút ở dưới để chọn" -#: gitk:11461 msgid "Main font" msgstr "Phông chữ chính" -#: gitk:11462 msgid "Diff display font" msgstr "Phông chữ dùng khi so sánh" -#: gitk:11463 msgid "User interface font" msgstr "Phông chữ giao diện" -#: gitk:11485 msgid "Gitk preferences" msgstr "Cá nhân hóa các cài đặt cho Gitk" -#: gitk:11494 msgid "General" msgstr "Chung" -#: gitk:11495 msgid "Colors" msgstr "Màu sắc" -#: gitk:11496 msgid "Fonts" msgstr "Phông chữ" -#: gitk:11546 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: chọn màu cho %s" -#: gitk:12059 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." @@ -1356,16 +1049,13 @@ msgstr "" "Rất tiếc, gitk không thể chạy Tcl/Tk phiên bản này.\n" " Gitk cần ít nhất là Tcl/Tk 8.4." -#: gitk:12269 msgid "Cannot find a git repository here." msgstr "Không thể tìm thấy kho git ở đây." -#: gitk:12316 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Đối số “%s” chưa rõ ràng: vừa là điểm xét duyệt vừa là tên tập tin" -#: gitk:12328 msgid "Bad arguments to gitk:" msgstr "Đối số cho gitk không hợp lệ:" diff --git a/po/zh_cn.po b/po/zh_cn.po index 17b7f899da3dd4..a2a794a97cd6bf 100644 --- a/po/zh_cn.po +++ b/po/zh_cn.po @@ -2,7 +2,6 @@ # # Translators: # YanKe , 2017 - msgid "" msgstr "" "Project-Id-Version: Git Chinese Localization Project\n" @@ -16,356 +15,266 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Language: zh_CN\n" -#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "不能获取未合并文件列表：" -#: gitk:212 gitk:2403 msgid "Color words" msgstr "着色显示差异" -#: gitk:217 gitk:2403 gitk:8249 gitk:8282 msgid "Markup words" msgstr "标记显示差异" -#: gitk:324 msgid "Error parsing revisions:" msgstr "解析版本错误：" -#: gitk:380 msgid "Error executing --argscmd command:" msgstr "运行 --argscmd命令出错" -#: gitk:393 msgid "No files selected: --merge specified but no files are unmerged." msgstr "没有选中文件：--指定merge参数但没有未合并的文件。" -#: gitk:396 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." msgstr "没有选中文件：--指定merge参数但没有未合并的文件在文件中" -#: gitk:418 gitk:566 msgid "Error executing git log:" msgstr "执行git log命令出错：" -#: gitk:436 gitk:582 msgid "Reading" msgstr "读取中" -#: gitk:496 gitk:4549 msgid "Reading commits..." msgstr "提交记录读取中..." -#: gitk:499 gitk:1641 gitk:4552 msgid "No commits selected" msgstr "未选中任何提交" -#: gitk:1449 gitk:4069 gitk:12583 msgid "Command line" msgstr "命令行" -#: gitk:1515 msgid "Can't parse git log output:" msgstr "不能解析git log输出：" -#: gitk:1744 msgid "No commit information available" msgstr "无可用提交信息" -#: gitk:1907 gitk:1936 gitk:4339 gitk:9789 gitk:11388 gitk:11668 msgid "OK" msgstr "确定" -#: gitk:1938 gitk:4341 gitk:9225 gitk:9304 gitk:9434 gitk:9520 gitk:9791 -#: gitk:11389 gitk:11669 msgid "Cancel" msgstr "取消" -#: gitk:2087 msgid "&Update" msgstr "更新" -#: gitk:2088 msgid "&Reload" msgstr "重新加载" -#: gitk:2089 msgid "Reread re&ferences" msgstr "重新读取引用" -#: gitk:2090 msgid "&List references" msgstr "列出引用(分支以及tag)" -#: gitk:2092 msgid "Start git &gui" msgstr "启动git gui客户端" -#: gitk:2094 msgid "&Quit" msgstr "退出" -#: gitk:2086 msgid "&File" msgstr "文件" -#: gitk:2098 msgid "&Preferences" msgstr "偏好设置" -#: gitk:2097 msgid "&Edit" msgstr "编辑" -#: gitk:2102 msgid "&New view..." msgstr "新视图..." -#: gitk:2103 msgid "&Edit view..." msgstr "编辑视图..." -#: gitk:2104 msgid "&Delete view" msgstr "删除视图" -#: gitk:2106 msgid "&All files" msgstr "所有文件" -#: gitk:2101 msgid "&View" msgstr "视图" -#: gitk:2111 gitk:2121 msgid "&About gitk" msgstr "关于gitk" -#: gitk:2112 gitk:2126 msgid "&Key bindings" msgstr "快捷键" -#: gitk:2110 gitk:2125 msgid "&Help" msgstr "帮助" -#: gitk:2203 gitk:8681 msgid "SHA1 ID:" msgstr "SHA1 ID：" -#: gitk:2247 msgid "Row" msgstr "行" -#: gitk:2285 msgid "Find" msgstr "查找" -#: gitk:2313 msgid "commit" msgstr "提交" -#: gitk:2317 gitk:2319 gitk:4711 gitk:4734 gitk:4758 gitk:6779 gitk:6851 -#: gitk:6936 msgid "containing:" msgstr "包含：" -#: gitk:2320 gitk:3550 gitk:3555 gitk:4787 msgid "touching paths:" msgstr "影响路径：" -#: gitk:2321 gitk:4801 msgid "adding/removing string:" msgstr "增加/删除字符串：" -#: gitk:2322 gitk:4803 msgid "changing lines matching:" msgstr "改变行匹配：" -#: gitk:2331 gitk:2333 gitk:4790 msgid "Exact" msgstr "精确匹配" -#: gitk:2333 gitk:4878 gitk:6747 msgid "IgnCase" msgstr "忽略大小写" -#: gitk:2333 gitk:4760 gitk:4876 gitk:6743 msgid "Regexp" msgstr "正则" -#: gitk:2335 gitk:2336 gitk:4898 gitk:4928 gitk:4935 gitk:6872 gitk:6940 msgid "All fields" msgstr "所有字段" -#: gitk:2336 gitk:4895 gitk:4928 gitk:6810 msgid "Headline" msgstr "标题" -#: gitk:2337 gitk:4895 gitk:6810 gitk:6940 gitk:7413 msgid "Comments" msgstr "提交注释" -#: gitk:2337 gitk:4895 gitk:4900 gitk:4935 gitk:6810 gitk:7348 gitk:8859 -#: gitk:8874 msgid "Author" msgstr "作者" -#: gitk:2337 gitk:4895 gitk:6810 gitk:7350 msgid "Committer" msgstr "提交者" -#: gitk:2371 msgid "Search" msgstr "搜索" -#: gitk:2379 msgid "Diff" msgstr "差异" -#: gitk:2381 msgid "Old version" msgstr "老版本" -#: gitk:2383 msgid "New version" msgstr "新版本" -#: gitk:2386 msgid "Lines of context" msgstr "Diff上下文显示行数" -#: gitk:2396 msgid "Ignore space change" msgstr "忽略空格修改" -#: gitk:2400 gitk:2402 gitk:7983 gitk:8235 msgid "Line diff" msgstr "按行显示差异" -#: gitk:2467 msgid "Patch" msgstr "补丁" -#: gitk:2469 msgid "Tree" msgstr "树" -#: gitk:2639 gitk:2660 msgid "Diff this -> selected" msgstr "比较从当前提交到选中提交的差异" -#: gitk:2640 gitk:2661 msgid "Diff selected -> this" msgstr "比较从选中提交到当前提交的差异" -#: gitk:2641 gitk:2662 msgid "Make patch" msgstr "制作补丁" -#: gitk:2642 gitk:9283 msgid "Create tag" msgstr "创建tag" -#: gitk:2643 msgid "Copy commit summary" msgstr "复制提交摘要" -#: gitk:2644 gitk:9414 msgid "Write commit to file" msgstr "写入提交到文件" -#: gitk:2645 msgid "Create new branch" msgstr "创建新分支" -#: gitk:2646 msgid "Cherry-pick this commit" msgstr "在此提交运用补丁(cherry-pick)命令" -#: gitk:2647 msgid "Reset HEAD branch to here" msgstr "将分支头(HEAD)重置到此处" -#: gitk:2648 msgid "Mark this commit" msgstr "标记此提交" -#: gitk:2649 msgid "Return to mark" msgstr "返回到标记" -#: gitk:2650 msgid "Find descendant of this and mark" msgstr "查找本次提交的子提交并标记" -#: gitk:2651 msgid "Compare with marked commit" msgstr "和已标记的提交作比较" -#: gitk:2652 gitk:2663 msgid "Diff this -> marked commit" msgstr "比较从当前提交到已标记提交的差异" -#: gitk:2653 gitk:2664 msgid "Diff marked commit -> this" msgstr "比较从已标记提交到当前提交的差异" -#: gitk:2654 msgid "Revert this commit" msgstr "撤销(revert)此提交" -#: gitk:2670 msgid "Check out this branch" msgstr "检出(checkout)此分支" -#: gitk:2671 msgid "Rename this branch" msgstr "重命名(Rename)此分支" -#: gitk:2672 msgid "Remove this branch" msgstr "删除(Remove)此分支" -#: gitk:2673 msgid "Copy branch name" msgstr "复制分支名称" -#: gitk:2680 msgid "Highlight this too" msgstr "高亮此处" -#: gitk:2681 msgid "Highlight this only" msgstr "只高亮此处" -#: gitk:2682 msgid "External diff" msgstr "外部diff" -#: gitk:2683 msgid "Blame parent commit" msgstr "Blame父提交" -#: gitk:2684 msgid "Copy path" msgstr "复制路径" -#: gitk:2691 msgid "Show origin of this line" msgstr "显示此行原始提交" -#: gitk:2692 msgid "Run git gui blame on this line" msgstr "在此行运行git gui客户端的blame" -#: gitk:3036 msgid "About gitk" msgstr "关于gitk" -#: gitk:3038 msgid "" "\n" "Gitk - a commit viewer for git\n" @@ -373,995 +282,792 @@ msgid "" "Copyright © 2005-2016 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" -msgstr "\nGitk — 一个git的提交查看器\n\n© 2005-2016 Paul Mackerras\n\n在GNU许可证下使用以及分发" +msgstr "" +"\n" +"Gitk — 一个git的提交查看器\n" +"\n" +"© 2005-2016 Paul Mackerras\n" +"\n" +"在GNU许可证下使用以及分发" -#: gitk:3046 gitk:3113 gitk:10004 msgid "Close" msgstr "关闭" -#: gitk:3067 msgid "Gitk key bindings" msgstr "Gitk快捷键" -#: gitk:3070 msgid "Gitk key bindings:" msgstr "Gitk快捷键：" -#: gitk:3072 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\t退出" -#: gitk:3073 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\t关闭窗口" -#: gitk:3074 msgid "\t\tMove to first commit" msgstr "\t\t移动到第一次提交" -#: gitk:3075 msgid "\t\tMove to last commit" msgstr "\t\t移动到最后一次提交" -#: gitk:3076 msgid ", p, k\tMove up one commit" msgstr ", p, k\t移动到上一次提交" -#: gitk:3077 msgid ", n, j\tMove down one commit" msgstr ", n, j\t移动到下一次提交" -#: gitk:3078 msgid ", z, h\tGo back in history list" msgstr ", z, h\t历史列表的上一项" -#: gitk:3079 msgid ", x, l\tGo forward in history list" msgstr ", x, l\t历史列表的下一项" -#: gitk:3080 #, tcl-format msgid "<%s-n>\tGo to n-th parent of current commit in history list" msgstr "<%s-n>\t在历史列表中前往本次提交的第n个父提交" -#: gitk:3081 msgid "\tMove up one page in commit list" msgstr "\t上一页提交列表" -#: gitk:3082 msgid "\tMove down one page in commit list" msgstr "\t下一页提交列表" -#: gitk:3083 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\t滚动到提交列表顶部" -#: gitk:3084 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\t滚动到提交列表底部" -#: gitk:3085 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Up>\t向上滚动一行提交列表" -#: gitk:3086 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Down>\t向下滚动一行提交列表" -#: gitk:3087 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\t向上滚动一页提交列表" -#: gitk:3088 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\t向下滚动一页提交列表" -#: gitk:3089 msgid "\tFind backwards (upwards, later commits)" msgstr "\t向后查找(向上的，更晚的提交)" -#: gitk:3090 msgid "\tFind forwards (downwards, earlier commits)" msgstr "\t向前查找(向下的，更早的提交)" -#: gitk:3091 msgid ", b\tScroll diff view up one page" msgstr ", b\t向上滚动diff视图一页" -#: gitk:3092 msgid "\tScroll diff view up one page" msgstr "\t向上滚动diff视图一页" -#: gitk:3093 msgid "\t\tScroll diff view down one page" msgstr "\t\t向下滚动diff视图一页" -#: gitk:3094 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\t向上滚动diff视图18行" -#: gitk:3095 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\t向下滚动diff视图18行" -#: gitk:3096 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\t查找" -#: gitk:3097 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\t移动到下一次查找命中" -#: gitk:3098 msgid "\tMove to next find hit" msgstr "\t\t移动到下一次查找命中" -#: gitk:3099 msgid "g\t\tGo to commit" msgstr "g\t\t转到提交" -#: gitk:3100 msgid "/\t\tFocus the search box" msgstr "/\t\t选中搜索框" -#: gitk:3101 msgid "?\t\tMove to previous find hit" msgstr "?\t\t移动到上一次查找命中" -#: gitk:3102 msgid "f\t\tScroll diff view to next file" msgstr "f\t\t滚动diff视图到下一个文件" -#: gitk:3103 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\t在diff视图中查找下一此命中" -#: gitk:3104 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\t在diff视图中查找上一次命中" -#: gitk:3105 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-KP+>\t增大字体大小" -#: gitk:3106 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\t增大字体大小" -#: gitk:3107 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-KP->\t减小字体大小" -#: gitk:3108 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\t减小字体大小" -#: gitk:3109 msgid "\t\tUpdate" msgstr "\t\t更新" -#: gitk:3574 gitk:3583 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "创建临时目录出错%s：" -#: gitk:3596 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "从%s获取\"%s\"出错：" -#: gitk:3659 msgid "command failed:" msgstr "执行命令失败：" -#: gitk:3808 msgid "No such commit" msgstr "无此提交" -#: gitk:3822 msgid "git gui blame: command failed:" msgstr "git gui blame：执行命令失败：" -#: gitk:3853 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "不能读取合并头(merge head)：%s" -#: gitk:3861 #, tcl-format msgid "Error reading index: %s" msgstr "读取索引出错：%s" -#: gitk:3886 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "不能执行git blame：%s" -#: gitk:3889 gitk:6778 msgid "Searching" msgstr "搜索中" -#: gitk:3921 #, tcl-format msgid "Error running git blame: %s" msgstr "运行git blame出错：%s" -#: gitk:3949 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "此行来自提交%s，不在此视图中" -#: gitk:3963 msgid "External diff viewer failed:" msgstr "外部diff查看器失败：" -#: gitk:4067 msgid "All files" msgstr "所有文件" -#: gitk:4091 msgid "View" msgstr "视图" -#: gitk:4094 msgid "Gitk view definition" msgstr "Gitk视图定义" -#: gitk:4098 msgid "Remember this view" msgstr "记住此视图" -#: gitk:4099 msgid "References (space separated list):" msgstr "引用(空格切分的列表)：" -#: gitk:4100 msgid "Branches & tags:" msgstr "分支和tags" -#: gitk:4101 msgid "All refs" msgstr "所有引用" -#: gitk:4102 msgid "All (local) branches" msgstr "所有(本地)分支" -#: gitk:4103 msgid "All tags" msgstr "所有tag" -#: gitk:4104 msgid "All remote-tracking branches" msgstr "所有远程跟踪分支" -#: gitk:4105 msgid "Commit Info (regular expressions):" msgstr "提交信息 (正则表达式)：" -#: gitk:4106 msgid "Author:" msgstr "作者：" -#: gitk:4107 msgid "Committer:" msgstr "提交者：" -#: gitk:4108 msgid "Commit Message:" msgstr "提交信息：" -#: gitk:4109 msgid "Matches all Commit Info criteria" msgstr "匹配所有提交信息标准" -#: gitk:4110 msgid "Matches no Commit Info criteria" msgstr "匹配无提交信息标准" -#: gitk:4111 msgid "Changes to Files:" msgstr "文件修改列表：" -#: gitk:4112 msgid "Fixed String" msgstr "固定字符串" -#: gitk:4113 msgid "Regular Expression" msgstr "正则表达式：" -#: gitk:4114 msgid "Search string:" msgstr "搜索字符串：" -#: gitk:4115 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -msgstr "提交日期 (\"2星期之前\", \"2009-03-17 15:27:38\", \"5月 17, 2009 15:27:38\"):" +msgstr "" +"提交日期 (\"2星期之前\", \"2009-03-17 15:27:38\", \"5月 17, 2009 15:27:38\"):" -#: gitk:4116 msgid "Since:" msgstr "自：" -#: gitk:4117 msgid "Until:" msgstr "到：" -#: gitk:4118 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "限制 且/或 跳过一定数量的版本(正整数)：" -#: gitk:4119 msgid "Number to show:" msgstr "显示数量：" -#: gitk:4120 msgid "Number to skip:" msgstr "跳过数量：" -#: gitk:4121 msgid "Miscellaneous options:" msgstr "其他选项：" -#: gitk:4122 msgid "Strictly sort by date" msgstr "严格按日期整理" -#: gitk:4123 msgid "Mark branch sides" msgstr "标记分支边界" -#: gitk:4124 msgid "Limit to first parent" msgstr "限制到第一个父提交" -#: gitk:4125 msgid "Simple history" msgstr "简易历史" -#: gitk:4126 msgid "Additional arguments to git log:" msgstr "git log命令的额外参数：" -#: gitk:4127 msgid "Enter files and directories to include, one per line:" msgstr "输入文件和文件夹来引用，每行一个：" -#: gitk:4128 msgid "Command to generate more commits to include:" msgstr "命令产生更多的提交来引用：" -#: gitk:4252 msgid "Gitk: edit view" msgstr "Gitk: 编辑视图" -#: gitk:4260 msgid "-- criteria for selecting revisions" msgstr "-- 用来选择版本的规则" -#: gitk:4265 msgid "View Name" msgstr "视图名称" -#: gitk:4340 msgid "Apply (F5)" msgstr "应用(F5)" -#: gitk:4378 msgid "Error in commit selection arguments:" msgstr "提交选择参数错误：" -#: gitk:4433 gitk:4486 gitk:4948 gitk:4962 gitk:6232 gitk:12524 gitk:12525 msgid "None" msgstr "无" -#: gitk:5045 gitk:5050 msgid "Descendant" msgstr "子提交" -#: gitk:5046 msgid "Not descendant" msgstr "非子提交" -#: gitk:5053 gitk:5058 msgid "Ancestor" msgstr "父提交" -#: gitk:5054 msgid "Not ancestor" msgstr "非父提交" -#: gitk:5348 msgid "Local changes checked in to index but not committed" msgstr "已添加到索引但未提交的修改" -#: gitk:5384 msgid "Local uncommitted changes, not checked in to index" msgstr "未添加到索引且未提交的修改" -#: gitk:7158 msgid "and many more" msgstr "更多" -#: gitk:7161 msgid "many" msgstr "很多" -#: gitk:7352 msgid "Tags:" msgstr "Tags:" -#: gitk:7369 gitk:7375 gitk:8854 msgid "Parent" msgstr "父节点" -#: gitk:7380 msgid "Child" msgstr "子节点" -#: gitk:7389 msgid "Branch" msgstr "分支" -#: gitk:7392 msgid "Follows" msgstr "之后的tag" -#: gitk:7395 msgid "Precedes" msgstr "之前的tag" -#: gitk:7990 #, tcl-format msgid "Error getting diffs: %s" msgstr "获取差异错误：%s" -#: gitk:8679 msgid "Goto:" msgstr "转到：" -#: gitk:8700 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "短格式的SHA1提交号%s不明确、有歧义" -#: gitk:8707 #, tcl-format msgid "Revision %s is not known" msgstr "版本%s未知" -#: gitk:8717 #, tcl-format msgid "SHA1 id %s is not known" msgstr "提交号(SHA1 id)%s未知" -#: gitk:8719 #, tcl-format msgid "Revision %s is not in the current view" msgstr "版本%s不在当前视图中" -#: gitk:8861 gitk:8876 msgid "Date" msgstr "日期" -#: gitk:8864 msgid "Children" msgstr "子节点" -#: gitk:8927 #, tcl-format msgid "Reset %s branch to here" msgstr "重置分支%s到此处" -#: gitk:8929 msgid "Detached head: can't reset" msgstr "分离的头(head)：不能重置(reset)" -#: gitk:9034 gitk:9040 msgid "Skipping merge commit " msgstr "跳过合并提交" -#: gitk:9049 gitk:9054 msgid "Error getting patch ID for " msgstr "获取补丁ID出错" -#: gitk:9050 gitk:9055 msgid " - stopping\n" msgstr " — 停止中\n" -#: gitk:9060 gitk:9063 gitk:9071 gitk:9085 gitk:9094 msgid "Commit " msgstr "提交" -#: gitk:9064 msgid "" " is the same patch as\n" " " -msgstr " 是相同的补丁(patch)\n " +msgstr "" +" 是相同的补丁(patch)\n" +" " -#: gitk:9072 msgid "" " differs from\n" " " -msgstr " 差异来自\n " +msgstr "" +" 差异来自\n" +" " -#: gitk:9074 msgid "" "Diff of commits:\n" "\n" -msgstr "提交的差异(Diff)：\n\n" +msgstr "" +"提交的差异(Diff)：\n" +"\n" -#: gitk:9086 gitk:9095 #, tcl-format msgid " has %s children - stopping\n" msgstr "有%s子节点 — 停止中\n" -#: gitk:9114 #, tcl-format msgid "Error writing commit to file: %s" msgstr "写入提交到文件出错：%s" -#: gitk:9120 #, tcl-format msgid "Error diffing commits: %s" msgstr "比较提交差异出错：%s" -#: gitk:9166 msgid "Top" msgstr "顶部" -#: gitk:9167 msgid "From" msgstr "从" -#: gitk:9172 msgid "To" msgstr "到" -#: gitk:9196 msgid "Generate patch" msgstr "生成补丁(patch)" -#: gitk:9198 msgid "From:" msgstr "从：" -#: gitk:9207 msgid "To:" msgstr "到：" -#: gitk:9216 msgid "Reverse" msgstr "反向(Reverse)" -#: gitk:9218 gitk:9428 msgid "Output file:" msgstr "输出文件：" -#: gitk:9224 msgid "Generate" msgstr "生成" -#: gitk:9262 msgid "Error creating patch:" msgstr "创建补丁(patch)出错：" -#: gitk:9285 gitk:9416 gitk:9504 msgid "ID:" msgstr "ID:" -#: gitk:9294 msgid "Tag name:" msgstr "Tag名称：" -#: gitk:9297 msgid "Tag message is optional" msgstr "Tag信息是可选的" -#: gitk:9299 msgid "Tag message:" msgstr "Tag信息：" -#: gitk:9303 gitk:9474 msgid "Create" msgstr "创建" -#: gitk:9321 msgid "No tag name specified" msgstr "未指定tag名称" -#: gitk:9325 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Tag\"%s\"已经存在" -#: gitk:9335 msgid "Error creating tag:" msgstr "创建tag出错：" -#: gitk:9425 msgid "Command:" msgstr "命令：" -#: gitk:9433 msgid "Write" msgstr "写入" -#: gitk:9451 msgid "Error writing commit:" msgstr "写入提交出错：" -#: gitk:9473 msgid "Create branch" msgstr "创建分支" -#: gitk:9489 #, tcl-format msgid "Rename branch %s" msgstr "重命名分支%s" -#: gitk:9490 msgid "Rename" msgstr "重命名" -#: gitk:9514 msgid "Name:" msgstr "名称：" -#: gitk:9538 msgid "Please specify a name for the new branch" msgstr "请指定新分支的名称" -#: gitk:9543 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "分支\"%s\"已经存在。覆盖它？" -#: gitk:9587 msgid "Please specify a new name for the branch" msgstr "请重新指定新分支的名称" -#: gitk:9650 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "提交%s已经存在于分支%s。确定重新应用它？" -#: gitk:9655 msgid "Cherry-picking" msgstr "打补丁中(Cherry-picking)" -#: gitk:9664 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" "Please commit, reset or stash your changes and try again." -msgstr "打补丁(Cherry-pick)失败，因为本地修改了文件\"%s\"。\n请提交(commit)、重置(reset)或暂存(stash)修改后重试。" +msgstr "" +"打补丁(Cherry-pick)失败，因为本地修改了文件\"%s\"。\n" +"请提交(commit)、重置(reset)或暂存(stash)修改后重试。" -#: gitk:9670 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" -msgstr "打补丁(Cherry-pick)失败因为合并冲突。\n你是否希望运行git citool 来解决冲突？" +msgstr "" +"打补丁(Cherry-pick)失败因为合并冲突。\n" +"你是否希望运行git citool 来解决冲突？" -#: gitk:9686 gitk:9744 msgid "No changes committed" msgstr "无已经提交的修改" -#: gitk:9713 #, tcl-format msgid "Commit %s is not included in branch %s -- really revert it?" msgstr "提交%s不包含在分支%s中，确认回滚(revert)它？" -#: gitk:9718 msgid "Reverting" msgstr "回滚中(Reverting)" -#: gitk:9726 #, tcl-format msgid "" "Revert failed because of local changes to the following files:%s Please " "commit, reset or stash your changes and try again." -msgstr "回滚(revert)失败，因为如下的本地文件修改：%s\n请提交(commit)、重置(reset)或者暂存(stash)改变后重试。" +msgstr "" +"回滚(revert)失败，因为如下的本地文件修改：%s\n" +"请提交(commit)、重置(reset)或者暂存(stash)改变后重试。" -#: gitk:9730 msgid "" "Revert failed because of merge conflict.\n" " Do you wish to run git citool to resolve it?" -msgstr "回滚(revert)失败，因为合并冲突。\n你是否希望运行git citool来解决冲突？" +msgstr "" +"回滚(revert)失败，因为合并冲突。\n" +"你是否希望运行git citool来解决冲突？" -#: gitk:9773 msgid "Confirm reset" msgstr "确认重置(reset)" -#: gitk:9775 #, tcl-format msgid "Reset branch %s to %s?" msgstr "重置(reset)分支%s到%s？" -#: gitk:9777 msgid "Reset type:" msgstr "重置(reset)类型：" -#: gitk:9780 msgid "Soft: Leave working tree and index untouched" msgstr "软性：离开工作树，索引未改变" -#: gitk:9783 msgid "Mixed: Leave working tree untouched, reset index" msgstr "混合：离开工作树(未改变)，索引重置" -#: gitk:9786 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" -msgstr "硬性：重置工作树和索引\n(丢弃所有的本地修改)" +msgstr "" +"硬性：重置工作树和索引\n" +"(丢弃所有的本地修改)" -#: gitk:9803 msgid "Resetting" msgstr "重置中(Resetting)" -#: gitk:9876 #, tcl-format msgid "A local branch named %s exists already" msgstr "本地分支%s已经存在" -#: gitk:9884 msgid "Checking out" msgstr "检出中(Checking out)" -#: gitk:9943 msgid "Cannot delete the currently checked-out branch" msgstr "不能删除当前检出(checkout)分支" -#: gitk:9949 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" "Really delete branch %s?" -msgstr "在分支%s上的提交不在其他任何分支上。\n确认删除分支%s？" +msgstr "" +"在分支%s上的提交不在其他任何分支上。\n" +"确认删除分支%s？" -#: gitk:9980 #, tcl-format msgid "Tags and heads: %s" msgstr "Tags和头指针(heads)：%s" -#: gitk:9997 msgid "Filter" msgstr "过滤器" -#: gitk:10293 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." msgstr "读取提交拓扑信息出错；分支和之前/之后的tag信息将不能完成。" -#: gitk:11270 msgid "Tag" msgstr "标签(Tag)" -#: gitk:11274 msgid "Id" msgstr "Id" -#: gitk:11357 msgid "Gitk font chooser" msgstr "Gitk字体选择" -#: gitk:11374 msgid "B" msgstr "粗体" -#: gitk:11377 msgid "I" msgstr "斜体" -#: gitk:11495 msgid "Commit list display options" msgstr "提交列表展示选项" -#: gitk:11498 msgid "Maximum graph width (lines)" msgstr "最大图宽度(行数)" -#: gitk:11502 #, no-tcl-format msgid "Maximum graph width (% of pane)" msgstr "最大图宽度(%窗口百分比)" -#: gitk:11505 msgid "Show local changes" msgstr "显示本地修改" -#: gitk:11508 msgid "Auto-select SHA1 (length)" msgstr "自动选择SHA1(长度)" -#: gitk:11512 msgid "Hide remote refs" msgstr "隐藏远程引用" -#: gitk:11516 msgid "Diff display options" msgstr "差异(Diff)展示选项" -#: gitk:11518 msgid "Tab spacing" msgstr "制表符宽度" -#: gitk:11521 msgid "Display nearby tags/heads" msgstr "显示临近的tags/heads" -#: gitk:11524 msgid "Maximum # tags/heads to show" msgstr "最大tags/heads展示数量" -#: gitk:11527 msgid "Limit diffs to listed paths" msgstr "diff中列出文件限制" -#: gitk:11530 msgid "Support per-file encodings" msgstr "单独文件编码支持" -#: gitk:11536 gitk:11683 msgid "External diff tool" msgstr "外部差异(diff)工具" -#: gitk:11537 msgid "Choose..." msgstr "选择..." -#: gitk:11542 msgid "General options" msgstr "常规选项" -#: gitk:11545 msgid "Use themed widgets" msgstr "使用主题小部件" -#: gitk:11547 msgid "(change requires restart)" msgstr "(需重启生效)" -#: gitk:11549 msgid "(currently unavailable)" msgstr "(当前不可用)" -#: gitk:11560 msgid "Colors: press to choose" msgstr "颜色：点击来选择" -#: gitk:11563 msgid "Interface" msgstr "界面" -#: gitk:11564 msgid "interface" msgstr "界面" -#: gitk:11567 msgid "Background" msgstr "背景" -#: gitk:11568 gitk:11598 msgid "background" msgstr "背景" -#: gitk:11571 msgid "Foreground" msgstr "前景" -#: gitk:11572 msgid "foreground" msgstr "前景" -#: gitk:11575 msgid "Diff: old lines" msgstr "差异(Diff)：老代码行" -#: gitk:11576 msgid "diff old lines" msgstr "差异(diff)老代码行" -#: gitk:11580 msgid "Diff: new lines" msgstr "差异(Diff)：新代码行" -#: gitk:11581 msgid "diff new lines" msgstr "差异(diff)新代码行" -#: gitk:11585 msgid "Diff: hunk header" msgstr "差异(Diff)：补丁片段头信息" -#: gitk:11587 msgid "diff hunk header" msgstr "差异(diff)补丁片段头信息" -#: gitk:11591 msgid "Marked line bg" msgstr "已标记代码行背景" -#: gitk:11593 msgid "marked line background" msgstr "已标记代码行背景" -#: gitk:11597 msgid "Select bg" msgstr "选择背景" -#: gitk:11606 msgid "Fonts: press to choose" msgstr "字体：点击来选择" -#: gitk:11608 msgid "Main font" msgstr "主字体" -#: gitk:11609 msgid "Diff display font" msgstr "差异(Diff)显示字体" -#: gitk:11610 msgid "User interface font" msgstr "用户界面字体" -#: gitk:11632 msgid "Gitk preferences" msgstr "Gitk偏好设置" -#: gitk:11641 msgid "General" msgstr "常规" -#: gitk:11642 msgid "Colors" msgstr "颜色" -#: gitk:11643 msgid "Fonts" msgstr "字体" -#: gitk:11693 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk：选择颜色用于%s" -#: gitk:12206 msgid "" "Sorry, gitk cannot run with this version of Tcl/Tk.\n" " Gitk requires at least Tcl/Tk 8.4." -msgstr "对不起，gitk不能运行在当前版本的Tcl/Tk中。\nGitk运行需要最低版本为Tcl/Tk8.4。" +msgstr "" +"对不起，gitk不能运行在当前版本的Tcl/Tk中。\n" +"Gitk运行需要最低版本为Tcl/Tk8.4。" -#: gitk:12416 msgid "Cannot find a git repository here." msgstr "在此位置未发现git仓库。" -#: gitk:12463 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "不明确有歧义的参数\"%s\"：版本和文件名称" -#: gitk:12475 msgid "Bad arguments to gitk:" msgstr "运行gitk参数错误：" From bb52cdac6254c006e06bf0bb820268dcf024fc22 Mon Sep 17 00:00:00 2001 From: Wolfgang Faust Date: Tue, 3 Mar 2026 17:30:52 -0800 Subject: [PATCH 09/12] git-gui: grey out comment lines in commit message Comment lines are stripped by wash_commit_message, but there is no indication in the UI that they are special and will be removed. Grey these lines out to indicate that they will be removed. Signed-off-by: Wolfgang Faust Signed-off-by: Johannes Sixt --- git-gui.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/git-gui.sh b/git-gui.sh index d3d3aa14a9b462..23fe76e498bd17 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -3900,6 +3900,24 @@ if {[winfo exists $ui_comm]} { backup_commit_buffer + # Grey out comment lines (which are stripped from the final commit message by + # wash_commit_message). + $ui_comm tag configure commit_comment -foreground gray + proc dim_commit_comment_lines {} { + global ui_comm comment_string + $ui_comm tag remove commit_comment 1.0 end + set text [$ui_comm get 1.0 end] + # See also cmt_rx in wash_commit_message + set cmt_rx [strcat {^} [regsub -all {\W} $comment_string {\\&}]] + set ranges [regexp -all -indices -inline -line -- $cmt_rx $text] + foreach pair $ranges { + set idx "1.0 + [lindex $pair 0] chars" + $ui_comm tag add commit_comment $idx "$idx lineend + 1 char" + } + } + dim_commit_comment_lines + bind $ui_comm <> { after idle dim_commit_comment_lines } + # -- If the user has aspell available we can drive it # in pipe mode to spellcheck the commit message. # From f697d08df7419d5d6256d15028a8d0a42c39ff3c Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Thu, 19 Mar 2026 17:06:25 +0800 Subject: [PATCH 10/12] gitk: i18n: use "Gitk" as package name in POT file Use "Gitk" instead of the placeholder "PACKAGE" in the header of the generated po/gitk.pot file. In particular, the "Project-Id-Version" field in the header entry should be set to: "Project-Id-Version: Gitk\n" New PO files generated from this POT file will inherit that package name. Signed-off-by: Jiang Xin --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cc32dcab4b2a6b..a9675a21456940 100644 --- a/Makefile +++ b/Makefile @@ -68,7 +68,7 @@ gitk-wish: gitk GIT-TCLTK-VARS $(SHELL_PATH) ./generate-tcl.sh "$(TCLTK_PATH_SQ)" "$<" "$@" $(PO_TEMPLATE): gitk - $(XGETTEXT) -kmc -LTcl -o $@ gitk + $(XGETTEXT) -kmc -LTcl --package-name=Gitk -o $@ gitk update-po:: $(PO_TEMPLATE) $(foreach p, $(ALL_POFILES), echo Updating $p ; msgmerge -U $p $(PO_TEMPLATE) ; ) $(ALL_MSGFILES): %.msg : %.po From cc10508b1888b75a30eeb7885080871065e79bf3 Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Thu, 19 Mar 2026 17:08:47 +0800 Subject: [PATCH 11/12] gitk: ignore generated POT file "po/gitk.pot" is generated from the source for translation maintenance. Ignore it in the working tree so regenerating the template does not introduce unnecessary noise in `git status`. Signed-off-by: Jiang Xin --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index d7ebcaf366f6a8..15f96aad5e9ce2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /GIT-TCLTK-VARS /gitk-wish +po/gitk.pot From e0f3d08b9b47bbf1ce85e41d7b91d700c00ea115 Mon Sep 17 00:00:00 2001 From: Jiang Xin Date: Thu, 19 Mar 2026 17:11:17 +0800 Subject: [PATCH 12/12] gitk: l10n: make PO headers identify the Gitk project Commit f697d08 (gitk: i18n: use "Gitk" as package name in POT file, 2026-03-19) updated the generated POT template to use "Gitk" in its Project-Id-Version header. Several existing PO files still carry older header values such as "git" or "git-gui", so they do not consistently identify themselves as Gitk translations. Update the Project-Id-Version field in all Gitk PO files so that they identify the Gitk project consistently. The "Project-Id-Version" field in the PO header helps tools identify which project a PO file belongs to. For example, Git's "git-po-helper" uses it to choose project-specific checks and POT handling rules. Without this change, some Gitk PO files are misidentified because their headers still refer to other projects. Signed-off-by: Jiang Xin --- po/bg.po | 2 +- po/ca.po | 2 +- po/de.po | 2 +- po/es.po | 2 +- po/fr.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/pt_br.po | 2 +- po/pt_pt.po | 2 +- po/ru.po | 2 +- po/sv.po | 2 +- po/ta.po | 2 +- po/vi.po | 2 +- po/zh_cn.po | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/po/bg.po b/po/bg.po index d1e7d92425bd77..e7e2f873217ce5 100644 --- a/po/bg.po +++ b/po/bg.po @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: gitk master\n" +"Project-Id-Version: Gitk master\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-07-22 18:34+0200\n" "PO-Revision-Date: 2025-07-28 13:38+0200\n" diff --git a/po/ca.po b/po/ca.po index 87dfc18b4406b2..d1a0854074f4ec 100644 --- a/po/ca.po +++ b/po/ca.po @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: gitk\n" +"Project-Id-Version: Gitk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2015-10-05 22:23-0600\n" diff --git a/po/de.po b/po/de.po index 5db38248289baa..14d2f83d10b2a4 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ # Frederik Schwarzer , 2008. msgid "" msgstr "" -"Project-Id-Version: git-gui\n" +"Project-Id-Version: Gitk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2015-10-20 14:20+0200\n" diff --git a/po/es.po b/po/es.po index fef3bbafeead3e..02950c7e52dba2 100644 --- a/po/es.po +++ b/po/es.po @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: gitk\n" +"Project-Id-Version: Gitk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2008-03-25 11:20+0100\n" diff --git a/po/fr.po b/po/fr.po index e4fac932e5b0f6..1b06703bbe2f76 100644 --- a/po/fr.po +++ b/po/fr.po @@ -6,7 +6,7 @@ # Jean-Noël Avila msgid "" msgstr "" -"Project-Id-Version: gitk\n" +"Project-Id-Version: Gitk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-01-22 22:04+0100\n" "PO-Revision-Date: 2016-01-22 23:28+0100\n" diff --git a/po/hu.po b/po/hu.po index 79ec5a565674b0..e8734cbac7f886 100644 --- a/po/hu.po +++ b/po/hu.po @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: git-gui\n" +"Project-Id-Version: Gitk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2009-12-14 14:04+0100\n" diff --git a/po/it.po b/po/it.po index b58d23eb2b9253..c6e7b4ca1f6b55 100644 --- a/po/it.po +++ b/po/it.po @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: gitk\n" +"Project-Id-Version: Gitk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2010-01-28 18:41+0100\n" diff --git a/po/ja.po b/po/ja.po index ca3c29b457bd37..f00f87737d8ae4 100644 --- a/po/ja.po +++ b/po/ja.po @@ -8,7 +8,7 @@ # Satoshi Yasushima , 2016. msgid "" msgstr "" -"Project-Id-Version: gitk\n" +"Project-Id-Version: Gitk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2015-11-12 13:00+0900\n" diff --git a/po/pt_br.po b/po/pt_br.po index 1feb34854b32cc..7f50b1d882e0d4 100644 --- a/po/pt_br.po +++ b/po/pt_br.po @@ -7,7 +7,7 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: gitk\n" +"Project-Id-Version: Gitk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2010-12-06 23:39-0200\n" diff --git a/po/pt_pt.po b/po/pt_pt.po index f680ea86aabd08..45fafed4bb10d5 100644 --- a/po/pt_pt.po +++ b/po/pt_pt.po @@ -4,7 +4,7 @@ # Vasco Almeida , 2016. msgid "" msgstr "" -"Project-Id-Version: gitk\n" +"Project-Id-Version: Gitk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-04-15 16:52+0000\n" "PO-Revision-Date: 2016-05-06 15:35+0000\n" diff --git a/po/ru.po b/po/ru.po index 9b08c263eadea7..6997b3a6700a86 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,7 +8,7 @@ # Skip , 2011 msgid "" msgstr "" -"Project-Id-Version: Git Russian Localization Project\n" +"Project-Id-Version: Gitk Russian Localization Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-12-15 00:18+0200\n" "PO-Revision-Date: 2016-12-14 22:23+0000\n" diff --git a/po/sv.po b/po/sv.po index 5afbe6da1d6ab0..bc4d19ea41259d 100644 --- a/po/sv.po +++ b/po/sv.po @@ -7,7 +7,7 @@ # msgid "" msgstr "" -"Project-Id-Version: sv\n" +"Project-Id-Version: Gitk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-10-26 21:39+0100\n" "PO-Revision-Date: 2023-10-26 21:42+0100\n" diff --git a/po/ta.po b/po/ta.po index 0e390c51531602..6d619f9720dc38 100644 --- a/po/ta.po +++ b/po/ta.po @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: gitk\n" +"Project-Id-Version: Gitk\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2025-05-07 08:01+0530\n" "PO-Revision-Date: 2025-05-07 09:17\n" diff --git a/po/vi.po b/po/vi.po index 59674986604891..2feea40ea5324e 100644 --- a/po/vi.po +++ b/po/vi.po @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: gitk @@GIT_VERSION@@\n" +"Project-Id-Version: Gitk @@GIT_VERSION@@\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-17 14:32+1000\n" "PO-Revision-Date: 2015-09-15 07:33+0700\n" diff --git a/po/zh_cn.po b/po/zh_cn.po index 17b7f899da3dd4..c89ce95e3d3d8c 100644 --- a/po/zh_cn.po +++ b/po/zh_cn.po @@ -5,7 +5,7 @@ msgid "" msgstr "" -"Project-Id-Version: Git Chinese Localization Project\n" +"Project-Id-Version: Gitk Chinese Localization Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-02-28 23:11+0800\n" "PO-Revision-Date: 2017-03-11 02:27+0800\n"