From d495097281d87849c164c76d31643c669527636f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr> Date: Fri, 9 Aug 2019 21:42:58 +0200 Subject: [PATCH] Pre-translate es_MX and ru from git strings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jean-No챘l Avila <jn.avila@free.fr> --- po/documentation.es_MX.po | 1335 ++++++++++++++++++++++--------------- po/documentation.pot | 15 +- po/documentation.ru.po | 1244 ++++++++++++++++++++-------------- 3 files changed, 1576 insertions(+), 1018 deletions(-) diff --git a/po/documentation.es_MX.po b/po/documentation.es_MX.po index a393078..96cb2ca 100644 --- a/po/documentation.es_MX.po +++ b/po/documentation.es_MX.po @@ -1,19 +1,17 @@ -# SOME DESCRIPTIVE TITLE -# Copyright (C) YEAR Free Software Foundation, Inc. -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# +# Translations for Git Manual Pages. +# Copyright (C) 2019 +# This file is distributed under the same license as the Git package. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Git Documentation\n" "POT-Creation-Date: 2019-02-13 20:53+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: Automatically generated\n" -"Language-Team: none\n" +"PO-Revision-Date: 2019-08-09 21:41+0200\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: es_MX\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: es_MX\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:646 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31 en/git-submodule.txt:258 @@ -89,8 +87,9 @@ msgstr "-t" #. type: Plain text #: en/blame-options.txt:27 +#, fuzzy msgid "Show raw timestamp (Default: off)." -msgstr "" +msgstr "Mostrar timestamp en formato raw (Default: off)" #. type: Labeled list #: en/blame-options.txt:28 @@ -100,8 +99,9 @@ msgstr "" #. type: Plain text #: en/blame-options.txt:30 +#, fuzzy msgid "Use revisions from revs-file instead of calling linkgit:git-rev-list[1]." -msgstr "" +msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list" #. type: Labeled list #: en/blame-options.txt:31 @@ -128,8 +128,9 @@ msgstr "--porcelain" #. type: Plain text #: en/blame-options.txt:42 +#, fuzzy msgid "Show in a format designed for machine consumption." -msgstr "" +msgstr "Mostrar en un formato dise챰ado para consumo de m찼quina" #. type: Labeled list #: en/blame-options.txt:43 @@ -248,8 +249,9 @@ msgstr "linkgit:git-annotate[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:3 +#, fuzzy msgid "Annotate file lines with commit information." -msgstr "" +msgstr "Anotar l챠neas de archivo con informaci처n de commit" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:30 @@ -259,8 +261,9 @@ msgstr "linkgit:git-blame[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:6 +#, fuzzy msgid "Show what revision and author last modified each line of a file." -msgstr "" +msgstr "Mostrar qu챕 revisi처n y autor modificaron al 첬ltimo cada l챠nea de un archivo" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:7 @@ -270,8 +273,9 @@ msgstr "linkgit:git-count-objects[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:9 +#, fuzzy msgid "Count unpacked number of objects and their disk consumption." -msgstr "" +msgstr "Contar n첬mero de objetos no empaquetados y su consumo en disco" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:10 @@ -281,8 +285,9 @@ msgstr "linkgit:git-difftool[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:12 +#, fuzzy msgid "Show changes using common diff tools." -msgstr "" +msgstr "Mostrar cambios usando herramientas de diff comunes" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:13 @@ -292,8 +297,9 @@ msgstr "linkgit:git-fsck[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20 +#, fuzzy msgid "Verifies the connectivity and validity of the objects in the database." -msgstr "" +msgstr "Verifica la conectividad y disponibilidad de los objetos en la base de datos" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:16 @@ -303,8 +309,9 @@ msgstr "linkgit:git-help[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:18 +#, fuzzy msgid "Display help information about Git." -msgstr "" +msgstr "Mostrar informaci처n sobre Git" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:19 @@ -314,8 +321,9 @@ msgstr "linkgit:git-instaweb[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:21 +#, fuzzy msgid "Instantly browse your working repository in gitweb." -msgstr "" +msgstr "Buscar instant찼neamente tu repositorio de trabajo en gitweb" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:22 @@ -325,8 +333,9 @@ msgstr "linkgit:git-merge-tree[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:24 +#, fuzzy msgid "Show three-way merge without touching index." -msgstr "" +msgstr "Mostrar fusi처n de tres v챠as sin tocar el 챠ndice" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:25 @@ -336,8 +345,9 @@ msgstr "linkgit:git-rerere[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:27 +#, fuzzy msgid "Reuse recorded resolution of conflicted merges." -msgstr "" +msgstr "Reutilizar la resoluci처n registrada de fusiones conflictivas" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:28 @@ -347,8 +357,9 @@ msgstr "linkgit:git-show-branch[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:30 +#, fuzzy msgid "Show branches and their commits." -msgstr "" +msgstr "Mostrar ramas y sus commits" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:31 @@ -358,8 +369,9 @@ msgstr "linkgit:git-verify-commit[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:33 +#, fuzzy msgid "Check the GPG signature of commits." -msgstr "" +msgstr "Verificar firma GPG de commits" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:34 @@ -369,8 +381,9 @@ msgstr "linkgit:git-verify-tag[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:36 +#, fuzzy msgid "Check the GPG signature of tags." -msgstr "" +msgstr "Verifica la firma GPG de etiquetas" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:37 @@ -380,8 +393,9 @@ msgstr "linkgit:git-whatchanged[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:39 +#, fuzzy msgid "Show logs with difference each commit introduces." -msgstr "" +msgstr "Muestra logs con las diferencias que cada commit introduce" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91 @@ -391,8 +405,9 @@ msgstr "linkgit:gitweb[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:42 +#, fuzzy msgid "Git web interface (web frontend to Git repositories)." -msgstr "" +msgstr "Interfaz web Git (interfaz web para repositorios Git)" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:142 @@ -402,8 +417,9 @@ msgstr "linkgit:git-config[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:3 +#, fuzzy msgid "Get and set repository or global options." -msgstr "" +msgstr "Configurar repositorio u opciones globales" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1489 @@ -413,8 +429,9 @@ msgstr "linkgit:git-fast-export[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:6 +#, fuzzy msgid "Git data exporter." -msgstr "" +msgstr "Exportador de data Git" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:236 @@ -424,8 +441,9 @@ msgstr "linkgit:git-fast-import[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:9 +#, fuzzy msgid "Backend for fast Git data importers." -msgstr "" +msgstr "Backend para importadores de data de Git r찼pidos" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:10 @@ -435,8 +453,9 @@ msgstr "linkgit:git-filter-branch[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:12 +#, fuzzy msgid "Rewrite branches." -msgstr "" +msgstr "Reescribir ramas" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:139 @@ -446,8 +465,9 @@ msgstr "linkgit:git-mergetool[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:15 +#, fuzzy msgid "Run merge conflict resolution tools to resolve merge conflicts." -msgstr "" +msgstr "Ejecuta las herramientas de fusi처n de resoluci처n de conflictos para resolver conflictos de fusi처n" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:16 @@ -457,8 +477,9 @@ msgstr "linkgit:git-pack-refs[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:18 +#, fuzzy msgid "Pack heads and tags for efficient repository access." -msgstr "" +msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:19 @@ -468,8 +489,9 @@ msgstr "linkgit:git-prune[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:21 +#, fuzzy msgid "Prune all unreachable objects from the object database." -msgstr "" +msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:22 @@ -479,8 +501,9 @@ msgstr "linkgit:git-reflog[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:24 +#, fuzzy msgid "Manage reflog information." -msgstr "" +msgstr "Gestionar informaci처n de reflog" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:25 @@ -490,8 +513,9 @@ msgstr "linkgit:git-remote[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:27 +#, fuzzy msgid "Manage set of tracked repositories." -msgstr "" +msgstr "Gestiona un conjunto de repositorios rastreados" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:28 @@ -501,8 +525,9 @@ msgstr "linkgit:git-repack[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:30 +#, fuzzy msgid "Pack unpacked objects in a repository." -msgstr "" +msgstr "Empaquetar objetos no empaquetados en un repositorio" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:31 @@ -512,8 +537,9 @@ msgstr "linkgit:git-replace[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:33 +#, fuzzy msgid "Create, list, delete refs to replace objects." -msgstr "" +msgstr "Crea, lista, borra referencias para reemplazar objetos" #. type: Labeled list #: en/cmds-foreignscminterface.txt:1 @@ -523,8 +549,9 @@ msgstr "linkgit:git-archimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:3 +#, fuzzy msgid "Import a GNU Arch repository into Git." -msgstr "" +msgstr "Importar un repositorio GNU Arch en Git" #. type: Labeled list #: en/cmds-foreignscminterface.txt:4 @@ -534,8 +561,9 @@ msgstr "linkgit:git-cvsexportcommit[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:6 +#, fuzzy msgid "Export a single commit to a CVS checkout." -msgstr "" +msgstr "Exporta un commit 첬nico a CVS checkout" #. type: Labeled list #: en/cmds-foreignscminterface.txt:7 @@ -545,8 +573,9 @@ msgstr "linkgit:git-cvsimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:9 +#, fuzzy msgid "Salvage your data out of another SCM people love to hate." -msgstr "" +msgstr "Salva tus datos de otro SCM que la gente adora odiar" #. type: Labeled list #: en/cmds-foreignscminterface.txt:10 @@ -556,8 +585,9 @@ msgstr "linkgit:git-cvsserver[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:12 +#, fuzzy msgid "A CVS server emulator for Git." -msgstr "" +msgstr "Un servidor emulador de CVS para Git" #. type: Labeled list #: en/cmds-foreignscminterface.txt:13 @@ -567,8 +597,9 @@ msgstr "linkgit:git-imap-send[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:15 +#, fuzzy msgid "Send a collection of patches from stdin to an IMAP folder." -msgstr "" +msgstr "Enviar una colecci처n de parches de stdin a una carpeta IMAP" #. type: Labeled list #: en/cmds-foreignscminterface.txt:16 @@ -578,8 +609,9 @@ msgstr "linkgit:git-p4[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:18 +#, fuzzy msgid "Import from and submit to Perforce repositories." -msgstr "" +msgstr "Importar desde y enviar a repositorios Perforce" #. type: Labeled list #: en/cmds-foreignscminterface.txt:19 @@ -589,8 +621,9 @@ msgstr "linkgit:git-quiltimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:21 +#, fuzzy msgid "Applies a quilt patchset onto the current branch." -msgstr "" +msgstr "Aplica un parche quilt en la rama actual" #. type: Labeled list #: en/cmds-foreignscminterface.txt:22 @@ -600,8 +633,9 @@ msgstr "linkgit:git-request-pull[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:24 +#, fuzzy msgid "Generates a summary of pending changes." -msgstr "" +msgstr "Genera un resumen de cambios pendientes" #. type: Labeled list #: en/cmds-foreignscminterface.txt:25 @@ -611,8 +645,9 @@ msgstr "linkgit:git-send-email[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:27 +#, fuzzy msgid "Send a collection of patches as emails." -msgstr "" +msgstr "Env챠a una colecci처n de parches como e-mails" #. type: Labeled list #: en/cmds-foreignscminterface.txt:28 @@ -622,8 +657,9 @@ msgstr "linkgit:git-svn[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:30 +#, fuzzy msgid "Bidirectional operation between a Subversion repository and Git." -msgstr "" +msgstr "Operaci처n bidireccional entre un repositorio Subversion y Git" #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186 @@ -633,8 +669,9 @@ msgstr "linkgit:git-add[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:3 +#, fuzzy msgid "Add file contents to the index." -msgstr "" +msgstr "Agrega contenido de carpetas al 챠ndice" #. type: Labeled list #: en/cmds-mainporcelain.txt:4 @@ -644,8 +681,9 @@ msgstr "linkgit:git-am[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:6 +#, fuzzy msgid "Apply a series of patches from a mailbox." -msgstr "" +msgstr "Aplicar una serie de parches de un mailbox" #. type: Labeled list #: en/cmds-mainporcelain.txt:7 @@ -655,8 +693,9 @@ msgstr "linkgit:git-archive[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:9 +#, fuzzy msgid "Create an archive of files from a named tree." -msgstr "" +msgstr "Crear un archivo o archivos de un 찼rbol nombrado" #. type: Labeled list #: en/cmds-mainporcelain.txt:10 @@ -666,8 +705,9 @@ msgstr "linkgit:git-bisect[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:12 +#, fuzzy msgid "Use binary search to find the commit that introduced a bug." -msgstr "" +msgstr "Use la b첬squeda binaria para encontrar el commit que introdujo el bug" #. type: Labeled list #: en/cmds-mainporcelain.txt:13 @@ -677,8 +717,9 @@ msgstr "linkgit:git-branch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:15 +#, fuzzy msgid "List, create, or delete branches." -msgstr "" +msgstr "Lista, crea, o borra ramas" #. type: Labeled list #: en/cmds-mainporcelain.txt:16 @@ -688,8 +729,9 @@ msgstr "linkgit:git-bundle[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:18 +#, fuzzy msgid "Move objects and refs by archive." -msgstr "" +msgstr "Mover objetos y referencias por archivo" #. type: Labeled list #: en/cmds-mainporcelain.txt:19 @@ -699,8 +741,9 @@ msgstr "linkgit:git-checkout[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:21 +#, fuzzy msgid "Switch branches or restore working tree files." -msgstr "" +msgstr "Cambia ramas o restaura los archivos de tu 찼rbol de trabajo" #. type: Plain text #: en/cmds-mainporcelain.txt:22 en/git-revert.txt:126 @@ -710,8 +753,9 @@ msgstr "linkgit:git-cherry-pick[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:24 +#, fuzzy msgid "Apply the changes introduced by some existing commits." -msgstr "" +msgstr "Aplica los cambios introducidos por algunos commits existentes" #. type: Labeled list #: en/cmds-mainporcelain.txt:25 @@ -721,8 +765,9 @@ msgstr "linkgit:git-citool[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:27 +#, fuzzy msgid "Graphical alternative to git-commit." -msgstr "" +msgstr "Opci처n gr찼fica a git-commit" #. type: Labeled list #: en/cmds-mainporcelain.txt:28 @@ -732,8 +777,9 @@ msgstr "linkgit:git-clean[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:30 +#, fuzzy msgid "Remove untracked files from the working tree." -msgstr "" +msgstr "Remueve archivos del 찼rbol de trabajo no rastreados" #. type: Labeled list #: en/cmds-mainporcelain.txt:31 @@ -743,8 +789,9 @@ msgstr "linkgit:git-clone[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:33 +#, fuzzy msgid "Clone a repository into a new directory." -msgstr "" +msgstr "Clona un repositorio dentro de un nuevo directorio" #. type: Labeled list #: en/cmds-mainporcelain.txt:34 @@ -754,8 +801,9 @@ msgstr "linkgit:git-commit[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:36 +#, fuzzy msgid "Record changes to the repository." -msgstr "" +msgstr "Graba los cambios en tu repositorio" #. type: Labeled list #: en/cmds-mainporcelain.txt:37 @@ -765,8 +813,9 @@ msgstr "linkgit:git-describe[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:39 +#, fuzzy msgid "Give an object a human readable name based on an available ref." -msgstr "" +msgstr "Dar a un objeto un nombre legible por humanos basado en una referencia disponible" #. type: Labeled list #: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:136 @@ -776,8 +825,9 @@ msgstr "linkgit:git-diff[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:42 +#, fuzzy msgid "Show changes between commits, commit and working tree, etc." -msgstr "" +msgstr "Muestra los cambios entre commits, commit y 찼rbol de trabajo, etc" #. type: Plain text #: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129 @@ -787,8 +837,9 @@ msgstr "linkgit:git-fetch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:45 +#, fuzzy msgid "Download objects and refs from another repository." -msgstr "" +msgstr "Descarga objetos y referencias de otro repositorio" #. type: Labeled list #: en/cmds-mainporcelain.txt:46 @@ -798,8 +849,9 @@ msgstr "linkgit:git-format-patch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:48 +#, fuzzy msgid "Prepare patches for e-mail submission." -msgstr "" +msgstr "Prepara parches para ser enviados por e-mail" #. type: Labeled list #: en/cmds-mainporcelain.txt:49 @@ -809,8 +861,9 @@ msgstr "linkgit:git-gc[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:51 +#, fuzzy msgid "Cleanup unnecessary files and optimize the local repository." -msgstr "" +msgstr "Limpia archivos innecesarios y optimiza el repositorio local" #. type: Labeled list #: en/cmds-mainporcelain.txt:52 @@ -820,8 +873,9 @@ msgstr "linkgit:git-grep[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:54 +#, fuzzy msgid "Print lines matching a pattern." -msgstr "" +msgstr "Imprime las l챠neas que concuerdan con el patron" #. type: Labeled list #: en/cmds-mainporcelain.txt:55 @@ -831,8 +885,9 @@ msgstr "linkgit:git-gui[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:57 +#, fuzzy msgid "A portable graphical interface to Git." -msgstr "" +msgstr "Una interfaz gr찼fica port찼til para Git" #. type: Labeled list #: en/cmds-mainporcelain.txt:58 @@ -842,8 +897,9 @@ msgstr "linkgit:git-init[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:60 +#, fuzzy msgid "Create an empty Git repository or reinitialize an existing one." -msgstr "" +msgstr "Crea un repositorio de Git vac챠o o reinicia el que ya existe" #. type: Labeled list #: en/cmds-mainporcelain.txt:61 @@ -853,8 +909,9 @@ msgstr "linkgit:git-log[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:63 +#, fuzzy msgid "Show commit logs." -msgstr "" +msgstr "Muestra los logs de los commits" #. type: Plain text #: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75 @@ -864,8 +921,9 @@ msgstr "linkgit:git-merge[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:66 +#, fuzzy msgid "Join two or more development histories together." -msgstr "" +msgstr "Junta dos o mas historiales de desarrollo juntos" #. type: Labeled list #: en/cmds-mainporcelain.txt:67 @@ -875,8 +933,9 @@ msgstr "linkgit:git-mv[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:69 +#, fuzzy msgid "Move or rename a file, a directory, or a symlink." -msgstr "" +msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simb처licos" #. type: Labeled list #: en/cmds-mainporcelain.txt:70 @@ -886,8 +945,9 @@ msgstr "linkgit:git-notes[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:72 +#, fuzzy msgid "Add or inspect object notes." -msgstr "" +msgstr "Agrega o inspecciona objetos nota" #. type: Plain text #: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:296 @@ -897,8 +957,9 @@ msgstr "linkgit:git-pull[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:75 +#, fuzzy msgid "Fetch from and integrate with another repository or a local branch." -msgstr "" +msgstr "Realiza un fetch e integra con otro repositorio o rama local" #. type: Labeled list #: en/cmds-mainporcelain.txt:76 @@ -908,8 +969,9 @@ msgstr "linkgit:git-push[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:78 +#, fuzzy msgid "Update remote refs along with associated objects." -msgstr "" +msgstr "Actualiza referencias remotas junto con sus objetos asociados" #. type: Labeled list #: en/cmds-mainporcelain.txt:79 @@ -919,8 +981,9 @@ msgstr "linkgit:git-range-diff[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:81 +#, fuzzy msgid "Compare two commit ranges (e.g. two versions of a branch)." -msgstr "" +msgstr "Compara dos rangos de commits (por ejemplo dos versions de un branch)" #. type: Plain text #: en/cmds-mainporcelain.txt:82 en/git-svn.txt:1171 @@ -930,8 +993,9 @@ msgstr "linkgit:git-rebase[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:84 +#, fuzzy msgid "Reapply commits on top of another base tip." -msgstr "" +msgstr "Vuelve a aplicar commits en la punta de otra rama" #. type: Labeled list #: en/cmds-mainporcelain.txt:85 @@ -941,8 +1005,9 @@ msgstr "linkgit:git-reset[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:87 +#, fuzzy msgid "Reset current HEAD to the specified state." -msgstr "" +msgstr "Reinicia el HEAD actual a un estado especifico" #. type: Plain text #: en/cmds-mainporcelain.txt:88 en/git-cherry-pick.txt:230 @@ -952,8 +1017,9 @@ msgstr "linkgit:git-revert[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:90 +#, fuzzy msgid "Revert some existing commits." -msgstr "" +msgstr "Revierte algunos commits existentes" #. type: Labeled list #: en/cmds-mainporcelain.txt:91 @@ -963,8 +1029,9 @@ msgstr "linkgit:git-rm[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:93 +#, fuzzy msgid "Remove files from the working tree and from the index." -msgstr "" +msgstr "Borra archivos del 찼rbol de trabajo y del 챠ndice" #. type: Labeled list #: en/cmds-mainporcelain.txt:94 @@ -974,8 +1041,9 @@ msgstr "linkgit:git-shortlog[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:96 +#, fuzzy msgid "Summarize 'git log' output." -msgstr "" +msgstr "Resumir la salida 'git log'" #. type: Labeled list #: en/cmds-mainporcelain.txt:97 @@ -985,8 +1053,9 @@ msgstr "linkgit:git-show[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:99 +#, fuzzy msgid "Show various types of objects." -msgstr "" +msgstr "Muestra varios tipos de objetos" #. type: Labeled list #: en/cmds-mainporcelain.txt:100 @@ -996,8 +1065,9 @@ msgstr "linkgit:git-stash[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:102 +#, fuzzy msgid "Stash the changes in a dirty working directory away." -msgstr "" +msgstr "Poner en un stash los cambios en un directorio de trabajo sucio de todas maneras" #. type: Labeled list #: en/cmds-mainporcelain.txt:103 @@ -1007,8 +1077,9 @@ msgstr "linkgit:git-status[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:105 +#, fuzzy msgid "Show the working tree status." -msgstr "" +msgstr "Muestra el estado del 찼rbol de trabajo" #. type: Labeled list #: en/cmds-mainporcelain.txt:106 @@ -1018,8 +1089,9 @@ msgstr "linkgit:git-submodule[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:108 +#, fuzzy msgid "Initialize, update or inspect submodules." -msgstr "" +msgstr "Inicializa, actualiza o inspecciona subm처dulos" #. type: Labeled list #: en/cmds-mainporcelain.txt:109 @@ -1029,8 +1101,9 @@ msgstr "linkgit:git-tag[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:111 +#, fuzzy msgid "Create, list, delete or verify a tag object signed with GPG." -msgstr "" +msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG" #. type: Labeled list #: en/cmds-mainporcelain.txt:112 @@ -1040,8 +1113,9 @@ msgstr "linkgit:git-worktree[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:114 +#, fuzzy msgid "Manage multiple working trees." -msgstr "" +msgstr "Gestiona m첬ltiples 찼rboles de trabajo" #. type: Labeled list #: en/cmds-mainporcelain.txt:115 en/git-gui.txt:104 @@ -1051,8 +1125,9 @@ msgstr "linkgit:gitk[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:117 +#, fuzzy msgid "The Git repository browser." -msgstr "" +msgstr "El navegador de repositorio Git" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:1 @@ -1062,8 +1137,9 @@ msgstr "linkgit:git-cat-file[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:3 +#, fuzzy msgid "Provide content or type and size information for repository objects." -msgstr "" +msgstr "Proveer contenido o tipo y tama챰o de informaci처n para objetos de repositorio" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:4 @@ -1073,8 +1149,9 @@ msgstr "linkgit:git-cherry[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:6 +#, fuzzy msgid "Find commits yet to be applied to upstream." -msgstr "" +msgstr "Encuentra commits que faltan aplicar en upstream" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:7 @@ -1084,8 +1161,9 @@ msgstr "linkgit:git-diff-files[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:9 +#, fuzzy msgid "Compares files in the working tree and the index." -msgstr "" +msgstr "Compara archivos del 찼rbol de trabajo y del 챠ndice" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:10 @@ -1095,8 +1173,9 @@ msgstr "linkgit:git-diff-index[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:12 +#, fuzzy msgid "Compare a tree to the working tree or index." -msgstr "" +msgstr "Compara un 찼rbol con el 찼rbol de trabajo o 챠ndice" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:13 @@ -1106,8 +1185,9 @@ msgstr "linkgit:git-diff-tree[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:15 +#, fuzzy msgid "Compares the content and mode of blobs found via two tree objects." -msgstr "" +msgstr "Compara el contenido y el modo de blobs encontrados a trav챕s de dos objetos de 찼rbol" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:16 @@ -1117,8 +1197,9 @@ msgstr "linkgit:git-for-each-ref[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:18 +#, fuzzy msgid "Output information on each ref." -msgstr "" +msgstr "Informaci처n de output en cada ref" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:19 @@ -1128,8 +1209,9 @@ msgstr "linkgit:git-get-tar-commit-id[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:21 +#, fuzzy msgid "Extract commit ID from an archive created using git-archive." -msgstr "" +msgstr "Extrae el ID de commit de un archivo creado usando git-archive" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:22 @@ -1139,8 +1221,9 @@ msgstr "linkgit:git-ls-files[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:24 +#, fuzzy msgid "Show information about files in the index and the working tree." -msgstr "" +msgstr "Muestra informaci처n sobre archivos in el 챠ndice y el 찼rbol de trabajo" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:25 @@ -1150,8 +1233,9 @@ msgstr "linkgit:git-ls-remote[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:27 +#, fuzzy msgid "List references in a remote repository." -msgstr "" +msgstr "Lista referencias en un repositorio remoto" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:28 @@ -1161,8 +1245,9 @@ msgstr "linkgit:git-ls-tree[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:30 +#, fuzzy msgid "List the contents of a tree object." -msgstr "" +msgstr "Lista los contenidos de un objeto 찼rbol" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:31 @@ -1172,8 +1257,9 @@ msgstr "linkgit:git-merge-base[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:33 +#, fuzzy msgid "Find as good common ancestors as possible for a merge." -msgstr "" +msgstr "Encuentra un ancestro com첬n bueno para una posible fusi처n" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:34 @@ -1183,8 +1269,9 @@ msgstr "linkgit:git-name-rev[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:36 +#, fuzzy msgid "Find symbolic names for given revs." -msgstr "" +msgstr "Encontrar nombres simb처licos para revs dados" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:37 @@ -1194,8 +1281,9 @@ msgstr "linkgit:git-pack-redundant[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:39 +#, fuzzy msgid "Find redundant pack files." -msgstr "" +msgstr "Encuentra archivos empaquetados de manera redundante" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:40 @@ -1205,8 +1293,9 @@ msgstr "linkgit:git-rev-list[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:42 +#, fuzzy msgid "Lists commit objects in reverse chronological order." -msgstr "" +msgstr "Lista objetos commit en orden cronol처gico inverso" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:43 @@ -1216,8 +1305,9 @@ msgstr "linkgit:git-rev-parse[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:45 +#, fuzzy msgid "Pick out and massage parameters." -msgstr "" +msgstr "Seleccionar y masajear los par찼metros" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:46 @@ -1227,8 +1317,9 @@ msgstr "linkgit:git-show-index[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:48 +#, fuzzy msgid "Show packed archive index." -msgstr "" +msgstr "Mostrar el 챠ndice de archivo empaquetado" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:386 @@ -1238,8 +1329,9 @@ msgstr "linkgit:git-show-ref[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:51 +#, fuzzy msgid "List references in a local repository." -msgstr "" +msgstr "Listar referencias en el repositorio local" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:52 @@ -1249,8 +1341,9 @@ msgstr "linkgit:git-unpack-file[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:54 +#, fuzzy msgid "Creates a temporary file with a blob's contents." -msgstr "" +msgstr "Crea un archivo temporal con contenidos de un blob" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:55 @@ -1260,8 +1353,9 @@ msgstr "linkgit:git-var[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:57 +#, fuzzy msgid "Show a Git logical variable." -msgstr "" +msgstr "Mostrar una variable l처gica de Git" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:58 @@ -1271,8 +1365,9 @@ msgstr "linkgit:git-verify-pack[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:60 +#, fuzzy msgid "Validate packed Git archive files." -msgstr "" +msgstr "Valida archivos Git empaquetados" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:1 @@ -1282,8 +1377,9 @@ msgstr "linkgit:git-apply[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:3 +#, fuzzy msgid "Apply a patch to files and/or to the index." -msgstr "" +msgstr "Aplicar un parche a archivos y/o el 챠ndice" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:4 @@ -1293,8 +1389,9 @@ msgstr "linkgit:git-checkout-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:6 +#, fuzzy msgid "Copy files from the index to the working tree." -msgstr "" +msgstr "Copiar archivos del 챠ndice al 찼rbol de trabajo" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:7 @@ -1304,8 +1401,9 @@ msgstr "linkgit:git-commit-graph[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:9 +#, fuzzy msgid "Write and verify Git commit-graph files." -msgstr "" +msgstr "Escribe y verifica los archivos de Git commit-graph" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:10 @@ -1315,8 +1413,9 @@ msgstr "linkgit:git-commit-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:12 +#, fuzzy msgid "Create a new commit object." -msgstr "" +msgstr "Crea un nuevo objeto commit" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:13 @@ -1326,8 +1425,9 @@ msgstr "linkgit:git-hash-object[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:15 +#, fuzzy msgid "Compute object ID and optionally creates a blob from a file." -msgstr "" +msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:16 @@ -1337,8 +1437,9 @@ msgstr "linkgit:git-index-pack[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:18 +#, fuzzy msgid "Build pack index file for an existing packed archive." -msgstr "" +msgstr "Constuye un archivo de 챠ndice para un archivo empaquetado existente" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:19 @@ -1348,8 +1449,9 @@ msgstr "linkgit:git-merge-file[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:21 +#, fuzzy msgid "Run a three-way file merge." -msgstr "" +msgstr "Ejecuta una fusi처n de tres v챠as en un archivo" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:22 @@ -1359,8 +1461,9 @@ msgstr "linkgit:git-merge-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:24 +#, fuzzy msgid "Run a merge for files needing merging." -msgstr "" +msgstr "Ejecuta una fusi처n para archivos que la necesitan" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:25 @@ -1370,8 +1473,9 @@ msgstr "linkgit:git-mktag[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:27 +#, fuzzy msgid "Creates a tag object." -msgstr "" +msgstr "Crea un objeto tag" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:28 @@ -1381,8 +1485,9 @@ msgstr "linkgit:git-mktree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:30 +#, fuzzy msgid "Build a tree-object from ls-tree formatted text." -msgstr "" +msgstr "Construir un objeto 찼rbol de un texto en formato ls-tree" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:31 @@ -1392,8 +1497,9 @@ msgstr "linkgit:git-multi-pack-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:33 +#, fuzzy msgid "Write and verify multi-pack-indexes." -msgstr "" +msgstr "Escribe y verifica archivos multi-pack-index" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:34 @@ -1403,8 +1509,9 @@ msgstr "linkgit:git-pack-objects[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:36 +#, fuzzy msgid "Create a packed archive of objects." -msgstr "" +msgstr "Crea un archivo de objetos empaquetados" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:37 @@ -1414,8 +1521,9 @@ msgstr "linkgit:git-prune-packed[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:39 +#, fuzzy msgid "Remove extra objects that are already in pack files." -msgstr "" +msgstr "Remover objetos extra que ya est찼n en archivos empaquetados" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:40 @@ -1425,8 +1533,9 @@ msgstr "linkgit:git-read-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:42 +#, fuzzy msgid "Reads tree information into the index." -msgstr "" +msgstr "Lee informaci처n del 찼bol en el 챠ndice" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:43 @@ -1436,8 +1545,9 @@ msgstr "linkgit:git-symbolic-ref[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:45 +#, fuzzy msgid "Read, modify and delete symbolic refs." -msgstr "" +msgstr "Lee, modifica y borra referencias simb처licas" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:46 @@ -1447,8 +1557,9 @@ msgstr "linkgit:git-unpack-objects[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:48 +#, fuzzy msgid "Unpack objects from a packed archive." -msgstr "" +msgstr "Desempaqueta objetos de un archivo empaquetado" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:49 @@ -1458,8 +1569,9 @@ msgstr "linkgit:git-update-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:51 +#, fuzzy msgid "Register file contents in the working tree to the index." -msgstr "" +msgstr "Registra contenidos de archivos en el 찼rbol de trabajo al 챠ndice" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:52 @@ -1469,8 +1581,9 @@ msgstr "linkgit:git-update-ref[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:54 +#, fuzzy msgid "Update the object name stored in a ref safely." -msgstr "" +msgstr "Actualiza el nombre del objeto almacenado en una referencia de forma segura" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:115 @@ -1480,8 +1593,9 @@ msgstr "linkgit:git-write-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:57 +#, fuzzy msgid "Create a tree object from the current index." -msgstr "" +msgstr "Crea un objeto 찼rbol del 챠ndice actual" #. type: Labeled list #: en/cmds-purehelpers.txt:1 @@ -1491,8 +1605,9 @@ msgstr "linkgit:git-check-attr[1]" #. type: Plain text #: en/cmds-purehelpers.txt:3 +#, fuzzy msgid "Display gitattributes information." -msgstr "" +msgstr "Mostrar informaci처n de gitattributes" #. type: Labeled list #: en/cmds-purehelpers.txt:4 @@ -1502,8 +1617,9 @@ msgstr "linkgit:git-check-ignore[1]" #. type: Plain text #: en/cmds-purehelpers.txt:6 +#, fuzzy msgid "Debug gitignore / exclude files." -msgstr "" +msgstr "Debug a gitignore / excluir archivos" #. type: Labeled list #: en/cmds-purehelpers.txt:7 @@ -1513,8 +1629,9 @@ msgstr "linkgit:git-check-mailmap[1]" #. type: Plain text #: en/cmds-purehelpers.txt:9 +#, fuzzy msgid "Show canonical names and email addresses of contacts." -msgstr "" +msgstr "Mostrar nombres can처nicos y direcciones de correo de contactos" #. type: Labeled list #: en/cmds-purehelpers.txt:10 @@ -1524,8 +1641,9 @@ msgstr "linkgit:git-check-ref-format[1]" #. type: Plain text #: en/cmds-purehelpers.txt:12 +#, fuzzy msgid "Ensures that a reference name is well formed." -msgstr "" +msgstr "Asegura que un nombre de referencia est챕 bien formado" #. type: Labeled list #: en/cmds-purehelpers.txt:13 @@ -1535,8 +1653,9 @@ msgstr "linkgit:git-column[1]" #. type: Plain text #: en/cmds-purehelpers.txt:15 +#, fuzzy msgid "Display data in columns." -msgstr "" +msgstr "Mostrar data en columnas" #. type: Labeled list #: en/cmds-purehelpers.txt:16 @@ -1546,8 +1665,9 @@ msgstr "linkgit:git-credential[1]" #. type: Plain text #: en/cmds-purehelpers.txt:18 +#, fuzzy msgid "Retrieve and store user credentials." -msgstr "" +msgstr "Obtener y guardar credenciales de usuario" #. type: Labeled list #: en/cmds-purehelpers.txt:19 @@ -1557,8 +1677,9 @@ msgstr "linkgit:git-credential-cache[1]" #. type: Plain text #: en/cmds-purehelpers.txt:21 +#, fuzzy msgid "Helper to temporarily store passwords in memory." -msgstr "" +msgstr "Auxiliar para almacenar temporalmente claves en memoria" #. type: Labeled list #: en/cmds-purehelpers.txt:22 @@ -1568,8 +1689,9 @@ msgstr "linkgit:git-credential-store[1]" #. type: Plain text #: en/cmds-purehelpers.txt:24 +#, fuzzy msgid "Helper to store credentials on disk." -msgstr "" +msgstr "Auxiliar para guardar credenciales en disco" #. type: Labeled list #: en/cmds-purehelpers.txt:25 @@ -1579,8 +1701,9 @@ msgstr "linkgit:git-fmt-merge-msg[1]" #. type: Plain text #: en/cmds-purehelpers.txt:27 +#, fuzzy msgid "Produce a merge commit message." -msgstr "" +msgstr "Produce un mensaje de commit para fusi처n" #. type: Labeled list #: en/cmds-purehelpers.txt:28 @@ -1590,8 +1713,9 @@ msgstr "linkgit:git-interpret-trailers[1]" #. type: Plain text #: en/cmds-purehelpers.txt:30 +#, fuzzy msgid "add or parse structured information in commit messages." -msgstr "" +msgstr "Agregar o analizar informaci처n estructurada en mensajes de commit" #. type: Labeled list #: en/cmds-purehelpers.txt:31 @@ -1601,8 +1725,9 @@ msgstr "linkgit:git-mailinfo[1]" #. type: Plain text #: en/cmds-purehelpers.txt:33 +#, fuzzy msgid "Extracts patch and authorship from a single e-mail message." -msgstr "" +msgstr "Extraer parche y autor챠a de un 첬nico mensaje de e-mail" #. type: Labeled list #: en/cmds-purehelpers.txt:34 @@ -1612,8 +1737,9 @@ msgstr "linkgit:git-mailsplit[1]" #. type: Plain text #: en/cmds-purehelpers.txt:36 +#, fuzzy msgid "Simple UNIX mbox splitter program." -msgstr "" +msgstr "Programa divisor de mbox simple de UNIX" #. type: Labeled list #: en/cmds-purehelpers.txt:37 @@ -1623,8 +1749,9 @@ msgstr "linkgit:git-merge-one-file[1]" #. type: Plain text #: en/cmds-purehelpers.txt:39 +#, fuzzy msgid "The standard helper program to use with git-merge-index." -msgstr "" +msgstr "El programa de ayuda est찼ndar para usar con git-merge-index" #. type: Plain text #: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142 @@ -1634,8 +1761,9 @@ msgstr "linkgit:git-patch-id[1]" #. type: Plain text #: en/cmds-purehelpers.txt:42 +#, fuzzy msgid "Compute unique ID for a patch." -msgstr "" +msgstr "Calcular ID 첬nico para un parche" #. type: Labeled list #: en/cmds-purehelpers.txt:43 @@ -1645,8 +1773,9 @@ msgstr "linkgit:git-sh-i18n[1]" #. type: Plain text #: en/cmds-purehelpers.txt:45 +#, fuzzy msgid "Git's i18n setup code for shell scripts." -msgstr "" +msgstr "El c처digo de configuraci처n i18n de Git para scripts de shell" #. type: Labeled list #: en/cmds-purehelpers.txt:46 @@ -1656,8 +1785,9 @@ msgstr "linkgit:git-sh-setup[1]" #. type: Plain text #: en/cmds-purehelpers.txt:48 +#, fuzzy msgid "Common Git shell script setup code." -msgstr "" +msgstr "C처digo de configuraci처n de script de shell com첬n de Git" #. type: Labeled list #: en/cmds-purehelpers.txt:49 @@ -1667,8 +1797,9 @@ msgstr "linkgit:git-stripspace[1]" #. type: Plain text #: en/cmds-purehelpers.txt:51 +#, fuzzy msgid "Remove unnecessary whitespace." -msgstr "" +msgstr "Eliminar el espacio en blanco innecesario" #. type: Labeled list #: en/cmds-synchelpers.txt:1 @@ -1678,8 +1809,9 @@ msgstr "linkgit:git-http-fetch[1]" #. type: Plain text #: en/cmds-synchelpers.txt:3 +#, fuzzy msgid "Download from a remote Git repository via HTTP." -msgstr "" +msgstr "Descarga de un repositorio Git remoto v챠a HTTP" #. type: Labeled list #: en/cmds-synchelpers.txt:4 @@ -1689,8 +1821,9 @@ msgstr "linkgit:git-http-push[1]" #. type: Plain text #: en/cmds-synchelpers.txt:6 +#, fuzzy msgid "Push objects over HTTP/DAV to another repository." -msgstr "" +msgstr "Empuja objetos por HTTP/DAV a otro repositorio" #. type: Labeled list #: en/cmds-synchelpers.txt:7 @@ -1700,8 +1833,9 @@ msgstr "linkgit:git-parse-remote[1]" #. type: Plain text #: en/cmds-synchelpers.txt:9 +#, fuzzy msgid "Routines to help parsing remote repository access parameters." -msgstr "" +msgstr "Rutinas para ayudar a analizar los par찼metros de acceso del repositorio remoto" #. type: Labeled list #: en/cmds-synchelpers.txt:10 @@ -1711,8 +1845,9 @@ msgstr "linkgit:git-receive-pack[1]" #. type: Plain text #: en/cmds-synchelpers.txt:12 +#, fuzzy msgid "Receive what is pushed into the repository." -msgstr "" +msgstr "Recibir lo que es empujado en el respositorio" #. type: Labeled list #: en/cmds-synchelpers.txt:13 @@ -1722,8 +1857,9 @@ msgstr "linkgit:git-shell[1]" #. type: Plain text #: en/cmds-synchelpers.txt:15 +#, fuzzy msgid "Restricted login shell for Git-only SSH access." -msgstr "" +msgstr "Shell de inicio de sesi처n restringido para acceso SSH exclusivo de Git" #. type: Labeled list #: en/cmds-synchelpers.txt:16 @@ -1733,8 +1869,9 @@ msgstr "linkgit:git-upload-archive[1]" #. type: Plain text #: en/cmds-synchelpers.txt:18 +#, fuzzy msgid "Send archive back to git-archive." -msgstr "" +msgstr "Enviar archivo a git-archive" #. type: Labeled list #: en/cmds-synchelpers.txt:19 @@ -1744,8 +1881,9 @@ msgstr "linkgit:git-upload-pack[1]" #. type: Plain text #: en/cmds-synchelpers.txt:21 +#, fuzzy msgid "Send objects packed back to git-fetch-pack." -msgstr "" +msgstr "Enviar objetos empaquetados a git-fetch-pack" #. type: Labeled list #: en/cmds-synchingrepositories.txt:1 @@ -1755,8 +1893,9 @@ msgstr "linkgit:git-daemon[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:3 +#, fuzzy msgid "A really simple server for Git repositories." -msgstr "" +msgstr "Un servidor realmente simple para repositorios Git" #. type: Labeled list #: en/cmds-synchingrepositories.txt:4 @@ -1766,8 +1905,9 @@ msgstr "linkgit:git-fetch-pack[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:6 +#, fuzzy msgid "Receive missing objects from another repository." -msgstr "" +msgstr "Descarga objetos faltantes de otro repositorio" #. type: Labeled list #: en/cmds-synchingrepositories.txt:7 @@ -1777,8 +1917,9 @@ msgstr "linkgit:git-http-backend[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:9 +#, fuzzy msgid "Server side implementation of Git over HTTP." -msgstr "" +msgstr "Implementaci처n de lado de servidor de Git por HTTP" #. type: Labeled list #: en/cmds-synchingrepositories.txt:10 @@ -1788,8 +1929,9 @@ msgstr "linkgit:git-send-pack[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:12 +#, fuzzy msgid "Push objects over Git protocol to another repository." -msgstr "" +msgstr "Empujar objetos por protocolo Git a otro repositorio" #. type: Labeled list #: en/cmds-synchingrepositories.txt:13 @@ -1799,8 +1941,9 @@ msgstr "linkgit:git-update-server-info[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:15 +#, fuzzy msgid "Update auxiliary info file to help dumb servers." -msgstr "" +msgstr "Actualiza el archivo de informaci처n auxiliar para ayudar a los servidores dumb" #. type: Title - #: en/config.txt:2 en/git-worktree.txt:237 @@ -1961,9 +2104,9 @@ msgstr "" #. type: Labeled list #: en/config.txt:143 -#, no-wrap +#, fuzzy, no-wrap msgid "`gitdir/i`" -msgstr "" +msgstr "`gitdir`" #. type: Plain text #: en/config.txt:146 @@ -2998,9 +3141,9 @@ msgstr "--raw" #. type: Plain text #: en/diff-options.txt:48 -#, no-wrap +#, fuzzy, no-wrap msgid "\tGenerate the diff in raw format.\n" -msgstr "" +msgstr "genera el diff en formato raw" #. type: Plain text #: en/diff-options.txt:58 @@ -3021,8 +3164,9 @@ msgstr "--patch-with-raw" #. type: Plain text #: en/diff-options.txt:64 +#, fuzzy msgid "Synonym for `-p --raw`." -msgstr "" +msgstr "sin처nimo para '-p --stat'" #. type: Labeled list #: en/diff-options.txt:66 @@ -3065,8 +3209,9 @@ msgstr "--patience" #. type: Plain text #: en/diff-options.txt:79 +#, fuzzy msgid "Generate a diff using the \"patience diff\" algorithm." -msgstr "" +msgstr "genera un diff usando algoritmo \"patience diff\"" #. type: Labeled list #: en/diff-options.txt:80 @@ -3076,8 +3221,9 @@ msgstr "--histogram" #. type: Plain text #: en/diff-options.txt:82 +#, fuzzy msgid "Generate a diff using the \"histogram diff\" algorithm." -msgstr "" +msgstr "genera un diff usando algoritmo \"histogram diff\"" #. type: Labeled list #: en/diff-options.txt:83 @@ -3087,8 +3233,9 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:85 +#, fuzzy msgid "Generate a diff using the \"anchored diff\" algorithm." -msgstr "" +msgstr "genera un diff usando algoritmo \"anchored diff\"" #. type: Plain text #: en/diff-options.txt:87 @@ -3157,9 +3304,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:113 -#, no-wrap +#, fuzzy, no-wrap msgid "--stat[=<width>[,<name-width>[,<count>]]]" -msgstr "" +msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]" #. type: Plain text #: en/diff-options.txt:127 @@ -3294,8 +3441,9 @@ msgstr "--patch-with-stat" #. type: Plain text #: en/diff-options.txt:202 +#, fuzzy msgid "Synonym for `-p --stat`." -msgstr "" +msgstr "sin처nimo para '-p --stat'" #. type: Labeled list #: en/diff-options.txt:206 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:41 en/git-checkout-index.txt:67 en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:122 en/git-update-index.txt:168 @@ -3335,8 +3483,9 @@ msgstr "--name-only" #. type: Plain text #: en/diff-options.txt:224 +#, fuzzy msgid "Show only names of changed files." -msgstr "" +msgstr "mostrar solo nombres de archivos cambiados" #. type: Labeled list #: en/diff-options.txt:225 en/git-ls-tree.txt:60 @@ -3410,8 +3559,9 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:259 +#, fuzzy msgid "Moved lines of code are colored differently." -msgstr "" +msgstr "l챠neas movidas de c처digo est찼n coloreadas diferente" #. type: Plain text #: en/diff-options.txt:261 @@ -3443,7 +3593,7 @@ msgstr "" #: en/diff-options.txt:269 en/git-commit.txt:211 #, no-wrap msgid "default" -msgstr "" +msgstr "default" #. type: Plain text #: en/diff-options.txt:272 @@ -3535,20 +3685,21 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:311 en/merge-strategies.txt:61 -#, no-wrap +#, fuzzy, no-wrap msgid "ignore-space-at-eol" -msgstr "" +msgstr "--ignore-space-at-eol" #. type: Plain text #: en/diff-options.txt:313 en/diff-options.txt:645 +#, fuzzy msgid "Ignore changes in whitespace at EOL." -msgstr "" +msgstr "ignorar cambios en espacios en blanco en EOL" #. type: Labeled list #: en/diff-options.txt:313 en/merge-strategies.txt:59 -#, no-wrap +#, fuzzy, no-wrap msgid "ignore-space-change" -msgstr "" +msgstr "--ignore-space-change" #. type: Plain text #: en/diff-options.txt:317 en/diff-options.txt:651 @@ -3557,9 +3708,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:317 en/merge-strategies.txt:60 -#, no-wrap +#, fuzzy, no-wrap msgid "ignore-all-space" -msgstr "" +msgstr "--ignore-all-space" #. type: Plain text #: en/diff-options.txt:320 @@ -3611,9 +3762,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:345 -#, no-wrap +#, fuzzy, no-wrap msgid "porcelain" -msgstr "" +msgstr "--porcelain" #. type: Plain text #: en/diff-options.txt:352 @@ -3622,9 +3773,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:352 en/git-daemon.txt:131 en/git-submodule.txt:162 -#, no-wrap +#, fuzzy, no-wrap msgid "none" -msgstr "" +msgstr "listo" #. type: Plain text #: en/diff-options.txt:354 @@ -3780,9 +3931,9 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:456 -#, no-wrap +#, fuzzy, no-wrap msgid "\tDetect renames.\n" -msgstr "" +msgstr "detectar renombrados" #. type: Plain text #: en/diff-options.txt:461 @@ -3892,9 +4043,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:528 -#, no-wrap +#, fuzzy, no-wrap msgid "-S<string>" -msgstr "" +msgstr "<string>" #. type: Plain text #: en/diff-options.txt:532 @@ -3913,9 +4064,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:541 -#, no-wrap +#, fuzzy, no-wrap msgid "-G<regex>" -msgstr "" +msgstr "<regex>" #. type: Plain text #: en/diff-options.txt:544 @@ -4066,8 +4217,9 @@ msgstr "--text" #. type: Plain text #: en/diff-options.txt:639 +#, fuzzy msgid "Treat all files as text." -msgstr "" +msgstr "tratar todos los archivos como texto" #. type: Labeled list #: en/diff-options.txt:640 @@ -4117,8 +4269,9 @@ msgstr "--ignore-blank-lines" #. type: Plain text #: en/diff-options.txt:660 +#, fuzzy msgid "Ignore changes whose lines are all blank." -msgstr "" +msgstr "ignora cambios cuyas l챠neas son todas en blanco" #. type: Labeled list #: en/diff-options.txt:661 @@ -4228,8 +4381,9 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:717 +#, fuzzy msgid "Show the given source prefix instead of \"a/\"." -msgstr "" +msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\"" #. type: Labeled list #: en/diff-options.txt:718 @@ -4239,8 +4393,9 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:720 +#, fuzzy msgid "Show the given destination prefix instead of \"b/\"." -msgstr "" +msgstr "mostrar el prefijo de destino en lugar de \"b/\"" #. type: Labeled list #: en/diff-options.txt:721 @@ -4250,8 +4405,9 @@ msgstr "--no-prefix" #. type: Plain text #: en/diff-options.txt:723 +#, fuzzy msgid "Do not show any source or destination prefix." -msgstr "" +msgstr "no mostrar ning첬n prefijo de fuente o destino" #. type: Labeled list #: en/diff-options.txt:724 @@ -4261,8 +4417,9 @@ msgstr "" #. type: Plain text #: en/diff-options.txt:726 +#, fuzzy msgid "Prepend an additional prefix to every line of output." -msgstr "" +msgstr "anteponer un prefijo adicional a cada l챠nea mostrada" #. type: Labeled list #: en/diff-options.txt:727 @@ -4461,8 +4618,9 @@ msgstr "--keep" #. type: Plain text #: en/fetch-options.txt:85 +#, fuzzy msgid "Keep downloaded pack." -msgstr "" +msgstr "mantener el paquete descargado" #. type: Labeled list #: en/fetch-options.txt:87 @@ -4655,8 +4813,9 @@ msgstr "--verbose" #. type: Plain text #: en/fetch-options.txt:207 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:128 +#, fuzzy msgid "Be verbose." -msgstr "" +msgstr "ser verboso" #. type: Labeled list #: en/fetch-options.txt:209 en/git-clone.txt:128 en/git-format-patch.txt:321 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-submodule.txt:247 en/merge-options.txt:129 @@ -4734,8 +4893,9 @@ msgstr "" #. type: Plain text #: en/git-add.txt:7 +#, fuzzy msgid "git-add - Add file contents to the index" -msgstr "" +msgstr "Agrega contenido de carpetas al 챠ndice" #. type: Title - #: en/git-add.txt:9 en/git-am.txt:10 en/git-annotate.txt:9 en/git-apply.txt:10 en/git-archimport.txt:10 en/git-archive.txt:10 en/git-bisect.txt:10 en/git-blame.txt:9 en/git-branch.txt:9 en/git-bundle.txt:10 en/git-cat-file.txt:10 en/git-check-attr.txt:10 en/git-check-ignore.txt:10 en/git-check-mailmap.txt:10 en/git-checkout-index.txt:10 en/git-checkout.txt:9 en/git-check-ref-format.txt:9 en/git-cherry-pick.txt:9 en/git-cherry.txt:9 en/git-citool.txt:9 en/git-clean.txt:9 en/git-clone.txt:10 en/git-column.txt:9 en/git-commit-tree.txt:10 en/git-commit.txt:9 en/git-config.txt:10 en/git-count-objects.txt:9 en/git-credential-cache--daemon.txt:9 en/git-credential-cache.txt:9 en/git-credential-store.txt:9 en/git-credential.txt:9 en/git-cvsexportcommit.txt:10 en/git-cvsimport.txt:10 en/git-cvsserver.txt:9 en/git-daemon.txt:9 en/git-describe.txt:9 en/git-diff-files.txt:10 en/git-diff-index.txt:10 en/git-difftool.txt:9 en/git-diff-tree.txt:10 en/git-diff.txt:10 en/git-fast-export.txt:10 en/git-fast-import.txt:10 en/git-fetch-pack.txt:10 en/git-fetch.txt:10 en/git-filter-branch.txt:9 en/git-fmt-merge-msg.txt:10 en/git-for-each-ref.txt:9 en/git-format-patch.txt:10 en/git-fsck-objects.txt:10 en/git-fsck.txt:10 en/git-gc.txt:10 en/git-get-tar-commit-id.txt:10 en/git-grep.txt:10 en/git-gui.txt:9 en/git-hash-object.txt:10 en/git-help.txt:9 en/git-http-backend.txt:9 en/git-http-fetch.txt:10 en/git-http-push.txt:10 en/git-imap-send.txt:10 en/git-index-pack.txt:10 en/git-init-db.txt:10 en/git-init.txt:10 en/git-instaweb.txt:9 en/git-interpret-trailers.txt:9 en/git-log.txt:10 en/git-ls-files.txt:10 en/git-ls-remote.txt:10 en/git-ls-tree.txt:10 en/git-mailinfo.txt:10 en/git-mailsplit.txt:9 en/git-merge-base.txt:10 en/git-merge-file.txt:10 en/git-merge-index.txt:10 en/git-merge-one-file.txt:10 en/git-mergetool--lib.txt:9 en/git-mergetool.txt:9 en/git-merge-tree.txt:10 en/git-merge.txt:10 en/git-mktag.txt:10 en/git-mktree.txt:10 en/git-mv.txt:10 en/git-name-rev.txt:10 en/git-notes.txt:9 en/git-p4.txt:10 en/git-pack-objects.txt:10 en/git-pack-redundant.txt:10 en/git-pack-refs.txt:9 en/git-parse-remote.txt:10 en/git-patch-id.txt:9 en/git-prune-packed.txt:10 en/git-prune.txt:10 en/git-pull.txt:10 en/git-push.txt:10 en/git-quiltimport.txt:10 en/git-read-tree.txt:10 en/git-rebase.txt:9 en/git-receive-pack.txt:10 en/git-reflog.txt:10 en/git-remote-ext.txt:9 en/git-remote-fd.txt:9 en/git-remote-testgit.txt:10 en/git-remote.txt:10 en/git-repack.txt:10 en/git-replace.txt:9 en/git-request-pull.txt:9 en/git-rerere.txt:9 en/git-reset.txt:9 en/git-revert.txt:9 en/git-rev-list.txt:10 en/git-rev-parse.txt:10 en/git-rm.txt:9 en/git-send-email.txt:10 en/git-send-pack.txt:10 en/git-shell.txt:10 en/git-sh-i18n--envsubst.txt:9 en/git-sh-i18n.txt:9 en/git-shortlog.txt:9 en/git-show-branch.txt:9 en/git-show-index.txt:10 en/git-show-ref.txt:9 en/git-show.txt:10 en/git-sh-setup.txt:9 en/git-stage.txt:10 en/git-stash.txt:9 en/git-status.txt:10 en/git-stripspace.txt:10 en/git-submodule.txt:10 en/git-svn.txt:9 en/git-symbolic-ref.txt:9 en/git-tag.txt:10 en/git.txt:10 en/git-unpack-file.txt:11 en/git-unpack-objects.txt:10 en/git-update-index.txt:10 en/git-update-ref.txt:9 en/git-update-server-info.txt:10 en/git-upload-archive.txt:10 en/git-upload-pack.txt:10 en/git-var.txt:10 en/git-verify-commit.txt:9 en/git-verify-pack.txt:10 en/git-verify-tag.txt:9 en/git-web--browse.txt:9 en/git-whatchanged.txt:10 en/git-worktree.txt:10 en/git-write-tree.txt:10 @@ -4818,8 +4978,9 @@ msgstr "" #. type: Plain text #: en/git-add.txt:80 +#, fuzzy msgid "Allow adding otherwise ignored files." -msgstr "" +msgstr "permitir agregar caso contrario ignorar archivos" #. type: Labeled list #: en/git-add.txt:81 en/git-am.txt:122 en/git-branch.txt:137 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:48 en/git-rebase.txt:389 en/git-repack.txt:163 en/git-tag.txt:123 en/rev-list-options.txt:73 @@ -5111,9 +5272,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:252 -#, no-wrap +#, fuzzy, no-wrap msgid "status" -msgstr "" +msgstr "--status" #. type: Plain text #: en/git-add.txt:259 @@ -5136,9 +5297,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:276 en/git-update-ref.txt:94 -#, no-wrap +#, fuzzy, no-wrap msgid "update" -msgstr "" +msgstr "--update" #. type: Plain text #: en/git-add.txt:285 @@ -5179,7 +5340,7 @@ msgstr "" #: en/git-add.txt:305 #, no-wrap msgid "revert" -msgstr "" +msgstr "revertir" #. type: Plain text #: en/git-add.txt:310 @@ -5188,9 +5349,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:311 -#, no-wrap +#, fuzzy, no-wrap msgid "add untracked" -msgstr "" +msgstr "Agregar no rastreados" #. type: Plain text #: en/git-add.txt:315 @@ -5199,9 +5360,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:316 -#, no-wrap +#, fuzzy, no-wrap msgid "patch" -msgstr "" +msgstr "ruta" #. type: Plain text #: en/git-add.txt:323 @@ -5284,9 +5445,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:374 -#, no-wrap +#, fuzzy, no-wrap msgid "modified content" -msgstr "" +msgstr "contenido modificado, " #. type: Plain text #: en/git-add.txt:381 @@ -5387,8 +5548,9 @@ msgstr "git-am(1)" #. type: Plain text #: en/git-am.txt:7 +#, fuzzy msgid "git-am - Apply a series of patches from a mailbox" -msgstr "" +msgstr "Aplicar una serie de parches de un mailbox" #. type: Plain text #: en/git-am.txt:20 @@ -5638,8 +5800,9 @@ msgstr "" #. type: Plain text #: en/git-am.txt:125 +#, fuzzy msgid "Run interactively." -msgstr "" +msgstr "ejecutar de manera interactiva" #. type: Plain text #: en/git-am.txt:126 en/git-rebase.txt:375 en/git-rebase.txt:515 @@ -5733,8 +5896,9 @@ msgstr "--abort" #. type: Plain text #: en/git-am.txt:169 +#, fuzzy msgid "Restore the original branch and abort the patching operation." -msgstr "" +msgstr "restaurar la rama original y abortar la operaci처n de parchado." #. type: Labeled list #: en/git-am.txt:170 en/git-rebase.txt:238 en/sequencer.txt:6 @@ -5842,8 +6006,9 @@ msgstr "" #. type: Plain text #: en/git-am.txt:237 +#, fuzzy msgid "linkgit:git-apply[1]." -msgstr "" +msgstr "linkgit:git-apply[1]" #. type: Title = #: en/git-annotate.txt:2 @@ -5880,8 +6045,9 @@ msgstr "git-apply(1)" #. type: Plain text #: en/git-apply.txt:7 +#, fuzzy msgid "git-apply - Apply a patch to files and/or to the index" -msgstr "" +msgstr "Aplicar un parche a archivos y/o el 챠ndice" #. type: Plain text #: en/git-apply.txt:20 @@ -6000,8 +6166,9 @@ msgstr "--reverse" #. type: Plain text #: en/git-apply.txt:107 +#, fuzzy msgid "Apply the patch in reverse." -msgstr "" +msgstr "aplicar el parche en reversa" #. type: Plain text #: en/git-apply.txt:114 @@ -6254,8 +6421,9 @@ msgstr "" #. type: Plain text #: en/git-apply.txt:282 +#, fuzzy msgid "linkgit:git-am[1]." -msgstr "" +msgstr "linkgit:git-am[1]" #. type: Title = #: en/git-archimport.txt:2 @@ -6410,8 +6578,9 @@ msgstr "git-archive(1)" #. type: Plain text #: en/git-archive.txt:7 +#, fuzzy msgid "git-archive - Create an archive of files from a named tree" -msgstr "" +msgstr "Crear un archivo o archivos de un 찼rbol nombrado" #. type: Plain text #: en/git-archive.txt:16 @@ -6468,8 +6637,9 @@ msgstr "" #. type: Plain text #: en/git-archive.txt:53 +#, fuzzy msgid "Prepend <prefix>/ to each filename in the archive." -msgstr "" +msgstr "anteponer prefijo a cada ruta en el archivo" #. type: Labeled list #: en/git-archive.txt:54 @@ -6534,9 +6704,9 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:77 en/git-checkout.txt:305 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:315 -#, no-wrap +#, fuzzy, no-wrap msgid "<tree-ish>" -msgstr "" +msgstr "찼rbol-ismo" #. type: Plain text #: en/git-archive.txt:79 @@ -6761,8 +6931,9 @@ msgstr "git-bisect(1)" #. type: Plain text #: en/git-bisect.txt:7 +#, fuzzy msgid "git-bisect - Use binary search to find the commit that introduced a bug" -msgstr "" +msgstr "Use la b첬squeda binaria para encontrar el commit que introdujo el bug" #. type: Plain text #: en/git-bisect.txt:13 @@ -7459,8 +7630,9 @@ msgstr "git-blame(1)" #. type: Plain text #: en/git-blame.txt:7 +#, fuzzy msgid "git-blame - Show what revision and author last modified each line of a file" -msgstr "" +msgstr "Mostrar qu챕 revisi처n y autor modificaron al 첬ltimo cada l챠nea de un archivo" #. type: Plain text #: en/git-blame.txt:15 @@ -7508,8 +7680,9 @@ msgstr "" #. type: Plain text #: en/git-blame.txt:54 +#, fuzzy msgid "Use the same output mode as linkgit:git-annotate[1] (Default: off)." -msgstr "" +msgstr "Usar el mismo modo salida como git-annotate (Default: off)" #. type: Labeled list #: en/git-blame.txt:55 @@ -7966,8 +8139,9 @@ msgstr "--ignore-case" #. type: Plain text #: en/git-branch.txt:140 +#, fuzzy msgid "Sorting and filtering branches are case insensitive." -msgstr "" +msgstr "ordenamiento y filtrado son case-insensitive" #. type: Labeled list #: en/git-branch.txt:141 en/git-status.txt:126 en/git-tag.txt:127 @@ -8004,8 +8178,9 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:156 +#, fuzzy msgid "List both remote-tracking branches and local branches." -msgstr "" +msgstr "listar혻ramas de remote-tracking y locales" #. type: Plain text #: en/git-branch.txt:162 @@ -8206,9 +8381,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:257 -#, no-wrap +#, fuzzy, no-wrap msgid "<newbranch>" -msgstr "" +msgstr "[nueva rama]" #. type: Plain text #: en/git-branch.txt:260 @@ -8609,8 +8784,9 @@ msgstr "git-cat-file(1)" #. type: Plain text #: en/git-cat-file.txt:7 +#, fuzzy msgid "git-cat-file - Provide content or type and size information for repository objects" -msgstr "" +msgstr "Proveer contenido o tipo y tama챰o de informaci처n para objetos de repositorio" #. type: Plain text #: en/git-cat-file.txt:14 @@ -8632,9 +8808,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:203 en/git.txt:303 -#, no-wrap +#, fuzzy, no-wrap msgid "<object>" -msgstr "" +msgstr "objeto" #. type: Plain text #: en/git-cat-file.txt:35 @@ -8707,9 +8883,9 @@ msgstr "--batch" #. type: Labeled list #: en/git-cat-file.txt:78 -#, no-wrap +#, fuzzy, no-wrap msgid "--batch=<format>" -msgstr "" +msgstr "--patch-format" #. type: Plain text #: en/git-cat-file.txt:84 @@ -9329,8 +9505,9 @@ msgstr "" #. type: Plain text #: en/git-check-attr.txt:117 +#, fuzzy msgid "linkgit:gitattributes[5]." -msgstr "" +msgstr "linkgit:gitattributes[5]" #. type: Title = #: en/git-check-ignore.txt:2 @@ -9503,9 +9680,9 @@ msgstr "" #. type: Plain text #: en/git-check-mailmap.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git check-mailmap' [<options>] <contact>...\n" -msgstr "" +msgstr "git check-mailmap [<opciones>] <contacto>..." #. type: Plain text #: en/git-check-mailmap.txt:22 @@ -9561,8 +9738,9 @@ msgstr "" #. type: Plain text #: en/git-checkout-index.txt:37 +#, fuzzy msgid "forces overwrite of existing files" -msgstr "" +msgstr "forzar sobreescritura de los archivos existentes" #. type: Plain text #: en/git-checkout-index.txt:42 @@ -9775,8 +9953,9 @@ msgstr "git-checkout(1)" #. type: Plain text #: en/git-checkout.txt:7 +#, fuzzy msgid "git-checkout - Switch branches or restore working tree files" -msgstr "" +msgstr "Cambia ramas o restaura los archivos de tu 찼rbol de trabajo" #. type: Plain text #: en/git-checkout.txt:18 @@ -9913,8 +10092,9 @@ msgstr "" #. type: Plain text #: en/git-checkout.txt:120 +#, fuzzy msgid "Quiet, suppress feedback messages." -msgstr "" +msgstr "suprimir mensajes de feedback" #. type: Plain text #: en/git-checkout.txt:126 @@ -10122,7 +10302,7 @@ msgstr "" #: en/git-checkout.txt:283 en/git-rebase.txt:225 #, no-wrap msgid "<branch>" -msgstr "" +msgstr "<rama>" #. type: Plain text #: en/git-checkout.txt:289 @@ -10141,9 +10321,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:298 -#, no-wrap +#, fuzzy, no-wrap msgid "<new_branch>" -msgstr "" +msgstr "nueva-rama" #. type: Plain text #: en/git-checkout.txt:300 @@ -10753,9 +10933,9 @@ msgstr "" #. type: Labeled list #: en/git-cherry-pick.txt:79 en/git-revert.txt:49 -#, no-wrap +#, fuzzy, no-wrap msgid "-m parent-number" -msgstr "" +msgstr "n첬mero-de-padre" #. type: Labeled list #: en/git-cherry-pick.txt:80 en/git-revert.txt:50 @@ -10999,14 +11179,15 @@ msgstr "git-cherry(1)" #. type: Plain text #: en/git-cherry.txt:7 +#, fuzzy msgid "git-cherry - Find commits yet to be applied to upstream" -msgstr "" +msgstr "Encuentra commits que faltan aplicar en upstream" #. type: Plain text #: en/git-cherry.txt:12 -#, no-wrap +#, fuzzy, no-wrap msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n" -msgstr "" +msgstr "git cherry [-v] [<upstream> [<head> [<l챠mite>]]]" #. type: Plain text #: en/git-cherry.txt:17 @@ -11030,9 +11211,9 @@ msgstr "" #. type: Labeled list #: en/git-cherry.txt:32 en/git-rebase.txt:220 -#, no-wrap +#, fuzzy, no-wrap msgid "<upstream>" -msgstr "" +msgstr "upstream" #. type: Plain text #: en/git-cherry.txt:35 @@ -11218,14 +11399,15 @@ msgstr "git-clean(1)" #. type: Plain text #: en/git-clean.txt:7 +#, fuzzy msgid "git-clean - Remove untracked files from the working tree" -msgstr "" +msgstr "Remueve archivos del 찼rbol de trabajo no rastreados" #. type: Plain text #: en/git-clean.txt:12 -#, no-wrap +#, fuzzy, no-wrap msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...\n" -msgstr "" +msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <patr처n>] [-x | -X] [--] <rutas>..." #. type: Plain text #: en/git-clean.txt:18 @@ -11377,9 +11559,9 @@ msgstr "" #. type: Labeled list #: en/git-clean.txt:127 -#, no-wrap +#, fuzzy, no-wrap msgid "quit" -msgstr "" +msgstr "tranquilo" #. type: Plain text #: en/git-clean.txt:130 @@ -11411,8 +11593,9 @@ msgstr "git-clone(1)" #. type: Plain text #: en/git-clone.txt:7 +#, fuzzy msgid "git-clone - Clone a repository into a new directory" -msgstr "" +msgstr "Clona un repositorio dentro de un nuevo directorio" #. type: Plain text #: en/git-clone.txt:19 @@ -11749,9 +11932,9 @@ msgstr "" #. type: Labeled list #: en/git-clone.txt:267 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1 -#, no-wrap +#, fuzzy, no-wrap msgid "<repository>" -msgstr "" +msgstr "repositorio" #. type: Plain text #: en/git-clone.txt:271 @@ -12461,9 +12644,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:200 -#, no-wrap +#, fuzzy, no-wrap msgid "whitespace" -msgstr "" +msgstr "--whitespace" #. type: Plain text #: en/git-commit.txt:202 @@ -12483,9 +12666,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:204 -#, no-wrap +#, fuzzy, no-wrap msgid "scissors" -msgstr "" +msgstr "--scissors" #. type: Plain text #: en/git-commit.txt:208 @@ -12567,8 +12750,9 @@ msgstr "--no-post-rewrite" #. type: Plain text #: en/git-commit.txt:259 +#, fuzzy msgid "Bypass the post-rewrite hook." -msgstr "" +msgstr "gancho bypass post reescritura" #. type: Labeled list #: en/git-commit.txt:261 @@ -12606,8 +12790,9 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:284 en/git-status.txt:61 +#, fuzzy msgid "Show untracked files." -msgstr "" +msgstr "No hay archivos sin rastrear.\n" #. type: Plain text #: en/git-commit.txt:288 @@ -12836,8 +13021,9 @@ msgstr "git-config(1)" #. type: Plain text #: en/git-config.txt:7 +#, fuzzy msgid "git-config - Get and set repository or global options" -msgstr "" +msgstr "Configurar repositorio u opciones globales" #. type: Plain text #: en/git-config.txt:27 @@ -13684,9 +13870,9 @@ msgstr "" #. type: Plain text #: en/git-count-objects.txt:12 -#, no-wrap +#, fuzzy, no-wrap msgid "'git count-objects' [-v] [-H | --human-readable]\n" -msgstr "" +msgstr "git count-objects [-v] [-H | --human-readable]" #. type: Plain text #: en/git-count-objects.txt:17 @@ -13752,8 +13938,9 @@ msgstr "--human-readable" #. type: Plain text #: en/git-count-objects.txt:51 +#, fuzzy msgid "Print sizes in human readable format" -msgstr "" +msgstr "mostrar tama챰os en formato legible para humano" #. type: Title = #: en/git-credential-cache--daemon.txt:2 @@ -14309,8 +14496,9 @@ msgstr "" #. type: Plain text #: en/git-cvsexportcommit.txt:84 +#, fuzzy msgid "Verbose." -msgstr "" +msgstr "verboso" #. type: Labeled list #: en/git-cvsexportcommit.txt:87 @@ -14374,8 +14562,9 @@ msgstr "git-cvsimport(1)" #. type: Plain text #: en/git-cvsimport.txt:7 +#, fuzzy msgid "git-cvsimport - Salvage your data out of another SCM people love to hate" -msgstr "" +msgstr "Salva tus datos de otro SCM que la gente adora odiar" #. type: Plain text #: en/git-cvsimport.txt:17 @@ -15412,8 +15601,9 @@ msgstr "git-daemon(1)" #. type: Plain text #: en/git-daemon.txt:7 +#, fuzzy msgid "git-daemon - A really simple server for Git repositories" -msgstr "" +msgstr "Un servidor realmente simple para repositorios Git" #. type: Plain text #: en/git-daemon.txt:25 @@ -15604,9 +15794,9 @@ msgstr "" #. type: Labeled list #: en/git-daemon.txt:129 -#, no-wrap +#, fuzzy, no-wrap msgid "syslog" -msgstr "" +msgstr "--syslog" #. type: Plain text #: en/git-daemon.txt:131 @@ -15930,8 +16120,9 @@ msgstr "git-describe(1)" #. type: Plain text #: en/git-describe.txt:7 +#, fuzzy msgid "git-describe - Give an object a human readable name based on an available ref" -msgstr "" +msgstr "Dar a un objeto un nombre legible por humanos basado en una referencia disponible" #. type: Plain text #: en/git-describe.txt:14 @@ -16051,9 +16242,9 @@ msgstr "" #. type: Labeled list #: en/git-describe.txt:96 -#, no-wrap +#, fuzzy, no-wrap msgid "--match <pattern>" -msgstr "" +msgstr "concordar <patr처n>" #. type: Plain text #: en/git-describe.txt:105 @@ -16079,8 +16270,9 @@ msgstr "--always" #. type: Plain text #: en/git-describe.txt:120 en/git-name-rev.txt:63 +#, fuzzy msgid "Show uniquely abbreviated commit object as fallback." -msgstr "" +msgstr "mostrar el objeto commit abreviado como fallback" #. type: Labeled list #: en/git-describe.txt:121 en/rev-list-options.txt:124 @@ -16432,9 +16624,9 @@ msgstr "" #. type: Plain text #: en/git-difftool.txt:12 -#, no-wrap +#, fuzzy, no-wrap msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n" -msgstr "" +msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]" #. type: Plain text #: en/git-difftool.txt:19 @@ -16466,8 +16658,9 @@ msgstr "--no-prompt" #. type: Plain text #: en/git-difftool.txt:31 +#, fuzzy msgid "Do not prompt before launching a diff tool." -msgstr "" +msgstr "no mostrar antes de lanzar una herramienta de diff" #. type: Labeled list #: en/git-difftool.txt:32 en/git-mergetool.txt:78 @@ -16525,8 +16718,9 @@ msgstr "--tool-help" #. type: Plain text #: en/git-difftool.txt:71 +#, fuzzy msgid "Print a list of diff tools that may be used with `--tool`." -msgstr "" +msgstr "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`" #. type: Labeled list #: en/git-difftool.txt:72 @@ -16546,9 +16740,9 @@ msgstr "" #. type: Labeled list #: en/git-difftool.txt:81 -#, no-wrap +#, fuzzy, no-wrap msgid "-x <command>" -msgstr "" +msgstr "<comando>" #. type: Labeled list #: en/git-difftool.txt:82 @@ -16689,17 +16883,17 @@ msgstr "" #. type: Plain text #: en/git-difftool.txt:138 msgid "Show changes between commits, commit and working tree, etc" -msgstr "" +msgstr "Muestra los cambios entre commits, commit y 찼rbol de trabajo, etc" #. type: Plain text #: en/git-difftool.txt:141 msgid "Run merge conflict resolution tools to resolve merge conflicts" -msgstr "" +msgstr "Ejecuta las herramientas de fusi처n de resoluci처n de conflictos para resolver conflictos de fusi처n" #. type: Plain text #: en/git-difftool.txt:144 msgid "Get and set repository or global options" -msgstr "" +msgstr "Configurar repositorio u opciones globales" #. type: Title = #: en/git-diff-tree.txt:2 @@ -16709,8 +16903,9 @@ msgstr "git-diff-tree(1)" #. type: Plain text #: en/git-diff-tree.txt:7 +#, fuzzy msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects" -msgstr "" +msgstr "Compara el contenido y el modo de blobs encontrados a trav챕s de dos objetos de 찼rbol" #. type: Plain text #: en/git-diff-tree.txt:15 @@ -16723,8 +16918,9 @@ msgstr "" #. type: Plain text #: en/git-diff-tree.txt:19 +#, fuzzy msgid "Compares the content and mode of the blobs found via two tree objects." -msgstr "" +msgstr "Compara el contenido y el modo de blobs encontrados a trav챕s de dos objetos de 찼rbol" #. type: Plain text #: en/git-diff-tree.txt:22 @@ -16754,8 +16950,9 @@ msgstr "" #. type: Plain text #: en/git-diff-tree.txt:38 +#, fuzzy msgid "recurse into sub-trees" -msgstr "" +msgstr "recurrir en sub찼rboles" #. type: Plain text #: en/git-diff-tree.txt:41 @@ -16836,8 +17033,9 @@ msgstr "git-diff(1)" #. type: Plain text #: en/git-diff.txt:7 +#, fuzzy msgid "git-diff - Show changes between commits, commit and working tree, etc" -msgstr "" +msgstr "Muestra los cambios entre commits, commit y 찼rbol de trabajo, etc" #. type: Plain text #: en/git-diff.txt:17 @@ -16879,9 +17077,9 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:41 -#, no-wrap +#, fuzzy, no-wrap msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]" -msgstr "" +msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]" #. type: Plain text #: en/git-diff.txt:50 @@ -16901,9 +17099,9 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:59 -#, no-wrap +#, fuzzy, no-wrap msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]" -msgstr "" +msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]" #. type: Plain text #: en/git-diff.txt:63 @@ -16912,9 +17110,9 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:64 -#, no-wrap +#, fuzzy, no-wrap msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]" -msgstr "" +msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]" #. type: Plain text #: en/git-diff.txt:69 @@ -16923,9 +17121,9 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:70 -#, no-wrap +#, fuzzy, no-wrap msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]" -msgstr "" +msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]" #. type: Plain text #: en/git-diff.txt:77 @@ -17620,8 +17818,9 @@ msgstr "fastimport.unpackLimit" #. type: Plain text #: en/git-fast-import.txt:142 +#, fuzzy msgid "See linkgit:git-config[1]" -msgstr "" +msgstr "linkgit:git-config[1]" #. type: Title - #: en/git-fast-import.txt:144 en/git-p4.txt:507 @@ -17820,9 +18019,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:314 -#, no-wrap +#, fuzzy, no-wrap msgid "Commands" -msgstr "" +msgstr "comando" #. type: Plain text #: en/git-fast-import.txt:318 @@ -18874,15 +19073,15 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:1073 -#, no-wrap +#, fuzzy, no-wrap msgid "no-relative-marks" -msgstr "" +msgstr "--[no-]relative-marks" #. type: Plain text #: en/git-fast-import.txt:1074 en/git-fast-import.txt:1141 #, no-wrap msgid "force" -msgstr "" +msgstr "forzar" #. type: Plain text #: en/git-fast-import.txt:1078 @@ -18908,15 +19107,15 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:1089 -#, no-wrap +#, fuzzy, no-wrap msgid "get-mark" -msgstr "" +msgstr "`get-mark`" #. type: Labeled list #: en/git-fast-import.txt:1090 -#, no-wrap +#, fuzzy, no-wrap msgid "cat-blob" -msgstr "" +msgstr "`cat-blob`" #. type: Labeled list #: en/git-fast-import.txt:1091 @@ -18944,7 +19143,7 @@ msgstr "" #: en/git-fast-import.txt:1106 #, no-wrap msgid "done" -msgstr "" +msgstr "listo" #. type: Plain text #: en/git-fast-import.txt:1113 @@ -19608,8 +19807,9 @@ msgstr "git-fetch(1)" #. type: Plain text #: en/git-fetch.txt:7 +#, fuzzy msgid "git-fetch - Download objects and refs from another repository" -msgstr "" +msgstr "Descarga objetos y referencias de otro repositorio" #. type: Plain text #: en/git-fetch.txt:16 @@ -19912,9 +20112,9 @@ msgstr "" #. type: Labeled list #: en/git-fetch.txt:221 en/git-push.txt:440 -#, no-wrap +#, fuzzy, no-wrap msgid "summary" -msgstr "" +msgstr "--summary" #. type: Plain text #: en/git-fetch.txt:226 @@ -19947,7 +20147,7 @@ msgstr "" #: en/git-fetch.txt:236 en/git-push.txt:477 #, no-wrap msgid "reason" -msgstr "" +msgstr "raz처n" #. type: Plain text #: en/git-fetch.txt:240 @@ -19956,8 +20156,9 @@ msgstr "" #. type: Plain text #: en/git-fetch.txt:245 +#, fuzzy msgid "Update the remote-tracking branches:" -msgstr "" +msgstr "actuar en ramas de traqueo remoto" #. type: delimited block - #: en/git-fetch.txt:248 @@ -20837,8 +21038,9 @@ msgstr "" #. type: Plain text #: en/git-for-each-ref.txt:76 +#, fuzzy msgid "Only list refs which points at the given object." -msgstr "" +msgstr "mostrar solo refs que apunten al objeto dado" #. type: Labeled list #: en/git-for-each-ref.txt:77 @@ -20886,8 +21088,9 @@ msgstr "" #. type: Plain text #: en/git-for-each-ref.txt:97 +#, fuzzy msgid "Sorting and filtering refs are case insensitive." -msgstr "" +msgstr "ordenamiento y filtrado son case-insensitive" #. type: Title - #: en/git-for-each-ref.txt:99 @@ -20907,9 +21110,9 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:107 -#, no-wrap +#, fuzzy, no-wrap msgid "refname" -msgstr "" +msgstr "renombrar" #. type: Plain text #: en/git-for-each-ref.txt:123 @@ -20923,9 +21126,9 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:126 -#, no-wrap +#, fuzzy, no-wrap msgid "objecttype" -msgstr "" +msgstr "`objecttype`" #. type: Plain text #: en/git-for-each-ref.txt:128 @@ -20934,9 +21137,9 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:129 -#, no-wrap +#, fuzzy, no-wrap msgid "objectsize" -msgstr "" +msgstr "`objectsize`" #. type: Plain text #: en/git-for-each-ref.txt:133 @@ -20945,9 +21148,9 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:133 -#, no-wrap +#, fuzzy, no-wrap msgid "objectname" -msgstr "" +msgstr "`objectname`" #. type: Plain text #: en/git-for-each-ref.txt:139 @@ -20956,9 +21159,9 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:139 -#, no-wrap +#, fuzzy, no-wrap msgid "deltabase" -msgstr "" +msgstr "`deltabase`" #. type: Plain text #: en/git-for-each-ref.txt:143 @@ -20969,7 +21172,7 @@ msgstr "" #: en/git-for-each-ref.txt:144 #, no-wrap msgid "upstream" -msgstr "" +msgstr "upstream" #. type: Plain text #: en/git-for-each-ref.txt:154 @@ -21037,9 +21240,9 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:211 -#, no-wrap +#, fuzzy, no-wrap msgid "symref" -msgstr "" +msgstr "--symref" #. type: Plain text #: en/git-for-each-ref.txt:216 @@ -21333,9 +21536,9 @@ msgstr "" #. type: Labeled list #: en/git-format-patch.txt:88 -#, no-wrap +#, fuzzy, no-wrap msgid "-<n>" -msgstr "" +msgstr "<n>" #. type: Plain text #: en/git-format-patch.txt:90 @@ -21389,8 +21592,9 @@ msgstr "" #. type: Plain text #: en/git-format-patch.txt:106 +#, fuzzy msgid "Start numbering the patches at <n> instead of 1." -msgstr "" +msgstr "comenzar a numerar los parches desde <n> en lugar de 1" #. type: Labeled list #: en/git-format-patch.txt:107 @@ -22278,8 +22482,9 @@ msgstr "git-fsck-objects(1)" #. type: Plain text #: en/git-fsck-objects.txt:7 +#, fuzzy msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database" -msgstr "" +msgstr "Verifica la conectividad y disponibilidad de los objetos en la base de datos" #. type: Plain text #: en/git-fsck-objects.txt:13 @@ -22300,8 +22505,9 @@ msgstr "git-fsck(1)" #. type: Plain text #: en/git-fsck.txt:7 +#, fuzzy msgid "git-fsck - Verifies the connectivity and validity of the objects in the database" -msgstr "" +msgstr "Verifica la conectividad y disponibilidad de los objetos en la base de datos" #. type: Plain text #: en/git-fsck.txt:16 @@ -22347,13 +22553,15 @@ msgstr "" #. type: Plain text #: en/git-fsck.txt:40 +#, fuzzy msgid "Report root nodes." -msgstr "" +msgstr "reportar nodos ra챠z" #. type: Plain text #: en/git-fsck.txt:43 +#, fuzzy msgid "Report tags." -msgstr "" +msgstr "reportar tags" #. type: Labeled list #: en/git-fsck.txt:44 @@ -22576,8 +22784,9 @@ msgstr "git-gc(1)" #. type: Plain text #: en/git-gc.txt:7 +#, fuzzy msgid "git-gc - Cleanup unnecessary files and optimize the local repository" -msgstr "" +msgstr "Limpia archivos innecesarios y optimiza el repositorio local" #. type: Plain text #: en/git-gc.txt:13 @@ -22799,9 +23008,9 @@ msgstr "" #. type: Plain text #: en/git-get-tar-commit-id.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git get-tar-commit-id'\n" -msgstr "" +msgstr "git-get-tar-commit-id(1)" #. type: Plain text #: en/git-get-tar-commit-id.txt:22 @@ -23014,8 +23223,9 @@ msgstr "" #. type: Plain text #: en/git-grep.txt:119 +#, fuzzy msgid "Don't match the pattern in binary files." -msgstr "" +msgstr "no concordar patrones en archivos binarios" #. type: Labeled list #: en/git-grep.txt:120 @@ -23257,8 +23467,9 @@ msgstr "--break" #. type: Plain text #: en/git-grep.txt:232 +#, fuzzy msgid "Print an empty line between matches from different files." -msgstr "" +msgstr "imprimir una l챠nea vac챠a entre coincidencias de diferentes archivos" #. type: Labeled list #: en/git-grep.txt:233 @@ -23489,8 +23700,9 @@ msgstr "git-gui(1)" #. type: Plain text #: en/git-gui.txt:7 +#, fuzzy msgid "git-gui - A portable graphical interface to Git" -msgstr "" +msgstr "Una interfaz gr찼fica port찼til para Git" #. type: Plain text #: en/git-gui.txt:12 @@ -23532,9 +23744,9 @@ msgstr "" #. type: Labeled list #: en/git-gui.txt:36 -#, no-wrap +#, fuzzy, no-wrap msgid "browser" -msgstr "" +msgstr "--browser" #. type: Plain text #: en/git-gui.txt:40 @@ -23554,9 +23766,9 @@ msgstr "" #. type: Labeled list #: en/git-gui.txt:47 -#, no-wrap +#, fuzzy, no-wrap msgid "version" -msgstr "" +msgstr "--version" #. type: Plain text #: en/git-gui.txt:49 @@ -23666,7 +23878,7 @@ msgstr "" #: en/git-gui.txt:110 #, no-wrap msgid "Other" -msgstr "" +msgstr "Otro" #. type: Plain text #: en/git-gui.txt:114 @@ -23703,8 +23915,9 @@ msgstr "git-hash-object(1)" #. type: Plain text #: en/git-hash-object.txt:7 +#, fuzzy msgid "git-hash-object - Compute object ID and optionally creates a blob from a file" -msgstr "" +msgstr "Computa ID de objeto y, opcionalmente, crea un blob de un archivo" #. type: Plain text #: en/git-hash-object.txt:14 @@ -23732,8 +23945,9 @@ msgstr "" #. type: Plain text #: en/git-hash-object.txt:33 +#, fuzzy msgid "Actually write the object into the object database." -msgstr "" +msgstr "escribir el objeto en la base de datos de objetos" #. type: Plain text #: en/git-hash-object.txt:36 @@ -23786,8 +24000,9 @@ msgstr "git-help(1)" #. type: Plain text #: en/git-help.txt:7 +#, fuzzy msgid "git-help - Display help information about Git" -msgstr "" +msgstr "Mostrar informaci처n sobre Git" #. type: Plain text #: en/git-help.txt:13 @@ -24511,8 +24726,9 @@ msgstr "" #. type: Plain text #: en/git-http-fetch.txt:17 +#, fuzzy msgid "Downloads a remote Git repository via HTTP." -msgstr "" +msgstr "Descarga de un repositorio Git remoto v챠a HTTP" #. type: Plain text #: en/git-http-fetch.txt:21 @@ -24587,8 +24803,9 @@ msgstr "git-http-push(1)" #. type: Plain text #: en/git-http-push.txt:7 +#, fuzzy msgid "git-http-push - Push objects over HTTP/DAV to another repository" -msgstr "" +msgstr "Empuja objetos por HTTP/DAV a otro repositorio" #. type: Plain text #: en/git-http-push.txt:13 @@ -24720,8 +24937,9 @@ msgstr "git-imap-send(1)" #. type: Plain text #: en/git-imap-send.txt:7 +#, fuzzy msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder" -msgstr "" +msgstr "Enviar una colecci처n de parches de stdin a una carpeta IMAP" #. type: Plain text #: en/git-imap-send.txt:13 @@ -24746,8 +24964,9 @@ msgstr "" #. type: Plain text #: en/git-imap-send.txt:39 +#, fuzzy msgid "Be quiet." -msgstr "" +msgstr "ser silencioso" #. type: Labeled list #: en/git-imap-send.txt:40 @@ -24895,8 +25114,9 @@ msgstr "git-index-pack(1)" #. type: Plain text #: en/git-index-pack.txt:7 +#, fuzzy msgid "git-index-pack - Build pack index file for an existing packed archive" -msgstr "" +msgstr "Constuye un archivo de 챠ndice para un archivo empaquetado existente" #. type: Plain text #: en/git-index-pack.txt:15 @@ -25060,8 +25280,9 @@ msgstr "git-init(1)" #. type: Plain text #: en/git-init.txt:7 +#, fuzzy msgid "git-init - Create an empty Git repository or reinitialize an existing one" -msgstr "" +msgstr "Crea un repositorio de Git vac챠o o reinicia el que ya existe" #. type: Plain text #: en/git-init.txt:15 @@ -25277,8 +25498,9 @@ msgstr "git-instaweb(1)" #. type: Plain text #: en/git-instaweb.txt:7 +#, fuzzy msgid "git-instaweb - Instantly browse your working repository in gitweb" -msgstr "" +msgstr "Buscar instant찼neamente tu repositorio de trabajo en gitweb" #. type: Plain text #: en/git-instaweb.txt:14 @@ -25379,9 +25601,9 @@ msgstr "" #. type: Labeled list #: en/git-instaweb.txt:64 -#, no-wrap +#, fuzzy, no-wrap msgid "restart" -msgstr "" +msgstr "--restart" #. type: Labeled list #: en/git-instaweb.txt:65 @@ -25499,8 +25721,9 @@ msgstr "--in-place" #. type: Plain text #: en/git-interpret-trailers.txt:76 +#, fuzzy msgid "Edit the files in place." -msgstr "" +msgstr "editar archivos en el lugar" #. type: Labeled list #: en/git-interpret-trailers.txt:77 @@ -25854,9 +26077,9 @@ msgstr "" #. type: delimited block - #: en/git-interpret-trailers.txt:271 en/git-interpret-trailers.txt:283 en/git-interpret-trailers.txt:290 en/git-interpret-trailers.txt:354 -#, no-wrap +#, fuzzy, no-wrap msgid "message\n" -msgstr "" +msgstr "mensaje" #. type: delimited block - #: en/git-interpret-trailers.txt:274 @@ -26041,9 +26264,9 @@ msgstr "" #. type: Plain text #: en/git-log.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git log' [<options>] [<revision range>] [[--] <path>...]\n" -msgstr "" +msgstr "git log [<opciones>] [<rango-de-revisi처n>] [[--] <ruta>...]" #. type: Plain text #: en/git-log.txt:17 @@ -26393,8 +26616,9 @@ msgstr "" #. type: Plain text #: en/git-log.txt:218 +#, fuzzy msgid "See linkgit:git-shortlog[1]." -msgstr "" +msgstr "linkgit:git-shortlog[1]" #. type: Labeled list #: en/git-log.txt:219 en/git-notes.txt:333 @@ -26425,8 +26649,9 @@ msgstr "git-ls-files(1)" #. type: Plain text #: en/git-ls-files.txt:7 +#, fuzzy msgid "git-ls-files - Show information about files in the index and the working tree" -msgstr "" +msgstr "Muestra informaci처n sobre archivos in el 챠ndice y el 찼rbol de trabajo" #. type: Plain text #: en/git-ls-files.txt:23 @@ -26457,8 +26682,9 @@ msgstr "" #. type: Plain text #: en/git-ls-files.txt:38 +#, fuzzy msgid "Show cached files in the output (default)" -msgstr "" +msgstr "mostrar archivos en cach챕 en la salida (default)" #. type: Labeled list #: en/git-ls-files.txt:40 @@ -26468,8 +26694,9 @@ msgstr "--deleted" #. type: Plain text #: en/git-ls-files.txt:42 +#, fuzzy msgid "Show deleted files in the output" -msgstr "" +msgstr "mostrar archivos borrados en la salida" #. type: Labeled list #: en/git-ls-files.txt:44 @@ -26479,8 +26706,9 @@ msgstr "--modified" #. type: Plain text #: en/git-ls-files.txt:46 +#, fuzzy msgid "Show modified files in the output" -msgstr "" +msgstr "mostrar archivos modificados en la salida" #. type: Labeled list #: en/git-ls-files.txt:48 @@ -26648,8 +26876,9 @@ msgstr "" #. type: Plain text #: en/git-ls-files.txt:125 +#, fuzzy msgid "cached" -msgstr "" +msgstr "--cached" #. type: Labeled list #: en/git-ls-files.txt:125 @@ -26670,8 +26899,9 @@ msgstr "" #. type: Plain text #: en/git-ls-files.txt:127 +#, fuzzy msgid "unmerged" -msgstr "" +msgstr "--unmerged" #. type: Labeled list #: en/git-ls-files.txt:127 @@ -26714,9 +26944,9 @@ msgstr "" #. type: Title ~ #: en/git-ls-files.txt:131 en/git.txt:513 -#, no-wrap +#, fuzzy, no-wrap msgid "other" -msgstr "" +msgstr "Otro" #. type: Plain text #: en/git-ls-files.txt:136 @@ -26773,7 +27003,7 @@ msgstr "" #: en/git-ls-files.txt:183 en/git.txt:331 en/git-update-index.txt:224 #, no-wrap msgid "<file>" -msgstr "" +msgstr "<archivo>" #. type: Plain text #: en/git-ls-files.txt:186 @@ -26864,12 +27094,15 @@ msgstr "" #. type: Plain text #: en/git-ls-remote.txt:15 -#, no-wrap +#, fuzzy, no-wrap msgid "" "'git ls-remote' [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" "\t [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" "\t [--symref] [<repository> [<refs>...]]\n" msgstr "" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<repositorio> [<refs>...]]" #. type: Plain text #: en/git-ls-remote.txt:20 @@ -26979,8 +27212,9 @@ msgstr "" #. type: Plain text #: en/git-ls-remote.txt:114 +#, fuzzy msgid "linkgit:git-check-ref-format[1]." -msgstr "" +msgstr "linkgit:git-check-ref-format[1]" #. type: Title = #: en/git-ls-tree.txt:2 @@ -27029,8 +27263,9 @@ msgstr "" #. type: Plain text #: en/git-ls-tree.txt:46 +#, fuzzy msgid "Recurse into sub-trees." -msgstr "" +msgstr "recurrir en sub찼rboles" #. type: Plain text #: en/git-ls-tree.txt:50 @@ -27114,8 +27349,9 @@ msgstr "git-mailinfo(1)" #. type: Plain text #: en/git-mailinfo.txt:7 +#, fuzzy msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message" -msgstr "" +msgstr "Extraer parche y autor챠a de un 첬nico mensaje de e-mail" #. type: Plain text #: en/git-mailinfo.txt:13 @@ -27288,9 +27524,9 @@ msgstr "" #. type: Labeled list #: en/git-mailsplit.txt:32 -#, no-wrap +#, fuzzy, no-wrap msgid "-o<directory>" -msgstr "" +msgstr "--directory" #. type: Plain text #: en/git-mailsplit.txt:34 @@ -27354,8 +27590,9 @@ msgstr "git-merge-base(1)" #. type: Plain text #: en/git-merge-base.txt:7 +#, fuzzy msgid "git-merge-base - Find as good common ancestors as possible for a merge" -msgstr "" +msgstr "Encuentra un ancestro com첬n bueno para una posible fusi처n" #. type: Plain text #: en/git-merge-base.txt:17 @@ -27741,8 +27978,9 @@ msgstr "" #. type: Plain text #: en/git-merge-file.txt:69 +#, fuzzy msgid "Quiet; do not warn about conflicts." -msgstr "" +msgstr "no advertir sobre conflictos" #. type: Labeled list #: en/git-merge-file.txt:70 @@ -27891,9 +28129,9 @@ msgstr "" #. type: Plain text #: en/git-merge-one-file.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git merge-one-file'\n" -msgstr "" +msgstr "git-merge-one-file(1)" #. type: Plain text #: en/git-merge-one-file.txt:18 @@ -27990,8 +28228,9 @@ msgstr "git-mergetool(1)" #. type: Plain text #: en/git-mergetool.txt:7 +#, fuzzy msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts" -msgstr "" +msgstr "Ejecuta las herramientas de fusi처n de resoluci처n de conflictos para resolver conflictos de fusi처n" #. type: Plain text #: en/git-mergetool.txt:12 @@ -28041,8 +28280,9 @@ msgstr "" #. type: Plain text #: en/git-mergetool.txt:69 +#, fuzzy msgid "Print a list of merge tools that may be used with `--tool`." -msgstr "" +msgstr "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`" #. type: Plain text #: en/git-mergetool.txt:77 @@ -28132,8 +28372,9 @@ msgstr "git-merge(1)" #. type: Plain text #: en/git-merge.txt:7 +#, fuzzy msgid "git-merge - Join two or more development histories together" -msgstr "" +msgstr "Junta dos o mas historiales de desarrollo juntos" #. type: Plain text #: en/git-merge.txt:18 @@ -28618,14 +28859,15 @@ msgstr "git-mktree(1)" #. type: Plain text #: en/git-mktree.txt:7 +#, fuzzy msgid "git-mktree - Build a tree-object from ls-tree formatted text" -msgstr "" +msgstr "Construir un objeto 찼rbol de un texto en formato ls-tree" #. type: Plain text #: en/git-mktree.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git mktree' [-z] [--missing] [--batch]\n" -msgstr "" +msgstr "git mktree [-z] [--missing] [--batch]" #. type: Plain text #: en/git-mktree.txt:20 @@ -28661,8 +28903,9 @@ msgstr "git-mv(1)" #. type: Plain text #: en/git-mv.txt:7 +#, fuzzy msgid "git-mv - Move or rename a file, a directory, or a symlink" -msgstr "" +msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simb처licos" #. type: Plain text #: en/git-mv.txt:13 @@ -28672,8 +28915,9 @@ msgstr "" #. type: Plain text #: en/git-mv.txt:17 +#, fuzzy msgid "Move or rename a file, directory or symlink." -msgstr "" +msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simb처licos" #. type: Plain text #: en/git-mv.txt:20 @@ -28770,8 +29014,9 @@ msgstr "" #. type: Plain text #: en/git-name-rev.txt:44 +#, fuzzy msgid "List all commits reachable from all refs" -msgstr "" +msgstr "listar todos los commits alcanzables desde todas las referencias" #. type: Plain text #: en/git-name-rev.txt:50 @@ -28944,9 +29189,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:87 -#, no-wrap +#, fuzzy, no-wrap msgid "append" -msgstr "" +msgstr "--append" #. type: Plain text #: en/git-notes.txt:90 @@ -28977,9 +29222,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:97 en/git-submodule.txt:150 -#, no-wrap +#, fuzzy, no-wrap msgid "merge" -msgstr "" +msgstr "emerge" #. type: Plain text #: en/git-notes.txt:102 @@ -28993,9 +29238,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:112 en/git-worktree.txt:105 -#, no-wrap +#, fuzzy, no-wrap msgid "remove" -msgstr "" +msgstr "--remove" #. type: Plain text #: en/git-notes.txt:117 @@ -29392,8 +29637,9 @@ msgstr "git-p4(1)" #. type: Plain text #: en/git-p4.txt:7 +#, fuzzy msgid "git-p4 - Import from and submit to Perforce repositories" -msgstr "" +msgstr "Importar desde y enviar a repositorios Perforce" #. type: Plain text #: en/git-p4.txt:16 @@ -29632,9 +29878,9 @@ msgstr "" #. type: Title ~ #: en/git-p4.txt:175 -#, no-wrap +#, fuzzy, no-wrap msgid "Unshelve" -msgstr "" +msgstr "--shelve" #. type: Plain text #: en/git-p4.txt:178 @@ -29672,7 +29918,7 @@ msgstr "" #: en/git-p4.txt:202 #, no-wrap msgid "General options" -msgstr "" +msgstr "Opciones generales" #. type: Plain text #: en/git-p4.txt:204 @@ -30761,9 +31007,9 @@ msgstr "" #. type: Labeled list #: en/git-pack-objects.txt:51 -#, no-wrap +#, fuzzy, no-wrap msgid "base-name" -msgstr "" +msgstr "nombre base" #. type: Plain text #: en/git-pack-objects.txt:58 @@ -31267,8 +31513,9 @@ msgstr "git-pack-refs(1)" #. type: Plain text #: en/git-pack-refs.txt:7 +#, fuzzy msgid "git-pack-refs - Pack heads and tags for efficient repository access" -msgstr "" +msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio" #. type: Plain text #: en/git-pack-refs.txt:12 @@ -31319,8 +31566,9 @@ msgstr "git-parse-remote(1)" #. type: Plain text #: en/git-parse-remote.txt:7 +#, fuzzy msgid "git-parse-remote - Routines to help parsing remote repository access parameters" -msgstr "" +msgstr "Rutinas para ayudar a analizar los par찼metros de acceso del repositorio remoto" #. type: Plain text #: en/git-parse-remote.txt:13 @@ -31426,9 +31674,9 @@ msgstr "" #. type: Plain text #: en/git-prune-packed.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git prune-packed' [-n|--dry-run] [-q|--quiet]\n" -msgstr "" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #. type: Plain text #: en/git-prune-packed.txt:19 @@ -31474,14 +31722,15 @@ msgstr "git-prune(1)" #. type: Plain text #: en/git-prune.txt:7 +#, fuzzy msgid "git-prune - Prune all unreachable objects from the object database" -msgstr "" +msgstr "Limpia todos los objetos no alcanzables de la base de datos de objetos" #. type: Plain text #: en/git-prune.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n" -msgstr "" +msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]" #. type: Plain text #: en/git-prune.txt:19 @@ -31510,8 +31759,9 @@ msgstr "" #. type: Plain text #: en/git-prune.txt:47 +#, fuzzy msgid "Show progress." -msgstr "" +msgstr "mostrar progreso" #. type: Labeled list #: en/git-prune.txt:48 en/git-worktree.txt:192 @@ -31570,14 +31820,15 @@ msgstr "git-pull(1)" #. type: Plain text #: en/git-pull.txt:7 +#, fuzzy msgid "git-pull - Fetch from and integrate with another repository or a local branch" -msgstr "" +msgstr "Realiza un fetch e integra con otro repositorio o rama local" #. type: Plain text #: en/git-pull.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n" -msgstr "" +msgstr "git pull [<opciones>] [<repositorio> [<especificaci처n-de-referencia>...]]" #. type: Plain text #: en/git-pull.txt:21 @@ -31674,7 +31925,7 @@ msgstr "" #: en/git-pull.txt:97 #, no-wrap msgid "Options related to merging" -msgstr "" +msgstr "Opciones relacionadas a fusi처n" #. type: Labeled list #: en/git-pull.txt:104 @@ -31754,7 +32005,7 @@ msgstr "" #: en/git-pull.txt:145 #, no-wrap msgid "Options related to fetching" -msgstr "" +msgstr "Opciones relacionadas a fetch" #. type: Title - #: en/git-pull.txt:156 @@ -31879,8 +32130,9 @@ msgstr "git-push(1)" #. type: Plain text #: en/git-push.txt:7 +#, fuzzy msgid "git-push - Update remote refs along with associated objects" -msgstr "" +msgstr "Actualiza referencias remotas junto con sus objetos asociados" #. type: Plain text #: en/git-push.txt:18 @@ -32373,9 +32625,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:449 -#, no-wrap +#, fuzzy, no-wrap msgid "rejected" -msgstr "" +msgstr "[rechazado]" #. type: Plain text #: en/git-push.txt:452 @@ -32775,13 +33027,13 @@ msgstr "" #. type: Plain text #: en/git-read-tree.txt:16 -#, no-wrap +#, fuzzy, no-wrap msgid "" "'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>]\n" "\t\t[-u [--exclude-per-directory=<gitignore>] | -i]]\n" "\t\t[--index-output=<file>] [--no-sparse-checkout]\n" "\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n" -msgstr "" +msgstr "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefijo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<archivo>] (--empty | <찼rbol-ismo1> [<찼rbol-ismo2> [<찼rbol-ismo3>]])" #. type: Plain text #: en/git-read-tree.txt:23 @@ -33315,8 +33567,9 @@ msgstr "git-rebase(1)" #. type: Plain text #: en/git-rebase.txt:7 +#, fuzzy msgid "git-rebase - Reapply commits on top of another base tip" -msgstr "" +msgstr "Vuelve a aplicar commits en la punta de otra rama" #. type: Plain text #: en/git-rebase.txt:16 @@ -33669,8 +33922,9 @@ msgstr "--edit-todo" #. type: Plain text #: en/git-rebase.txt:261 +#, fuzzy msgid "Edit the todo list during an interactive rebase." -msgstr "" +msgstr "editar la lista de pendientes durante el rebase interactivo" #. type: Plain text #: en/git-rebase.txt:266 @@ -33699,9 +33953,9 @@ msgstr "" #. type: Labeled list #: en/git-rebase.txt:294 -#, no-wrap +#, fuzzy, no-wrap msgid "-X <strategy-option>" -msgstr "" +msgstr "--strategy-option" #. type: Labeled list #: en/git-rebase.txt:295 @@ -33716,8 +33970,9 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:312 +#, fuzzy msgid "Be quiet. Implies --no-stat." -msgstr "" +msgstr "ser silencioso implica --no-stat" #. type: Plain text #: en/git-rebase.txt:316 @@ -34186,8 +34441,9 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:607 +#, fuzzy msgid "commit" -msgstr "" +msgstr "`commit`" #. type: Plain text #: en/git-rebase.txt:609 @@ -35776,9 +36032,9 @@ msgstr "" #. type: Labeled list #: en/git-remote.txt:83 -#, no-wrap +#, fuzzy, no-wrap msgid "'rename'" -msgstr "" +msgstr "renombrar" #. type: Plain text #: en/git-remote.txt:87 @@ -36185,8 +36441,9 @@ msgstr "git-replace(1)" #. type: Plain text #: en/git-replace.txt:7 +#, fuzzy msgid "git-replace - Create, list, delete refs to replace objects" -msgstr "" +msgstr "Crea, lista, borra referencias para reemplazar objetos" #. type: Plain text #: en/git-replace.txt:17 @@ -36536,8 +36793,9 @@ msgstr "git-rerere(1)" #. type: Plain text #: en/git-rerere.txt:7 +#, fuzzy msgid "git-rerere - Reuse recorded resolution of conflicted merges" -msgstr "" +msgstr "Reutilizar la resoluci처n registrada de fusiones conflictivas" #. type: Plain text #: en/git-rerere.txt:12 @@ -36800,8 +37058,9 @@ msgstr "git-reset(1)" #. type: Plain text #: en/git-reset.txt:7 +#, fuzzy msgid "git-reset - Reset current HEAD to the specified state" -msgstr "" +msgstr "Reinicia el HEAD actual a un estado especifico" #. type: Plain text #: en/git-reset.txt:14 @@ -36819,9 +37078,9 @@ msgstr "" #. type: Labeled list #: en/git-reset.txt:22 -#, no-wrap +#, fuzzy, no-wrap msgid "'git reset' [-q] [<tree-ish>] [--] <paths>..." -msgstr "" +msgstr "git reset [-q] [<찼rbol-ismo>] [--] <rutas>..." #. type: Plain text #: en/git-reset.txt:26 @@ -36840,9 +37099,9 @@ msgstr "" #. type: Labeled list #: en/git-reset.txt:37 -#, no-wrap +#, fuzzy, no-wrap msgid "'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]" -msgstr "" +msgstr "git reset --patch [<찼rbol-ismo>] [--] [<rutas>...]" #. type: Plain text #: en/git-reset.txt:41 @@ -37556,8 +37815,9 @@ msgstr "git-rev-list(1)" #. type: Plain text #: en/git-rev-list.txt:7 +#, fuzzy msgid "git-rev-list - Lists commit objects in reverse chronological order" -msgstr "" +msgstr "Lista objetos commit en orden cronol처gico inverso" #. type: Plain text #: en/git-rev-list.txt:64 @@ -38520,8 +38780,9 @@ msgstr "git-rm(1)" #. type: Plain text #: en/git-rm.txt:7 +#, fuzzy msgid "git-rm - Remove files from the working tree and from the index" -msgstr "" +msgstr "Borra archivos del 찼rbol de trabajo y del 챠ndice" #. type: Plain text #: en/git-rm.txt:12 @@ -38541,8 +38802,9 @@ msgstr "" #. type: Plain text #: en/git-rm.txt:42 +#, fuzzy msgid "Override the up-to-date check." -msgstr "" +msgstr "sobrescribir el check de actualizado" #. type: Plain text #: en/git-rm.txt:48 @@ -38567,8 +38829,9 @@ msgstr "--ignore-unmatch" #. type: Plain text #: en/git-rm.txt:65 +#, fuzzy msgid "Exit with a zero status even if no files matched." -msgstr "" +msgstr "salir con estado cero incluso si nada coincide" #. type: Plain text #: en/git-rm.txt:70 @@ -38647,8 +38910,9 @@ msgstr "" #. type: Plain text #: en/git-rm.txt:125 +#, fuzzy msgid "See linkgit:git-add[1]." -msgstr "" +msgstr "linkgit:git-add[1]" #. type: Title ~ #: en/git-rm.txt:127 @@ -39627,8 +39891,9 @@ msgstr "git-send-pack(1)" #. type: Plain text #: en/git-send-pack.txt:7 +#, fuzzy msgid "git-send-pack - Push objects over Git protocol to another repository" -msgstr "" +msgstr "Empujar objetos por protocolo Git a otro repositorio" #. type: Plain text #: en/git-send-pack.txt:16 @@ -39741,8 +40006,9 @@ msgstr "git-shell(1)" #. type: Plain text #: en/git-shell.txt:7 +#, fuzzy msgid "git-shell - Restricted login shell for Git-only SSH access" -msgstr "" +msgstr "Shell de inicio de sesi처n restringido para acceso SSH exclusivo de Git" #. type: Plain text #: en/git-shell.txt:15 @@ -40007,8 +40273,9 @@ msgstr "--email" #. type: Plain text #: en/git-shortlog.txt:41 +#, fuzzy msgid "Show the email address of each author." -msgstr "" +msgstr "Mostrar la direcci처n de correo de cada autor" #. type: Labeled list #: en/git-shortlog.txt:42 @@ -40081,7 +40348,7 @@ msgstr "" #. type: Plain text #: en/git-show-branch.txt:17 -#, no-wrap +#, fuzzy, no-wrap msgid "" "'git show-branch' [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -40090,6 +40357,10 @@ msgid "" "\t\t[(<rev> | <glob>)...]\n" "'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\n" msgstr "" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" +"\t\t[--more=<n> | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]" #. type: Plain text #: en/git-show-branch.txt:24 @@ -40130,8 +40401,9 @@ msgstr "" #. type: Plain text #: en/git-show-branch.txt:46 +#, fuzzy msgid "Show the remote-tracking branches." -msgstr "" +msgstr "mostrar ramas de rastreo remoto" #. type: Plain text #: en/git-show-branch.txt:50 @@ -40189,8 +40461,9 @@ msgstr "" #. type: Plain text #: en/git-show-branch.txt:82 +#, fuzzy msgid "Synonym to `--more=-1`" -msgstr "" +msgstr "sin처nimo de m찼s=-1" #. type: Labeled list #: en/git-show-branch.txt:83 @@ -40441,8 +40714,9 @@ msgstr "--head" #. type: Plain text #: en/git-show-ref.txt:39 +#, fuzzy msgid "Show the HEAD reference, even if it would normally be filtered out." -msgstr "" +msgstr "mostrar la referencia de HEAD, incluso si se filtrara" #. type: Plain text #: en/git-show-ref.txt:46 @@ -40663,9 +40937,9 @@ msgstr "" #. type: Plain text #: en/git-show.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git show' [<options>] [<object>...]\n" -msgstr "" +msgstr "git show [<opciones>] <objeto>..." #. type: Plain text #: en/git-show.txt:17 @@ -40846,9 +41120,9 @@ msgstr "" #. type: Labeled list #: en/git-sh-setup.txt:55 -#, no-wrap +#, fuzzy, no-wrap msgid "is_bare_repository" -msgstr "" +msgstr "--is-bare-repository" #. type: Plain text #: en/git-sh-setup.txt:59 @@ -40863,8 +41137,9 @@ msgstr "" #. type: Plain text #: en/git-sh-setup.txt:62 +#, fuzzy msgid "runs chdir to the toplevel of the working tree." -msgstr "" +msgstr "No se puede aplicar chdir a $cdup, el nivel m찼ximo del 찼rbol de trabajo" #. type: Labeled list #: en/git-sh-setup.txt:63 @@ -40935,8 +41210,9 @@ msgstr "git-stage(1)" #. type: Plain text #: en/git-stage.txt:7 +#, fuzzy msgid "git-stage - Add file contents to the staging area" -msgstr "" +msgstr "Agrega contenidos de un archivo al 찼rea de staging" #. type: Plain text #: en/git-stage.txt:13 @@ -40957,8 +41233,9 @@ msgstr "git-stash(1)" #. type: Plain text #: en/git-stash.txt:7 +#, fuzzy msgid "git-stash - Stash the changes in a dirty working directory away" -msgstr "" +msgstr "Poner en un stash los cambios en un directorio de trabajo sucio de todas maneras" #. type: Plain text #: en/git-stash.txt:22 @@ -41081,9 +41358,9 @@ msgstr "" #. type: Labeled list #: en/git-stash.txt:120 -#, no-wrap +#, fuzzy, no-wrap msgid "pop [--index] [-q|--quiet] [<stash>]" -msgstr "" +msgstr "git stash pop [--index] [-q|--quiet] [<stash>]" #. type: Plain text #: en/git-stash.txt:126 @@ -41107,9 +41384,9 @@ msgstr "" #. type: Labeled list #: en/git-stash.txt:139 -#, no-wrap +#, fuzzy, no-wrap msgid "apply [--index] [-q|--quiet] [<stash>]" -msgstr "" +msgstr "git stash apply [--index] [-q|--quiet] [<stash>]" #. type: Plain text #: en/git-stash.txt:144 @@ -41158,7 +41435,7 @@ msgstr "" #: en/git-stash.txt:172 en/git-update-ref.txt:100 #, no-wrap msgid "create" -msgstr "" +msgstr "crear" #. type: Plain text #: en/git-stash.txt:179 @@ -41167,9 +41444,9 @@ msgstr "" #. type: Labeled list #: en/git-stash.txt:180 -#, no-wrap +#, fuzzy, no-wrap msgid "store" -msgstr "" +msgstr "puntaje" #. type: Plain text #: en/git-stash.txt:186 @@ -41325,9 +41602,9 @@ msgstr "" #. type: Plain text #: en/git-status.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git status' [<options>...] [--] [<pathspec>...]\n" -msgstr "" +msgstr "git status [<opciones>] [--] <especificaci처n-de-ruta>..." #. type: Plain text #: en/git-status.txt:23 @@ -41962,8 +42239,9 @@ msgstr "--strip-comments" #. type: Plain text #: en/git-stripspace.txt:41 +#, fuzzy msgid "Skip and remove all lines starting with comment character (default '#')." -msgstr "" +msgstr "saltar y borrar todas las l챠neas que comienzan con un car찼cter de comentario" #. type: Labeled list #: en/git-stripspace.txt:43 @@ -42188,9 +42466,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:139 -#, no-wrap +#, fuzzy, no-wrap msgid "checkout" -msgstr "" +msgstr "--checkout" #. type: Plain text #: en/git-submodule.txt:140 @@ -42210,9 +42488,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:147 -#, no-wrap +#, fuzzy, no-wrap msgid "rebase" -msgstr "" +msgstr "--rebase" #. type: Plain text #: en/git-submodule.txt:148 @@ -42497,9 +42775,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:371 -#, no-wrap +#, fuzzy, no-wrap msgid "--reference <repository>" -msgstr "" +msgstr "repositorio de referencia" #. type: Plain text #: en/git-submodule.txt:375 en/git-submodule.txt:384 @@ -42576,8 +42854,9 @@ msgstr "git-svn(1)" #. type: Plain text #: en/git-svn.txt:7 +#, fuzzy msgid "git-svn - Bidirectional operation between a Subversion repository and Git" -msgstr "" +msgstr "Operaci처n bidireccional entre un repositorio Subversion y Git" #. type: Plain text #: en/git-svn.txt:12 @@ -43052,9 +43331,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:305 -#, no-wrap +#, fuzzy, no-wrap msgid "'branch'" -msgstr "" +msgstr "rama" #. type: Plain text #: en/git-svn.txt:307 @@ -43721,9 +44000,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:677 -#, no-wrap +#, fuzzy, no-wrap msgid "-s<strategy>" -msgstr "" +msgstr "--strategy" #. type: Plain text #: en/git-svn.txt:682 @@ -44419,8 +44698,9 @@ msgstr "git-tag(1)" #. type: Plain text #: en/git-tag.txt:7 +#, fuzzy msgid "git-tag - Create, list, delete or verify a tag object signed with GPG" -msgstr "" +msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG" #. type: Plain text #: en/git-tag.txt:20 @@ -44562,8 +44842,9 @@ msgstr "" #. type: Plain text #: en/git-tag.txt:126 +#, fuzzy msgid "Sorting and filtering tags are case insensitive." -msgstr "" +msgstr "ordenamiento y filtrado son case-insensitive" #. type: Plain text #: en/git-tag.txt:132 @@ -44643,9 +44924,9 @@ msgstr "" #. type: Labeled list #: en/git-tag.txt:202 en/git.txt:312 -#, no-wrap +#, fuzzy, no-wrap msgid "<commit>" -msgstr "" +msgstr "`commit`" #. type: Plain text #: en/git-tag.txt:206 @@ -44880,7 +45161,7 @@ msgstr "" #. type: Plain text #: en/git.txt:18 -#, no-wrap +#, fuzzy, no-wrap msgid "" "'git' [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -44889,6 +45170,11 @@ msgid "" " [--super-prefix=<path>]\n" " <command> [<args>]\n" msgstr "" +"git [--version] [--help] [-C <ruta>] [-c <nombre>=<valor>]\n" +" [--exec-path[=<ruta>]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n" +" [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n" +" <comando> [<args>]" #. type: Plain text #: en/git.txt:24 @@ -45181,9 +45467,9 @@ msgstr "" #. type: Title ~ #: en/git.txt:190 -#, no-wrap +#, fuzzy, no-wrap msgid "Main porcelain commands" -msgstr "" +msgstr "Comandos de Porcelana principales" #. type: Title ~ #: en/git.txt:195 @@ -45205,7 +45491,7 @@ msgstr "" #: en/git.txt:206 #, no-wrap msgid "Interacting with Others" -msgstr "" +msgstr "Interactuando con Otros" #. type: Plain text #: en/git.txt:210 @@ -45625,8 +45911,9 @@ msgstr "" #. type: Plain text #: en/git.txt:470 +#, fuzzy msgid "see linkgit:git-commit-tree[1]" -msgstr "" +msgstr "linkgit:git-commit-tree[1]" #. type: Title ~ #: en/git.txt:472 @@ -47289,9 +47576,9 @@ msgstr "" #. type: Labeled list #: en/git-update-ref.txt:104 -#, no-wrap +#, fuzzy, no-wrap msgid "delete" -msgstr "" +msgstr "--delete" #. type: Plain text #: en/git-update-ref.txt:107 @@ -47300,9 +47587,9 @@ msgstr "" #. type: Labeled list #: en/git-update-ref.txt:108 -#, no-wrap +#, fuzzy, no-wrap msgid "verify" -msgstr "" +msgstr "--verify" #. type: Plain text #: en/git-update-ref.txt:111 @@ -47311,9 +47598,9 @@ msgstr "" #. type: Labeled list #: en/git-update-ref.txt:112 -#, no-wrap +#, fuzzy, no-wrap msgid "option" -msgstr "" +msgstr "`option`" #. type: Plain text #: en/git-update-ref.txt:116 @@ -47381,9 +47668,9 @@ msgstr "" #. type: Plain text #: en/git-update-server-info.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git update-server-info' [--force]\n" -msgstr "" +msgstr "git update-server-info [--force]" #. type: Plain text #: en/git-update-server-info.txt:21 @@ -47392,8 +47679,9 @@ msgstr "" #. type: Plain text #: en/git-update-server-info.txt:29 +#, fuzzy msgid "Update the info files from scratch." -msgstr "" +msgstr "actualiza los archivos info desde cero" #. type: Plain text #: en/git-update-server-info.txt:37 @@ -47515,13 +47803,15 @@ msgstr "--[no-]strict" #. type: Plain text #: en/git-upload-pack.txt:30 +#, fuzzy msgid "Do not try <directory>/.git/ if <directory> is no Git directory." -msgstr "" +msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git" #. type: Plain text #: en/git-upload-pack.txt:33 +#, fuzzy msgid "Interrupt transfer after <n> seconds of inactivity." -msgstr "" +msgstr "interrumpir transferencia tras <n> segundos de inactividad" #. type: Labeled list #: en/git-upload-pack.txt:34 @@ -47575,8 +47865,9 @@ msgstr "" #. type: Plain text #: en/git-var.txt:17 +#, fuzzy msgid "Prints a Git logical variable." -msgstr "" +msgstr "Mostrar una variable l처gica de Git" #. type: Plain text #: en/git-var.txt:25 @@ -47709,9 +48000,9 @@ msgstr "" #. type: Plain text #: en/git-verify-pack.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git verify-pack' [-v|--verbose] [-s|--stat-only] [--] <pack>.idx ...\n" -msgstr "" +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquete>..." #. type: Plain text #: en/git-verify-pack.txt:20 @@ -48204,9 +48495,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:96 -#, no-wrap +#, fuzzy, no-wrap msgid "move" -msgstr "" +msgstr "modo" #. type: Plain text #: en/git-worktree.txt:100 @@ -48574,9 +48865,9 @@ msgstr "" #. type: Plain text #: en/git-write-tree.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n" -msgstr "" +msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]" #. type: Plain text #: en/git-write-tree.txt:18 @@ -49039,9 +49330,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:16 -#, no-wrap +#, fuzzy, no-wrap msgid "recursive" -msgstr "" +msgstr "--recursive" #. type: Plain text #: en/merge-strategies.txt:29 @@ -49071,9 +49362,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:42 -#, no-wrap +#, fuzzy, no-wrap msgid "theirs" -msgstr "" +msgstr "--theirs" #. type: Plain text #: en/merge-strategies.txt:45 @@ -49082,9 +49373,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:46 -#, no-wrap +#, fuzzy, no-wrap msgid "patience" -msgstr "" +msgstr "--patience" #. type: Plain text #: en/merge-strategies.txt:52 @@ -49104,9 +49395,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:62 -#, no-wrap +#, fuzzy, no-wrap msgid "ignore-cr-at-eol" -msgstr "" +msgstr "--ignore-cr-at-eol" #. type: Plain text #: en/merge-strategies.txt:68 @@ -49130,9 +49421,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:75 -#, no-wrap +#, fuzzy, no-wrap msgid "renormalize" -msgstr "" +msgstr "--renormalize" #. type: Plain text #: en/merge-strategies.txt:82 @@ -49141,9 +49432,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:83 -#, no-wrap +#, fuzzy, no-wrap msgid "no-renormalize" -msgstr "" +msgstr "--renormalize" #. type: Plain text #: en/merge-strategies.txt:86 @@ -49152,9 +49443,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:87 -#, no-wrap +#, fuzzy, no-wrap msgid "no-renames" -msgstr "" +msgstr "--no-renames" #. type: Plain text #: en/merge-strategies.txt:91 @@ -49196,9 +49487,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:108 -#, no-wrap +#, fuzzy, no-wrap msgid "octopus" -msgstr "" +msgstr "--octopus" #. type: Plain text #: en/merge-strategies.txt:114 @@ -49972,9 +50263,9 @@ msgstr "" #. type: Labeled list #: en/pretty-options.txt:45 -#, no-wrap +#, fuzzy, no-wrap msgid "--expand-tabs=<n>" -msgstr "" +msgstr "--expand-tabs" #. type: Labeled list #: en/pretty-options.txt:46 @@ -50081,9 +50372,9 @@ msgstr "" #. type: Labeled list #: en/pull-fetch-param.txt:14 -#, no-wrap +#, fuzzy, no-wrap msgid "<refspec>" -msgstr "" +msgstr "refspec" #. type: Plain text #: en/pull-fetch-param.txt:18 diff --git a/po/documentation.pot b/po/documentation.pot index 7d22645..eb3074f 100644 --- a/po/documentation.pot +++ b/po/documentation.pot @@ -1,19 +1,16 @@ -# SOME DESCRIPTIVE TITLE -# Copyright (C) YEAR Free Software Foundation, Inc. -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# -#, fuzzy +# Translations for Git Manual Pages. +# Copyright (C) 2019 +# This file is distributed under the same license as the Git package. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Git Documentation\n" "POT-Creation-Date: 2019-02-13 20:53+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2019-08-09 21:34+0200\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" #. type: Labeled list diff --git a/po/documentation.ru.po b/po/documentation.ru.po index 1428f40..93ff6f7 100644 --- a/po/documentation.ru.po +++ b/po/documentation.ru.po @@ -1,21 +1,17 @@ -# SOME DESCRIPTIVE TITLE -# Copyright (C) YEAR Free Software Foundation, Inc. -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. -# +# Translations for Git Manual Pages. +# Copyright (C) 2019 +# This file is distributed under the same license as the Git package. msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: Git Documentation\n" "POT-Creation-Date: 2019-02-13 20:53+0100\n" -"PO-Revision-Date: 2019-08-08 15:23+0000\n" -"Last-Translator: Dexter Morganov <dexter.morganov@gmail.com>\n" -"Language-Team: none\n" +"PO-Revision-Date: 2019-08-09 21:36+0200\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <LL@li.org>\n" +"Language: ru\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" +"Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ru\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 3.8-dev\n" #. type: Labeled list #: en/blame-options.txt:1 en/diff-options.txt:646 en/git-instaweb.txt:45 en/git-mailinfo.txt:47 en/git-mailsplit.txt:35 en/git-repack.txt:126 en/git-status.txt:31 en/git-submodule.txt:258 @@ -91,8 +87,9 @@ msgstr "-t" #. type: Plain text #: en/blame-options.txt:27 +#, fuzzy msgid "Show raw timestamp (Default: off)." -msgstr "" +msgstr "�棘克逵鈞逵�� 戟筠棘閨�逵閨棘�逵戟戟�筠 勻�筠劇筠戟戟�筠 劇筠�克龜 (�棘 �劇棘剋�逵戟龜�: 棘�克剋��筠戟棘)" #. type: Labeled list #: en/blame-options.txt:28 @@ -102,8 +99,9 @@ msgstr "" #. type: Plain text #: en/blame-options.txt:30 +#, fuzzy msgid "Use revisions from revs-file instead of calling linkgit:git-rev-list[1]." -msgstr "" +msgstr "��極棘剋�鈞棘勻逵�� �筠畇逵克�龜龜 龜鈞 <�逵橘剋逵> 勻劇筠��棘 勻�鈞棘勻逵 git-rev-list" #. type: Labeled list #: en/blame-options.txt:31 @@ -130,8 +128,9 @@ msgstr "--porcelain" #. type: Plain text #: en/blame-options.txt:42 +#, fuzzy msgid "Show in a format designed for machine consumption." -msgstr "" +msgstr "�棘克逵鈞逵�� 勻 �棘�劇逵�筠 畇剋� 極�棘均�逵劇劇戟棘均棘 �逵鈞閨棘�逵" #. type: Labeled list #: en/blame-options.txt:43 @@ -250,8 +249,9 @@ msgstr "linkgit:git-annotate[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:3 +#, fuzzy msgid "Annotate file lines with commit information." -msgstr "" +msgstr "�戟戟棘�龜�棘勻逵戟龜筠 ���棘克 �逵橘剋逵 龜戟�棘�劇逵�龜筠橘 棘 克棘劇劇龜�逵�" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:30 @@ -261,8 +261,9 @@ msgstr "linkgit:git-blame[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:6 +#, fuzzy msgid "Show what revision and author last modified each line of a file." -msgstr "" +msgstr "�棘克逵鈞 �筠畇逵克�龜龜 龜 逵勻�棘�逵 極棘�剋筠畇戟筠均棘 龜鈞劇筠戟龜勻�筠均棘 克逵菌畇�� ���棘克� �逵橘剋逵" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:7 @@ -272,8 +273,9 @@ msgstr "linkgit:git-count-objects[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:9 +#, fuzzy msgid "Count unpacked number of objects and their disk consumption." -msgstr "" +msgstr "�棘畇��筠� 克棘剋龜�筠��勻逵 戟筠�極逵克棘勻逵戟戟�� 棘閨�筠克�棘勻 龜 龜� 極棘��筠閨剋筠戟龜� 畇龜�克逵" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:10 @@ -283,8 +285,9 @@ msgstr "linkgit:git-difftool[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:12 +#, fuzzy msgid "Show changes using common diff tools." -msgstr "" +msgstr "�棘克逵鈞 龜鈞劇筠戟筠戟龜橘 � 極棘劇棘��� �逵�極�棘���逵戟筠戟戟�� ��龜剋龜� ��逵勻戟筠戟龜�" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:13 @@ -294,8 +297,9 @@ msgstr "linkgit:git-fsck[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:15 en/git-fsck.txt:20 +#, fuzzy msgid "Verifies the connectivity and validity of the objects in the database." -msgstr "" +msgstr "��棘勻筠�克逵 �勻�鈞戟棘��龜 龜 勻逵剋龜畇戟棘��龜 棘閨�筠克�棘勻 勻 閨逵鈞筠 畇逵戟戟��" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:16 @@ -305,8 +309,9 @@ msgstr "linkgit:git-help[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:18 +#, fuzzy msgid "Display help information about Git." -msgstr "" +msgstr "��棘閨�逵菌筠戟龜筠 �極�逵勻棘�戟棘橘 龜戟�棘�劇逵�龜龜 棘 Git" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:19 @@ -316,8 +321,9 @@ msgstr "linkgit:git-instaweb[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:21 +#, fuzzy msgid "Instantly browse your working repository in gitweb." -msgstr "" +msgstr "�均戟棘勻筠戟戟�橘 極�棘�劇棘�� 勻逵�筠均棘 �逵閨棘�筠均棘 �筠極棘鈞龜�棘�龜� 勻 gitweb" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:22 @@ -327,8 +333,9 @@ msgstr "linkgit:git-merge-tree[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:24 +#, fuzzy msgid "Show three-way merge without touching index." -msgstr "" +msgstr "��勻棘畇 �����棘畇棘勻棘均棘 �剋龜�戟龜筠 閨筠鈞 鈞逵��逵均龜勻逵戟龜� 龜戟畇筠克�逵" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:25 @@ -338,8 +345,9 @@ msgstr "linkgit:git-rerere[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:27 +#, fuzzy msgid "Reuse recorded resolution of conflicted merges." -msgstr "" +msgstr "�棘勻�棘�戟棘筠 龜�極棘剋�鈞棘勻逵戟龜筠 鈞逵極龜�逵戟戟�� �逵鈞�筠�筠戟龜橘 克棘戟�剋龜克�棘勻 極�龜 �剋龜�戟龜��" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:28 @@ -349,8 +357,9 @@ msgstr "linkgit:git-show-branch[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:30 +#, fuzzy msgid "Show branches and their commits." -msgstr "" +msgstr "��勻棘畇 勻筠�棘克 龜 龜� 克棘劇劇龜�棘勻" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:31 @@ -360,8 +369,9 @@ msgstr "linkgit:git-verify-commit[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:33 +#, fuzzy msgid "Check the GPG signature of commits." -msgstr "" +msgstr "��棘勻筠�克逵 極棘畇極龜�龜 GPG 克棘劇劇龜�棘勻" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:34 @@ -371,8 +381,9 @@ msgstr "linkgit:git-verify-tag[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:36 +#, fuzzy msgid "Check the GPG signature of tags." -msgstr "" +msgstr "��棘勻筠�克逵 極棘畇極龜�龜 GPG 劇筠�棘克" #. type: Labeled list #: en/cmds-ancillaryinterrogators.txt:37 @@ -382,8 +393,9 @@ msgstr "linkgit:git-whatchanged[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:39 +#, fuzzy msgid "Show logs with difference each commit introduces." -msgstr "" +msgstr "��勻棘畇 菌��戟逵剋逵 � 龜鈞劇筠戟筠戟龜�劇龜, 克棘�棘��筠 勻勻棘畇龜剋 克逵菌畇�橘 龜鈞 克棘劇劇龜�棘勻" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91 @@ -393,8 +405,9 @@ msgstr "linkgit:gitweb[1]" #. type: Plain text #: en/cmds-ancillaryinterrogators.txt:42 +#, fuzzy msgid "Git web interface (web frontend to Git repositories)." -msgstr "" +msgstr "�筠閨 龜戟�筠��筠橘� Git (勻筠閨-龜戟�筠��筠橘� 畇剋� Git �筠極棘鈞龜�棘�龜筠勻)" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:142 @@ -404,8 +417,9 @@ msgstr "linkgit:git-config[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:3 +#, fuzzy msgid "Get and set repository or global options." -msgstr "" +msgstr "�棘剋��筠戟龜筠 龜 ���逵戟棘勻克逵 均剋棘閨逵剋�戟�� 棘極�龜橘 龜剋龜 棘極�龜橘 �筠極棘鈞龜�棘�龜�" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1489 @@ -415,8 +429,9 @@ msgstr "linkgit:git-fast-export[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:6 +#, fuzzy msgid "Git data exporter." -msgstr "" +msgstr "葵克�極棘�� 畇逵戟戟�� Git" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:236 @@ -426,8 +441,9 @@ msgstr "linkgit:git-fast-import[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:9 +#, fuzzy msgid "Backend for fast Git data importers." -msgstr "" +msgstr "�戟���筠戟戟龜橘 龜戟�筠��筠橘� 畇剋� 閨����棘均棘 龜劇極棘��逵 畇逵戟戟�� Git" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:10 @@ -437,8 +453,9 @@ msgstr "linkgit:git-filter-branch[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:12 +#, fuzzy msgid "Rewrite branches." -msgstr "" +msgstr "�筠�筠鈞逵極龜�� 勻筠�棘克" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:139 @@ -448,8 +465,9 @@ msgstr "linkgit:git-mergetool[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:15 +#, fuzzy msgid "Run merge conflict resolution tools to resolve merge conflicts." -msgstr "" +msgstr "�逵極��克 龜戟����劇筠戟�棘勻 �逵鈞�筠�筠戟龜� 克棘戟�剋龜克�棘勻 �剋龜�戟龜�" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:16 @@ -459,8 +477,9 @@ msgstr "linkgit:git-pack-refs[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:18 +#, fuzzy msgid "Pack heads and tags for efficient repository access." -msgstr "" +msgstr "叫極逵克棘勻克逵 �克逵鈞逵�筠剋筠橘 戟逵 勻筠�克龜 龜 劇筠�棘克 畇剋� ���筠克�龜勻戟棘均棘 畇棘���極逵 克 �筠極棘鈞龜�棘�龜�" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:19 @@ -470,8 +489,9 @@ msgstr "linkgit:git-prune[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:21 +#, fuzzy msgid "Prune all unreachable objects from the object database." -msgstr "" +msgstr "��龜��克逵 勻�筠� 戟筠畇棘��龜菌龜劇�� 棘閨�筠克�棘勻 龜鈞 閨逵鈞� 畇逵戟戟�� 棘閨�筠克�棘勻" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:22 @@ -481,8 +501,9 @@ msgstr "linkgit:git-reflog[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:24 +#, fuzzy msgid "Manage reflog information." -msgstr "" +msgstr "叫極�逵勻剋筠戟龜筠 龜戟�棘�劇逵�龜筠橘 菌��戟逵剋逵 ���剋棘克" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:25 @@ -492,8 +513,9 @@ msgstr "linkgit:git-remote[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:27 +#, fuzzy msgid "Manage set of tracked repositories." -msgstr "" +msgstr "叫極�逵勻剋筠戟龜筠 戟逵閨棘�棘劇 棘��剋筠菌龜勻逵筠劇�� �筠極棘鈞龜�棘�龜筠勻" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:28 @@ -503,8 +525,9 @@ msgstr "linkgit:git-repack[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:30 +#, fuzzy msgid "Pack unpacked objects in a repository." -msgstr "" +msgstr "叫極逵克棘勻克逵 戟筠�極逵克棘勻逵戟戟�� 棘閨�筠克�棘勻 勻 �筠極棘鈞龜�棘�龜龜" #. type: Labeled list #: en/cmds-ancillarymanipulators.txt:31 @@ -514,8 +537,9 @@ msgstr "linkgit:git-replace[1]" #. type: Plain text #: en/cmds-ancillarymanipulators.txt:33 +#, fuzzy msgid "Create, list, delete refs to replace objects." -msgstr "" +msgstr "鬼棘鈞畇逵戟龜筠, 勻�勻棘畇 �極龜�克逵, �畇逵剋筠戟龜筠 ���剋棘克 畇剋� 鈞逵劇筠戟� 棘閨�筠克�棘勻" #. type: Labeled list #: en/cmds-foreignscminterface.txt:1 @@ -525,8 +549,9 @@ msgstr "linkgit:git-archimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:3 +#, fuzzy msgid "Import a GNU Arch repository into Git." -msgstr "" +msgstr "�劇極棘��龜�棘勻逵戟龜筠 GNU Arch �筠極棘鈞龜�棘�龜� 勻 Git" #. type: Labeled list #: en/cmds-foreignscminterface.txt:4 @@ -536,8 +561,9 @@ msgstr "linkgit:git-cvsexportcommit[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:6 +#, fuzzy msgid "Export a single commit to a CVS checkout." -msgstr "" +msgstr "葵克�極棘�� 筠畇龜戟��勻筠戟戟棘均棘 克棘劇劇龜�逵 勻 勻龜畇筠 �逵閨棘�筠橘 克棘極龜龜 CVS" #. type: Labeled list #: en/cmds-foreignscminterface.txt:7 @@ -547,8 +573,9 @@ msgstr "linkgit:git-cvsimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:9 +#, fuzzy msgid "Salvage your data out of another SCM people love to hate." -msgstr "" +msgstr "鬼極逵�筠戟龜筠 勻逵�龜� 畇逵戟戟�� 龜鈞 畇��均棘橘 鬼�� 克棘�棘��� 剋�畇龜 剋�閨�� 戟筠戟逵勻龜畇筠��" #. type: Labeled list #: en/cmds-foreignscminterface.txt:10 @@ -558,8 +585,9 @@ msgstr "linkgit:git-cvsserver[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:12 +#, fuzzy msgid "A CVS server emulator for Git." -msgstr "" +msgstr "葵劇�剋��棘� �筠�勻筠�逵 CVS 畇剋� Git" #. type: Labeled list #: en/cmds-foreignscminterface.txt:13 @@ -569,8 +597,9 @@ msgstr "linkgit:git-imap-send[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:15 +#, fuzzy msgid "Send a collection of patches from stdin to an IMAP folder." -msgstr "" +msgstr "��極�逵勻克逵 克棘剋剋筠克�龜龜 極逵��筠橘 龜鈞 ��逵戟畇逵��戟棘均棘 勻勻棘畇逵 勻 極逵極克� IMAP" #. type: Labeled list #: en/cmds-foreignscminterface.txt:16 @@ -580,8 +609,9 @@ msgstr "linkgit:git-p4[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:18 +#, fuzzy msgid "Import from and submit to Perforce repositories." -msgstr "" +msgstr "�劇極棘�� 龜 棘�極�逵勻克逵 勻 �筠極棘鈞龜�棘�龜龜 Perforce" #. type: Labeled list #: en/cmds-foreignscminterface.txt:19 @@ -591,8 +621,9 @@ msgstr "linkgit:git-quiltimport[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:21 +#, fuzzy msgid "Applies a quilt patchset onto the current branch." -msgstr "" +msgstr "��龜劇筠戟筠戟龜筠 �極棘��畇棘�筠戟戟棘均棘 �極龜�克逵 極逵��筠橘 戟逵畇 �筠克��筠橘 勻筠�克棘橘" #. type: Labeled list #: en/cmds-foreignscminterface.txt:22 @@ -602,8 +633,9 @@ msgstr "linkgit:git-request-pull[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:24 +#, fuzzy msgid "Generates a summary of pending changes." -msgstr "" +msgstr "�筠戟筠�逵�龜� �勻棘畇克龜 極�筠畇��棘��龜� 龜鈞劇筠戟筠戟龜橘" #. type: Labeled list #: en/cmds-foreignscminterface.txt:25 @@ -613,8 +645,9 @@ msgstr "linkgit:git-send-email[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:27 +#, fuzzy msgid "Send a collection of patches as emails." -msgstr "" +msgstr "��極�逵勻克逵 克棘剋剋筠克�龜龜 極逵��筠橘 戟逵 �剋筠克��棘戟戟�� 極棘���" #. type: Labeled list #: en/cmds-foreignscminterface.txt:28 @@ -624,8 +657,9 @@ msgstr "linkgit:git-svn[1]" #. type: Plain text #: en/cmds-foreignscminterface.txt:30 +#, fuzzy msgid "Bidirectional operation between a Subversion repository and Git." -msgstr "" +msgstr "�勻����棘�棘戟戟龜筠 棘極筠�逵�龜龜 劇筠菌畇� �筠極棘鈞龜�棘�龜�劇龜 Subversion 龜 Git" #. type: Plain text #: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186 @@ -635,8 +669,9 @@ msgstr "linkgit:git-add[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:3 +#, fuzzy msgid "Add file contents to the index." -msgstr "" +msgstr "�棘閨逵勻剋筠戟龜筠 �棘畇筠�菌龜劇棘均棘 �逵橘剋逵 勻 龜戟畇筠克�" #. type: Labeled list #: en/cmds-mainporcelain.txt:4 @@ -646,8 +681,9 @@ msgstr "linkgit:git-am[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:6 +#, fuzzy msgid "Apply a series of patches from a mailbox." -msgstr "" +msgstr "��龜劇筠戟筠戟龜筠 �筠�龜龜 極逵��筠橘 龜鈞 極棘��棘勻棘均棘 �棘棘閨�筠戟龜�" #. type: Labeled list #: en/cmds-mainporcelain.txt:7 @@ -657,8 +693,9 @@ msgstr "linkgit:git-archive[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:9 +#, fuzzy msgid "Create an archive of files from a named tree." -msgstr "" +msgstr "鬼棘鈞畇逵戟龜筠 逵��龜勻逵 �逵橘剋棘勻 龜鈞 �克逵鈞逵戟戟棘均棘 畇筠�筠勻逵" #. type: Labeled list #: en/cmds-mainporcelain.txt:10 @@ -668,8 +705,9 @@ msgstr "linkgit:git-bisect[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:12 +#, fuzzy msgid "Use binary search to find the commit that introduced a bug." -msgstr "" +msgstr "��極棘剋戟筠戟龜筠 畇勻棘龜�戟棘均棘 極棘龜�克逵 克棘劇劇龜�逵, 克棘�棘��橘 勻戟棘�龜� 棘�龜閨克�" #. type: Labeled list #: en/cmds-mainporcelain.txt:13 @@ -679,8 +717,9 @@ msgstr "linkgit:git-branch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:15 +#, fuzzy msgid "List, create, or delete branches." -msgstr "" +msgstr "��勻棘畇 �極龜�克逵, �棘鈞畇逵戟龜筠 龜剋龜 �畇逵剋筠戟龜筠 勻筠�棘克" #. type: Labeled list #: en/cmds-mainporcelain.txt:16 @@ -690,8 +729,9 @@ msgstr "linkgit:git-bundle[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:18 +#, fuzzy msgid "Move objects and refs by archive." -msgstr "" +msgstr "�筠�筠劇筠�筠戟龜筠 棘閨�筠克�棘勻 龜 ���剋棘克 極棘 逵��龜勻�" #. type: Labeled list #: en/cmds-mainporcelain.txt:19 @@ -701,8 +741,9 @@ msgstr "linkgit:git-checkout[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:21 +#, fuzzy msgid "Switch branches or restore working tree files." -msgstr "" +msgstr "�筠�筠克剋��筠戟龜筠 勻筠�棘克 龜剋龜 勻棘���逵戟棘勻剋筠戟龜筠 �逵橘剋棘勻 勻 �逵閨棘�筠劇 克逵�逵剋棘均筠" #. type: Plain text #: en/cmds-mainporcelain.txt:22 en/git-revert.txt:126 @@ -712,8 +753,9 @@ msgstr "linkgit:git-cherry-pick[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:24 +#, fuzzy msgid "Apply the changes introduced by some existing commits." -msgstr "" +msgstr "��龜劇筠戟筠戟龜筠 龜鈞劇筠戟筠戟龜橘, �畇筠剋逵戟戟�� 勻 克逵克棘劇-�棘 ���筠��勻���筠劇 克棘劇劇龜�筠" #. type: Labeled list #: en/cmds-mainporcelain.txt:25 @@ -723,8 +765,9 @@ msgstr "linkgit:git-citool[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:27 +#, fuzzy msgid "Graphical alternative to git-commit." -msgstr "" +msgstr "��逵�龜�筠�克逵� 逵剋��筠�戟逵�龜勻逵 畇剋� git-commit" #. type: Labeled list #: en/cmds-mainporcelain.txt:28 @@ -734,8 +777,9 @@ msgstr "linkgit:git-clean[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:30 +#, fuzzy msgid "Remove untracked files from the working tree." -msgstr "" +msgstr "叫畇逵剋筠戟龜筠 戟筠棘��剋筠菌龜勻逵筠劇�� �逵橘剋棘勻 龜鈞 �逵閨棘�筠均棘 克逵�逵剋棘均逵" #. type: Labeled list #: en/cmds-mainporcelain.txt:31 @@ -756,8 +800,9 @@ msgstr "linkgit:git-commit[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:36 +#, fuzzy msgid "Record changes to the repository." -msgstr "" +msgstr "�逵極龜�� 龜鈞劇筠戟筠戟龜橘 勻 �筠極棘鈞龜�棘�龜橘" #. type: Labeled list #: en/cmds-mainporcelain.txt:37 @@ -767,8 +812,9 @@ msgstr "linkgit:git-describe[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:39 +#, fuzzy msgid "Give an object a human readable name based on an available ref." -msgstr "" +msgstr "��龜�勻棘筠戟龜筠 棘閨�筠克�� �畇棘閨棘�龜�逵筠劇棘筠 龜劇� 戟逵 棘�戟棘勻筠 畇棘���極戟棘橘 ���剋克龜" #. type: Labeled list #: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:136 @@ -778,8 +824,9 @@ msgstr "linkgit:git-diff[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:42 +#, fuzzy msgid "Show changes between commits, commit and working tree, etc." -msgstr "" +msgstr "��勻棘畇 �逵鈞戟龜�� 劇筠菌畇� 克棘劇劇龜�逵劇龜, 克棘劇劇龜�棘劇 龜 �逵閨棘�龜劇 克逵�逵剋棘均棘劇 龜 �.畇." #. type: Plain text #: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129 @@ -789,8 +836,9 @@ msgstr "linkgit:git-fetch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:45 +#, fuzzy msgid "Download objects and refs from another repository." -msgstr "" +msgstr "�逵均��鈞克逵 棘閨�筠克�棘勻 龜 ���剋棘克 龜鈞 畇��均棘均棘 �筠極棘鈞龜�棘�龜�" #. type: Labeled list #: en/cmds-mainporcelain.txt:46 @@ -800,8 +848,9 @@ msgstr "linkgit:git-format-patch[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:48 +#, fuzzy msgid "Prepare patches for e-mail submission." -msgstr "" +msgstr "�棘畇均棘�棘勻克逵 極逵��筠橘 畇剋� 棘�極�逵勻克龜 極棘 �剋筠克��棘戟戟棘橘 極棘��筠" #. type: Labeled list #: en/cmds-mainporcelain.txt:49 @@ -811,8 +860,9 @@ msgstr "linkgit:git-gc[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:51 +#, fuzzy msgid "Cleanup unnecessary files and optimize the local repository." -msgstr "" +msgstr "��龜��克逵 戟筠戟�菌戟�� �逵橘剋棘勻 龜 棘極�龜劇龜鈞逵�龜� 剋棘克逵剋�戟棘均棘 �筠極棘鈞龜�棘�龜�" #. type: Labeled list #: en/cmds-mainporcelain.txt:52 @@ -822,8 +872,9 @@ msgstr "linkgit:git-grep[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:54 +#, fuzzy msgid "Print lines matching a pattern." -msgstr "" +msgstr "��勻棘畇 ���棘克, �棘棘�勻筠���勻���龜� �逵閨剋棘戟�" #. type: Labeled list #: en/cmds-mainporcelain.txt:55 @@ -833,8 +884,9 @@ msgstr "linkgit:git-gui[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:57 +#, fuzzy msgid "A portable graphical interface to Git." -msgstr "" +msgstr "�棘��逵�龜勻戟�橘 均�逵�龜�筠�克龜橘 龜戟�筠��筠橘� 畇剋� Git" #. type: Labeled list #: en/cmds-mainporcelain.txt:58 @@ -844,8 +896,9 @@ msgstr "linkgit:git-init[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:60 +#, fuzzy msgid "Create an empty Git repository or reinitialize an existing one." -msgstr "" +msgstr "鬼棘鈞畇逵戟龜筠 極���棘均棘 �筠極棘鈞龜�棘�龜� Git 龜剋龜 極筠�筠龜戟龜�龜逵剋龜鈞逵�龜� ���筠��勻���筠均棘" #. type: Labeled list #: en/cmds-mainporcelain.txt:61 @@ -855,8 +908,9 @@ msgstr "linkgit:git-log[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:63 +#, fuzzy msgid "Show commit logs." -msgstr "" +msgstr "��勻棘畇 龜��棘�龜龜 克棘劇劇龜�棘勻" #. type: Plain text #: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75 @@ -866,8 +920,9 @@ msgstr "linkgit:git-merge[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:66 +#, fuzzy msgid "Join two or more development histories together." -msgstr "" +msgstr "�閨�筠畇龜戟筠戟龜筠 棘畇戟棘橘 龜剋龜 戟筠�克棘剋�克龜� 龜��棘�龜橘 �逵鈞�逵閨棘�克龜 勻劇筠��筠" #. type: Labeled list #: en/cmds-mainporcelain.txt:67 @@ -877,8 +932,9 @@ msgstr "linkgit:git-mv[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:69 +#, fuzzy msgid "Move or rename a file, a directory, or a symlink." -msgstr "" +msgstr "�筠�筠劇筠�筠戟龜筠 龜剋龜 極筠�筠龜劇筠戟棘勻逵戟龜筠 �逵橘剋逵, 克逵�逵剋棘均逵 龜剋龜 �龜劇勻棘剋�戟棘橘 ���剋克龜" #. type: Labeled list #: en/cmds-mainporcelain.txt:70 @@ -888,8 +944,9 @@ msgstr "linkgit:git-notes[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:72 +#, fuzzy msgid "Add or inspect object notes." -msgstr "" +msgstr "�棘閨逵勻剋筠戟龜筠 龜剋龜 極�棘�劇棘�� 鈞逵劇筠�棘克 棘閨�筠克�逵" #. type: Plain text #: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:296 @@ -899,8 +956,9 @@ msgstr "linkgit:git-pull[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:75 +#, fuzzy msgid "Fetch from and integrate with another repository or a local branch." -msgstr "" +msgstr "�鈞勻剋筠�筠戟龜筠 龜鈞劇筠戟筠戟龜橘 龜 棘閨�筠畇龜戟筠戟龜筠 � 畇��均龜劇 �筠極棘鈞龜�棘�龜筠劇 龜剋龜 剋棘克逵剋�戟棘橘 勻筠�克棘橘" #. type: Labeled list #: en/cmds-mainporcelain.txt:76 @@ -910,8 +968,9 @@ msgstr "linkgit:git-push[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:78 +#, fuzzy msgid "Update remote refs along with associated objects." -msgstr "" +msgstr "�閨戟棘勻剋筠戟龜筠 勻戟筠�戟龜� ���剋棘克 龜 �勻�鈞逵戟戟�� 棘閨�筠克�棘勻" #. type: Labeled list #: en/cmds-mainporcelain.txt:79 @@ -921,8 +980,9 @@ msgstr "linkgit:git-range-diff[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:81 +#, fuzzy msgid "Compare two commit ranges (e.g. two versions of a branch)." -msgstr "" +msgstr "鬼�逵勻戟筠戟龜筠 畇勻�� 畇龜逵極逵鈞棘戟棘勻 克棘劇劇龜�棘勻 (戟逵極�龜劇筠� 畇勻�� 勻筠��龜橘 勻筠�克龜)" #. type: Plain text #: en/cmds-mainporcelain.txt:82 en/git-svn.txt:1171 @@ -932,8 +992,9 @@ msgstr "linkgit:git-rebase[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:84 +#, fuzzy msgid "Reapply commits on top of another base tip." -msgstr "" +msgstr "�棘勻�棘�戟棘筠 極�龜劇筠戟筠戟龜筠 克棘劇劇龜�棘勻 戟逵畇 勻筠����克棘橘 畇��均棘橘 勻筠�克龜" #. type: Labeled list #: en/cmds-mainporcelain.txt:85 @@ -943,8 +1004,9 @@ msgstr "linkgit:git-reset[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:87 +#, fuzzy msgid "Reset current HEAD to the specified state." -msgstr "" +msgstr "鬼閨�棘� �筠克��筠均棘 �棘��棘�戟龜� HEAD 戟逵 �克逵鈞逵戟戟棘筠 �棘��棘�戟龜筠" #. type: Plain text #: en/cmds-mainporcelain.txt:88 en/git-cherry-pick.txt:230 @@ -954,8 +1016,9 @@ msgstr "linkgit:git-revert[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:90 +#, fuzzy msgid "Revert some existing commits." -msgstr "" +msgstr "�閨�逵�筠戟龜筠 龜鈞劇筠戟筠戟龜橘 ���筠��勻���龜� 克棘劇劇龜�棘勻" #. type: Labeled list #: en/cmds-mainporcelain.txt:91 @@ -965,8 +1028,9 @@ msgstr "linkgit:git-rm[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:93 +#, fuzzy msgid "Remove files from the working tree and from the index." -msgstr "" +msgstr "叫畇逵剋筠戟龜筠 �逵橘剋棘勻 龜鈞 �逵閨棘�筠均棘 克逵�逵剋棘均逵 龜 龜戟畇筠克�逵" #. type: Labeled list #: en/cmds-mainporcelain.txt:94 @@ -976,8 +1040,9 @@ msgstr "linkgit:git-shortlog[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:96 +#, fuzzy msgid "Summarize 'git log' output." -msgstr "" +msgstr "�閨棘閨�筠戟龜筠 勻�勻棘畇逵 짬git log쨩" #. type: Labeled list #: en/cmds-mainporcelain.txt:97 @@ -987,8 +1052,9 @@ msgstr "linkgit:git-show[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:99 +#, fuzzy msgid "Show various types of objects." -msgstr "" +msgstr "��勻棘畇 �逵鈞剋龜�戟�� �龜極棘勻 棘閨�筠克�棘勻" #. type: Labeled list #: en/cmds-mainporcelain.txt:100 @@ -998,8 +1064,9 @@ msgstr "linkgit:git-stash[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:102 +#, fuzzy msgid "Stash the changes in a dirty working directory away." -msgstr "" +msgstr "鬼極���逵�� 龜鈞劇筠戟筠戟龜� 勻 龜鈞劇筠戟�戟戟棘劇 �逵閨棘�筠劇 克逵�逵剋棘均筠" #. type: Labeled list #: en/cmds-mainporcelain.txt:103 @@ -1009,8 +1076,9 @@ msgstr "linkgit:git-status[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:105 +#, fuzzy msgid "Show the working tree status." -msgstr "" +msgstr "��勻棘畇 �棘��棘�戟龜� �逵閨棘�筠均棘 克逵�逵剋棘均逵" #. type: Labeled list #: en/cmds-mainporcelain.txt:106 @@ -1020,8 +1088,9 @@ msgstr "linkgit:git-submodule[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:108 +#, fuzzy msgid "Initialize, update or inspect submodules." -msgstr "" +msgstr "�戟龜�龜逵剋龜鈞逵�龜�, 棘閨戟棘勻剋筠戟龜筠 龜剋龜 極�棘�劇棘�� 極棘畇劇棘畇�剋筠橘" #. type: Labeled list #: en/cmds-mainporcelain.txt:109 @@ -1031,8 +1100,9 @@ msgstr "linkgit:git-tag[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:111 +#, fuzzy msgid "Create, list, delete or verify a tag object signed with GPG." -msgstr "" +msgstr "鬼棘鈞畇逵戟龜筠, 勻�勻棘畇 �極龜�克逵, �畇逵剋筠戟龜筠 龜剋龜 極�棘勻筠�克逵 劇筠�克龜, 極棘畇極龜�逵戟戟棘橘 � 極棘劇棘��� GPG" #. type: Labeled list #: en/cmds-mainporcelain.txt:112 @@ -1042,8 +1112,9 @@ msgstr "linkgit:git-worktree[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:114 +#, fuzzy msgid "Manage multiple working trees." -msgstr "" +msgstr "叫極�逵勻剋筠戟龜筠 戟筠�克棘剋�克龜劇龜 �逵閨棘�龜劇龜 克逵�逵剋棘均逵劇龜" #. type: Labeled list #: en/cmds-mainporcelain.txt:115 en/git-gui.txt:104 @@ -1053,8 +1124,9 @@ msgstr "linkgit:gitk[1]" #. type: Plain text #: en/cmds-mainporcelain.txt:117 +#, fuzzy msgid "The Git repository browser." -msgstr "" +msgstr "��逵�鈞筠� �筠極棘鈞龜�棘�龜� Git" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:1 @@ -1064,8 +1136,9 @@ msgstr "linkgit:git-cat-file[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:3 +#, fuzzy msgid "Provide content or type and size information for repository objects." -msgstr "" +msgstr "��勻棘畇 �棘畇筠�菌龜劇棘均棘 龜剋龜 �龜極逵 龜 龜戟�棘�劇逵�龜龜 棘 �逵鈞劇筠�筠 畇剋� 棘閨�筠克�棘勻 �筠極棘鈞龜�棘�龜�" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:4 @@ -1075,8 +1148,9 @@ msgstr "linkgit:git-cherry[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:6 +#, fuzzy msgid "Find commits yet to be applied to upstream." -msgstr "" +msgstr "�棘龜�克 克棘劇劇龜�棘勻 克棘�棘��筠 筠�筠 戟筠 極�龜劇筠戟筠戟� 勻��筠��棘��龜劇 �筠極棘鈞龜�棘�龜筠劇" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:7 @@ -1086,8 +1160,9 @@ msgstr "linkgit:git-diff-files[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:9 +#, fuzzy msgid "Compares files in the working tree and the index." -msgstr "" +msgstr "鬼�逵勻戟筠戟龜筠 �筠畇筠�菌龜劇棘均棘 �逵橘剋棘勻 勻 �逵閨棘�筠劇 克逵�逵剋棘均筠 � �逵橘剋逵劇龜 勻 龜戟畇筠克�筠" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:10 @@ -1097,8 +1172,9 @@ msgstr "linkgit:git-diff-index[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:12 +#, fuzzy msgid "Compare a tree to the working tree or index." -msgstr "" +msgstr "鬼�逵勻戟筠戟龜筠 畇筠�筠勻逵 �逵橘剋棘勻 � �逵閨棘�龜劇 克逵�逵剋棘均棘劇 龜剋龜 龜戟畇筠克�棘劇" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:13 @@ -1108,8 +1184,9 @@ msgstr "linkgit:git-diff-tree[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:15 +#, fuzzy msgid "Compares the content and mode of blobs found via two tree objects." -msgstr "" +msgstr "鬼�逵勻戟筠戟龜筠 �棘畇筠�菌龜劇棘均棘 龜 �筠菌龜劇逵 畇勻棘龜�戟�� 棘閨�筠克�棘勻, 戟逵橘畇筠戟戟�� 極棘 畇勻�劇 棘閨�筠克�逵劇 畇筠�筠勻逵" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:16 @@ -1119,8 +1196,9 @@ msgstr "linkgit:git-for-each-ref[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:18 +#, fuzzy msgid "Output information on each ref." -msgstr "" +msgstr "��勻棘畇 龜戟�棘�劇逵�龜龜 棘 克逵菌畇棘橘 ���剋克筠" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:19 @@ -1130,8 +1208,9 @@ msgstr "linkgit:git-get-tar-commit-id[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:21 +#, fuzzy msgid "Extract commit ID from an archive created using git-archive." -msgstr "" +msgstr "�鈞勻剋筠�筠戟龜筠 龜畇筠戟�龜�龜克逵�棘�逵 克棘劇劇龜�逵 龜鈞 逵��龜勻逵, �棘鈞畇逵戟戟棘均棘 � 極棘劇棘��� git-archive" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:22 @@ -1141,8 +1220,9 @@ msgstr "linkgit:git-ls-files[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:24 +#, fuzzy msgid "Show information about files in the index and the working tree." -msgstr "" +msgstr "��勻棘畇 龜戟�棘�劇逵�龜龜 棘 �逵橘剋逵� 勻 龜戟畇筠克�筠 龜 勻 �逵閨棘�筠劇 克逵�逵剋棘均筠" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:25 @@ -1152,8 +1232,9 @@ msgstr "linkgit:git-ls-remote[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:27 +#, fuzzy msgid "List references in a remote repository." -msgstr "" +msgstr "��勻棘畇 �極龜�克逵 ���剋棘克 勻棘 勻戟筠�戟筠劇 �筠極棘鈞龜�棘�龜龜" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:28 @@ -1163,8 +1244,9 @@ msgstr "linkgit:git-ls-tree[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:30 +#, fuzzy msgid "List the contents of a tree object." -msgstr "" +msgstr "��勻棘畇 �棘畇筠�菌龜劇棘均棘 棘閨�筠克�逵 畇筠�筠勻逵" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:31 @@ -1174,8 +1256,9 @@ msgstr "linkgit:git-merge-base[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:33 +#, fuzzy msgid "Find as good common ancestors as possible for a merge." -msgstr "" +msgstr "�棘龜�克 極棘畇�棘畇��龜� 棘閨�龜� 極�筠畇克棘勻 畇剋� 勻棘鈞劇棘菌戟棘均棘 �剋龜�戟龜�" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:34 @@ -1185,8 +1268,9 @@ msgstr "linkgit:git-name-rev[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:36 +#, fuzzy msgid "Find symbolic names for given revs." -msgstr "" +msgstr "�棘龜�克 �龜劇勻棘剋�戟�� 龜劇�戟 畇剋� �克逵鈞逵戟戟�� �筠畇逵克�龜橘" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:37 @@ -1196,8 +1280,9 @@ msgstr "linkgit:git-pack-redundant[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:39 +#, fuzzy msgid "Find redundant pack files." -msgstr "" +msgstr "�棘龜�克 龜鈞閨��棘�戟�� �逵橘剋棘勻 極逵克筠�棘勻" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:40 @@ -1207,8 +1292,9 @@ msgstr "linkgit:git-rev-list[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:42 +#, fuzzy msgid "Lists commit objects in reverse chronological order." -msgstr "" +msgstr "��勻棘畇 �極龜�克逵 棘閨�筠克�棘勻 克棘劇劇龜�逵 勻 棘閨�逵�戟棘劇 ��棘戟棘剋棘均龜�筠�克棘劇 極棘��畇克筠" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:43 @@ -1218,8 +1304,9 @@ msgstr "linkgit:git-rev-parse[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:45 +#, fuzzy msgid "Pick out and massage parameters." -msgstr "" +msgstr "�逵鈞閨棘� 龜 棘閨�逵閨棘�克逵 極逵�逵劇筠��棘勻" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:46 @@ -1229,8 +1316,9 @@ msgstr "linkgit:git-show-index[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:48 +#, fuzzy msgid "Show packed archive index." -msgstr "" +msgstr "��勻棘畇 龜戟畇筠克�逵 �極逵克棘勻逵戟戟棘均棘 逵��龜勻逵" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:386 @@ -1240,8 +1328,9 @@ msgstr "linkgit:git-show-ref[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:51 +#, fuzzy msgid "List references in a local repository." -msgstr "" +msgstr "��勻棘畇 ���剋棘克 勻 剋棘克逵剋�戟棘劇 �筠極棘鈞龜�棘�龜龜" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:52 @@ -1251,8 +1340,9 @@ msgstr "linkgit:git-unpack-file[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:54 +#, fuzzy msgid "Creates a temporary file with a blob's contents." -msgstr "" +msgstr "鬼棘鈞畇逵戟龜筠 勻�筠劇筠戟戟棘均棘 �逵橘剋逵 � �棘畇筠�菌龜劇�劇 畇勻棘龜�戟棘均棘 棘閨�筠克�逵" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:55 @@ -1262,8 +1352,9 @@ msgstr "linkgit:git-var[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:57 +#, fuzzy msgid "Show a Git logical variable." -msgstr "" +msgstr "��勻棘畇 剋棘均龜�筠�克棘橘 極筠�筠劇筠戟戟棘橘 Git" #. type: Labeled list #: en/cmds-plumbinginterrogators.txt:58 @@ -1273,8 +1364,9 @@ msgstr "linkgit:git-verify-pack[1]" #. type: Plain text #: en/cmds-plumbinginterrogators.txt:60 +#, fuzzy msgid "Validate packed Git archive files." -msgstr "" +msgstr "��棘勻筠�克逵 �逵橘剋棘勻 �極逵克棘勻逵戟戟�� 逵��龜勻棘勻 Git" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:1 @@ -1284,8 +1376,9 @@ msgstr "linkgit:git-apply[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:3 +#, fuzzy msgid "Apply a patch to files and/or to the index." -msgstr "" +msgstr "��龜劇筠戟筠戟龜筠 極逵��逵 克 �逵橘剋逵劇 龜/龜剋龜 龜戟畇筠克��" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:4 @@ -1295,8 +1388,9 @@ msgstr "linkgit:git-checkout-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:6 +#, fuzzy msgid "Copy files from the index to the working tree." -msgstr "" +msgstr "�棘極龜�棘勻逵戟龜筠 �逵橘剋棘勻 龜鈞 龜戟畇筠克�逵 勻 �逵閨棘�龜橘 克逵�逵剋棘均" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:7 @@ -1306,8 +1400,9 @@ msgstr "linkgit:git-commit-graph[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:9 +#, fuzzy msgid "Write and verify Git commit-graph files." -msgstr "" +msgstr "�逵極龜�� 龜 極�棘勻筠�克逵 commit-graph �逵橘剋棘勻 Git" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:10 @@ -1317,8 +1412,9 @@ msgstr "linkgit:git-commit-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:12 +#, fuzzy msgid "Create a new commit object." -msgstr "" +msgstr "鬼棘鈞畇逵戟龜筠 戟棘勻棘均棘 棘閨�筠克�逵 克棘劇劇龜�逵" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:13 @@ -1328,8 +1424,9 @@ msgstr "linkgit:git-hash-object[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:15 +#, fuzzy msgid "Compute object ID and optionally creates a blob from a file." -msgstr "" +msgstr "���龜�剋筠戟龜筠 龜畇筠戟�龜�龜克逵�棘�逵 棘閨�筠克�逵 龜 勻棘鈞劇棘菌戟棘筠 �棘鈞畇逵戟龜筠 畇勻棘龜�戟棘均棘 棘閨�筠克�逵 龜鈞 �逵橘剋逵" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:16 @@ -1339,8 +1436,9 @@ msgstr "linkgit:git-index-pack[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:18 +#, fuzzy msgid "Build pack index file for an existing packed archive." -msgstr "" +msgstr "�棘���棘筠戟龜筠 �逵橘剋逵 龜戟畇筠克�逵 畇剋� ���筠��勻���筠均棘 �極逵克棘勻逵戟戟棘均棘 逵��龜勻逵" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:19 @@ -1350,8 +1448,9 @@ msgstr "linkgit:git-merge-file[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:21 +#, fuzzy msgid "Run a three-way file merge." -msgstr "" +msgstr "�逵極��克 �����棘畇棘勻棘均棘 �剋龜�戟龜� �逵橘剋棘勻" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:22 @@ -1361,8 +1460,9 @@ msgstr "linkgit:git-merge-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:24 +#, fuzzy msgid "Run a merge for files needing merging." -msgstr "" +msgstr "�逵極��克 �剋龜�戟龜� 畇剋� �逵橘剋棘勻, 克棘�棘��筠 ��筠閨��� �剋龜�戟龜�" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:25 @@ -1372,8 +1472,9 @@ msgstr "linkgit:git-mktag[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:27 +#, fuzzy msgid "Creates a tag object." -msgstr "" +msgstr "鬼棘鈞畇逵戟龜筠 棘閨�筠克�棘勻 劇筠�棘克" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:28 @@ -1383,8 +1484,9 @@ msgstr "linkgit:git-mktree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:30 +#, fuzzy msgid "Build a tree-object from ls-tree formatted text." -msgstr "" +msgstr "�棘���棘筠戟龜筠 棘閨�筠克�逵 畇筠�筠勻逵 龜鈞 �筠克��逵 �棘�劇逵�逵 ls-tree" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:31 @@ -1394,8 +1496,9 @@ msgstr "linkgit:git-multi-pack-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:33 +#, fuzzy msgid "Write and verify multi-pack-indexes." -msgstr "" +msgstr "�逵極龜�� 龜 極�棘勻筠�克逵 �逵橘剋棘勻 multi-pack-index" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:34 @@ -1405,8 +1508,9 @@ msgstr "linkgit:git-pack-objects[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:36 +#, fuzzy msgid "Create a packed archive of objects." -msgstr "" +msgstr "鬼棘鈞畇逵戟龜筠 �極逵克棘勻逵戟戟棘均棘 逵��龜勻逵 棘閨�筠克�棘勻" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:37 @@ -1416,8 +1520,9 @@ msgstr "linkgit:git-prune-packed[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:39 +#, fuzzy msgid "Remove extra objects that are already in pack files." -msgstr "" +msgstr "叫畇逵剋筠戟龜筠 畇棘極棘剋戟龜�筠剋�戟�� 棘閨�筠克�棘勻, 克棘�棘��筠 �菌筠 �棘畇筠�菌逵��� 勻 �逵橘剋逵� 極逵克筠�棘勻" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:40 @@ -1427,8 +1532,9 @@ msgstr "linkgit:git-read-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:42 +#, fuzzy msgid "Reads tree information into the index." -msgstr "" +msgstr "槻�筠戟龜筠 龜戟�棘�劇逵�龜龜 棘 畇筠�筠勻筠 勻 龜戟畇筠克�" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:43 @@ -1438,8 +1544,9 @@ msgstr "linkgit:git-symbolic-ref[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:45 +#, fuzzy msgid "Read, modify and delete symbolic refs." -msgstr "" +msgstr "槻�筠戟龜筠, 龜鈞劇筠戟筠戟龜筠 龜 �畇逵剋筠戟龜筠 �龜劇勻棘剋龜�筠�克龜� ���剋棘克" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:46 @@ -1449,8 +1556,9 @@ msgstr "linkgit:git-unpack-objects[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:48 +#, fuzzy msgid "Unpack objects from a packed archive." -msgstr "" +msgstr "�逵�極逵克棘勻克逵 棘閨�筠克�棘勻 龜鈞 �極逵克棘勻逵戟戟棘均棘 逵��龜勻逵" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:49 @@ -1460,8 +1568,9 @@ msgstr "linkgit:git-update-index[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:51 +#, fuzzy msgid "Register file contents in the working tree to the index." -msgstr "" +msgstr "�筠均龜���逵�龜� �棘畇筠�菌龜劇棘均棘 �逵橘剋逵 龜鈞 �逵閨棘�筠均棘 克逵�逵剋棘均逵 勻 龜戟畇筠克�" #. type: Labeled list #: en/cmds-plumbingmanipulators.txt:52 @@ -1471,8 +1580,9 @@ msgstr "linkgit:git-update-ref[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:54 +#, fuzzy msgid "Update the object name stored in a ref safely." -msgstr "" +msgstr "�筠鈞棘極逵�戟棘筠 棘閨戟棘勻剋筠戟龜筠 龜劇筠戟龜 棘閨�筠克�逵 ��逵戟��筠均棘�� 勻 ���剋克筠" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:115 @@ -1482,8 +1592,9 @@ msgstr "linkgit:git-write-tree[1]" #. type: Plain text #: en/cmds-plumbingmanipulators.txt:57 +#, fuzzy msgid "Create a tree object from the current index." -msgstr "" +msgstr "鬼棘鈞畇逵戟龜筠 棘閨�筠克�逵 畇筠�筠勻逵 龜鈞 �筠克��筠均棘 龜戟畇筠克�逵" #. type: Labeled list #: en/cmds-purehelpers.txt:1 @@ -1493,8 +1604,9 @@ msgstr "linkgit:git-check-attr[1]" #. type: Plain text #: en/cmds-purehelpers.txt:3 +#, fuzzy msgid "Display gitattributes information." -msgstr "" +msgstr "��勻棘畇 龜戟�棘�劇逵�龜龜 龜鈞 gitattributes" #. type: Labeled list #: en/cmds-purehelpers.txt:4 @@ -1504,8 +1616,9 @@ msgstr "linkgit:git-check-ignore[1]" #. type: Plain text #: en/cmds-purehelpers.txt:6 +#, fuzzy msgid "Debug gitignore / exclude files." -msgstr "" +msgstr "��剋逵畇克逵 �逵橘剋棘勻 gitignore / exclude" #. type: Labeled list #: en/cmds-purehelpers.txt:7 @@ -1515,8 +1628,9 @@ msgstr "linkgit:git-check-mailmap[1]" #. type: Plain text #: en/cmds-purehelpers.txt:9 +#, fuzzy msgid "Show canonical names and email addresses of contacts." -msgstr "" +msgstr "��勻棘畇 克逵戟棘戟龜�戟�� 龜劇�戟 龜 逵畇�筠�棘勻 �剋筠克��棘戟戟棘橘 極棘��� 克棘戟�逵克�棘勻" #. type: Labeled list #: en/cmds-purehelpers.txt:10 @@ -1526,8 +1640,9 @@ msgstr "linkgit:git-check-ref-format[1]" #. type: Plain text #: en/cmds-purehelpers.txt:12 +#, fuzzy msgid "Ensures that a reference name is well formed." -msgstr "" +msgstr "叫畇棘��棘勻筠�龜����, ��棘 龜劇� ���剋克龜 極�逵勻龜剋�戟棘 ��棘�劇龜�棘勻逵戟棘" #. type: Labeled list #: en/cmds-purehelpers.txt:13 @@ -1537,8 +1652,9 @@ msgstr "linkgit:git-column[1]" #. type: Plain text #: en/cmds-purehelpers.txt:15 +#, fuzzy msgid "Display data in columns." -msgstr "" +msgstr "��勻棘畇 畇逵戟戟�� 極棘 克棘剋棘戟克逵劇" #. type: Labeled list #: en/cmds-purehelpers.txt:16 @@ -1548,8 +1664,9 @@ msgstr "linkgit:git-credential[1]" #. type: Plain text #: en/cmds-purehelpers.txt:18 +#, fuzzy msgid "Retrieve and store user credentials." -msgstr "" +msgstr "�棘剋��筠戟龜筠 龜 �棘��逵戟筠戟龜筠 ��筠�戟�� 鈞逵極龜�筠橘 極棘剋�鈞棘勻逵�筠剋�" #. type: Labeled list #: en/cmds-purehelpers.txt:19 @@ -1559,8 +1676,9 @@ msgstr "linkgit:git-credential-cache[1]" #. type: Plain text #: en/cmds-purehelpers.txt:21 +#, fuzzy msgid "Helper to temporarily store passwords in memory." -msgstr "" +msgstr "�棘劇棘�戟龜克 畇剋� 勻�筠劇筠戟戟棘均棘 ��逵戟筠戟龜� 極逵�棘剋筠橘 勻 極逵劇��龜" #. type: Labeled list #: en/cmds-purehelpers.txt:22 @@ -1570,8 +1688,9 @@ msgstr "linkgit:git-credential-store[1]" #. type: Plain text #: en/cmds-purehelpers.txt:24 +#, fuzzy msgid "Helper to store credentials on disk." -msgstr "" +msgstr "�棘劇棘�戟龜克 畇剋� ��逵戟筠戟龜� ��筠�戟�� 鈞逵極龜�筠橘 戟逵 畇龜�克筠" #. type: Labeled list #: en/cmds-purehelpers.txt:25 @@ -1581,8 +1700,9 @@ msgstr "linkgit:git-fmt-merge-msg[1]" #. type: Plain text #: en/cmds-purehelpers.txt:27 +#, fuzzy msgid "Produce a merge commit message." -msgstr "" +msgstr "鬼棘鈞畇逵戟龜筠 �棘棘閨�筠戟龜� 克棘劇劇龜�逵 畇剋� �剋龜�戟龜�" #. type: Labeled list #: en/cmds-purehelpers.txt:28 @@ -1592,8 +1712,9 @@ msgstr "linkgit:git-interpret-trailers[1]" #. type: Plain text #: en/cmds-purehelpers.txt:30 +#, fuzzy msgid "add or parse structured information in commit messages." -msgstr "" +msgstr "�棘閨逵勻剋筠戟龜筠 龜剋龜 �逵鈞閨棘� ����克���龜�棘勻逵戟戟棘橘 龜戟�棘�劇逵�龜龜 勻 �棘棘閨�筠戟龜�� 克棘劇劇龜�逵" #. type: Labeled list #: en/cmds-purehelpers.txt:31 @@ -1603,8 +1724,9 @@ msgstr "linkgit:git-mailinfo[1]" #. type: Plain text #: en/cmds-purehelpers.txt:33 +#, fuzzy msgid "Extracts patch and authorship from a single e-mail message." -msgstr "" +msgstr "�鈞勻剋筠克逵筠� 極逵�� 龜 逵勻�棘���勻棘 龜鈞 棘畇戟棘均棘 �棘棘閨�筠戟龜� �剋筠克��棘戟戟棘橘 極棘���" #. type: Labeled list #: en/cmds-purehelpers.txt:34 @@ -1614,8 +1736,9 @@ msgstr "linkgit:git-mailsplit[1]" #. type: Plain text #: en/cmds-purehelpers.txt:36 +#, fuzzy msgid "Simple UNIX mbox splitter program." -msgstr "" +msgstr "��棘��逵� 極�棘均�逵劇劇逵 UNIX 畇剋� �逵鈞閨棘�逵 �逵橘剋逵 mbox" #. type: Labeled list #: en/cmds-purehelpers.txt:37 @@ -1625,8 +1748,9 @@ msgstr "linkgit:git-merge-one-file[1]" #. type: Plain text #: en/cmds-purehelpers.txt:39 +#, fuzzy msgid "The standard helper program to use with git-merge-index." -msgstr "" +msgstr "鬼�逵戟畇逵��戟逵� 極�棘均�逵劇劇逵-極棘劇棘�戟龜克 畇剋� 龜�極棘剋�鈞棘勻逵戟龜� �棘勻劇筠��戟棘 � git-merge-index" #. type: Plain text #: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142 @@ -1636,8 +1760,9 @@ msgstr "linkgit:git-patch-id[1]" #. type: Plain text #: en/cmds-purehelpers.txt:42 +#, fuzzy msgid "Compute unique ID for a patch." -msgstr "" +msgstr "���龜�剋筠戟龜筠 �戟龜克逵剋�戟棘均棘 龜畇筠戟�龜�龜克逵�棘�逵 畇剋� 極逵��逵" #. type: Labeled list #: en/cmds-purehelpers.txt:43 @@ -1647,8 +1772,9 @@ msgstr "linkgit:git-sh-i18n[1]" #. type: Plain text #: en/cmds-purehelpers.txt:45 +#, fuzzy msgid "Git's i18n setup code for shell scripts." -msgstr "" +msgstr "�棘畇 戟逵���棘橘克龜 龜戟�筠�戟逵�龜棘戟逵剋龜鈞逵�龜龜 畇剋� ��筠戟逵�龜筠勻 棘閨棘剋棘�克龜 Git" #. type: Labeled list #: en/cmds-purehelpers.txt:46 @@ -1658,8 +1784,9 @@ msgstr "linkgit:git-sh-setup[1]" #. type: Plain text #: en/cmds-purehelpers.txt:48 +#, fuzzy msgid "Common Git shell script setup code." -msgstr "" +msgstr "�閨�龜橘 克棘畇 戟逵���棘橘克龜 畇剋� ��筠戟逵�龜筠勻 棘閨棘剋棘�克龜 Git" #. type: Labeled list #: en/cmds-purehelpers.txt:49 @@ -1669,8 +1796,9 @@ msgstr "linkgit:git-stripspace[1]" #. type: Plain text #: en/cmds-purehelpers.txt:51 +#, fuzzy msgid "Remove unnecessary whitespace." -msgstr "" +msgstr "叫畇逵剋筠戟龜筠 戟筠戟�菌戟�� 極�棘閨筠剋棘勻" #. type: Labeled list #: en/cmds-synchelpers.txt:1 @@ -1680,8 +1808,9 @@ msgstr "linkgit:git-http-fetch[1]" #. type: Plain text #: en/cmds-synchelpers.txt:3 +#, fuzzy msgid "Download from a remote Git repository via HTTP." -msgstr "" +msgstr "�逵均��鈞克逵 龜鈞 勻戟筠�戟筠均棘 �筠極棘鈞龜�棘�龜� Git � 極棘劇棘��� HTTP" #. type: Labeled list #: en/cmds-synchelpers.txt:4 @@ -1691,8 +1820,9 @@ msgstr "linkgit:git-http-push[1]" #. type: Plain text #: en/cmds-synchelpers.txt:6 +#, fuzzy msgid "Push objects over HTTP/DAV to another repository." -msgstr "" +msgstr "��極�逵勻克逵 棘閨�筠克�棘勻 勻 畇��均棘橘 �筠極棘鈞龜�棘�龜橘 � 極棘劇棘��� HTTP/DAV" #. type: Labeled list #: en/cmds-synchelpers.txt:7 @@ -1702,8 +1832,9 @@ msgstr "linkgit:git-parse-remote[1]" #. type: Plain text #: en/cmds-synchelpers.txt:9 +#, fuzzy msgid "Routines to help parsing remote repository access parameters." -msgstr "" +msgstr "�棘畇極�棘均�逵劇劇� 畇剋� 極棘劇棘�龜 �逵鈞閨棘�逵 極逵�逵劇筠��棘勻 畇棘���極逵 勻戟筠�戟筠均棘 �筠極棘鈞龜�棘�龜�" #. type: Labeled list #: en/cmds-synchelpers.txt:10 @@ -1713,8 +1844,9 @@ msgstr "linkgit:git-receive-pack[1]" #. type: Plain text #: en/cmds-synchelpers.txt:12 +#, fuzzy msgid "Receive what is pushed into the repository." -msgstr "" +msgstr "�棘剋��筠戟龜筠 �棘均棘, ��棘 閨�剋棘 棘�極�逵勻剋筠戟棘 勻 �筠極棘鈞龜�棘�龜橘" #. type: Labeled list #: en/cmds-synchelpers.txt:13 @@ -1724,8 +1856,9 @@ msgstr "linkgit:git-shell[1]" #. type: Plain text #: en/cmds-synchelpers.txt:15 +#, fuzzy msgid "Restricted login shell for Git-only SSH access." -msgstr "" +msgstr "�均�逵戟龜�筠戟戟逵� 棘閨棘剋棘�克逵 勻�棘畇逵 勻 �龜��筠劇� 畇剋� 畇棘���極逵 Git �筠�筠鈞 SSH" #. type: Labeled list #: en/cmds-synchelpers.txt:16 @@ -1735,8 +1868,9 @@ msgstr "linkgit:git-upload-archive[1]" #. type: Plain text #: en/cmds-synchelpers.txt:18 +#, fuzzy msgid "Send archive back to git-archive." -msgstr "" +msgstr "��極�逵勻克逵 逵��龜勻逵 棘閨�逵�戟棘 勻 git-archive" #. type: Labeled list #: en/cmds-synchelpers.txt:19 @@ -1746,8 +1880,9 @@ msgstr "linkgit:git-upload-pack[1]" #. type: Plain text #: en/cmds-synchelpers.txt:21 +#, fuzzy msgid "Send objects packed back to git-fetch-pack." -msgstr "" +msgstr "��極�逵勻克逵 �極逵克棘勻逵戟戟�� 棘閨�筠克�棘勻 棘閨�逵�戟棘 勻 git-fetch-pack" #. type: Labeled list #: en/cmds-synchingrepositories.txt:1 @@ -1757,8 +1892,9 @@ msgstr "linkgit:git-daemon[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:3 +#, fuzzy msgid "A really simple server for Git repositories." -msgstr "" +msgstr "��筠戟� 極�棘��棘橘 �筠�勻筠� 畇剋� Git �筠極棘鈞龜�棘�龜筠勻" #. type: Labeled list #: en/cmds-synchingrepositories.txt:4 @@ -1768,8 +1904,9 @@ msgstr "linkgit:git-fetch-pack[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:6 +#, fuzzy msgid "Receive missing objects from another repository." -msgstr "" +msgstr "�棘剋��筠戟龜筠 戟筠畇棘��逵��龜� 棘閨�筠克�棘勻 龜鈞 畇��均棘均棘 �筠極棘鈞龜�棘�龜�" #. type: Labeled list #: en/cmds-synchingrepositories.txt:7 @@ -1779,8 +1916,9 @@ msgstr "linkgit:git-http-backend[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:9 +#, fuzzy msgid "Server side implementation of Git over HTTP." -msgstr "" +msgstr "鬼筠�勻筠�戟逵� �筠逵剋龜鈞逵�龜� 極�棘�棘克棘剋逵 Git 戟逵畇 HTTP" #. type: Labeled list #: en/cmds-synchingrepositories.txt:10 @@ -1790,8 +1928,9 @@ msgstr "linkgit:git-send-pack[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:12 +#, fuzzy msgid "Push objects over Git protocol to another repository." -msgstr "" +msgstr "��極�逵勻克逵 棘閨�筠克�棘勻 勻 畇��均棘橘 �筠極棘鈞龜�棘�龜橘 � 極棘劇棘��� 極�棘�棘克棘剋逵 Git" #. type: Labeled list #: en/cmds-synchingrepositories.txt:13 @@ -1801,8 +1940,9 @@ msgstr "linkgit:git-update-server-info[1]" #. type: Plain text #: en/cmds-synchingrepositories.txt:15 +#, fuzzy msgid "Update auxiliary info file to help dumb servers." -msgstr "" +msgstr "�閨戟棘勻剋筠戟龜筠 �逵橘剋逵 �棘 勻�極棘劇棘均逵�筠剋�戟棘橘 龜戟�棘�劇逵�龜筠橘 畇剋� 均剋�極�� �筠�勻筠�棘勻" #. type: Title - #: en/config.txt:2 en/git-worktree.txt:237 @@ -1963,9 +2103,9 @@ msgstr "" #. type: Labeled list #: en/config.txt:143 -#, no-wrap +#, fuzzy, no-wrap msgid "`gitdir/i`" -msgstr "" +msgstr "`gitdir`" #. type: Plain text #: en/config.txt:146 @@ -3537,9 +3677,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:311 en/merge-strategies.txt:61 -#, no-wrap +#, fuzzy, no-wrap msgid "ignore-space-at-eol" -msgstr "" +msgstr "--ignore-space-at-eol" #. type: Plain text #: en/diff-options.txt:313 en/diff-options.txt:645 @@ -3548,9 +3688,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:313 en/merge-strategies.txt:59 -#, no-wrap +#, fuzzy, no-wrap msgid "ignore-space-change" -msgstr "" +msgstr "--ignore-space-change" #. type: Plain text #: en/diff-options.txt:317 en/diff-options.txt:651 @@ -3559,9 +3699,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:317 en/merge-strategies.txt:60 -#, no-wrap +#, fuzzy, no-wrap msgid "ignore-all-space" -msgstr "" +msgstr "--ignore-all-space" #. type: Plain text #: en/diff-options.txt:320 @@ -3613,9 +3753,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:345 -#, no-wrap +#, fuzzy, no-wrap msgid "porcelain" -msgstr "" +msgstr "--porcelain" #. type: Plain text #: en/diff-options.txt:352 @@ -3624,9 +3764,9 @@ msgstr "" #. type: Labeled list #: en/diff-options.txt:352 en/git-daemon.txt:131 en/git-submodule.txt:162 -#, no-wrap +#, fuzzy, no-wrap msgid "none" -msgstr "" +msgstr "均棘�棘勻棘" #. type: Plain text #: en/diff-options.txt:354 @@ -4463,8 +4603,9 @@ msgstr "--keep" #. type: Plain text #: en/fetch-options.txt:85 +#, fuzzy msgid "Keep downloaded pack." -msgstr "" +msgstr "棘��逵勻龜�� 鈞逵均��菌筠戟戟�橘 極逵克筠� 畇逵戟戟��" #. type: Labeled list #: en/fetch-options.txt:87 @@ -4657,8 +4798,9 @@ msgstr "--verbose" #. type: Plain text #: en/fetch-options.txt:207 en/git-add.txt:76 en/git-imap-send.txt:35 en/merge-options.txt:128 +#, fuzzy msgid "Be verbose." -msgstr "" +msgstr "閨��� 劇戟棘均棘�剋棘勻戟筠筠" #. type: Labeled list #: en/fetch-options.txt:209 en/git-clone.txt:128 en/git-format-patch.txt:321 en/git-pack-objects.txt:151 en/git-prune.txt:45 en/git-push.txt:371 en/git-submodule.txt:247 en/merge-options.txt:129 @@ -4820,8 +4962,9 @@ msgstr "" #. type: Plain text #: en/git-add.txt:80 +#, fuzzy msgid "Allow adding otherwise ignored files." -msgstr "" +msgstr "�逵鈞�筠�龜�� 畇棘閨逵勻剋筠戟龜筠 龜均戟棘�龜��筠劇�� 龜戟逵�筠 �逵橘剋棘勻" #. type: Labeled list #: en/git-add.txt:81 en/git-am.txt:122 en/git-branch.txt:137 en/git-clean.txt:42 en/git-commit.txt:260 en/git-cvsimport.txt:88 en/git-grep.txt:112 en/git-help.txt:64 en/git-ls-files.txt:51 en/git-read-tree.txt:48 en/git-rebase.txt:389 en/git-repack.txt:163 en/git-tag.txt:123 en/rev-list-options.txt:73 @@ -5113,9 +5256,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:252 -#, no-wrap +#, fuzzy, no-wrap msgid "status" -msgstr "" +msgstr "--status" #. type: Plain text #: en/git-add.txt:259 @@ -5138,9 +5281,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:276 en/git-update-ref.txt:94 -#, no-wrap +#, fuzzy, no-wrap msgid "update" -msgstr "" +msgstr "--update" #. type: Plain text #: en/git-add.txt:285 @@ -5181,7 +5324,7 @@ msgstr "" #: en/git-add.txt:305 #, no-wrap msgid "revert" -msgstr "" +msgstr "棘閨�逵�龜�� 龜鈞劇筠戟筠戟龜�" #. type: Plain text #: en/git-add.txt:310 @@ -5190,9 +5333,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:311 -#, no-wrap +#, fuzzy, no-wrap msgid "add untracked" -msgstr "" +msgstr "�棘閨逵勻龜�� 戟筠棘��剋筠菌龜勻逵筠劇�橘" #. type: Plain text #: en/git-add.txt:315 @@ -5201,9 +5344,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:316 -#, no-wrap +#, fuzzy, no-wrap msgid "patch" -msgstr "" +msgstr "極���" #. type: Plain text #: en/git-add.txt:323 @@ -5286,9 +5429,9 @@ msgstr "" #. type: Labeled list #: en/git-add.txt:374 -#, no-wrap +#, fuzzy, no-wrap msgid "modified content" -msgstr "" +msgstr "龜鈞劇筠戟筠戟棘 �棘畇筠�菌龜劇棘筠, " #. type: Plain text #: en/git-add.txt:381 @@ -5389,8 +5532,9 @@ msgstr "git-am(1)" #. type: Plain text #: en/git-am.txt:7 +#, fuzzy msgid "git-am - Apply a series of patches from a mailbox" -msgstr "" +msgstr "��龜劇筠戟筠戟龜筠 �筠�龜龜 極逵��筠橘 龜鈞 極棘��棘勻棘均棘 �棘棘閨�筠戟龜�" #. type: Plain text #: en/git-am.txt:20 @@ -5640,8 +5784,9 @@ msgstr "" #. type: Plain text #: en/git-am.txt:125 +#, fuzzy msgid "Run interactively." -msgstr "" +msgstr "鈞逵極���龜�� 勻 龜戟�筠�逵克�龜勻戟棘劇 �筠菌龜劇筠" #. type: Plain text #: en/git-am.txt:126 en/git-rebase.txt:375 en/git-rebase.txt:515 @@ -5735,8 +5880,9 @@ msgstr "--abort" #. type: Plain text #: en/git-am.txt:169 +#, fuzzy msgid "Restore the original branch and abort the patching operation." -msgstr "" +msgstr "勻棘���逵戟棘勻龜�� 棘�龜均龜戟逵剋�戟�� 勻筠�克� 龜 棘�劇筠戟龜�� 棘極筠�逵�龜� 極�龜劇筠戟筠戟龜� 龜鈞劇筠戟筠戟龜橘." #. type: Labeled list #: en/git-am.txt:170 en/git-rebase.txt:238 en/sequencer.txt:6 @@ -5844,8 +5990,9 @@ msgstr "" #. type: Plain text #: en/git-am.txt:237 +#, fuzzy msgid "linkgit:git-apply[1]." -msgstr "" +msgstr "linkgit:git-apply[1]" #. type: Title = #: en/git-annotate.txt:2 @@ -5882,8 +6029,9 @@ msgstr "git-apply(1)" #. type: Plain text #: en/git-apply.txt:7 +#, fuzzy msgid "git-apply - Apply a patch to files and/or to the index" -msgstr "" +msgstr "��龜劇筠戟筠戟龜筠 極逵��逵 克 �逵橘剋逵劇 龜/龜剋龜 龜戟畇筠克��" #. type: Plain text #: en/git-apply.txt:20 @@ -6002,8 +6150,9 @@ msgstr "--reverse" #. type: Plain text #: en/git-apply.txt:107 +#, fuzzy msgid "Apply the patch in reverse." -msgstr "" +msgstr "極�龜劇筠戟龜�� 極逵�� � 棘閨�逵�筠戟龜筠劇 龜鈞劇筠戟筠戟龜橘" #. type: Plain text #: en/git-apply.txt:114 @@ -6256,8 +6405,9 @@ msgstr "" #. type: Plain text #: en/git-apply.txt:282 +#, fuzzy msgid "linkgit:git-am[1]." -msgstr "" +msgstr "linkgit:git-am[1]" #. type: Title = #: en/git-archimport.txt:2 @@ -6412,8 +6562,9 @@ msgstr "git-archive(1)" #. type: Plain text #: en/git-archive.txt:7 +#, fuzzy msgid "git-archive - Create an archive of files from a named tree" -msgstr "" +msgstr "鬼棘鈞畇逵戟龜筠 逵��龜勻逵 �逵橘剋棘勻 龜鈞 �克逵鈞逵戟戟棘均棘 畇筠�筠勻逵" #. type: Plain text #: en/git-archive.txt:16 @@ -6470,8 +6621,9 @@ msgstr "" #. type: Plain text #: en/git-archive.txt:53 +#, fuzzy msgid "Prepend <prefix>/ to each filename in the archive." -msgstr "" +msgstr "畇棘閨逵勻剋��� 極�筠�龜克� 極筠�筠畇 克逵菌畇�劇 極��筠劇 �逵橘剋逵 勻 逵��龜勻筠" #. type: Labeled list #: en/git-archive.txt:54 @@ -6536,9 +6688,9 @@ msgstr "" #. type: Labeled list #: en/git-archive.txt:77 en/git-checkout.txt:305 en/git-diff-index.txt:26 en/git-diff-tree.txt:29 en/git-ls-tree.txt:38 en/git.txt:315 -#, no-wrap +#, fuzzy, no-wrap msgid "<tree-ish>" -msgstr "" +msgstr "�克逵鈞逵�筠剋�-畇筠�筠勻逵" #. type: Plain text #: en/git-archive.txt:79 @@ -6763,8 +6915,9 @@ msgstr "git-bisect(1)" #. type: Plain text #: en/git-bisect.txt:7 +#, fuzzy msgid "git-bisect - Use binary search to find the commit that introduced a bug" -msgstr "" +msgstr "��極棘剋戟筠戟龜筠 畇勻棘龜�戟棘均棘 極棘龜�克逵 克棘劇劇龜�逵, 克棘�棘��橘 勻戟棘�龜� 棘�龜閨克�" #. type: Plain text #: en/git-bisect.txt:13 @@ -7461,8 +7614,9 @@ msgstr "git-blame(1)" #. type: Plain text #: en/git-blame.txt:7 +#, fuzzy msgid "git-blame - Show what revision and author last modified each line of a file" -msgstr "" +msgstr "�棘克逵鈞 �筠畇逵克�龜龜 龜 逵勻�棘�逵 極棘�剋筠畇戟筠均棘 龜鈞劇筠戟龜勻�筠均棘 克逵菌畇�� ���棘克� �逵橘剋逵" #. type: Plain text #: en/git-blame.txt:15 @@ -7510,8 +7664,9 @@ msgstr "" #. type: Plain text #: en/git-blame.txt:54 +#, fuzzy msgid "Use the same output mode as linkgit:git-annotate[1] (Default: off)." -msgstr "" +msgstr "��極棘剋�鈞棘勻逵�� �逵克棘橘 菌筠 �棘�劇逵� 勻�勻棘畇逵, 克逵克 龜 git-annotate (�棘 �劇棘剋�逵戟龜�: 棘�克剋��筠戟棘)" #. type: Labeled list #: en/git-blame.txt:55 @@ -7968,8 +8123,9 @@ msgstr "--ignore-case" #. type: Plain text #: en/git-branch.txt:140 +#, fuzzy msgid "Sorting and filtering branches are case insensitive." -msgstr "" +msgstr "�棘��龜�棘勻克逵 龜 �龜剋���逵�龜� 戟筠 鈞逵勻龜��� 棘� �筠均龜���逵" #. type: Labeled list #: en/git-branch.txt:141 en/git-status.txt:126 en/git-tag.txt:127 @@ -8006,8 +8162,9 @@ msgstr "" #. type: Plain text #: en/git-branch.txt:156 +#, fuzzy msgid "List both remote-tracking branches and local branches." -msgstr "" +msgstr "極棘克逵鈞逵�� �極龜�棘克 龜 棘��剋筠菌龜勻逵筠劇�� 龜 剋棘克逵剋�戟�� 勻筠�棘克" #. type: Plain text #: en/git-branch.txt:162 @@ -8208,9 +8365,9 @@ msgstr "" #. type: Labeled list #: en/git-branch.txt:257 -#, no-wrap +#, fuzzy, no-wrap msgid "<newbranch>" -msgstr "" +msgstr "[戟棘勻逵� 勻筠�克逵]" #. type: Plain text #: en/git-branch.txt:260 @@ -8611,8 +8768,9 @@ msgstr "git-cat-file(1)" #. type: Plain text #: en/git-cat-file.txt:7 +#, fuzzy msgid "git-cat-file - Provide content or type and size information for repository objects" -msgstr "" +msgstr "��勻棘畇 �棘畇筠�菌龜劇棘均棘 龜剋龜 �龜極逵 龜 龜戟�棘�劇逵�龜龜 棘 �逵鈞劇筠�筠 畇剋� 棘閨�筠克�棘勻 �筠極棘鈞龜�棘�龜�" #. type: Plain text #: en/git-cat-file.txt:14 @@ -8634,9 +8792,9 @@ msgstr "" #. type: Labeled list #: en/git-cat-file.txt:31 en/git-fsck.txt:23 en/git-tag.txt:203 en/git.txt:303 -#, no-wrap +#, fuzzy, no-wrap msgid "<object>" -msgstr "" +msgstr "棘閨�筠克�" #. type: Plain text #: en/git-cat-file.txt:35 @@ -8709,9 +8867,9 @@ msgstr "--batch" #. type: Labeled list #: en/git-cat-file.txt:78 -#, no-wrap +#, fuzzy, no-wrap msgid "--batch=<format>" -msgstr "" +msgstr "--patch-format" #. type: Plain text #: en/git-cat-file.txt:84 @@ -9331,8 +9489,9 @@ msgstr "" #. type: Plain text #: en/git-check-attr.txt:117 +#, fuzzy msgid "linkgit:gitattributes[5]." -msgstr "" +msgstr "linkgit:gitattributes[5]" #. type: Title = #: en/git-check-ignore.txt:2 @@ -9505,9 +9664,9 @@ msgstr "" #. type: Plain text #: en/git-check-mailmap.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git check-mailmap' [<options>] <contact>...\n" -msgstr "" +msgstr "git check-mailmap [<棘極�龜龜>] <克棘戟�逵克�>��" #. type: Plain text #: en/git-check-mailmap.txt:22 @@ -9563,8 +9722,9 @@ msgstr "" #. type: Plain text #: en/git-checkout-index.txt:37 +#, fuzzy msgid "forces overwrite of existing files" -msgstr "" +msgstr "極�龜戟�畇龜�筠剋�戟逵� 極筠�筠鈞逵極龜�� ���筠��勻���龜� �逵橘剋棘勻" #. type: Plain text #: en/git-checkout-index.txt:42 @@ -9777,8 +9937,9 @@ msgstr "git-checkout(1)" #. type: Plain text #: en/git-checkout.txt:7 +#, fuzzy msgid "git-checkout - Switch branches or restore working tree files" -msgstr "" +msgstr "�筠�筠克剋��筠戟龜筠 勻筠�棘克 龜剋龜 勻棘���逵戟棘勻剋筠戟龜筠 �逵橘剋棘勻 勻 �逵閨棘�筠劇 克逵�逵剋棘均筠" #. type: Plain text #: en/git-checkout.txt:18 @@ -10124,7 +10285,7 @@ msgstr "" #: en/git-checkout.txt:283 en/git-rebase.txt:225 #, no-wrap msgid "<branch>" -msgstr "" +msgstr "<勻筠�克逵>" #. type: Plain text #: en/git-checkout.txt:289 @@ -10143,9 +10304,9 @@ msgstr "" #. type: Labeled list #: en/git-checkout.txt:298 -#, no-wrap +#, fuzzy, no-wrap msgid "<new_branch>" -msgstr "" +msgstr "戟棘勻逵�-勻筠�克逵" #. type: Plain text #: en/git-checkout.txt:300 @@ -10755,9 +10916,9 @@ msgstr "" #. type: Labeled list #: en/git-cherry-pick.txt:79 en/git-revert.txt:49 -#, no-wrap +#, fuzzy, no-wrap msgid "-m parent-number" -msgstr "" +msgstr "戟棘劇筠�-�棘畇龜�筠剋�" #. type: Labeled list #: en/git-cherry-pick.txt:80 en/git-revert.txt:50 @@ -11001,14 +11162,15 @@ msgstr "git-cherry(1)" #. type: Plain text #: en/git-cherry.txt:7 +#, fuzzy msgid "git-cherry - Find commits yet to be applied to upstream" -msgstr "" +msgstr "�棘龜�克 克棘劇劇龜�棘勻 克棘�棘��筠 筠�筠 戟筠 極�龜劇筠戟筠戟� 勻��筠��棘��龜劇 �筠極棘鈞龜�棘�龜筠劇" #. type: Plain text #: en/git-cherry.txt:12 -#, no-wrap +#, fuzzy, no-wrap msgid "'git cherry' [-v] [<upstream> [<head> [<limit>]]]\n" -msgstr "" +msgstr "git cherry [-v] [<勻��筠��棘��逵�-勻筠�克逵> [<�筠畇逵克�龜�> [<棘均�逵戟龜�筠戟龜筠>]]]" #. type: Plain text #: en/git-cherry.txt:17 @@ -11032,9 +11194,9 @@ msgstr "" #. type: Labeled list #: en/git-cherry.txt:32 en/git-rebase.txt:220 -#, no-wrap +#, fuzzy, no-wrap msgid "<upstream>" -msgstr "" +msgstr "勻��筠��棘��逵�" #. type: Plain text #: en/git-cherry.txt:35 @@ -11220,14 +11382,15 @@ msgstr "git-clean(1)" #. type: Plain text #: en/git-clean.txt:7 +#, fuzzy msgid "git-clean - Remove untracked files from the working tree" -msgstr "" +msgstr "叫畇逵剋筠戟龜筠 戟筠棘��剋筠菌龜勻逵筠劇�� �逵橘剋棘勻 龜鈞 �逵閨棘�筠均棘 克逵�逵剋棘均逵" #. type: Plain text #: en/git-clean.txt:12 -#, no-wrap +#, fuzzy, no-wrap msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...\n" -msgstr "" +msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <�逵閨剋棘戟>] [-x | -X] [--] <極��龜>��" #. type: Plain text #: en/git-clean.txt:18 @@ -11379,9 +11542,9 @@ msgstr "" #. type: Labeled list #: en/git-clean.txt:127 -#, no-wrap +#, fuzzy, no-wrap msgid "quit" -msgstr "" +msgstr "�龜�龜橘 �筠菌龜劇" #. type: Plain text #: en/git-clean.txt:130 @@ -11413,8 +11576,9 @@ msgstr "git-clone(1)" #. type: Plain text #: en/git-clone.txt:7 +#, fuzzy msgid "git-clone - Clone a repository into a new directory" -msgstr "" +msgstr "�剋棘戟龜�棘勻逵戟龜筠 �筠極棘鈞龜�棘�龜� 勻 戟棘勻�橘 克逵�逵剋棘均" #. type: Plain text #: en/git-clone.txt:19 @@ -11751,9 +11915,9 @@ msgstr "" #. type: Labeled list #: en/git-clone.txt:267 en/git-fetch-pack.txt:114 en/git-ls-remote.txt:81 en/git-push.txt:50 en/pull-fetch-param.txt:1 -#, no-wrap +#, fuzzy, no-wrap msgid "<repository>" -msgstr "" +msgstr "�筠極棘鈞龜�棘�龜橘" #. type: Plain text #: en/git-clone.txt:271 @@ -12463,9 +12627,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:200 -#, no-wrap +#, fuzzy, no-wrap msgid "whitespace" -msgstr "" +msgstr "--whitespace" #. type: Plain text #: en/git-commit.txt:202 @@ -12485,9 +12649,9 @@ msgstr "" #. type: Labeled list #: en/git-commit.txt:204 -#, no-wrap +#, fuzzy, no-wrap msgid "scissors" -msgstr "" +msgstr "--scissors" #. type: Plain text #: en/git-commit.txt:208 @@ -12569,8 +12733,9 @@ msgstr "--no-post-rewrite" #. type: Plain text #: en/git-commit.txt:259 +#, fuzzy msgid "Bypass the post-rewrite hook." -msgstr "" +msgstr "極�棘極���龜�� 極筠�筠�勻逵��龜克 post-rewrite" #. type: Labeled list #: en/git-commit.txt:261 @@ -12608,8 +12773,9 @@ msgstr "" #. type: Plain text #: en/git-commit.txt:284 en/git-status.txt:61 +#, fuzzy msgid "Show untracked files." -msgstr "" +msgstr "�筠� 戟筠棘��剋筠菌龜勻逵筠劇�� �逵橘剋棘勻.\n" #. type: Plain text #: en/git-commit.txt:288 @@ -12838,8 +13004,9 @@ msgstr "git-config(1)" #. type: Plain text #: en/git-config.txt:7 +#, fuzzy msgid "git-config - Get and set repository or global options" -msgstr "" +msgstr "�棘剋��筠戟龜筠 龜 ���逵戟棘勻克逵 均剋棘閨逵剋�戟�� 棘極�龜橘 龜剋龜 棘極�龜橘 �筠極棘鈞龜�棘�龜�" #. type: Plain text #: en/git-config.txt:27 @@ -13686,9 +13853,9 @@ msgstr "" #. type: Plain text #: en/git-count-objects.txt:12 -#, no-wrap +#, fuzzy, no-wrap msgid "'git count-objects' [-v] [-H | --human-readable]\n" -msgstr "" +msgstr "git count-objects [-v] [-H | --human-readable]" #. type: Plain text #: en/git-count-objects.txt:17 @@ -13754,8 +13921,9 @@ msgstr "--human-readable" #. type: Plain text #: en/git-count-objects.txt:51 +#, fuzzy msgid "Print sizes in human readable format" -msgstr "" +msgstr "勻�勻棘畇 �逵鈞劇筠�棘勻 勻 �畇棘閨棘�龜�逵筠劇棘劇 畇剋� �筠剋棘勻筠克逵 勻龜畇筠" #. type: Title = #: en/git-credential-cache--daemon.txt:2 @@ -14311,8 +14479,9 @@ msgstr "" #. type: Plain text #: en/git-cvsexportcommit.txt:84 +#, fuzzy msgid "Verbose." -msgstr "" +msgstr "閨��� 劇戟棘均棘�剋棘勻戟筠筠" #. type: Labeled list #: en/git-cvsexportcommit.txt:87 @@ -14376,8 +14545,9 @@ msgstr "git-cvsimport(1)" #. type: Plain text #: en/git-cvsimport.txt:7 +#, fuzzy msgid "git-cvsimport - Salvage your data out of another SCM people love to hate" -msgstr "" +msgstr "鬼極逵�筠戟龜筠 勻逵�龜� 畇逵戟戟�� 龜鈞 畇��均棘橘 鬼�� 克棘�棘��� 剋�畇龜 剋�閨�� 戟筠戟逵勻龜畇筠��" #. type: Plain text #: en/git-cvsimport.txt:17 @@ -15414,8 +15584,9 @@ msgstr "git-daemon(1)" #. type: Plain text #: en/git-daemon.txt:7 +#, fuzzy msgid "git-daemon - A really simple server for Git repositories" -msgstr "" +msgstr "��筠戟� 極�棘��棘橘 �筠�勻筠� 畇剋� Git �筠極棘鈞龜�棘�龜筠勻" #. type: Plain text #: en/git-daemon.txt:25 @@ -15606,9 +15777,9 @@ msgstr "" #. type: Labeled list #: en/git-daemon.txt:129 -#, no-wrap +#, fuzzy, no-wrap msgid "syslog" -msgstr "" +msgstr "--syslog" #. type: Plain text #: en/git-daemon.txt:131 @@ -15932,8 +16103,9 @@ msgstr "git-describe(1)" #. type: Plain text #: en/git-describe.txt:7 +#, fuzzy msgid "git-describe - Give an object a human readable name based on an available ref" -msgstr "" +msgstr "��龜�勻棘筠戟龜筠 棘閨�筠克�� �畇棘閨棘�龜�逵筠劇棘筠 龜劇� 戟逵 棘�戟棘勻筠 畇棘���極戟棘橘 ���剋克龜" #. type: Plain text #: en/git-describe.txt:14 @@ -16053,9 +16225,9 @@ msgstr "" #. type: Labeled list #: en/git-describe.txt:96 -#, no-wrap +#, fuzzy, no-wrap msgid "--match <pattern>" -msgstr "" +msgstr "極棘龜�克 �棘棘�勻筠���勻龜橘 � <�逵閨剋棘戟棘劇>" #. type: Plain text #: en/git-describe.txt:105 @@ -16081,8 +16253,9 @@ msgstr "--always" #. type: Plain text #: en/git-describe.txt:120 en/git-name-rev.txt:63 +#, fuzzy msgid "Show uniquely abbreviated commit object as fallback." -msgstr "" +msgstr "筠�剋龜 戟筠 戟逵橘畇筠戟棘, 極棘克逵鈞逵�� �棘克�逵�筠戟戟�橘 戟棘劇筠� �筠畇逵克�龜龜 克棘劇劇龜�逵" #. type: Labeled list #: en/git-describe.txt:121 en/rev-list-options.txt:124 @@ -16434,9 +16607,9 @@ msgstr "" #. type: Plain text #: en/git-difftool.txt:12 -#, no-wrap +#, fuzzy, no-wrap msgid "'git difftool' [<options>] [<commit> [<commit>]] [--] [<path>...]\n" -msgstr "" +msgstr "git difftool [<棘極�龜龜>] [<克棘劇劇龜�> [<克棘劇劇龜�>]] [--] [<極���>��]" #. type: Plain text #: en/git-difftool.txt:19 @@ -16468,8 +16641,9 @@ msgstr "--no-prompt" #. type: Plain text #: en/git-difftool.txt:31 +#, fuzzy msgid "Do not prompt before launching a diff tool." -msgstr "" +msgstr "戟筠 �極�逵�龜勻逵�� 極筠�筠畇 鈞逵極��克棘劇 ��龜剋龜�� ��逵勻戟筠戟龜�" #. type: Labeled list #: en/git-difftool.txt:32 en/git-mergetool.txt:78 @@ -16527,8 +16701,9 @@ msgstr "--tool-help" #. type: Plain text #: en/git-difftool.txt:71 +#, fuzzy msgid "Print a list of diff tools that may be used with `--tool`." -msgstr "" +msgstr "勻�勻筠��龜 �極龜�棘克 ��龜剋龜�, 克棘�棘��筠 劇棘菌戟棘 龜�極棘剋�鈞棘勻逵�� � 極逵�逵劇筠��棘劇 짬--tool쨩" #. type: Labeled list #: en/git-difftool.txt:72 @@ -16691,17 +16866,17 @@ msgstr "" #. type: Plain text #: en/git-difftool.txt:138 msgid "Show changes between commits, commit and working tree, etc" -msgstr "" +msgstr "��勻棘畇 �逵鈞戟龜�� 劇筠菌畇� 克棘劇劇龜�逵劇龜, 克棘劇劇龜�棘劇 龜 �逵閨棘�龜劇 克逵�逵剋棘均棘劇 龜 �.畇." #. type: Plain text #: en/git-difftool.txt:141 msgid "Run merge conflict resolution tools to resolve merge conflicts" -msgstr "" +msgstr "�逵極��克 龜戟����劇筠戟�棘勻 �逵鈞�筠�筠戟龜� 克棘戟�剋龜克�棘勻 �剋龜�戟龜�" #. type: Plain text #: en/git-difftool.txt:144 msgid "Get and set repository or global options" -msgstr "" +msgstr "�棘剋��筠戟龜筠 龜 ���逵戟棘勻克逵 均剋棘閨逵剋�戟�� 棘極�龜橘 龜剋龜 棘極�龜橘 �筠極棘鈞龜�棘�龜�" #. type: Title = #: en/git-diff-tree.txt:2 @@ -16711,8 +16886,9 @@ msgstr "git-diff-tree(1)" #. type: Plain text #: en/git-diff-tree.txt:7 +#, fuzzy msgid "git-diff-tree - Compares the content and mode of blobs found via two tree objects" -msgstr "" +msgstr "鬼�逵勻戟筠戟龜筠 �棘畇筠�菌龜劇棘均棘 龜 �筠菌龜劇逵 畇勻棘龜�戟�� 棘閨�筠克�棘勻, 戟逵橘畇筠戟戟�� 極棘 畇勻�劇 棘閨�筠克�逵劇 畇筠�筠勻逵" #. type: Plain text #: en/git-diff-tree.txt:15 @@ -16725,8 +16901,9 @@ msgstr "" #. type: Plain text #: en/git-diff-tree.txt:19 +#, fuzzy msgid "Compares the content and mode of the blobs found via two tree objects." -msgstr "" +msgstr "鬼�逵勻戟筠戟龜筠 �棘畇筠�菌龜劇棘均棘 龜 �筠菌龜劇逵 畇勻棘龜�戟�� 棘閨�筠克�棘勻, 戟逵橘畇筠戟戟�� 極棘 畇勻�劇 棘閨�筠克�逵劇 畇筠�筠勻逵" #. type: Plain text #: en/git-diff-tree.txt:22 @@ -16756,8 +16933,9 @@ msgstr "" #. type: Plain text #: en/git-diff-tree.txt:38 +#, fuzzy msgid "recurse into sub-trees" -msgstr "" +msgstr "極�棘�棘畇龜�� �筠克���龜勻戟棘 勻 極棘畇畇筠�筠勻��" #. type: Plain text #: en/git-diff-tree.txt:41 @@ -16838,8 +17016,9 @@ msgstr "git-diff(1)" #. type: Plain text #: en/git-diff.txt:7 +#, fuzzy msgid "git-diff - Show changes between commits, commit and working tree, etc" -msgstr "" +msgstr "��勻棘畇 �逵鈞戟龜�� 劇筠菌畇� 克棘劇劇龜�逵劇龜, 克棘劇劇龜�棘劇 龜 �逵閨棘�龜劇 克逵�逵剋棘均棘劇 龜 �.畇." #. type: Plain text #: en/git-diff.txt:17 @@ -16881,9 +17060,9 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:41 -#, no-wrap +#, fuzzy, no-wrap msgid "'git diff' [<options>] --cached [<commit>] [--] [<path>...]" -msgstr "" +msgstr "git difftool [<棘極�龜龜>] [<克棘劇劇龜�> [<克棘劇劇龜�>]] [--] [<極���>��]" #. type: Plain text #: en/git-diff.txt:50 @@ -16903,9 +17082,9 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:59 -#, no-wrap +#, fuzzy, no-wrap msgid "'git diff' [<options>] <commit> <commit> [--] [<path>...]" -msgstr "" +msgstr "git difftool [<棘極�龜龜>] [<克棘劇劇龜�> [<克棘劇劇龜�>]] [--] [<極���>��]" #. type: Plain text #: en/git-diff.txt:63 @@ -16914,9 +17093,9 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:64 -#, no-wrap +#, fuzzy, no-wrap msgid "'git diff' [<options>] <commit>..<commit> [--] [<path>...]" -msgstr "" +msgstr "git difftool [<棘極�龜龜>] [<克棘劇劇龜�> [<克棘劇劇龜�>]] [--] [<極���>��]" #. type: Plain text #: en/git-diff.txt:69 @@ -16925,9 +17104,9 @@ msgstr "" #. type: Labeled list #: en/git-diff.txt:70 -#, no-wrap +#, fuzzy, no-wrap msgid "'git diff' [<options>] <commit>\\...<commit> [--] [<path>...]" -msgstr "" +msgstr "git difftool [<棘極�龜龜>] [<克棘劇劇龜�> [<克棘劇劇龜�>]] [--] [<極���>��]" #. type: Plain text #: en/git-diff.txt:77 @@ -17622,8 +17801,9 @@ msgstr "fastimport.unpackLimit" #. type: Plain text #: en/git-fast-import.txt:142 +#, fuzzy msgid "See linkgit:git-config[1]" -msgstr "" +msgstr "linkgit:git-config[1]" #. type: Title - #: en/git-fast-import.txt:144 en/git-p4.txt:507 @@ -17822,9 +18002,9 @@ msgstr "" #. type: Title ~ #: en/git-fast-import.txt:314 -#, no-wrap +#, fuzzy, no-wrap msgid "Commands" -msgstr "" +msgstr "克棘劇逵戟畇逵" #. type: Plain text #: en/git-fast-import.txt:318 @@ -18876,15 +19056,15 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:1073 -#, no-wrap +#, fuzzy, no-wrap msgid "no-relative-marks" -msgstr "" +msgstr "--[no-]relative-marks" #. type: Plain text #: en/git-fast-import.txt:1074 en/git-fast-import.txt:1141 #, no-wrap msgid "force" -msgstr "" +msgstr "極�龜戟�畇龜�筠剋�戟棘" #. type: Plain text #: en/git-fast-import.txt:1078 @@ -18910,15 +19090,15 @@ msgstr "" #. type: Labeled list #: en/git-fast-import.txt:1089 -#, no-wrap +#, fuzzy, no-wrap msgid "get-mark" -msgstr "" +msgstr "`get-mark`" #. type: Labeled list #: en/git-fast-import.txt:1090 -#, no-wrap +#, fuzzy, no-wrap msgid "cat-blob" -msgstr "" +msgstr "`cat-blob`" #. type: Labeled list #: en/git-fast-import.txt:1091 @@ -18946,7 +19126,7 @@ msgstr "" #: en/git-fast-import.txt:1106 #, no-wrap msgid "done" -msgstr "" +msgstr "均棘�棘勻棘" #. type: Plain text #: en/git-fast-import.txt:1113 @@ -19610,8 +19790,9 @@ msgstr "git-fetch(1)" #. type: Plain text #: en/git-fetch.txt:7 +#, fuzzy msgid "git-fetch - Download objects and refs from another repository" -msgstr "" +msgstr "�逵均��鈞克逵 棘閨�筠克�棘勻 龜 ���剋棘克 龜鈞 畇��均棘均棘 �筠極棘鈞龜�棘�龜�" #. type: Plain text #: en/git-fetch.txt:16 @@ -19914,9 +20095,9 @@ msgstr "" #. type: Labeled list #: en/git-fetch.txt:221 en/git-push.txt:440 -#, no-wrap +#, fuzzy, no-wrap msgid "summary" -msgstr "" +msgstr "--summary" #. type: Plain text #: en/git-fetch.txt:226 @@ -19949,7 +20130,7 @@ msgstr "" #: en/git-fetch.txt:236 en/git-push.txt:477 #, no-wrap msgid "reason" -msgstr "" +msgstr "極�龜�龜戟逵" #. type: Plain text #: en/git-fetch.txt:240 @@ -19958,8 +20139,9 @@ msgstr "" #. type: Plain text #: en/git-fetch.txt:245 +#, fuzzy msgid "Update the remote-tracking branches:" -msgstr "" +msgstr "勻�極棘剋戟龜�� 畇筠橘��勻龜� 戟逵 棘��剋筠菌龜勻逵筠劇�� 勻戟筠�戟龜� 勻筠�克逵�" #. type: delimited block - #: en/git-fetch.txt:248 @@ -20839,8 +21021,9 @@ msgstr "" #. type: Plain text #: en/git-for-each-ref.txt:76 +#, fuzzy msgid "Only list refs which points at the given object." -msgstr "" +msgstr "勻�勻棘畇 �棘剋�克棘 ���剋棘克, 克棘�棘��筠 �克逵鈞�勻逵�� 戟逵 極筠�筠畇逵戟戟�橘 棘閨�筠克�" #. type: Labeled list #: en/git-for-each-ref.txt:77 @@ -20888,8 +21071,9 @@ msgstr "" #. type: Plain text #: en/git-for-each-ref.txt:97 +#, fuzzy msgid "Sorting and filtering refs are case insensitive." -msgstr "" +msgstr "�棘��龜�棘勻克逵 龜 �龜剋���逵�龜� 戟筠 鈞逵勻龜��� 棘� �筠均龜���逵" #. type: Title - #: en/git-for-each-ref.txt:99 @@ -20909,9 +21093,9 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:107 -#, no-wrap +#, fuzzy, no-wrap msgid "refname" -msgstr "" +msgstr "極筠�筠龜劇筠戟棘勻逵戟龜筠" #. type: Plain text #: en/git-for-each-ref.txt:123 @@ -20925,9 +21109,9 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:126 -#, no-wrap +#, fuzzy, no-wrap msgid "objecttype" -msgstr "" +msgstr "`objecttype`" #. type: Plain text #: en/git-for-each-ref.txt:128 @@ -20936,9 +21120,9 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:129 -#, no-wrap +#, fuzzy, no-wrap msgid "objectsize" -msgstr "" +msgstr "`objectsize`" #. type: Plain text #: en/git-for-each-ref.txt:133 @@ -20947,9 +21131,9 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:133 -#, no-wrap +#, fuzzy, no-wrap msgid "objectname" -msgstr "" +msgstr "`objectname`" #. type: Plain text #: en/git-for-each-ref.txt:139 @@ -20958,9 +21142,9 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:139 -#, no-wrap +#, fuzzy, no-wrap msgid "deltabase" -msgstr "" +msgstr "`deltabase`" #. type: Plain text #: en/git-for-each-ref.txt:143 @@ -20971,7 +21155,7 @@ msgstr "" #: en/git-for-each-ref.txt:144 #, no-wrap msgid "upstream" -msgstr "" +msgstr "勻��筠��棘��逵�" #. type: Plain text #: en/git-for-each-ref.txt:154 @@ -21039,9 +21223,9 @@ msgstr "" #. type: Labeled list #: en/git-for-each-ref.txt:211 -#, no-wrap +#, fuzzy, no-wrap msgid "symref" -msgstr "" +msgstr "--symref" #. type: Plain text #: en/git-for-each-ref.txt:216 @@ -21391,8 +21575,9 @@ msgstr "" #. type: Plain text #: en/git-format-patch.txt:106 +#, fuzzy msgid "Start numbering the patches at <n> instead of 1." -msgstr "" +msgstr "戟逵�逵�� 戟�劇筠�逵�龜� 極逵��筠橘 � <n>, 逵 戟筠 � 1" #. type: Labeled list #: en/git-format-patch.txt:107 @@ -22280,8 +22465,9 @@ msgstr "git-fsck-objects(1)" #. type: Plain text #: en/git-fsck-objects.txt:7 +#, fuzzy msgid "git-fsck-objects - Verifies the connectivity and validity of the objects in the database" -msgstr "" +msgstr "��棘勻筠�克逵 �勻�鈞戟棘��龜 龜 勻逵剋龜畇戟棘��龜 棘閨�筠克�棘勻 勻 閨逵鈞筠 畇逵戟戟��" #. type: Plain text #: en/git-fsck-objects.txt:13 @@ -22302,8 +22488,9 @@ msgstr "git-fsck(1)" #. type: Plain text #: en/git-fsck.txt:7 +#, fuzzy msgid "git-fsck - Verifies the connectivity and validity of the objects in the database" -msgstr "" +msgstr "��棘勻筠�克逵 �勻�鈞戟棘��龜 龜 勻逵剋龜畇戟棘��龜 棘閨�筠克�棘勻 勻 閨逵鈞筠 畇逵戟戟��" #. type: Plain text #: en/git-fsck.txt:16 @@ -22349,13 +22536,15 @@ msgstr "" #. type: Plain text #: en/git-fsck.txt:40 +#, fuzzy msgid "Report root nodes." -msgstr "" +msgstr "勻�勻筠��龜 棘��筠� 極棘 克棘�戟筠勻�劇 �鈞剋逵劇" #. type: Plain text #: en/git-fsck.txt:43 +#, fuzzy msgid "Report tags." -msgstr "" +msgstr "勻�勻筠��龜 棘��筠� 極棘 劇筠�克逵劇" #. type: Labeled list #: en/git-fsck.txt:44 @@ -22578,8 +22767,9 @@ msgstr "git-gc(1)" #. type: Plain text #: en/git-gc.txt:7 +#, fuzzy msgid "git-gc - Cleanup unnecessary files and optimize the local repository" -msgstr "" +msgstr "��龜��克逵 戟筠戟�菌戟�� �逵橘剋棘勻 龜 棘極�龜劇龜鈞逵�龜� 剋棘克逵剋�戟棘均棘 �筠極棘鈞龜�棘�龜�" #. type: Plain text #: en/git-gc.txt:13 @@ -22801,9 +22991,9 @@ msgstr "" #. type: Plain text #: en/git-get-tar-commit-id.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git get-tar-commit-id'\n" -msgstr "" +msgstr "git-get-tar-commit-id(1)" #. type: Plain text #: en/git-get-tar-commit-id.txt:22 @@ -23016,8 +23206,9 @@ msgstr "" #. type: Plain text #: en/git-grep.txt:119 +#, fuzzy msgid "Don't match the pattern in binary files." -msgstr "" +msgstr "戟筠 龜�克逵�� �棘勻極逵畇筠戟龜� �逵閨剋棘戟逵 勻 畇勻棘龜�戟�� �逵橘剋逵�" #. type: Labeled list #: en/git-grep.txt:120 @@ -23259,8 +23450,9 @@ msgstr "--break" #. type: Plain text #: en/git-grep.txt:232 +#, fuzzy msgid "Print an empty line between matches from different files." -msgstr "" +msgstr "勻�勻棘畇龜�� 極����� ���棘克� 極棘�剋筠 �棘勻極逵畇筠戟龜橘 龜鈞 �逵鈞戟�� �逵橘剋棘勻" #. type: Labeled list #: en/git-grep.txt:233 @@ -23491,8 +23683,9 @@ msgstr "git-gui(1)" #. type: Plain text #: en/git-gui.txt:7 +#, fuzzy msgid "git-gui - A portable graphical interface to Git" -msgstr "" +msgstr "�棘��逵�龜勻戟�橘 均�逵�龜�筠�克龜橘 龜戟�筠��筠橘� 畇剋� Git" #. type: Plain text #: en/git-gui.txt:12 @@ -23534,9 +23727,9 @@ msgstr "" #. type: Labeled list #: en/git-gui.txt:36 -#, no-wrap +#, fuzzy, no-wrap msgid "browser" -msgstr "" +msgstr "--browser" #. type: Plain text #: en/git-gui.txt:40 @@ -23556,9 +23749,9 @@ msgstr "" #. type: Labeled list #: en/git-gui.txt:47 -#, no-wrap +#, fuzzy, no-wrap msgid "version" -msgstr "" +msgstr "--version" #. type: Plain text #: en/git-gui.txt:49 @@ -23668,7 +23861,7 @@ msgstr "" #: en/git-gui.txt:110 #, no-wrap msgid "Other" -msgstr "" +msgstr "���均棘筠" #. type: Plain text #: en/git-gui.txt:114 @@ -23705,8 +23898,9 @@ msgstr "git-hash-object(1)" #. type: Plain text #: en/git-hash-object.txt:7 +#, fuzzy msgid "git-hash-object - Compute object ID and optionally creates a blob from a file" -msgstr "" +msgstr "���龜�剋筠戟龜筠 龜畇筠戟�龜�龜克逵�棘�逵 棘閨�筠克�逵 龜 勻棘鈞劇棘菌戟棘筠 �棘鈞畇逵戟龜筠 畇勻棘龜�戟棘均棘 棘閨�筠克�逵 龜鈞 �逵橘剋逵" #. type: Plain text #: en/git-hash-object.txt:14 @@ -23734,8 +23928,9 @@ msgstr "" #. type: Plain text #: en/git-hash-object.txt:33 +#, fuzzy msgid "Actually write the object into the object database." -msgstr "" +msgstr "鈞逵極龜�� 棘閨�筠克�逵 勻 閨逵鈞� 畇逵戟戟�� 棘閨�筠克�棘勻" #. type: Plain text #: en/git-hash-object.txt:36 @@ -23788,8 +23983,9 @@ msgstr "git-help(1)" #. type: Plain text #: en/git-help.txt:7 +#, fuzzy msgid "git-help - Display help information about Git" -msgstr "" +msgstr "��棘閨�逵菌筠戟龜筠 �極�逵勻棘�戟棘橘 龜戟�棘�劇逵�龜龜 棘 Git" #. type: Plain text #: en/git-help.txt:13 @@ -24513,8 +24709,9 @@ msgstr "" #. type: Plain text #: en/git-http-fetch.txt:17 +#, fuzzy msgid "Downloads a remote Git repository via HTTP." -msgstr "" +msgstr "�逵均��鈞克逵 龜鈞 勻戟筠�戟筠均棘 �筠極棘鈞龜�棘�龜� Git � 極棘劇棘��� HTTP" #. type: Plain text #: en/git-http-fetch.txt:21 @@ -24589,8 +24786,9 @@ msgstr "git-http-push(1)" #. type: Plain text #: en/git-http-push.txt:7 +#, fuzzy msgid "git-http-push - Push objects over HTTP/DAV to another repository" -msgstr "" +msgstr "��極�逵勻克逵 棘閨�筠克�棘勻 勻 畇��均棘橘 �筠極棘鈞龜�棘�龜橘 � 極棘劇棘��� HTTP/DAV" #. type: Plain text #: en/git-http-push.txt:13 @@ -24722,8 +24920,9 @@ msgstr "git-imap-send(1)" #. type: Plain text #: en/git-imap-send.txt:7 +#, fuzzy msgid "git-imap-send - Send a collection of patches from stdin to an IMAP folder" -msgstr "" +msgstr "��極�逵勻克逵 克棘剋剋筠克�龜龜 極逵��筠橘 龜鈞 ��逵戟畇逵��戟棘均棘 勻勻棘畇逵 勻 極逵極克� IMAP" #. type: Plain text #: en/git-imap-send.txt:13 @@ -24748,8 +24947,9 @@ msgstr "" #. type: Plain text #: en/git-imap-send.txt:39 +#, fuzzy msgid "Be quiet." -msgstr "" +msgstr "�龜�龜橘 �筠菌龜劇" #. type: Labeled list #: en/git-imap-send.txt:40 @@ -24897,8 +25097,9 @@ msgstr "git-index-pack(1)" #. type: Plain text #: en/git-index-pack.txt:7 +#, fuzzy msgid "git-index-pack - Build pack index file for an existing packed archive" -msgstr "" +msgstr "�棘���棘筠戟龜筠 �逵橘剋逵 龜戟畇筠克�逵 畇剋� ���筠��勻���筠均棘 �極逵克棘勻逵戟戟棘均棘 逵��龜勻逵" #. type: Plain text #: en/git-index-pack.txt:15 @@ -25062,8 +25263,9 @@ msgstr "git-init(1)" #. type: Plain text #: en/git-init.txt:7 +#, fuzzy msgid "git-init - Create an empty Git repository or reinitialize an existing one" -msgstr "" +msgstr "鬼棘鈞畇逵戟龜筠 極���棘均棘 �筠極棘鈞龜�棘�龜� Git 龜剋龜 極筠�筠龜戟龜�龜逵剋龜鈞逵�龜� ���筠��勻���筠均棘" #. type: Plain text #: en/git-init.txt:15 @@ -25279,8 +25481,9 @@ msgstr "git-instaweb(1)" #. type: Plain text #: en/git-instaweb.txt:7 +#, fuzzy msgid "git-instaweb - Instantly browse your working repository in gitweb" -msgstr "" +msgstr "�均戟棘勻筠戟戟�橘 極�棘�劇棘�� 勻逵�筠均棘 �逵閨棘�筠均棘 �筠極棘鈞龜�棘�龜� 勻 gitweb" #. type: Plain text #: en/git-instaweb.txt:14 @@ -25381,9 +25584,9 @@ msgstr "" #. type: Labeled list #: en/git-instaweb.txt:64 -#, no-wrap +#, fuzzy, no-wrap msgid "restart" -msgstr "" +msgstr "--restart" #. type: Labeled list #: en/git-instaweb.txt:65 @@ -25501,8 +25704,9 @@ msgstr "--in-place" #. type: Plain text #: en/git-interpret-trailers.txt:76 +#, fuzzy msgid "Edit the files in place." -msgstr "" +msgstr "�筠畇逵克�龜�棘勻逵�� �逵橘剋� 戟逵 劇筠��筠" #. type: Labeled list #: en/git-interpret-trailers.txt:77 @@ -25856,9 +26060,9 @@ msgstr "" #. type: delimited block - #: en/git-interpret-trailers.txt:271 en/git-interpret-trailers.txt:283 en/git-interpret-trailers.txt:290 en/git-interpret-trailers.txt:354 -#, no-wrap +#, fuzzy, no-wrap msgid "message\n" -msgstr "" +msgstr "�棘棘閨�筠戟龜筠" #. type: delimited block - #: en/git-interpret-trailers.txt:274 @@ -26043,9 +26247,9 @@ msgstr "" #. type: Plain text #: en/git-log.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git log' [<options>] [<revision range>] [[--] <path>...]\n" -msgstr "" +msgstr "git log [<棘極�龜龜>] [<畇龜逵極逵鈞棘戟-�筠畇逵克�龜橘>] [[--] <極���>��]" #. type: Plain text #: en/git-log.txt:17 @@ -26395,8 +26599,9 @@ msgstr "" #. type: Plain text #: en/git-log.txt:218 +#, fuzzy msgid "See linkgit:git-shortlog[1]." -msgstr "" +msgstr "linkgit:git-shortlog[1]" #. type: Labeled list #: en/git-log.txt:219 en/git-notes.txt:333 @@ -26427,8 +26632,9 @@ msgstr "git-ls-files(1)" #. type: Plain text #: en/git-ls-files.txt:7 +#, fuzzy msgid "git-ls-files - Show information about files in the index and the working tree" -msgstr "" +msgstr "��勻棘畇 龜戟�棘�劇逵�龜龜 棘 �逵橘剋逵� 勻 龜戟畇筠克�筠 龜 勻 �逵閨棘�筠劇 克逵�逵剋棘均筠" #. type: Plain text #: en/git-ls-files.txt:23 @@ -26459,8 +26665,9 @@ msgstr "" #. type: Plain text #: en/git-ls-files.txt:38 +#, fuzzy msgid "Show cached files in the output (default)" -msgstr "" +msgstr "極棘克逵鈞�勻逵�� 克��龜�棘勻逵戟戟�筠 �逵橘剋� 極�龜 勻�勻棘畇筠 (極棘 �劇棘剋�逵戟龜�)" #. type: Labeled list #: en/git-ls-files.txt:40 @@ -26470,8 +26677,9 @@ msgstr "--deleted" #. type: Plain text #: en/git-ls-files.txt:42 +#, fuzzy msgid "Show deleted files in the output" -msgstr "" +msgstr "極棘克逵鈞�勻逵�� �畇逵剋筠戟戟�筠 �逵橘剋� 極�龜 勻�勻棘畇筠" #. type: Labeled list #: en/git-ls-files.txt:44 @@ -26481,8 +26689,9 @@ msgstr "--modified" #. type: Plain text #: en/git-ls-files.txt:46 +#, fuzzy msgid "Show modified files in the output" -msgstr "" +msgstr "極棘克逵鈞�勻逵�� 龜鈞劇筠戟筠戟戟�筠 �逵橘剋� 極�龜 勻�勻棘畇筠" #. type: Labeled list #: en/git-ls-files.txt:48 @@ -26650,8 +26859,9 @@ msgstr "" #. type: Plain text #: en/git-ls-files.txt:125 +#, fuzzy msgid "cached" -msgstr "" +msgstr "--cached" #. type: Labeled list #: en/git-ls-files.txt:125 @@ -26672,8 +26882,9 @@ msgstr "" #. type: Plain text #: en/git-ls-files.txt:127 +#, fuzzy msgid "unmerged" -msgstr "" +msgstr "--unmerged" #. type: Labeled list #: en/git-ls-files.txt:127 @@ -26716,9 +26927,9 @@ msgstr "" #. type: Title ~ #: en/git-ls-files.txt:131 en/git.txt:513 -#, no-wrap +#, fuzzy, no-wrap msgid "other" -msgstr "" +msgstr "���均棘筠" #. type: Plain text #: en/git-ls-files.txt:136 @@ -26866,12 +27077,15 @@ msgstr "" #. type: Plain text #: en/git-ls-remote.txt:15 -#, no-wrap +#, fuzzy, no-wrap msgid "" "'git ls-remote' [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n" "\t [-q | --quiet] [--exit-code] [--get-url] [--sort=<key>]\n" "\t [--symref] [<repository> [<refs>...]]\n" msgstr "" +"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<鈞逵極��克>]\n" +" [-q | --quiet] [--exit-code] [--get-url]\n" +" [--symref] [<�筠極棘鈞龜�棘�龜橘> [<���剋克龜>��]]" #. type: Plain text #: en/git-ls-remote.txt:20 @@ -26981,8 +27195,9 @@ msgstr "" #. type: Plain text #: en/git-ls-remote.txt:114 +#, fuzzy msgid "linkgit:git-check-ref-format[1]." -msgstr "" +msgstr "linkgit:git-check-ref-format[1]" #. type: Title = #: en/git-ls-tree.txt:2 @@ -27031,8 +27246,9 @@ msgstr "" #. type: Plain text #: en/git-ls-tree.txt:46 +#, fuzzy msgid "Recurse into sub-trees." -msgstr "" +msgstr "極�棘�棘畇龜�� �筠克���龜勻戟棘 勻 極棘畇畇筠�筠勻��" #. type: Plain text #: en/git-ls-tree.txt:50 @@ -27116,8 +27332,9 @@ msgstr "git-mailinfo(1)" #. type: Plain text #: en/git-mailinfo.txt:7 +#, fuzzy msgid "git-mailinfo - Extracts patch and authorship from a single e-mail message" -msgstr "" +msgstr "�鈞勻剋筠克逵筠� 極逵�� 龜 逵勻�棘���勻棘 龜鈞 棘畇戟棘均棘 �棘棘閨�筠戟龜� �剋筠克��棘戟戟棘橘 極棘���" #. type: Plain text #: en/git-mailinfo.txt:13 @@ -27290,9 +27507,9 @@ msgstr "" #. type: Labeled list #: en/git-mailsplit.txt:32 -#, no-wrap +#, fuzzy, no-wrap msgid "-o<directory>" -msgstr "" +msgstr "--directory" #. type: Plain text #: en/git-mailsplit.txt:34 @@ -27356,8 +27573,9 @@ msgstr "git-merge-base(1)" #. type: Plain text #: en/git-merge-base.txt:7 +#, fuzzy msgid "git-merge-base - Find as good common ancestors as possible for a merge" -msgstr "" +msgstr "�棘龜�克 極棘畇�棘畇��龜� 棘閨�龜� 極�筠畇克棘勻 畇剋� 勻棘鈞劇棘菌戟棘均棘 �剋龜�戟龜�" #. type: Plain text #: en/git-merge-base.txt:17 @@ -27743,8 +27961,9 @@ msgstr "" #. type: Plain text #: en/git-merge-file.txt:69 +#, fuzzy msgid "Quiet; do not warn about conflicts." -msgstr "" +msgstr "戟筠 極�筠畇�極�筠菌畇逵�� 棘 克棘戟�剋龜克�逵�" #. type: Labeled list #: en/git-merge-file.txt:70 @@ -27893,9 +28112,9 @@ msgstr "" #. type: Plain text #: en/git-merge-one-file.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git merge-one-file'\n" -msgstr "" +msgstr "git-merge-one-file(1)" #. type: Plain text #: en/git-merge-one-file.txt:18 @@ -27992,8 +28211,9 @@ msgstr "git-mergetool(1)" #. type: Plain text #: en/git-mergetool.txt:7 +#, fuzzy msgid "git-mergetool - Run merge conflict resolution tools to resolve merge conflicts" -msgstr "" +msgstr "�逵極��克 龜戟����劇筠戟�棘勻 �逵鈞�筠�筠戟龜� 克棘戟�剋龜克�棘勻 �剋龜�戟龜�" #. type: Plain text #: en/git-mergetool.txt:12 @@ -28043,8 +28263,9 @@ msgstr "" #. type: Plain text #: en/git-mergetool.txt:69 +#, fuzzy msgid "Print a list of merge tools that may be used with `--tool`." -msgstr "" +msgstr "勻�勻筠��龜 �極龜�棘克 ��龜剋龜�, 克棘�棘��筠 劇棘菌戟棘 龜�極棘剋�鈞棘勻逵�� � 極逵�逵劇筠��棘劇 짬--tool쨩" #. type: Plain text #: en/git-mergetool.txt:77 @@ -28134,8 +28355,9 @@ msgstr "git-merge(1)" #. type: Plain text #: en/git-merge.txt:7 +#, fuzzy msgid "git-merge - Join two or more development histories together" -msgstr "" +msgstr "�閨�筠畇龜戟筠戟龜筠 棘畇戟棘橘 龜剋龜 戟筠�克棘剋�克龜� 龜��棘�龜橘 �逵鈞�逵閨棘�克龜 勻劇筠��筠" #. type: Plain text #: en/git-merge.txt:18 @@ -28620,14 +28842,15 @@ msgstr "git-mktree(1)" #. type: Plain text #: en/git-mktree.txt:7 +#, fuzzy msgid "git-mktree - Build a tree-object from ls-tree formatted text" -msgstr "" +msgstr "�棘���棘筠戟龜筠 棘閨�筠克�逵 畇筠�筠勻逵 龜鈞 �筠克��逵 �棘�劇逵�逵 ls-tree" #. type: Plain text #: en/git-mktree.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git mktree' [-z] [--missing] [--batch]\n" -msgstr "" +msgstr "git mktree [-z] [--missing] [--batch]" #. type: Plain text #: en/git-mktree.txt:20 @@ -28663,8 +28886,9 @@ msgstr "git-mv(1)" #. type: Plain text #: en/git-mv.txt:7 +#, fuzzy msgid "git-mv - Move or rename a file, a directory, or a symlink" -msgstr "" +msgstr "�筠�筠劇筠�筠戟龜筠 龜剋龜 極筠�筠龜劇筠戟棘勻逵戟龜筠 �逵橘剋逵, 克逵�逵剋棘均逵 龜剋龜 �龜劇勻棘剋�戟棘橘 ���剋克龜" #. type: Plain text #: en/git-mv.txt:13 @@ -28674,8 +28898,9 @@ msgstr "" #. type: Plain text #: en/git-mv.txt:17 +#, fuzzy msgid "Move or rename a file, directory or symlink." -msgstr "" +msgstr "�筠�筠劇筠�筠戟龜筠 龜剋龜 極筠�筠龜劇筠戟棘勻逵戟龜筠 �逵橘剋逵, 克逵�逵剋棘均逵 龜剋龜 �龜劇勻棘剋�戟棘橘 ���剋克龜" #. type: Plain text #: en/git-mv.txt:20 @@ -28772,8 +28997,9 @@ msgstr "" #. type: Plain text #: en/git-name-rev.txt:44 +#, fuzzy msgid "List all commits reachable from all refs" -msgstr "" +msgstr "勻�勻筠��龜 �極龜�棘克 勻�筠� 克棘劇劇龜�棘勻, 畇棘��龜菌龜劇�� �棘 勻�筠� ���剋棘克" #. type: Plain text #: en/git-name-rev.txt:50 @@ -28946,9 +29172,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:87 -#, no-wrap +#, fuzzy, no-wrap msgid "append" -msgstr "" +msgstr "--append" #. type: Plain text #: en/git-notes.txt:90 @@ -28979,9 +29205,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:97 en/git-submodule.txt:150 -#, no-wrap +#, fuzzy, no-wrap msgid "merge" -msgstr "" +msgstr "emerge" #. type: Plain text #: en/git-notes.txt:102 @@ -28995,9 +29221,9 @@ msgstr "" #. type: Labeled list #: en/git-notes.txt:112 en/git-worktree.txt:105 -#, no-wrap +#, fuzzy, no-wrap msgid "remove" -msgstr "" +msgstr "--remove" #. type: Plain text #: en/git-notes.txt:117 @@ -29394,8 +29620,9 @@ msgstr "git-p4(1)" #. type: Plain text #: en/git-p4.txt:7 +#, fuzzy msgid "git-p4 - Import from and submit to Perforce repositories" -msgstr "" +msgstr "�劇極棘�� 龜 棘�極�逵勻克逵 勻 �筠極棘鈞龜�棘�龜龜 Perforce" #. type: Plain text #: en/git-p4.txt:16 @@ -29634,9 +29861,9 @@ msgstr "" #. type: Title ~ #: en/git-p4.txt:175 -#, no-wrap +#, fuzzy, no-wrap msgid "Unshelve" -msgstr "" +msgstr "--shelve" #. type: Plain text #: en/git-p4.txt:178 @@ -29674,7 +29901,7 @@ msgstr "" #: en/git-p4.txt:202 #, no-wrap msgid "General options" -msgstr "" +msgstr "�閨�龜筠 棘極�龜龜" #. type: Plain text #: en/git-p4.txt:204 @@ -31269,8 +31496,9 @@ msgstr "git-pack-refs(1)" #. type: Plain text #: en/git-pack-refs.txt:7 +#, fuzzy msgid "git-pack-refs - Pack heads and tags for efficient repository access" -msgstr "" +msgstr "叫極逵克棘勻克逵 �克逵鈞逵�筠剋筠橘 戟逵 勻筠�克龜 龜 劇筠�棘克 畇剋� ���筠克�龜勻戟棘均棘 畇棘���極逵 克 �筠極棘鈞龜�棘�龜�" #. type: Plain text #: en/git-pack-refs.txt:12 @@ -31321,8 +31549,9 @@ msgstr "git-parse-remote(1)" #. type: Plain text #: en/git-parse-remote.txt:7 +#, fuzzy msgid "git-parse-remote - Routines to help parsing remote repository access parameters" -msgstr "" +msgstr "�棘畇極�棘均�逵劇劇� 畇剋� 極棘劇棘�龜 �逵鈞閨棘�逵 極逵�逵劇筠��棘勻 畇棘���極逵 勻戟筠�戟筠均棘 �筠極棘鈞龜�棘�龜�" #. type: Plain text #: en/git-parse-remote.txt:13 @@ -31428,9 +31657,9 @@ msgstr "" #. type: Plain text #: en/git-prune-packed.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git prune-packed' [-n|--dry-run] [-q|--quiet]\n" -msgstr "" +msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]" #. type: Plain text #: en/git-prune-packed.txt:19 @@ -31476,14 +31705,15 @@ msgstr "git-prune(1)" #. type: Plain text #: en/git-prune.txt:7 +#, fuzzy msgid "git-prune - Prune all unreachable objects from the object database" -msgstr "" +msgstr "��龜��克逵 勻�筠� 戟筠畇棘��龜菌龜劇�� 棘閨�筠克�棘勻 龜鈞 閨逵鈞� 畇逵戟戟�� 棘閨�筠克�棘勻" #. type: Plain text #: en/git-prune.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]\n" -msgstr "" +msgstr "git prune [-n] [-v] [--progress] [--expire <勻�筠劇�>] [--] [<�筠畇逵克�龜�>��]" #. type: Plain text #: en/git-prune.txt:19 @@ -31512,8 +31742,9 @@ msgstr "" #. type: Plain text #: en/git-prune.txt:47 +#, fuzzy msgid "Show progress." -msgstr "" +msgstr "極棘克逵鈞逵�� 極�棘均�筠�� 勻�極棘剋戟筠戟龜�" #. type: Labeled list #: en/git-prune.txt:48 en/git-worktree.txt:192 @@ -31572,14 +31803,15 @@ msgstr "git-pull(1)" #. type: Plain text #: en/git-pull.txt:7 +#, fuzzy msgid "git-pull - Fetch from and integrate with another repository or a local branch" -msgstr "" +msgstr "�鈞勻剋筠�筠戟龜筠 龜鈞劇筠戟筠戟龜橘 龜 棘閨�筠畇龜戟筠戟龜筠 � 畇��均龜劇 �筠極棘鈞龜�棘�龜筠劇 龜剋龜 剋棘克逵剋�戟棘橘 勻筠�克棘橘" #. type: Plain text #: en/git-pull.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git pull' [<options>] [<repository> [<refspec>...]]\n" -msgstr "" +msgstr "git pull [<棘極�龜龜>] [<�筠極棘鈞龜�棘�龜橘> [<�極筠�龜�龜克逵�棘�-���剋克龜>��]]" #. type: Plain text #: en/git-pull.txt:21 @@ -31676,7 +31908,7 @@ msgstr "" #: en/git-pull.txt:97 #, no-wrap msgid "Options related to merging" -msgstr "" +msgstr "�極�龜龜, �勻�鈞逵戟戟�筠 �棘 �剋龜�戟龜筠劇" #. type: Labeled list #: en/git-pull.txt:104 @@ -31756,7 +31988,7 @@ msgstr "" #: en/git-pull.txt:145 #, no-wrap msgid "Options related to fetching" -msgstr "" +msgstr "�極�龜龜, �勻�鈞逵戟戟�筠 � 龜鈞勻剋筠�筠戟龜筠劇 龜鈞劇筠戟筠戟龜橘" #. type: Title - #: en/git-pull.txt:156 @@ -31881,8 +32113,9 @@ msgstr "git-push(1)" #. type: Plain text #: en/git-push.txt:7 +#, fuzzy msgid "git-push - Update remote refs along with associated objects" -msgstr "" +msgstr "�閨戟棘勻剋筠戟龜筠 勻戟筠�戟龜� ���剋棘克 龜 �勻�鈞逵戟戟�� 棘閨�筠克�棘勻" #. type: Plain text #: en/git-push.txt:18 @@ -32375,9 +32608,9 @@ msgstr "" #. type: Labeled list #: en/git-push.txt:449 -#, no-wrap +#, fuzzy, no-wrap msgid "rejected" -msgstr "" +msgstr "[棘�克剋棘戟筠戟棘]" #. type: Plain text #: en/git-push.txt:452 @@ -32777,13 +33010,13 @@ msgstr "" #. type: Plain text #: en/git-read-tree.txt:16 -#, no-wrap +#, fuzzy, no-wrap msgid "" "'git read-tree' [[-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>]\n" "\t\t[-u [--exclude-per-directory=<gitignore>] | -i]]\n" "\t\t[--index-output=<file>] [--no-sparse-checkout]\n" "\t\t(--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])\n" -msgstr "" +msgstr "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<極�筠�龜克�>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--index-output=<�逵橘剋>] (--empty | <�克逵鈞逵�筠剋�-畇筠�筠勻逵-1> [<�克逵鈞逵�筠剋�-畇筠�筠勻逵-2> [<�克逵鈞逵�筠剋�-畇筠�筠勻逵-3>]])" #. type: Plain text #: en/git-read-tree.txt:23 @@ -33317,8 +33550,9 @@ msgstr "git-rebase(1)" #. type: Plain text #: en/git-rebase.txt:7 +#, fuzzy msgid "git-rebase - Reapply commits on top of another base tip" -msgstr "" +msgstr "�棘勻�棘�戟棘筠 極�龜劇筠戟筠戟龜筠 克棘劇劇龜�棘勻 戟逵畇 勻筠����克棘橘 畇��均棘橘 勻筠�克龜" #. type: Plain text #: en/git-rebase.txt:16 @@ -33701,9 +33935,9 @@ msgstr "" #. type: Labeled list #: en/git-rebase.txt:294 -#, no-wrap +#, fuzzy, no-wrap msgid "-X <strategy-option>" -msgstr "" +msgstr "--strategy-option" #. type: Labeled list #: en/git-rebase.txt:295 @@ -34188,8 +34422,9 @@ msgstr "" #. type: Plain text #: en/git-rebase.txt:607 +#, fuzzy msgid "commit" -msgstr "" +msgstr "`commit`" #. type: Plain text #: en/git-rebase.txt:609 @@ -35778,9 +36013,9 @@ msgstr "" #. type: Labeled list #: en/git-remote.txt:83 -#, no-wrap +#, fuzzy, no-wrap msgid "'rename'" -msgstr "" +msgstr "極筠�筠龜劇筠戟棘勻逵戟龜筠" #. type: Plain text #: en/git-remote.txt:87 @@ -36187,8 +36422,9 @@ msgstr "git-replace(1)" #. type: Plain text #: en/git-replace.txt:7 +#, fuzzy msgid "git-replace - Create, list, delete refs to replace objects" -msgstr "" +msgstr "鬼棘鈞畇逵戟龜筠, 勻�勻棘畇 �極龜�克逵, �畇逵剋筠戟龜筠 ���剋棘克 畇剋� 鈞逵劇筠戟� 棘閨�筠克�棘勻" #. type: Plain text #: en/git-replace.txt:17 @@ -36538,8 +36774,9 @@ msgstr "git-rerere(1)" #. type: Plain text #: en/git-rerere.txt:7 +#, fuzzy msgid "git-rerere - Reuse recorded resolution of conflicted merges" -msgstr "" +msgstr "�棘勻�棘�戟棘筠 龜�極棘剋�鈞棘勻逵戟龜筠 鈞逵極龜�逵戟戟�� �逵鈞�筠�筠戟龜橘 克棘戟�剋龜克�棘勻 極�龜 �剋龜�戟龜��" #. type: Plain text #: en/git-rerere.txt:12 @@ -36802,8 +37039,9 @@ msgstr "git-reset(1)" #. type: Plain text #: en/git-reset.txt:7 +#, fuzzy msgid "git-reset - Reset current HEAD to the specified state" -msgstr "" +msgstr "鬼閨�棘� �筠克��筠均棘 �棘��棘�戟龜� HEAD 戟逵 �克逵鈞逵戟戟棘筠 �棘��棘�戟龜筠" #. type: Plain text #: en/git-reset.txt:14 @@ -36821,9 +37059,9 @@ msgstr "" #. type: Labeled list #: en/git-reset.txt:22 -#, no-wrap +#, fuzzy, no-wrap msgid "'git reset' [-q] [<tree-ish>] [--] <paths>..." -msgstr "" +msgstr "git reset [-q] [<�克逵鈞逵�筠剋�-畇筠�筠勻逵>] [--] <極��龜>��" #. type: Plain text #: en/git-reset.txt:26 @@ -36842,9 +37080,9 @@ msgstr "" #. type: Labeled list #: en/git-reset.txt:37 -#, no-wrap +#, fuzzy, no-wrap msgid "'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]" -msgstr "" +msgstr "git reset --patch [<�克逵鈞逵�筠剋�-畇筠�筠勻逵>] [--] [<極��龜>��]" #. type: Plain text #: en/git-reset.txt:41 @@ -37558,8 +37796,9 @@ msgstr "git-rev-list(1)" #. type: Plain text #: en/git-rev-list.txt:7 +#, fuzzy msgid "git-rev-list - Lists commit objects in reverse chronological order" -msgstr "" +msgstr "��勻棘畇 �極龜�克逵 棘閨�筠克�棘勻 克棘劇劇龜�逵 勻 棘閨�逵�戟棘劇 ��棘戟棘剋棘均龜�筠�克棘劇 極棘��畇克筠" #. type: Plain text #: en/git-rev-list.txt:64 @@ -38522,8 +38761,9 @@ msgstr "git-rm(1)" #. type: Plain text #: en/git-rm.txt:7 +#, fuzzy msgid "git-rm - Remove files from the working tree and from the index" -msgstr "" +msgstr "叫畇逵剋筠戟龜筠 �逵橘剋棘勻 龜鈞 �逵閨棘�筠均棘 克逵�逵剋棘均逵 龜 龜戟畇筠克�逵" #. type: Plain text #: en/git-rm.txt:12 @@ -38543,8 +38783,9 @@ msgstr "" #. type: Plain text #: en/git-rm.txt:42 +#, fuzzy msgid "Override the up-to-date check." -msgstr "" +msgstr "極�棘極���龜�� 極�棘勻筠�克� 逵克��逵剋�戟棘��龜" #. type: Plain text #: en/git-rm.txt:48 @@ -38569,8 +38810,9 @@ msgstr "--ignore-unmatch" #. type: Plain text #: en/git-rm.txt:65 +#, fuzzy msgid "Exit with a zero status even if no files matched." -msgstr "" +msgstr "勻��棘畇 � 戟�剋筠勻�劇 克棘畇棘劇 勻棘鈞勻�逵�逵, 畇逵菌筠 筠�剋龜 戟龜�筠均棘 戟筠 戟逵橘畇筠戟棘" #. type: Plain text #: en/git-rm.txt:70 @@ -38649,8 +38891,9 @@ msgstr "" #. type: Plain text #: en/git-rm.txt:125 +#, fuzzy msgid "See linkgit:git-add[1]." -msgstr "" +msgstr "linkgit:git-add[1]" #. type: Title ~ #: en/git-rm.txt:127 @@ -39629,8 +39872,9 @@ msgstr "git-send-pack(1)" #. type: Plain text #: en/git-send-pack.txt:7 +#, fuzzy msgid "git-send-pack - Push objects over Git protocol to another repository" -msgstr "" +msgstr "��極�逵勻克逵 棘閨�筠克�棘勻 勻 畇��均棘橘 �筠極棘鈞龜�棘�龜橘 � 極棘劇棘��� 極�棘�棘克棘剋逵 Git" #. type: Plain text #: en/git-send-pack.txt:16 @@ -39743,8 +39987,9 @@ msgstr "git-shell(1)" #. type: Plain text #: en/git-shell.txt:7 +#, fuzzy msgid "git-shell - Restricted login shell for Git-only SSH access" -msgstr "" +msgstr "�均�逵戟龜�筠戟戟逵� 棘閨棘剋棘�克逵 勻�棘畇逵 勻 �龜��筠劇� 畇剋� 畇棘���極逵 Git �筠�筠鈞 SSH" #. type: Plain text #: en/git-shell.txt:15 @@ -40009,8 +40254,9 @@ msgstr "--email" #. type: Plain text #: en/git-shortlog.txt:41 +#, fuzzy msgid "Show the email address of each author." -msgstr "" +msgstr "�棘克逵鈞逵�� 極棘��� 克逵菌畇棘均棘 龜鈞 逵勻�棘�棘勻" #. type: Labeled list #: en/git-shortlog.txt:42 @@ -40083,7 +40329,7 @@ msgstr "" #. type: Plain text #: en/git-show-branch.txt:17 -#, no-wrap +#, fuzzy, no-wrap msgid "" "'git show-branch' [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n" "\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n" @@ -40092,6 +40338,10 @@ msgid "" "\t\t[(<rev> | <glob>)...]\n" "'git show-branch' (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]\n" msgstr "" +"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n" +"\t\t[--current] [--color[=<克棘均畇逵>] | --no-color] [--sparse]\n" +"\t\t[--more=<n> | --list | --independent | --merge-base]\n" +"\t\t[--no-name | --sha1-name] [--topics] [(<�筠畇逵克�龜�> | <�逵閨剋棘戟>)��]" #. type: Plain text #: en/git-show-branch.txt:24 @@ -40132,8 +40382,9 @@ msgstr "" #. type: Plain text #: en/git-show-branch.txt:46 +#, fuzzy msgid "Show the remote-tracking branches." -msgstr "" +msgstr "極棘克逵鈞逵�� �極龜�棘克 棘��剋筠菌龜勻逵筠劇�� 勻戟筠�戟龜� 勻筠�棘克" #. type: Plain text #: en/git-show-branch.txt:50 @@ -40191,8 +40442,9 @@ msgstr "" #. type: Plain text #: en/git-show-branch.txt:82 +#, fuzzy msgid "Synonym to `--more=-1`" -msgstr "" +msgstr "�龜戟棘戟龜劇 畇剋� more=-1" #. type: Labeled list #: en/git-show-branch.txt:83 @@ -40443,8 +40695,9 @@ msgstr "--head" #. type: Plain text #: en/git-show-ref.txt:39 +#, fuzzy msgid "Show the HEAD reference, even if it would normally be filtered out." -msgstr "" +msgstr "勻�勻筠��龜 ���剋克� HEAD, 畇逵菌筠 筠�剋龜 棘戟逵 閨�畇筠� 棘��龜剋���棘勻逵戟逵" #. type: Plain text #: en/git-show-ref.txt:46 @@ -40665,9 +40918,9 @@ msgstr "" #. type: Plain text #: en/git-show.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git show' [<options>] [<object>...]\n" -msgstr "" +msgstr "git show [<棘極�龜龜>] <棘閨�筠克�>��" #. type: Plain text #: en/git-show.txt:17 @@ -40848,9 +41101,9 @@ msgstr "" #. type: Labeled list #: en/git-sh-setup.txt:55 -#, no-wrap +#, fuzzy, no-wrap msgid "is_bare_repository" -msgstr "" +msgstr "--is-bare-repository" #. type: Plain text #: en/git-sh-setup.txt:59 @@ -40865,8 +41118,9 @@ msgstr "" #. type: Plain text #: en/git-sh-setup.txt:62 +#, fuzzy msgid "runs chdir to the toplevel of the working tree." -msgstr "" +msgstr "�筠 �畇逵剋棘�� 勻�極棘剋戟龜�� chdir 勻 $cdup, 勻筠��龜戟� �逵閨棘�筠均棘 克逵�逵剋棘均逵" #. type: Labeled list #: en/git-sh-setup.txt:63 @@ -40937,8 +41191,9 @@ msgstr "git-stage(1)" #. type: Plain text #: en/git-stage.txt:7 +#, fuzzy msgid "git-stage - Add file contents to the staging area" -msgstr "" +msgstr "�棘閨逵勻剋筠戟龜筠 �棘畇筠�菌龜劇棘均棘 �逵橘剋棘勻 勻 龜戟畇筠克�" #. type: Plain text #: en/git-stage.txt:13 @@ -40959,8 +41214,9 @@ msgstr "git-stash(1)" #. type: Plain text #: en/git-stash.txt:7 +#, fuzzy msgid "git-stash - Stash the changes in a dirty working directory away" -msgstr "" +msgstr "鬼極���逵�� 龜鈞劇筠戟筠戟龜� 勻 龜鈞劇筠戟�戟戟棘劇 �逵閨棘�筠劇 克逵�逵剋棘均筠" #. type: Plain text #: en/git-stash.txt:22 @@ -41083,9 +41339,9 @@ msgstr "" #. type: Labeled list #: en/git-stash.txt:120 -#, no-wrap +#, fuzzy, no-wrap msgid "pop [--index] [-q|--quiet] [<stash>]" -msgstr "" +msgstr "git stash pop [--index] [-q|--quiet] [<�極���逵戟戟�筠-龜鈞劇筠戟筠戟龜�>]" #. type: Plain text #: en/git-stash.txt:126 @@ -41109,9 +41365,9 @@ msgstr "" #. type: Labeled list #: en/git-stash.txt:139 -#, no-wrap +#, fuzzy, no-wrap msgid "apply [--index] [-q|--quiet] [<stash>]" -msgstr "" +msgstr "git stash apply [--index] [-q|--quiet] [<�極���逵戟戟�筠-龜鈞劇筠戟筠戟龜�>]" #. type: Plain text #: en/git-stash.txt:144 @@ -41160,7 +41416,7 @@ msgstr "" #: en/git-stash.txt:172 en/git-update-ref.txt:100 #, no-wrap msgid "create" -msgstr "" +msgstr "�棘鈞畇逵戟逵" #. type: Plain text #: en/git-stash.txt:179 @@ -41169,9 +41425,9 @@ msgstr "" #. type: Labeled list #: en/git-stash.txt:180 -#, no-wrap +#, fuzzy, no-wrap msgid "store" -msgstr "" +msgstr "劇龜戟-畇剋龜戟逵" #. type: Plain text #: en/git-stash.txt:186 @@ -41327,9 +41583,9 @@ msgstr "" #. type: Plain text #: en/git-status.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git status' [<options>...] [--] [<pathspec>...]\n" -msgstr "" +msgstr "git status [<棘極�龜龜>] [--] <�極筠�龜�龜克逵�棘�-極��龜>��" #. type: Plain text #: en/git-status.txt:23 @@ -41964,8 +42220,9 @@ msgstr "--strip-comments" #. type: Plain text #: en/git-stripspace.txt:41 +#, fuzzy msgid "Skip and remove all lines starting with comment character (default '#')." -msgstr "" +msgstr "極�棘極���龜�� 龜 �畇逵剋龜�� 勻�筠 ���棘克龜, 戟逵�龜戟逵��龜筠�� � �龜劇勻棘剋逵 克棘劇劇筠�逵�龜�" #. type: Labeled list #: en/git-stripspace.txt:43 @@ -42190,9 +42447,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:139 -#, no-wrap +#, fuzzy, no-wrap msgid "checkout" -msgstr "" +msgstr "--checkout" #. type: Plain text #: en/git-submodule.txt:140 @@ -42212,9 +42469,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:147 -#, no-wrap +#, fuzzy, no-wrap msgid "rebase" -msgstr "" +msgstr "--rebase" #. type: Plain text #: en/git-submodule.txt:148 @@ -42499,9 +42756,9 @@ msgstr "" #. type: Labeled list #: en/git-submodule.txt:371 -#, no-wrap +#, fuzzy, no-wrap msgid "--reference <repository>" -msgstr "" +msgstr "���剋逵筠劇�橘 �筠極棘鈞龜�棘�龜橘" #. type: Plain text #: en/git-submodule.txt:375 en/git-submodule.txt:384 @@ -42578,8 +42835,9 @@ msgstr "git-svn(1)" #. type: Plain text #: en/git-svn.txt:7 +#, fuzzy msgid "git-svn - Bidirectional operation between a Subversion repository and Git" -msgstr "" +msgstr "�勻����棘�棘戟戟龜筠 棘極筠�逵�龜龜 劇筠菌畇� �筠極棘鈞龜�棘�龜�劇龜 Subversion 龜 Git" #. type: Plain text #: en/git-svn.txt:12 @@ -43054,9 +43312,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:305 -#, no-wrap +#, fuzzy, no-wrap msgid "'branch'" -msgstr "" +msgstr "勻筠�克逵" #. type: Plain text #: en/git-svn.txt:307 @@ -43723,9 +43981,9 @@ msgstr "" #. type: Labeled list #: en/git-svn.txt:677 -#, no-wrap +#, fuzzy, no-wrap msgid "-s<strategy>" -msgstr "" +msgstr "--strategy" #. type: Plain text #: en/git-svn.txt:682 @@ -44421,8 +44679,9 @@ msgstr "git-tag(1)" #. type: Plain text #: en/git-tag.txt:7 +#, fuzzy msgid "git-tag - Create, list, delete or verify a tag object signed with GPG" -msgstr "" +msgstr "鬼棘鈞畇逵戟龜筠, 勻�勻棘畇 �極龜�克逵, �畇逵剋筠戟龜筠 龜剋龜 極�棘勻筠�克逵 劇筠�克龜, 極棘畇極龜�逵戟戟棘橘 � 極棘劇棘��� GPG" #. type: Plain text #: en/git-tag.txt:20 @@ -44564,8 +44823,9 @@ msgstr "" #. type: Plain text #: en/git-tag.txt:126 +#, fuzzy msgid "Sorting and filtering tags are case insensitive." -msgstr "" +msgstr "�棘��龜�棘勻克逵 龜 �龜剋���逵�龜� 戟筠 鈞逵勻龜��� 棘� �筠均龜���逵" #. type: Plain text #: en/git-tag.txt:132 @@ -44645,9 +44905,9 @@ msgstr "" #. type: Labeled list #: en/git-tag.txt:202 en/git.txt:312 -#, no-wrap +#, fuzzy, no-wrap msgid "<commit>" -msgstr "" +msgstr "`commit`" #. type: Plain text #: en/git-tag.txt:206 @@ -44882,7 +45142,7 @@ msgstr "" #. type: Plain text #: en/git.txt:18 -#, no-wrap +#, fuzzy, no-wrap msgid "" "'git' [--version] [--help] [-C <path>] [-c <name>=<value>]\n" " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" @@ -44891,6 +45151,11 @@ msgid "" " [--super-prefix=<path>]\n" " <command> [<args>]\n" msgstr "" +"git [--version] [--help] [-C <極���>] [-c <龜劇�>=<鈞戟逵�筠戟龜筠>]\n" +" [--exec-path[=<極���>]] [--html-path] [--man-path] [--info-path]\n" +" [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n" +" [--git-dir=<極���>] [--work-tree=<極���>] [--namespace=<龜劇�>]\n" +" <克棘劇逵戟畇逵> [<逵�均�劇筠戟��>]" #. type: Plain text #: en/git.txt:24 @@ -45183,9 +45448,9 @@ msgstr "" #. type: Title ~ #: en/git.txt:190 -#, no-wrap +#, fuzzy, no-wrap msgid "Main porcelain commands" -msgstr "" +msgstr "��戟棘勻戟�筠 劇逵�龜戟棘�龜�逵筠劇�筠 克棘劇逵戟畇�" #. type: Title ~ #: en/git.txt:195 @@ -45207,7 +45472,7 @@ msgstr "" #: en/git.txt:206 #, no-wrap msgid "Interacting with Others" -msgstr "" +msgstr "�鈞逵龜劇棘畇筠橘��勻龜筠 � 畇��均龜劇龜" #. type: Plain text #: en/git.txt:210 @@ -45627,8 +45892,9 @@ msgstr "" #. type: Plain text #: en/git.txt:470 +#, fuzzy msgid "see linkgit:git-commit-tree[1]" -msgstr "" +msgstr "linkgit:git-commit-tree[1]" #. type: Title ~ #: en/git.txt:472 @@ -47291,9 +47557,9 @@ msgstr "" #. type: Labeled list #: en/git-update-ref.txt:104 -#, no-wrap +#, fuzzy, no-wrap msgid "delete" -msgstr "" +msgstr "--delete" #. type: Plain text #: en/git-update-ref.txt:107 @@ -47302,9 +47568,9 @@ msgstr "" #. type: Labeled list #: en/git-update-ref.txt:108 -#, no-wrap +#, fuzzy, no-wrap msgid "verify" -msgstr "" +msgstr "--verify" #. type: Plain text #: en/git-update-ref.txt:111 @@ -47313,9 +47579,9 @@ msgstr "" #. type: Labeled list #: en/git-update-ref.txt:112 -#, no-wrap +#, fuzzy, no-wrap msgid "option" -msgstr "" +msgstr "`option`" #. type: Plain text #: en/git-update-ref.txt:116 @@ -47383,9 +47649,9 @@ msgstr "" #. type: Plain text #: en/git-update-server-info.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git update-server-info' [--force]\n" -msgstr "" +msgstr "git update-server-info [--force]" #. type: Plain text #: en/git-update-server-info.txt:21 @@ -47394,8 +47660,9 @@ msgstr "" #. type: Plain text #: en/git-update-server-info.txt:29 +#, fuzzy msgid "Update the info files from scratch." -msgstr "" +msgstr "棘閨戟棘勻龜�� 龜戟�棘�劇逵�龜� 棘 �筠�勻筠�逵� � 戟�剋�" #. type: Plain text #: en/git-update-server-info.txt:37 @@ -47517,13 +47784,15 @@ msgstr "--[no-]strict" #. type: Plain text #: en/git-upload-pack.txt:30 +#, fuzzy msgid "Do not try <directory>/.git/ if <directory> is no Git directory." -msgstr "" +msgstr "戟筠 極�棘勻筠���� <克逵�逵剋棘均>/.git/ 筠�剋龜 <克逵�逵剋棘均> 戟筠 �勻剋�筠��� 克逵�逵剋棘均棘劇 Git" #. type: Plain text #: en/git-upload-pack.txt:33 +#, fuzzy msgid "Interrupt transfer after <n> seconds of inactivity." -msgstr "" +msgstr "極�筠�勻逵�� 極筠�筠畇逵�� 極棘�剋筠 <克棘剋> �筠克�戟畇 極�棘��棘�" #. type: Labeled list #: en/git-upload-pack.txt:34 @@ -47577,8 +47846,9 @@ msgstr "" #. type: Plain text #: en/git-var.txt:17 +#, fuzzy msgid "Prints a Git logical variable." -msgstr "" +msgstr "��勻棘畇 剋棘均龜�筠�克棘橘 極筠�筠劇筠戟戟棘橘 Git" #. type: Plain text #: en/git-var.txt:25 @@ -47711,9 +47981,9 @@ msgstr "" #. type: Plain text #: en/git-verify-pack.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git verify-pack' [-v|--verbose] [-s|--stat-only] [--] <pack>.idx ...\n" -msgstr "" +msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <極逵克筠�>��" #. type: Plain text #: en/git-verify-pack.txt:20 @@ -48206,9 +48476,9 @@ msgstr "" #. type: Labeled list #: en/git-worktree.txt:96 -#, no-wrap +#, fuzzy, no-wrap msgid "move" -msgstr "" +msgstr "�筠菌龜劇" #. type: Plain text #: en/git-worktree.txt:100 @@ -48576,9 +48846,9 @@ msgstr "" #. type: Plain text #: en/git-write-tree.txt:13 -#, no-wrap +#, fuzzy, no-wrap msgid "'git write-tree' [--missing-ok] [--prefix=<prefix>/]\n" -msgstr "" +msgstr "git write-tree [--missing-ok] [--prefix=<極�筠�龜克�>/]" #. type: Plain text #: en/git-write-tree.txt:18 @@ -49041,9 +49311,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:16 -#, no-wrap +#, fuzzy, no-wrap msgid "recursive" -msgstr "" +msgstr "--recursive" #. type: Plain text #: en/merge-strategies.txt:29 @@ -49073,9 +49343,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:42 -#, no-wrap +#, fuzzy, no-wrap msgid "theirs" -msgstr "" +msgstr "--theirs" #. type: Plain text #: en/merge-strategies.txt:45 @@ -49084,9 +49354,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:46 -#, no-wrap +#, fuzzy, no-wrap msgid "patience" -msgstr "" +msgstr "--patience" #. type: Plain text #: en/merge-strategies.txt:52 @@ -49106,9 +49376,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:62 -#, no-wrap +#, fuzzy, no-wrap msgid "ignore-cr-at-eol" -msgstr "" +msgstr "--ignore-cr-at-eol" #. type: Plain text #: en/merge-strategies.txt:68 @@ -49132,9 +49402,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:75 -#, no-wrap +#, fuzzy, no-wrap msgid "renormalize" -msgstr "" +msgstr "--renormalize" #. type: Plain text #: en/merge-strategies.txt:82 @@ -49143,9 +49413,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:83 -#, no-wrap +#, fuzzy, no-wrap msgid "no-renormalize" -msgstr "" +msgstr "--renormalize" #. type: Plain text #: en/merge-strategies.txt:86 @@ -49154,9 +49424,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:87 -#, no-wrap +#, fuzzy, no-wrap msgid "no-renames" -msgstr "" +msgstr "--no-renames" #. type: Plain text #: en/merge-strategies.txt:91 @@ -49198,9 +49468,9 @@ msgstr "" #. type: Labeled list #: en/merge-strategies.txt:108 -#, no-wrap +#, fuzzy, no-wrap msgid "octopus" -msgstr "" +msgstr "--octopus" #. type: Plain text #: en/merge-strategies.txt:114 @@ -49974,9 +50244,9 @@ msgstr "" #. type: Labeled list #: en/pretty-options.txt:45 -#, no-wrap +#, fuzzy, no-wrap msgid "--expand-tabs=<n>" -msgstr "" +msgstr "--expand-tabs" #. type: Labeled list #: en/pretty-options.txt:46 @@ -50083,9 +50353,9 @@ msgstr "" #. type: Labeled list #: en/pull-fetch-param.txt:14 -#, no-wrap +#, fuzzy, no-wrap msgid "<refspec>" -msgstr "" +msgstr "�極筠�龜�龜克逵�棘� ���剋克龜" #. type: Plain text #: en/pull-fetch-param.txt:18 -- GitLab