From d46895c1b1759fa26afd94c4c0d9098dc35a1fd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-No=C3=ABl=20Avila?= <jn.avila@free.fr>
Date: Thu, 15 Aug 2019 16:58:52 +0200
Subject: [PATCH] pt_BR: fix linkgit macros
---
po/documentation.pt_BR.po | 12808 ++++++++++++++++++------------------
1 file changed, 6254 insertions(+), 6554 deletions(-)
diff --git a/po/documentation.pt_BR.po b/po/documentation.pt_BR.po
index 25ac8e0..b4de728 100644
--- a/po/documentation.pt_BR.po
+++ b/po/documentation.pt_BR.po
@@ -4,7 +4,8 @@
#
msgid ""
msgstr ""
-"PO-Revision-Date: 2019-06-25 12:10+0000\n"
+"POT-Creation-Date: 2019-02-13 20:53+0100\n"
+"PO-Revision-Date: 2019-08-09 22:48+0200\n"
"Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n"
"Language-Team: none\n"
"Language: pt_BR\n"
@@ -18,7 +19,7 @@ msgstr ""
#: 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
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-b"
msgstr "-b"
@@ -34,7 +35,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:5 en/git-diff-tree.txt:42 en/git-format-patch.txt:314
#: en/git-fsck.txt:38 en/git-rebase.txt:465
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--root"
msgstr "--root"
@@ -49,7 +50,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:9
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-stats"
msgstr "--show-stats"
@@ -82,8 +83,8 @@ msgstr ""
#. type: Plain text
#: en/blame-options.txt:19
msgid ""
-"<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from"
-" <start> to end of file. ``-L ,<end>'' spans from start of file to <end>."
+"<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from "
+"<start> to end of file. ``-L ,<end>'' spans from start of file to <end>."
msgstr ""
"<come챌o> e <fim> s찾o opcionais. ``-L <come챌o>\" ou ``-L <come챌o>,\" toma do "
"<come챌o> at챕 o fim do arquivo. ``-L <fim>\" toma do come챌o do arquivo at챕 "
@@ -94,7 +95,7 @@ msgstr ""
#: en/git-checkout.txt:185 en/git-clone.txt:44 en/git-config.txt:164
#: en/git-grep.txt:186 en/git-instaweb.txt:23 en/git-ls-tree.txt:51
#: en/git-repack.txt:66 en/git-svn.txt:244 en/git-tag.txt:92 en/git-var.txt:20
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-l"
msgstr "-l"
@@ -108,7 +109,7 @@ msgstr "Mostra o rev longo (Padr찾o: desligado)."
#: en/git-cat-file.txt:36 en/git-checkout.txt:166 en/git-diff-tree.txt:39
#: en/git-ls-files.txt:113 en/git-ls-remote.txt:26 en/git-ls-tree.txt:47
#: en/git-svn.txt:312 en/rev-list-options.txt:974
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-t"
msgstr "-t"
@@ -139,11 +140,11 @@ msgstr "--reverso <rev>..<rev>"
#. type: Plain text
#: en/blame-options.txt:38
msgid ""
-"Walk history forward instead of backward. Instead of showing the revision in"
-" which a line appeared, this shows the last revision in which a line has "
-"existed. This requires a range of revision like START..END where the path to"
-" blame exists in START. `git blame --reverse START` is taken as `git blame "
-"--reverse START..HEAD` for convenience."
+"Walk history forward instead of backward. Instead of showing the revision in "
+"which a line appeared, this shows the last revision in which a line has "
+"existed. This requires a range of revision like START..END where the path to "
+"blame exists in START. `git blame --reverse START` is taken as `git blame --"
+"reverse START..HEAD` for convenience."
msgstr ""
"Caminhe para a frente em vez de para tr찼s. Em vez de mostrar a revis찾o em "
"que uma linha apareceu, isso mostra a 첬ltima revis찾o em que uma linha "
@@ -158,14 +159,14 @@ msgstr ""
#: en/git-grep.txt:237 en/git-instaweb.txt:41 en/git-merge-file.txt:63
#: en/git-rebase.txt:428 en/git-request-pull.txt:29 en/git-svn.txt:535
#: en/git-svn.txt:679 en/git.txt:99
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-p"
msgstr "-p"
#. type: Labeled list
#: en/blame-options.txt:40 en/git-commit.txt:113 en/git-push.txt:176
#: en/git-worktree.txt:179
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--porcelain"
msgstr "--porcelain"
@@ -176,7 +177,7 @@ msgstr "Mostra em um formato designado para o consumo de m찼quina."
#. type: Labeled list
#: en/blame-options.txt:43
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--line-porcelain"
msgstr "--line-porcelain"
@@ -187,12 +188,12 @@ msgid ""
"just the first time a commit is referenced. Implies --porcelain."
msgstr ""
"Mostra o formato porcelain, mas a informa챌찾o de sa챠da do commit para cada "
-"linha, n찾o apenas a primeira vez que o commit 챕 referenciado. Implica "
-"--porcelain."
+"linha, n찾o apenas a primeira vez que o commit 챕 referenciado. Implica --"
+"porcelain."
#. type: Labeled list
#: en/blame-options.txt:48 en/git-pack-objects.txt:138 en/git-svn.txt:373
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--incremental"
msgstr "--incremental"
@@ -263,7 +264,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:73 en/git-checkout.txt:121 en/git-fsck.txt:92
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]progress"
msgstr "--[no-]progress"
@@ -277,8 +278,8 @@ msgid ""
msgstr ""
"O status de progresso 챕 reportado na sa챠da padr찾o de erro por padr찾o quando "
"est찼 anexado a um terminal. Esta flag habilita o relat처rio de progresso caso "
-"n찾o esteja anexado a um terminal. N찾o use `--progress` junto com "
-"`--porcelain` ou `--incremental`."
+"n찾o esteja anexado a um terminal. N찾o use `--progress` junto com `--"
+"porcelain` ou `--incremental`."
#. type: Labeled list
#: en/blame-options.txt:80
@@ -292,8 +293,8 @@ msgid ""
"Detect moved or copied lines within a file. When a commit moves or copies a "
"block of lines (e.g. the original file has A and then B, and the commit "
"changes it to B and then A), the traditional 'blame' algorithm notices only "
-"half of the movement and typically blames the lines that were moved up (i.e."
-" B) to the parent and assigns blame to the lines that were moved down (i.e. "
+"half of the movement and typically blames the lines that were moved up (i.e. "
+"B) to the parent and assigns blame to the lines that were moved down (i.e. "
"A) to the child commit. With this option, both groups of lines are blamed "
"on the parent by running extra passes of inspection."
msgstr ""
@@ -326,10 +327,10 @@ msgstr "-C[<num>]"
#. type: Plain text
#: en/blame-options.txt:105
msgid ""
-"In addition to `-M`, detect lines moved or copied from other files that were"
-" modified in the same commit. This is useful when you reorganize your "
-"program and move code around across files. When this option is given twice,"
-" the command additionally looks for copies from other files in the commit "
+"In addition to `-M`, detect lines moved or copied from other files that were "
+"modified in the same commit. This is useful when you reorganize your "
+"program and move code around across files. When this option is given twice, "
+"the command additionally looks for copies from other files in the commit "
"that creates the file. When this option is given three times, the command "
"additionally looks for copies from other files in any commit."
msgstr ""
@@ -358,7 +359,7 @@ msgstr ""
#. type: Labeled list
#: en/blame-options.txt:113 en/git-archimport.txt:71 en/git-cvsimport.txt:184
#: en/git-cvsserver.txt:48 en/git-grep.txt:144 en/git-ls-remote.txt:24
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-h"
msgstr "-h"
@@ -369,7 +370,7 @@ msgstr "Mostra a mensagem de ajuda."
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:1 en/git-blame.txt:232
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-annotate[1]"
msgstr "linkgit:git-annotate[1]"
@@ -380,7 +381,7 @@ msgstr "Anota as linhas de informa챌찾o do commit."
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:4 en/git-annotate.txt:30
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-blame[1]"
msgstr "linkgit:git-blame[1]"
@@ -392,7 +393,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:7
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-count-objects[1]"
msgstr "linkgit:git-count-objects[1]"
@@ -403,7 +404,7 @@ msgstr "Conta o n첬mero de objetos n찾o empacotados e seu consumo de disco."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:10
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-difftool[1]"
msgstr "linkgit:git-difftool[1]"
@@ -414,7 +415,7 @@ msgstr "Mostra mudan챌as usando ferramentas comuns de diff."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:13
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-fsck[1]"
msgstr "linkgit:git-fsck[1]"
@@ -425,7 +426,7 @@ msgstr "Verifica a conectividade e validade dos objetos em um banco de dados."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:16
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-help[1]"
msgstr "linkgit:git-help[1]"
@@ -436,7 +437,7 @@ msgstr "Mostra informa챌찾o de ajuda sobre o Git."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:19
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-instaweb[1]"
msgstr "linkgit:git-instaweb[1]"
@@ -447,7 +448,7 @@ msgstr "Procura instantaneamente em seu reposit처rio de trabalho na gitweb."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:22
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-merge-tree[1]"
msgstr "linkgit:git-merge-tree[1]"
@@ -458,7 +459,7 @@ msgstr "Mostra as tr챗s vias de merge sem mexer no index."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:25
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-rerere[1]"
msgstr "linkgit:git-rerere[1]"
@@ -469,7 +470,7 @@ msgstr "Resua uma resolu챌찾o gravada de merges em conflito."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:28
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-show-branch[1]"
msgstr "linkgit:git-show-branch[1]"
@@ -480,7 +481,7 @@ msgstr "Mostra banches e seus commits."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:31
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-verify-commit[1]"
msgstr "linkgit:git-verify-commit[1]"
@@ -491,7 +492,7 @@ msgstr "Mostra a assinatura GPG dos commits."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:34
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-verify-tag[1]"
msgstr "linkgit:git-verify-tag[1]"
@@ -502,7 +503,7 @@ msgstr "Mostra a assinatura GPG de tags."
#. type: Labeled list
#: en/cmds-ancillaryinterrogators.txt:37
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-whatchanged[1]"
msgstr "linkgit:git-whatchanged[1]"
@@ -513,7 +514,7 @@ msgstr "Mostra logs com a diferen챌a entre a introdu챌찾o de cada commit."
#. type: Plain text
#: en/cmds-ancillaryinterrogators.txt:40 en/git-instaweb.txt:91
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:gitweb[1]"
msgstr "linkgit:gitweb[1]"
@@ -524,7 +525,7 @@ msgstr "Interface web Git (frontend web para reposit처rios Git)."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:1 en/git-difftool.txt:142
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-config[1]"
msgstr "linkgit:git-config[1]"
@@ -535,7 +536,7 @@ msgstr "Obt챕m e seta reposit처rios ou op챌천es globais."
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:4 en/git-fast-import.txt:1489
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-fast-export[1]"
msgstr "linkgit:git-fast-export[1]"
@@ -546,7 +547,7 @@ msgstr "tipo: Texto plano."
#. type: Plain text
#: en/cmds-ancillarymanipulators.txt:7 en/git-fast-export.txt:236
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-fast-import[1]"
msgstr "linkgit:git-fast-import[1]"
@@ -557,7 +558,7 @@ msgstr "Backend para importadores de dados r찼pidos Git."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:10
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-filter-branch[1]"
msgstr "linkgit:git-filter-branch[1]"
@@ -568,7 +569,7 @@ msgstr "Reescreve branches."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:13 en/git-difftool.txt:139
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-mergetool[1]"
msgstr "linkgit:git-mergetool[1]"
@@ -581,7 +582,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:16
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-pack-refs[1]"
msgstr "linkgit:git-pack-refs[1]"
@@ -592,7 +593,7 @@ msgstr "Empacota heads e tags para acesso eficiente ao reposit처rio."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:19
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-prune[1]"
msgstr "linkgit:git-prune[1]"
@@ -603,7 +604,7 @@ msgstr "Suprime todos os objetos fora de alcance do banco de dados de objetos."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:22
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-reflog[1]"
msgstr "linkgit:git-reflog[1]"
@@ -614,7 +615,7 @@ msgstr "Gerencia a informa챌찾o de reflog."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:25
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-remote[1]"
msgstr "linkgit:git-remote[1]"
@@ -625,7 +626,7 @@ msgstr "Gerencia o conjunto de reposit처rios monitorados."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:28
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-repack[1]"
msgstr "linkgit:git-repack[1]"
@@ -636,7 +637,7 @@ msgstr "Empacota objetos n찾o empacotados em um reposit처rio."
#. type: Labeled list
#: en/cmds-ancillarymanipulators.txt:31
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-replace[1]"
msgstr "linkgit:git-replace[1]"
@@ -647,7 +648,7 @@ msgstr "Cria, lista, deleta refs para substituir objetos."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:1
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-archimport[1]"
msgstr "linkgit:git-archimport[1]"
@@ -658,7 +659,7 @@ msgstr "Importa um reposit처rio GNU Arch no Git."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:4
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-cvsexportcommit[1]"
msgstr "linkgit:git-cvsexportcommit[1]"
@@ -669,7 +670,7 @@ msgstr "Exporta um commit unico para um checkout do CVS."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:7
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-cvsimport[1]"
msgstr "linkgit:git-cvsimport[1]"
@@ -680,7 +681,7 @@ msgstr "Recupera seus dados que outras pessoas SCM adoram odiar."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:10
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-cvsserver[1]"
msgstr "linkgit:git-cvsserver[1]"
@@ -691,7 +692,7 @@ msgstr "Um emulador de servidor CVS para Git."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:13
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-imap-send[1]"
msgstr "linkgit:git-imap-send[1]"
@@ -702,7 +703,7 @@ msgstr "Manda uma cole챌찾o de patches da entrada padr찾o para uma pasta IMAP."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:16
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-p4[1]"
msgstr "linkgit:git-p4[1]"
@@ -713,7 +714,7 @@ msgstr "Importa de e submete aos reposit처rio Perforce."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:19
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-quiltimport[1]"
msgstr "linkgit:git-quiltimport[1]"
@@ -724,7 +725,7 @@ msgstr "Aplica um conjunto de patches na branch atual."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:22
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-request-pull[1]"
msgstr "linkgit:git-request-pull[1]"
@@ -735,7 +736,7 @@ msgstr "Cria um sum찼rio de mudan챌as pendentes."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:25
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-send-email[1]"
msgstr "linkgit:git-send-email[1]"
@@ -746,7 +747,7 @@ msgstr "Manda uma cole챌찾o de patches como emails."
#. type: Labeled list
#: en/cmds-foreignscminterface.txt:28
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-svn[1]"
msgstr "linkgit:git-svn[1]"
@@ -757,7 +758,7 @@ msgstr "Opera챌찾o bidirecional entre um reposit처rio do Subversion e Git."
#. type: Plain text
#: en/cmds-mainporcelain.txt:1 en/git-rm.txt:186
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-add[1]"
msgstr "linkgit:git-add[1]"
@@ -768,7 +769,7 @@ msgstr "Adiciona o conte첬do de arquivos ao index."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:4
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-am[1]"
msgstr "linkgit:git-am[1]"
@@ -779,7 +780,7 @@ msgstr "Aplica uma s챕rie de patches de uma caixa de e-mails."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:7
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-archive[1]"
msgstr "linkgit:git-archive[1]"
@@ -790,7 +791,7 @@ msgstr "Cria um hist처rico de arquivos a partir de uma 찼rvore nomeada."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:10
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-bisect[1]"
msgstr "linkgit:git-bisect[1]"
@@ -801,7 +802,7 @@ msgstr "Usa uma busca bin찼ria para procurar o commit que introduziu um bug."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:13
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-branch[1]"
msgstr "linkgit:git-branch[1]"
@@ -812,7 +813,7 @@ msgstr "Lista, cria ou deleta branches."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:16
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-bundle[1]"
msgstr "linkgit:git-bundle[1]"
@@ -823,7 +824,7 @@ msgstr "Move objetos e refs pelo hist처rico."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:19
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-checkout[1]"
msgstr "linkgit:git-checkout[1]"
@@ -834,7 +835,7 @@ msgstr "Move branches ou restaura arquivos de 찼rvores de trabalho."
#. type: Plain text
#: en/cmds-mainporcelain.txt:22 en/git-revert.txt:126
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-cherry-pick[1]"
msgstr "linkgit:git-cherry-pick[1]"
@@ -845,7 +846,7 @@ msgstr "Aplica as mudan챌as introduzidas por alguns commits existentes."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:25
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-citool[1]"
msgstr "linkgit:git-citool[1]"
@@ -856,7 +857,7 @@ msgstr "Alternativa gr찼fica ao git-commit."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:28
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-clean[1]"
msgstr "linkgit:git-clean[1]"
@@ -867,7 +868,7 @@ msgstr "Remove arquivos n찾o rastrados da 찼rvore de trabalho."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:31
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-clone[1]"
msgstr "linkgit:git-clone[1]"
@@ -878,7 +879,7 @@ msgstr "Clona um reposit처rio em um novo reposit처rio."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:34
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-commit[1]"
msgstr "linkgit:git-commit[1]"
@@ -889,7 +890,7 @@ msgstr "Grava as mudan챌as para o reposit처rio."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:37
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-describe[1]"
msgstr "linkgit:git-describe[1]"
@@ -902,7 +903,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:40 en/git-difftool.txt:136
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-diff[1]"
msgstr "linkgit:git-diff[1]"
@@ -913,7 +914,7 @@ msgstr "Mostra mudan챌as entre commits, commit e 찼rvore de trabalho, etc."
#. type: Plain text
#: en/cmds-mainporcelain.txt:43 en/git-fetch-pack.txt:129
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-fetch[1]"
msgstr "linkgit:git-fetch[1]"
@@ -924,7 +925,7 @@ msgstr "Faz o download de objetos e refs de outro reposit처rio."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:46
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-format-patch[1]"
msgstr "linkgit:git-format-patch[1]"
@@ -935,7 +936,7 @@ msgstr "Prepara patches para submiss찾o por e-mail."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:49
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-gc[1]"
msgstr "linkgit:git-gc[1]"
@@ -946,7 +947,7 @@ msgstr "Limpa arquivos desnecess찼rios e otimiza o reposit처rio local."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:52
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-grep[1]"
msgstr "linkgit:git-grep[1]"
@@ -957,7 +958,7 @@ msgstr "Imprime linhas de um padr찾o encontrado."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:55
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-gui[1]"
msgstr "linkgit:git-gui[1]"
@@ -968,7 +969,7 @@ msgstr "Uma interface gr찼fica port찼til para o Git."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:58
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-init[1]"
msgstr "linkgit:git-init[1]"
@@ -981,7 +982,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-mainporcelain.txt:61
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-log[1]"
msgstr "linkgit:git-log[1]"
@@ -992,7 +993,7 @@ msgstr "Mostra os logs de commit."
#. type: Plain text
#: en/cmds-mainporcelain.txt:64 en/git-fmt-merge-msg.txt:75
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-merge[1]"
msgstr "linkgit:git-merge[1]"
@@ -1003,7 +1004,7 @@ msgstr "Junta dois ou mais hist처ricos de desenvolvimento juntos."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:67
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-mv[1]"
msgstr "linkgit:git-mv[1]"
@@ -1014,7 +1015,7 @@ msgstr "Move ou renomeia um arquivo, um diret처rio, ou um link simb처lico."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:70
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-notes[1]"
msgstr "linkgit:git-notes[1]"
@@ -1025,7 +1026,7 @@ msgstr "Adiciona ou inspeciona objetos de nota."
#. type: Plain text
#: en/cmds-mainporcelain.txt:73 en/git-fetch.txt:296
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-pull[1]"
msgstr "linkgit:git-pull[1]"
@@ -1036,7 +1037,7 @@ msgstr "Busca de e integra com outro reposit처rio ou branch local."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:76
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-push[1]"
msgstr "linkgit:git-push[1]"
@@ -1047,7 +1048,7 @@ msgstr "Atualiza refs remotas atrav챕s de objetos associados."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:79
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-range-diff[1]"
msgstr "linkgit:git-range-diff[1]"
@@ -1058,7 +1059,7 @@ msgstr "Compara dois intervalos de commit (e.x. duas vers천es de uma branch)."
#. type: Plain text
#: en/cmds-mainporcelain.txt:82 en/git-svn.txt:1171
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-rebase[1]"
msgstr "linkgit:git-rebase[1]"
@@ -1069,7 +1070,7 @@ msgstr "Reaplica commits no top de outra ponta de base."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:85
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-reset[1]"
msgstr "linkgit:git-reset[1]"
@@ -1080,7 +1081,7 @@ msgstr "Reseta o HEAD corrente para o estado especificado."
#. type: Plain text
#: en/cmds-mainporcelain.txt:88 en/git-cherry-pick.txt:230
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-revert[1]"
msgstr "linkgit:git-revert[1]"
@@ -1091,7 +1092,7 @@ msgstr "Reverte alguns commits existente."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:91
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-rm[1]"
msgstr "linkgit:git-rm[1]"
@@ -1102,7 +1103,7 @@ msgstr "Remove arquivos da 찼rvore de trabalho e do index."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:94
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-shortlog[1]"
msgstr "linkgit:git-shortlog[1]"
@@ -1113,7 +1114,7 @@ msgstr "Sumaria a sa챠da de 'git log'."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:97
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-show[1]"
msgstr "linkgit:git-show[1]"
@@ -1124,7 +1125,7 @@ msgstr "Mostra v찼rios tipos de objetos."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:100
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-stash[1]"
msgstr "linkgit:git-stash[1]"
@@ -1135,7 +1136,7 @@ msgstr "Esconde as mudan챌as em um diret처rio de trabalho ausente."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:103
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-status[1]"
msgstr "linkgit:git-status[1]"
@@ -1146,7 +1147,7 @@ msgstr "Mostra o status da 찼rvore de trabalho."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:106
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-submodule[1]"
msgstr "linkgit:git-submodule[1]"
@@ -1157,7 +1158,7 @@ msgstr "Inicializa, atualize ou inspeciona submodulos."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:109
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-tag[1]"
msgstr "linkgit:git-tag[1]"
@@ -1168,7 +1169,7 @@ msgstr "Cria, lista, deleta ou verifica uma tag de objeto assinada com GPG."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:112
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-worktree[1]"
msgstr "linkgit:git-worktree[1]"
@@ -1179,7 +1180,7 @@ msgstr "Manipula m첬ltiplas 찼rvores de trabalho."
#. type: Labeled list
#: en/cmds-mainporcelain.txt:115 en/git-gui.txt:104
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:gitk[1]"
msgstr "linkgit:gitk[1]"
@@ -1190,7 +1191,7 @@ msgstr "O browser de reposit처rio Git."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:1
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-cat-file[1]"
msgstr "linkgit:git-cat-file[1]"
@@ -1203,7 +1204,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:4
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-cherry[1]"
msgstr "linkgit:git-cherry[1]"
@@ -1214,7 +1215,7 @@ msgstr "Procura commits que ainda ser찾o aplicados em upstream."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:7
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-diff-files[1]"
msgstr "linkgit:git-diff-files[1]"
@@ -1225,7 +1226,7 @@ msgstr "Compara arquivos na 찼rvore de trabalho e no index."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:10
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-diff-index[1]"
msgstr "linkgit:git-diff-index[1]"
@@ -1236,7 +1237,7 @@ msgstr "Compara uma 찼rvore ao diret처rio de trabalho ou index."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:13
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-diff-tree[1]"
msgstr "linkgit:git-diff-tree[1]"
@@ -1248,7 +1249,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:16
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-for-each-ref[1]"
msgstr "linkgit:git-for-each-ref[1]"
@@ -1259,7 +1260,7 @@ msgstr "Informa챌찾o de output de cada ref."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:19
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-get-tar-commit-id[1]"
msgstr "linkgit:git-get-tar-commit-id[1]"
@@ -1270,7 +1271,7 @@ msgstr "Extrai o ID de commit de um arquivo criado usando git-archive."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:22
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-ls-files[1]"
msgstr "linkgit:git-ls-files[1]"
@@ -1281,7 +1282,7 @@ msgstr "Mostra a informa챌찾o sobre arquivos no index e na 찼rvore de trabalho."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:25
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-ls-remote[1]"
msgstr "linkgit:git-ls-remote[1]"
@@ -1292,7 +1293,7 @@ msgstr "Lista as refer챗ncias em um reposit처rio remoto."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:28
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-ls-tree[1]"
msgstr "linkgit:git-ls-tree[1]"
@@ -1303,7 +1304,7 @@ msgstr "Lista o conte첬do de uma 찼rvore de objetos."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:31
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-merge-base[1]"
msgstr "linkgit:git-merge-base[1]"
@@ -1314,7 +1315,7 @@ msgstr "Mostra os melhores ancestrais poss챠veis para um merge."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:34
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-name-rev[1]"
msgstr "linkgit:git-name-rev[1]"
@@ -1325,7 +1326,7 @@ msgstr "Mostra nomes simb처licos para dadas revs."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:37
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-pack-redundant[1]"
msgstr "linkgit:git-pack-redundant[1]"
@@ -1336,7 +1337,7 @@ msgstr "Mostra arquivos pack redundantes."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:40
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-rev-list[1]"
msgstr "linkgit:git-rev-list[1]"
@@ -1347,7 +1348,7 @@ msgstr "Lista objetos de commit em ordem cronol처gica reversa."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:43
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-rev-parse[1]"
msgstr "linkgit:git-rev-parse[1]"
@@ -1358,7 +1359,7 @@ msgstr "Escolha e modele os par창metros."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:46
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-show-index[1]"
msgstr "linkgit:git-show-index[1]"
@@ -1369,7 +1370,7 @@ msgstr "Mostra o index hist처rico compactado."
#. type: Plain text
#: en/cmds-plumbinginterrogators.txt:49 en/git-for-each-ref.txt:386
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-show-ref[1]"
msgstr "linkgit:git-show-ref[1]"
@@ -1380,7 +1381,7 @@ msgstr "Lista refer챗ncias em um reposit처rio local."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:52
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-unpack-file[1]"
msgstr "linkgit:git-unpack-file[1]"
@@ -1391,7 +1392,7 @@ msgstr "Cria um arquivo tempor찼rio com conte첬do de blob."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:55
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-var[1]"
msgstr "linkgit:git-var[1]"
@@ -1402,7 +1403,7 @@ msgstr "Mostra uma vari찼vel l처gica local Git."
#. type: Labeled list
#: en/cmds-plumbinginterrogators.txt:58
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-verify-pack[1]"
msgstr "linkgit:git-verify-pack[1]"
@@ -1413,7 +1414,7 @@ msgstr "Valida hist처ricos compactados Git."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:1
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-apply[1]"
msgstr "linkgit:git-apply[1]"
@@ -1424,7 +1425,7 @@ msgstr "Aplica um patch a arquivos e/ou ao index."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:4
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-checkout-index[1]"
msgstr "linkgit:git-checkout-index[1]"
@@ -1435,7 +1436,7 @@ msgstr "Copia arquivos do index para a 찼rvore de diret처rio."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:7
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-commit-graph[1]"
msgstr "linkgit:git-commit-graph[1]"
@@ -1446,7 +1447,7 @@ msgstr "Escreve e verifica arquivos de grafo-commit."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:10
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-commit-tree[1]"
msgstr "linkgit:git-commit-tree[1]"
@@ -1457,7 +1458,7 @@ msgstr "Cria um novo objeto de commit."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:13
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-hash-object[1]"
msgstr "linkgit:git-hash-object[1]"
@@ -1468,7 +1469,7 @@ msgstr "Calcula o ID do objeto e opcionalmente cria um blob de um arquivo."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:16
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-index-pack[1]"
msgstr "linkgit:git-index-pack[1]"
@@ -1481,7 +1482,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:19
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-merge-file[1]"
msgstr "linkgit:git-merge-file[1]"
@@ -1492,7 +1493,7 @@ msgstr "Executar um arquivo de tr챗s vias, merge."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:22
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-merge-index[1]"
msgstr "linkgit:git-merge-index[1]"
@@ -1503,7 +1504,7 @@ msgstr "Executa um merge para arquivos que necessitam de merge."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:25
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-mktag[1]"
msgstr "linkgit:git-mktag[1]"
@@ -1514,7 +1515,7 @@ msgstr "Cria um objeto tag."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:28
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-mktree[1]"
msgstr "linkgit:git-mktree[1]"
@@ -1525,7 +1526,7 @@ msgstr "Cria uma 찼rvore-objeto de um texto formatado ls-tree."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:31
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-multi-pack-index[1]"
msgstr "linkgit:git-multi-pack-index[1]"
@@ -1536,7 +1537,7 @@ msgstr "Escreve e verifica hist처ricos multi compactados."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:34
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-pack-objects[1]"
msgstr "linkgit:git-pack-objects[1]"
@@ -1547,7 +1548,7 @@ msgstr "Cria um hist처rico compactado de objetos."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:37
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-prune-packed[1]"
msgstr "linkgit:git-prune-packed[1]"
@@ -1558,7 +1559,7 @@ msgstr "Remove objetos extras que existem atualmente em arquivos compactados."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:40
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-read-tree[1]"
msgstr "linkgit:git-read-tree[1]"
@@ -1569,7 +1570,7 @@ msgstr "L챗 informa챌찾o de 찼rvore no index."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:43
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-symbolic-ref[1]"
msgstr "linkgit:git-symbolic-ref[1]"
@@ -1580,7 +1581,7 @@ msgstr "L챗, modifica e deleta refer챗ncias simb처licas."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:46
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-unpack-objects[1]"
msgstr "linkgit:git-unpack-objects[1]"
@@ -1591,7 +1592,7 @@ msgstr "Descompacta objetos de um hist처ricos compactado."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:49
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-update-index[1]"
msgstr "linkgit:git-update-index[1]"
@@ -1602,7 +1603,7 @@ msgstr "Registra o conte첬do de arquivo na 찼rvore de trabalho para o index."
#. type: Labeled list
#: en/cmds-plumbingmanipulators.txt:52
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-update-ref[1]"
msgstr "linkgit:git-update-ref[1]"
@@ -1613,7 +1614,7 @@ msgstr "Atualiza o nome do objeto guardado em uma ref de forma segura."
#. type: Plain text
#: en/cmds-plumbingmanipulators.txt:55 en/git-commit-tree.txt:115
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-write-tree[1]"
msgstr "linkgit:git-write-tree[1]"
@@ -1624,7 +1625,7 @@ msgstr "Cria um objeto de 찼rvore do 챠ndice corrente."
#. type: Labeled list
#: en/cmds-purehelpers.txt:1
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-check-attr[1]"
msgstr "linkgit:git-check-attr[1]"
@@ -1635,7 +1636,7 @@ msgstr "Mostra a informa챌찾o de gitattributes."
#. type: Labeled list
#: en/cmds-purehelpers.txt:4
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-check-ignore[1]"
msgstr "linkgit:git-check-ignore[1]"
@@ -1646,7 +1647,7 @@ msgstr "Debuga o gitignore / exclui arquivos."
#. type: Labeled list
#: en/cmds-purehelpers.txt:7
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-check-mailmap[1]"
msgstr "linkgit:git-check-mailmap[1]"
@@ -1657,7 +1658,7 @@ msgstr "Mostra os nomes can척nicos e os endere챌os de email dos contatos."
#. type: Labeled list
#: en/cmds-purehelpers.txt:10
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-check-ref-format[1]"
msgstr "linkgit:git-check-ref-format[1]"
@@ -1668,7 +1669,7 @@ msgstr "Se certifica que um nome de refer챗ncia est찼 bem formado."
#. type: Labeled list
#: en/cmds-purehelpers.txt:13
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-column[1]"
msgstr "linkgit:git-column[1]"
@@ -1679,7 +1680,7 @@ msgstr "Mostra os dados em colunas."
#. type: Labeled list
#: en/cmds-purehelpers.txt:16
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-credential[1]"
msgstr "linkgit:git-credential[1]"
@@ -1690,7 +1691,7 @@ msgstr "Obtem e guarda as credenciais de usu찼rio."
#. type: Labeled list
#: en/cmds-purehelpers.txt:19
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-credential-cache[1]"
msgstr "linkgit:git-credential-cache[1]"
@@ -1701,7 +1702,7 @@ msgstr "Ajuda a guardar senhas temporariamente em mem처ria."
#. type: Labeled list
#: en/cmds-purehelpers.txt:22
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-credential-store[1]"
msgstr "linkgit:git-credential-store[1]"
@@ -1712,7 +1713,7 @@ msgstr "Ajuda a guardar credenciais em disco."
#. type: Labeled list
#: en/cmds-purehelpers.txt:25
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-fmt-merge-msg[1]"
msgstr "linkgit:git-fmt-merge-msg[1]"
@@ -1723,7 +1724,7 @@ msgstr "Produz uma mensagem de commit de merge."
#. type: Labeled list
#: en/cmds-purehelpers.txt:28
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-interpret-trailers[1]"
msgstr "linkgit:git-interpret-trailers[1]"
@@ -1734,7 +1735,7 @@ msgstr "Adiciona ou analisa informa챌찾o estruturada em mensagens de commit."
#. type: Labeled list
#: en/cmds-purehelpers.txt:31
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-mailinfo[1]"
msgstr "linkgit:git-mailinfo[1]"
@@ -1745,7 +1746,7 @@ msgstr "Extrai o patch e o autor de uma 첬nica mensagem de e-mail."
#. type: Labeled list
#: en/cmds-purehelpers.txt:34
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-mailsplit[1]"
msgstr "linkgit:git-mailsplit[1]"
@@ -1756,7 +1757,7 @@ msgstr "Programa simples do divisor UNIX mbox."
#. type: Labeled list
#: en/cmds-purehelpers.txt:37
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-merge-one-file[1]"
msgstr "linkgit:git-merge-one-file[1]"
@@ -1767,7 +1768,7 @@ msgstr "O programa padr찾o de ajuda para usar com git-merge-index."
#. type: Plain text
#: en/cmds-purehelpers.txt:40 en/git-cherry.txt:142
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-patch-id[1]"
msgstr "linkgit:git-patch-id[1]"
@@ -1778,7 +1779,7 @@ msgstr "Computa um 첬nico ID para um patch."
#. type: Labeled list
#: en/cmds-purehelpers.txt:43
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-sh-i18n[1]"
msgstr "linkgit:git-sh-i18n[1]"
@@ -1789,7 +1790,7 @@ msgstr "C처digo de configura챌찾o do i18n do Git para scripts de shell."
#. type: Labeled list
#: en/cmds-purehelpers.txt:46
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-sh-setup[1]"
msgstr "linkgit:git-sh-setup[1]"
@@ -1800,7 +1801,7 @@ msgstr "C처digo de configura챌찾o do script de shell comum do Git."
#. type: Labeled list
#: en/cmds-purehelpers.txt:49
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-stripspace[1]"
msgstr "linkgit:git-stripspace[1]"
@@ -1811,7 +1812,7 @@ msgstr "Remove espa챌os em branco desnecess찼rios."
#. type: Labeled list
#: en/cmds-synchelpers.txt:1
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-http-fetch[1]"
msgstr "linkgit:git-http-fetch[1]"
@@ -1822,7 +1823,7 @@ msgstr "Faz o download de um reposit처rio remoto Git via HTTP."
#. type: Labeled list
#: en/cmds-synchelpers.txt:4
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-http-push[1]"
msgstr "linkgit:git-http-push[1]"
@@ -1833,7 +1834,7 @@ msgstr "Empurra objetos atrav챕s de HTTP/DAV para outro reposit처rio."
#. type: Labeled list
#: en/cmds-synchelpers.txt:7
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-parse-remote[1]"
msgstr "linkgit:git-parse-remote[1]"
@@ -1845,7 +1846,7 @@ msgstr ""
#. type: Labeled list
#: en/cmds-synchelpers.txt:10
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-receive-pack[1]"
msgstr "linkgit:git-receive-pack[1]"
@@ -1856,7 +1857,7 @@ msgstr "Receba o que 챕 enviado ao reposit처rio."
#. type: Labeled list
#: en/cmds-synchelpers.txt:13
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-shell[1]"
msgstr "linkgit:git-shell[1]"
@@ -1867,7 +1868,7 @@ msgstr "Shell de login restrito para acesso somente por SSH do Git."
#. type: Labeled list
#: en/cmds-synchelpers.txt:16
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-upload-archive[1]"
msgstr "linkgit:git-upload-archive[1]"
@@ -1878,7 +1879,7 @@ msgstr "Manda um arquivo de volta ao git-archive."
#. type: Labeled list
#: en/cmds-synchelpers.txt:19
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-upload-pack[1]"
msgstr "linkgit:git-upload-pack[1]"
@@ -1889,7 +1890,7 @@ msgstr "Manda objetos compactados para git-fetch-pack."
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:1
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-daemon[1]"
msgstr "linkgit:git-daemon[1]"
@@ -1900,7 +1901,7 @@ msgstr "Um servidor realmente simples para reposit처rios Git."
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:4
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-fetch-pack[1]"
msgstr "linkgit:git-fetch-pack[1]"
@@ -1911,7 +1912,7 @@ msgstr "Recebe objetos faltantes de um outro reposit처rio."
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:7
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-http-backend[1]"
msgstr "linkgit:git-http-backend[1]"
@@ -1922,7 +1923,7 @@ msgstr "Implementa챌찾o do lado do servidor do Git via HTTP."
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:10
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-send-pack[1]"
msgstr "linkgit:git-send-pack[1]"
@@ -1933,7 +1934,7 @@ msgstr "Faz o push de objetos sob o protocolo Git de outro reposit처rio."
#. type: Labeled list
#: en/cmds-synchingrepositories.txt:13
-#, ignore-same, no-wrap
+#, no-wrap
msgid "linkgit:git-update-server-info[1]"
msgstr "linkgit:git-update-server-info[1]"
@@ -1953,12 +1954,12 @@ msgstr "ARQUIVO DE CONFIGURA횉횄O"
#: en/config.txt:11
msgid ""
"The Git configuration file contains a number of variables that affect the "
-"Git commands' behavior. The files `.git/config` and optionally "
-"`config.worktree` (see `extensions.worktreeConfig` below) in each repository"
-" are used to store the configuration for that repository, and "
-"`$HOME/.gitconfig` is used to store a per-user configuration as fallback "
-"values for the `.git/config` file. The file `/etc/gitconfig` can be used to "
-"store a system-wide default configuration."
+"Git commands' behavior. The files `.git/config` and optionally `config."
+"worktree` (see `extensions.worktreeConfig` below) in each repository are "
+"used to store the configuration for that repository, and `$HOME/.gitconfig` "
+"is used to store a per-user configuration as fallback values for the `.git/"
+"config` file. The file `/etc/gitconfig` can be used to store a system-wide "
+"default configuration."
msgstr ""
"O arquivo de configura챌찾o do Git cont챕m um n첬mero de vari찼veis que afetam o "
"comportamento dos comandos do Git. Os arquivos `.git/config` e, "
@@ -1975,10 +1976,10 @@ msgid ""
"The configuration variables are used by both the Git plumbing and the "
"porcelains. The variables are divided into sections, wherein the fully "
"qualified variable name of the variable itself is the last dot-separated "
-"segment and the section name is everything before the last dot. The variable"
-" names are case-insensitive, allow only alphanumeric characters and `-`, and"
-" must start with an alphabetic character. Some variables may appear "
-"multiple times; we say then that the variable is multivalued."
+"segment and the section name is everything before the last dot. The variable "
+"names are case-insensitive, allow only alphanumeric characters and `-`, and "
+"must start with an alphabetic character. Some variables may appear multiple "
+"times; we say then that the variable is multivalued."
msgstr ""
"As vari찼veis de configura챌찾o s찾o usadas pelo encanamento Git e pelas "
"porcelanas. As vari찼veis s찾o divididas em se챌천es, em que o nome completo da "
@@ -2009,11 +2010,11 @@ msgstr ""
#. type: Plain text
#: en/config.txt:34
msgid ""
-"The file consists of sections and variables. A section begins with the name"
-" of the section in square brackets and continues until the next section "
+"The file consists of sections and variables. A section begins with the name "
+"of the section in square brackets and continues until the next section "
"begins. Section names are case-insensitive. Only alphanumeric characters, "
-"`-` and `.` are allowed in section names. Each variable must belong to some"
-" section, which means that there must be a section header before the first "
+"`-` and `.` are allowed in section names. Each variable must belong to some "
+"section, which means that there must be a section header before the first "
"setting of a variable."
msgstr ""
"O arquivo consiste em se챌천es e vari찼veis. Uma se챌찾o come챌a com o nome da "
@@ -2026,9 +2027,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:38
msgid ""
-"Sections can be further divided into subsections. To begin a subsection put"
-" its name in double quotes, separated by space from the section name, in the"
-" section header, like in the example below:"
+"Sections can be further divided into subsections. To begin a subsection put "
+"its name in double quotes, separated by space from the section name, in the "
+"section header, like in the example below:"
msgstr ""
"As se챌천es podem ser divididas em subse챌천es. Para come챌ar uma subse챌찾o "
"coloque o seu nome em quotes duplos, separados por espa챌os do nome da se챌찾o, "
@@ -2044,13 +2045,13 @@ msgstr "\t[se챌찾o \"subse챌찾o\"]\n"
#: en/config.txt:52
msgid ""
"Subsection names are case sensitive and can contain any characters except "
-"newline and the null byte. Doublequote `\"` and backslash can be included by"
-" escaping them as `\\\"` and `\\\\`, respectively. Backslashes preceding "
-"other characters are dropped when reading; for example, `\\t` is read as `t`"
-" and `\\0` is read as `0` Section headers cannot span multiple lines. "
-"Variables may belong directly to a section or to a given subsection. You can"
-" have `[section]` if you have `[section \"subsection\"]`, but you don't need"
-" to."
+"newline and the null byte. Doublequote `\"` and backslash can be included by "
+"escaping them as `\\\"` and `\\\\`, respectively. Backslashes preceding "
+"other characters are dropped when reading; for example, `\\t` is read as `t` "
+"and `\\0` is read as `0` Section headers cannot span multiple lines. "
+"Variables may belong directly to a section or to a given subsection. You can "
+"have `[section]` if you have `[section \"subsection\"]`, but you don't need "
+"to."
msgstr ""
"Os nomes das subse챌천es diferenciam mai첬sculas e min첬sculas e podem conter "
"qualquer caractere, exceto a nova linha e o byte nulo. Cita챌찾o dupla `\"` e "
@@ -2078,14 +2079,14 @@ msgstr ""
#. type: Plain text
#: en/config.txt:64
msgid ""
-"All the other lines (and the remainder of the line after the section header)"
-" are recognized as setting variables, in the form 'name = value' (or just "
-"'name', which is a short-hand to say that the variable is the boolean "
-"\"true\"). The variable names are case-insensitive, allow only alphanumeric"
-" characters and `-`, and must start with an alphabetic character."
+"All the other lines (and the remainder of the line after the section header) "
+"are recognized as setting variables, in the form 'name = value' (or just "
+"'name', which is a short-hand to say that the variable is the boolean \"true"
+"\"). The variable names are case-insensitive, allow only alphanumeric "
+"characters and `-`, and must start with an alphabetic character."
msgstr ""
-"Todas as outras linhas (e os lembretes da linha depois do cabe챌alho de se챌찾o)"
-" s찾o reconhecidos como vari찼veis defin챠veis, na forma 'nome=valor' (ou "
+"Todas as outras linhas (e os lembretes da linha depois do cabe챌alho de "
+"se챌찾o) s찾o reconhecidos como vari찼veis defin챠veis, na forma 'nome=valor' (ou "
"simplesmente 'nome', o qual 챕 um atalho para dizer que a vari찼vel 챕 um "
"booleano \"true\"). O nome de vari찼veis n찾o diferenciam nome de mai첬sculas "
"ou min첬sculas, permitindo apenas caracteres alfanum챕ricos e `-`, e tem que "
@@ -2120,16 +2121,15 @@ msgstr ""
#. type: Plain text
#: en/config.txt:80
msgid ""
-"The following escape sequences (beside `\\\"` and `\\\\`) are recognized: "
-"`\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB)"
-" and `\\b` for backspace (BS). Other char escape sequences (including "
-"octal escape sequences) are invalid."
+"The following escape sequences (beside `\\\"` and `\\\\`) are recognized: `"
+"\\n` for newline character (NL), `\\t` for horizontal tabulation (HT, TAB) "
+"and `\\b` for backspace (BS). Other char escape sequences (including octal "
+"escape sequences) are invalid."
msgstr ""
"A seguintes sequ챗ncias de escape (ao lado de `\\\"` e `\\\\`) s찾o "
-"reconhecidas: `\\n"
-"` para caracteres de nova linha (NL), `\\t` para tabul챌찾o horizontal (HT, "
-"TAB) e `\\b` para backspace (BS). Outras sequ챗ncias de escape de caracteres ("
-"incluindo sequ챗ncias de escape octal) s찾o inv찼lidas."
+"reconhecidas: `\\n` para caracteres de nova linha (NL), `\\t` para tabul챌찾o "
+"horizontal (HT, TAB) e `\\b` para backspace (BS). Outras sequ챗ncias de "
+"escape de caracteres (incluindo sequ챗ncias de escape octal) s찾o inv찼lidas."
#. type: Title ~
#: en/config.txt:83
@@ -2153,9 +2153,9 @@ msgstr ""
#. type: Plain text
#: en/config.txt:95
msgid ""
-"You can include a config file from another by setting the special "
-"`include.path` (or `includeIf.*.path`) variable to the name of the file to "
-"be included. The variable takes a pathname as its value, and is subject to "
+"You can include a config file from another by setting the special `include."
+"path` (or `includeIf.*.path`) variable to the name of the file to be "
+"included. The variable takes a pathname as its value, and is subject to "
"tilde expansion. These variables can be given multiple times."
msgstr ""
"Voc챗 pode incluir um arquivo de configura챌찾o de outro, definindo a vari찼vel "
@@ -2188,8 +2188,7 @@ msgstr "Inclui condicional"
#: en/config.txt:108
msgid ""
"You can include a config file from another conditionally by setting a "
-"`includeIf.<condition>.path` variable to the name of the file to be "
-"included."
+"`includeIf.<condition>.path` variable to the name of the file to be included."
msgstr ""
"Voc챗 pode incluir um arquivo de configura챌찾o de outro condicionalmente "
"setando uma vari찼vel `includeIf.<condition>.path` para o nome do arquivo a "
@@ -2207,7 +2206,7 @@ msgstr ""
#. type: Labeled list
#: en/config.txt:113
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`gitdir`"
msgstr "`gitdir`"
@@ -2227,13 +2226,13 @@ msgstr ""
msgid ""
"The .git location may be auto-discovered, or come from `$GIT_DIR` "
"environment variable. If the repository is auto discovered via a .git file "
-"(e.g. from submodules, or a linked worktree), the .git location would be the"
-" final location where the .git directory is, not where the"
+"(e.g. from submodules, or a linked worktree), the .git location would be the "
+"final location where the .git directory is, not where the"
msgstr ""
"A localiza챌찾o de .git pode ser auto-descoberta, ou vir da vari찼vel de "
-"ambiente `$GIT_DIR`. Se o reposit처rio 챕 auto descoberto via um arquivo. git ("
-"e.x. de subm처dulos ou linkado a uma 찼rvore de trabalho), a localiza챌찾o de "
-".git pode ser a localiza챌찾o final onde o diret처rio. git 챕, n찾o onde o"
+"ambiente `$GIT_DIR`. Se o reposit처rio 챕 auto descoberto via um arquivo. git "
+"(e.x. de subm처dulos ou linkado a uma 찼rvore de trabalho), a localiza챌찾o de ."
+"git pode ser a localiza챌찾o final onde o diret처rio. git 챕, n찾o onde o"
#. type: Block title
#: en/config.txt:123
@@ -2244,19 +2243,19 @@ msgstr "o arquivo git 챕."
#. type: Plain text
#: en/config.txt:128
msgid ""
-"The pattern can contain standard globbing wildcards and two additional ones,"
-" `**/` and `/**`, that can match multiple path components. Please refer to "
+"The pattern can contain standard globbing wildcards and two additional ones, "
+"`**/` and `/**`, that can match multiple path components. Please refer to "
"linkgit:gitignore[5] for details. For convenience:"
msgstr ""
-"O padr찾o pode conter wildcads globbing padr찾o e dois adicionais, `**/` e "
-"`/**`, que podem casar m첬ltplos components de caminho. Por favor procure por "
+"O padr찾o pode conter wildcads globbing padr찾o e dois adicionais, `**/` e `/"
+"**`, que podem casar m첬ltplos components de caminho. Por favor procure por "
"linkgit:gitignore[5] para detalhes. Para conveni챗ncia:"
#. type: Plain text
#: en/config.txt:131
msgid ""
-"If the pattern starts with `~/`, `~` will be substituted with the content of"
-" the environment variable `HOME`."
+"If the pattern starts with `~/`, `~` will be substituted with the content of "
+"the environment variable `HOME`."
msgstr ""
"Se o padr찾o come챌a com `~/`, `~` ser찼 substitu챠do com o conte첬do da vari찼vel "
"de ambiente `HOME`."
@@ -2274,8 +2273,8 @@ msgstr ""
#: en/config.txt:138
msgid ""
"If the pattern does not start with either `~/`, `./` or `/`, `**/` will be "
-"automatically prepended. For example, the pattern `foo/bar` becomes "
-"`**/foo/bar` and would match `/any/path/to/foo/bar`."
+"automatically prepended. For example, the pattern `foo/bar` becomes `**/foo/"
+"bar` and would match `/any/path/to/foo/bar`."
msgstr ""
"Se o padr찾o n찾o come챌a com `~/`, `./` ou `/`, `**/` ele ser찼 pr챕-anexado "
"automaticamente. Por exemplo, o padr찾o `foo/bar` se torna `**/foo/bar` e "
@@ -2284,13 +2283,13 @@ msgstr ""
#. type: Plain text
#: en/config.txt:142
msgid ""
-"If the pattern ends with `/`, `**` will be automatically added. For example,"
-" the pattern `foo/` becomes `foo/**`. In other words, it matches \"foo\" and"
-" everything inside, recursively."
+"If the pattern ends with `/`, `**` will be automatically added. For example, "
+"the pattern `foo/` becomes `foo/**`. In other words, it matches \"foo\" and "
+"everything inside, recursively."
msgstr ""
"Se o padr찾o termina com `/`, `**` ser찼 automaticamente adicionado. Por "
-"exemplo, o padr찾o `foo/` se torna`foo/**`. Em outras palavras, ele casa \""
-"foo\" e tudo o que estiver dentro, recursivamente."
+"exemplo, o padr찾o `foo/` se torna`foo/**`. Em outras palavras, ele casa "
+"\"foo\" e tudo o que estiver dentro, recursivamente."
#. type: Labeled list
#: en/config.txt:143
@@ -2301,8 +2300,8 @@ msgstr "'gitdir/i'"
#. type: Plain text
#: en/config.txt:146
msgid ""
-"This is the same as `gitdir` except that matching is done case-insensitively"
-" (e.g. on case-insensitive file sytems)"
+"This is the same as `gitdir` except that matching is done case-insensitively "
+"(e.g. on case-insensitive file sytems)"
msgstr ""
"Isto 챕 o mesmo que `gitdir`exceto que casa ignorando mudan챌a de caixa (e.x. "
"em sistemas de arquivo que ignoram mudan챌a de caixa)"
@@ -2320,12 +2319,12 @@ msgstr "Sumlinks em `$GIT_DIR` n찾o s찾o resolvidos sem casar."
#. type: Plain text
#: en/config.txt:155
msgid ""
-"Both the symlink & realpath versions of paths will be matched outside of "
-"`$GIT_DIR`. E.g. if ~/git is a symlink to /mnt/storage/git, both "
-"`gitdir:~/git` and `gitdir:/mnt/storage/git` will match."
+"Both the symlink & realpath versions of paths will be matched outside of `"
+"$GIT_DIR`. E.g. if ~/git is a symlink to /mnt/storage/git, both `gitdir:~/"
+"git` and `gitdir:/mnt/storage/git` will match."
msgstr ""
-"Ambas as vers천es symlink & realpath dos paths ser찾o correspondidas fora do "
-"`$GIT_DIR`. Por exemplo, se ~/git for um link simb처lico para /mnt/storage/"
+"Ambas as vers천es symlink & realpath dos paths ser찾o correspondidas fora do `"
+"$GIT_DIR`. Por exemplo, se ~/git for um link simb처lico para /mnt/storage/"
"git, ambos `gitdir:~/git` e `gitdir:/mnt/storage/git` ser찾o encontrados."
#. type: Plain text
@@ -2344,8 +2343,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:163
msgid ""
-"Note that \"../\" is not special and will match literally, which is unlikely"
-" what you want."
+"Note that \"../\" is not special and will match literally, which is unlikely "
+"what you want."
msgstr ""
"Note que \"../\" n찾o 챕 especial e n찾o ir찼 casar literalmente, o que n찾o 챕 o "
"que voc챗 quer."
@@ -2550,8 +2549,8 @@ msgstr "`0` e a string vazia.\n"
#: en/config.txt:232
msgid ""
"When converting a value to its canonical form using the `--type=bool` type "
-"specifier, 'git config' will ensure that the output is \"true\" or \"false\""
-" (spelled in lowercase)."
+"specifier, 'git config' will ensure that the output is \"true\" or \"false"
+"\" (spelled in lowercase)."
msgstr ""
"Quando converter um valor a sua forma can척nica usando o tipo de "
"especifica챌찾o `--type=bool`, 'git config' se assegurar찼 que a sa챠da 챕 'true' "
@@ -2566,8 +2565,8 @@ msgstr "inteiro"
#. type: Plain text
#: en/config.txt:237
msgid ""
-"The value for many variables that specify various sizes can be suffixed with"
-" `k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc."
+"The value for many variables that specify various sizes can be suffixed with "
+"`k`, `M`,... to mean \"scale the number by 1024\", \"by 1024x1024\", etc."
msgstr ""
"O valor de muitas vari찼veis que especificam v찼rios tamanhos podem ter como "
"sufixo `k`,`M`, para dizer \"escale o n첬mero por 1024\", \"por 1024x1024\", "
@@ -2605,8 +2604,8 @@ msgstr ""
#. type: Plain text
#: en/config.txt:251
msgid ""
-"Colors may also be given as numbers between 0 and 255; these use ANSI "
-"256-color mode (but note that not all terminals may support this). If your "
+"Colors may also be given as numbers between 0 and 255; these use ANSI 256-"
+"color mode (but note that not all terminals may support this). If your "
"terminal supports it, you may also specify 24-bit RGB values as hex, like "
"`#ff0ab3`."
msgstr ""
@@ -2621,8 +2620,8 @@ msgid ""
"The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, "
"`italic`, and `strike` (for crossed-out or \"strikethrough\" letters). The "
"position of any attributes with respect to the colors (before, after, or in "
-"between), doesn't matter. Specific attributes may be turned off by prefixing"
-" them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
+"between), doesn't matter. Specific attributes may be turned off by prefixing "
+"them with `no` or `no-` (e.g., `noreverse`, `no-ul`, etc)."
msgstr ""
"Os atributos aceitos s찾o `bold`, `dim`, `ul`, `blink`, `reverse`, `italic`, "
"e `strike` (para letras cruzadas ou \"rasuradas\"). A posi챌찾o de qualquer "
@@ -2644,20 +2643,20 @@ msgstr ""
#: en/config.txt:270
msgid ""
"For git's pre-defined color slots, the attributes are meant to be reset at "
-"the beginning of each item in the colored output. So setting "
-"`color.decorate.branch` to `black` will paint that branch name in a plain "
-"`black`, even if the previous thing on the same output line (e.g. opening "
-"parenthesis before the list of branch names in `log --decorate` output) is "
-"set to be painted with `bold` or some other attribute. However, custom log "
-"formats may do more complicated and layered coloring, and the negated forms "
-"may be useful there."
+"the beginning of each item in the colored output. So setting `color.decorate."
+"branch` to `black` will paint that branch name in a plain `black`, even if "
+"the previous thing on the same output line (e.g. opening parenthesis before "
+"the list of branch names in `log --decorate` output) is set to be painted "
+"with `bold` or some other attribute. However, custom log formats may do "
+"more complicated and layered coloring, and the negated forms may be useful "
+"there."
msgstr ""
"Para os slots de cores predefinidos do git, os atributos devem ser "
"redefinidos no in챠cio de cada item na sa챠da colorida. Portanto, definir "
"`color.decorate.branch` como `black` ir찼 pintar esse nome de branch em "
"`black`, mesmo que a anterior esteja na mesma linha de sa챠da (por exemplo, "
-"abrindo par챗nteses antes da linha de nomes de ramifica챌천es em `log "
-"--decorate`) 챕 definido para ser pintado com `bold` ou algum outro atributo. "
+"abrindo par챗nteses antes da linha de nomes de ramifica챌천es em `log --"
+"decorate`) 챕 definido para ser pintado com `bold` ou algum outro atributo. "
"No entanto, formatos de log personalizados podem fazer cores mais "
"complicadas e em camadas, e os formul찼rios negados podem ser 첬teis l찼."
@@ -2671,8 +2670,8 @@ msgstr "caminho do diret처rio"
#: en/config.txt:277
msgid ""
"A variable that takes a pathname value can be given a string that begins "
-"with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such"
-" a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the "
+"with \"`~/`\" or \"`~user/`\", and the usual tilde expansion happens to such "
+"a string: `~/` is expanded to the value of `$HOME`, and `~user/` to the "
"specified user's home directory."
msgstr ""
"Uma vari찼vel que recebe um valor de nome de caminho pode receber uma string "
@@ -2690,8 +2689,8 @@ msgstr "Vari찼veis"
#: en/config.txt:285
msgid ""
"Note that this list is non-comprehensive and not necessarily complete. For "
-"command-specific variables, you will find a more detailed description in the"
-" appropriate manual page."
+"command-specific variables, you will find a more detailed description in the "
+"appropriate manual page."
msgstr ""
"Note que esta lista n찾o 챕 abrangente e n찾o necessariamente completa. Para "
"vari찼veis espec챠ficas de comando, voc챗 encontrar찼 uma descri챌찾o mais "
@@ -2702,8 +2701,8 @@ msgstr ""
msgid ""
"Other git-related tools may and do use their own variables. When inventing "
"new variables for use in your own tool, make sure their names do not "
-"conflict with those that are used by Git itself and other popular tools, and"
-" describe them in your documentation."
+"conflict with those that are used by Git itself and other popular tools, and "
+"describe them in your documentation."
msgstr ""
"Outras ferramentas relacionadas ao git podem e usam suas pr처prias vari찼veis. "
"Ao inventar novas vari찼veis para uso em sua pr처pria ferramenta, certifique-"
@@ -2740,10 +2739,10 @@ msgstr "Formato interno Git"
#. type: Plain text
#: en/date-formats.txt:15
msgid ""
-"It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the"
-" number of seconds since the UNIX epoch. `<time zone offset>` is a positive"
-" or negative offset from UTC. For example CET (which is 1 hour ahead of "
-"UTC) is `+0100`."
+"It is `<unix timestamp> <time zone offset>`, where `<unix timestamp>` is the "
+"number of seconds since the UNIX epoch. `<time zone offset>` is a positive "
+"or negative offset from UTC. For example CET (which is 1 hour ahead of UTC) "
+"is `+0100`."
msgstr ""
"횋 `<unix timestamp> <time zone offset>`, onde `<unix timestamp>` 챕 o n첬mero "
"de segundos desde a 챕poca do UNIX. `<time zone offset>` 챕 um deslocamento "
@@ -2759,11 +2758,11 @@ msgstr "RFC 2822"
#. type: Plain text
#: en/date-formats.txt:19
msgid ""
-"The standard email format as described by RFC 2822, for example `Thu, 07 Apr"
-" 2005 22:13:13 +0200`."
+"The standard email format as described by RFC 2822, for example `Thu, 07 Apr "
+"2005 22:13:13 +0200`."
msgstr ""
-"O formato de e-mail padr찾o, conforme descrito pela RFC 2822, por exemplo, `"
-"Thu, 07 Apr 2005 22:13:13 +0200`."
+"O formato de e-mail padr찾o, conforme descrito pela RFC 2822, por exemplo, "
+"`Thu, 07 Apr 2005 22:13:13 +0200`."
#. type: Labeled list
#: en/date-formats.txt:20
@@ -2785,11 +2784,11 @@ msgstr ""
#. type: Plain text
#: en/date-formats.txt:26
msgid ""
-"In addition, the date part is accepted in the following formats: "
-"`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`."
+"In addition, the date part is accepted in the following formats: `YYYY.MM."
+"DD`, `MM/DD/YYYY` and `DD.MM.YYYY`."
msgstr ""
-"Al챕m disso, a parte da data 챕 aceita nos seguintes formatos: `YYYY.MM.DD`, `"
-"MM/DD/YYYY` e `DD.MM.YYYY`."
+"Al챕m disso, a parte da data 챕 aceita nos seguintes formatos: `YYYY.MM.DD`, "
+"`MM/DD/YYYY` e `DD.MM.YYYY`."
#. type: Title -
#: en/diff-format.txt:2
@@ -2800,8 +2799,8 @@ msgstr "Formato de sa챠da bruta"
#. type: Plain text
#: en/diff-format.txt:6
msgid ""
-"The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-"
-"diff-files\" and \"git diff --raw\" are very similar."
+"The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-diff-"
+"files\" and \"git diff --raw\" are very similar."
msgstr ""
"O formato de sa챠da bruta de \"git-diff-index\", \"git-diff-tree\", \"git-"
"diff-files\" e \"git diff --raw\" s찾o muito semelhantes."
@@ -2861,8 +2860,8 @@ msgstr "compara o 챠ndice e os arquivos no sistema de arquivos."
#. type: Plain text
#: en/diff-format.txt:25
msgid ""
-"The \"git-diff-tree\" command begins its output by printing the hash of what"
-" is being compared. After that, all the commands print one output line per "
+"The \"git-diff-tree\" command begins its output by printing the hash of what "
+"is being compared. After that, all the commands print one output line per "
"changed file."
msgstr ""
"O comando \"git-diff-tree\" inicia sua sa챠da imprimindo o hash do que est찼 "
@@ -2925,7 +2924,8 @@ msgstr "sha1 for \"src\"; 0\\{40\\} se criado ou n찾o."
#. type: Plain text
#: en/diff-format.txt:47
-msgid "sha1 for \"dst\"; 0\\{40\\} if creation, unmerged or \"look at work tree\"."
+msgid ""
+"sha1 for \"dst\"; 0\\{40\\} if creation, unmerged or \"look at work tree\"."
msgstr ""
"sha1 para \"dst\"; 0\\{40\\} se criada, desimpedida ou \"olhar para a 찼rvore "
"de trabalho\"."
@@ -3016,9 +3016,9 @@ msgstr ""
#: en/diff-format.txt:71
msgid ""
"Status letters C and R are always followed by a score (denoting the "
-"percentage of similarity between the source and target of the move or copy)."
-" Status letter M may be followed by a score (denoting the percentage of "
-"dissimilarity) for file rewrites."
+"percentage of similarity between the source and target of the move or "
+"copy). Status letter M may be followed by a score (denoting the percentage "
+"of dissimilarity) for file rewrites."
msgstr ""
"As letras de status C e R s찾o sempre seguidas por uma pontua챌찾o (indicando a "
"porcentagem de semelhan챌a entre a origem e o destino da movimenta챌찾o ou da "
@@ -3050,8 +3050,8 @@ msgstr ":100644 100644 5be4a4a 0000000 M file.c\n"
#. type: Plain text
#: en/diff-format.txt:85 en/git-ls-files.txt:210 en/git-ls-tree.txt:101
msgid ""
-"Without the `-z` option, pathnames with \"unusual\" characters are quoted as"
-" explained for the configuration variable `core.quotePath` (see linkgit:git-"
+"Without the `-z` option, pathnames with \"unusual\" characters are quoted as "
+"explained for the configuration variable `core.quotePath` (see linkgit:git-"
"config[1]). Using `-z` the filename is output verbatim and the line is "
"terminated by a NUL byte."
msgstr ""
@@ -3070,8 +3070,8 @@ msgstr "formato diff para mesclagens"
#: en/diff-format.txt:93
msgid ""
"\"git-diff-tree\", \"git-diff-files\" and \"git-diff --raw\" can take `-c` "
-"or `--cc` option to generate diff output also for merge commits. The output"
-" differs from the format described above in the following way:"
+"or `--cc` option to generate diff output also for merge commits. The output "
+"differs from the format described above in the following way:"
msgstr ""
"\"git-diff-tree\", \"git-diff-files\" e \"git-diff --raw\" podem tomar a "
"op챌찾o `-c` ou `--cc` para gerar o resultado do diff tamb챕m para commits de "
@@ -3140,9 +3140,9 @@ msgstr ""
#: en/diff-format.txt:125
msgid ""
"When showing a change that involves a rename or a copy, `--stat` output "
-"formats the pathnames compactly by combining common prefix and suffix of the"
-" pathnames. For example, a change that moves `arch/i386/Makefile` to "
-"`arch/x86/Makefile` while modifying 4 lines will be shown like this:"
+"formats the pathnames compactly by combining common prefix and suffix of the "
+"pathnames. For example, a change that moves `arch/i386/Makefile` to `arch/"
+"x86/Makefile` while modifying 4 lines will be shown like this:"
msgstr ""
"Ao mostrar uma mudan챌a que envolve renomear ou copiar, a sa챠da `--stat` "
"formata os nomes dos caminhos compactamente combinando prefixo e sufixo "
@@ -3159,9 +3159,8 @@ msgstr "arch/{i386 => x86}/Fazer-arquivo | 4 +--\n"
#. type: Plain text
#: en/diff-format.txt:133
msgid ""
-"The `--numstat` option gives the diffstat(1) information but is designed for"
-" easier machine consumption. An entry in `--numstat` output looks like "
-"this:"
+"The `--numstat` option gives the diffstat(1) information but is designed for "
+"easier machine consumption. An entry in `--numstat` output looks like this:"
msgstr ""
"A op챌찾o `--numstat` fornece as informa챌천es do diffstat(1), mas foi projetada "
"para facilitar o consumo da m찼quina. Uma entrada na sa챠da `--numstat` 챕 "
@@ -3210,8 +3209,7 @@ msgstr "uma nova linha."
#. type: Plain text
#: en/diff-format.txt:149
-msgid ""
-"When `-z` output option is in effect, the output is formatted this way:"
+msgid "When `-z` output option is in effect, the output is formatted this way:"
msgstr ""
"Quando a op챌찾o de sa챠da `-z` est찼 e vigor, a sa챠da 챕 formatada desta maneira:"
@@ -3253,8 +3251,8 @@ msgstr "um NUL."
#. type: Plain text
#: en/diff-format.txt:171
msgid ""
-"The extra `NUL` before the preimage path in renamed case is to allow scripts"
-" that read the output to tell if the current record being read is a single-"
+"The extra `NUL` before the preimage path in renamed case is to allow scripts "
+"that read the output to tell if the current record being read is a single-"
"path record or a rename/copy record without reading ahead. After reading "
"added and deleted lines, reading up to `NUL` would yield the pathname, but "
"if that is `NUL`, the record will show two paths."
@@ -3399,8 +3397,8 @@ msgstr ""
#. type: Plain text
#: en/diff-generate-patch.txt:55
msgid ""
-"The index line includes the SHA-1 checksum before and after the change. The"
-" <mode> is included if the file mode does not change; otherwise, separate "
+"The index line includes the SHA-1 checksum before and after the change. The "
+"<mode> is included if the file mode does not change; otherwise, separate "
"lines indicate the old and the new mode."
msgstr ""
"A linha de 챠ndice inclui a soma de verifica챌찾o SHA-1 antes e depois da "
@@ -3547,8 +3545,8 @@ msgid ""
"It is preceded with a \"git diff\" header, that looks like this (when `-c` "
"option is used):"
msgstr ""
-"Ele 챕 percebido por um cabe챌alho \"git diff\", que se parece com isso ("
-"quando a op챌찾o `-c` 챕 usada):"
+"Ele 챕 percebido por um cabe챌alho \"git diff\", que se parece com isso "
+"(quando a op챌찾o `-c` 챕 usada):"
#. type: Plain text
#: en/diff-generate-patch.txt:119
@@ -3622,8 +3620,8 @@ msgstr "b/ arquivo"
#. type: Plain text
#: en/diff-generate-patch.txt:146
msgid ""
-"Similar to two-line header for traditional 'unified' diff format, "
-"`/dev/null` is used to signal created or deleted files."
+"Similar to two-line header for traditional 'unified' diff format, `/dev/"
+"null` is used to signal created or deleted files."
msgstr ""
"Semelhante ao cabe챌alho de duas linhas para o formato diff 'unificado' "
"tradicional, o `/dev/null` 챕 usado para sinalizar arquivos criados ou "
@@ -3662,20 +3660,20 @@ msgstr ""
#: en/diff-generate-patch.txt:166
msgid ""
"Unlike the traditional 'unified' diff format, which shows two files A and B "
-"with a single column that has `-` (minus -- appears in A but removed in B), "
-"`+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) "
+"with a single column that has `-` (minus -- appears in A but removed in B), `"
+"+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) "
"prefix, this format compares two or more files file1, file2,... with one "
"file X, and shows how X differs from each of fileN. One column for each of "
-"fileN is prepended to the output line to note how X's line is different from"
-" it."
+"fileN is prepended to the output line to note how X's line is different from "
+"it."
msgstr ""
"Ao contr찼rio do formato diff tradicional 'unificado', que mostra dois "
"arquivos A e B com uma 첬nica coluna que tem `-` (menos -- aparece em A, mas "
-"removido em B), `+` (mais -- faltando em A, mas adicionado para B), ou `\" \""
-"` (espa챌o -- inalterado) prefixo, este formato compara dois ou mais arquivos "
-"file1, file2, ... com um arquivo X, e mostra como X difere de cada fileN. "
-"Uma coluna para cara arquivo fileN 챕 anexada 횪 linha de sa챠da para observar "
-"como a linha do X 챕 diferente dela."
+"removido em B), `+` (mais -- faltando em A, mas adicionado para B), ou `\" "
+"\"` (espa챌o -- inalterado) prefixo, este formato compara dois ou mais "
+"arquivos file1, file2, ... com um arquivo X, e mostra como X difere de cada "
+"fileN. Uma coluna para cara arquivo fileN 챕 anexada 횪 linha de sa챠da para "
+"observar como a linha do X 챕 diferente dela."
#. type: Plain text
#: en/diff-generate-patch.txt:172
@@ -3702,8 +3700,8 @@ msgstr ""
"Na sa챠da do exemplo acima, a assinatura da fun챌찾o foi alterada de ambos os "
"arquivos (portanto, duas remo챌천es `-` do file1 e do file2, mais `++` para "
"significar que uma linha adicionada n찾o aparece no file1 nem no file2). "
-"Tamb챕m oito outras linhas s찾o as mesmas do file1, mas n찾o aparecem no file2 ("
-"portanto, prefixado com `+`)."
+"Tamb챕m oito outras linhas s찾o as mesmas do file1, mas n찾o aparecem no file2 "
+"(portanto, prefixado com `+`)."
#. type: Plain text
#: en/diff-generate-patch.txt:184
@@ -3711,19 +3709,19 @@ msgid ""
"When shown by `git diff-tree -c`, it compares the parents of a merge commit "
"with the merge result (i.e. file1..fileN are the parents). When shown by "
"`git diff-files -c`, it compares the two unresolved merge parents with the "
-"working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage"
-" 3 aka \"their version\")."
+"working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage "
+"3 aka \"their version\")."
msgstr ""
"Quando mostrado pelo `git diff-tree -c`, ele compara os pais de uma "
-"consolida챌찾o de mesclagem com o resultado da mesclagem (ou seja, "
-"file1..fileN s찾o os pais). Quando mostrado pelo `git diff-files -c`, compara "
-"os dois pais de mesclagem n찾o resolvidos com o arquivo da 찼rvore de trabalho "
+"consolida챌찾o de mesclagem com o resultado da mesclagem (ou seja, file1.."
+"fileN s찾o os pais). Quando mostrado pelo `git diff-files -c`, compara os "
+"dois pais de mesclagem n찾o resolvidos com o arquivo da 찼rvore de trabalho "
"(ou seja, file1 챕 o est찼gio 2, tamb챕m conhecido como\" nossa vers찾o \", "
"file2 챕 o est찼gio 3\" aka sua vers찾o \")."
#. type: Labeled list
#: en/diff-options.txt:17 en/git-rebase.txt:322 en/merge-options.txt:74
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-stat"
msgstr "--no-stat"
@@ -3737,14 +3735,14 @@ msgstr "Gere corre챌천es simples sem qualquer diffstats."
#: en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64
#: en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52
#: en/git-push.txt:348 en/git-read-tree.txt:44
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-u"
msgstr "-u"
#. type: Labeled list
#: en/diff-options.txt:24 en/git-add.txt:89 en/git-checkout.txt:254
#: en/git-commit.txt:71
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--patch"
msgstr "--patch"
@@ -3766,13 +3764,13 @@ msgstr "\tEste 챕 o padr찾o.\n"
#: en/git-ls-files.txt:59 en/git-revert.txt:89 en/git-shortlog.txt:34
#: en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38
#: en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-s"
msgstr "-s"
#. type: Labeled list
#: en/diff-options.txt:31
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-patch"
msgstr "--no-patch"
@@ -3811,7 +3809,7 @@ msgstr "\tImplica `-p`.\n"
#. type: Labeled list
#: en/diff-options.txt:45 en/git-replace.txt:78 en/git-verify-commit.txt:19
#: en/git-verify-tag.txt:19
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--raw"
msgstr "--raw"
@@ -3839,7 +3837,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:62
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--patch-with-raw"
msgstr "--patch-with-raw"
@@ -3850,22 +3848,22 @@ msgstr "Sin척nimo para `-p --raw`."
#. type: Labeled list
#: en/diff-options.txt:66
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--indent-heuristic"
msgstr "--indent-heuristic"
#. type: Plain text
#: en/diff-options.txt:69
msgid ""
-"Enable the heuristic that shifts diff hunk boundaries to make patches easier"
-" to read. This is the default."
+"Enable the heuristic that shifts diff hunk boundaries to make patches easier "
+"to read. This is the default."
msgstr ""
"Habilite a heur챠stica que desloca os limites do hunk do diff para facilitar "
"a leitura dos patches. Este 챕 o padr찾o."
#. type: Labeled list
#: en/diff-options.txt:70
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-indent-heuristic"
msgstr "--no-indent-heuristic"
@@ -3876,7 +3874,7 @@ msgstr "Desative a heur챠stica de recuo."
#. type: Labeled list
#: en/diff-options.txt:73
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--minimal"
msgstr "--minimal"
@@ -3889,7 +3887,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:77
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--patience"
msgstr "--patience"
@@ -3900,7 +3898,7 @@ msgstr "Gere um diff usando o algoritmo \"diff de paci챗ncia\"."
#. type: Labeled list
#: en/diff-options.txt:80
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--histogram"
msgstr "--histogram"
@@ -3963,13 +3961,13 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:99
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`minimal`"
msgstr "`minimal`"
#. type: Labeled list
#: en/diff-options.txt:102
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`patience`"
msgstr "`patience`"
@@ -3980,7 +3978,7 @@ msgstr "Use o algoritmo \"diff de paci챗ncia\" ao gerar patches."
#. type: Labeled list
#: en/diff-options.txt:104
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`histogram`"
msgstr "`histogram`"
@@ -4013,27 +4011,27 @@ msgstr "--stat[=<width>[,<name-width>[,<count>]]]"
#. type: Plain text
#: en/diff-options.txt:127
msgid ""
-"Generate a diffstat. By default, as much space as necessary will be used for"
-" the filename part, and the rest for the graph part. Maximum width defaults "
+"Generate a diffstat. By default, as much space as necessary will be used for "
+"the filename part, and the rest for the graph part. Maximum width defaults "
"to terminal width, or 80 columns if not connected to a terminal, and can be "
"overridden by `<width>`. The width of the filename part can be limited by "
"giving another width `<name-width>` after a comma. The width of the graph "
"part can be limited by using `--stat-graph-width=<width>` (affects all "
-"commands generating a stat graph) or by setting "
-"`diff.statGraphWidth=<width>` (does not affect `git format-patch`). By "
-"giving a third parameter `<count>`, you can limit the output to the first "
-"`<count>` lines, followed by `...` if there are more."
+"commands generating a stat graph) or by setting `diff."
+"statGraphWidth=<width>` (does not affect `git format-patch`). By giving a "
+"third parameter `<count>`, you can limit the output to the first `<count>` "
+"lines, followed by `...` if there are more."
msgstr ""
"Gere um diffstat. Por padr찾o, o espa챌o necess찼rio ser찼 usado para a parte do "
"nome do arquivo e o restante para a parte do gr찼fico. A largura m찼xima 챕 "
"padronizada para a largura do terminal, ou 80 colunas, se n찾o estiver "
"conectada a um terminal, e pode ser substitu챠da por `<width>`. A largura da "
-"parte do nome do arquivo pode ser limitada dando outra largura `<name-width>`"
-" ap처s uma v챠rgula. A largura da parte do gr찼fico pode ser limitada usando "
-"`--stat-graph-width=<width>` (afeta todos os comandos que geram um stat "
-"graph) ou configurando `diff.statGraphWidth=<width>` (n찾o afeta git format-"
-"patch`). Dando um terceiro par창metro `<count>`, voc챗 pode limitar a sa챠da "
-"para as primeiras linhas `<count>` seguidas por `...` se houver mais."
+"parte do nome do arquivo pode ser limitada dando outra largura `<name-"
+"width>` ap처s uma v챠rgula. A largura da parte do gr찼fico pode ser limitada "
+"usando `--stat-graph-width=<width>` (afeta todos os comandos que geram um "
+"stat graph) ou configurando `diff.statGraphWidth=<width>` (n찾o afeta git "
+"format-patch`). Dando um terceiro par창metro `<count>`, voc챗 pode limitar a "
+"sa챠da para as primeiras linhas `<count>` seguidas por `...` se houver mais."
#. type: Plain text
#: en/diff-options.txt:130
@@ -4046,7 +4044,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:131
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--compact-summary"
msgstr "--compact-summary"
@@ -4056,19 +4054,19 @@ msgid ""
"Output a condensed summary of extended header information such as file "
"creations or deletions (\"new\" or \"gone\", optionally \"+l\" if it's a "
"symlink) and mode changes (\"+x\" or \"-x\" for adding or removing "
-"executable bit respectively) in diffstat. The information is put between the"
-" filename part and the graph part. Implies `--stat`."
+"executable bit respectively) in diffstat. The information is put between the "
+"filename part and the graph part. Implies `--stat`."
msgstr ""
"Sa챠da de um resumo condensado de informa챌천es de cabe챌alho estendido, como "
"cria챌천es ou exclus천es de arquivos (\"novo\" ou \"desaparecido\", "
-"opcionalmente \"+|\" se for um symlink) e altera챌천es de modo (\"+x\" ou \"-"
-"x\" para adicionar ou remover bit execut찼vel, respectivamente) em diffstat. "
-"A informa챌찾o 챕 colocada entre a parte do nome do arquivo e a parte do "
-"gr찼fico. Implica `--stat`."
+"opcionalmente \"+|\" se for um symlink) e altera챌천es de modo (\"+x\" ou \"-x"
+"\" para adicionar ou remover bit execut찼vel, respectivamente) em diffstat. A "
+"informa챌찾o 챕 colocada entre a parte do nome do arquivo e a parte do gr찼fico. "
+"Implica `--stat`."
#. type: Labeled list
#: en/diff-options.txt:139 en/git-apply.txt:45
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--numstat"
msgstr "--numstat"
@@ -4086,7 +4084,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:146
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--shortstat"
msgstr "--shortstat"
@@ -4117,12 +4115,12 @@ msgstr ""
"Sa챠da da distribui챌찾o da quantidade relativa de altera챌천es para cada "
"subdiret처rio. O comportamento de `--dirstat` pode ser customizado passando-"
"se uma lista de par창metros separados por v챠rgulas. Os padr천es s찾o "
-"controlados pela vari찼vel de configura챌찾o `diff.dirstat` (veja linkgit: git-"
-"config [1]). Os seguintes par창metros est찾o dispon챠veis:"
+"controlados pela vari찼vel de configura챌찾o `diff.dirstat` (veja linkgit:git-"
+"config[1]). Os seguintes par창metros est찾o dispon챠veis:"
#. type: Labeled list
#: en/diff-options.txt:160
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`changes`"
msgstr "`changes`"
@@ -4143,7 +4141,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:166
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`lines`"
msgstr "`lines`"
@@ -4153,8 +4151,8 @@ msgid ""
"Compute the dirstat numbers by doing the regular line-based diff analysis, "
"and summing the removed/added line counts. (For binary files, count 64-byte "
"chunks instead, since binary files have no natural concept of lines). This "
-"is a more expensive `--dirstat` behavior than the `changes` behavior, but it"
-" does count rearranged lines within a file as much as other changes. The "
+"is a more expensive `--dirstat` behavior than the `changes` behavior, but it "
+"does count rearranged lines within a file as much as other changes. The "
"resulting output is consistent with what you get from the other `--*stat` "
"options."
msgstr ""
@@ -4168,7 +4166,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:174
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`files`"
msgstr "`files`"
@@ -4187,7 +4185,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:179
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`cumulative`"
msgstr "`cumulative`"
@@ -4195,8 +4193,8 @@ msgstr "`cumulative`"
#: en/diff-options.txt:184
msgid ""
"Count changes in a child directory for the parent directory as well. Note "
-"that when using `cumulative`, the sum of the percentages reported may exceed"
-" 100%. The default (non-cumulative) behavior can be specified with the "
+"that when using `cumulative`, the sum of the percentages reported may exceed "
+"100%. The default (non-cumulative) behavior can be specified with the "
"`noncumulative` parameter."
msgstr ""
"Contar altera챌천es em um diret처rio filho para o diret처rio pai tamb챕m. Note "
@@ -4226,8 +4224,8 @@ msgstr ""
msgid ""
"Example: The following will count changed files, while ignoring directories "
"with less than 10% of the total amount of changed files, and accumulating "
-"child directory counts in the parent directories: "
-"`--dirstat=files,10,cumulative`."
+"child directory counts in the parent directories: `--dirstat=files,10,"
+"cumulative`."
msgstr ""
"Exemplo: O seguinte contar찼 os arquivos alterados, ignorando os diret처rios "
"com menos de 10% da quantidade total de arquivos alterados e acumulando "
@@ -4237,22 +4235,22 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:195 en/git-apply.txt:52 en/git-shortlog.txt:35
#: en/merge-options.txt:115
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--summary"
msgstr "--summary"
#. type: Plain text
#: en/diff-options.txt:198
msgid ""
-"Output a condensed summary of extended header information such as creations,"
-" renames and mode changes."
+"Output a condensed summary of extended header information such as creations, "
+"renames and mode changes."
msgstr ""
"Produza um resumo condensado de informa챌천es de cabe챌alho estendidas, como "
"cria챌천es, renomea챌천es e altera챌천es de modo."
#. type: Labeled list
#: en/diff-options.txt:200
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--patch-with-stat"
msgstr "--patch-with-stat"
@@ -4267,7 +4265,7 @@ msgstr "Sin척nimo para `-p --stat`."
#: 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
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-z"
msgstr "-z"
@@ -4280,8 +4278,8 @@ msgstr "\tSepare os commits com NULs em vez de com novas newlines.\n"
#. type: Plain text
#: en/diff-options.txt:212
msgid ""
-"Also, when `--raw` or `--numstat` has been given, do not munge pathnames and"
-" use NULs as output field terminators."
+"Also, when `--raw` or `--numstat` has been given, do not munge pathnames and "
+"use NULs as output field terminators."
msgstr ""
"Al챕m disso, quando `--raw` ou` --numstat` for fornecido, n찾o munge nomes de "
"caminho e use NULs como terminadores de campos de sa챠da."
@@ -4294,8 +4292,7 @@ msgid ""
"\tgiven, do not munge pathnames and use NULs as output field terminators.\n"
msgstr ""
"\tQuando `--raw`, `--numstat`, `--name-only` ou `--name-status` foi\n"
-"\tdado, n찾o munge nomes de pathnames e usar NULs como terminadores de campo "
-"de sa챠da.\n"
+"\tdado, n찾o munge nomes de pathnames e usar NULs como terminadores de campo de sa챠da.\n"
#. type: Plain text
#: en/diff-options.txt:221 en/git-apply.txt:122
@@ -4306,12 +4303,12 @@ msgid ""
msgstr ""
"Sem esta op챌찾o, nomes de caminho com caracteres \"incomuns\" s찾o citados "
"como explicado para a vari찼vel de configura챌찾o `core.quotePath` (veja "
-"linkgit: git-config [1])."
+"linkgit:git-config [1])."
#. type: Labeled list
#: en/diff-options.txt:222 en/git-config.txt:215 en/git-grep.txt:188
#: en/git-ls-tree.txt:59 en/git-name-rev.txt:51
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--name-only"
msgstr "--name-only"
@@ -4322,15 +4319,15 @@ msgstr "Mostrar apenas nomes de arquivos alterados."
#. type: Labeled list
#: en/diff-options.txt:225 en/git-ls-tree.txt:60
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--name-status"
msgstr "--name-status"
#. type: Plain text
#: en/diff-options.txt:228
msgid ""
-"Show only names and status of changed files. See the description of the "
-"`--diff-filter` option on what the status letters mean."
+"Show only names and status of changed files. See the description of the `--"
+"diff-filter` option on what the status letters mean."
msgstr ""
"Mostrar apenas nomes e status de arquivos alterados. Veja a descri챌찾o da "
"op챌찾o `--diff-filter` sobre o significado das letras de status."
@@ -4344,10 +4341,10 @@ msgstr "--submodule [= <formato>]"
#. type: Plain text
#: en/diff-options.txt:240
msgid ""
-"Specify how differences in submodules are shown. When specifying "
-"`--submodule=short` the 'short' format is used. This format just shows the "
-"names of the commits at the beginning and end of the range. When "
-"`--submodule` or `--submodule=log` is specified, the 'log' format is used. "
+"Specify how differences in submodules are shown. When specifying `--"
+"submodule=short` the 'short' format is used. This format just shows the "
+"names of the commits at the beginning and end of the range. When `--"
+"submodule` or `--submodule=log` is specified, the 'log' format is used. "
"This format lists the commits in the range like linkgit:git-submodule[1] "
"`summary` does. When `--submodule=diff` is specified, the 'diff' format is "
"used. This format shows an inline diff of the changes in the submodule "
@@ -4356,14 +4353,13 @@ msgid ""
msgstr ""
"Especifique como as diferen챌as nos subm처dulos s찾o mostradas. Ao especificar "
"`--submodule = short`, o formato 'short' 챕 usado. Este formato mostra apenas "
-"os nomes das confirma챌천es no in챠cio e no final do intervalo. Quando "
-"`--subm처dulo` ou` --subm처dulo = log` 챕 especificado, o formato 'log' 챕 "
-"usado. Este formato lista os commits no intervalo como linkgit: git-"
-"submodule [1] `summary` faz. Quando `--submodule = diff` 챕 especificado, o "
-"formato 'diff' 챕 usado. Este formato mostra um diff inline das altera챌천es no "
-"conte첬do do subm처dulo entre o intervalo de confirma챌찾o. O padr찾o 챕 "
-"`diff.submodule` ou o formato 'short' se a op챌찾o de configura챌찾o n찾o estiver "
-"definida."
+"os nomes das confirma챌천es no in챠cio e no final do intervalo. Quando `--"
+"subm처dulo` ou` --subm처dulo = log` 챕 especificado, o formato 'log' 챕 usado. "
+"Este formato lista os commits no intervalo como linkgit:git-submodule [1] "
+"`summary` faz. Quando `--submodule = diff` 챕 especificado, o formato 'diff' "
+"챕 usado. Este formato mostra um diff inline das altera챌천es no conte첬do do "
+"subm처dulo entre o intervalo de confirma챌찾o. O padr찾o 챕 `diff.submodule` ou o "
+"formato 'short' se a op챌찾o de configura챌찾o n찾o estiver definida."
#. type: Labeled list
#: en/diff-options.txt:241 en/git-branch.txt:127 en/git-for-each-ref.txt:60
@@ -4375,11 +4371,11 @@ msgstr "--color [= <quando>]"
#. type: Plain text
#: en/diff-options.txt:245
msgid ""
-"Show colored diff. `--color` (i.e. without '=<when>') is the same as "
-"`--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
+"Show colored diff. `--color` (i.e. without '=<when>') is the same as `--"
+"color=always`. '<when>' can be one of `always`, `never`, or `auto`."
msgstr ""
-"Mostrar colorido diff. `--color` (isto 챕, sem '=<when>') 챕 o mesmo que "
-"`--color=always`. '<when>' pode ser um de `always`, `never`, ou `auto`."
+"Mostrar colorido diff. `--color` (isto 챕, sem '=<when>') 챕 o mesmo que `--"
+"color=always`. '<when>' pode ser um de `always`, `never`, ou `auto`."
#. type: Plain text
#: en/diff-options.txt:248
@@ -4394,7 +4390,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:250 en/git-branch.txt:132 en/git-grep.txt:225
#: en/git-show-branch.txt:124
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-color"
msgstr "--no-color"
@@ -4430,9 +4426,7 @@ msgstr "Linhas de c처digo movidas s찾o coloridas de maneira diferente."
#: en/diff-options.txt:261
#, no-wrap
msgid "\tIt can be changed by the `diff.colorMoved` configuration setting.\n"
-msgstr ""
-"\tEle pode ser alterado pela configura챌찾o de configura챌찾o `diff.colorMoved`."
-"\n"
+msgstr "\tEle pode ser alterado pela configura챌찾o de configura챌찾o `diff.colorMoved`.\n"
#. type: Plain text
#: en/diff-options.txt:265
@@ -4482,8 +4476,8 @@ msgstr "avi찾o"
#: en/diff-options.txt:279
msgid ""
"Any line that is added in one location and was removed in another location "
-"will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved'"
-" will be used for removed lines that are added somewhere else in the diff. "
+"will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved' "
+"will be used for removed lines that are added somewhere else in the diff. "
"This mode picks up any moved line, but it is not very useful in a review to "
"determine if a block of code was moved without permutation."
msgstr ""
@@ -4503,12 +4497,12 @@ msgstr "blocos"
#: en/diff-options.txt:284
msgid ""
"Blocks of moved text of at least 20 alphanumeric characters are detected "
-"greedily. The detected blocks are painted using either the "
-"'color.diff.{old,new}Moved' color. Adjacent blocks cannot be told apart."
+"greedily. The detected blocks are painted using either the 'color.diff.{old,"
+"new}Moved' color. Adjacent blocks cannot be told apart."
msgstr ""
"Blocos de texto movido de pelo menos 20 caracteres alfanum챕ricos s찾o "
-"detectados com avidez. Os blocos detectados s찾o pintados usando a cor "
-"'color.diff.{old, new}Moved'. Blocos adjacentes n찾o podem ser separados."
+"detectados com avidez. Os blocos detectados s찾o pintados usando a cor 'color."
+"diff.{old, new}Moved'. Blocos adjacentes n찾o podem ser separados."
#. type: Labeled list
#: en/diff-options.txt:284
@@ -4520,9 +4514,9 @@ msgstr "zebra"
#: en/diff-options.txt:289
msgid ""
"Blocks of moved text are detected as in 'blocks' mode. The blocks are "
-"painted using either the 'color.diff.{old,new}Moved' color or "
-"'color.diff.{old,new}MovedAlternative'. The change between the two colors "
-"indicates that a new block was detected."
+"painted using either the 'color.diff.{old,new}Moved' color or 'color.diff."
+"{old,new}MovedAlternative'. The change between the two colors indicates that "
+"a new block was detected."
msgstr ""
"Blocos de texto movido s찾o detectados como no modo 'blocos'. Os blocos s찾o "
"pintados usando 'color.diff.{old,new}Moved' color ou 'color.diff.{old,new}"
@@ -4539,8 +4533,8 @@ msgstr "zebra-escurecida"
#: en/diff-options.txt:294
msgid ""
"Similar to 'zebra', but additional dimming of uninteresting parts of moved "
-"code is performed. The bordering lines of two adjacent blocks are considered"
-" interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated "
+"code is performed. The bordering lines of two adjacent blocks are considered "
+"interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated "
"synonym."
msgstr ""
"Semelhante a 'zebra', mas o escurecimento adicional de partes "
@@ -4550,7 +4544,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:296
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-color-moved"
msgstr "--no-color-moved"
@@ -4572,8 +4566,8 @@ msgstr "--color-movido-ws=<modes>"
#. type: Plain text
#: en/diff-options.txt:303
msgid ""
-"This configures how whitespace is ignored when performing the move detection"
-" for `--color-moved`."
+"This configures how whitespace is ignored when performing the move detection "
+"for `--color-moved`."
msgstr ""
"Isso configura como o espa챌o em branco 챕 ignorado ao executar a detec챌찾o de "
"movimento para `--color-moved`."
@@ -4632,8 +4626,8 @@ msgstr "ignore-todo-espa챌o"
#. type: Plain text
#: en/diff-options.txt:320
msgid ""
-"Ignore whitespace when comparing lines. This ignores differences even if one"
-" line has whitespace where the other line has none."
+"Ignore whitespace when comparing lines. This ignores differences even if one "
+"line has whitespace where the other line has none."
msgstr ""
"Ignore os espa챌os em branco ao comparar linhas. Isso ignora as diferen챌as, "
"mesmo que uma linha tenha espa챌o em branco onde a outra linha n찾o tenha "
@@ -4659,19 +4653,19 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:327
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-color-moved-ws"
msgstr "--no-color-moved-ws"
#. type: Plain text
#: en/diff-options.txt:331
msgid ""
-"Do not ignore whitespace when performing move detection. This can be used to"
-" override configuration settings. It is the same as `--color-moved-ws=no`."
+"Do not ignore whitespace when performing move detection. This can be used to "
+"override configuration settings. It is the same as `--color-moved-ws=no`."
msgstr ""
"N찾o ignore espa챌os em branco ao realizar a detec챌찾o de movimento. Isso pode "
-"ser usado para substituir as configura챌천es. 횋 o mesmo que `--color-moved-ws ="
-" no`."
+"ser usado para substituir as configura챌천es. 횋 o mesmo que `--color-moved-ws "
+"= no`."
#. type: Labeled list
#: en/diff-options.txt:332
@@ -4715,8 +4709,8 @@ msgstr "porcelana"
#. type: Plain text
#: en/diff-options.txt:352
msgid ""
-"Use a special line-based format intended for script consumption. "
-"Added/removed/unchanged runs are printed in the usual unified diff format, "
+"Use a special line-based format intended for script consumption. Added/"
+"removed/unchanged runs are printed in the usual unified diff format, "
"starting with a `+`/`-`/` ` character at the beginning of the line and "
"extending to the end of the line. Newlines in the input are represented by "
"a tilde `~` on a line of its own."
@@ -4741,8 +4735,8 @@ msgstr "Desative a palavra diff novamente."
#. type: Plain text
#: en/diff-options.txt:358
msgid ""
-"Note that despite the name of the first mode, color is used to highlight the"
-" changed parts in all modes if enabled."
+"Note that despite the name of the first mode, color is used to highlight the "
+"changed parts in all modes if enabled."
msgstr ""
"Observe que, apesar do nome do primeiro modo, a cor 챕 usada para real챌ar as "
"partes alteradas em todos os modos, se ativada."
@@ -4771,8 +4765,8 @@ msgid ""
"between these matches is considered whitespace and ignored(!) for the "
"purposes of finding differences. You may want to append `|[^[:space:]]` to "
"your regular expression to make sure that it matches all non-whitespace "
-"characters. A match that contains a newline is silently truncated(!) at the"
-" newline."
+"characters. A match that contains a newline is silently truncated(!) at the "
+"newline."
msgstr ""
"Cada correspond챗ncia n찾o sobreposta do <regex> 챕 considerada uma palavra. "
"Qualquer coisa entre essas correspond챗ncias 챕 considerada espa챌o em branco e "
@@ -4816,12 +4810,12 @@ msgid ""
"Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-"
"diff-regex=<regex>`."
msgstr ""
-"Equivalente a `--word-diff = color` plus (se um regex foi especificado)` "
-"--word-diff-regex = <regex> `."
+"Equivalente a `--word-diff = color` plus (se um regex foi especificado)` --"
+"word-diff-regex = <regex> `."
#. type: Labeled list
#: en/diff-options.txt:385 en/git-status.txt:139
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-renames"
msgstr "--no-renames"
@@ -4836,7 +4830,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:390 en/git-apply.txt:58
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--check"
msgstr "--check"
@@ -4853,8 +4847,8 @@ msgid ""
msgstr ""
"Avisar se as altera챌천es introduzem marcadores de conflito ou erros de espa챌o "
"em branco. O que 챕 considerado erro de espa챌o em branco 챕 controlado pela "
-"configura챌찾o `core.whitespace`. Por padr찾o, os espa챌os em branco 횪 direita ("
-"incluindo linhas que consistem somente em espa챌os em branco) e um caractere "
+"configura챌찾o `core.whitespace`. Por padr찾o, os espa챌os em branco 횪 direita "
+"(incluindo linhas que consistem somente em espa챌os em branco) e um caractere "
"de espa챌o que 챕 imediatamente seguido por um caractere de tabula챌찾o dentro "
"do recuo inicial da linha s찾o considerados erros de espa챌o em branco. Sai "
"com status diferente de zero se forem encontrados problemas. N찾o 챕 "
@@ -4871,11 +4865,11 @@ msgstr "--ws-erro-highlight=<kind>"
msgid ""
"Highlight whitespace errors in the `context`, `old` or `new` lines of the "
"diff. Multiple values are separated by comma, `none` resets previous "
-"values, `default` reset the list to `new` and `all` is a shorthand for "
-"`old,new,context`. When this option is not given, and the configuration "
-"variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new`"
-" lines are highlighted. The whitespace errors are colored with "
-"`color.diff.whitespace`."
+"values, `default` reset the list to `new` and `all` is a shorthand for `old,"
+"new,context`. When this option is not given, and the configuration variable "
+"`diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines "
+"are highlighted. The whitespace errors are colored with `color.diff."
+"whitespace`."
msgstr ""
"Destacar os erros de espa챌o em branco nas linhas `context`,` old` ou `new` "
"do diff. V찼rios valores s찾o separados por v챠rgula, `none` redefine os "
@@ -4887,7 +4881,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:412
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--full-index"
msgstr "--full-index"
@@ -4904,15 +4898,15 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:417 en/git-apply.txt:160
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--binary"
msgstr "--binary"
#. type: Plain text
#: en/diff-options.txt:420
msgid ""
-"In addition to `--full-index`, output a binary diff that can be applied with"
-" `git-apply`."
+"In addition to `--full-index`, output a binary diff that can be applied with "
+"`git-apply`."
msgstr ""
"Al챕m de `--full-index`, gera um diff bin찼rio que pode ser aplicado com` git-"
"apply`."
@@ -4930,14 +4924,14 @@ msgid ""
"Instead of showing the full 40-byte hexadecimal object name in diff-raw "
"format output and diff-tree header lines, show only a partial prefix. This "
"is independent of the `--full-index` option above, which controls the diff-"
-"patch output format. Non default number of digits can be specified with "
-"`--abbrev=<n>`."
+"patch output format. Non default number of digits can be specified with `--"
+"abbrev=<n>`."
msgstr ""
"Em vez de mostrar o nome completo do objeto hexadecimal de 40 bytes em "
"linhas de cabe챌alho de sa챠da de formato diff-raw e de 찼rvore de diferen챌as, "
-"mostre apenas um prefixo parcial. Isto 챕 independente da op챌찾o `--full-index`"
-" acima, que controla o formato de sa챠da do patch diff. N첬mero n찾o padr찾o de "
-"d챠gitos pode ser especificado com `--abbrev=<n>`."
+"mostre apenas um prefixo parcial. Isto 챕 independente da op챌찾o `--full-"
+"index` acima, que controla o formato de sa챠da do patch diff. N첬mero n찾o "
+"padr찾o de d챠gitos pode ser especificado com `--abbrev=<n>`."
#. type: Labeled list
#: en/diff-options.txt:429
@@ -4963,15 +4957,14 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:443
msgid ""
-"It affects the way a change that amounts to a total rewrite of a file not as"
-" a series of deletion and insertion mixed together with a very few lines "
-"that happen to match textually as the context, but as a single deletion of "
+"It affects the way a change that amounts to a total rewrite of a file not as "
+"a series of deletion and insertion mixed together with a very few lines that "
+"happen to match textually as the context, but as a single deletion of "
"everything old followed by a single insertion of everything new, and the "
-"number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%`"
-" specifies that less than 30% of the original should remain in the result "
-"for Git to consider it a total rewrite (i.e. otherwise the resulting patch "
-"will be a series of deletion and insertion mixed together with context "
-"lines)."
+"number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` "
+"specifies that less than 30% of the original should remain in the result for "
+"Git to consider it a total rewrite (i.e. otherwise the resulting patch will "
+"be a series of deletion and insertion mixed together with context lines)."
msgstr ""
"Ela afeta a forma como uma mudan챌a que equivale a uma reescrita total de um "
"arquivo n찾o como uma s챕rie de exclus찾o e inser챌찾o misturadas com poucas "
@@ -4985,10 +4978,10 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:451
msgid ""
-"When used with -M, a totally-rewritten file is also considered as the source"
-" of a rename (usually -M only considers a file that disappeared as the "
-"source of a rename), and the number `n` controls this aspect of the -B "
-"option (defaults to 50%). `-B20%` specifies that a change with addition and "
+"When used with -M, a totally-rewritten file is also considered as the source "
+"of a rename (usually -M only considers a file that disappeared as the source "
+"of a rename), and the number `n` controls this aspect of the -B option "
+"(defaults to 50%). `-B20%` specifies that a change with addition and "
"deletion compared to 20% or more of the file's size are eligible for being "
"picked up as a possible source of a rename to another file."
msgstr ""
@@ -5027,8 +5020,7 @@ msgid ""
"\t`--follow`.\n"
msgstr ""
"\tSe estiver gerando diffs, detectar e relatar renomea챌천es para commit.\n"
-"\tPara os seguintes arquivos em renomea챌천es ao percorrer o hist처rico, "
-"consulte\n"
+"\tPara os seguintes arquivos em renomea챌천es ao percorrer o hist처rico, consulte\n"
"\t`--follow`.\n"
#. type: Plain text
@@ -5079,7 +5071,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:477 en/git-svn.txt:626
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--find-copies-harder"
msgstr "--find-copies-harder"
@@ -5089,8 +5081,8 @@ msgid ""
"For performance reasons, by default, `-C` option finds copies only if the "
"original file of the copy was modified in the same changeset. This flag "
"makes the command inspect unmodified files as candidates for the source of "
-"copy. This is a very expensive operation for large projects, so use it with"
-" caution. Giving more than one `-C` option has the same effect."
+"copy. This is a very expensive operation for large projects, so use it with "
+"caution. Giving more than one `-C` option has the same effect."
msgstr ""
"Por motivos de desempenho, por padr찾o, a op챌찾o `-C` localiza c처pias somente "
"se o arquivo original da c처pia foi modificado no mesmo changeset. Esse "
@@ -5107,7 +5099,7 @@ msgstr "-D"
#. type: Labeled list
#: en/diff-options.txt:487
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--irreversible-delete"
msgstr "--irreversible-delete"
@@ -5115,8 +5107,8 @@ msgstr "--irreversible-delete"
#: en/diff-options.txt:495
msgid ""
"Omit the preimage for deletes, i.e. print only the header but not the diff "
-"between the preimage and `/dev/null`. The resulting patch is not meant to be"
-" applied with `patch` or `git apply`; this is solely for people who want to "
+"between the preimage and `/dev/null`. The resulting patch is not meant to be "
+"applied with `patch` or `git apply`; this is solely for people who want to "
"just concentrate on reviewing the text after the change. In addition, the "
"output obviously lacks enough information to apply such a patch in reverse, "
"even manually, hence the name of the option."
@@ -5131,8 +5123,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:498
msgid ""
-"When used together with `-B`, omit also the preimage in the deletion part of"
-" a delete/create pair."
+"When used together with `-B`, omit also the preimage in the deletion part of "
+"a delete/create pair."
msgstr ""
"Quando usado junto com `-B`, omita tamb챕m a pr챕-imagem na parte de exclus찾o "
"de um par delete/create."
@@ -5169,8 +5161,8 @@ msgid ""
"Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, "
"submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or "
"have had their pairing Broken (`B`). Any combination of the filter "
-"characters (including none) can be used. When `*` (All-or-none) is added to"
-" the combination, all paths are selected if there is any file that matches "
+"characters (including none) can be used. When `*` (All-or-none) is added to "
+"the combination, all paths are selected if there is any file that matches "
"other criteria in the comparison; if there is no file that matches other "
"criteria, nothing is selected."
msgstr ""
@@ -5227,8 +5219,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:538
msgid ""
-"It is useful when you're looking for an exact block of code (like a struct),"
-" and want to know the history of that block since it first came into being: "
+"It is useful when you're looking for an exact block of code (like a struct), "
+"and want to know the history of that block since it first came into being: "
"use the feature iteratively to feed the interesting block in the preimage "
"back into `-S`, and keep going until you get the very first version of the "
"block."
@@ -5261,11 +5253,11 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:548
msgid ""
-"To illustrate the difference between `-S<regex> --pickaxe-regex` and "
-"`-G<regex>`, consider a commit with the following diff in the same file:"
+"To illustrate the difference between `-S<regex> --pickaxe-regex` and `-"
+"G<regex>`, consider a commit with the following diff in the same file:"
msgstr ""
-"Para ilustrar a diferen챌a entre `-S <regex> --pickaxe-regex` e` -G <regex> `"
-", considere um commit com o seguinte diff no mesmo arquivo:"
+"Para ilustrar a diferen챌a entre `-S <regex> --pickaxe-regex` e` -G <regex> "
+"`, considere um commit com o seguinte diff no mesmo arquivo:"
#. type: delimited block -
#: en/diff-options.txt:553
@@ -5282,8 +5274,8 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:558
msgid ""
-"While `git log -G\"regexec\\(regexp\"` will show this commit, `git log "
-"-S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of "
+"While `git log -G\"regexec\\(regexp\"` will show this commit, `git log -S"
+"\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of "
"occurrences of that string did not change)."
msgstr ""
"Enquanto o `git log -G\" regexec\\(regexp\"` mostrar찼 este commit, `git log -"
@@ -5301,10 +5293,9 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:564
-msgid ""
-"See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
+msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
msgstr ""
-"Veja a entrada 'pickaxe' em linkgit: gitdiffcore[7] para mais informa챌천es."
+"Veja a entrada 'pickaxe' em linkgit:gitdiffcore[7] para mais informa챌천es."
#. type: Labeled list
#: en/diff-options.txt:565
@@ -5329,12 +5320,12 @@ msgid ""
"The object can be a blob or a submodule commit. It implies the `-t` option "
"in `git-log` to also find trees."
msgstr ""
-"O objeto pode ser um blob ou um subm처dulo commit. Isso implica que a op챌찾o "
-"`-t` em` git-log` tamb챕m encontre 찼rvores."
+"O objeto pode ser um blob ou um subm처dulo commit. Isso implica que a op챌찾o `-"
+"t` em` git-log` tamb챕m encontre 찼rvores."
#. type: Labeled list
#: en/diff-options.txt:574
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--pickaxe-all"
msgstr "--pickaxe-all"
@@ -5349,7 +5340,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:579
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--pickaxe-regex"
msgstr "--pickaxe-regex"
@@ -5376,20 +5367,20 @@ msgid ""
"cancel `diff.orderFile`, use `-O/dev/null`."
msgstr ""
"Controlar a ordem em que os arquivos aparecem na sa챠da. Isto sobrescreve a "
-"vari찼vel de configura챌찾o `diff.orderFile` (veja linkgit: git-config[1]). "
-"Para cancelar `diff.orderFile`, use` -O/dev/null`."
+"vari찼vel de configura챌찾o `diff.orderFile` (veja linkgit:git-config[1]). Para "
+"cancelar `diff.orderFile`, use` -O/dev/null`."
#. type: Plain text
#: en/diff-options.txt:602
msgid ""
-"The output order is determined by the order of glob patterns in <orderfile>."
-" All files with pathnames that match the first pattern are output first, "
-"all files with pathnames that match the second pattern (but not the first) "
-"are output next, and so on. All files with pathnames that do not match any "
-"pattern are output last, as if there was an implicit match-all pattern at "
-"the end of the file. If multiple pathnames have the same rank (they match "
-"the same pattern but no earlier patterns), their output order relative to "
-"each other is the normal order."
+"The output order is determined by the order of glob patterns in "
+"<orderfile>. All files with pathnames that match the first pattern are "
+"output first, all files with pathnames that match the second pattern (but "
+"not the first) are output next, and so on. All files with pathnames that do "
+"not match any pattern are output last, as if there was an implicit match-all "
+"pattern at the end of the file. If multiple pathnames have the same rank "
+"(they match the same pattern but no earlier patterns), their output order "
+"relative to each other is the normal order."
msgstr ""
"A ordem de sa챠da 챕 determinada pela ordem dos padr천es glob no <orderfile>. "
"Todos os arquivos com nomes de caminho que correspondam ao primeiro padr찾o "
@@ -5437,8 +5428,8 @@ msgid ""
"Patterns have the same syntax and semantics as patterns used for fnmatch(3) "
"without the FNM_PATHNAME flag, except a pathname also matches a pattern if "
"removing any number of the final pathname components matches the pattern. "
-"For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and "
-"\"`foo/bar/baz/asdf`\" but not \"`foobarx`\"."
+"For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and \"`foo/"
+"bar/baz/asdf`\" but not \"`foobarx`\"."
msgstr ""
"Os padr천es t챗m a mesma sintaxe e sem창ntica que os padr천es usados para "
"fnmatch(3) sem o sinalizador FNM_PATHNAME, exceto que um nome de caminho "
@@ -5473,8 +5464,8 @@ msgstr "--relativo[=<path>]"
msgid ""
"When run from a subdirectory of the project, it can be told to exclude "
"changes outside the directory and show pathnames relative to it with this "
-"option. When you are not in a subdirectory (e.g. in a bare repository), you"
-" can name which subdirectory to make the output relative to by giving a "
+"option. When you are not in a subdirectory (e.g. in a bare repository), you "
+"can name which subdirectory to make the output relative to by giving a "
"<path> as an argument."
msgstr ""
"Quando executado a partir de um subdiret처rio do projeto, ele pode ser "
@@ -5490,13 +5481,13 @@ msgstr ""
#: en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101
#: en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26
#: en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-tag.txt:60
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-a"
msgstr "-a"
#. type: Labeled list
#: en/diff-options.txt:637 en/git-grep.txt:102
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--text"
msgstr "--text"
@@ -5507,7 +5498,7 @@ msgstr "Trate todos os arquivos como texto."
#. type: Labeled list
#: en/diff-options.txt:640
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-cr-at-eol"
msgstr "--ignore-cr-at-eol"
@@ -5518,26 +5509,26 @@ msgstr "Ignore o retorno do carro no final da linha ao fazer uma compara챌찾o."
#. type: Labeled list
#: en/diff-options.txt:643
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-space-at-eol"
msgstr "--ignore-space-at-eol"
#. type: Labeled list
#: en/diff-options.txt:647 en/git-am.txt:102 en/git-apply.txt:182
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
#: en/diff-options.txt:652 en/git-blame.txt:83 en/git-cvsexportcommit.txt:71
#: en/git-grep.txt:134 en/git-hash-object.txt:31 en/git-help.txt:79
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-w"
msgstr "-w"
#. type: Labeled list
#: en/diff-options.txt:653
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-all-space"
msgstr "--ignore-all-space"
@@ -5553,7 +5544,7 @@ msgstr ""
#. type: Labeled list
#: en/diff-options.txt:658
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-blank-lines"
msgstr "--ignore-blank-lines"
@@ -5572,12 +5563,12 @@ msgstr "--inter-peda챌o-contexto=<lines>"
#: en/diff-options.txt:666
msgid ""
"Show the context between diff hunks, up to the specified number of lines, "
-"thereby fusing hunks that are close to each other. Defaults to "
-"`diff.interHunkContext` or 0 if the config option is unset."
+"thereby fusing hunks that are close to each other. Defaults to `diff."
+"interHunkContext` or 0 if the config option is unset."
msgstr ""
"Mostra o contexto entre os peda챌os de diff, at챕 o n첬mero especificado de "
-"linhas, assim fundindo partes pr처ximas umas das outras. O padr찾o 챕 "
-"`diff.interHunkContext` ou 0 se a op챌찾o de configura챌찾o n찾o estiver definida."
+"linhas, assim fundindo partes pr처ximas umas das outras. O padr찾o 챕 `diff."
+"interHunkContext` ou 0 se a op챌찾o de configura챌찾o n찾o estiver definida."
#. type: Labeled list
#: en/diff-options.txt:667 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261
@@ -5587,7 +5578,7 @@ msgstr "-W"
#. type: Labeled list
#: en/diff-options.txt:668 en/git-grep.txt:262
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--function-context"
msgstr "--function-context"
@@ -5598,15 +5589,15 @@ msgstr "Mostrar fun챌천es vizinhas inteiras de mudan챌as."
#. type: Labeled list
#: en/diff-options.txt:673 en/git-ls-remote.txt:46
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--exit-code"
msgstr "--exit-code"
#. type: Plain text
#: en/diff-options.txt:677
msgid ""
-"Make the program exit with codes similar to diff(1). That is, it exits with"
-" 1 if there were differences and 0 means no differences."
+"Make the program exit with codes similar to diff(1). That is, it exits with "
+"1 if there were differences and 0 means no differences."
msgstr ""
"Fa챌a o programa sair com c처digos semelhantes ao diff(1). Ou seja, sai com 1 "
"se houver diferen챌as e 0 significa sem diferen챌as."
@@ -5624,7 +5615,7 @@ msgstr ""
#: en/git-show-ref.txt:71 en/git-submodule.txt:244 en/git-svn.txt:671
#: en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:122
#: en/rev-list-options.txt:212
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--quiet"
msgstr "--quiet"
@@ -5635,7 +5626,7 @@ msgstr "Desativar todas as sa챠das do programa. Implica `--exit-code`."
#. type: Labeled list
#: en/diff-options.txt:683
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ext-diff"
msgstr "--ext-diff"
@@ -5647,12 +5638,12 @@ msgid ""
"linkgit:git-log[1] and friends."
msgstr ""
"Permitir que um auxiliar de diferen챌as externo seja executado. Se voc챗 "
-"definir um driver externo com diff linkgit: gitattributes[5], voc챗 precisa "
-"usar esta op챌찾o com linkgit: git-log[1] e amigos."
+"definir um driver externo com diff linkgit:gitattributes[5], voc챗 precisa "
+"usar esta op챌찾o com linkgit:git-log[1] e amigos."
#. type: Labeled list
#: en/diff-options.txt:688
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-ext-diff"
msgstr "--no-ext-diff"
@@ -5663,13 +5654,13 @@ msgstr "N찾o permitir drivers externos de diferen챌as."
#. type: Labeled list
#: en/diff-options.txt:691 en/git-cat-file.txt:60 en/git-grep.txt:105
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--textconv"
msgstr "--textconv"
#. type: Labeled list
#: en/diff-options.txt:692 en/git-grep.txt:108
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-textconv"
msgstr "--no-textconv"
@@ -5681,16 +5672,16 @@ msgid ""
"textconv filters are typically a one-way conversion, the resulting diff is "
"suitable for human consumption, but cannot be applied. For this reason, "
"textconv filters are enabled by default only for linkgit:git-diff[1] and "
-"linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing"
-" commands."
+"linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing "
+"commands."
msgstr ""
"Permitir (ou proibir) filtros de convers찾o de texto externos para serem "
-"executados ao comparar arquivos bin찼rios. Veja linkgit: gitattributes[5] "
-"para detalhes. Como os filtros textconv s찾o tipicamente uma convers찾o "
+"executados ao comparar arquivos bin찼rios. Veja linkgit:gitattributes[5] para "
+"detalhes. Como os filtros textconv s찾o tipicamente uma convers찾o "
"unidirecional, o diff resultante 챕 adequado para consumo humano, mas n찾o "
"pode ser aplicado. Por essa raz찾o, os filtros textconv s찾o habilitados por "
-"padr찾o apenas para linkgit: git-diff[1] e linkgit: git-log[1], mas n찾o para "
-"os comandos linkgit: git-format-patch 1] ou diff plumbing."
+"padr찾o apenas para linkgit:git-diff[1] e linkgit:git-log[1], mas n찾o para os "
+"comandos linkgit:git-format-patch 1] ou diff plumbing."
#. type: Labeled list
#: en/diff-options.txt:702 en/git-status.txt:85
@@ -5706,25 +5697,25 @@ msgid ""
"\"none\" will consider the submodule modified when it either contains "
"untracked or modified files or its HEAD differs from the commit recorded in "
"the superproject and can be used to override any settings of the 'ignore' "
-"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\""
-" is used submodules are not considered dirty when they only contain "
-"untracked content (but they are still scanned for modified content). Using "
-"\"dirty\" ignores all changes to the work tree of submodules, only changes "
-"to the commits stored in the superproject are shown (this was the behavior "
-"until 1.7.0). Using \"all\" hides all changes to submodules."
-msgstr ""
-"Ignore as altera챌천es nos subm처dulos na gera챌찾o do diff. <when> pode ser \""
-"none\", \"untracked\", \"dirty\" ou \"all\", que 챕 o padr찾o. O uso de \""
-"none\" considerar찼 o subm처dulo modificado quando ele contiver arquivos n찾o "
+"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" "
+"is used submodules are not considered dirty when they only contain untracked "
+"content (but they are still scanned for modified content). Using \"dirty\" "
+"ignores all changes to the work tree of submodules, only changes to the "
+"commits stored in the superproject are shown (this was the behavior until "
+"1.7.0). Using \"all\" hides all changes to submodules."
+msgstr ""
+"Ignore as altera챌천es nos subm처dulos na gera챌찾o do diff. <when> pode ser "
+"\"none\", \"untracked\", \"dirty\" ou \"all\", que 챕 o padr찾o. O uso de "
+"\"none\" considerar찼 o subm처dulo modificado quando ele contiver arquivos n찾o "
"rastreados ou modificados ou seu HEAD for diferente do commit gravado no "
"superprojeto e pode ser usado para sobrescrever qualquer configura챌찾o da "
-"op챌찾o 'ignore' no linkgit: git-config[1] ou linkgit: gitmodules[5]. Quando \""
-"untracked\" 챕 usado, os subm처dulos n찾o s찾o considerados sujos quando cont챗m "
-"apenas conte첬do n찾o rastreado (mas eles ainda s찾o verificados quanto ao "
-"conte첬do modificado). Usando \"dirty\" ignora todas as mudan챌as na 찼rvore de "
-"trabalho de subm처dulos, apenas as mudan챌as nos commits armazenados no "
-"superprojeto s찾o mostradas (este foi o comportamento at챕 1.7.0). Usar \"all\""
-" oculta todas as altera챌천es nos subm처dulos."
+"op챌찾o 'ignore' no linkgit:git-config[1] ou linkgit:gitmodules[5]. Quando "
+"\"untracked\" 챕 usado, os subm처dulos n찾o s찾o considerados sujos quando "
+"cont챗m apenas conte첬do n찾o rastreado (mas eles ainda s찾o verificados quanto "
+"ao conte첬do modificado). Usando \"dirty\" ignora todas as mudan챌as na 찼rvore "
+"de trabalho de subm처dulos, apenas as mudan챌as nos commits armazenados no "
+"superprojeto s찾o mostradas (este foi o comportamento at챕 1.7.0). Usar \"all"
+"\" oculta todas as altera챌천es nos subm처dulos."
#. type: Labeled list
#: en/diff-options.txt:715
@@ -5750,7 +5741,7 @@ msgstr "Mostrar o prefixo de destino especificado em vez de \"b/\"."
#. type: Labeled list
#: en/diff-options.txt:721
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-prefix"
msgstr "--no-prefix"
@@ -5772,7 +5763,7 @@ msgstr "Prefira um prefixo adicional a cada linha de sa챠da."
#. type: Labeled list
#: en/diff-options.txt:727
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ita-invisible-in-index"
msgstr "--ita-invisible-in-index"
@@ -5795,11 +5786,11 @@ msgstr ""
#. type: Plain text
#: en/diff-options.txt:736
msgid ""
-"For more detailed explanation on these common options, see also "
-"linkgit:gitdiffcore[7]."
+"For more detailed explanation on these common options, see also linkgit:"
+"gitdiffcore[7]."
msgstr ""
"Para uma explica챌찾o mais detalhada sobre estas op챌천es comuns, veja tamb챕m "
-"linkgit: gitdiffcore[7]."
+"linkgit:gitdiffcore[7]."
#. type: Labeled list
#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:154
@@ -5810,7 +5801,7 @@ msgstr ""
#: en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37
#: en/git-show-branch.txt:48 en/git-submodule.txt:254
#: en/rev-list-options.txt:138
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--all"
msgstr "--all"
@@ -5821,7 +5812,7 @@ msgstr "Buscar todos os controles remotos."
#. type: Labeled list
#: en/fetch-options.txt:5
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--append"
msgstr "--append"
@@ -5846,14 +5837,14 @@ msgstr "--profundidade=<profundidade>"
#: en/fetch-options.txt:16
msgid ""
"Limit fetching to the specified number of commits from the tip of each "
-"remote branch history. If fetching to a 'shallow' repository created by `git"
-" clone` with `--depth=<depth>` option (see linkgit:git-clone[1]), deepen or "
+"remote branch history. If fetching to a 'shallow' repository created by `git "
+"clone` with `--depth=<depth>` option (see linkgit:git-clone[1]), deepen or "
"shorten the history to the specified number of commits. Tags for the "
"deepened commits are not fetched."
msgstr ""
"Limite a busca para o n첬mero especificado de confirma챌천es da ponta de cada "
"hist처rico de ramifica챌찾o remota. Se buscar um reposit처rio 'superficial' "
-"criado pelo `git clone` com a op챌찾o` --depth = <depth> `(veja linkgit: git-"
+"criado pelo `git clone` com a op챌찾o` --depth = <depth> `(veja linkgit:git-"
"clone[1]), aprofunde ou encurte o hist처rico para o n첬mero especificado de "
"commits. As tags para as confirma챌천es aprofundadas n찾o s찾o buscadas."
@@ -5906,7 +5897,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:31
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--unshallow"
msgstr "--unshallow"
@@ -5930,15 +5921,15 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:39
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--update-shallow"
msgstr "--update-shallow"
#. type: Plain text
#: en/fetch-options.txt:44
msgid ""
-"By default when fetching from a shallow repository, `git fetch` refuses refs"
-" that require updating .git/shallow. This option updates .git/shallow and "
+"By default when fetching from a shallow repository, `git fetch` refuses refs "
+"that require updating .git/shallow. This option updates .git/shallow and "
"accept such refs."
msgstr ""
"Por padr찾o, ao buscar a partir de um reposit처rio superficial, o `git fetch` "
@@ -5954,10 +5945,10 @@ msgstr "--negocia챌찾o-tip=<commit|glob>"
#. type: Plain text
#: en/fetch-options.txt:53
msgid ""
-"By default, Git will report, to the server, commits reachable from all local"
-" refs to find common commits in an attempt to reduce the size of the to-be-"
-"received packfile. If specified, Git will only report commits reachable from"
-" the given tips. This is useful to speed up fetches when the user knows "
+"By default, Git will report, to the server, commits reachable from all local "
+"refs to find common commits in an attempt to reduce the size of the to-be-"
+"received packfile. If specified, Git will only report commits reachable from "
+"the given tips. This is useful to speed up fetches when the user knows "
"which local ref is likely to have commits in common with the upstream ref "
"being fetched."
msgstr ""
@@ -5981,11 +5972,11 @@ msgstr ""
#: en/fetch-options.txt:60
msgid ""
"The argument to this option may be a glob on ref names, a ref, or the "
-"(possibly abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to"
-" specifying this option multiple times, one for each matching ref name."
+"(possibly abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to "
+"specifying this option multiple times, one for each matching ref name."
msgstr ""
-"O argumento para essa op챌찾o pode ser um glob nos nomes de ref, um ref ou o ("
-"possivelmente abreviado) SHA-1 de um commit. A especifica챌찾o de glob 챕 "
+"O argumento para essa op챌찾o pode ser um glob nos nomes de ref, um ref ou o "
+"(possivelmente abreviado) SHA-1 de um commit. A especifica챌찾o de glob 챕 "
"equivalente a especificar essa op챌찾o v찼rias vezes, uma para cada nome de "
"refer챗ncia correspondente."
@@ -5996,7 +5987,7 @@ msgid ""
"in linkgit:git-config[1]."
msgstr ""
"Veja tamb챕m a vari찼vel de configura챌찾o `fetch.negotiationAlgorithm` "
-"documentada em linkgit: git-config[1]."
+"documentada em linkgit:git-config[1]."
#. type: Labeled list
#: en/fetch-options.txt:65 en/git-add.txt:69 en/git-clean.txt:48
@@ -6006,7 +5997,7 @@ msgstr ""
#: en/git-read-tree.txt:58 en/git-reflog.txt:120 en/git-rm.txt:44
#: en/git-send-email.txt:392 en/git-send-pack.txt:51 en/git-svn.txt:687
#: en/git-worktree.txt:175
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--dry-run"
msgstr "--dry-run"
@@ -6024,7 +6015,7 @@ msgstr "Mostre o que seria feito, sem fazer altera챌천es."
#: en/git-repack.txt:70 en/git-replace.txt:60 en/git-rm.txt:39
#: en/git-submodule.txt:266 en/git-tag.txt:72 en/git-update-server-info.txt:26
#: en/git-worktree.txt:119
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-f"
msgstr "-f"
@@ -6036,7 +6027,7 @@ msgstr "-f"
#: en/git-push.txt:325 en/git-replace.txt:61 en/git-rm.txt:40
#: en/git-send-email.txt:421 en/git-send-pack.txt:54 en/git-submodule.txt:267
#: en/git-tag.txt:73 en/git-update-server-info.txt:27 en/git-worktree.txt:120
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--force"
msgstr "--force"
@@ -6073,17 +6064,17 @@ msgstr "\tEsta op챌찾o sobrescreve essa verifica챌찾o.\n"
#. type: Labeled list
#: en/fetch-options.txt:82 en/git-am.txt:40 en/git-cvsexportcommit.txt:67
-#: en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53
-#: en/git-format-patch.txt:111 en/git-ls-files.txt:74 en/git-mailinfo.txt:27
-#: en/git-mv.txt:34 en/git-repack.txt:156
-#, ignore-same, no-wrap
+#: en/git-cvsimport.txt:93 en/git-fetch-pack.txt:53 en/git-format-patch.txt:111
+#: en/git-ls-files.txt:74 en/git-mailinfo.txt:27 en/git-mv.txt:34
+#: en/git-repack.txt:156
+#, no-wrap
msgid "-k"
msgstr "-k"
#. type: Labeled list
#: en/fetch-options.txt:83 en/git-am.txt:41 en/git-fetch-pack.txt:54
#: en/git-index-pack.txt:54 en/git-reset.txt:82
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--keep"
msgstr "--keep"
@@ -6094,7 +6085,7 @@ msgstr "Mantenha o pacote baixado."
#. type: Labeled list
#: en/fetch-options.txt:87
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--multiple"
msgstr "--multiple"
@@ -6109,7 +6100,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:92 en/git-push.txt:153
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--prune"
msgstr "--prune"
@@ -6147,16 +6138,16 @@ msgstr "-p"
#. type: Labeled list
#: en/fetch-options.txt:106
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--prune-tags"
msgstr "--prune-tags"
#. type: Plain text
#: en/fetch-options.txt:113
msgid ""
-"Before fetching, remove any local tags that no longer exist on the remote if"
-" `--prune` is enabled. This option should be used more carefully, unlike "
-"`--prune` it will remove any local references (local tags) that have been "
+"Before fetching, remove any local tags that no longer exist on the remote if "
+"`--prune` is enabled. This option should be used more carefully, unlike `--"
+"prune` it will remove any local references (local tags) that have been "
"created. This option is a shorthand for providing the explicit tag refspec "
"along with `--prune`, see the discussion about that in its documentation."
msgstr ""
@@ -6164,8 +6155,8 @@ msgstr ""
"controle remoto se `--prune` estiver ativado. Esta op챌찾o deve ser usada com "
"mais cuidado, ao contr찼rio de `--prune` ela ir찼 remover quaisquer "
"refer챗ncias locais (tags locais) que tenham sido criadas. Esta op챌찾o 챕 uma "
-"forma abreviada de fornecer o refspec de tag expl챠cito junto com o `--prune`"
-", veja a discuss찾o sobre isso em sua documenta챌찾o."
+"forma abreviada de fornecer o refspec de tag expl챠cito junto com o `--"
+"prune`, veja a discuss찾o sobre isso em sua documenta챌찾o."
#. type: Labeled list
#: en/fetch-options.txt:119 en/git-add.txt:68 en/git-blame.txt:70
@@ -6177,15 +6168,14 @@ msgstr ""
#: en/git-read-tree.txt:57 en/git-rebase.txt:321 en/git-reflog.txt:119
#: en/git-repack.txt:82 en/git-revert.txt:69 en/git-rm.txt:43
#: en/git-shortlog.txt:29 en/git-submodule.txt:289 en/git-svn.txt:686
-#: en/git-unpack-objects.txt:30 en/git-worktree.txt:174
-#: en/merge-options.txt:73
-#, ignore-same, no-wrap
+#: en/git-unpack-objects.txt:30 en/git-worktree.txt:174 en/merge-options.txt:73
+#, no-wrap
msgid "-n"
msgstr "-n"
#. type: Labeled list
#: en/fetch-options.txt:121 en/git-clone.txt:224
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-tags"
msgstr "--no-tags"
@@ -6200,7 +6190,7 @@ msgstr ""
"Por padr찾o, as tags que apontam para objetos que s찾o baixados do reposit처rio "
"remoto s찾o buscadas e armazenadas localmente. Esta op챌찾o desativa esta tag "
"autom찼tica. O comportamento padr찾o de um controle remoto pode ser "
-"especificado com a configura챌찾o remota. <Nome>.tagOpt. Veja linkgit: git-"
+"especificado com a configura챌찾o remota. <Nome>.tagOpt. Veja linkgit:git-"
"config[1]."
#. type: Labeled list
@@ -6218,8 +6208,8 @@ msgid ""
"remote repository. See section on \"Configured Remote-tracking Branches\" "
"for details."
msgstr ""
-"Ao buscar refs listadas na linha de comando, use o refspec especificado ("
-"pode ser fornecido mais de uma vez) para mapear os refs para filiais de "
+"Ao buscar refs listadas na linha de comando, use o refspec especificado "
+"(pode ser fornecido mais de uma vez) para mapear os refs para filiais de "
"rastreamento remoto, em vez dos valores das vari찼veis de configura챌찾o "
"`remote.*.Fetch` para o reposit처rio remoto. Consulte a se챌찾o \"Ramifica챌천es "
"de rastreamento remoto configuradas\" para detalhes."
@@ -6228,7 +6218,7 @@ msgstr ""
#: en/fetch-options.txt:138 en/git-describe.txt:55 en/git-fsck.txt:41
#: en/git-ls-remote.txt:27 en/git-name-rev.txt:24 en/git-push.txt:186
#: en/git-show-ref.txt:41
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--tags"
msgstr "--tags"
@@ -6236,13 +6226,13 @@ msgstr "--tags"
#: en/fetch-options.txt:145
msgid ""
"Fetch all tags from the remote (i.e., fetch remote tags `refs/tags/*` into "
-"local tags with the same name), in addition to whatever else would otherwise"
-" be fetched. Using this option alone does not subject tags to pruning, even"
-" if --prune is used (though tags may be pruned anyway if they are also the "
+"local tags with the same name), in addition to whatever else would otherwise "
+"be fetched. Using this option alone does not subject tags to pruning, even "
+"if --prune is used (though tags may be pruned anyway if they are also the "
"destination of an explicit refspec; see `--prune`)."
msgstr ""
-"Busque todas as tags do controle remoto (ou seja, busque as tags remotas `"
-"refs/tags/*` em tags locais com o mesmo nome), al챕m de qualquer outra coisa "
+"Busque todas as tags do controle remoto (ou seja, busque as tags remotas "
+"`refs/tags/*` em tags locais com o mesmo nome), al챕m de qualquer outra coisa "
"que seria buscada. Usar essa op챌찾o sozinha n찾o submete as tags 횪 remo챌찾o, "
"mesmo se --prune for usado (embora as tags possam ser removidas de qualquer "
"maneira, se elas tamb챕m forem o destino de uma refer챗ncia expl챠cita; "
@@ -6278,7 +6268,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:157
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-j"
msgstr "-j"
@@ -6301,7 +6291,7 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:164 en/git-push.txt:377
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-recurse-submodules"
msgstr "--no-recurse-submodules"
@@ -6327,8 +6317,8 @@ msgid ""
"submodule foo\". This option is used internally when recursing over "
"submodules."
msgstr ""
-"Prefira <path> a caminhos impressos em mensagens informativas, como \""
-"Buscando submodulo foo\". Essa op챌찾o 챕 usada internamente ao recorrer a "
+"Prefira <path> a caminhos impressos em mensagens informativas, como "
+"\"Buscando submodulo foo\". Essa op챌찾o 챕 usada internamente ao recorrer a "
"subm처dulos."
#. type: Labeled list
@@ -6340,22 +6330,21 @@ msgstr "--recurso-subm처dulo-padr찾o=[sim|sob-demanda]"
#. type: Plain text
#: en/fetch-options.txt:180
msgid ""
-"This option is used internally to temporarily provide a non-negative default"
-" value for the --recurse-submodules option. All other methods of "
-"configuring fetch's submodule recursion (such as settings in "
-"linkgit:gitmodules[5] and linkgit:git-config[1]) override this option, as "
-"does specifying --[no-]recurse-submodules directly."
+"This option is used internally to temporarily provide a non-negative default "
+"value for the --recurse-submodules option. All other methods of configuring "
+"fetch's submodule recursion (such as settings in linkgit:gitmodules[5] and "
+"linkgit:git-config[1]) override this option, as does specifying --"
+"[no-]recurse-submodules directly."
msgstr ""
"Essa op챌찾o 챕 usada internamente para fornecer temporariamente um valor "
"padr찾o n찾o negativo para a op챌찾o --recurse-submodules. Todos os outros "
"m챕todos de configura챌찾o da recurs찾o do subm처dulo da busca (como "
-"configura챌천es em linkgit: gitmodules[5] e linkgit: git-config[1]) "
-"sobrescrevem esta op챌찾o, assim como especificar - [no-]recurse-submodules "
-"diretamente."
+"configura챌천es em linkgit:gitmodules[5] e linkgit:git-config[1]) sobrescrevem "
+"esta op챌찾o, assim como especificar - [no-]recurse-submodules diretamente."
#. type: Labeled list
#: en/fetch-options.txt:183
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--update-head-ok"
msgstr "--update-head-ok"
@@ -6381,9 +6370,9 @@ msgstr "--envio-pacote <envio-pacote>"
#. type: Plain text
#: en/fetch-options.txt:196
msgid ""
-"When given, and the repository to fetch from is handled by 'git fetch-pack',"
-" `--exec=<upload-pack>` is passed to the command to specify non-default path"
-" for the command run on the other end."
+"When given, and the repository to fetch from is handled by 'git fetch-pack', "
+"`--exec=<upload-pack>` is passed to the command to specify non-default path "
+"for the command run on the other end."
msgstr ""
"Quando dado, e o reposit처rio para buscar 챕 manipulado por 'git fetch-pack', "
"`--exec=<upload-pack>` 챕 passado para o comando para especificar o caminho "
@@ -6402,7 +6391,7 @@ msgstr ""
#: en/git-show-ref.txt:70 en/git-submodule.txt:243 en/git-svn.txt:670
#: en/git-symbolic-ref.txt:39 en/git-unpack-objects.txt:34
#: en/git-update-index.txt:58 en/git-worktree.txt:184 en/merge-options.txt:121
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-q"
msgstr "-q"
@@ -6430,7 +6419,7 @@ msgstr ""
#: en/git-svn.txt:366 en/git-tag.txt:80 en/git-verify-commit.txt:23
#: en/git-verify-pack.txt:26 en/git-verify-tag.txt:23 en/git-worktree.txt:188
#: en/merge-options.txt:125
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-v"
msgstr "-v"
@@ -6446,7 +6435,7 @@ msgstr "-v"
#: en/git-status.txt:51 en/git-svn.txt:367 en/git-update-index.txt:153
#: en/git-verify-commit.txt:24 en/git-verify-pack.txt:27
#: en/git-verify-tag.txt:24 en/git-worktree.txt:189 en/merge-options.txt:126
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--verbose"
msgstr "--verbose"
@@ -6460,7 +6449,7 @@ msgstr "Seja verboso."
#: 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
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--progress"
msgstr "--progress"
@@ -6469,8 +6458,8 @@ msgstr "--progress"
#: en/git-push.txt:376
msgid ""
"Progress status is reported on the standard error stream by default when it "
-"is attached to a terminal, unless -q is specified. This flag forces progress"
-" status even if the standard error stream is not directed to a terminal."
+"is attached to a terminal, unless -q is specified. This flag forces progress "
+"status even if the standard error stream is not directed to a terminal."
msgstr ""
"O status de progresso 챕 relatado no fluxo de erro padr찾o por padr찾o quando "
"ele 챕 anexado a um terminal, a menos que -q seja especificado. Esse "
@@ -6504,13 +6493,13 @@ msgstr ""
#. type: Labeled list
#: en/fetch-options.txt:223 en/git-push.txt:398
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-4"
msgstr "-4"
#. type: Labeled list
#: en/fetch-options.txt:224 en/git-push.txt:399
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ipv4"
msgstr "--ipv4"
@@ -6521,13 +6510,13 @@ msgstr "Use apenas endere챌os IPv4, ignorando endere챌os IPv6."
#. type: Labeled list
#: en/fetch-options.txt:227 en/git-push.txt:402
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-6"
msgstr "-6"
#. type: Labeled list
#: en/fetch-options.txt:228 en/git-push.txt:403
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ipv6"
msgstr "--ipv6"
@@ -6538,7 +6527,7 @@ msgstr "Use apenas endere챌os IPv6, ignorando endere챌os IPv4."
#. type: Title =
#: en/git-add.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-add(1)"
msgstr "git-add(1)"
@@ -6547,49 +6536,47 @@ msgstr "git-add(1)"
#: en/git-archimport.txt:5 en/git-archive.txt:5 en/git-bisect.txt:5
#: en/git-blame.txt:5 en/git-branch.txt:5 en/git-bundle.txt:5
#: en/git-cat-file.txt:5 en/git-check-attr.txt:5 en/git-check-ignore.txt:5
-#: en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5
-#: en/git-checkout.txt:5 en/git-check-ref-format.txt:5
-#: en/git-cherry-pick.txt:5 en/git-cherry.txt:5 en/git-citool.txt:5
-#: en/git-clean.txt:5 en/git-clone.txt:5 en/git-column.txt:5
-#: en/git-commit-tree.txt:5 en/git-commit.txt:5 en/git-config.txt:5
-#: en/git-count-objects.txt:5 en/git-credential-cache--daemon.txt:5
-#: en/git-credential-cache.txt:5 en/git-credential-store.txt:5
-#: en/git-credential.txt:5 en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5
-#: en/git-cvsserver.txt:5 en/git-daemon.txt:5 en/git-describe.txt:5
-#: en/git-diff-files.txt:5 en/git-diff-index.txt:5 en/git-difftool.txt:5
-#: en/git-diff-tree.txt:5 en/git-diff.txt:5 en/git-fast-export.txt:5
-#: en/git-fast-import.txt:5 en/git-fetch-pack.txt:5 en/git-fetch.txt:5
-#: en/git-filter-branch.txt:5 en/git-fmt-merge-msg.txt:5
-#: en/git-for-each-ref.txt:5 en/git-format-patch.txt:5
-#: en/git-fsck-objects.txt:5 en/git-fsck.txt:5 en/git-gc.txt:5
-#: en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5 en/git-gui.txt:5
-#: en/git-hash-object.txt:5 en/git-help.txt:5 en/git-http-backend.txt:5
-#: en/git-http-fetch.txt:5 en/git-http-push.txt:5 en/git-imap-send.txt:5
-#: en/git-index-pack.txt:5 en/git-init-db.txt:5 en/git-init.txt:5
-#: en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5 en/git-log.txt:5
-#: en/git-ls-files.txt:5 en/git-ls-remote.txt:5 en/git-ls-tree.txt:5
-#: en/git-mailinfo.txt:5 en/git-mailsplit.txt:5 en/git-merge-base.txt:5
-#: en/git-merge-file.txt:5 en/git-merge-index.txt:5
+#: en/git-check-mailmap.txt:5 en/git-checkout-index.txt:5 en/git-checkout.txt:5
+#: en/git-check-ref-format.txt:5 en/git-cherry-pick.txt:5 en/git-cherry.txt:5
+#: en/git-citool.txt:5 en/git-clean.txt:5 en/git-clone.txt:5
+#: en/git-column.txt:5 en/git-commit-tree.txt:5 en/git-commit.txt:5
+#: en/git-config.txt:5 en/git-count-objects.txt:5
+#: en/git-credential-cache--daemon.txt:5 en/git-credential-cache.txt:5
+#: en/git-credential-store.txt:5 en/git-credential.txt:5
+#: en/git-cvsexportcommit.txt:5 en/git-cvsimport.txt:5 en/git-cvsserver.txt:5
+#: en/git-daemon.txt:5 en/git-describe.txt:5 en/git-diff-files.txt:5
+#: en/git-diff-index.txt:5 en/git-difftool.txt:5 en/git-diff-tree.txt:5
+#: en/git-diff.txt:5 en/git-fast-export.txt:5 en/git-fast-import.txt:5
+#: en/git-fetch-pack.txt:5 en/git-fetch.txt:5 en/git-filter-branch.txt:5
+#: en/git-fmt-merge-msg.txt:5 en/git-for-each-ref.txt:5
+#: en/git-format-patch.txt:5 en/git-fsck-objects.txt:5 en/git-fsck.txt:5
+#: en/git-gc.txt:5 en/git-get-tar-commit-id.txt:5 en/git-grep.txt:5
+#: en/git-gui.txt:5 en/git-hash-object.txt:5 en/git-help.txt:5
+#: en/git-http-backend.txt:5 en/git-http-fetch.txt:5 en/git-http-push.txt:5
+#: en/git-imap-send.txt:5 en/git-index-pack.txt:5 en/git-init-db.txt:5
+#: en/git-init.txt:5 en/git-instaweb.txt:5 en/git-interpret-trailers.txt:5
+#: en/git-log.txt:5 en/git-ls-files.txt:5 en/git-ls-remote.txt:5
+#: en/git-ls-tree.txt:5 en/git-mailinfo.txt:5 en/git-mailsplit.txt:5
+#: en/git-merge-base.txt:5 en/git-merge-file.txt:5 en/git-merge-index.txt:5
#: en/git-merge-one-file.txt:5 en/git-mergetool--lib.txt:5
#: en/git-mergetool.txt:5 en/git-merge-tree.txt:5 en/git-merge.txt:5
-#: en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5
-#: en/git-name-rev.txt:5 en/git-notes.txt:5 en/git-p4.txt:5
-#: en/git-pack-objects.txt:5 en/git-pack-redundant.txt:5
-#: en/git-pack-refs.txt:5 en/git-parse-remote.txt:5 en/git-patch-id.txt:5
-#: en/git-prune-packed.txt:5 en/git-prune.txt:5 en/git-pull.txt:5
-#: en/git-push.txt:5 en/git-quiltimport.txt:5 en/git-read-tree.txt:5
-#: en/git-rebase.txt:5 en/git-receive-pack.txt:5 en/git-reflog.txt:5
-#: en/git-remote-ext.txt:5 en/git-remote-fd.txt:5 en/git-remote-testgit.txt:5
-#: en/git-remote.txt:5 en/git-repack.txt:5 en/git-replace.txt:5
-#: en/git-request-pull.txt:5 en/git-rerere.txt:5 en/git-reset.txt:5
-#: en/git-revert.txt:5 en/git-rev-list.txt:5 en/git-rev-parse.txt:5
-#: en/git-rm.txt:5 en/git-send-email.txt:5 en/git-send-pack.txt:5
-#: en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5 en/git-sh-i18n.txt:5
-#: en/git-shortlog.txt:5 en/git-show-branch.txt:5 en/git-show-index.txt:5
-#: en/git-show-ref.txt:5 en/git-show.txt:5 en/git-sh-setup.txt:5
-#: en/git-stage.txt:5 en/git-stash.txt:5 en/git-status.txt:5
-#: en/git-stripspace.txt:5 en/git-submodule.txt:5 en/git-svn.txt:5
-#: en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5
+#: en/git-mktag.txt:5 en/git-mktree.txt:5 en/git-mv.txt:5 en/git-name-rev.txt:5
+#: en/git-notes.txt:5 en/git-p4.txt:5 en/git-pack-objects.txt:5
+#: en/git-pack-redundant.txt:5 en/git-pack-refs.txt:5 en/git-parse-remote.txt:5
+#: en/git-patch-id.txt:5 en/git-prune-packed.txt:5 en/git-prune.txt:5
+#: en/git-pull.txt:5 en/git-push.txt:5 en/git-quiltimport.txt:5
+#: en/git-read-tree.txt:5 en/git-rebase.txt:5 en/git-receive-pack.txt:5
+#: en/git-reflog.txt:5 en/git-remote-ext.txt:5 en/git-remote-fd.txt:5
+#: en/git-remote-testgit.txt:5 en/git-remote.txt:5 en/git-repack.txt:5
+#: en/git-replace.txt:5 en/git-request-pull.txt:5 en/git-rerere.txt:5
+#: en/git-reset.txt:5 en/git-revert.txt:5 en/git-rev-list.txt:5
+#: en/git-rev-parse.txt:5 en/git-rm.txt:5 en/git-send-email.txt:5
+#: en/git-send-pack.txt:5 en/git-shell.txt:5 en/git-sh-i18n--envsubst.txt:5
+#: en/git-sh-i18n.txt:5 en/git-shortlog.txt:5 en/git-show-branch.txt:5
+#: en/git-show-index.txt:5 en/git-show-ref.txt:5 en/git-show.txt:5
+#: en/git-sh-setup.txt:5 en/git-stage.txt:5 en/git-stash.txt:5
+#: en/git-status.txt:5 en/git-stripspace.txt:5 en/git-submodule.txt:5
+#: en/git-svn.txt:5 en/git-symbolic-ref.txt:5 en/git-tag.txt:5 en/git.txt:5
#: en/git-unpack-file.txt:5 en/git-unpack-objects.txt:5
#: en/git-update-index.txt:5 en/git-update-ref.txt:5
#: en/git-update-server-info.txt:5 en/git-upload-archive.txt:5
@@ -6611,17 +6598,16 @@ msgstr "git-add - Adicione o conte첬do do arquivo ao 챠ndice"
#: 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-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
@@ -6672,11 +6658,9 @@ msgid ""
"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
"\t [--chmod=(+|-)x] [--] [<pathspec>...]\n"
msgstr ""
-"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interativo | "
-"-i] [--patch | -p]\n"
+"'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interativo | -i] [--patch | -p]\n"
"\t [--edit | -e] [- [no-]todos | - [no-]ignorar-remo챌찾o| [--update | -u]]\n"
-"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] "
-"[--renormalize]\n"
+"\t [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]\n"
"\t [--chmod = (+ | -) x] [-] [<pathspec> ...]\n"
#. type: Title -
@@ -6727,14 +6711,13 @@ msgstr ""
#: en/git-show-index.txt:16 en/git-show-ref.txt:17 en/git-show.txt:15
#: en/git-sh-setup.txt:14 en/git-stage.txt:16 en/git-stash.txt:24
#: en/git-status.txt:15 en/git-stripspace.txt:16 en/git-submodule.txt:24
-#: en/git-svn.txt:14 en/git-symbolic-ref.txt:16 en/git-tag.txt:22
-#: en/git.txt:20 en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16
+#: en/git-svn.txt:14 en/git-symbolic-ref.txt:16 en/git-tag.txt:22 en/git.txt:20
+#: en/git-unpack-file.txt:16 en/git-unpack-objects.txt:16
#: en/git-update-index.txt:31 en/git-update-ref.txt:14
#: en/git-update-server-info.txt:15 en/git-upload-archive.txt:15
#: en/git-upload-pack.txt:16 en/git-var.txt:15 en/git-verify-commit.txt:14
-#: en/git-verify-pack.txt:16 en/git-verify-tag.txt:14
-#: en/git-web--browse.txt:14 en/git-whatchanged.txt:15 en/git-worktree.txt:21
-#: en/git-write-tree.txt:15
+#: en/git-verify-pack.txt:16 en/git-verify-tag.txt:14 en/git-web--browse.txt:14
+#: en/git-whatchanged.txt:15 en/git-worktree.txt:21 en/git-write-tree.txt:15
#, no-wrap
msgid "DESCRIPTION"
msgstr "DESCRI횉횄O"
@@ -6759,9 +6742,9 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:30
msgid ""
-"The \"index\" holds a snapshot of the content of the working tree, and it is"
-" this snapshot that is taken as the contents of the next commit. Thus after"
-" making any changes to the working tree, and before running the commit "
+"The \"index\" holds a snapshot of the content of the working tree, and it is "
+"this snapshot that is taken as the contents of the next commit. Thus after "
+"making any changes to the working tree, and before running the commit "
"command, you must use the `add` command to add any new or modified files to "
"the index."
msgstr ""
@@ -6788,8 +6771,8 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:38
msgid ""
-"The `git status` command can be used to obtain a summary of which files have"
-" changes that are staged for the next commit."
+"The `git status` command can be used to obtain a summary of which files have "
+"changes that are staged for the next commit."
msgstr ""
"O comando `git status` pode ser usado para obter um resumo de quais arquivos "
"possuem mudan챌as que s찾o testadas para o pr처ximo commit."
@@ -6797,8 +6780,8 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:45
msgid ""
-"The `git add` command will not add ignored files by default. If any ignored"
-" files were explicitly specified on the command line, `git add` will fail "
+"The `git add` command will not add ignored files by default. If any ignored "
+"files were explicitly specified on the command line, `git add` will fail "
"with a list of ignored files. Ignored files reached by directory recursion "
"or filename globbing performed by Git (quote your globs before the shell) "
"will be silently ignored. The 'git add' command can be used to add ignored "
@@ -6818,7 +6801,7 @@ msgid ""
"Please see linkgit:git-commit[1] for alternative ways to add content to a "
"commit."
msgstr ""
-"Por favor, veja linkgit: git-commit[1] para formas alternativas de adicionar "
+"Por favor, veja linkgit:git-commit[1] para formas alternativas de adicionar "
"conte첬do a um commit."
#. type: Title -
@@ -6881,14 +6864,14 @@ msgstr "<pathspec>..."
#: en/git-add.txt:64
msgid ""
"Files to add content from. Fileglobs (e.g. `*.c`) can be given to add all "
-"matching files. Also a leading directory name (e.g. `dir` to add "
-"`dir/file1` and `dir/file2`) can be given to update the index to match the "
+"matching files. Also a leading directory name (e.g. `dir` to add `dir/"
+"file1` and `dir/file2`) can be given to update the index to match the "
"current state of the directory as a whole (e.g. specifying `dir` will "
-"record not just a file `dir/file1` modified in the working tree, a file "
-"`dir/file2` added to the working tree, but also a file `dir/file3` removed "
-"from the working tree). Note that older versions of Git used to ignore "
-"removed files; use `--no-all` option if you want to add modified or new "
-"files but ignore removed ones."
+"record not just a file `dir/file1` modified in the working tree, a file `dir/"
+"file2` added to the working tree, but also a file `dir/file3` removed from "
+"the working tree). Note that older versions of Git used to ignore removed "
+"files; use `--no-all` option if you want to add modified or new files but "
+"ignore removed ones."
msgstr ""
"Arquivos para adicionar conte첬do de. Fileglobs (por exemplo, `* .c`) podem "
"ser fornecidos para adicionar todos os arquivos correspondentes. Tamb챕m um "
@@ -6909,7 +6892,7 @@ msgid ""
"linkgit:gitglossary[7]."
msgstr ""
"Para mais detalhes sobre a sintaxe <pathspec>, veja a entrada 'pathspec' em "
-"linkgit: gitglossary[7]."
+"linkgit:gitglossary[7]."
#. type: Plain text
#: en/git-add.txt:72
@@ -6931,14 +6914,14 @@ msgstr "Permitir a adi챌찾o de arquivos ignorados."
#: 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
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-i"
msgstr "-i"
#. type: Labeled list
#: en/git-add.txt:82 en/git-am.txt:123 en/git-clean.txt:43
#: en/git-rebase.txt:390 en/git-rebase.txt:530 en/git-svn.txt:297
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--interactive"
msgstr "--interactive"
@@ -6958,8 +6941,8 @@ msgstr ""
#: en/git-add.txt:94
msgid ""
"Interactively choose hunks of patch between the index and the work tree and "
-"add them to the index. This gives the user a chance to review the difference"
-" before adding modified contents to the index."
+"add them to the index. This gives the user a chance to review the difference "
+"before adding modified contents to the index."
msgstr ""
"Interativamente, escolha peda챌os de patch entre o 챠ndice e a 찼rvore de "
"trabalho e adicione-os ao 챠ndice. Isso d찼 ao usu찼rio a chance de revisar a "
@@ -6969,8 +6952,8 @@ msgstr ""
#: en/git-add.txt:98
msgid ""
"This effectively runs `add --interactive`, but bypasses the initial command "
-"menu and directly jumps to the `patch` subcommand. See ``Interactive mode''"
-" for details."
+"menu and directly jumps to the `patch` subcommand. See ``Interactive mode'' "
+"for details."
msgstr ""
"Isso efetivamente executa `add --interactive`, mas ignora o menu de comando "
"inicial e pula diretamente para o subcomando` patch`. Veja `` modo "
@@ -6981,7 +6964,7 @@ msgstr ""
#: en/git-cherry-pick.txt:55 en/git-commit.txt:219 en/git-config.txt:245
#: en/git-grep.txt:275 en/git-revert.txt:43 en/git-shortlog.txt:38
#: en/git-svn.txt:614 en/git-tag.txt:170 en/merge-options.txt:11
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-e"
msgstr "-e"
@@ -6989,7 +6972,7 @@ msgstr "-e"
#: en/git-add.txt:100 en/git-cherry-pick.txt:56 en/git-commit.txt:220
#: en/git-config.txt:246 en/git-revert.txt:44 en/git-svn.txt:615
#: en/git-tag.txt:171 en/merge-options.txt:10
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--edit"
msgstr "--edit"
@@ -7006,11 +6989,11 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:110
msgid ""
-"The intent of this option is to pick and choose lines of the patch to apply,"
-" or even to modify the contents of lines to be staged. This can be quicker "
+"The intent of this option is to pick and choose lines of the patch to apply, "
+"or even to modify the contents of lines to be staged. This can be quicker "
"and more flexible than using the interactive hunk selector. However, it is "
-"easy to confuse oneself and create a patch that does not apply to the index."
-" See EDITING PATCHES below."
+"easy to confuse oneself and create a patch that does not apply to the index. "
+"See EDITING PATCHES below."
msgstr ""
"A inten챌찾o dessa op챌찾o 챕 escolher linhas do patch a ser aplicado ou "
"modificar o conte첬do das linhas a serem testadas. Isso pode ser mais r찼pido "
@@ -7020,7 +7003,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:112
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--update"
msgstr "--update"
@@ -7038,8 +7021,8 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:121
msgid ""
-"If no <pathspec> is given when `-u` option is used, all tracked files in the"
-" entire working tree are updated (old versions of Git used to limit the "
+"If no <pathspec> is given when `-u` option is used, all tracked files in the "
+"entire working tree are updated (old versions of Git used to limit the "
"update to the current directory and its subdirectories)."
msgstr ""
"Se nenhum <pathspec> for fornecido quando a op챌찾o `-u` for usada, todos os "
@@ -7055,7 +7038,7 @@ msgstr "-A"
#. type: Labeled list
#: en/git-add.txt:124
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-ignore-removal"
msgstr "--no-ignore-removal"
@@ -7085,21 +7068,21 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:135
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-all"
msgstr "--no-all"
#. type: Labeled list
#: en/git-add.txt:136
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-removal"
msgstr "--ignore-removal"
#. type: Plain text
#: en/git-add.txt:141
msgid ""
-"Update the index by adding new files that are unknown to the index and files"
-" modified in the working tree, but ignore files that have been removed from "
+"Update the index by adding new files that are unknown to the index and files "
+"modified in the working tree, but ignore files that have been removed from "
"the working tree. This option is a no-op when no <pathspec> is used."
msgstr ""
"Atualize o 챠ndice adicionando novos arquivos que s찾o desconhecidos ao 챠ndice "
@@ -7126,7 +7109,7 @@ msgstr "-N"
#. type: Labeled list
#: en/git-add.txt:147 en/git-apply.txt:77
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--intent-to-add"
msgstr "--intent-to-add"
@@ -7134,8 +7117,8 @@ msgstr "--intent-to-add"
#: en/git-add.txt:153
msgid ""
"Record only the fact that the path will be added later. An entry for the "
-"path is placed in the index with no content. This is useful for, among other"
-" things, showing the unstaged content of such files with `git diff` and "
+"path is placed in the index with no content. This is useful for, among other "
+"things, showing the unstaged content of such files with `git diff` and "
"committing them with `git commit -a`."
msgstr ""
"Registre apenas o fato de que o caminho ser찼 adicionado posteriormente. Uma "
@@ -7145,7 +7128,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:154 en/git-update-index.txt:54
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--refresh"
msgstr "--refresh"
@@ -7160,7 +7143,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:158
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-errors"
msgstr "--ignore-errors"
@@ -7168,20 +7151,20 @@ msgstr "--ignore-errors"
#: en/git-add.txt:164
msgid ""
"If some files could not be added because of errors indexing them, do not "
-"abort the operation, but continue adding the others. The command shall still"
-" exit with non-zero status. The configuration variable `add.ignoreErrors` "
+"abort the operation, but continue adding the others. The command shall still "
+"exit with non-zero status. The configuration variable `add.ignoreErrors` "
"can be set to true to make this the default behaviour."
msgstr ""
"Se alguns arquivos n찾o puderem ser adicionados devido a erros de indexa챌찾o, "
"n찾o cancele a opera챌찾o, mas continue adicionando os outros. O comando ainda "
-"deve sair com status diferente de zero. A vari찼vel de configura챌찾o "
-"`add.ignoreErrors` pode ser configurada como true para tornar este o "
+"deve sair com status diferente de zero. A vari찼vel de configura챌찾o `add."
+"ignoreErrors` pode ser configurada como true para tornar este o "
"comportamento padr찾o."
#. type: Labeled list
#: en/git-add.txt:165 en/git-notes.txt:169 en/git-update-index.txt:72
#: en/rev-list-options.txt:193
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-missing"
msgstr "--ignore-missing"
@@ -7199,7 +7182,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:171
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-warn-embedded-repo"
msgstr "--no-warn-embedded-repo"
@@ -7207,18 +7190,18 @@ msgstr "--no-warn-embedded-repo"
#: en/git-add.txt:177
msgid ""
"By default, `git add` will warn when adding an embedded repository to the "
-"index without using `git submodule add` to create an entry in `.gitmodules`."
-" This option will suppress the warning (e.g., if you are manually performing"
-" operations on submodules)."
+"index without using `git submodule add` to create an entry in `.gitmodules`. "
+"This option will suppress the warning (e.g., if you are manually performing "
+"operations on submodules)."
msgstr ""
"Por padr찾o, o `git add` ir찼 avisar quando adicionar um reposit처rio embutido "
-"ao 챠ndice sem usar o` git submodule add` para criar uma entrada no "
-"`.gitmodules`. Esta op챌찾o suprimir찼 o aviso (por exemplo, se voc챗 estiver "
+"ao 챠ndice sem usar o` git submodule add` para criar uma entrada no `."
+"gitmodules`. Esta op챌찾o suprimir찼 o aviso (por exemplo, se voc챗 estiver "
"executando opera챌천es manualmente em subm처dulos)."
#. type: Labeled list
#: en/git-add.txt:178
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--renormalize"
msgstr "--renormalize"
@@ -7233,8 +7216,8 @@ msgstr ""
"Aplique o processo \"limpo\" recentemente a todos os arquivos rastreados "
"para adicion찼-los 횪 for챌a novamente ao 챠ndice. Isso 챕 첬til depois de alterar "
"a configura챌찾o `core.autocrlf` ou o atributo` text` para corrigir arquivos "
-"adicionados com termina챌천es de linha CRLF/LF erradas. Esta op챌찾o implica "
-"`-u`."
+"adicionados com termina챌천es de linha CRLF/LF erradas. Esta op챌찾o implica `-"
+"u`."
#. type: Labeled list
#: en/git-add.txt:185 en/git-update-index.txt:85
@@ -7286,14 +7269,14 @@ msgstr "CONFIGURA횉횄O"
#: en/git-add.txt:203
msgid ""
"The optional configuration variable `core.excludesFile` indicates a path to "
-"a file containing patterns of file names to exclude from git-add, similar to"
-" $GIT_DIR/info/exclude. Patterns in the exclude file are used in addition "
-"to those in info/exclude. See linkgit:gitignore[5]."
+"a file containing patterns of file names to exclude from git-add, similar to "
+"$GIT_DIR/info/exclude. Patterns in the exclude file are used in addition to "
+"those in info/exclude. See linkgit:gitignore[5]."
msgstr ""
"A vari찼vel de configura챌찾o opcional core.excludesFile indica um caminho para "
"um arquivo contendo padr천es de nomes de arquivos a serem exclu챠dos do git-"
"add, similar a $GIT_DIR/info/exclude. Padr천es no arquivo de exclus찾o s찾o "
-"usados al챕m daqueles em info/exclude. Veja linkgit: gitignore[5]."
+"usados al챕m daqueles em info/exclude. Veja linkgit:gitignore[5]."
#. type: Title -
#: en/git-add.txt:206 en/git-archive.txt:149 en/git-bisect.txt:369
@@ -7304,20 +7287,20 @@ msgstr ""
#: en/git-commit.txt:357 en/git-config.txt:336 en/git-credential-cache.txt:55
#: en/git-credential-store.txt:71 en/git-cvsexportcommit.txt:91
#: en/git-daemon.txt:257 en/git-describe.txt:127 en/git-diff.txt:123
-#: en/git-fast-export.txt:146 en/git-fetch.txt:242
-#: en/git-filter-branch.txt:234 en/git-fmt-merge-msg.txt:61
-#: en/git-for-each-ref.txt:268 en/git-format-patch.txt:629 en/git-grep.txt:316
-#: en/git-http-backend.txt:67 en/git-imap-send.txt:97 en/git-init.txt:137
-#: en/git-interpret-trailers.txt:256 en/git-log.txt:115
-#: en/git-ls-remote.txt:93 en/git-merge-file.txt:81 en/git-merge.txt:310
-#: en/git-name-rev.txt:65 en/git-notes.txt:278 en/git-p4.txt:33
-#: en/git-prune.txt:60 en/git-pull.txt:210 en/git-push.txt:570
-#: en/git-remote-ext.txt:77 en/git-remote-fd.txt:37 en/git-remote.txt:207
-#: en/git-request-pull.txt:50 en/git-reset.txt:105 en/git-revert.txt:109
-#: en/git-rev-parse.txt:430 en/git-rm.txt:160 en/git-send-email.txt:475
-#: en/git-shell.txt:66 en/git-show-branch.txt:177 en/git-show-ref.txt:124
-#: en/git-show.txt:58 en/git-stash.txt:206 en/git-stripspace.txt:49
-#: en/git-update-index.txt:351 en/git-var.txt:27 en/git-worktree.txt:355
+#: en/git-fast-export.txt:146 en/git-fetch.txt:242 en/git-filter-branch.txt:234
+#: en/git-fmt-merge-msg.txt:61 en/git-for-each-ref.txt:268
+#: en/git-format-patch.txt:629 en/git-grep.txt:316 en/git-http-backend.txt:67
+#: en/git-imap-send.txt:97 en/git-init.txt:137
+#: en/git-interpret-trailers.txt:256 en/git-log.txt:115 en/git-ls-remote.txt:93
+#: en/git-merge-file.txt:81 en/git-merge.txt:310 en/git-name-rev.txt:65
+#: en/git-notes.txt:278 en/git-p4.txt:33 en/git-prune.txt:60
+#: en/git-pull.txt:210 en/git-push.txt:570 en/git-remote-ext.txt:77
+#: en/git-remote-fd.txt:37 en/git-remote.txt:207 en/git-request-pull.txt:50
+#: en/git-reset.txt:105 en/git-revert.txt:109 en/git-rev-parse.txt:430
+#: en/git-rm.txt:160 en/git-send-email.txt:475 en/git-shell.txt:66
+#: en/git-show-branch.txt:177 en/git-show-ref.txt:124 en/git-show.txt:58
+#: en/git-stash.txt:206 en/git-stripspace.txt:49 en/git-update-index.txt:351
+#: en/git-var.txt:27 en/git-worktree.txt:355
#, no-wrap
msgid "EXAMPLES"
msgstr "EXEMPLOS"
@@ -7365,8 +7348,8 @@ msgid ""
"listing the files explicitly), it does not consider `subdir/git-foo.sh`."
msgstr ""
"Como este exemplo permite que o shell expanda o asterisco (ou seja, voc챗 "
-"est찼 listando os arquivos explicitamente), ele n찾o considera `subdir/git-"
-"foo.sh`."
+"est찼 listando os arquivos explicitamente), ele n찾o considera `subdir/git-foo."
+"sh`."
#. type: Title -
#: en/git-add.txt:230 en/git-rebase.txt:588
@@ -7386,9 +7369,9 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:239 en/git-clean.txt:84
msgid ""
-"The command loop shows the list of subcommands available, and gives a prompt"
-" \"What now> \". In general, when the prompt ends with a single '>', you "
-"can pick only one of the choices given and type return, like this:"
+"The command loop shows the list of subcommands available, and gives a prompt "
+"\"What now> \". In general, when the prompt ends with a single '>', you can "
+"pick only one of the choices given and type return, like this:"
msgstr ""
"O loop de comando mostra a lista de subcomandos dispon챠veis e fornece um "
"prompt \"What now>\". Em geral, quando o prompt termina com um 첬nico '>', "
@@ -7404,8 +7387,7 @@ msgid ""
" What now> 1\n"
msgstr ""
" ***Comandos***\n"
-" 1: status 2: atualiza챌찾o 3: reverter 4: adicionar sem "
-"rastreamento\n"
+" 1: status 2: atualiza챌찾o 3: reverter 4: adicionar sem rastreamento\n"
" 5: patch 6: diff 7: sair 8: ajuda\n"
" O que agora> 1\n"
@@ -7432,10 +7414,10 @@ msgstr "estado"
#. type: Plain text
#: en/git-add.txt:259
msgid ""
-"This shows the change between HEAD and index (i.e. what will be committed if"
-" you say `git commit`), and between index and working tree files (i.e. what "
-"you could stage further before `git commit` using `git add`) for each path."
-" A sample output looks like this:"
+"This shows the change between HEAD and index (i.e. what will be committed if "
+"you say `git commit`), and between index and working tree files (i.e. what "
+"you could stage further before `git commit` using `git add`) for each path. "
+"A sample output looks like this:"
msgstr ""
"Isto mostra a mudan챌a entre HEAD e index (i.e. o que ser찼 cometido se voc챗 "
"disser `git commit`), e entre index e working tree files (i.e. o que voc챗 "
@@ -7459,8 +7441,8 @@ msgid ""
"the working tree version (if the working tree version were also different, "
"'binary' would have been shown in place of 'nothing'). The other file, git-"
"add{litdd}interactive.perl, has 403 lines added and 35 lines deleted if you "
-"commit what is in the index, but working tree file has further modifications"
-" (one addition and one deletion)."
+"commit what is in the index, but working tree file has further modifications "
+"(one addition and one deletion)."
msgstr ""
"Ele mostra que foo.png tem diferen챌as de HEAD (mas isso 챕 bin찼rio, ent찾o a "
"contagem de linhas n찾o pode ser mostrada) e n찾o h찼 diferen챌a entre a c처pia "
@@ -7482,9 +7464,9 @@ msgstr "atualizar"
msgid ""
"This shows the status information and issues an \"Update>>\" prompt. When "
"the prompt ends with double '>>', you can make more than one selection, "
-"concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5"
-" 7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range"
-" is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 "
+"concatenated with whitespace or comma. Also you can say ranges. E.g. \"2-5 "
+"7,9\" to choose 2,3,4,5,7,9 from the list. If the second number in a range "
+"is omitted, all remaining patches are taken. E.g. \"7-\" to choose 7,8,9 "
"from the list. You can say '*' to choose everything."
msgstr ""
"Isso mostra as informa챌천es de status e emite um prompt \"Atualizar\". "
@@ -7604,8 +7586,7 @@ msgstr ""
"n - n찾o encenar esse peda챌o\n"
"q - sair; n찾o encenar este peda챌o ou qualquer um dos restantes\n"
"a - encenar esse peda챌o e todos os peda챌os posteriores no arquivo\n"
-"d - n찾o encenar esse peda챌o ou qualquer um dos peda챌os posteriores no "
-"arquivo\n"
+"d - n찾o encenar esse peda챌o ou qualquer um dos peda챌os posteriores no arquivo\n"
"g - selecione um peda챌o para ir\n"
"/ - procure por um peda챌o que corresponda 횪 regex dada\n"
"j - deixe esse peda챌o indeciso, veja o pr처ximo peda챌o indeciso\n"
@@ -7618,8 +7599,8 @@ msgstr ""
#. type: Plain text
#: en/git-add.txt:341
msgid ""
-"After deciding the fate for all hunks, if there is any hunk that was chosen,"
-" the index is updated with the selected hunks."
+"After deciding the fate for all hunks, if there is any hunk that was chosen, "
+"the index is updated with the selected hunks."
msgstr ""
"Depois de decidir o destino de todos os peda챌os, se houver algum peda챌o "
"escolhido, o 챠ndice 챕 atualizado com os peda챌os selecionados."
@@ -7635,7 +7616,7 @@ msgstr ""
#. type: Labeled list
#: en/git-add.txt:345
-#, ignore-same, no-wrap
+#, no-wrap
msgid "diff"
msgstr "diff"
@@ -7703,8 +7684,8 @@ msgid ""
"prevent staging their removal by converting the \"-\" to a \" \" (space)."
msgstr ""
"O conte첬do removido 챕 representado por linhas que come챌am com \"-\". Voc챗 "
-"pode evitar a prepara챌찾o da remo챌찾o convertendo o \"-\" para um \" \" "
-"(espa챌o)."
+"pode evitar a prepara챌찾o da remo챌찾o convertendo o \"-\" para um \" "
+"\" (espa챌o)."
#. type: Labeled list
#: en/git-add.txt:374
@@ -7733,8 +7714,8 @@ msgstr ""
msgid ""
"There are also more complex operations that can be performed. But beware "
"that because the patch is applied only to the index and not the working "
-"tree, the working tree will appear to \"undo\" the change in the index. For"
-" example, introducing a new line into the index that is in neither the HEAD "
+"tree, the working tree will appear to \"undo\" the change in the index. For "
+"example, introducing a new line into the index that is in neither the HEAD "
"nor the working tree will stage the new line for commit, but the line will "
"appear to be reverted in the working tree."
msgstr ""
@@ -7766,8 +7747,8 @@ msgid ""
msgstr ""
"O conte첬do que n찾o difere entre o 챠ndice e a 찼rvore de trabalho pode ser "
"mostrado em linhas de contexto, come챌ando com um \" \" (espa챌o). Voc챗 pode "
-"organizar linhas de contexto para remo챌찾o convertendo o espa챌o para um \"-\""
-". O arquivo da 찼rvore de trabalho resultante aparecer찼 para adicionar "
+"organizar linhas de contexto para remo챌찾o convertendo o espa챌o para um \"-"
+"\". O arquivo da 찼rvore de trabalho resultante aparecer찼 para adicionar "
"novamente o conte첬do."
#. type: Labeled list
@@ -7779,8 +7760,8 @@ msgstr "modificando o conte첬do existente"
#. type: Plain text
#: en/git-add.txt:407
msgid ""
-"One can also modify context lines by staging them for removal (by converting"
-" \" \" to \"-\") and adding a \"{plus}\" line with the new content. "
+"One can also modify context lines by staging them for removal (by converting "
+"\" \" to \"-\") and adding a \"{plus}\" line with the new content. "
"Similarly, one can modify \"{plus}\" lines for existing additions or "
"modifications. In all cases, the new modification will appear reverted in "
"the working tree."
@@ -7836,13 +7817,13 @@ msgstr "modificando o conte첬do do contexto ou linhas de remo챌찾o"
#: en/git-add.txt:423 en/git-am.txt:235 en/git-annotate.txt:28
#: en/git-apply.txt:280 en/git-archive.txt:192 en/git-bisect.txt:493
#: en/git-blame.txt:230 en/git-branch.txt:342 en/git-check-attr.txt:115
-#: en/git-check-ignore.txt:113 en/git-cherry-pick.txt:228
-#: en/git-cherry.txt:140 en/git-clean.txt:136 en/git-commit-tree.txt:113
-#: en/git-commit.txt:487 en/git-difftool.txt:135 en/git-diff.txt:193
-#: en/git-fast-export.txt:234 en/git-fast-import.txt:1487
-#: en/git-fetch-pack.txt:127 en/git-fetch.txt:294 en/git-fmt-merge-msg.txt:73
-#: en/git-for-each-ref.txt:384 en/git-format-patch.txt:674 en/git-gc.txt:204
-#: en/git-gui.txt:103 en/git-imap-send.txt:135 en/git-instaweb.txt:89
+#: en/git-check-ignore.txt:113 en/git-cherry-pick.txt:228 en/git-cherry.txt:140
+#: en/git-clean.txt:136 en/git-commit-tree.txt:113 en/git-commit.txt:487
+#: en/git-difftool.txt:135 en/git-diff.txt:193 en/git-fast-export.txt:234
+#: en/git-fast-import.txt:1487 en/git-fetch-pack.txt:127 en/git-fetch.txt:294
+#: en/git-fmt-merge-msg.txt:73 en/git-for-each-ref.txt:384
+#: en/git-format-patch.txt:674 en/git-gc.txt:204 en/git-gui.txt:103
+#: en/git-imap-send.txt:135 en/git-instaweb.txt:89
#: en/git-interpret-trailers.txt:385 en/git-ls-files.txt:243
#: en/git-ls-remote.txt:112 en/git-merge.txt:353 en/git-pack-objects.txt:399
#: en/git-pack-redundant.txt:43 en/git-prune-packed.txt:41 en/git-prune.txt:81
@@ -7860,7 +7841,6 @@ msgstr "VEJA TAMB횋M"
#. type: Plain text
#: en/git-add.txt:430
-#, ignore-same
msgid ""
"linkgit:git-status[1] linkgit:git-rm[1] linkgit:git-reset[1] linkgit:git-"
"mv[1] linkgit:git-commit[1] linkgit:git-update-index[1]"
@@ -7890,41 +7870,38 @@ msgstr ""
#: en/git-format-patch.txt:678 en/git-fsck-objects.txt:21 en/git-fsck.txt:161
#: en/git-gc.txt:211 en/git-get-tar-commit-id.txt:29 en/git-grep.txt:334
#: en/git-gui.txt:126 en/git-hash-object.txt:64 en/git-help.txt:203
-#: en/git-http-backend.txt:276 en/git-http-fetch.txt:48
-#: en/git-http-push.txt:96 en/git-imap-send.txt:139 en/git-index-pack.txt:107
-#: en/git-init-db.txt:22 en/git-init.txt:153 en/git-instaweb.txt:93
-#: en/git-interpret-trailers.txt:389 en/git-log.txt:234
-#: en/git-ls-files.txt:247 en/git-ls-remote.txt:116 en/git-ls-tree.txt:103
-#: en/git-mailinfo.txt:101 en/git-mailsplit.txt:56 en/git-merge-base.txt:230
-#: en/git-merge-file.txt:94 en/git-merge-index.txt:78
+#: en/git-http-backend.txt:276 en/git-http-fetch.txt:48 en/git-http-push.txt:96
+#: en/git-imap-send.txt:139 en/git-index-pack.txt:107 en/git-init-db.txt:22
+#: en/git-init.txt:153 en/git-instaweb.txt:93 en/git-interpret-trailers.txt:389
+#: en/git-log.txt:234 en/git-ls-files.txt:247 en/git-ls-remote.txt:116
+#: en/git-ls-tree.txt:103 en/git-mailinfo.txt:101 en/git-mailsplit.txt:56
+#: en/git-merge-base.txt:230 en/git-merge-file.txt:94 en/git-merge-index.txt:78
#: en/git-merge-one-file.txt:20 en/git-mergetool--lib.txt:46
#: en/git-mergetool.txt:111 en/git-merge-tree.txt:28 en/git-merge.txt:362
#: en/git-mktag.txt:38 en/git-mktree.txt:39 en/git-mv.txt:68
#: en/git-name-rev.txt:88 en/git-notes.txt:404 en/git-pack-objects.txt:405
#: en/git-pack-redundant.txt:49 en/git-pack-refs.txt:72
-#: en/git-parse-remote.txt:22 en/git-patch-id.txt:60
-#: en/git-prune-packed.txt:46 en/git-prune.txt:88 en/git-pull.txt:261
-#: en/git-push.txt:672 en/git-quiltimport.txt:63 en/git-read-tree.txt:437
-#: en/git-rebase.txt:1048 en/git-receive-pack.txt:251 en/git-reflog.txt:137
-#: en/git-remote-ext.txt:124 en/git-remote-fd.txt:58
-#: en/git-remote-testgit.txt:29 en/git-remote.txt:255 en/git-repack.txt:187
-#: en/git-replace.txt:160 en/git-request-pull.txt:78 en/git-rerere.txt:221
-#: en/git-reset.txt:473 en/git-revert.txt:128 en/git-rev-list.txt:122
-#: en/git-rev-parse.txt:455 en/git-rm.txt:188 en/git-send-email.txt:511
-#: en/git-send-pack.txt:155 en/git-shell.txt:105
-#: en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42
-#: en/git-shortlog.txt:89 en/git-show-branch.txt:203 en/git-show-index.txt:40
-#: en/git-show-ref.txt:185 en/git-show.txt:86 en/git-sh-setup.txt:94
-#: en/git-stage.txt:22 en/git-stash.txt:299 en/git-status.txt:434
-#: en/git-stripspace.txt:93 en/git-submodule.txt:428 en/git-svn.txt:1173
-#: en/git-symbolic-ref.txt:68 en/git-tag.txt:379 en/git.txt:877
-#: en/git-unpack-file.txt:27 en/git-unpack-objects.txt:51
-#: en/git-update-index.txt:553 en/git-update-ref.txt:151
-#: en/git-update-server-info.txt:43 en/git-upload-archive.txt:61
-#: en/git-upload-pack.txt:52 en/git-var.txt:69 en/git-verify-commit.txt:31
-#: en/git-verify-pack.txt:52 en/git-verify-tag.txt:31
-#: en/git-web--browse.txt:123 en/git-whatchanged.txt:42
-#: en/git-worktree.txt:381 en/git-write-tree.txt:41
+#: en/git-parse-remote.txt:22 en/git-patch-id.txt:60 en/git-prune-packed.txt:46
+#: en/git-prune.txt:88 en/git-pull.txt:261 en/git-push.txt:672
+#: en/git-quiltimport.txt:63 en/git-read-tree.txt:437 en/git-rebase.txt:1048
+#: en/git-receive-pack.txt:251 en/git-reflog.txt:137 en/git-remote-ext.txt:124
+#: en/git-remote-fd.txt:58 en/git-remote-testgit.txt:29 en/git-remote.txt:255
+#: en/git-repack.txt:187 en/git-replace.txt:160 en/git-request-pull.txt:78
+#: en/git-rerere.txt:221 en/git-reset.txt:473 en/git-revert.txt:128
+#: en/git-rev-list.txt:122 en/git-rev-parse.txt:455 en/git-rm.txt:188
+#: en/git-send-email.txt:511 en/git-send-pack.txt:155 en/git-shell.txt:105
+#: en/git-sh-i18n--envsubst.txt:35 en/git-sh-i18n.txt:42 en/git-shortlog.txt:89
+#: en/git-show-branch.txt:203 en/git-show-index.txt:40 en/git-show-ref.txt:185
+#: en/git-show.txt:86 en/git-sh-setup.txt:94 en/git-stage.txt:22
+#: en/git-stash.txt:299 en/git-status.txt:434 en/git-stripspace.txt:93
+#: en/git-submodule.txt:428 en/git-svn.txt:1173 en/git-symbolic-ref.txt:68
+#: en/git-tag.txt:379 en/git.txt:877 en/git-unpack-file.txt:27
+#: en/git-unpack-objects.txt:51 en/git-update-index.txt:553
+#: en/git-update-ref.txt:151 en/git-update-server-info.txt:43
+#: en/git-upload-archive.txt:61 en/git-upload-pack.txt:52 en/git-var.txt:69
+#: en/git-verify-commit.txt:31 en/git-verify-pack.txt:52
+#: en/git-verify-tag.txt:31 en/git-web--browse.txt:123
+#: en/git-whatchanged.txt:42 en/git-worktree.txt:381 en/git-write-tree.txt:41
#, no-wrap
msgid "GIT"
msgstr "GIT"
@@ -7951,47 +7928,44 @@ msgstr "GIT"
#: en/git-format-patch.txt:679 en/git-fsck-objects.txt:22 en/git-fsck.txt:162
#: en/git-gc.txt:212 en/git-get-tar-commit-id.txt:30 en/git-grep.txt:335
#: en/git-gui.txt:127 en/git-hash-object.txt:65 en/git-help.txt:204
-#: en/git-http-backend.txt:277 en/git-http-fetch.txt:49
-#: en/git-http-push.txt:97 en/git-imap-send.txt:140 en/git-index-pack.txt:108
-#: en/git-init-db.txt:23 en/git-init.txt:154 en/git-instaweb.txt:94
-#: en/git-interpret-trailers.txt:390 en/git-log.txt:235
-#: en/git-ls-files.txt:248 en/git-ls-remote.txt:117 en/git-ls-tree.txt:104
-#: en/git-mailinfo.txt:102 en/git-mailsplit.txt:57 en/git-merge-base.txt:231
-#: en/git-merge-file.txt:95 en/git-merge-index.txt:79
+#: en/git-http-backend.txt:277 en/git-http-fetch.txt:49 en/git-http-push.txt:97
+#: en/git-imap-send.txt:140 en/git-index-pack.txt:108 en/git-init-db.txt:23
+#: en/git-init.txt:154 en/git-instaweb.txt:94 en/git-interpret-trailers.txt:390
+#: en/git-log.txt:235 en/git-ls-files.txt:248 en/git-ls-remote.txt:117
+#: en/git-ls-tree.txt:104 en/git-mailinfo.txt:102 en/git-mailsplit.txt:57
+#: en/git-merge-base.txt:231 en/git-merge-file.txt:95 en/git-merge-index.txt:79
#: en/git-merge-one-file.txt:21 en/git-mergetool--lib.txt:47
#: en/git-mergetool.txt:112 en/git-merge-tree.txt:29 en/git-merge.txt:363
#: en/git-mktag.txt:39 en/git-mktree.txt:40 en/git-mv.txt:69
#: en/git-name-rev.txt:89 en/git-notes.txt:405 en/git-pack-objects.txt:406
#: en/git-pack-redundant.txt:50 en/git-pack-refs.txt:73
-#: en/git-parse-remote.txt:23 en/git-patch-id.txt:61
-#: en/git-prune-packed.txt:47 en/git-prune.txt:89 en/git-pull.txt:262
-#: en/git-push.txt:673 en/git-quiltimport.txt:64 en/git-read-tree.txt:438
-#: en/git-rebase.txt:1049 en/git-receive-pack.txt:252 en/git-reflog.txt:138
-#: en/git-remote-ext.txt:125 en/git-remote-fd.txt:59
-#: en/git-remote-testgit.txt:30 en/git-remote.txt:256 en/git-repack.txt:188
-#: en/git-replace.txt:161 en/git-request-pull.txt:79 en/git-rerere.txt:222
-#: en/git-reset.txt:474 en/git-revert.txt:129 en/git-rev-list.txt:123
-#: en/git-rev-parse.txt:456 en/git-rm.txt:189 en/git-send-email.txt:512
-#: en/git-send-pack.txt:156 en/git-shell.txt:106
-#: en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43
-#: en/git-shortlog.txt:90 en/git-show-branch.txt:204 en/git-show-index.txt:41
-#: en/git-show-ref.txt:186 en/git-show.txt:87 en/git-sh-setup.txt:95
-#: en/git-stage.txt:23 en/git-stash.txt:300 en/git-status.txt:435
-#: en/git-stripspace.txt:94 en/git-submodule.txt:429 en/git-svn.txt:1174
-#: en/git-symbolic-ref.txt:69 en/git-tag.txt:380 en/git.txt:878
-#: en/git-unpack-file.txt:28 en/git-unpack-objects.txt:52
-#: en/git-update-index.txt:554 en/git-update-ref.txt:152
-#: en/git-update-server-info.txt:44 en/git-upload-archive.txt:62
-#: en/git-upload-pack.txt:53 en/git-var.txt:70 en/git-verify-commit.txt:32
-#: en/git-verify-pack.txt:53 en/git-verify-tag.txt:32
-#: en/git-web--browse.txt:124 en/git-whatchanged.txt:43
-#: en/git-worktree.txt:382 en/git-write-tree.txt:42
+#: en/git-parse-remote.txt:23 en/git-patch-id.txt:61 en/git-prune-packed.txt:47
+#: en/git-prune.txt:89 en/git-pull.txt:262 en/git-push.txt:673
+#: en/git-quiltimport.txt:64 en/git-read-tree.txt:438 en/git-rebase.txt:1049
+#: en/git-receive-pack.txt:252 en/git-reflog.txt:138 en/git-remote-ext.txt:125
+#: en/git-remote-fd.txt:59 en/git-remote-testgit.txt:30 en/git-remote.txt:256
+#: en/git-repack.txt:188 en/git-replace.txt:161 en/git-request-pull.txt:79
+#: en/git-rerere.txt:222 en/git-reset.txt:474 en/git-revert.txt:129
+#: en/git-rev-list.txt:123 en/git-rev-parse.txt:456 en/git-rm.txt:189
+#: en/git-send-email.txt:512 en/git-send-pack.txt:156 en/git-shell.txt:106
+#: en/git-sh-i18n--envsubst.txt:36 en/git-sh-i18n.txt:43 en/git-shortlog.txt:90
+#: en/git-show-branch.txt:204 en/git-show-index.txt:41 en/git-show-ref.txt:186
+#: en/git-show.txt:87 en/git-sh-setup.txt:95 en/git-stage.txt:23
+#: en/git-stash.txt:300 en/git-status.txt:435 en/git-stripspace.txt:94
+#: en/git-submodule.txt:429 en/git-svn.txt:1174 en/git-symbolic-ref.txt:69
+#: en/git-tag.txt:380 en/git.txt:878 en/git-unpack-file.txt:28
+#: en/git-unpack-objects.txt:52 en/git-update-index.txt:554
+#: en/git-update-ref.txt:152 en/git-update-server-info.txt:44
+#: en/git-upload-archive.txt:62 en/git-upload-pack.txt:53 en/git-var.txt:70
+#: en/git-verify-commit.txt:32 en/git-verify-pack.txt:53
+#: en/git-verify-tag.txt:32 en/git-web--browse.txt:124
+#: en/git-whatchanged.txt:43 en/git-worktree.txt:382 en/git-write-tree.txt:42
msgid "Part of the linkgit:git[1] suite"
-msgstr "Parte do linkgit: git[1] suite"
+msgstr "Parte do linkgit:git[1] suite"
#. type: Title =
#: en/git-am.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-am(1)"
msgstr "git-am(1)"
@@ -8015,14 +7989,12 @@ msgid ""
msgstr ""
"'git am' [--signoff] [--manter] [--[n찾o-]manter-cr] [--[n찾o-]utf8]\n"
"\t[--[n찾o-]3caminho] [--interativo] [--committer-data-챕-autor-data]\n"
-"\t[--ignorar-data] [--ignorar-mudan챌a-de-espa챌o | --ignorar-espa챌o-em-branco]"
-"\n"
+"\t[--ignorar-data] [--ignorar-mudan챌a-de-espa챌o | --ignorar-espa챌o-em-branco]\n"
"\t[--espa챌o-em-branco=<op챌찾o>] [-C<n>] [-p<n>] [--diret처rio=<dir>]\n"
"\t[--excluir=<path>] [--incluir=<path>] [--rejeitar] [-q | --quieto]\n"
"\t[--[n찾o-]tesouras] [-S[<keyid>]] [--patch-formato=<formato>]\n"
"\t[(<mbox> | <Maildir>)...]\n"
-"'git am' (--continuar | --skip | --abortar | --quieto | --mostrar-atual-"
-"patch)\n"
+"'git am' (--continuar | --skip | --abortar | --quieto | --mostrar-atual-patch)\n"
#. type: Plain text
#: en/git-am.txt:26
@@ -8054,7 +8026,7 @@ msgstr ""
#: en/git-am.txt:35 en/git-cherry-pick.txt:101 en/git-commit.txt:166
#: en/git-format-patch.txt:117 en/git-rebase.txt:382 en/git-revert.txt:90
#: en/merge-options.txt:61
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--signoff"
msgstr "--signoff"
@@ -8073,11 +8045,11 @@ msgstr ""
#: en/git-am.txt:43
msgid "Pass `-k` flag to 'git mailinfo' (see linkgit:git-mailinfo[1])."
msgstr ""
-"Passe o sinalizador `-k` para 'git mailinfo' (veja linkgit: git-mailinfo[1])."
+"Passe o sinalizador `-k` para 'git mailinfo' (veja linkgit:git-mailinfo[1])."
#. type: Labeled list
#: en/git-am.txt:44 en/git-quiltimport.txt:59
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--keep-non-patch"
msgstr "--keep-non-patch"
@@ -8089,7 +8061,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:47
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]keep-cr"
msgstr "--[no-]keep-cr"
@@ -8097,8 +8069,8 @@ msgstr "--[no-]keep-cr"
#: en/git-am.txt:52
msgid ""
"With `--keep-cr`, call 'git mailsplit' (see linkgit:git-mailsplit[1]) with "
-"the same option, to prevent it from stripping CR at the end of lines. "
-"`am.keepcr` configuration variable can be used to specify the default "
+"the same option, to prevent it from stripping CR at the end of lines. `am."
+"keepcr` configuration variable can be used to specify the default "
"behaviour. `--no-keep-cr` is useful to override `am.keepcr`."
msgstr ""
"Com `--keep-cr`, chame 'git mailsplit' (veja linkgit:git-mailsplit[1]) com "
@@ -8112,13 +8084,13 @@ msgstr ""
#: en/git-diff-tree.txt:88 en/git-grep.txt:216 en/git-help.txt:54
#: en/git-ls-files.txt:35 en/git-shortlog.txt:50 en/git-stripspace.txt:42
#: en/rev-list-options.txt:950
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-c"
msgstr "-c"
#. type: Labeled list
#: en/git-am.txt:54 en/git-mailinfo.txt:74
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--scissors"
msgstr "--scissors"
@@ -8135,7 +8107,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:59 en/git-mailinfo.txt:90
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-scissors"
msgstr "--no-scissors"
@@ -8151,13 +8123,13 @@ msgstr "Ignore linhas de tesoura (veja linkgit:git-mailinfo[1])."
#: en/git-instaweb.txt:36 en/git-ls-files.txt:43 en/git-mailinfo.txt:69
#: en/git-read-tree.txt:34 en/git-rebase.txt:267 en/git-svn.txt:308
#: en/git-svn.txt:675 en/git-symbolic-ref.txt:49 en/rev-list-options.txt:963
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-m"
msgstr "-m"
#. type: Labeled list
#: en/git-am.txt:63 en/git-mailinfo.txt:70
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--message-id"
msgstr "--message-id"
@@ -8175,7 +8147,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:69
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-message-id"
msgstr "--no-message-id"
@@ -8195,7 +8167,7 @@ msgstr "Fique quieto. Imprime apenas mensagens de erro."
#. type: Labeled list
#: en/git-am.txt:78
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--utf8"
msgstr "--utf8"
@@ -8207,11 +8179,11 @@ msgid ""
"encoding (configuration variable `i18n.commitencoding` can be used to "
"specify project's preferred encoding if it is not UTF-8)."
msgstr ""
-"Passe o sinalizador `-u` para 'git mailinfo' (veja linkgit:git-mailinfo[1])"
-". A mensagem de log de confirma챌찾o proposta retirada do e-mail 챕 "
-"recodificada em codifica챌찾o UTF-8 (a vari찼vel de configura챌찾o "
-"`i18n.commitencoding` pode ser usada para especificar a codifica챌찾o "
-"preferida do projeto, se n찾o for UTF-8)."
+"Passe o sinalizador `-u` para 'git mailinfo' (veja linkgit:git-"
+"mailinfo[1]). A mensagem de log de confirma챌찾o proposta retirada do e-mail "
+"챕 recodificada em codifica챌찾o UTF-8 (a vari찼vel de configura챌찾o `i18n."
+"commitencoding` pode ser usada para especificar a codifica챌찾o preferida do "
+"projeto, se n찾o for UTF-8)."
#. type: Plain text
#: en/git-am.txt:87
@@ -8225,7 +8197,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:88
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-utf8"
msgstr "--no-utf8"
@@ -8237,30 +8209,30 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:92 en/git-apply.txt:85
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-3"
msgstr "-3"
#. type: Labeled list
#: en/git-am.txt:93 en/git-apply.txt:86
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--3way"
msgstr "--3way"
#. type: Labeled list
#: en/git-am.txt:94
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-3way"
msgstr "--no-3way"
#. type: Plain text
#: en/git-am.txt:101
msgid ""
-"When the patch does not apply cleanly, fall back on 3-way merge if the patch"
-" records the identity of blobs it is supposed to apply to and we have those "
+"When the patch does not apply cleanly, fall back on 3-way merge if the patch "
+"records the identity of blobs it is supposed to apply to and we have those "
"blobs available locally. `--no-3way` can be used to override am.threeWay "
-"configuration variable. For more information, see am.threeWay in "
-"linkgit:git-config[1]."
+"configuration variable. For more information, see am.threeWay in linkgit:git-"
+"config[1]."
msgstr ""
"Quando o patch n찾o se aplica corretamente, use a mesclagem de 3 vias se o "
"patch registra a identidade dos blobs aos quais ele deve se aplicar e temos "
@@ -8271,7 +8243,7 @@ msgstr ""
#. type: Plain text
#: en/git-am.txt:103 en/git-apply.txt:183 en/git-rebase.txt:368
#: en/git-rebase.txt:518
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-whitespace"
msgstr "--ignore-whitespace"
@@ -8313,7 +8285,7 @@ msgstr "--incluir=<path>"
#. type: Labeled list
#: en/git-am.txt:110 en/git-apply.txt:108
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--reject"
msgstr "--reject"
@@ -8323,12 +8295,12 @@ msgid ""
"These flags are passed to the 'git apply' (see linkgit:git-apply[1]) "
"program that applies the patch."
msgstr ""
-"Esses sinalizadores s찾o passados para o programa 'git apply' (ver linkgit"
-":git-apply 1]) que aplica o patch."
+"Esses sinalizadores s찾o passados para o programa 'git apply' (ver linkgit:"
+"git-apply 1]) que aplica o patch."
#. type: Labeled list
#: en/git-am.txt:115
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--patch-format"
msgstr "--patch-format"
@@ -8352,7 +8324,7 @@ msgstr "Corra interativamente."
#. type: Plain text
#: en/git-am.txt:126 en/git-rebase.txt:375 en/git-rebase.txt:515
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--committer-date-is-author-date"
msgstr "--committer-date-is-author-date"
@@ -8361,8 +8333,8 @@ msgstr "--committer-date-is-author-date"
msgid ""
"By default the command records the date from the e-mail message as the "
"commit author date, and uses the time of commit creation as the committer "
-"date. This allows the user to lie about the committer date by using the same"
-" value as the author date."
+"date. This allows the user to lie about the committer date by using the same "
+"value as the author date."
msgstr ""
"Por padr찾o, o comando registra a data da mensagem de e-mail como a data do "
"autor de confirma챌찾o e usa a hora da cria챌찾o de confirma챌찾o como a data do "
@@ -8371,7 +8343,7 @@ msgstr ""
#. type: Plain text
#: en/git-am.txt:133 en/git-rebase.txt:376 en/git-rebase.txt:516
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-date"
msgstr "--ignore-date"
@@ -8390,7 +8362,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:140 en/git-rebase.txt:256
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--skip"
msgstr "--skip"
@@ -8434,7 +8406,7 @@ msgstr ""
#. type: Labeled list
#: en/git-am.txt:150 en/git-merge.txt:102 en/git-rebase.txt:228
#: en/sequencer.txt:1
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--continue"
msgstr "--continue"
@@ -8444,21 +8416,21 @@ msgstr "--continue"
#: en/git-pull.txt:103 en/git-rebase.txt:401 en/git-rm.txt:49
#: en/git-show-branch.txt:43 en/git-unpack-objects.txt:38
#: en/rev-list-options.txt:971
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-r"
msgstr "-r"
#. type: Labeled list
#: en/git-am.txt:152
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--resolved"
msgstr "--resolved"
#. type: Plain text
#: en/git-am.txt:159
msgid ""
-"After a patch failure (e.g. attempting to apply conflicting patch), the user"
-" has applied it by hand and the index file stores the result of the "
+"After a patch failure (e.g. attempting to apply conflicting patch), the user "
+"has applied it by hand and the index file stores the result of the "
"application. Make a commit using the authorship and commit log extracted "
"from the e-mail message and the current index file, and continue."
msgstr ""
@@ -8477,19 +8449,19 @@ msgstr "--resolvermsg=<msg>"
#: en/git-am.txt:166
msgid ""
"When a patch failure occurs, <msg> will be printed to the screen before "
-"exiting. This overrides the standard message informing you to use "
-"`--continue` or `--skip` to handle the failure. This is solely for internal"
-" use between 'git rebase' and 'git am'."
+"exiting. This overrides the standard message informing you to use `--"
+"continue` or `--skip` to handle the failure. This is solely for internal "
+"use between 'git rebase' and 'git am'."
msgstr ""
"Quando ocorre uma falha de patch, <msg> ser찼 impresso na tela antes de "
-"sair. Isto substitui a mensagem padr찾o informando que voc챗 deve usar "
-"`--continue` ou` --skip` para manipular a falha. Isto 챕 apenas para uso "
-"interno entre 'git rebase' e 'git am'."
+"sair. Isto substitui a mensagem padr찾o informando que voc챗 deve usar `--"
+"continue` ou` --skip` para manipular a falha. Isto 챕 apenas para uso interno "
+"entre 'git rebase' e 'git am'."
#. type: Labeled list
#: en/git-am.txt:167 en/git-merge.txt:90 en/git-notes.txt:201
#: en/git-rebase.txt:231 en/sequencer.txt:11
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--abort"
msgstr "--abort"
@@ -8500,26 +8472,26 @@ msgstr "Restaure a ramifica챌찾o original e aborte a opera챌찾o de corre챌찾o."
#. type: Labeled list
#: en/git-am.txt:170 en/git-rebase.txt:238 en/sequencer.txt:6
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--quit"
msgstr "--quit"
#. type: Plain text
#: en/git-am.txt:173
msgid "Abort the patching operation but keep HEAD and the index untouched."
-msgstr "Anule a opera챌찾o de corre챌찾o, mas mantenha HEAD e o 챠ndice inalterados."
+msgstr ""
+"Anule a opera챌찾o de corre챌찾o, mas mantenha HEAD e o 챠ndice inalterados."
#. type: Labeled list
#: en/git-am.txt:174 en/git-rebase.txt:262
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-current-patch"
msgstr "--show-current-patch"
#. type: Plain text
#: en/git-am.txt:177
msgid ""
-"Show the patch being applied when \"git am\" is stopped because of "
-"conflicts."
+"Show the patch being applied when \"git am\" is stopped because of conflicts."
msgstr ""
"Mostrar o patch sendo aplicado quando \"git am\" 챕 interrompido devido a "
"conflitos."
@@ -8537,11 +8509,11 @@ msgstr "DISCUSS횄O"
#. type: Plain text
#: en/git-am.txt:187
msgid ""
-"The commit author name is taken from the \"From: \" line of the message, and"
-" commit author date is taken from the \"Date: \" line of the message. The "
+"The commit author name is taken from the \"From: \" line of the message, and "
+"commit author date is taken from the \"Date: \" line of the message. The "
"\"Subject: \" line is used as the title of the commit, after stripping "
-"common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to"
-" concisely describe what the commit is about in one line of text."
+"common prefix \"[PATCH <anything>]\". The \"Subject: \" line is supposed to "
+"concisely describe what the commit is about in one line of text."
msgstr ""
"O nome do autor de confirma챌찾o 챕 retirado da linha \"De:\" da mensagem e a "
"data do autor de envio 챕 obtida a partir da linha \"Data:\" da mensagem. A "
@@ -8552,8 +8524,8 @@ msgstr ""
#. type: Plain text
#: en/git-am.txt:190
msgid ""
-"\"From: \" and \"Subject: \" lines starting the body override the respective"
-" commit author name and title values taken from the headers."
+"\"From: \" and \"Subject: \" lines starting the body override the respective "
+"commit author name and title values taken from the headers."
msgstr ""
"As linhas \"De:\" e \"Assunto:\" iniciando o corpo substituem os respectivos "
"valores de nome e t챠tulo do autor de confirma챌찾o retirados dos cabe챌alhos."
@@ -8562,8 +8534,8 @@ msgstr ""
#: en/git-am.txt:195
msgid ""
"The commit message is formed by the title taken from the \"Subject: \", a "
-"blank line and the body of the message up to where the patch begins. Excess"
-" whitespace at the end of each line is automatically stripped."
+"blank line and the body of the message up to where the patch begins. Excess "
+"whitespace at the end of each line is automatically stripped."
msgstr ""
"A mensagem de confirma챌찾o 챕 formada pelo t챠tulo obtido a partir do \"Assunto:"
"\", uma linha em branco e o corpo da mensagem at챕 onde o patch come챌a. O "
@@ -8624,8 +8596,8 @@ msgstr "pule o patch atual reexecutando o comando com a op챌찾o `--skip`."
#: en/git-am.txt:216
msgid ""
"hand resolve the conflict in the working directory, and update the index "
-"file to bring it into a state that the patch should have produced. Then run"
-" the command with the `--continue` option."
+"file to bring it into a state that the patch should have produced. Then run "
+"the command with the `--continue` option."
msgstr ""
"m찾o resolver o conflito no diret처rio de trabalho e atualizar o arquivo de "
"챠ndice para coloc찼-lo em um estado que o patch deve ter produzido. \n"
@@ -8647,8 +8619,8 @@ msgstr ""
msgid ""
"Before any patches are applied, ORIG_HEAD is set to the tip of the current "
"branch. This is useful if you have problems with multiple commits, like "
-"running 'git am' on the wrong branch or an error in the commits that is more"
-" easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
+"running 'git am' on the wrong branch or an error in the commits that is more "
+"easily fixed by changing the mailbox (e.g. errors in the \"From:\" lines)."
msgstr ""
"Antes que qualquer corre챌찾o seja aplicada, ORIG_HEAD 챕 definido como a ponta "
"da ramifica챌찾o atual. Isso 챕 첬til se voc챗 tiver problemas com v찼rias "
@@ -8678,7 +8650,7 @@ msgstr "linkgit:git-aplicar1]."
#. type: Title =
#: en/git-annotate.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-annotate(1)"
msgstr "git-annotate(1)"
@@ -8696,8 +8668,8 @@ msgstr "'anotar git' [<op챌천es>] <arquivo> [<revis찾o>]\n"
#. type: Plain text
#: en/git-annotate.txt:17
msgid ""
-"Annotates each line in the given file with information from the commit which"
-" introduced the line. Optionally annotates from a given revision."
+"Annotates each line in the given file with information from the commit which "
+"introduced the line. Optionally annotates from a given revision."
msgstr ""
"Anota cada linha no arquivo fornecido com informa챌천es da confirma챌찾o que "
"introduziu a linha. Anota챌찾o opcional de uma determinada revis찾o."
@@ -8706,8 +8678,8 @@ msgstr ""
#: en/git-annotate.txt:22
msgid ""
"The only difference between this command and linkgit:git-blame[1] is that "
-"they use slightly different output formats, and this command exists only for"
-" backward compatibility to support existing scripts, and provide a more "
+"they use slightly different output formats, and this command exists only for "
+"backward compatibility to support existing scripts, and provide a more "
"familiar command name for people coming from other SCM systems."
msgstr ""
"A 첬nica diferen챌a entre esse comando e o linkgit:git-blame[1] 챕 que eles "
@@ -8718,7 +8690,7 @@ msgstr ""
#. type: Title =
#: en/git-apply.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-apply(1)"
msgstr "git-apply(1)"
@@ -8740,10 +8712,8 @@ msgid ""
"\t [--exclude=<path>] [--include=<path>] [--directory=<root>]\n"
"\t [--verbose] [--unsafe-paths] [<patch>...]\n"
msgstr ""
-"'git aplique' [--stat] [--numstat] [--resumo] [--verifica] [--챠ndice | "
-"--inten챌찾o-de-adicionar] [--3caminho]\n"
-"\t [--aplique] [--n찾o-adicionar] [--construir-antepassado-falso=<arquivo>] "
-"[-R | --reverso]\n"
+"'git aplique' [--stat] [--numstat] [--resumo] [--verifica] [--챠ndice | --inten챌찾o-de-adicionar] [--3caminho]\n"
+"\t [--aplique] [--n찾o-adicionar] [--construir-antepassado-falso=<arquivo>] [-R | --reverso]\n"
"\t [--permitir-substitui챌찾o-bin찼ria | --bin찼rio] [--rejeitar] [-z]\n"
"\t [-p<n>] [-C<n>] [--impreciso-eof] [--recontagem] [--em-cache]\n"
"\t [--ignorar-mudan챌a-de-estado | --ignorar-espa챌o-em-branco]\n"
@@ -8771,9 +8741,9 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:34
msgid ""
-"This command applies the patch but does not create a commit. Use "
-"linkgit:git-am[1] to create commits from patches generated by linkgit:git-"
-"format-patch[1] and/or received by email."
+"This command applies the patch but does not create a commit. Use linkgit:"
+"git-am[1] to create commits from patches generated by linkgit:git-format-"
+"patch[1] and/or received by email."
msgstr ""
"Este comando aplica o patch, mas n찾o cria um commit. Use linkgit:git-am[1] "
"para criar commits de patches gerados pelo linkgit:git-format-patch[1] e/ou "
@@ -8788,15 +8758,15 @@ msgstr "<patch>..."
#. type: Plain text
#: en/git-apply.txt:40
msgid ""
-"The files to read the patch from. '-' can be used to read from the standard"
-" input."
+"The files to read the patch from. '-' can be used to read from the standard "
+"input."
msgstr ""
"Os arquivos para ler o patch de. '-' pode ser usado para ler a entrada "
"padr찾o."
#. type: Labeled list
#: en/git-apply.txt:41 en/git-rebase.txt:317 en/merge-options.txt:72
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--stat"
msgstr "--stat"
@@ -8806,8 +8776,8 @@ msgid ""
"Instead of applying the patch, output diffstat for the input. Turns off "
"\"apply\"."
msgstr ""
-"Em vez de aplicar o patch, imprima o diffstat para a entrada. Desativa \""
-"aplicar\"."
+"Em vez de aplicar o patch, imprima o diffstat para a entrada. Desativa "
+"\"aplicar\"."
#. type: Plain text
#: en/git-apply.txt:51
@@ -8826,8 +8796,8 @@ msgstr ""
#: en/git-apply.txt:57
msgid ""
"Instead of applying the patch, output a condensed summary of information "
-"obtained from git diff extended headers, such as creations, renames and mode"
-" changes. Turns off \"apply\"."
+"obtained from git diff extended headers, such as creations, renames and mode "
+"changes. Turns off \"apply\"."
msgstr ""
"Em vez de aplicar o patch, imprima um resumo condensado das informa챌천es "
"obtidas a partir dos cabe챌alhos estendidos do git diff, como cria챌천es, "
@@ -8836,17 +8806,16 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:62
msgid ""
-"Instead of applying the patch, see if the patch is applicable to the current"
-" working tree and/or the index file and detects errors. Turns off "
-"\"apply\"."
+"Instead of applying the patch, see if the patch is applicable to the current "
+"working tree and/or the index file and detects errors. Turns off \"apply\"."
msgstr ""
"Em vez de aplicar o patch, verifique se o patch 챕 aplic찼vel 횪 찼rvore de "
-"trabalho atual e/ou ao arquivo de 챠ndice e detecta erros. Desativa \""
-"aplicar\"."
+"trabalho atual e/ou ao arquivo de 챠ndice e detecta erros. Desativa \"aplicar"
+"\"."
#. type: Labeled list
#: en/git-apply.txt:63 en/git-checkout-index.txt:26
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--index"
msgstr "--index"
@@ -8855,8 +8824,8 @@ msgstr "--index"
msgid ""
"When `--check` is in effect, or when applying the patch (which is the "
"default when none of the options that disables it is in effect), make sure "
-"the patch is applicable to what the current index file records. If the file"
-" to be patched in the working tree is not up to date, it is flagged as an "
+"the patch is applicable to what the current index file records. If the file "
+"to be patched in the working tree is not up to date, it is flagged as an "
"error. This flag also causes the index file to be updated."
msgstr ""
"Quando `--check` estiver em vigor ou ao aplicar o patch (que 챕 o padr찾o "
@@ -8870,7 +8839,7 @@ msgstr ""
#: en/git-apply.txt:72 en/git-check-attr.txt:27 en/git-diff-index.txt:29
#: en/git-grep.txt:75 en/git-ls-files.txt:36 en/git-rm.txt:58
#: en/git-submodule.txt:279
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--cached"
msgstr "--cached"
@@ -8888,8 +8857,8 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:84
msgid ""
-"When applying the patch only to the working tree, mark new files to be added"
-" to the index later (see `--intent-to-add` option in linkgit:git-add[1]). "
+"When applying the patch only to the working tree, mark new files to be added "
+"to the index later (see `--intent-to-add` option in linkgit:git-add[1]). "
"This option is ignored unless running in a Git repository and `--index` is "
"not specified. Note that `--index` could be implied by other options such "
"as `--cached` or `--3way`."
@@ -8903,12 +8872,12 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:93
msgid ""
-"When the patch does not apply cleanly, fall back on 3-way merge if the patch"
-" records the identity of blobs it is supposed to apply to, and we have those"
-" blobs available locally, possibly leaving the conflict markers in the files"
-" in the working tree for the user to resolve. This option implies the "
-"`--index` option, and is incompatible with the `--reject` and the `--cached`"
-" options."
+"When the patch does not apply cleanly, fall back on 3-way merge if the patch "
+"records the identity of blobs it is supposed to apply to, and we have those "
+"blobs available locally, possibly leaving the conflict markers in the files "
+"in the working tree for the user to resolve. This option implies the `--"
+"index` option, and is incompatible with the `--reject` and the `--cached` "
+"options."
msgstr ""
"Quando o patch n찾o se aplica corretamente, use a mesclagem de 3 vias se o "
"patch registrar a identidade dos blobs aos quais ele deve se aplicar, e "
@@ -8940,15 +8909,15 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:103
msgid ""
-"When a pure mode change is encountered (which has no index information), the"
-" information is read from the current index instead."
+"When a pure mode change is encountered (which has no index information), the "
+"information is read from the current index instead."
msgstr ""
"Quando uma altera챌찾o de modo puro 챕 encontrada (que n찾o cont챕m informa챌천es "
"de 챠ndice), as informa챌천es s찾o lidas a partir do 챠ndice atual."
#. type: Labeled list
#: en/git-apply.txt:105 en/rev-list-options.txt:668
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--reverse"
msgstr "--reverse"
@@ -8993,9 +8962,9 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:134 en/git-rebase.txt:337
msgid ""
-"Ensure at least <n> lines of surrounding context match before and after each"
-" change. When fewer lines of surrounding context exist they all must match."
-" By default no context is ever ignored."
+"Ensure at least <n> lines of surrounding context match before and after each "
+"change. When fewer lines of surrounding context exist they all must match. "
+"By default no context is ever ignored."
msgstr ""
"Assegure pelo menos <n> linhas de correspond챗ncia de contexto ao redor antes "
"e depois de cada altera챌찾o. Quando menos linhas de contexto circundante "
@@ -9003,7 +8972,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:135
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--unidiff-zero"
msgstr "--unidiff-zero"
@@ -9011,9 +8980,9 @@ msgstr "--unidiff-zero"
#: en/git-apply.txt:141
msgid ""
"By default, 'git apply' expects that the patch being applied is a unified "
-"diff with at least one line of context. This provides good safety measures,"
-" but breaks down when applying a diff generated with `--unified=0`. To "
-"bypass these checks use `--unidiff-zero`."
+"diff with at least one line of context. This provides good safety measures, "
+"but breaks down when applying a diff generated with `--unified=0`. To bypass "
+"these checks use `--unidiff-zero`."
msgstr ""
"Por padr찾o, 'git apply' espera que o patch sendo aplicado seja um diff "
"unificado com pelo menos uma linha de contexto. Isso fornece boas medidas "
@@ -9031,7 +9000,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:145
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--apply"
msgstr "--apply"
@@ -9039,8 +9008,8 @@ msgstr "--apply"
#: en/git-apply.txt:151
msgid ""
"If you use any of the options marked \"Turns off 'apply'\" above, 'git "
-"apply' reads and outputs the requested information without actually applying"
-" the patch. Give this flag after those flags to also apply the patch."
+"apply' reads and outputs the requested information without actually applying "
+"the patch. Give this flag after those flags to also apply the patch."
msgstr ""
"Se voc챗 usar qualquer uma das op챌천es marcadas como \"Desativar 'aplicar'\" "
"acima, 'git apply' ler찼 e exibir찼 as informa챌천es solicitadas sem aplicar o "
@@ -9049,17 +9018,17 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:152
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-add"
msgstr "--no-add"
#. type: Plain text
#: en/git-apply.txt:158
msgid ""
-"When applying a patch, ignore additions made by the patch. This can be used"
-" to extract the common part between two files by first running 'diff' on "
-"them and applying the result with this option, which would apply the "
-"deletion part but not the addition part."
+"When applying a patch, ignore additions made by the patch. This can be used "
+"to extract the common part between two files by first running 'diff' on them "
+"and applying the result with this option, which would apply the deletion "
+"part but not the addition part."
msgstr ""
"Ao aplicar um patch, ignore as adi챌천es feitas pelo patch. Isso pode ser "
"usado para extrair a parte comum entre dois arquivos, primeiro executando "
@@ -9068,7 +9037,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:159
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--allow-binary-replacement"
msgstr "--allow-binary-replacement"
@@ -9121,11 +9090,11 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:181
msgid ""
-"When `--exclude` and `--include` patterns are used, they are examined in the"
-" order they appear on the command line, and the first match determines if a "
+"When `--exclude` and `--include` patterns are used, they are examined in the "
+"order they appear on the command line, and the first match determines if a "
"patch to each path is used. A patch to a path that does not match any "
-"include/exclude pattern is used by default if there is no include pattern on"
-" the command line, and ignored if there is any include pattern."
+"include/exclude pattern is used by default if there is no include pattern on "
+"the command line, and ignored if there is any include pattern."
msgstr ""
"Quando os padr천es `--exclude` e` --include` s찾o usados, eles s찾o examinados "
"na ordem em que aparecem na linha de comando, e a primeira correspond챗ncia "
@@ -9157,11 +9126,11 @@ msgstr "--espa챌oembranco=<action>"
#: en/git-apply.txt:198
msgid ""
"When applying a patch, detect a new or modified line that has whitespace "
-"errors. What are considered whitespace errors is controlled by "
-"`core.whitespace` configuration. By default, trailing whitespaces "
-"(including lines that solely consist of whitespaces) and a space character "
-"that is immediately followed by a tab character inside the initial indent of"
-" the line are considered whitespace errors."
+"errors. What are considered whitespace errors is controlled by `core."
+"whitespace` configuration. By default, trailing whitespaces (including "
+"lines that solely consist of whitespaces) and a space character that is "
+"immediately followed by a tab character inside the initial indent of the "
+"line are considered whitespace errors."
msgstr ""
"Ao aplicar um patch, detecte uma linha nova ou modificada que tenha erros de "
"espa챌o em branco. O que 챕 considerado erro de espa챌o em branco 챕 controlado "
@@ -9231,15 +9200,15 @@ msgstr "`error-all` 챕 semelhante a`error`, mas mostra todos os erros."
#. type: Labeled list
#: en/git-apply.txt:217
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--inaccurate-eof"
msgstr "--inaccurate-eof"
#. type: Plain text
#: en/git-apply.txt:223
msgid ""
-"Under certain circumstances, some versions of 'diff' do not correctly detect"
-" a missing new-line at the end of the file. As a result, patches created by "
+"Under certain circumstances, some versions of 'diff' do not correctly detect "
+"a missing new-line at the end of the file. As a result, patches created by "
"such 'diff' programs do not record incomplete lines correctly. This option "
"adds support for applying such patches by working around this bug."
msgstr ""
@@ -9262,7 +9231,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:230
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--recount"
msgstr "--recount"
@@ -9295,17 +9264,17 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:242
msgid ""
-"For example, a patch that talks about updating `a/git-gui.sh` to `b/git-"
-"gui.sh` can be applied to the file in the working tree `modules/git-gui/git-"
-"gui.sh` by running `git apply --directory=modules/git-gui`."
+"For example, a patch that talks about updating `a/git-gui.sh` to `b/git-gui."
+"sh` can be applied to the file in the working tree `modules/git-gui/git-gui."
+"sh` by running `git apply --directory=modules/git-gui`."
msgstr ""
"Por exemplo, um patch que fala sobre a atualiza챌찾o de `a/git-gui.sh` para`b/"
-"git-gui.sh` pode ser aplicado ao arquivo na 찼rvore de trabalho `modules/"
-"git-gui/git-gui.sh `executando`git apply --directory=modules/git-gui`."
+"git-gui.sh` pode ser aplicado ao arquivo na 찼rvore de trabalho `modules/git-"
+"gui/git-gui.sh `executando`git apply --directory=modules/git-gui`."
#. type: Labeled list
#: en/git-apply.txt:243
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--unsafe-paths"
msgstr "--unsafe-paths"
@@ -9313,8 +9282,8 @@ msgstr "--unsafe-paths"
#: en/git-apply.txt:248
msgid ""
"By default, a patch that affects outside the working area (either a Git "
-"controlled working tree, or the current working directory when \"git apply\""
-" is used as a replacement of GNU patch) is rejected as a mistake (or a "
+"controlled working tree, or the current working directory when \"git apply\" "
+"is used as a replacement of GNU patch) is rejected as a mistake (or a "
"mischief)."
msgstr ""
"Por padr찾o, um patch que afeta fora da 찼rea de trabalho (uma 찼rvore de "
@@ -9325,8 +9294,8 @@ msgstr ""
#. type: Plain text
#: en/git-apply.txt:252
msgid ""
-"When `git apply` is used as a \"better GNU patch\", the user can pass the "
-"`--unsafe-paths` option to override this safety check. This option has no "
+"When `git apply` is used as a \"better GNU patch\", the user can pass the `--"
+"unsafe-paths` option to override this safety check. This option has no "
"effect when `--index` or `--cached` is in use."
msgstr ""
"Quando `git apply` 챕 usado como um \"melhor patch GNU\", o usu찼rio pode "
@@ -9336,16 +9305,16 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:256
-#, ignore-same, no-wrap
+#, no-wrap
msgid "apply.ignoreWhitespace"
msgstr "apply.ignoreWhitespace"
#. type: Plain text
#: en/git-apply.txt:260
msgid ""
-"Set to 'change' if you want changes in whitespace to be ignored by default."
-" Set to one of: no, none, never, false if you want changes in whitespace to"
-" be significant."
+"Set to 'change' if you want changes in whitespace to be ignored by default. "
+"Set to one of: no, none, never, false if you want changes in whitespace to "
+"be significant."
msgstr ""
"Defina para 'alterar' se quiser que as altera챌천es no espa챌o em branco sejam "
"ignoradas por padr찾o. Defina como um dos seguintes: n찾o, nenhum, nunca, "
@@ -9353,7 +9322,7 @@ msgstr ""
#. type: Labeled list
#: en/git-apply.txt:260
-#, ignore-same, no-wrap
+#, no-wrap
msgid "apply.whitespace"
msgstr "apply.whitespace"
@@ -9386,9 +9355,8 @@ msgstr ""
msgid ""
"If `--index` is specified (explicitly or implicitly), then the submodule "
"commits must match the index exactly for the patch to apply. If any of the "
-"submodules are checked-out, then these check-outs are completely ignored, "
-"i.e., they are not required to be up to date or clean and they are not "
-"updated."
+"submodules are checked-out, then these check-outs are completely ignored, i."
+"e., they are not required to be up to date or clean and they are not updated."
msgstr ""
"Se `--index` for especificado (explicitamente ou implicitamente), ent찾o o "
"subm처dulo commit deve corresponder exatamente ao 챠ndice para o patch ser "
@@ -9414,7 +9382,7 @@ msgstr "linkgit:git-am[1]."
#. type: Title =
#: en/git-archimport.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-archimport(1)"
msgstr "git-archimport(1)"
@@ -9435,10 +9403,10 @@ msgstr ""
#: en/git-archimport.txt:23
msgid ""
"Imports a project from one or more GNU Arch repositories. It will follow "
-"branches and repositories within the namespaces defined by the "
-"<archive/branch> parameters supplied. If it cannot find the remote branch a "
-"merge comes from it will just import it as a regular commit. If it can find "
-"it, it will mark it as a merge whenever possible (see discussion below)."
+"branches and repositories within the namespaces defined by the <archive/"
+"branch> parameters supplied. If it cannot find the remote branch a merge "
+"comes from it will just import it as a regular commit. If it can find it, it "
+"will mark it as a merge whenever possible (see discussion below)."
msgstr ""
"Importa um projeto de um ou mais reposit처rios do GNU Arch. Ele seguir찼 "
"ramifica챌천es e reposit처rios dentro dos namespaces definidos pelos par창metros "
@@ -9450,8 +9418,8 @@ msgstr ""
#: en/git-archimport.txt:27
msgid ""
"The script expects you to provide the key roots where it can start the "
-"import from an 'initial import' or 'tag' type of Arch commit. It will follow"
-" and import new branches within the provided roots."
+"import from an 'initial import' or 'tag' type of Arch commit. It will follow "
+"and import new branches within the provided roots."
msgstr ""
"O script espera que voc챗 forne챌a as principais ra챠zes onde ele pode iniciar "
"a importa챌찾o de um tipo 'initial import' ou 'tag' do Arch commit. Ele "
@@ -9471,8 +9439,8 @@ msgstr ""
#. type: Plain text
#: en/git-archimport.txt:37
msgid ""
-"'git archimport' uses `tla` extensively in the background to access the Arch"
-" repository. Make sure you have a recent version of `tla` available in the "
+"'git archimport' uses `tla` extensively in the background to access the Arch "
+"repository. Make sure you have a recent version of `tla` available in the "
"path. `tla` must know about the repositories you pass to 'git archimport'."
msgstr ""
"'git archimport' usa `tla` extensivamente em segundo plano para acessar o "
@@ -9484,8 +9452,8 @@ msgstr ""
#: en/git-archimport.txt:42
msgid ""
"For the initial import, 'git archimport' expects to find itself in an empty "
-"directory. To follow the development of a project that uses Arch, rerun 'git"
-" archimport' with the same parameters as the initial import to perform "
+"directory. To follow the development of a project that uses Arch, rerun 'git "
+"archimport' with the same parameters as the initial import to perform "
"incremental imports."
msgstr ""
"Para a importa챌찾o inicial, o 'git archimport' espera encontrar-se em um "
@@ -9508,14 +9476,14 @@ msgstr ""
"ramifica챌천es do Git manualmente. Para fazer isso, escreva um nome de "
"ramifica챌찾o Git ap처s cada par창metro <archive/branch>, separado por dois "
"pontos. Dessa forma, voc챗 pode encurtar os nomes das ramifica챌천es do Arch e "
-"converter o jarg찾o do Arch para o jarg찾o do Git, por exemplo, mapeando um \""
-"PROJECT {litdd} devo {litdd} VERSION\" ramifica챌찾o para \"master\"."
+"converter o jarg찾o do Arch para o jarg찾o do Git, por exemplo, mapeando um "
+"\"PROJECT {litdd} devo {litdd} VERSION\" ramifica챌찾o para \"master\"."
#. type: Plain text
#: en/git-archimport.txt:54
msgid ""
-"Associating multiple Arch branches to one Git branch is possible; the result"
-" will make the most sense only if no commits are made to the first branch, "
+"Associating multiple Arch branches to one Git branch is possible; the result "
+"will make the most sense only if no commits are made to the first branch, "
"after the second branch is created. Still, this is useful to convert Arch "
"repositories that had been rotated periodically."
msgstr ""
@@ -9551,8 +9519,8 @@ msgstr ""
#: en/git-archimport.txt:67
msgid ""
"Fortunately, when you try and merge branches imported from Arch, Git will "
-"find a good merge base, and it has a good chance of identifying patches that"
-" have been traded out-of-sequence between the branches."
+"find a good merge base, and it has a good chance of identifying patches that "
+"have been traded out-of-sequence between the branches."
msgstr ""
"Felizmente, quando voc챗 tenta mesclar ramifica챌천es importadas do Arch, o Git "
"encontrar찼 uma boa base de mesclagem e tem uma boa chance de identificar os "
@@ -9577,8 +9545,8 @@ msgstr "-T"
#. type: Plain text
#: en/git-archimport.txt:80
msgid ""
-"Many tags. Will create a tag for every commit, reflecting the commit name in"
-" the Arch repository."
+"Many tags. Will create a tag for every commit, reflecting the commit name in "
+"the Arch repository."
msgstr ""
"Muitas tags. Ir찼 criar uma tag para cada commit, refletindo o nome da commit "
"no reposit처rio Arch."
@@ -9586,8 +9554,8 @@ msgstr ""
#. type: Plain text
#: en/git-archimport.txt:85
msgid ""
-"Use the fast patchset import strategy. This can be significantly faster for"
-" large trees, but cannot handle directory renames or permissions changes. "
+"Use the fast patchset import strategy. This can be significantly faster for "
+"large trees, but cannot handle directory renames or permissions changes. "
"The default strategy is slow and safe."
msgstr ""
"Use a estrat챕gia de importa챌찾o de conjuntos de faixas r찼pida. Isso pode ser "
@@ -9598,7 +9566,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archimport.txt:86 en/git-commit.txt:267 en/git-grep.txt:211
#: en/git-ls-files.txt:47 en/git-merge-index.txt:29
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-o"
msgstr "-o"
@@ -9606,10 +9574,10 @@ msgstr "-o"
#: en/git-archimport.txt:93
msgid ""
"Use this for compatibility with old-style branch names used by earlier "
-"versions of 'git archimport'. Old-style branch names were "
-"category{litdd}branch, whereas new-style branch names are "
-"archive,category{litdd}branch{litdd}version. In both cases, names given on "
-"the command-line will override the automatically-generated ones."
+"versions of 'git archimport'. Old-style branch names were category{litdd}"
+"branch, whereas new-style branch names are archive,category{litdd}"
+"branch{litdd}version. In both cases, names given on the command-line will "
+"override the automatically-generated ones."
msgstr ""
"Use isso para compatibilidade com nomes de ramifica챌천es de estilo antigo "
"usados por vers천es anteriores de 'git archimport'. Os nomes de ramifica챌천es "
@@ -9637,12 +9605,11 @@ msgstr ""
#. type: Plain text
#: en/git-archimport.txt:102
msgid ""
-"Attempt to auto-register archives at `http://mirrors.sourcecontrol.net` This"
-" is particularly useful with the -D option."
+"Attempt to auto-register archives at `http://mirrors.sourcecontrol.net` This "
+"is particularly useful with the -D option."
msgstr ""
-"Tente registrar automaticamente os arquivos em "
-"`http://mirrors.sourcecontrol.net` Isso 챕 particularmente 첬til com a op챌찾o "
-"-D."
+"Tente registrar automaticamente os arquivos em `http://mirrors.sourcecontrol."
+"net` Isso 챕 particularmente 첬til com a op챌찾o -D."
#. type: Labeled list
#: en/git-archimport.txt:103
@@ -9669,7 +9636,7 @@ msgstr ""
#. type: Title =
#: en/git-archive.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-archive(1)"
msgstr "git-archive(1)"
@@ -9691,8 +9658,8 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:23
msgid ""
-"Creates an archive of the specified format containing the tree structure for"
-" the named tree, and writes it out to the standard output. If <prefix> is "
+"Creates an archive of the specified format containing the tree structure for "
+"the named tree, and writes it out to the standard output. If <prefix> is "
"specified it is prepended to the filenames in the archive."
msgstr ""
"Cria um archive do formato especificado contendo a estrutura em 찼rvore da "
@@ -9741,7 +9708,7 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:44 en/git-branch.txt:158 en/git-config.txt:165
#: en/git-show-branch.txt:80 en/git-tag.txt:93
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--list"
msgstr "--list"
@@ -9785,15 +9752,15 @@ msgstr "Escreva o arquivo para <arquivo> em vez de stdout."
#. type: Labeled list
#: en/git-archive.txt:58
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--worktree-attributes"
msgstr "--worktree-attributes"
#. type: Plain text
#: en/git-archive.txt:61
msgid ""
-"Look for attributes in .gitattributes files in the working tree as well (see"
-" <<ATTRIBUTES>>)."
+"Look for attributes in .gitattributes files in the working tree as well (see "
+"<<ATTRIBUTES>>)."
msgstr ""
"Procure atributos em arquivos .gitattributes na 찼rvore de trabalho (consulte "
"<< ATRIBUTOS >>)."
@@ -9869,8 +9836,8 @@ msgstr "<path>"
#: en/git-archive.txt:84
msgid ""
"Without an optional path parameter, all files and subdirectories of the "
-"current working directory are included in the archive. If one or more paths"
-" are specified, only these are included."
+"current working directory are included in the archive. If one or more paths "
+"are specified, only these are included."
msgstr ""
"Sem um par창metro de caminho opcional, todos os arquivos e subdiret처rios do "
"diret처rio de trabalho atual s찾o inclu챠dos no archive. Se um ou mais "
@@ -9890,7 +9857,7 @@ msgstr "zip"
#. type: Labeled list
#: en/git-archive.txt:90 en/git-diff-files.txt:28 en/git-diff.txt:109
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-0"
msgstr "-0"
@@ -9901,15 +9868,15 @@ msgstr "Armazene os arquivos em vez de esvazi찼-los."
#. type: Labeled list
#: en/git-archive.txt:92
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-9"
msgstr "-9"
#. type: Plain text
#: en/git-archive.txt:95
msgid ""
-"Highest and slowest compression level. You can specify any number from 1 to"
-" 9 to adjust compression speed and ratio."
+"Highest and slowest compression level. You can specify any number from 1 to "
+"9 to adjust compression speed and ratio."
msgstr ""
"Maior e mais lento n챠vel de compress찾o. Voc챗 pode especificar qualquer "
"n첬mero de 1 a 9 para ajustar a velocidade e a taxa de compacta챌찾o."
@@ -9932,8 +9899,9 @@ msgstr ""
"Esta vari찼vel pode ser usada para restringir os bits de permiss찾o das "
"entradas do arquivo tar. O padr찾o 챕 0002, que desativa o bit de grava챌찾o do "
"mundo. O valor especial \"user\" indica que a m찼scara do usu찼rio de "
-"arquivamento ser찼 usada no lugar. Veja umask(2) para detalhes. Se `--remote`"
-" for usado, somente a configura챌찾o do reposit처rio remoto entrar찼 em vigor."
+"arquivamento ser찼 usada no lugar. Veja umask(2) para detalhes. Se `--"
+"remote` for usado, somente a configura챌찾o do reposit처rio remoto entrar찼 em "
+"vigor."
#. type: Labeled list
#: en/git-archive.txt:108
@@ -10016,9 +9984,9 @@ msgstr "exportar-subst"
#. type: Plain text
#: en/git-archive.txt:139
msgid ""
-"If the attribute export-subst is set for a file then Git will expand several"
-" placeholders when adding this file to an archive. See "
-"linkgit:gitattributes[5] for details."
+"If the attribute export-subst is set for a file then Git will expand several "
+"placeholders when adding this file to an archive. See linkgit:"
+"gitattributes[5] for details."
msgstr ""
"Se o atributo export-subst estiver configurado para um arquivo, o Git "
"expandir찼 v찼rios marcadores ao incluir esse arquivo em um archive. Veja "
@@ -10027,31 +9995,28 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:147
msgid ""
-"Note that attributes are by default taken from the `.gitattributes` files in"
-" the tree that is being archived. If you want to tweak the way the output "
-"is generated after the fact (e.g. you committed without adding an "
-"appropriate export-ignore in its `.gitattributes`), adjust the checked out "
-"`.gitattributes` file as necessary and use `--worktree-attributes` option. "
+"Note that attributes are by default taken from the `.gitattributes` files in "
+"the tree that is being archived. If you want to tweak the way the output is "
+"generated after the fact (e.g. you committed without adding an appropriate "
+"export-ignore in its `.gitattributes`), adjust the checked out `."
+"gitattributes` file as necessary and use `--worktree-attributes` option. "
"Alternatively you can keep necessary attributes that should apply while "
"archiving any tree in your `$GIT_DIR/info/attributes` file."
msgstr ""
-"Observe que os atributos s찾o, por padr찾o, obtidos dos arquivos "
-"`.gitattributes` na 찼rvore que est찼 sendo arquivada. Se voc챗 quer ajustar a "
+"Observe que os atributos s찾o, por padr찾o, obtidos dos arquivos `."
+"gitattributes` na 찼rvore que est찼 sendo arquivada. Se voc챗 quer ajustar a "
"maneira como a sa챠da 챕 gerada ap처s o fato (por exemplo, voc챗 cometeu sem "
"adicionar um export-ignore apropriado em seu `.gitattributes`), ajuste o "
-"arquivo`.gitattributes` retirado conforme necess찼rio e use `--worktree "
-"-atributos` op챌찾o. Alternativamente, voc챗 pode manter os atributos "
+"arquivo`.gitattributes` retirado conforme necess찼rio e use `--worktree -"
+"atributos` op챌찾o. Alternativamente, voc챗 pode manter os atributos "
"necess찼rios que devem ser aplicados durante o arquivamento de qualquer "
"찼rvore em seu arquivo `$ GIT_DIR / info / attributes`."
#. type: Labeled list
#: en/git-archive.txt:150
#, no-wrap
-msgid ""
-"`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)`"
-msgstr ""
-"`git arquivo --formato=tar --prefix = lixo / CABE횉A | (cd/var/tmp/ && tar xf "
-"-) `"
+msgid "`git archive --format=tar --prefix=junk/ HEAD | (cd /var/tmp/ && tar xf -)`"
+msgstr "`git arquivo --formato=tar --prefix = lixo / CABE횉A | (cd/var/tmp/ && tar xf -) `"
#. type: Plain text
#: en/git-archive.txt:155
@@ -10065,12 +10030,8 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:156
#, no-wrap
-msgid ""
-"`git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip "
-">git-1.4.0.tar.gz`"
-msgstr ""
-"`git arquivo --formato=tar --prefixo=git-1.4.0/ v1.4.0 | gzip "
-">git-1.4.0.tar.gz`"
+msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz`"
+msgstr "`git arquivo --formato=tar --prefixo=git-1.4.0/ v1.4.0 | gzip >git-1.4.0.tar.gz`"
#. type: Plain text
#: en/git-archive.txt:159
@@ -10080,10 +10041,8 @@ msgstr "Crie um tarball comprimido para a vers찾o v1.4.0."
#. type: Labeled list
#: en/git-archive.txt:160
#, no-wrap
-msgid ""
-"`git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`"
-msgstr ""
-"`git arquivo --formato=tar.gz --prefixo=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`"
+msgid "`git archive --format=tar.gz --prefix=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`"
+msgstr "`git arquivo --formato=tar.gz --prefixo=git-1.4.0/ v1.4.0 >git-1.4.0.tar.gz`"
#. type: Plain text
#: en/git-archive.txt:163
@@ -10104,12 +10063,8 @@ msgstr "O mesmo que acima, mas o formato 챕 inferido do arquivo de sa챠da."
#. type: Labeled list
#: en/git-archive.txt:168
#, no-wrap
-msgid ""
-"`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip "
-">git-1.4.0.tar.gz`"
-msgstr ""
-"`git arquivo --formato=tar --prefixo=git-1.4.0/ v1.4.0^{tree} | gzip "
-">git-1.4.0.tar.gz`"
+msgid "`git archive --format=tar --prefix=git-1.4.0/ v1.4.0^{tree} | gzip >git-1.4.0.tar.gz`"
+msgstr "`git arquivo --formato=tar --prefixo=git-1.4.0/ v1.4.0^{tree} | gzip >git-1.4.0.tar.gz`"
#. type: Plain text
#: en/git-archive.txt:172
@@ -10123,12 +10078,8 @@ msgstr ""
#. type: Labeled list
#: en/git-archive.txt:173
#, no-wrap
-msgid ""
-"`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > "
-"git-1.4.0-docs.zip`"
-msgstr ""
-"`git arquivo --formato=zip --prefixo=git-docs/ CABE횉A: Documenta챌찾o/ > "
-"git-1.4.0-docs.zip`"
+msgid "`git archive --format=zip --prefix=git-docs/ HEAD:Documentation/ > git-1.4.0-docs.zip`"
+msgstr "`git arquivo --formato=zip --prefixo=git-docs/ CABE횉A: Documenta챌찾o/ > git-1.4.0-docs.zip`"
#. type: Plain text
#: en/git-archive.txt:177
@@ -10136,8 +10087,8 @@ msgid ""
"Put everything in the current head's Documentation/ directory into "
"'git-1.4.0-docs.zip', with the prefix 'git-docs/'."
msgstr ""
-"Coloque tudo no diret처rio Documenta챌찾o / da cabe챌a atual em 'git-1.4.0-"
-"docs.zip', com o prefixo 'git-docs /'."
+"Coloque tudo no diret처rio Documenta챌찾o / da cabe챌a atual em 'git-1.4.0-docs."
+"zip', com o prefixo 'git-docs /'."
#. type: Labeled list
#: en/git-archive.txt:178
@@ -10175,20 +10126,18 @@ msgstr ""
#. type: Plain text
#: en/git-archive.txt:194
-#, ignore-same
msgid "linkgit:gitattributes[5]"
msgstr "linkgit:gitattributes[5]"
#. type: Title =
#: en/git-bisect.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-bisect(1)"
msgstr "git-bisect(1)"
#. type: Plain text
#: en/git-bisect.txt:7
-msgid ""
-"git-bisect - Use binary search to find the commit that introduced a bug"
+msgid "git-bisect - Use binary search to find the commit that introduced a bug"
msgstr ""
"git-bisect - Use a pesquisa bin찼ria para encontrar o commit que introduziu "
"um bug"
@@ -10225,8 +10174,7 @@ msgid ""
" git bisect run <cmd>...\n"
" git bisect help\n"
msgstr ""
-" git in챠cio de divis찾o [--prazo-{velho,bom}=<prazo> "
-"--prazo-{novo,mau}=<prazo>]\n"
+" git in챠cio de divis찾o [--prazo-{velho,bom}=<prazo> --prazo-{novo,mau}=<prazo>]\n"
"\t\t [--n찾o-confira] [<mau> [<bom>...]] [--] [<paths>...]\n"
" git divis찾o (mau|novo|<prazo-novo>) [<rev>]\n"
" git divis찾o (bom|velho|<prazo-velho>) [<rev>...]\n"
@@ -10243,9 +10191,9 @@ msgstr ""
#: en/git-bisect.txt:40
msgid ""
"This command uses a binary search algorithm to find which commit in your "
-"project's history introduced a bug. You use it by first telling it a \"bad\""
-" commit that is known to contain the bug, and a \"good\" commit that is "
-"known to be before the bug was introduced. Then `git bisect` picks a commit "
+"project's history introduced a bug. You use it by first telling it a \"bad\" "
+"commit that is known to contain the bug, and a \"good\" commit that is known "
+"to be before the bug was introduced. Then `git bisect` picks a commit "
"between those two endpoints and asks you whether the selected commit is "
"\"good\" or \"bad\". It continues narrowing down the range until it finds "
"the exact commit that introduced the change."
@@ -10253,10 +10201,10 @@ msgstr ""
"Esse comando usa um algoritmo de busca bin찼ria para descobrir qual commit no "
"hist처rico do seu projeto introduziu um bug. Voc챗 o utiliza primeiro "
"informando a um commit \"ruim\" que 챕 conhecido por conter o bug, e um "
-"commit \"bom\" que 챕 sabido antes do bug ser introduzido. Ent찾o, `git bisect`"
-" seleciona um commit entre esses dois endpoints e pergunta se o commit "
-"selecionado 챕\" good \"ou\" bad \". Ele continua reduzindo o intervalo at챕 "
-"encontrar o commit exato que introduziu a mudan챌a."
+"commit \"bom\" que 챕 sabido antes do bug ser introduzido. Ent찾o, `git "
+"bisect` seleciona um commit entre esses dois endpoints e pergunta se o "
+"commit selecionado 챕\" good \"ou\" bad \". Ele continua reduzindo o "
+"intervalo at챕 encontrar o commit exato que introduziu a mudan챌a."
#. type: Plain text
#: en/git-bisect.txt:47
@@ -10264,9 +10212,9 @@ msgid ""
"In fact, `git bisect` can be used to find the commit that changed *any* "
"property of your project; e.g., the commit that fixed a bug, or the commit "
"that caused a benchmark's performance to improve. To support this more "
-"general usage, the terms \"old\" and \"new\" can be used in place of "
-"\"good\" and \"bad\", or you can choose your own terms. See section "
-"\"Alternate terms\" below for more information."
+"general usage, the terms \"old\" and \"new\" can be used in place of \"good"
+"\" and \"bad\", or you can choose your own terms. See section \"Alternate "
+"terms\" below for more information."
msgstr ""
"De fato, `git bisect` pode ser usado para encontrar o commit que mudou * "
"qualquer * propriedade do seu projeto; por exemplo, o commit que corrigiu um "
@@ -10286,8 +10234,8 @@ msgstr "Comandos b찼sicos da bissec챌찾o: come챌ar, ruim, bom"
#: en/git-bisect.txt:54
msgid ""
"As an example, suppose you are trying to find the commit that broke a "
-"feature that was known to work in version `v2.6.13-rc2` of your project. You"
-" start a bisect session as follows:"
+"feature that was known to work in version `v2.6.13-rc2` of your project. You "
+"start a bisect session as follows:"
msgstr ""
"Como exemplo, suponha que voc챗 esteja tentando encontrar o commit que "
"quebrou um recurso que era conhecido por funcionar na vers찾o `v2.6.13-rc2` "
@@ -10317,9 +10265,7 @@ msgstr ""
#: en/git-bisect.txt:67
#, no-wrap
msgid "Bisecting: 675 revisions left to test after this (roughly 10 steps)\n"
-msgstr ""
-"Bisecting: 675 revis천es deixadas para testar depois disso (aproximadamente "
-"10 passos)\n"
+msgstr "Bisecting: 675 revis천es deixadas para testar depois disso (aproximadamente 10 passos)\n"
#. type: Plain text
#: en/git-bisect.txt:71
@@ -10356,9 +10302,7 @@ msgstr "Ent찾o `git bisect` ir찼 responder com algo como"
#: en/git-bisect.txt:86
#, no-wrap
msgid "Bisecting: 337 revisions left to test after this (roughly 9 steps)\n"
-msgstr ""
-"Bisecting: 337 revis천es deixadas para testar depois disso (aproximadamente 9 "
-"passos)\n"
+msgstr "Bisecting: 337 revis천es deixadas para testar depois disso (aproximadamente 9 passos)\n"
#. type: Plain text
#: en/git-bisect.txt:91
@@ -10375,8 +10319,8 @@ msgstr ""
#: en/git-bisect.txt:95
msgid ""
"Eventually there will be no more revisions left to inspect, and the command "
-"will print out a description of the first bad commit. The reference "
-"`refs/bisect/bad` will be left pointing at that commit."
+"will print out a description of the first bad commit. The reference `refs/"
+"bisect/bad` will be left pointing at that commit."
msgstr ""
"Eventualmente, n찾o haver찼 mais revis천es para inspecionar e o comando "
"imprimir찼 uma descri챌찾o do primeiro commit inv찼lido. A refer챗ncia `refs/"
@@ -10446,16 +10390,16 @@ msgstr "Termos alternativos"
#. type: Plain text
#: en/git-bisect.txt:132
msgid ""
-"Sometimes you are not looking for the commit that introduced a breakage, but"
-" rather for a commit that caused a change between some other \"old\" state "
+"Sometimes you are not looking for the commit that introduced a breakage, but "
+"rather for a commit that caused a change between some other \"old\" state "
"and \"new\" state. For example, you might be looking for the commit that "
-"introduced a particular fix. Or you might be looking for the first commit in"
-" which the source-code filenames were finally all converted to your "
-"company's naming standard. Or whatever."
+"introduced a particular fix. Or you might be looking for the first commit in "
+"which the source-code filenames were finally all converted to your company's "
+"naming standard. Or whatever."
msgstr ""
"�s vezes, voc챗 n찾o est찼 procurando a confirma챌찾o que introduziu uma quebra, "
-"mas sim uma confirma챌찾o que causou uma altera챌찾o entre algum outro estado \""
-"antigo\" e o estado \"novo\". Por exemplo, voc챗 pode estar procurando o "
+"mas sim uma confirma챌찾o que causou uma altera챌찾o entre algum outro estado "
+"\"antigo\" e o estado \"novo\". Por exemplo, voc챗 pode estar procurando o "
"commit que introduziu uma corre챌찾o espec챠fica. Ou voc챗 pode estar procurando "
"pelo primeiro commit no qual os nomes dos arquivos de c처digo-fonte foram "
"finalmente convertidos para o padr찾o de nomenclatura de sua empresa. Como "
@@ -10464,11 +10408,11 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:138
msgid ""
-"In such cases it can be very confusing to use the terms \"good\" and \"bad\""
-" to refer to \"the state before the change\" and \"the state after the "
-"change\". So instead, you can use the terms \"old\" and \"new\", "
-"respectively, in place of \"good\" and \"bad\". (But note that you cannot "
-"mix \"good\" and \"bad\" with \"old\" and \"new\" in a single session.)"
+"In such cases it can be very confusing to use the terms \"good\" and \"bad\" "
+"to refer to \"the state before the change\" and \"the state after the change"
+"\". So instead, you can use the terms \"old\" and \"new\", respectively, in "
+"place of \"good\" and \"bad\". (But note that you cannot mix \"good\" and "
+"\"bad\" with \"old\" and \"new\" in a single session.)"
msgstr ""
"Em tais casos, pode ser muito confuso usar os termos \"bom\" e \"ruim\" para "
"se referir a \"o estado antes da mudan챌a\" e \"o estado ap처s a mudan챌a\". "
@@ -10540,8 +10484,8 @@ msgstr "git termos de divis찾o\n"
#. type: Plain text
#: en/git-bisect.txt:170
msgid ""
-"You can get just the old (respectively new) term with `git bisect terms "
-"--term-old` or `git bisect terms --term-good`."
+"You can get just the old (respectively new) term with `git bisect terms --"
+"term-old` or `git bisect terms --term-good`."
msgstr ""
"Voc챗 pode obter apenas o termo antigo (respectivamente novo) com `git bisect "
"terms --term-old` ou` git bisect terms --term-good`."
@@ -10549,8 +10493,8 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:175
msgid ""
-"If you would like to use your own terms instead of \"bad\"/\"good\" or "
-"\"new\"/\"old\", you can choose any names you like (except existing bisect "
+"If you would like to use your own terms instead of \"bad\"/\"good\" or \"new"
+"\"/\"old\", you can choose any names you like (except existing bisect "
"subcommands like `reset`, `start`, ...) by starting the bisection using"
msgstr ""
"Se voc챗 gostaria de usar seus pr처prios termos em vez de \"ruim\"/ \"bom\" ou "
@@ -10562,8 +10506,7 @@ msgstr ""
#: en/git-bisect.txt:178
#, no-wrap
msgid "git bisect start --term-old <term-old> --term-new <term-new>\n"
-msgstr ""
-"git in챠cio de divis찾o --termo-velho <termo-velho> --termo-novo <termo-novo>\n"
+msgstr "git in챠cio de divis찾o --termo-velho <termo-velho> --termo-novo <termo-novo>\n"
#. type: Plain text
#: en/git-bisect.txt:182
@@ -10583,7 +10526,8 @@ msgstr "git in챠cio de divis찾o --termo-velho r찼pido --termo-novo lento\n"
#. type: Plain text
#: en/git-bisect.txt:188
msgid "Or if you are looking for the commit that fixed a bug, you might use"
-msgstr "Ou se voc챗 est찼 procurando o commit que corrigiu um bug, voc챗 pode usar"
+msgstr ""
+"Ou se voc챗 est찼 procurando o commit que corrigiu um bug, voc챗 pode usar"
#. type: delimited block -
#: en/git-bisect.txt:191
@@ -10626,12 +10570,12 @@ msgstr "$ git visualizar divis찾o\n"
#. type: Plain text
#: en/git-bisect.txt:210
msgid ""
-"If the `DISPLAY` environment variable is not set, 'git log' is used instead."
-" You can also give command-line options such as `-p` and `--stat`."
+"If the `DISPLAY` environment variable is not set, 'git log' is used "
+"instead. You can also give command-line options such as `-p` and `--stat`."
msgstr ""
"Se a vari찼vel de ambiente `DISPLAY` n찾o estiver definida, o 'git log' 챕 "
-"usado em seu lugar. Voc챗 tamb챕m pode dar op챌천es de linha de comando como "
-"`-p` e` --stat`."
+"usado em seu lugar. Voc챗 tamb챕m pode dar op챌천es de linha de comando como `-"
+"p` e` --stat`."
#. type: delimited block -
#: en/git-bisect.txt:213
@@ -10648,8 +10592,8 @@ msgstr "Divis찾o de log e divis찾o de replay"
#. type: Plain text
#: en/git-bisect.txt:220
msgid ""
-"After having marked revisions as good or bad, issue the following command to"
-" show what has been done so far:"
+"After having marked revisions as good or bad, issue the following command to "
+"show what has been done so far:"
msgstr ""
"Depois de ter marcado as revis천es como boas ou ruins, emita o seguinte "
"comando para mostrar o que foi feito at챕 agora:"
@@ -10802,8 +10746,8 @@ msgid ""
"This tells the bisect process that the commits between `v2.5` and `v2.6` "
"(inclusive) should be skipped."
msgstr ""
-"Isso informa ao processo de divis찾o que as confirma챌천es entre `v2.5` e` v2.6`"
-" (inclusive) devem ser ignoradas."
+"Isso informa ao processo de divis찾o que as confirma챌천es entre `v2.5` e` "
+"v2.6` (inclusive) devem ser ignoradas."
#. type: Title ~
#: en/git-bisect.txt:293
@@ -10883,24 +10827,24 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:331
msgid ""
-"Any other exit code will abort the bisect process. It should be noted that a"
-" program that terminates via `exit(-1)` leaves $? = 255, (see the exit(3) "
+"Any other exit code will abort the bisect process. It should be noted that a "
+"program that terminates via `exit(-1)` leaves $? = 255, (see the exit(3) "
"manual page), as the value is chopped with `& 0377`."
msgstr ""
"Qualquer outro c처digo de sa챠da abortar찼 o processo de divis찾o. Deve-se notar "
-"que um programa que termina via `exit (-1)` deixa $? = 255, (veja a sa챠da (3)"
-" p찼gina de manual), como o valor 챕 cortado com `& 0377`."
+"que um programa que termina via `exit (-1)` deixa $? = 255, (veja a sa챠da "
+"(3) p찼gina de manual), como o valor 챕 cortado com `& 0377`."
#. type: Plain text
#: en/git-bisect.txt:340
msgid ""
-"The special exit code 125 should be used when the current source code cannot"
-" be tested. If the script exits with this code, the current revision will be"
-" skipped (see `git bisect skip` above). 125 was chosen as the highest "
+"The special exit code 125 should be used when the current source code cannot "
+"be tested. If the script exits with this code, the current revision will be "
+"skipped (see `git bisect skip` above). 125 was chosen as the highest "
"sensible value to use for this purpose, because 126 and 127 are used by "
"POSIX shells to signal specific error status (127 is for command not found, "
-"126 is for command found but not executable--these details do not matter, as"
-" they are normal errors in the script, as far as `bisect run` is concerned)."
+"126 is for command found but not executable--these details do not matter, as "
+"they are normal errors in the script, as far as `bisect run` is concerned)."
msgstr ""
"O c처digo de sa챠da especial 125 deve ser usado quando o c처digo-fonte atual "
"n찾o puder ser testado. Se o script sair com este c처digo, a revis찾o atual "
@@ -10917,8 +10861,8 @@ msgid ""
"You may often find that during a bisect session you want to have temporary "
"modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a header file, or "
"\"revision that does not have this commit needs this patch applied to work "
-"around another problem this bisection is not interested in\") applied to the"
-" revision being tested."
+"around another problem this bisection is not interested in\") applied to the "
+"revision being tested."
msgstr ""
"Muitas vezes voc챗 pode achar que durante uma sess찾o de bisse챌찾o voc챗 quer "
"ter modifica챌천es tempor찼rias (por exemplo, s / # define DEBUG 0 / # define "
@@ -10947,7 +10891,7 @@ msgstr ""
#. type: Labeled list
#: en/git-bisect.txt:357 en/git-clone.txt:134
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-checkout"
msgstr "--no-checkout"
@@ -10955,8 +10899,8 @@ msgstr "--no-checkout"
#: en/git-bisect.txt:362
msgid ""
"Do not checkout the new working tree at each iteration of the bisection "
-"process. Instead just update a special reference named `BISECT_HEAD` to make"
-" it point to the commit that should be tested."
+"process. Instead just update a special reference named `BISECT_HEAD` to make "
+"it point to the commit that should be tested."
msgstr ""
"N찾o registre a nova 찼rvore de trabalho em cada itera챌찾o do processo de "
"bissec챌찾o. Em vez disso, basta atualizar uma refer챗ncia especial chamada "
@@ -11185,8 +11129,7 @@ msgid ""
msgstr ""
"$ git in챠cio de divis찾o\n"
"$ git divis찾o nova HEAD # commit atual est찼 marcado como novo\n"
-"$ git divis찾o velha HEAD~10 # o d챕cimo commit a partir de agora 챕 marcado "
-"como antigo\n"
+"$ git divis찾o velha HEAD~10 # o d챕cimo commit a partir de agora 챕 marcado como antigo\n"
#. type: Plain text
#: en/git-bisect.txt:480
@@ -11223,15 +11166,15 @@ msgstr ""
#. type: Plain text
#: en/git-bisect.txt:496
msgid ""
-"link:git-bisect-lk2009.html[Fighting regressions with git bisect], "
-"linkgit:git-blame[1]."
+"link:git-bisect-lk2009.html[Fighting regressions with git bisect], linkgit:"
+"git-blame[1]."
msgstr ""
-"link:git-divis찾o-lk2009.html[Regress천es de combate com divis찾o git], linkgit"
-":git-blame[1]."
+"link:git-divis찾o-lk2009.html[Regress천es de combate com divis찾o git], linkgit:"
+"git-blame[1]."
#. type: Title =
#: en/git-blame.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-blame(1)"
msgstr "git-blame(1)"
@@ -11267,8 +11210,8 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:24
msgid ""
-"When specified one or more times, `-L` restricts annotation to the requested"
-" lines."
+"When specified one or more times, `-L` restricts annotation to the requested "
+"lines."
msgstr ""
"Quando especificado uma ou mais vezes, `-L` restringe a anota챌찾o 횪s linhas "
"solicitadas."
@@ -11289,8 +11232,8 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:34
msgid ""
-"The report does not tell you anything about lines which have been deleted or"
-" replaced; you need to use a tool such as 'git diff' or the \"pickaxe\" "
+"The report does not tell you anything about lines which have been deleted or "
+"replaced; you need to use a tool such as 'git diff' or the \"pickaxe\" "
"interface briefly mentioned in the following paragraph."
msgstr ""
"O relat처rio n찾o informa nada sobre linhas que foram eliminadas ou "
@@ -11301,8 +11244,8 @@ msgstr ""
#: en/git-blame.txt:41
msgid ""
"Apart from supporting file annotation, Git also supports searching the "
-"development history for when a code snippet occurred in a change. This makes"
-" it possible to track when a code snippet was added to a file, moved or "
+"development history for when a code snippet occurred in a change. This makes "
+"it possible to track when a code snippet was added to a file, moved or "
"copied between files, and eventually deleted or replaced. It works by "
"searching for a text string in the diff. A small example of the pickaxe "
"interface that searches for `blame_usage`:"
@@ -11324,41 +11267,39 @@ msgid ""
"ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Make the output\n"
msgstr ""
"$ git log --pretty=oneline -S'uso_de_responsabilidade'\n"
-"5040f17eba15504bad66b14a645bddd9b015ebb7 blame -S <arquivo-de-ancestralidade>"
-"\n"
+"5040f17eba15504bad66b14a645bddd9b015ebb7 blame -S <arquivo-de-ancestralidade>\n"
"ea4c7f9bf69e781dd0cd88d2bccb2bf5cc15c9a7 git-blame: Fa챌a a sa챠da\n"
#. type: Plain text
#: en/git-blame.txt:54
msgid "Use the same output mode as linkgit:git-annotate[1] (Default: off)."
-msgstr "Use o mesmo modo de sa챠da que o linkgit: git-anotar [1] (Padr찾o: fora)."
+msgstr "Use o mesmo modo de sa챠da que o linkgit:git-anotar [1] (Padr찾o: fora)."
#. type: Labeled list
#: en/git-blame.txt:55
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--score-debug"
msgstr "--score-debug"
#. type: Plain text
#: en/git-blame.txt:63
msgid ""
-"Include debugging information related to the movement of lines between files"
-" (see `-C`) and lines moved within a file (see `-M`). The first number "
-"listed is the score. This is the number of alphanumeric characters detected"
-" as having been moved between or within files. This must be above a certain"
-" threshold for 'git blame' to consider those lines of code to have been "
-"moved."
+"Include debugging information related to the movement of lines between files "
+"(see `-C`) and lines moved within a file (see `-M`). The first number "
+"listed is the score. This is the number of alphanumeric characters detected "
+"as having been moved between or within files. This must be above a certain "
+"threshold for 'git blame' to consider those lines of code to have been moved."
msgstr ""
"Inclua informa챌천es de depura챌찾o relacionadas ao movimento de linhas entre "
-"arquivos (consulte `-C) e linhas movidas dentro de um arquivo (consulte` -M`)"
-". O primeiro n첬mero listado 챕 a pontua챌찾o. \n"
+"arquivos (consulte `-C) e linhas movidas dentro de um arquivo (consulte` -"
+"M`). O primeiro n첬mero listado 챕 a pontua챌찾o. \n"
" Esse 챕 o n첬mero de caracteres alfanum챕ricos detectados como tendo sido "
"movidos entre ou dentro dos arquivos. Isso deve estar acima de um certo "
"limite para 'git blame' considerar essas linhas de c처digo que foram movidas."
#. type: Labeled list
#: en/git-blame.txt:65
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-name"
msgstr "--show-name"
@@ -11375,7 +11316,7 @@ msgstr ""
#. type: Labeled list
#: en/git-blame.txt:71
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-number"
msgstr "--show-number"
@@ -11391,7 +11332,7 @@ msgstr "Suprima o nome do autor e o registro de data e hora da sa챠da."
#. type: Labeled list
#: en/git-blame.txt:78
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-email"
msgstr "--show-email"
@@ -11402,8 +11343,8 @@ msgid ""
"be controlled via the `blame.showEmail` config option."
msgstr ""
"Mostrar o email do autor em vez do nome do autor (Padr찾o: desativado). Isso "
-"tamb챕m pode ser controlado atrav챕s da op챌찾o de configura챌찾o "
-"`blame.showEmail`."
+"tamb챕m pode ser controlado atrav챕s da op챌찾o de configura챌찾o `blame."
+"showEmail`."
#. type: Plain text
#: en/git-blame.txt:86
@@ -11484,8 +11425,8 @@ msgstr ""
#. type: Plain text
#: en/git-blame.txt:112
msgid ""
-"the author name (\"author\"), email (\"author-mail\"), time (\"author-"
-"time\"), and time zone (\"author-tz\"); similarly for committer."
+"the author name (\"author\"), email (\"author-mail\"), time (\"author-time"
+"\"), and time zone (\"author-tz\"); similarly for committer."
msgstr ""
"o nome do autor (\"autor\"), email (\"autor-mail\"), time (\"autor-time\") e "
"fuso hor찼rio (\"autor-tz\"); da mesma forma para o committer."
@@ -11513,12 +11454,11 @@ msgstr ""
#: en/git-blame.txt:126
msgid ""
"The porcelain format generally suppresses commit information that has "
-"already been seen. For example, two lines that are blamed to the same commit"
-" will both be shown, but the details for that commit will be shown only "
-"once. This is more efficient, but may require more state be kept by the "
-"reader. The `--line-porcelain` option can be used to output full commit "
-"information for each line, allowing simpler (but less efficient) usage "
-"like:"
+"already been seen. For example, two lines that are blamed to the same commit "
+"will both be shown, but the details for that commit will be shown only once. "
+"This is more efficient, but may require more state be kept by the reader. "
+"The `--line-porcelain` option can be used to output full commit information "
+"for each line, allowing simpler (but less efficient) usage like:"
msgstr ""
"O formato de porcelana geralmente suprime informa챌천es de confirma챌찾o que j찼 "
"foram vistas. Por exemplo, duas linhas que s찾o responsabilizadas para a "
@@ -11565,8 +11505,8 @@ msgstr ""
#: en/git-blame.txt:145
msgid ""
"When you are interested in finding the origin for lines 40-60 for file "
-"`foo`, you can use the `-L` option like so (they mean the same thing -- both"
-" ask for 21 lines starting at line 40):"
+"`foo`, you can use the `-L` option like so (they mean the same thing -- both "
+"ask for 21 lines starting at line 40):"
msgstr ""
"Quando voc챗 estiver interessado em encontrar a origem para as linhas 40-60 "
"do arquivo `foo`, voc챗 pode usar a op챌찾o` -L` assim (eles significam a mesma "
@@ -11604,8 +11544,8 @@ msgstr "que limita a anota챌찾o ao corpo da sub-rotina `hello`."
#: en/git-blame.txt:158
msgid ""
"When you are not interested in changes older than version v2.6.18, or "
-"changes older than 3 weeks, you can use revision range specifiers similar to"
-" 'git rev-list':"
+"changes older than 3 weeks, you can use revision range specifiers similar to "
+"'git rev-list':"
msgstr ""
"Quando voc챗 n찾o est찼 interessado em mudan챌as mais antigas que a vers찾o "
"v2.6.18, ou em mudan챌as anteriores a 3 semanas, voc챗 pode usar "
@@ -11630,8 +11570,8 @@ msgid ""
"blamed for that range boundary commit."
msgstr ""
"Quando os especificadores de intervalo de revis찾o s찾o usados para limitar a "
-"anota챌찾o, as linhas que n찾o foram alteradas desde o limite de intervalo ("
-"seja a confirma챌찾o v2.6.18 ou a confirma챌찾o mais recente com mais de 3 "
+"anota챌찾o, as linhas que n찾o foram alteradas desde o limite de intervalo "
+"(seja a confirma챌찾o v2.6.18 ou a confirma챌찾o mais recente com mais de 3 "
"semanas no exemplo acima) s찾o responsabilizadas por esse limite de intervalo "
"commit."
@@ -11720,8 +11660,8 @@ msgstr "Os n첬meros de linha contam a partir de 1."
msgid ""
"The first time that a commit shows up in the stream, it has various other "
"information about it printed out with a one-word tag at the beginning of "
-"each line describing the extra commit information (author, email, committer,"
-" dates, summary, etc.)."
+"each line describing the extra commit information (author, email, committer, "
+"dates, summary, etc.)."
msgstr ""
"A primeira vez que um commit 챕 exibido no fluxo, ele cont챕m v찼rias outras "
"informa챌천es sobre ele impressas com uma tag de uma palavra no in챠cio de cada "
@@ -11741,8 +11681,7 @@ msgstr ""
#: en/git-blame.txt:210
#, no-wrap
msgid "\"filename\" <whitespace-quoted-filename-goes-here>\n"
-msgstr ""
-"\"nome-do-arquivo\" <espa챌o-em-branco-quoted-nomed-do-arquivo-vai-aqui>\n"
+msgstr "\"nome-do-arquivo\" <espa챌o-em-branco-quoted-nomed-do-arquivo-vai-aqui>\n"
#. type: Plain text
#: en/git-blame.txt:213
@@ -11765,8 +11704,8 @@ msgid ""
"commentary), a blame viewer will not care."
msgstr ""
"Para as pessoas que fazem an찼lise: para torn찼-lo mais robusto, simplesmente "
-"ignore quaisquer linhas entre a primeira e a 첬ltima (linhas \"<sha1>\" e \""
-"nome do arquivo\") onde voc챗 n찾o reconhece as palavras da tag (ou se "
+"ignore quaisquer linhas entre a primeira e a 첬ltima (linhas \"<sha1>\" e "
+"\"nome do arquivo\") onde voc챗 n찾o reconhece as palavras da tag (ou se "
"preocupa com aquela em particular) no in챠cio das linhas de \"informa챌천es "
"estendidas\". Dessa forma, se houver alguma informa챌찾o adicionada (como a "
"codifica챌찾o de commit ou coment찼rio de commit estendido), um visualizador de "
@@ -11780,7 +11719,7 @@ msgstr "AUTORES DE MAPEAMENTO"
#. type: Title =
#: en/git-branch.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-branch(1)"
msgstr "git-branch(1)"
@@ -11813,12 +11752,12 @@ msgstr ""
msgid ""
"If `--list` is given, or if there are no non-option arguments, existing "
"branches are listed; the current branch will be highlighted with an "
-"asterisk. Option `-r` causes the remote-tracking branches to be listed, and"
-" option `-a` shows both local and remote branches. If a `<pattern>` is "
-"given, it is used as a shell wildcard to restrict the output to matching "
-"branches. If multiple patterns are given, a branch is shown if it matches "
-"any of the patterns. Note that when providing a `<pattern>`, you must use "
-"`--list`; otherwise the command is interpreted as branch creation."
+"asterisk. Option `-r` causes the remote-tracking branches to be listed, and "
+"option `-a` shows both local and remote branches. If a `<pattern>` is given, "
+"it is used as a shell wildcard to restrict the output to matching branches. "
+"If multiple patterns are given, a branch is shown if it matches any of the "
+"patterns. Note that when providing a `<pattern>`, you must use `--list`; "
+"otherwise the command is interpreted as branch creation."
msgstr ""
"Se `--list` for fornecido, ou se n찾o houver argumentos n찾o-opcionais, as "
"ramifica챌천es existentes ser찾o listadas; o ramo atual ser찼 destacado com um "
@@ -11833,16 +11772,16 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:46
msgid ""
-"With `--contains`, shows only the branches that contain the named commit (in"
-" other words, the branches whose tip commits are descendants of the named "
+"With `--contains`, shows only the branches that contain the named commit (in "
+"other words, the branches whose tip commits are descendants of the named "
"commit), `--no-contains` inverts it. With `--merged`, only branches merged "
"into the named commit (i.e. the branches whose tip commits are reachable "
-"from the named commit) will be listed. With `--no-merged` only branches not"
-" merged into the named commit will be listed. If the <commit> argument is "
+"from the named commit) will be listed. With `--no-merged` only branches not "
+"merged into the named commit will be listed. If the <commit> argument is "
"missing it defaults to `HEAD` (i.e. the tip of the current branch)."
msgstr ""
-"Com `--contains`, mostra apenas as ramifica챌천es que cont챗m o commit nomeado ("
-"em outras palavras, os branches cuja dica commit 챕 descendente da commit "
+"Com `--contains`, mostra apenas as ramifica챌천es que cont챗m o commit nomeado "
+"(em outras palavras, os branches cuja dica commit 챕 descendente da commit "
"nomeada),` --no-contains` a inverte. Com o `--merged`, somente os ramos "
"mesclados na confirma챌찾o nomeada (ou seja, os ramos cujas dicas s찾o "
"acessadas a partir da confirma챌찾o nomeada) ser찾o listados. Com as "
@@ -11853,8 +11792,8 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:49
msgid ""
-"The command's second form creates a new branch head named <branchname> which"
-" points to the current `HEAD`, or <start-point> if given."
+"The command's second form creates a new branch head named <branchname> which "
+"points to the current `HEAD`, or <start-point> if given."
msgstr ""
"O segundo formul찼rio do comando cria um novo cabe챌alho de ramifica챌찾o "
"chamado <branchname>, que aponta para o atual `HEAD`, ou <start-point>, se "
@@ -11874,13 +11813,13 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:61
msgid ""
-"When a local branch is started off a remote-tracking branch, Git sets up the"
-" branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` "
+"When a local branch is started off a remote-tracking branch, Git sets up the "
+"branch (specifically the `branch.<name>.remote` and `branch.<name>.merge` "
"configuration entries) so that 'git pull' will appropriately merge from the "
-"remote-tracking branch. This behavior may be changed via the global "
-"`branch.autoSetupMerge` configuration flag. That setting can be overridden "
-"by using the `--track` and `--no-track` options, and changed later using "
-"`git branch --set-upstream-to`."
+"remote-tracking branch. This behavior may be changed via the global `branch."
+"autoSetupMerge` configuration flag. That setting can be overridden by using "
+"the `--track` and `--no-track` options, and changed later using `git branch "
+"--set-upstream-to`."
msgstr ""
"Quando uma ramifica챌찾o local 챕 iniciada em uma ramifica챌찾o de controle "
"remoto, o Git configura a ramifica챌찾o (especificamente as entradas de "
@@ -11919,8 +11858,8 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:75
msgid ""
-"With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify"
-" more than one branch for deletion. If the branch currently has a reflog "
+"With a `-d` or `-D` option, `<branchname>` will be deleted. You may specify "
+"more than one branch for deletion. If the branch currently has a reflog "
"then the reflog will also be deleted."
msgstr ""
"Com uma op챌찾o `-d` ou` -D`, o `<branchname>` ser찼 deletado. Voc챗 pode "
@@ -11932,16 +11871,16 @@ msgstr ""
msgid ""
"Use `-r` together with `-d` to delete remote-tracking branches. Note, that "
"it only makes sense to delete remote-tracking branches if they no longer "
-"exist in the remote repository or if 'git fetch' was configured not to fetch"
-" them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a "
+"exist in the remote repository or if 'git fetch' was configured not to fetch "
+"them again. See also the 'prune' subcommand of linkgit:git-remote[1] for a "
"way to clean up all obsolete remote-tracking branches."
msgstr ""
"Use `-r` juntamente com` -d` para excluir ramifica챌천es de rastreamento "
"remoto. Observe que s처 faz sentido excluir ramifica챌천es de rastreamento "
"remoto se elas n찾o existirem mais no reposit처rio remoto ou se a \"busca de "
"git\" tiver sido configurada para n찾o busc찼-las novamente. Veja tamb챕m o "
-"subcomando 'prune' do linkgit: git-remote[1] para uma maneira de limpar "
-"todas as ramifica챌천es de rastreamento remoto obsoletas."
+"subcomando 'prune' do linkgit:git-remote[1] para uma maneira de limpar todas "
+"as ramifica챌천es de rastreamento remoto obsoletas."
#. type: Labeled list
#: en/git-branch.txt:85 en/git-clean.txt:28 en/git-cvsexportcommit.txt:49
@@ -11949,14 +11888,14 @@ msgstr ""
#: en/git-ls-files.txt:39 en/git-ls-tree.txt:41 en/git-push.txt:181
#: en/git-repack.txt:60 en/git-replace.txt:65 en/git-show-ref.txt:47
#: en/git-symbolic-ref.txt:35 en/git-tag.txt:76
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-d"
msgstr "-d"
#. type: Labeled list
#: en/git-branch.txt:86 en/git-push.txt:182 en/git-replace.txt:66
#: en/git-symbolic-ref.txt:36 en/git-tag.txt:77
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--delete"
msgstr "--delete"
@@ -11967,8 +11906,8 @@ msgid ""
"in `HEAD` if no upstream was set with `--track` or `--set-upstream-to`."
msgstr ""
"Exclua uma ramifica챌찾o. A ramifica챌찾o deve ser totalmente integrada em sua "
-"ramifica챌찾o upstream, ou em `HEAD` se n찾o houver upstream configurado com` "
-"--track` ou `--set-upstream-to`."
+"ramifica챌찾o upstream, ou em `HEAD` se n찾o houver upstream configurado com` --"
+"track` ou `--set-upstream-to`."
#. type: Plain text
#: en/git-branch.txt:93
@@ -11977,20 +11916,20 @@ msgstr "Atalho para `--excluir--for챌a`."
#. type: Labeled list
#: en/git-branch.txt:94 en/git-tag.txt:183
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--create-reflog"
msgstr "--create-reflog"
#. type: Plain text
#: en/git-branch.txt:103
msgid ""
-"Create the branch's reflog. This activates recording of all changes made to"
-" the branch ref, enabling use of date based sha1 expressions such as "
-"\"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs"
-" are usually enabled by default by the `core.logAllRefUpdates` config "
-"option. The negated form `--no-create-reflog` only overrides an earlier "
-"`--create-reflog`, but currently does not negate the setting of "
-"`core.logAllRefUpdates`."
+"Create the branch's reflog. This activates recording of all changes made to "
+"the branch ref, enabling use of date based sha1 expressions such as "
+"\"<branchname>@\\{yesterday}\". Note that in non-bare repositories, reflogs "
+"are usually enabled by default by the `core.logAllRefUpdates` config "
+"option. The negated form `--no-create-reflog` only overrides an earlier `--"
+"create-reflog`, but currently does not negate the setting of `core."
+"logAllRefUpdates`."
msgstr ""
"Crie o reflogo da ramifica챌찾o. Isso ativa a grava챌찾o de todas as altera챌천es "
"feitas no ref da ramifica챌찾o, permitindo o uso de express천es sha1 baseadas "
@@ -12019,7 +11958,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:114
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--move"
msgstr "--move"
@@ -12041,7 +11980,7 @@ msgstr "Atalho para `--mover --for챌a`."
#. type: Labeled list
#: en/git-branch.txt:121
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--copy"
msgstr "--copy"
@@ -12082,7 +12021,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:138 en/git-for-each-ref.txt:95 en/git-grep.txt:113
#: en/git-tag.txt:124
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-case"
msgstr "--ignore-case"
@@ -12101,7 +12040,7 @@ msgstr "--coluna[=<op챌천es>]"
#. type: Labeled list
#: en/git-branch.txt:142 en/git-status.txt:127 en/git-tag.txt:128
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-column"
msgstr "--no-column"
@@ -12123,7 +12062,7 @@ msgstr "Esta op챌찾o 챕 aplic찼vel apenas no modo n찾o detalhado."
#. type: Labeled list
#: en/git-branch.txt:150 en/git-show-branch.txt:44
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--remotes"
msgstr "--remotes"
@@ -12140,8 +12079,8 @@ msgstr "Listar filiais de rastreamento remoto e filiais locais."
#. type: Plain text
#: en/git-branch.txt:162
msgid ""
-"List branches. With optional `<pattern>...`, e.g. `git branch --list "
-"'maint-*'`, list only the branches that match the pattern(s)."
+"List branches. With optional `<pattern>...`, e.g. `git branch --list 'maint-"
+"*'`, list only the branches that match the pattern(s)."
msgstr ""
"Listar branches. Com o opcional `<pattern> ...`, por ex. `git branch --list "
"'maint - *'`, lista apenas as ramifica챌천es que correspondem ao(s) "
@@ -12149,7 +12088,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:164
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-vv"
msgstr "-vv"
@@ -12161,8 +12100,8 @@ msgid ""
"name of the upstream branch, as well (see also `git remote show <remote>`)."
msgstr ""
"Quando estiver no modo de lista, mostre sha1 e submeta a linha de assunto "
-"para cada cabe챌alho, junto com o relacionamento com a ramifica챌찾o upstream ("
-"se houver). Se dado duas vezes, imprima o nome da ramifica챌찾o upstream, "
+"para cada cabe챌alho, junto com o relacionamento com a ramifica챌찾o upstream "
+"(se houver). Se dado duas vezes, imprima o nome da ramifica챌찾o upstream, "
"tamb챕m (veja tamb챕m `git remote show <remote>`)."
#. type: Plain text
@@ -12187,12 +12126,12 @@ msgid ""
"value is 7 and can be overridden by the `core.abbrev` config option."
msgstr ""
"Altere o comprimento de exibi챌찾o m챠nimo do sha1 na listagem de sa챠da. O "
-"valor padr찾o 챕 7 e pode ser sobrescrito pela op챌찾o de configura챌찾o "
-"`core.abbrev`."
+"valor padr찾o 챕 7 e pode ser sobrescrito pela op챌찾o de configura챌찾o `core."
+"abbrev`."
#. type: Labeled list
#: en/git-branch.txt:182
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-abbrev"
msgstr "--no-abbrev"
@@ -12204,22 +12143,22 @@ msgstr "Exibe os sha1s completos na listagem de sa챠da, em vez de abrevi찼-los."
#. type: Labeled list
#: en/git-branch.txt:186 en/git-checkout.txt:167
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--track"
msgstr "--track"
#. type: Plain text
#: en/git-branch.txt:194
msgid ""
-"When creating a new branch, set up `branch.<name>.remote` and "
-"`branch.<name>.merge` configuration entries to mark the start-point branch "
-"as \"upstream\" from the new branch. This configuration will tell git to "
-"show the relationship between the two branches in `git status` and `git "
-"branch -v`. Furthermore, it directs `git pull` without arguments to pull "
-"from the upstream when the new branch is checked out."
+"When creating a new branch, set up `branch.<name>.remote` and `branch.<name>."
+"merge` configuration entries to mark the start-point branch as \"upstream\" "
+"from the new branch. This configuration will tell git to show the "
+"relationship between the two branches in `git status` and `git branch -v`. "
+"Furthermore, it directs `git pull` without arguments to pull from the "
+"upstream when the new branch is checked out."
msgstr ""
-"Ao criar uma nova ramifica챌찾o, configure as entradas de configura챌찾o `"
-"branch. <Name> .remote` e` branch. <Name> .merge` para marcar a ramifica챌찾o "
+"Ao criar uma nova ramifica챌찾o, configure as entradas de configura챌찾o "
+"`branch. <Name> .remote` e` branch. <Name> .merge` para marcar a ramifica챌찾o "
"do ponto inicial como \"upstream\" da nova ramifica챌찾o. Esta configura챌찾o "
"ir찼 dizer ao git para mostrar a rela챌찾o entre as duas ramifica챌천es em `git "
"status` e` git branch -v`. Al챕m disso, ele direciona `git pull` sem "
@@ -12230,20 +12169,20 @@ msgstr ""
msgid ""
"This behavior is the default when the start point is a remote-tracking "
"branch. Set the branch.autoSetupMerge configuration variable to `false` if "
-"you want `git checkout` and `git branch` to always behave as if `--no-track`"
-" were given. Set it to `always` if you want this behavior when the start-"
+"you want `git checkout` and `git branch` to always behave as if `--no-track` "
+"were given. Set it to `always` if you want this behavior when the start-"
"point is either a local or remote-tracking branch."
msgstr ""
"Esse comportamento 챕 o padr찾o quando o ponto inicial 챕 um ramo de "
-"rastreamento remoto. Configure a vari찼vel de configura챌찾o "
-"branch.autoSetupMerge para `false` se voc챗 quiser que` git checkout` e `git "
-"branch` sempre se comporte como se` --no-track` fosse dado. Defina-o como "
-"`sempre` se voc챗 quiser esse comportamento quando o ponto de partida for um "
-"ramo local ou de rastreamento remoto."
+"rastreamento remoto. Configure a vari찼vel de configura챌찾o branch."
+"autoSetupMerge para `false` se voc챗 quiser que` git checkout` e `git branch` "
+"sempre se comporte como se` --no-track` fosse dado. Defina-o como `sempre` "
+"se voc챗 quiser esse comportamento quando o ponto de partida for um ramo "
+"local ou de rastreamento remoto."
#. type: Labeled list
#: en/git-branch.txt:201 en/git-checkout.txt:181
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-track"
msgstr "--no-track"
@@ -12253,12 +12192,12 @@ msgid ""
"Do not set up \"upstream\" configuration, even if the branch.autoSetupMerge "
"configuration variable is true."
msgstr ""
-"N찾o configure \"upstream\", mesmo que a vari찼vel de configura챌찾o "
-"branch.autoSetupMerge seja verdadeira."
+"N찾o configure \"upstream\", mesmo que a vari찼vel de configura챌찾o branch."
+"autoSetupMerge seja verdadeira."
#. type: Labeled list
#: en/git-branch.txt:205 en/git-push.txt:349
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--set-upstream"
msgstr "--set-upstream"
@@ -12296,7 +12235,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:215
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--unset-upstream"
msgstr "--unset-upstream"
@@ -12311,7 +12250,7 @@ msgstr ""
#. type: Labeled list
#: en/git-branch.txt:219
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--edit-description"
msgstr "--edit-description"
@@ -12323,8 +12262,8 @@ msgid ""
"`merge` (if enabled)). Multi-line explanations may be used."
msgstr ""
"Abra um editor e edite o texto para explicar para que serve o ramo, para ser "
-"usado por v찼rios outros comandos (por exemplo, `format-patch`,` request-pull`"
-" e `merge` (se ativado)). Explica챌천es de v찼rias linhas podem ser usadas."
+"usado por v찼rios outros comandos (por exemplo, `format-patch`,` request-"
+"pull` e `merge` (se ativado)). Explica챌천es de v찼rias linhas podem ser usadas."
#. type: Labeled list
#: en/git-branch.txt:225 en/git-tag.txt:135
@@ -12398,11 +12337,11 @@ msgstr "<branchnome>"
#: en/git-branch.txt:248
msgid ""
"The name of the branch to create or delete. The new branch name must pass "
-"all checks defined by linkgit:git-check-ref-format[1]. Some of these checks"
-" may restrict the characters allowed in a branch name."
+"all checks defined by linkgit:git-check-ref-format[1]. Some of these checks "
+"may restrict the characters allowed in a branch name."
msgstr ""
"O nome do ramo a criar ou eliminar. O novo nome da ramifica챌찾o deve passar "
-"por todas as verifica챌천es definidas pelo linkgit: git-check-ref-format[1]. "
+"por todas as verifica챌천es definidas pelo linkgit:git-check-ref-format[1]. "
"Algumas dessas verifica챌천es podem restringir os caracteres permitidos em um "
"nome de ramifica챌찾o."
@@ -12460,8 +12399,8 @@ msgstr "--ordenar=<chave>"
#: en/git-branch.txt:271
msgid ""
"Sort based on the key given. Prefix `-` to sort in descending order of the "
-"value. You may use the --sort=<key> option multiple times, in which case the"
-" last key becomes the primary key. The keys supported are the same as those "
+"value. You may use the --sort=<key> option multiple times, in which case the "
+"last key becomes the primary key. The keys supported are the same as those "
"in `git for-each-ref`. Sort order defaults to the value configured for the "
"`branch.sort` variable if exists, or to sorting based on the full refname "
"(including `refs/...` prefix). This lists detached HEAD (if present) first, "
@@ -12472,8 +12411,8 @@ msgstr ""
"ordem decrescente do valor. Voc챗 pode usar a op챌찾o --ordenar = <chave> "
"v찼rias vezes, em cujo caso a 첬ltima chave se torna a chave prim찼ria. As "
"chaves suportadas s찾o as mesmas do `git para-cada-ref`. A ordem de "
-"classifica챌찾o 챕 padronizada para o valor configurado para a vari찼vel "
-"branch.sort, se existir, ou para a classifica챌찾o baseada no refnome completo "
+"classifica챌찾o 챕 padronizada para o valor configurado para a vari찼vel branch."
+"sort, se existir, ou para a classifica챌찾o baseada no refnome completo "
"(incluindo o prefixo `refs/...`). Isso lista HEAD separado (se presente) "
"primeiro, depois as ramifica챌천es locais e, finalmente, as ramifica챌천es de "
"rastreamento remoto. Veja linkgit:git-config[1]."
@@ -12514,8 +12453,8 @@ msgid ""
"config[1]."
msgstr ""
"`pager.branch` s처 챕 respeitado quando se listam ramifica챌천es, ou seja, "
-"quando` --list` 챕 usado ou impl챠cito. O padr찾o 챕 usar um pager. Veja linkgit"
-":git-config[1]."
+"quando` --list` 챕 usado ou impl챠cito. O padr찾o 챕 usar um pager. Veja linkgit:"
+"git-config[1]."
#. type: Labeled list
#: en/git-branch.txt:290
@@ -12539,8 +12478,8 @@ msgid ""
"This step and the next one could be combined into a single step with "
"\"checkout -b my2.6.14 v2.6.14\"."
msgstr ""
-"Esta etapa e a pr처xima poderiam ser combinadas em uma 첬nica etapa com \""
-"checkout -b my2.6.14 v2.6.14\"."
+"Esta etapa e a pr처xima poderiam ser combinadas em uma 첬nica etapa com "
+"\"checkout -b my2.6.14 v2.6.14\"."
#. type: Labeled list
#: en/git-branch.txt:302
@@ -12561,9 +12500,9 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:314
msgid ""
-"Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next"
-" 'fetch' or 'pull' will create them again unless you configure them not to."
-" See linkgit:git-fetch[1]."
+"Delete the remote-tracking branches \"todo\", \"html\" and \"man\". The next "
+"'fetch' or 'pull' will create them again unless you configure them not to. "
+"See linkgit:git-fetch[1]."
msgstr ""
"Exclua os ramos de rastreamento remoto \"todo\", \"html\" e \"man\". A "
"pr처xima 'fetch' ou 'pull' ir찼 cri찼-los novamente, a menos que voc챗 os "
@@ -12640,8 +12579,8 @@ msgstr ""
#. type: Plain text
#: en/git-branch.txt:340
msgid ""
-"`--no-merged` is used to find branches which are candidates for merging into"
-" HEAD, since those branches are not fully contained by HEAD."
+"`--no-merged` is used to find branches which are candidates for merging into "
+"HEAD, since those branches are not fully contained by HEAD."
msgstr ""
"`--n찾o-merged` 챕 usado para encontrar ramifica챌천es candidatas a serem "
"mescladas no HEAD, uma vez que essas ramifica챌천es n찾o s찾o totalmente "
@@ -12654,13 +12593,13 @@ msgid ""
"remote[1], link:user-manual.html#what-is-a-branch[``Understanding history: "
"What is a branch?''] in the Git User's Manual."
msgstr ""
-"linkgit:git-check-ref-formato[1], linkgit: git-busca[1], linkgit:git-"
+"linkgit:git-check-ref-formato[1], linkgit:git-busca[1], linkgit:git-"
"remoto[1], link: usu찼rio-manual.html#que-챕-uma-branch[`` Compreens찾o "
"hist처ria: O que 챕 um branch? ''] no Manual do Usu찼rio do Git."
#. type: Title =
#: en/git-bundle.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-bundle(1)"
msgstr "git-bundle(1)"
@@ -12700,8 +12639,8 @@ msgid ""
msgstr ""
"Alguns fluxos de trabalho exigem que um ou mais ramos de desenvolvimento em "
"uma m찼quina sejam replicados em outra m찼quina, mas as duas m찼quinas n찾o "
-"podem ser conectadas diretamente e, portanto, os protocolos Git interativos ("
-"git, ssh, http) n찾o podem ser usados. Este comando fornece suporte para "
+"podem ser conectadas diretamente e, portanto, os protocolos Git interativos "
+"(git, ssh, http) n찾o podem ser usados. Este comando fornece suporte para "
"'git fetch' e 'git pull' para operar empacotando objetos e refer챗ncias em um "
"arquivo na m찼quina de origem, importando-os em outro reposit처rio usando 'git "
"fetch' e 'git pull' ap처s mover o arquivo por alguns meios (por exemplo, por "
@@ -12719,8 +12658,8 @@ msgstr "criar <arquivo>"
#. type: Plain text
#: en/git-bundle.txt:39
msgid ""
-"Used to create a bundle named 'file'. This requires the 'git-rev-list-args'"
-" arguments to define the bundle contents."
+"Used to create a bundle named 'file'. This requires the 'git-rev-list-args' "
+"arguments to define the bundle contents."
msgstr ""
"Usado para criar um pacote denominado 'file'. Isso requer argumentos 'git-"
"rev-list-args' para definir o conte첬do do pacote."
@@ -12736,8 +12675,8 @@ msgstr "verificar <arquivo>"
msgid ""
"Used to check that a bundle file is valid and will apply cleanly to the "
"current repository. This includes checks on the bundle format itself as "
-"well as checking that the prerequisite commits exist and are fully linked in"
-" the current repository. 'git bundle' prints a list of missing commits, if "
+"well as checking that the prerequisite commits exist and are fully linked in "
+"the current repository. 'git bundle' prints a list of missing commits, if "
"any, and exits with a non-zero status."
msgstr ""
"Usado para verificar se um arquivo de pacote 챕 v찼lido e ser찼 aplicado "
@@ -12774,8 +12713,8 @@ msgstr "unbundle <arquivo>"
msgid ""
"Passes the objects in the bundle to 'git index-pack' for storage in the "
"repository, then prints the names of all defined references. If a list of "
-"references is given, only references matching those in the list are printed."
-" This command is really plumbing, intended to be called only by 'git fetch'."
+"references is given, only references matching those in the list are printed. "
+"This command is really plumbing, intended to be called only by 'git fetch'."
msgstr ""
"Passa os objetos no pacote para 'git index-pack' para armazenamento no "
"reposit처rio, depois imprime os nomes de todas as refer챗ncias definidas. Se "
@@ -12793,11 +12732,11 @@ msgstr ""
#: en/git-bundle.txt:69
msgid ""
"A list of arguments, acceptable to 'git rev-parse' and 'git rev-list' (and "
-"containing a named ref, see SPECIFYING REFERENCES below), that specifies the"
-" specific objects and references to transport. For example, "
-"`master~10..master` causes the current master reference to be packaged along"
-" with all objects added since its 10th ancestor commit. There is no "
-"explicit limit to the number of references and objects that may be packaged."
+"containing a named ref, see SPECIFYING REFERENCES below), that specifies the "
+"specific objects and references to transport. For example, `master~10.."
+"master` causes the current master reference to be packaged along with all "
+"objects added since its 10th ancestor commit. There is no explicit limit to "
+"the number of references and objects that may be packaged."
msgstr ""
"Uma lista de argumentos, aceit찼vel para 'git rev-parse' e 'git rev-list' (e "
"contendo um ref nomeado, consulte ESPECIFICANDO REFERENCIAS abaixo), que "
@@ -12837,20 +12776,20 @@ msgstr "ESPECIFICANDO REFER횎NCIAS"
msgid ""
"'git bundle' will only package references that are shown by 'git show-ref': "
"this includes heads, tags, and remote heads. References such as `master~1` "
-"cannot be packaged, but are perfectly suitable for defining the basis. More"
-" than one reference may be packaged, and more than one basis can be "
-"specified. The objects packaged are those not contained in the union of the"
-" given bases. Each basis can be specified explicitly (e.g. `^master~10`), "
-"or implicitly (e.g. `master~10..master`, `--since=10.days.ago master`)."
+"cannot be packaged, but are perfectly suitable for defining the basis. More "
+"than one reference may be packaged, and more than one basis can be "
+"specified. The objects packaged are those not contained in the union of the "
+"given bases. Each basis can be specified explicitly (e.g. `^master~10`), or "
+"implicitly (e.g. `master~10..master`, `--since=10.days.ago master`)."
msgstr ""
"O 'git bundle' s처 ir찼 empacotar refer챗ncias mostradas por 'git mostra-ref': "
"isso inclui cabe챌alhos, tags e cabe챌as remotas. Refer챗ncias como `master~1` "
"n찾o podem ser empacotadas, mas s찾o perfeitamente adequadas para definir a "
"base. Mais de uma refer챗ncia pode ser empacotada e mais de uma base pode "
"ser especificada. Os objetos empacotados s찾o aqueles que n찾o est찾o contidos "
-"na uni찾o das bases dadas. Cada base pode ser especificada explicitamente ("
-"por exemplo, `^master~10`) ou implicitamente (por exemplo,`mestre~10..master`"
-", `--segmento=10.dias.atr찼s master`)."
+"na uni찾o das bases dadas. Cada base pode ser especificada explicitamente "
+"(por exemplo, `^master~10`) ou implicitamente (por exemplo,`mestre~10.."
+"master`, `--segmento=10.dias.atr찼s master`)."
#. type: Plain text
#: en/git-bundle.txt:94
@@ -12868,9 +12807,9 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:103
msgid ""
-"Assume you want to transfer the history from a repository R1 on machine A to"
-" another repository R2 on machine B. For whatever reason, direct connection"
-" between A and B is not allowed, but we can move data from A to B via some "
+"Assume you want to transfer the history from a repository R1 on machine A to "
+"another repository R2 on machine B. For whatever reason, direct connection "
+"between A and B is not allowed, but we can move data from A to B via some "
"mechanism (CD, email, etc.). We want to update R2 with development made on "
"the branch master in R1."
msgstr ""
@@ -12925,9 +12864,9 @@ msgstr "m찼quinaB$ git clone -b master /home/me/tmp/arquivo.bundle R2\n"
#. type: Plain text
#: en/git-bundle.txt:126
msgid ""
-"This will define a remote called \"origin\" in the resulting repository that"
-" lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 "
-"will have an entry like this:"
+"This will define a remote called \"origin\" in the resulting repository that "
+"lets you fetch and pull from the bundle. The $GIT_DIR/config file in R2 will "
+"have an entry like this:"
msgstr ""
"Isso definir찼 um controle remoto chamado \"origem\" no reposit처rio "
"resultante, que permite buscar e extrair do pacote. O arquivo $GIT_DIR/"
@@ -12977,8 +12916,8 @@ msgstr ""
#. type: Plain text
#: en/git-bundle.txt:148
msgid ""
-"You then transfer the bundle to the other machine to replace "
-"/home/me/tmp/file.bundle, and pull from it."
+"You then transfer the bundle to the other machine to replace /home/me/tmp/"
+"file.bundle, and pull from it."
msgstr ""
"Em seguida, voc챗 transfere o pacote para a outra m찼quina para substituir /"
"home/me/tmp/file.bundle e extrai dele."
@@ -13046,8 +12985,8 @@ msgstr "$ git criar pacote meu-pacote - 10 master\n"
#. type: Plain text
#: en/git-bundle.txt:181
msgid ""
-"You can run `git-bundle verify` to see if you can extract from a bundle that"
-" was created with a basis:"
+"You can run `git-bundle verify` to see if you can extract from a bundle that "
+"was created with a basis:"
msgstr ""
"Voc챗 pode executar o `git-verificar pacote` para ver se voc챗 pode extrair de "
"um pacote que foi criado com base:"
@@ -13097,7 +13036,7 @@ msgstr "$ git ls-remoto meu-pacote\n"
#. type: Title =
#: en/git-cat-file.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-cat-file(1)"
msgstr "git-cat-file(1)"
@@ -13121,24 +13060,24 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:21
msgid ""
-"In its first form, the command provides the content or the type of an object"
-" in the repository. The type is required unless `-t` or `-p` is used to find"
-" the object type, or `-s` is used to find the object size, or `--textconv` "
-"or `--filters` is used (which imply type \"blob\")."
+"In its first form, the command provides the content or the type of an object "
+"in the repository. The type is required unless `-t` or `-p` is used to find "
+"the object type, or `-s` is used to find the object size, or `--textconv` or "
+"`--filters` is used (which imply type \"blob\")."
msgstr ""
"Em sua primeira forma, o comando fornece o conte첬do ou o tipo de um objeto "
"no reposit처rio. O tipo 챕 requerido a menos que `-t` ou` -p` seja usado para "
"encontrar o tipo de objeto, ou `-s` seja usado para encontrar o tamanho do "
-"objeto, ou` --textconv` ou `--filters` seja usado (que implicam tipo \"blob\""
-")."
+"objeto, ou` --textconv` ou `--filters` seja usado (que implicam tipo \"blob"
+"\")."
#. type: Plain text
#: en/git-cat-file.txt:28
msgid ""
"In the second form, a list of objects (separated by linefeeds) is provided "
-"on stdin, and the SHA-1, type, and size of each object is printed on stdout."
-" The output format can be overridden using the optional `<format>` argument."
-" If either `--textconv` or `--filters` was specified, the input is expected "
+"on stdin, and the SHA-1, type, and size of each object is printed on stdout. "
+"The output format can be overridden using the optional `<format>` argument. "
+"If either `--textconv` or `--filters` was specified, the input is expected "
"to list the object names followed by the path name, separated by a single "
"whitespace, so that the appropriate drivers can be determined."
msgstr ""
@@ -13160,8 +13099,8 @@ msgstr "<objeto>"
#: en/git-cat-file.txt:35
msgid ""
"The name of the object to show. For a more complete list of ways to spell "
-"object names, see the \"SPECIFYING REVISIONS\" section in "
-"linkgit:gitrevisions[7]."
+"object names, see the \"SPECIFYING REVISIONS\" section in linkgit:"
+"gitrevisions[7]."
msgstr ""
"O nome do objeto a ser mostrado. Para uma lista mais completa de maneiras de "
"soletrar nomes de objetos, veja a se챌찾o \"ESPECIFICANDO REVIS횛ES\" em "
@@ -13203,8 +13142,8 @@ msgstr "<tipo>"
#: en/git-cat-file.txt:59
msgid ""
"Typically this matches the real type of <object> but asking for a type that "
-"can trivially be dereferenced from the given <object> is also permitted. An"
-" example is to ask for a \"tree\" with <object> being a commit object that "
+"can trivially be dereferenced from the given <object> is also permitted. An "
+"example is to ask for a \"tree\" with <object> being a commit object that "
"contains it, or to ask for a \"blob\" with <object> being a tag object that "
"points at it."
msgstr ""
@@ -13217,8 +13156,8 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:65
msgid ""
-"Show the content as transformed by a textconv filter. In this case, <object>"
-" has to be of the form <tree-ish>:<path>, or :<path> in order to apply the "
+"Show the content as transformed by a textconv filter. In this case, <object> "
+"has to be of the form <tree-ish>:<path>, or :<path> in order to apply the "
"filter to the content recorded in the index at <path>."
msgstr ""
"Mostrar o conte첬do como transformado por um filtro textconv. Nesse caso, "
@@ -13227,7 +13166,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:66
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--filters"
msgstr "--filters"
@@ -13236,8 +13175,8 @@ msgstr "--filters"
msgid ""
"Show the content as converted by the filters configured in the current "
"working tree for the given <path> (i.e. smudge filters, end-of-line "
-"conversion, etc). In this case, <object> has to be of the form <tree-"
-"ish>:<path>, or :<path>."
+"conversion, etc). In this case, <object> has to be of the form <tree-ish>:"
+"<path>, or :<path>."
msgstr ""
"Mostrar o conte첬do como convertido pelos filtros configurados na 찼rvore de "
"trabalho atual para o <path> fornecido (por exemplo, filtros de manchas, "
@@ -13253,9 +13192,9 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:76
msgid ""
-"For use with --textconv or --filters, to allow specifying an object name and"
-" a path separately, e.g. when it is difficult to figure out the revision "
-"from which the blob came."
+"For use with --textconv or --filters, to allow specifying an object name and "
+"a path separately, e.g. when it is difficult to figure out the revision from "
+"which the blob came."
msgstr ""
"Para uso com --textconv ou --filters, para permitir a especifica챌찾o de um "
"nome de objeto e um caminho separadamente, por ex. quando 챕 dif챠cil "
@@ -13263,7 +13202,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:77 en/git-mktree.txt:32
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--batch"
msgstr "--batch"
@@ -13278,8 +13217,8 @@ msgstr "--batch=<formato>"
msgid ""
"Print object information and contents for each object provided on stdin. "
"May not be combined with any other options or arguments except `--textconv` "
-"or `--filters`, in which case the input lines also need to specify the path,"
-" separated by whitespace. See the section `BATCH OUTPUT` below for details."
+"or `--filters`, in which case the input lines also need to specify the path, "
+"separated by whitespace. See the section `BATCH OUTPUT` below for details."
msgstr ""
"Imprima informa챌천es sobre o objeto e o conte첬do de cada objeto fornecido no "
"stdin. N찾o pode ser combinado com quaisquer outras op챌천es ou argumentos, "
@@ -13289,7 +13228,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:85
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--batch-check"
msgstr "--batch-check"
@@ -13303,19 +13242,19 @@ msgstr "--batch-check=<formato>"
#: en/git-cat-file.txt:92
msgid ""
"Print object information for each object provided on stdin. May not be "
-"combined with any other options or arguments except `--textconv` or "
-"`--filters`, in which case the input lines also need to specify the path, "
+"combined with any other options or arguments except `--textconv` or `--"
+"filters`, in which case the input lines also need to specify the path, "
"separated by whitespace. See the section `BATCH OUTPUT` below for details."
msgstr ""
"Imprime as informa챌천es do objeto para cada objeto fornecido no stdin. N찾o "
-"pode ser combinado com quaisquer outras op챌천es ou argumentos, exceto "
-"`--textconv` ou` --filters`, caso em que as linhas de entrada tamb챕m "
-"precisam especificar o caminho, separadas por espa챌o em branco. Veja a se챌찾o "
-"`BATCH OUTPUT` abaixo para detalhes."
+"pode ser combinado com quaisquer outras op챌천es ou argumentos, exceto `--"
+"textconv` ou` --filters`, caso em que as linhas de entrada tamb챕m precisam "
+"especificar o caminho, separadas por espa챌o em branco. Veja a se챌찾o `BATCH "
+"OUTPUT` abaixo para detalhes."
#. type: Labeled list
#: en/git-cat-file.txt:93
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--batch-all-objects"
msgstr "--batch-all-objects"
@@ -13325,8 +13264,7 @@ msgid ""
"Instead of reading a list of objects on stdin, perform the requested batch "
"operation on all objects in the repository and any alternate object stores "
"(not just reachable objects). Requires `--batch` or `--batch-check` be "
-"specified. Note that the objects are visited in order sorted by their "
-"hashes."
+"specified. Note that the objects are visited in order sorted by their hashes."
msgstr ""
"Em vez de ler uma lista de objetos no stdin, execute a opera챌찾o em lote "
"solicitada em todos os objetos no reposit처rio e em quaisquer armazenamentos "
@@ -13336,7 +13274,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:100
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--buffer"
msgstr "--buffer"
@@ -13355,19 +13293,19 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:107
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--unordered"
msgstr "--unordered"
#. type: Plain text
#: en/git-cat-file.txt:116
msgid ""
-"When `--batch-all-objects` is in use, visit objects in an order which may be"
-" more efficient for accessing the object contents than hash order. The exact"
-" details of the order are unspecified, but if you do not require a specific "
-"order, this should generally result in faster output, especially with "
-"`--batch`. Note that `cat-file` will still show each object only once, even"
-" if it is stored multiple times in the repository."
+"When `--batch-all-objects` is in use, visit objects in an order which may be "
+"more efficient for accessing the object contents than hash order. The exact "
+"details of the order are unspecified, but if you do not require a specific "
+"order, this should generally result in faster output, especially with `--"
+"batch`. Note that `cat-file` will still show each object only once, even if "
+"it is stored multiple times in the repository."
msgstr ""
"Quando `--batch-all-objects` estiver em uso, visite objetos em uma ordem que "
"pode ser mais eficiente para acessar o conte첬do do objeto do que a ordem "
@@ -13379,7 +13317,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:117
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--allow-unknown-type"
msgstr "--allow-unknown-type"
@@ -13392,7 +13330,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:120
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--follow-symlinks"
msgstr "--follow-symlinks"
@@ -13400,11 +13338,11 @@ msgstr "--follow-symlinks"
#: en/git-cat-file.txt:129
msgid ""
"With --batch or --batch-check, follow symlinks inside the repository when "
-"requesting objects with extended SHA-1 expressions of the form tree-"
-"ish:path-in-tree. Instead of providing output about the link itself, "
-"provide output about the linked-to object. If a symlink points outside the "
-"tree-ish (e.g. a link to /foo or a root-level link to ../foo), the portion "
-"of the link which is outside the tree will be printed."
+"requesting objects with extended SHA-1 expressions of the form tree-ish:path-"
+"in-tree. Instead of providing output about the link itself, provide output "
+"about the linked-to object. If a symlink points outside the tree-ish (e.g. "
+"a link to /foo or a root-level link to ../foo), the portion of the link "
+"which is outside the tree will be printed."
msgstr ""
"Com --batch ou --batch-check, siga os links simb처licos dentro do reposit처rio "
"ao solicitar objetos com express천es SHA-1 estendidas do formul찼rio tree-ish: "
@@ -13430,8 +13368,8 @@ msgid ""
"This option cannot (currently) be used unless `--batch` or `--batch-check` "
"is used."
msgstr ""
-"Esta op챌찾o n찾o pode (atualmente) ser usada, a menos que `--batch` ou` "
-"--batch-check` seja usado."
+"Esta op챌찾o n찾o pode (atualmente) ser usada, a menos que `--batch` ou` --"
+"batch-check` seja usado."
#. type: Plain text
#: en/git-cat-file.txt:138
@@ -13566,22 +13504,22 @@ msgstr "SA횒DA DO LOTE"
#: en/git-cat-file.txt:196
msgid ""
"If `--batch` or `--batch-check` is given, `cat-file` will read objects from "
-"stdin, one per line, and print information about them. By default, the whole"
-" line is considered as an object, as if it were fed to linkgit:git-rev-"
+"stdin, one per line, and print information about them. By default, the whole "
+"line is considered as an object, as if it were fed to linkgit:git-rev-"
"parse[1]."
msgstr ""
"Se `--batch` ou` --batch-check` for fornecido, o `cat-file` ler찼 objetos de "
"stdin, um por linha, e imprimir찼 informa챌천es sobre eles. Por padr찾o, a linha "
-"inteira 챕 considerada como um objeto, como se fosse alimentada para linkgit"
-":git-rev-parse[1]."
+"inteira 챕 considerada como um objeto, como se fosse alimentada para linkgit:"
+"git-rev-parse[1]."
#. type: Plain text
#: en/git-cat-file.txt:201
msgid ""
"You can specify the information shown for each object by using a custom "
"`<format>`. The `<format>` is copied literally to stdout for each object, "
-"with placeholders of the form `%(atom)` expanded, followed by a newline. The"
-" available atoms are:"
+"with placeholders of the form `%(atom)` expanded, followed by a newline. The "
+"available atoms are:"
msgstr ""
"Voc챗 pode especificar as informa챌천es mostradas para cada objeto usando um "
"`<formato>` personalizado. O `<formato>` 챕 copiado literalmente para stdout "
@@ -13590,7 +13528,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:202
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`objectname`"
msgstr "`objectname`"
@@ -13601,7 +13539,7 @@ msgstr "O nome do objeto com 40 hexadecimais do objeto."
#. type: Labeled list
#: en/git-cat-file.txt:205
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`objecttype`"
msgstr "`objecttype`"
@@ -13612,7 +13550,7 @@ msgstr "O tipo do objeto (o mesmo que os relat처rios `cat-file -t`)."
#. type: Labeled list
#: en/git-cat-file.txt:208
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`objectsize`"
msgstr "`objectsize`"
@@ -13639,7 +13577,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:216
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`deltabase`"
msgstr "`deltabase`"
@@ -13656,7 +13594,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cat-file.txt:221
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`rest`"
msgstr "`rest`"
@@ -13666,8 +13604,8 @@ msgid ""
"If this atom is used in the output string, input lines are split at the "
"first whitespace boundary. All characters before that whitespace are "
"considered to be the object name; characters after that first run of "
-"whitespace (i.e., the \"rest\" of the line) are output in place of the "
-"`%(rest)` atom."
+"whitespace (i.e., the \"rest\" of the line) are output in place of the `"
+"%(rest)` atom."
msgstr ""
"Se esse 찼tomo for usado na sequ챗ncia de sa챠da, as linhas de entrada ser찾o "
"divididas no primeiro limite de espa챌o em branco. Todos os caracteres antes "
@@ -13757,8 +13695,8 @@ msgstr "<objeto> SP amb챠guo LF\n"
#. type: Plain text
#: en/git-cat-file.txt:264
msgid ""
-"If --follow-symlinks is used, and a symlink in the repository points outside"
-" the repository, then `cat-file` will ignore any custom format and print:"
+"If --follow-symlinks is used, and a symlink in the repository points outside "
+"the repository, then `cat-file` will ignore any custom format and print:"
msgstr ""
"Se --siga-links-simb처licos for usado, e um link-simb처lico no reposit처rio "
"apontar para fora do reposit처rio, ent찾o o `cat-file` ir찼 ignorar qualquer "
@@ -13777,8 +13715,8 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:273
msgid ""
-"The symlink will either be absolute (beginning with a /), or relative to the"
-" tree root. For instance, if dir/link points to ../../foo, then <symlink> "
+"The symlink will either be absolute (beginning with a /), or relative to the "
+"tree root. For instance, if dir/link points to ../../foo, then <symlink> "
"will be ../foo. <size> is the size of the symlink in bytes."
msgstr ""
"O link simb처lico ser찼 absoluto (come챌ando com a /) ou relativo 횪 raiz da "
@@ -13788,8 +13726,7 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:276
msgid ""
-"If --follow-symlinks is used, the following error messages will be "
-"displayed:"
+"If --follow-symlinks is used, the following error messages will be displayed:"
msgstr ""
"Se --seguir-links-simb처licos for usado, as seguintes mensagens de erro ser찾o "
"exibidas:"
@@ -13831,8 +13768,8 @@ msgstr ""
#. type: Plain text
#: en/git-cat-file.txt:295
msgid ""
-"is printed for symlink loops (or any symlinks that require more than 40 link"
-" resolutions to resolve)."
+"is printed for symlink loops (or any symlinks that require more than 40 link "
+"resolutions to resolve)."
msgstr ""
"챕 impresso para la챌os de links simb처licos (ou quaisquer links simb처licos que "
"exijam mais de 40 resolu챌천es de link para resolver)."
@@ -13883,8 +13820,8 @@ msgstr ""
#: en/git-cat-file.txt:316 en/git-for-each-ref.txt:382
msgid ""
"Note also that multiple copies of an object may be present in the object "
-"database; in this case, it is undefined which copy's size or delta base will"
-" be reported."
+"database; in this case, it is undefined which copy's size or delta base will "
+"be reported."
msgstr ""
"Observe tamb챕m que v찼rias c처pias de um objeto podem estar presentes no banco "
"de dados de objetos; neste caso, 챕 indefinido qual tamanho da c처pia ou base "
@@ -13892,7 +13829,7 @@ msgstr ""
#. type: Title =
#: en/git-check-attr.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-check-attr(1)"
msgstr "git-check-attr(1)"
@@ -13938,8 +13875,7 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:29
-msgid ""
-"Consider `.gitattributes` in the index only, ignoring the working tree."
+msgid "Consider `.gitattributes` in the index only, ignoring the working tree."
msgstr ""
"Considere `.gitattributos` apenas no 챠ndice, ignorando a 찼rvore de trabalho."
@@ -13950,7 +13886,7 @@ msgstr ""
#: en/git-http-fetch.txt:37 en/git-index-pack.txt:38 en/git-name-rev.txt:45
#: en/git-notes.txt:173 en/git-send-pack.txt:41 en/git-svn.txt:595
#: en/git-update-index.txt:148 en/rev-list-options.txt:205
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--stdin"
msgstr "--stdin"
@@ -13966,12 +13902,12 @@ msgstr ""
#. type: Plain text
#: en/git-check-attr.txt:38
msgid ""
-"The output format is modified to be machine-parseable. If `--stdin` is also"
-" given, input paths are separated with a NUL character instead of a linefeed"
-" character."
+"The output format is modified to be machine-parseable. If `--stdin` is also "
+"given, input paths are separated with a NUL character instead of a linefeed "
+"character."
msgstr ""
-"O formato de sa챠da 챕 modificado para ser analis찼vel por m찼quina. Se "
-"`--stdin` tamb챕m 챕 fornecido, os caminhos de entrada s찾o separados por um "
+"O formato de sa챠da 챕 modificado para ser analis찼vel por m찼quina. Se `--"
+"stdin` tamb챕m 챕 fornecido, os caminhos de entrada s찾o separados por um "
"caractere NUL em vez de um caractere de alimenta챌찾o de linha."
#. type: Plain text
@@ -14001,8 +13937,8 @@ msgstr "A sa챠da 챕 do formato: <caminho> COLON SP <atributo> COLON SP <info> LF
#. type: Plain text
#: en/git-check-attr.txt:55
msgid ""
-"unless `-z` is in effect, in which case NUL is used as delimiter: <path> NUL"
-" <attribute> NUL <info> NUL"
+"unless `-z` is in effect, in which case NUL is used as delimiter: <path> NUL "
+"<attribute> NUL <info> NUL"
msgstr ""
"a menos que `-z` esteja em vigor, caso em que NUL 챕 usado como delimitador: "
"<path> NUL <atributo> NUL <info> NUL"
@@ -14063,13 +13999,13 @@ msgstr "quando um valor foi atribu챠do ao atributo."
#. type: Plain text
#: en/git-check-attr.txt:69 en/git-check-ignore.txt:99
msgid ""
-"Buffering happens as documented under the `GIT_FLUSH` option in "
-"linkgit:git[1]. The caller is responsible for avoiding deadlocks caused by "
+"Buffering happens as documented under the `GIT_FLUSH` option in linkgit:"
+"git[1]. The caller is responsible for avoiding deadlocks caused by "
"overfilling an input buffer or reading from an empty output buffer."
msgstr ""
-"Buffering acontece conforme documentado sob a op챌찾o `GIT_FLUSH` em "
-"linkgit:git[1]. O chamador 챕 respons찼vel por evitar deadlocks causados pelo "
-"excesso de buffer de entrada ou pela leitura de um buffer de sa챠da vazio."
+"Buffering acontece conforme documentado sob a op챌찾o `GIT_FLUSH` em linkgit:"
+"git[1]. O chamador 챕 respons찼vel por evitar deadlocks causados pelo excesso "
+"de buffer de entrada ou pela leitura de um buffer de sa챠da vazio."
#. type: Plain text
#: en/git-check-attr.txt:74
@@ -14161,7 +14097,7 @@ msgstr "linkgit:gitatributos[5]."
#. type: Title =
#: en/git-check-ignore.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-check-ignore(1)"
msgstr "git-check-ignore(1)"
@@ -14195,8 +14131,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:25
msgid ""
-"By default, tracked files are not shown at all since they are not subject to"
-" exclude rules; but see `--no-index'."
+"By default, tracked files are not shown at all since they are not subject to "
+"exclude rules; but see `--no-index'."
msgstr ""
"Por padr찾o, os arquivos rastreados n찾o s찾o exibidos, pois n찾o est찾o sujeitos "
"a regras de exclus찾o. mas veja `--n찾o-챠ndice '."
@@ -14236,13 +14172,14 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:45
msgid ""
-"The output format is modified to be machine-parseable (see below). If "
-"`--stdin` is also given, input paths are separated with a NUL character "
-"instead of a linefeed character."
+"The output format is modified to be machine-parseable (see below). If `--"
+"stdin` is also given, input paths are separated with a NUL character instead "
+"of a linefeed character."
msgstr ""
-"O formato de sa챠da 챕 modificado para ser analis찼vel por m찼quina (veja abaixo)"
-". Se `--stdin` tamb챕m 챕 fornecido, os caminhos de entrada s찾o separados por "
-"um caractere NUL em vez de um caractere de alimenta챌찾o de linha."
+"O formato de sa챠da 챕 modificado para ser analis찼vel por m찼quina (veja "
+"abaixo). Se `--stdin` tamb챕m 챕 fornecido, os caminhos de entrada s찾o "
+"separados por um caractere NUL em vez de um caractere de alimenta챌찾o de "
+"linha."
#. type: Labeled list
#: en/git-check-ignore.txt:46
@@ -14253,8 +14190,8 @@ msgstr "-n, --n찾o-coincidindo"
#. type: Plain text
#: en/git-check-ignore.txt:51
msgid ""
-"Show given paths which don't match any pattern.\t This only makes sense when"
-" `--verbose` is enabled, otherwise it would not be possible to distinguish "
+"Show given paths which don't match any pattern.\t This only makes sense when "
+"`--verbose` is enabled, otherwise it would not be possible to distinguish "
"between paths which match a pattern and those which don't."
msgstr ""
"Mostrar paths que n찾o correspondem a nenhum padr찾o.\t Isto s처 faz sentido "
@@ -14264,7 +14201,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ignore.txt:52 en/git-grep.txt:79
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-index"
msgstr "--no-index"
@@ -14285,14 +14222,14 @@ msgstr ""
#. type: Plain text
#: en/git-check-ignore.txt:66
msgid ""
-"By default, any of the given pathnames which match an ignore pattern will be"
-" output, one per line. If no pattern matches a given path, nothing will be "
+"By default, any of the given pathnames which match an ignore pattern will be "
+"output, one per line. If no pattern matches a given path, nothing will be "
"output for that path; this means that path will not be ignored."
msgstr ""
"Por padr찾o, qualquer um dos nomes de caminho fornecidos que correspondem a "
"um padr찾o de ignorar ser찼 gerado, um por linha. Se nenhum padr찾o "
-"corresponder a um determinado caminho, nada ser찼 produzido para esse caminho;"
-" isso significa que o caminho n찾o ser찼 ignorado."
+"corresponder a um determinado caminho, nada ser찼 produzido para esse "
+"caminho; isso significa que o caminho n찾o ser찼 ignorado."
#. type: Plain text
#: en/git-check-ignore.txt:68
@@ -14314,9 +14251,9 @@ msgid ""
"pattern, <source> is the pattern's source file, and <linenum> is the line "
"number of the pattern within that source. If the pattern contained a `!` "
"prefix or `/` suffix, it will be preserved in the output. <source> will be "
-"an absolute path when referring to the file configured by "
-"`core.excludesFile`, or relative to the repository root when referring to "
-"`.git/info/exclude` or a per-directory exclude file."
+"an absolute path when referring to the file configured by `core."
+"excludesFile`, or relative to the repository root when referring to `.git/"
+"info/exclude` or a per-directory exclude file."
msgstr ""
"<pathnome> 챕 o path de um arquivo sendo consultado, <padronizar> 챕 o padr찾o "
"correspondente, <fonte> 챕 o arquivo de origem do padr찾o e <n첬mero-de-linha> "
@@ -14408,13 +14345,12 @@ msgstr "Um erro fatal foi encontrado."
#. type: Plain text
#: en/git-check-ignore.txt:117
-#, ignore-same
msgid "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
msgstr "linkgit:gitignore[5] linkgit:git-config[1] linkgit:git-ls-files[1]"
#. type: Title =
#: en/git-check-mailmap.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-check-mailmap(1)"
msgstr "git-check-mailmap(1)"
@@ -14466,14 +14402,15 @@ msgstr ""
#. type: Title =
#: en/git-checkout-index.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-checkout-index(1)"
msgstr "git-checkout-index(1)"
#. type: Plain text
#: en/git-checkout-index.txt:7
msgid "git-checkout-index - Copy files from the index to the working tree"
-msgstr "git-checkout-index - Copia arquivos do 챠ndice para a 찼rvore de trabalho"
+msgstr ""
+"git-checkout-index - Copia arquivos do 챠ndice para a 찼rvore de trabalho"
#. type: Plain text
#: en/git-checkout-index.txt:17
@@ -14492,8 +14429,8 @@ msgid ""
"Will copy all files listed from the index to the working directory (not "
"overwriting existing files)."
msgstr ""
-"Copiar찼 todos os arquivos listados do 챠ndice para o diret처rio de trabalho ("
-"n찾o sobrescrevendo arquivos existentes)."
+"Copiar찼 todos os arquivos listados do 챠ndice para o diret처rio de trabalho "
+"(n찾o sobrescrevendo arquivos existentes)."
#. type: Plain text
#: en/git-checkout-index.txt:29
@@ -14523,7 +14460,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:44
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-create"
msgstr "--no-create"
@@ -14568,7 +14505,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout-index.txt:57
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--temp"
msgstr "--temp"
@@ -14586,8 +14523,8 @@ msgstr ""
#: en/git-checkout-index.txt:66 en/git-update-index.txt:152
msgid ""
"Instead of taking list of paths from the command line, read list of paths "
-"from the standard input. Paths are separated by LF (i.e. one path per line)"
-" by default."
+"from the standard input. Paths are separated by LF (i.e. one path per line) "
+"by default."
msgstr ""
"Em vez de pegar a lista de caminhos da linha de comando, leia a lista de "
"caminhos da entrada padr찾o. Os paths s찾o separados por LF (ou seja, um "
@@ -14696,10 +14633,10 @@ msgstr ""
#. type: Plain text
#: en/git-checkout-index.txt:121
msgid ""
-"The first format is what gets used when `--stage` is omitted or is not "
-"`--stage=all`. The field tempname is the temporary file name holding the "
-"file content and path is the tracked path name in the index. Only the "
-"requested entries are output."
+"The first format is what gets used when `--stage` is omitted or is not `--"
+"stage=all`. The field tempname is the temporary file name holding the file "
+"content and path is the tracked path name in the index. Only the requested "
+"entries are output."
msgstr ""
#. type: Plain text
@@ -14759,12 +14696,8 @@ msgstr "Para atualizar e atualizar somente os arquivos j찼 verificados"
#. type: delimited block -
#: en/git-checkout-index.txt:148 en/git-update-index.txt:356
#, no-wrap
-msgid ""
-"$ git checkout-index -n -f -a && git update-index --ignore-missing "
-"--refresh\n"
-msgstr ""
-"$ git verificar-챠ndice-n -f -a && git update-챠ndice --ignorar-atualiza챌찾o --"
-"ausente\n"
+msgid "$ git checkout-index -n -f -a && git update-index --ignore-missing --refresh\n"
+msgstr "$ git verificar-챠ndice-n -f -a && git update-챠ndice --ignorar-atualiza챌찾o --ausente\n"
#. type: Labeled list
#: en/git-checkout-index.txt:150
@@ -14775,9 +14708,9 @@ msgstr "Usando 'git verificar-챠ndice' para \"exportar uma 찼rvore inteira\""
#. type: Plain text
#: en/git-checkout-index.txt:154
msgid ""
-"The prefix ability basically makes it trivial to use 'git checkout-index' as"
-" an \"export as tree\" function. Just read the desired tree into the index,"
-" and do:"
+"The prefix ability basically makes it trivial to use 'git checkout-index' as "
+"an \"export as tree\" function. Just read the desired tree into the index, "
+"and do:"
msgstr ""
"A habilidade prefixo basicamente torna trivial o uso do 'git verificar-"
"챠ndice' como uma fun챌찾o \"exportar como 찼rvore\". Apenas leia a 찼rvore "
@@ -14821,15 +14754,15 @@ msgstr "$ git verificar-챠ndice --prefixo=.merged- Fazer arquivo\n"
#. type: Plain text
#: en/git-checkout-index.txt:174
msgid ""
-"This will check out the currently cached copy of `Makefile` into the file "
-"`.merged-Makefile`."
+"This will check out the currently cached copy of `Makefile` into the file `."
+"merged-Makefile`."
msgstr ""
-"Isto ir찼 verificar a c처pia atualmente em cache de `Fazer arquivo` no arquivo`"
-" .merged-Fazer arquivo`."
+"Isto ir찼 verificar a c처pia atualmente em cache de `Fazer arquivo` no "
+"arquivo` .merged-Fazer arquivo`."
#. type: Title =
#: en/git-checkout.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-checkout(1)"
msgstr "git-checkout(1)"
@@ -14874,8 +14807,8 @@ msgstr "'git confira' <branch>"
msgid ""
"To prepare for working on <branch>, switch to it by updating the index and "
"the files in the working tree, and by pointing HEAD at the branch. Local "
-"modifications to the files in the working tree are kept, so that they can be"
-" committed to the <branch>."
+"modifications to the files in the working tree are kept, so that they can be "
+"committed to the <branch>."
msgstr ""
"Para se preparar para trabalhar em <branch>, alterne para ele atualizando o "
"챠ndice e os arquivos na 찼rvore de trabalho e apontando HEAD na ramifica챌찾o. "
@@ -14924,8 +14857,8 @@ msgid ""
"side-effects to show only the tracking information, if exists, for the "
"current branch."
msgstr ""
-"Voc챗 pode omitir <branch>, caso em que o comando se degenera para \""
-"verificar o branch atual\", que 챕 um glorificado n찾o-op com efeitos "
+"Voc챗 pode omitir <branch>, caso em que o comando se degenera para "
+"\"verificar o branch atual\", que 챕 um glorificado n찾o-op com efeitos "
"colaterais bastante caros para mostrar apenas as informa챌천es de "
"rastreamento, se existir, para o branch atual."
@@ -14939,22 +14872,22 @@ msgstr "'git verificar' -b|-B <novo_branch> [<start point>]"
#: en/git-checkout.txt:63
msgid ""
"Specifying `-b` causes a new branch to be created as if linkgit:git-"
-"branch[1] were called and then checked out. In this case you can use the "
-"`--track` or `--no-track` options, which will be passed to 'git branch'. As"
-" a convenience, `--track` without `-b` implies branch creation; see the "
+"branch[1] were called and then checked out. In this case you can use the `--"
+"track` or `--no-track` options, which will be passed to 'git branch'. As a "
+"convenience, `--track` without `-b` implies branch creation; see the "
"description of `--track` below."
msgstr ""
-"Especificar `-b` faz com que uma nova ramifica챌찾o seja criada como se linkgit"
-":git-branch[1] fosse chamado e, em seguida, retirado. Neste caso voc챗 pode "
-"usar as op챌천es `--track` ou` --n찾o-track`, que ser찾o passadas para 'git "
-"branch'. Por conveni챗ncia, `--track` sem` -b` implica cria챌찾o de ramifica챌찾o;"
-" veja a descri챌찾o de `--track` abaixo."
+"Especificar `-b` faz com que uma nova ramifica챌찾o seja criada como se "
+"linkgit:git-branch[1] fosse chamado e, em seguida, retirado. Neste caso voc챗 "
+"pode usar as op챌천es `--track` ou` --n찾o-track`, que ser찾o passadas para 'git "
+"branch'. Por conveni챗ncia, `--track` sem` -b` implica cria챌찾o de "
+"ramifica챌찾o; veja a descri챌찾o de `--track` abaixo."
#. type: Plain text
#: en/git-checkout.txt:66
msgid ""
-"If `-B` is given, <new_branch> is created if it doesn't exist; otherwise, it"
-" is reset. This is the transactional equivalent of"
+"If `-B` is given, <new_branch> is created if it doesn't exist; otherwise, it "
+"is reset. This is the transactional equivalent of"
msgstr ""
"Se `-B` 챕 dado, <novo_branch> 챕 criado se n찾o existir; caso contr찼rio, 챕 "
"redefinido. Este 챕 o equivalente transacional de"
@@ -14999,9 +14932,9 @@ msgid ""
"resulting working tree will be the state recorded in the commit plus the "
"local modifications."
msgstr ""
-"Prepare-se para trabalhar em cima de <commit>, desanexando HEAD nele ("
-"consulte a se챌찾o \"DESTACADO HEAD\") e atualizando o 챠ndice e os arquivos na "
-"찼rvore de trabalho. As modifica챌천es locais nos arquivos na 찼rvore de "
+"Prepare-se para trabalhar em cima de <commit>, desanexando HEAD nele "
+"(consulte a se챌찾o \"DESTACADO HEAD\") e atualizando o 챠ndice e os arquivos "
+"na 찼rvore de trabalho. As modifica챌천es locais nos arquivos na 찼rvore de "
"trabalho s찾o mantidas, de forma que a 찼rvore de trabalho resultante seja o "
"estado registrado no commit mais as modifica챌천es locais."
@@ -15032,13 +14965,13 @@ msgstr "'git verificar' [<tree-ish>] [--] <pathspec>..."
msgid ""
"Overwrite paths in the working tree by replacing with the contents in the "
"index or in the <tree-ish> (most often a commit). When a <tree-ish> is "
-"given, the paths that match the <pathspec> are updated both in the index and"
-" in the working tree."
+"given, the paths that match the <pathspec> are updated both in the index and "
+"in the working tree."
msgstr ""
"Sobrescreva caminhos na 찼rvore de trabalho substituindo o conte첬do no 챠ndice "
"ou no <tree-ish> (na maioria das vezes uma confirma챌찾o). \n"
-" Quando um <tree-ish> 챕 fornecido, os caminhos que correspondem ao <pathspec>"
-" s찾o atualizados no 챠ndice e na 찼rvore de trabalho."
+" Quando um <tree-ish> 챕 fornecido, os caminhos que correspondem ao "
+"<pathspec> s찾o atualizados no 챠ndice e na 찼rvore de trabalho."
#. type: Plain text
#: en/git-checkout.txt:106
@@ -15068,8 +15001,8 @@ msgstr "'git verificar' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]"
#. type: Plain text
#: en/git-checkout.txt:113
msgid ""
-"This is similar to the \"check out paths to the working tree from either the"
-" index or from a tree-ish\" mode described above, but lets you use the "
+"This is similar to the \"check out paths to the working tree from either the "
+"index or from a tree-ish\" mode described above, but lets you use the "
"interactive interface to show the \"diff\" output and choose which hunks to "
"use in the result. See below for the description of `--patch` option."
msgstr ""
@@ -15088,8 +15021,8 @@ msgstr "Silencioso, suprima as mensagens de feedback."
msgid ""
"Progress status is reported on the standard error stream by default when it "
"is attached to a terminal, unless `--quiet` is specified. This flag enables "
-"progress reporting even if not attached to a terminal, regardless of "
-"`--quiet`."
+"progress reporting even if not attached to a terminal, regardless of `--"
+"quiet`."
msgstr ""
"O status de progresso 챕 relatado no fluxo de erro padr찾o por padr찾o quando "
"ele 챕 anexado a um terminal, a menos que `--quiet` seja especificado. Este "
@@ -15117,13 +15050,13 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:136 en/git-merge-file.txt:73
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ours"
msgstr "--ours"
#. type: Labeled list
#: en/git-checkout.txt:137 en/git-merge-file.txt:74
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--theirs"
msgstr "--theirs"
@@ -15156,9 +15089,9 @@ msgid ""
"the remote as the shared canonical one, and treats the work done on the "
"branch you are rebasing as the third-party work to be integrated, and you "
"are temporarily assuming the role of the keeper of the canonical history "
-"during the rebase. As the keeper of the canonical history, you need to view"
-" the history from the remote as `ours` (i.e. \"our shared canonical "
-"history\"), while what you did on your side branch as `theirs` (i.e. \"one "
+"during the rebase. As the keeper of the canonical history, you need to view "
+"the history from the remote as `ours` (i.e. \"our shared canonical history"
+"\"), while what you did on your side branch as `theirs` (i.e. \"one "
"contributor's work on top of it\")."
msgstr ""
"Isso ocorre porque o `rebase` 챕 usado em um fluxo de trabalho que trata o "
@@ -15195,9 +15128,9 @@ msgstr "-B <novo_branch>"
#. type: Plain text
#: en/git-checkout.txt:165
msgid ""
-"Creates the branch <new_branch> and start it at <start_point>; if it already"
-" exists, then reset it to <start_point>. This is equivalent to running \"git"
-" branch\" with \"-f\"; see linkgit:git-branch[1] for details."
+"Creates the branch <new_branch> and start it at <start_point>; if it already "
+"exists, then reset it to <start_point>. This is equivalent to running \"git "
+"branch\" with \"-f\"; see linkgit:git-branch[1] for details."
msgstr ""
"Cria o ramo <novo_branch> e inicia em <ponto_de_partida>; se j찼 existir, "
"redefina-o para <ponto_de_partida>. Isso 챕 equivalente a executar \"git "
@@ -15206,22 +15139,22 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:170
msgid ""
-"When creating a new branch, set up \"upstream\" configuration. See \"--"
-"track\" in linkgit:git-branch[1] for details."
+"When creating a new branch, set up \"upstream\" configuration. See \"--track"
+"\" in linkgit:git-branch[1] for details."
msgstr ""
-"Ao criar um novo branch, configure \"upstream\". Veja \"--track\" em linkgit"
-":git-branch[1] para detalhes."
+"Ao criar um novo branch, configure \"upstream\". Veja \"--track\" em linkgit:"
+"git-branch[1] para detalhes."
#. type: Plain text
#: en/git-checkout.txt:180
msgid ""
"If no `-b` option is given, the name of the new branch will be derived from "
"the remote-tracking branch, by looking at the local part of the refspec "
-"configured for the corresponding remote, and then stripping the initial part"
-" up to the \"*\". This would tell us to use \"hack\" as the local branch "
+"configured for the corresponding remote, and then stripping the initial part "
+"up to the \"*\". This would tell us to use \"hack\" as the local branch "
"when branching off of \"origin/hack\" (or \"remotes/origin/hack\", or even "
-"\"refs/remotes/origin/hack\"). If the given name has no slash, or the above"
-" guessing results in an empty name, the guessing is aborted. You can "
+"\"refs/remotes/origin/hack\"). If the given name has no slash, or the above "
+"guessing results in an empty name, the guessing is aborted. You can "
"explicitly give a name with `-b` in such a case."
msgstr ""
"Se nenhuma op챌찾o `-b` for fornecida, o nome da nova ramifica챌찾o ser찼 "
@@ -15242,7 +15175,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:189 en/git-daemon.txt:156 en/git-worktree.txt:143
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--detach"
msgstr "--detach"
@@ -15255,9 +15188,9 @@ msgid ""
"\"DETACHED HEAD\" section below for details."
msgstr ""
"Em vez de verificar um ramo para trabalhar nele, confira um commit para "
-"inspe챌천es e experi챗ncias descart찼veis. Este 챕 o comportamento padr찾o de \""
-"git checkout <commit>\" quando <commit> n찾o 챕 um nome de ramifica챌찾o. Veja a "
-"se챌찾o \"DESTACADO CABE횉A\" abaixo para detalhes."
+"inspe챌천es e experi챗ncias descart찼veis. Este 챕 o comportamento padr찾o de "
+"\"git checkout <commit>\" quando <commit> n찾o 챕 um nome de ramifica챌찾o. Veja "
+"a se챌찾o \"DESTACADO CABE횉A\" abaixo para detalhes."
#. type: Labeled list
#: en/git-checkout.txt:196
@@ -15268,8 +15201,8 @@ msgstr "--orf찾o <novo_branch>"
#. type: Plain text
#: en/git-checkout.txt:202
msgid ""
-"Create a new 'orphan' branch, named <new_branch>, started from <start_point>"
-" and switch to it. The first commit made on this new branch will have no "
+"Create a new 'orphan' branch, named <new_branch>, started from <start_point> "
+"and switch to it. The first commit made on this new branch will have no "
"parents and it will be the root of a new history totally disconnected from "
"all the other branches and commits."
msgstr ""
@@ -15282,8 +15215,8 @@ msgstr ""
#: en/git-checkout.txt:207
msgid ""
"The index and the working tree are adjusted as if you had previously run "
-"\"git checkout <start_point>\". This allows you to start a new history that"
-" records a set of paths similar to <start_point> by easily running \"git "
+"\"git checkout <start_point>\". This allows you to start a new history that "
+"records a set of paths similar to <start_point> by easily running \"git "
"commit -a\" to make the root commit."
msgstr ""
"O 챠ndice e a 찼rvore de trabalho s찾o ajustados como se voc챗 tivesse executado "
@@ -15302,38 +15235,38 @@ msgid ""
msgstr ""
"Isso pode ser 첬til quando voc챗 deseja publicar a 찼rvore de um commit sem "
"expor seu hist처rico completo. Voc챗 pode querer fazer isso para publicar uma "
-"ramifica챌찾o de c처digo aberto de um projeto cuja 찼rvore atual esteja \"limpa\""
-", mas cujo hist처rico completo contenha bits de c처digo propriet찼rios ou de "
+"ramifica챌찾o de c처digo aberto de um projeto cuja 찼rvore atual esteja \"limpa"
+"\", mas cujo hist처rico completo contenha bits de c처digo propriet찼rios ou de "
"outra forma onerados."
#. type: Plain text
#: en/git-checkout.txt:220
msgid ""
-"If you want to start a disconnected history that records a set of paths that"
-" is totally different from the one of <start_point>, then you should clear "
+"If you want to start a disconnected history that records a set of paths that "
+"is totally different from the one of <start_point>, then you should clear "
"the index and the working tree right after creating the orphan branch by "
-"running \"git rm -rf .\" from the top level of the working tree. Afterwards"
-" you will be ready to prepare your new files, repopulating the working tree,"
-" by copying them from elsewhere, extracting a tarball, etc."
+"running \"git rm -rf .\" from the top level of the working tree. Afterwards "
+"you will be ready to prepare your new files, repopulating the working tree, "
+"by copying them from elsewhere, extracting a tarball, etc."
msgstr ""
"Se voc챗 quiser iniciar um hist처rico desconectado que registra um conjunto de "
"caminhos totalmente diferente do <start_point>, ent찾o voc챗 deve limpar o "
-"챠ndice e a 찼rvore de trabalho logo ap처s criar o branch 처rf찾o executando \""
-"git rm -rf. \" do n챠vel superior da 찼rvore de trabalho. Depois disso, voc챗 "
+"챠ndice e a 찼rvore de trabalho logo ap처s criar o branch 처rf찾o executando "
+"\"git rm -rf. \" do n챠vel superior da 찼rvore de trabalho. Depois disso, voc챗 "
"estar찼 pronto para preparar seus novos arquivos, preenchendo a 찼rvore de "
"trabalho, copiando-os de outro lugar, extraindo um tarball, etc."
#. type: Labeled list
#: en/git-checkout.txt:221
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-skip-worktree-bits"
msgstr "--ignore-skip-worktree-bits"
#. type: Plain text
#: en/git-checkout.txt:226
msgid ""
-"In sparse checkout mode, `git checkout -- <paths>` would update only entries"
-" matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. "
+"In sparse checkout mode, `git checkout -- <paths>` would update only entries "
+"matched by <paths> and sparse patterns in $GIT_DIR/info/sparse-checkout. "
"This option ignores the sparse patterns and adds back any files in <paths>."
msgstr ""
"No modo de checkout esparso, `git checkout - <paths>` atualizaria apenas "
@@ -15345,7 +15278,7 @@ msgstr ""
#: en/git-checkout.txt:228 en/git-rebase.txt:268 en/git-rebase.txt:523
#: en/git-reset.txt:71 en/git-submodule.txt:342 en/git-svn.txt:676
#: en/rev-list-options.txt:289
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--merge"
msgstr "--merge"
@@ -15404,9 +15337,10 @@ msgid ""
"is shown by \"merge\" style, shows the original contents)."
msgstr ""
"O mesmo que a op챌찾o --merge acima, mas altera a forma como os blocos "
-"conflitantes s찾o apresentados, substituindo a vari찼vel de configura챌찾o "
-"merge.conflictStyle. Os valores poss챠veis s찾o \"merge\" (padr찾o) e \"diff3\""
-" (al챕m do que 챕 mostrado pelo estilo \"merge\", mostra o conte첬do original)."
+"conflitantes s찾o apresentados, substituindo a vari찼vel de configura챌찾o merge."
+"conflictStyle. Os valores poss챠veis s찾o \"merge\" (padr찾o) e "
+"\"diff3\" (al챕m do que 챕 mostrado pelo estilo \"merge\", mostra o conte첬do "
+"original)."
#. type: Plain text
#: en/git-checkout.txt:259
@@ -15435,16 +15369,16 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:264
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-other-worktrees"
msgstr "--ignore-other-worktrees"
#. type: Plain text
#: en/git-checkout.txt:269
msgid ""
-"`git checkout` refuses when the wanted ref is already checked out by another"
-" worktree. This option makes it check the ref out anyway. In other words, "
-"the ref can be held by more than one worktree."
+"`git checkout` refuses when the wanted ref is already checked out by another "
+"worktree. This option makes it check the ref out anyway. In other words, the "
+"ref can be held by more than one worktree."
msgstr ""
"`git checkout` recusa-se quando a refer챗ncia desejada j찼 foi verificada por "
"outra worktree. Esta op챌찾o faz com que verifique o ref fora de qualquer "
@@ -15453,7 +15387,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:270 en/git-read-tree.txt:117
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]recurse-submodules"
msgstr "--[no-]recurse-submodules"
@@ -15476,7 +15410,7 @@ msgstr ""
#. type: Labeled list
#: en/git-checkout.txt:279
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-guess"
msgstr "--no-guess"
@@ -15499,21 +15433,22 @@ msgstr ""
#: en/git-checkout.txt:289
msgid ""
"Branch to checkout; if it refers to a branch (i.e., a name that, when "
-"prepended with \"refs/heads/\", is a valid ref), then that branch is checked"
-" out. Otherwise, if it refers to a valid commit, your HEAD becomes "
-"\"detached\" and you are no longer on any branch (see below for details)."
+"prepended with \"refs/heads/\", is a valid ref), then that branch is checked "
+"out. Otherwise, if it refers to a valid commit, your HEAD becomes \"detached"
+"\" and you are no longer on any branch (see below for details)."
msgstr ""
"Filial para check-out; se refere-se a um ramo (isto 챕, um nome que, quando "
"prefixado com \"refs/heads/\", 챕 um ref v찼lido), ent찾o esse ramo 챕 retirado. "
-"Caso contr찼rio, se se referir a um commit v찼lido, seu HEAD se torna \""
-"separado\" e voc챗 n찾o est찼 mais em nenhum branch (veja abaixo para detalhes)."
+"Caso contr찼rio, se se referir a um commit v찼lido, seu HEAD se torna "
+"\"separado\" e voc챗 n찾o est찼 mais em nenhum branch (veja abaixo para "
+"detalhes)."
#. type: Plain text
#: en/git-checkout.txt:293
msgid ""
"You can use the `\"@{-N}\"` syntax to refer to the N-th last branch/commit "
-"checked out using \"git checkout\" operation. You may also specify `-` which"
-" is synonymous to `\"@{-1}`."
+"checked out using \"git checkout\" operation. You may also specify `-` which "
+"is synonymous to `\"@{-1}`."
msgstr ""
"Voc챗 pode usar a sintaxe `\" @{- N}\"` para se referir 횪 첬ltima branch/"
"commit finalizada usando a opera챌찾o \"git checkout\". Voc챗 tamb챕m pode "
@@ -15523,8 +15458,8 @@ msgstr ""
#: en/git-checkout.txt:297
msgid ""
"As a special case, you may use `\"A...B\"` as a shortcut for the merge base "
-"of `A` and `B` if there is exactly one merge base. You can leave out at most"
-" one of `A` and `B`, in which case it defaults to `HEAD`."
+"of `A` and `B` if there is exactly one merge base. You can leave out at most "
+"one of `A` and `B`, in which case it defaults to `HEAD`."
msgstr ""
"Como um caso especial, voc챗 pode usar `\"A ... B\"` como um atalho para a "
"base de mesclagem de `A` e` B` se houver exatamente uma base de merge. Voc챗 "
@@ -15554,8 +15489,8 @@ msgid ""
"The name of a commit at which to start the new branch; see linkgit:git-"
"branch[1] for details. Defaults to HEAD."
msgstr ""
-"O nome de um commit no qual iniciar o novo branch; veja linkgit:git-branch[1]"
-" para detalhes. Padr찾o para HEAD."
+"O nome de um commit no qual iniciar o novo branch; veja linkgit:git-"
+"branch[1] para detalhes. Padr찾o para HEAD."
#. type: Plain text
#: en/git-checkout.txt:308
@@ -15576,12 +15511,12 @@ msgstr "CABE횉A DESTACADA"
#: en/git-checkout.txt:316
msgid ""
"HEAD normally refers to a named branch (e.g. 'master'). Meanwhile, each "
-"branch refers to a specific commit. Let's look at a repo with three commits,"
-" one of them tagged, and with branch 'master' checked out:"
+"branch refers to a specific commit. Let's look at a repo with three commits, "
+"one of them tagged, and with branch 'master' checked out:"
msgstr ""
-"HEAD normalmente se refere a uma ramifica챌찾o nomeada (por exemplo, 'mestre')"
-". Enquanto isso, cada ramo se refere a um commit espec챠fico. Vamos olhar "
-"para um reposit처rio com tr챗s commits, um deles marcado, e com branch "
+"HEAD normalmente se refere a uma ramifica챌찾o nomeada (por exemplo, "
+"'mestre'). Enquanto isso, cada ramo se refere a um commit espec챠fico. Vamos "
+"olhar para um reposit처rio com tr챗s commits, um deles marcado, e com branch "
"'master' check out:"
#. type: delimited block -
@@ -15790,8 +15725,8 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:432
msgid ""
-"similarly creates a new branch 'foo', which refers to commit 'f', but leaves"
-" HEAD detached."
+"similarly creates a new branch 'foo', which refers to commit 'f', but leaves "
+"HEAD detached."
msgstr ""
"similarmente cria uma nova ramifica챌찾o 'foo', que se refere ao commit 'f', "
"mas deixa o HEAD desanexado."
@@ -15807,13 +15742,13 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:440
msgid ""
-"If we have moved away from commit 'f', then we must first recover its object"
-" name (typically by using git reflog), and then we can create a reference to"
-" it. For example, to see the last two commits to which HEAD referred, we can"
-" use either of these commands:"
+"If we have moved away from commit 'f', then we must first recover its object "
+"name (typically by using git reflog), and then we can create a reference to "
+"it. For example, to see the last two commits to which HEAD referred, we can "
+"use either of these commands:"
msgstr ""
-"Se nos afastamos do commit 'f', devemos primeiro recuperar o nome do objeto ("
-"geralmente usando o git reflog), e ent찾o podemos criar uma refer챗ncia para "
+"Se nos afastamos do commit 'f', devemos primeiro recuperar o nome do objeto "
+"(geralmente usando o git reflog), e ent찾o podemos criar uma refer챗ncia para "
"ele. Por exemplo, para ver os dois 첬ltimos commits aos quais o HEAD se "
"referiu, podemos usar um destes comandos:"
@@ -15844,13 +15779,13 @@ msgid ""
"index."
msgstr ""
"Quando h찼 apenas um argumento dado e n찾o 챕 `--` (eg\" git checkout abc\"), e "
-"quando o argumento 챕 ambos um` <tree-ish> `v찼lido (ex. Um ramo\" abc \""
-"existe) e um v찼lido `<pathspec>` (por exemplo, um arquivo ou diret처rio cujo "
-"nome 챕 \"abc\" existe), o Git normalmente pede para voc챗 desambiguar. Como o "
-"check-out de uma ramifica챌찾o 챕 uma opera챌찾o t찾o comum, no entanto, \"git "
-"checkout abc\" toma \"abc\" como um `<tree-ish>` em tal situa챌찾o. Use `git "
-"checkout - <pathspec>` se voc챗 quiser fazer o checkout desses caminhos fora "
-"do 챠ndice."
+"quando o argumento 챕 ambos um` <tree-ish> `v찼lido (ex. Um ramo\" abc "
+"\"existe) e um v찼lido `<pathspec>` (por exemplo, um arquivo ou diret처rio "
+"cujo nome 챕 \"abc\" existe), o Git normalmente pede para voc챗 desambiguar. "
+"Como o check-out de uma ramifica챌찾o 챕 uma opera챌찾o t찾o comum, no entanto, "
+"\"git checkout abc\" toma \"abc\" como um `<tree-ish>` em tal situa챌찾o. Use "
+"`git checkout - <pathspec>` se voc챗 quiser fazer o checkout desses caminhos "
+"fora do 챠ndice."
#. type: Plain text
#: en/git-checkout.txt:464
@@ -15910,8 +15845,7 @@ msgstr "$ git verificar -- '*.c'\n"
msgid ""
"Note the quotes around `*.c`. The file `hello.c` will also be checked out, "
"even though it is no longer in the working tree, because the file globbing "
-"is used to match entries in the index (not in the working tree by the "
-"shell)."
+"is used to match entries in the index (not in the working tree by the shell)."
msgstr ""
"Observe as aspas em torno de `* .c`. O arquivo `hello.c` tamb챕m ser찼 "
"retirado, mesmo que n찾o esteja mais na 찼rvore de trabalho, porque o "
@@ -15953,8 +15887,8 @@ msgstr "$ git checkout meu t처pico\n"
#: en/git-checkout.txt:506
msgid ""
"However, your \"wrong\" branch and correct \"mytopic\" branch may differ in "
-"files that you have modified locally, in which case the above checkout would"
-" fail like this:"
+"files that you have modified locally, in which case the above checkout would "
+"fail like this:"
msgstr ""
"No entanto, sua ramifica챌찾o \"errada\" e a ramifica챌찾o \"meu t처pico\" "
"correta podem diferir nos arquivos que voc챗 modificou localmente. Nesse "
@@ -15973,8 +15907,7 @@ msgstr ""
#. type: Plain text
#: en/git-checkout.txt:514
msgid ""
-"You can give the `-m` flag to the command, which would try a three-way "
-"merge:"
+"You can give the `-m` flag to the command, which would try a three-way merge:"
msgstr ""
"Voc챗 pode dar o sinalizador `-m` ao comando, que tentaria uma merge de tr챗s "
"vias:"
@@ -16047,7 +15980,7 @@ msgstr ""
#. type: Title =
#: en/git-check-ref-format.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-check-ref-format(1)"
msgstr "git-check-ref-format(1)"
@@ -16081,21 +16014,22 @@ msgstr ""
#: en/git-check-ref-format.txt:27
msgid ""
"A reference is used in Git to specify branches and tags. A branch head is "
-"stored in the `refs/heads` hierarchy, while a tag is stored in the "
-"`refs/tags` hierarchy of the ref namespace (typically in "
-"`$GIT_DIR/refs/heads` and `$GIT_DIR/refs/tags` directories or, as entries in"
-" file `$GIT_DIR/packed-refs` if refs are packed by `git gc`)."
+"stored in the `refs/heads` hierarchy, while a tag is stored in the `refs/"
+"tags` hierarchy of the ref namespace (typically in `$GIT_DIR/refs/heads` and "
+"`$GIT_DIR/refs/tags` directories or, as entries in file `$GIT_DIR/packed-"
+"refs` if refs are packed by `git gc`)."
msgstr ""
"Uma refer챗ncia 챕 usada no Git para especificar ramifica챌천es e tags. Um "
"branch head 챕 armazenado na hierarquia `refs/heads`, enquanto um tag 챕 "
-"armazenado na hierarquia` refs/tags` do espa챌o de nome ref (normalmente em `$"
-"GIT_DIR/refs/heads` e` $GIT_DIR/refs/tags `diret처rios ou, como entradas no "
+"armazenado na hierarquia` refs/tags` do espa챌o de nome ref (normalmente em `"
+"$GIT_DIR/refs/heads` e` $GIT_DIR/refs/tags `diret처rios ou, como entradas no "
"arquivo` $GIT_DIR/packed-refs`, se os refs forem empacotados por `git gc`)."
#. type: Plain text
#: en/git-check-ref-format.txt:29
msgid "Git imposes the following rules on how references are named:"
-msgstr "O Git imp천e as seguintes regras sobre como as refer챗ncias s찾o nomeadas:"
+msgstr ""
+"O Git imp천e as seguintes regras sobre como as refer챗ncias s찾o nomeadas:"
#. type: Plain text
#: en/git-check-ref-format.txt:33
@@ -16111,9 +16045,9 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:38
msgid ""
-"They must contain at least one `/`. This enforces the presence of a category"
-" like `heads/`, `tags/` etc. but the actual names are not restricted. If "
-"the `--allow-onelevel` option is used, this rule is waived."
+"They must contain at least one `/`. This enforces the presence of a category "
+"like `heads/`, `tags/` etc. but the actual names are not restricted. If the "
+"`--allow-onelevel` option is used, this rule is waived."
msgstr ""
"Eles devem conter pelo menos um `/`. Isso imp천e a presen챌a de uma categoria "
"como `heads /`, `tags /` etc., mas os nomes reais n찾o s찾o restritos. Se a "
@@ -16127,8 +16061,8 @@ msgstr "Eles n찾o podem ter dois pontos consecutivos `..` em qualquer lugar."
#. type: Plain text
#: en/git-check-ref-format.txt:44
msgid ""
-"They cannot have ASCII control characters (i.e. bytes whose values are lower"
-" than \\040, or \\177 `DEL`), space, tilde `~`, caret `^`, or colon `:` "
+"They cannot have ASCII control characters (i.e. bytes whose values are lower "
+"than \\040, or \\177 `DEL`), space, tilde `~`, caret `^`, or colon `:` "
"anywhere."
msgstr ""
"Eles n찾o podem ter caracteres de controle ASCII (ou seja, bytes cujos "
@@ -16139,8 +16073,8 @@ msgstr ""
#: en/git-check-ref-format.txt:48
msgid ""
"They cannot have question-mark `?`, asterisk `*`, or open bracket `[` "
-"anywhere. See the `--refspec-pattern` option below for an exception to this"
-" rule."
+"anywhere. See the `--refspec-pattern` option below for an exception to this "
+"rule."
msgstr ""
"Eles n찾o podem ter o ponto de interroga챌찾o `?`, asterisco `*` ou colchete "
"aberto `[` em qualquer lugar. Veja a op챌찾o `--refspec-pattern` abaixo para "
@@ -16202,8 +16136,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:72
msgid ""
-"A tilde `~` and caret `^` are used to introduce the postfix 'nth parent' and"
-" 'peel onion' operation."
+"A tilde `~` and caret `^` are used to introduce the postfix 'nth parent' and "
+"'peel onion' operation."
msgstr ""
"Um til `~` e um caractere circunflexo `^` s찾o usados para introduzir a "
"opera챌찾o do postfix 'nth parent' e 'peel onion'."
@@ -16211,8 +16145,8 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:77
msgid ""
-"A colon `:` is used as in `srcref:dstref` to mean \"use srcref\\'s value and"
-" store it in dstref\" in fetch and push operations. It may also be used to "
+"A colon `:` is used as in `srcref:dstref` to mean \"use srcref\\'s value and "
+"store it in dstref\" in fetch and push operations. It may also be used to "
"select a specific object such as with 'git cat-file': \"git cat-file blob "
"v1.3.3:refs.c\"."
msgstr ""
@@ -16231,20 +16165,20 @@ msgstr ""
#. type: Plain text
#: en/git-check-ref-format.txt:97
msgid ""
-"With the `--branch` option, the command takes a name and checks if it can be"
-" used as a valid branch name (e.g. when creating a new branch). But be "
+"With the `--branch` option, the command takes a name and checks if it can be "
+"used as a valid branch name (e.g. when creating a new branch). But be "
"cautious when using the previous checkout syntax that may refer to a "
"detached HEAD state. The rule `git check-ref-format --branch $name` "
-"implements may be stricter than what `git check-ref-format refs/heads/$name`"
-" says (e.g. a dash may appear at the beginning of a ref component, but it is"
-" explicitly forbidden at the beginning of a branch name). When run with "
-"`--branch` option in a repository, the input is first expanded for the "
+"implements may be stricter than what `git check-ref-format refs/heads/$name` "
+"says (e.g. a dash may appear at the beginning of a ref component, but it is "
+"explicitly forbidden at the beginning of a branch name). When run with `--"
+"branch` option in a repository, the input is first expanded for the "
"``previous checkout syntax'' `@{-n}`. For example, `@{-1}` is a way to "
"refer the last thing that was checked out using \"git checkout\" operation. "
"This option should be used by porcelains to accept this syntax anywhere a "
-"branch name is expected, so they can act as if you typed the branch name. As"
-" an exception note that, the ``previous checkout operation'' might result in"
-" a commit object name when the N-th last thing checked out was not a branch."
+"branch name is expected, so they can act as if you typed the branch name. As "
+"an exception note that, the ``previous checkout operation'' might result in "
+"a commit object name when the N-th last thing checked out was not a branch."
msgstr ""
"Com a op챌찾o `--branch`, o comando obt챕m um nome e verifica se ele pode ser "
"usado como um nome de ramifica챌찾o v찼lido (por exemplo, ao criar uma nova "
@@ -16266,15 +16200,15 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:100
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]allow-onelevel"
msgstr "--[no-]allow-onelevel"
#. type: Plain text
#: en/git-check-ref-format.txt:104
msgid ""
-"Controls whether one-level refnames are accepted (i.e., refnames that do not"
-" contain multiple `/`-separated components). The default is `--no-allow-"
+"Controls whether one-level refnames are accepted (i.e., refnames that do not "
+"contain multiple `/`-separated components). The default is `--no-allow-"
"onelevel`."
msgstr ""
"Controla se refnomes de um n챠vel s찾o aceitos (isto 챕, refnomes que n찾o "
@@ -16283,7 +16217,7 @@ msgstr ""
#. type: Labeled list
#: en/git-check-ref-format.txt:105
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--refspec-pattern"
msgstr "--refspec-pattern"
@@ -16295,14 +16229,14 @@ msgid ""
"contain a single `*` in the refspec (e.g., `foo/bar*/baz` or `foo/bar*baz/` "
"but not `foo/bar*/baz*`)."
msgstr ""
-"Interprete <refnome> como um padr찾o de nome de refer챗ncia para um refspec ("
-"conforme usado com reposit처rios remotos). Se esta op챌찾o estiver habilitada, "
-"<refnome> tem permiss찾o para conter um 첬nico `*` no refspec (por exemplo, `"
-"foo/bar*/baz` ou`foo/bar*baz/ `mas n찾o` foo/bar*/baz*`)."
+"Interprete <refnome> como um padr찾o de nome de refer챗ncia para um refspec "
+"(conforme usado com reposit처rios remotos). Se esta op챌찾o estiver habilitada, "
+"<refnome> tem permiss찾o para conter um 첬nico `*` no refspec (por exemplo, "
+"`foo/bar*/baz` ou`foo/bar*baz/ `mas n찾o` foo/bar*/baz*`)."
#. type: Labeled list
#: en/git-check-ref-format.txt:112
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--normalize"
msgstr "--normalize"
@@ -16312,8 +16246,8 @@ msgid ""
"Normalize 'refname' by removing any leading slash (`/`) characters and "
"collapsing runs of adjacent slashes between name components into a single "
"slash. If the normalized refname is valid then print it to standard output "
-"and exit with a status of 0, otherwise exit with a non-zero status. "
-"(`--print` is a deprecated way to spell `--normalize`.)"
+"and exit with a status of 0, otherwise exit with a non-zero status. (`--"
+"print` is a deprecated way to spell `--normalize`.)"
msgstr ""
"Normalize 'refnome' removendo quaisquer caracteres de barra (`/`) e "
"reduzindo as execu챌천es de barras adjacentes entre componentes de nomes em "
@@ -16345,19 +16279,17 @@ msgid ""
"{ echo \"we do not like '$newbranch' as a branch name.\" >&2 ; exit 1 ; }\n"
msgstr ""
"$ ref=$(git verifica-o-formato-ref--normalize \"refs/heads/$novobranch\")||\n"
-"{ echo \"n처s n찾o gostamos '$novobranch' as a branch nome.\" >&2 ; exit 1 ; }"
-"\n"
+"{ echo \"n처s n찾o gostamos '$novobranch' as a branch nome.\" >&2 ; exit 1 ; }\n"
#. type: Title =
#: en/git-cherry-pick.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-cherry-pick(1)"
msgstr "git-cherry-pick(1)"
#. type: Plain text
#: en/git-cherry-pick.txt:7
-msgid ""
-"git-cherry-pick - Apply the changes introduced by some existing commits"
+msgid "git-cherry-pick - Apply the changes introduced by some existing commits"
msgstr ""
"git-cherry-pick - Aplique as altera챌천es introduzidas por alguns commits "
"existentes"
@@ -16401,8 +16333,8 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:31
msgid ""
-"The `CHERRY_PICK_HEAD` ref is set to point at the commit that introduced the"
-" change that is difficult to apply."
+"The `CHERRY_PICK_HEAD` ref is set to point at the commit that introduced the "
+"change that is difficult to apply."
msgstr ""
"A refer챗ncia `CHERRY_PICK_HEAD` 챕 configurada para apontar para o commit que "
"introduziu a mudan챌a que 챕 dif챠cil de aplicar."
@@ -16410,8 +16342,8 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:33
msgid ""
-"Paths in which the change applied cleanly are updated both in the index file"
-" and in your working tree."
+"Paths in which the change applied cleanly are updated both in the index file "
+"and in your working tree."
msgstr ""
"Caminhos nos quais a mudan챌a aplicada corretamente s찾o atualizados no "
"arquivo de 챠ndice e na sua 찼rvore de trabalho."
@@ -16452,19 +16384,19 @@ msgstr ""
#: en/git-cherry-pick.txt:54
msgid ""
"Commits to cherry-pick. For a more complete list of ways to spell commits, "
-"see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal"
-" is done by default, as if the `--no-walk` option was specified, see "
-"linkgit:git-rev-list[1]. Note that specifying a range will feed all "
-"<commit>... arguments to a single revision walk (see a later example that "
-"uses 'maint master..next')."
+"see linkgit:gitrevisions[7]. Sets of commits can be passed but no traversal "
+"is done by default, as if the `--no-walk` option was specified, see linkgit:"
+"git-rev-list[1]. Note that specifying a range will feed all <commit>... "
+"arguments to a single revision walk (see a later example that uses 'maint "
+"master..next')."
msgstr ""
"Compromete-se a escolher. Para uma lista mais completa de maneiras de "
"soletrar commits, veja linkgit:gitrevisions[7]. Conjuntos de commits podem "
-"ser passados, mas nenhuma passagem 챕 feita por padr찾o, como se a op챌찾o "
-"`--n찾o-caminhar` fosse especificada, veja linkgit:git-rev-list[1]. Note que "
+"ser passados, mas nenhuma passagem 챕 feita por padr찾o, como se a op챌찾o `--"
+"n찾o-caminhar` fosse especificada, veja linkgit:git-rev-list[1]. Note que "
"especificar um intervalo alimentar찼 todos os argumentos <commit> ... para um "
-"첬nico passo de revis찾o (veja um exemplo posterior que usa 'maint "
-"master..next')."
+"첬nico passo de revis찾o (veja um exemplo posterior que usa 'maint master.."
+"next')."
#. type: Plain text
#: en/git-cherry-pick.txt:59
@@ -16477,7 +16409,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:60 en/git-clean.txt:62
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-x"
msgstr "-x"
@@ -16489,8 +16421,8 @@ msgid ""
"commit this change was cherry-picked from. This is done only for cherry "
"picks without conflicts. Do not use this option if you are cherry-picking "
"from your private branch because the information is useless to the "
-"recipient. If on the other hand you are cherry-picking between two publicly"
-" visible branches (e.g. backporting a fix to a maintenance branch for an "
+"recipient. If on the other hand you are cherry-picking between two publicly "
+"visible branches (e.g. backporting a fix to a maintenance branch for an "
"older release from a development branch), adding this information can be "
"useful."
msgstr ""
@@ -16507,13 +16439,13 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:78
msgid ""
-"It used to be that the command defaulted to do `-x` described above, and "
-"`-r` was to disable it. Now the default is not to do `-x` so this option is"
-" a no-op."
+"It used to be that the command defaulted to do `-x` described above, and `-"
+"r` was to disable it. Now the default is not to do `-x` so this option is a "
+"no-op."
msgstr ""
-"Costumava ser que o comando padronizava para fazer `-x` descrito acima, e` "
-"-r` era desativ찼-lo. Agora o padr찾o 챕 n찾o fazer `-x`, ent찾o esta op챌찾o n찾o "
-"챕 op."
+"Costumava ser que o comando padronizava para fazer `-x` descrito acima, e` -"
+"r` era desativ찼-lo. Agora o padr찾o 챕 n찾o fazer `-x`, ent찾o esta op챌찾o n찾o 챕 "
+"op."
#. type: Labeled list
#: en/git-cherry-pick.txt:79 en/git-revert.txt:49
@@ -16530,8 +16462,8 @@ msgstr "--mainline n첬mero-pai"
#. type: Plain text
#: en/git-cherry-pick.txt:86
msgid ""
-"Usually you cannot cherry-pick a merge because you do not know which side of"
-" the merge should be considered the mainline. This option specifies the "
+"Usually you cannot cherry-pick a merge because you do not know which side of "
+"the merge should be considered the mainline. This option specifies the "
"parent number (starting from 1) of the mainline and allows cherry-pick to "
"replay the change relative to the specified parent."
msgstr ""
@@ -16542,7 +16474,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:88 en/git-revert.txt:70 en/merge-options.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-commit"
msgstr "--no-commit"
@@ -16552,8 +16484,8 @@ msgid ""
"Usually the command automatically creates a sequence of commits. This flag "
"applies the changes necessary to cherry-pick each named commit to your "
"working tree and the index, without making any commit. In addition, when "
-"this option is used, your index does not have to match the HEAD commit. The"
-" cherry-pick is done against the beginning state of your index."
+"this option is used, your index does not have to match the HEAD commit. The "
+"cherry-pick is done against the beginning state of your index."
msgstr ""
"Normalmente, o comando cria automaticamente uma sequ챗ncia de commits. Este "
"sinalizador aplica as altera챌천es necess찼rias para selecionar cada "
@@ -16582,7 +16514,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:111 en/merge-options.txt:30
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ff"
msgstr "--ff"
@@ -16597,7 +16529,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:116 en/git-commit.txt:179 en/git-notes.txt:158
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--allow-empty"
msgstr "--allow-empty"
@@ -16608,27 +16540,28 @@ msgid ""
"explicit invocation of `git commit --allow-empty` is required. This option "
"overrides that behavior, allowing empty commits to be preserved "
"automatically in a cherry-pick. Note that when \"--ff\" is in effect, empty "
-"commits that meet the \"fast-forward\" requirement will be kept even without"
-" this option. Note also, that use of this option only keeps commits that "
-"were initially empty (i.e. the commit recorded the same tree as its parent)."
-" Commits which are made empty due to a previous commit are dropped. To "
-"force the inclusion of those commits use `--keep-redundant-commits`."
+"commits that meet the \"fast-forward\" requirement will be kept even without "
+"this option. Note also, that use of this option only keeps commits that "
+"were initially empty (i.e. the commit recorded the same tree as its "
+"parent). Commits which are made empty due to a previous commit are "
+"dropped. To force the inclusion of those commits use `--keep-redundant-"
+"commits`."
msgstr ""
"Por padr찾o, a escolha aleat처ria de uma confirma챌찾o vazia falhar찼, indicando "
"que uma chamada expl챠cita de `git commit --allow-empty` 챕 necess찼ria. Essa "
"op챌찾o substitui esse comportamento, permitindo que os commits vazios sejam "
"preservados automaticamente em um cherry-pick. Observe que quando \"--ff\" "
-"est찼 em vigor, os commits vazios que atendem ao requisito de \"fast forward\""
-" ser찾o mantidos mesmo sem essa op챌찾o. Observe tamb챕m que o uso desta op챌찾o "
-"mant챕m apenas confirma챌천es que estavam inicialmente vazias (isto 챕, o commit "
-"registrou a mesma 찼rvore que seu pai). Commits que s찾o feitos em branco "
-"devido a um commit anterior s찾o descartados. Para for챌ar a inclus찾o desses "
-"commits use `--keep-redundant-commits`."
+"est찼 em vigor, os commits vazios que atendem ao requisito de \"fast forward"
+"\" ser찾o mantidos mesmo sem essa op챌찾o. Observe tamb챕m que o uso desta "
+"op챌찾o mant챕m apenas confirma챌천es que estavam inicialmente vazias (isto 챕, o "
+"commit registrou a mesma 찼rvore que seu pai). Commits que s찾o feitos em "
+"branco devido a um commit anterior s찾o descartados. Para for챌ar a inclus찾o "
+"desses commits use `--keep-redundant-commits`."
#. type: Plain text
#: en/git-cherry-pick.txt:129 en/git-commit.txt:185 en/git-rebase.txt:249
#: en/git-rebase.txt:526
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--allow-empty-message"
msgstr "--allow-empty-message"
@@ -16645,7 +16578,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cherry-pick.txt:134
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--keep-redundant-commits"
msgstr "--keep-redundant-commits"
@@ -16655,8 +16588,8 @@ msgid ""
"If a commit being cherry picked duplicates a commit already in the current "
"history, it will become empty. By default these redundant commits cause "
"`cherry-pick` to stop so the user can examine the commit. This option "
-"overrides that behavior and creates an empty commit object. Implies "
-"`--allow-empty`."
+"overrides that behavior and creates an empty commit object. Implies `--"
+"allow-empty`."
msgstr ""
"Se um commit que est찼 sendo escolhido, duplicar um commit j찼 no hist처rico "
"atual, ele ficar찼 vazio. Por padr찾o, estas confirma챌천es redundantes fazem "
@@ -16737,8 +16670,8 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:167
msgid ""
-"Apply the changes introduced by all commits that are ancestors of master but"
-" not of HEAD to produce new commits."
+"Apply the changes introduced by all commits that are ancestors of master but "
+"not of HEAD to produce new commits."
msgstr ""
"Aplique as altera챌천es introduzidas por todos os commits que s찾o ancestrais "
"do master, mas n찾o do HEAD para produzir novos commits."
@@ -16759,8 +16692,8 @@ msgstr "`git cherry-pick maint master..pr처ximo`"
#: en/git-cherry-pick.txt:176
msgid ""
"Apply the changes introduced by all commits that are ancestors of maint or "
-"next, but not master or any of its ancestors. Note that the latter does not"
-" mean `maint` and everything between `master` and `next`; specifically, "
+"next, but not master or any of its ancestors. Note that the latter does not "
+"mean `maint` and everything between `master` and `next`; specifically, "
"`maint` will not be used if it is included in `master`."
msgstr ""
"Aplique as altera챌천es introduzidas por todos os commits que s찾o ancestrais "
@@ -16792,9 +16725,9 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:189
msgid ""
-"Apply to the working tree and the index the changes introduced by the second"
-" last commit pointed to by master and by the last commit pointed to by next,"
-" but do not create any commit with these changes."
+"Apply to the working tree and the index the changes introduced by the second "
+"last commit pointed to by master and by the last commit pointed to by next, "
+"but do not create any commit with these changes."
msgstr ""
"Aplique 횪 찼rvore de trabalho e ao 챠ndice as altera챌천es introduzidas pela "
"segunda 첬ltima confirma챌찾o apontada pelo mestre e pela 첬ltima confirma챌찾o "
@@ -16830,8 +16763,8 @@ msgstr ""
#: en/git-cherry-pick.txt:204
msgid ""
"Apply the changes introduced by all commits on the master branch that "
-"touched README to the working tree and index, so the result can be inspected"
-" and made into a single new commit if suitable."
+"touched README to the working tree and index, so the result can be inspected "
+"and made into a single new commit if suitable."
msgstr ""
"Aplique as altera챌천es introduzidas por todas as confirma챌천es no ramo "
"principal que tocaram no README para a 찼rvore de trabalho e o 챠ndice, para "
@@ -16862,8 +16795,8 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:219
msgid ""
-"apply the change that would be shown by `git show topic^`. In this example,"
-" the patch does not apply cleanly, so information about the conflict is "
+"apply the change that would be shown by `git show topic^`. In this example, "
+"the patch does not apply cleanly, so information about the conflict is "
"written to the index and working tree and no new commit results."
msgstr ""
"aplique a mudan챌a que seria mostrada pelo `git mostra t처picos ^`. Neste "
@@ -16889,8 +16822,8 @@ msgstr ""
#. type: Plain text
#: en/git-cherry-pick.txt:226
msgid ""
-"try to apply the change introduced by `topic^` again, spending extra time to"
-" avoid mistakes based on incorrectly matching context lines."
+"try to apply the change introduced by `topic^` again, spending extra time to "
+"avoid mistakes based on incorrectly matching context lines."
msgstr ""
"tente aplicar a mudan챌a introduzida por `topic^` novamente, gastando tempo "
"extra para evitar erros baseados em linhas de contexto correspondentes "
@@ -16898,7 +16831,7 @@ msgstr ""
#. type: Title =
#: en/git-cherry.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-cherry(1)"
msgstr "git-cherry(1)"
@@ -16926,20 +16859,20 @@ msgstr ""
#: en/git-cherry.txt:22
msgid ""
"The equivalence test is based on the diff, after removing whitespace and "
-"line numbers. git-cherry therefore detects when commits have been "
-"\"copied\" by means of linkgit:git-cherry-pick[1], linkgit:git-am[1] or "
-"linkgit:git-rebase[1]."
+"line numbers. git-cherry therefore detects when commits have been \"copied"
+"\" by means of linkgit:git-cherry-pick[1], linkgit:git-am[1] or linkgit:git-"
+"rebase[1]."
msgstr ""
"O teste de equival챗ncia 챕 baseado no diff, depois de remover os espa챌os em "
"branco e os n첬meros das linhas. O git-cherry, portanto, detecta quando os "
-"commits foram \"copiados\" por meio do linkgit:git-cherry-pick[1], linkgit"
-":git-am[1] ou linkgit:git-rebase[1]."
+"commits foram \"copiados\" por meio do linkgit:git-cherry-pick[1], linkgit:"
+"git-am[1] ou linkgit:git-rebase[1]."
#. type: Plain text
#: en/git-cherry.txt:26
msgid ""
-"Outputs the SHA1 of every commit in `<limit>..<head>`, prefixed with `-` for"
-" commits that have an equivalent in <upstream>, and `+` for commits that do "
+"Outputs the SHA1 of every commit in `<limit>..<head>`, prefixed with `-` for "
+"commits that have an equivalent in <upstream>, and `+` for commits that do "
"not."
msgstr ""
"Gera o SHA1 de cada commit em `<limite> .. <head>`, prefixado com `-` para "
@@ -16991,10 +16924,10 @@ msgstr "Fluxos de trabalho de patch"
#. type: Plain text
#: en/git-cherry.txt:52
msgid ""
-"git-cherry is frequently used in patch-based workflows (see "
-"linkgit:gitworkflows[7]) to determine if a series of patches has been "
-"applied by the upstream maintainer. In such a workflow you might create and"
-" send a topic branch like this:"
+"git-cherry is frequently used in patch-based workflows (see linkgit:"
+"gitworkflows[7]) to determine if a series of patches has been applied by the "
+"upstream maintainer. In such a workflow you might create and send a topic "
+"branch like this:"
msgstr ""
"O git-cherry 챕 freq체entemente usado em fluxos de trabalho baseados em "
"patches (veja linkgit:gitworkflows[7]) para determinar se uma s챕rie de "
@@ -17090,8 +17023,8 @@ msgstr ""
msgid ""
"Here, we see that the commits A and C (marked with `-`) can be dropped from "
"your `topic` branch when you rebase it on top of `origin/master`, while the "
-"commit B (marked with `+`) still needs to be kept so that it will be sent to"
-" be applied to `origin/master`."
+"commit B (marked with `+`) still needs to be kept so that it will be sent to "
+"be applied to `origin/master`."
msgstr ""
"Aqui, vemos que os commits A e C (marcados com `-`) podem ser removidos de "
"sua ramifica챌찾o` topic` quando voc챗 rebase em cima de `origidm/master`, "
@@ -17108,8 +17041,8 @@ msgstr "Usando um limite"
#: en/git-cherry.txt:110
msgid ""
"The optional <limit> is useful in cases where your topic is based on other "
-"work that is not in upstream. Expanding on the previous example, this might"
-" look like:"
+"work that is not in upstream. Expanding on the previous example, this might "
+"look like:"
msgstr ""
"O <limite> opcional 챕 첬til nos casos em que seu t처pico 챕 baseado em outro "
"trabalho que n찾o est찼 no desenvolvimento. Expandindo o exemplo anterior, "
@@ -17160,7 +17093,7 @@ msgstr ""
#. type: Title =
#: en/git-citool.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-citool(1)"
msgstr "git-citool(1)"
@@ -17178,10 +17111,10 @@ msgstr ""
#. type: Plain text
#: en/git-citool.txt:19
msgid ""
-"A Tcl/Tk based graphical interface to review modified files, stage them into"
-" the index, enter a commit message and record the new commit onto the "
-"current branch. This interface is an alternative to the less interactive "
-"'git commit' program."
+"A Tcl/Tk based graphical interface to review modified files, stage them into "
+"the index, enter a commit message and record the new commit onto the current "
+"branch. This interface is an alternative to the less interactive 'git "
+"commit' program."
msgstr ""
"Uma interface gr찼fica baseada em Tcl/Tk para revisar arquivos modificados, "
"coloc찼-los no 챠ndice, inserir uma mensagem de confirma챌찾o e registrar o novo "
@@ -17191,15 +17124,15 @@ msgstr ""
#. type: Plain text
#: en/git-citool.txt:22
msgid ""
-"'git citool' is actually a standard alias for `git gui citool`. See "
-"linkgit:git-gui[1] for more details."
+"'git citool' is actually a standard alias for `git gui citool`. See linkgit:"
+"git-gui[1] for more details."
msgstr ""
"'git citool' 챕 na verdade um pseud척nimo padr찾o para `git gui citool`. Veja "
"linkgit:git-gui[1] para mais detalhes."
#. type: Title =
#: en/git-clean.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-clean(1)"
msgstr "git-clean(1)"
@@ -17211,9 +17144,7 @@ msgstr "git-clean - Remove arquivos n찾o rastreados da 찼rvore de trabalho"
#. type: Plain text
#: en/git-clean.txt:12
#, no-wrap
-msgid ""
-"'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] "
-"<path>...\n"
+msgid "'git clean' [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <path>...\n"
msgstr ""
#. type: Plain text
@@ -17251,8 +17182,8 @@ msgstr ""
msgid ""
"Remove untracked directories in addition to untracked files. If an "
"untracked directory is managed by a different Git repository, it is not "
-"removed by default. Use -f option twice if you really want to remove such a"
-" directory."
+"removed by default. Use -f option twice if you really want to remove such a "
+"directory."
msgstr ""
"Remova os diret처rios n찾o acompanhados, al챕m dos arquivos n찾o acompanhados. "
"Se um diret처rio n찾o rastreado for gerenciado por um reposit처rio Git "
@@ -17264,8 +17195,8 @@ msgstr ""
msgid ""
"If the Git configuration variable clean.requireForce is not set to false, "
"'git clean' will refuse to delete files or directories unless given -f, -n "
-"or -i. Git will refuse to delete directories with .git sub directory or file"
-" unless a second -f is given."
+"or -i. Git will refuse to delete directories with .git sub directory or file "
+"unless a second -f is given."
msgstr ""
"Se a vari찼vel de configura챌찾o do Git, clean.requireForce, n찾o estiver "
"definida como false, o 'git clean' recusar찼 a exclus찾o de arquivos ou "
@@ -17311,9 +17242,9 @@ msgstr "--excluir=<pattern>"
#. type: Plain text
#: en/git-clean.txt:61
msgid ""
-"In addition to those found in .gitignore (per directory) and "
-"$GIT_DIR/info/exclude, also consider these patterns to be in the set of the "
-"ignore rules in effect."
+"In addition to those found in .gitignore (per directory) and $GIT_DIR/info/"
+"exclude, also consider these patterns to be in the set of the ignore rules "
+"in effect."
msgstr ""
"Al챕m dos encontrados em .gitignore (por diret처rio) e $GIT_DIR/info/excluir, "
"considere tamb챕m que esses padr천es estejam no conjunto das regras de ignorar "
@@ -17322,18 +17253,18 @@ msgstr ""
#. type: Plain text
#: en/git-clean.txt:69
msgid ""
-"Don't use the standard ignore rules read from .gitignore (per directory) and"
-" $GIT_DIR/info/exclude, but do still use the ignore rules given with `-e` "
+"Don't use the standard ignore rules read from .gitignore (per directory) and "
+"$GIT_DIR/info/exclude, but do still use the ignore rules given with `-e` "
"options. This allows removing all untracked files, including build "
"products. This can be used (possibly in conjunction with 'git reset') to "
"create a pristine working directory to test a clean build."
msgstr ""
-"N찾o use as regras padr찾o de ignorar lidas de .gitignore (por diret처rio) e $"
-"GIT_DIR/info/excluir, mas ainda use as regras de ignorar dadas com as op챌천es "
-"`-e`. Isso permite remover todos os arquivos n찾o acompanhados, incluindo "
-"produtos de cria챌찾o. Isso pode ser usado (possivelmente em conjunto com "
-"'git reset') para criar um diret처rio de trabalho primitivo para testar uma "
-"compila챌찾o limpa."
+"N찾o use as regras padr찾o de ignorar lidas de .gitignore (por diret처rio) e "
+"$GIT_DIR/info/excluir, mas ainda use as regras de ignorar dadas com as "
+"op챌천es `-e`. Isso permite remover todos os arquivos n찾o acompanhados, "
+"incluindo produtos de cria챌찾o. Isso pode ser usado (possivelmente em "
+"conjunto com 'git reset') para criar um diret처rio de trabalho primitivo para "
+"testar uma compila챌찾o limpa."
#. type: Labeled list
#: en/git-clean.txt:70
@@ -17410,12 +17341,12 @@ msgstr "filtrar por padr찾o"
msgid ""
"This shows the files and directories to be deleted and issues an \"Input "
"ignore patterns>>\" prompt. You can input space-separated patterns to "
-"exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes"
-" files end with \".c\" and \".h\" from deletion. When you are satisfied with"
-" the filtered result, press ENTER (empty) back to the main menu."
+"exclude files and directories from deletion. E.g. \"*.c *.h\" will excludes "
+"files end with \".c\" and \".h\" from deletion. When you are satisfied with "
+"the filtered result, press ENTER (empty) back to the main menu."
msgstr ""
-"Isso mostra os arquivos e diret처rios a serem exclu챠dos e emite um aviso \""
-"Input ignore patterns >>\". Voc챗 pode inserir padr천es separados por espa챌o "
+"Isso mostra os arquivos e diret처rios a serem exclu챠dos e emite um aviso "
+"\"Input ignore patterns >>\". Voc챗 pode inserir padr천es separados por espa챌o "
"para excluir arquivos e diret처rios da exclus찾o. Por exemplo. \"*.c *.h\" "
"excluir찼 os arquivos com \".c\" e \".h\" da exclus찾o. Quando estiver "
"satisfeito com o resultado filtrado, pressione ENTER (vazio) de volta ao "
@@ -17431,23 +17362,23 @@ msgstr "selecione por n첬meros"
#: en/git-clean.txt:120
msgid ""
"This shows the files and directories to be deleted and issues an \"Select "
-"items to delete>>\" prompt. When the prompt ends with double '>>' like this,"
-" you can make more than one selection, concatenated with whitespace or "
+"items to delete>>\" prompt. When the prompt ends with double '>>' like this, "
+"you can make more than one selection, concatenated with whitespace or "
"comma. Also you can say ranges. E.g. \"2-5 7,9\" to choose 2,3,4,5,7,9 "
"from the list. If the second number in a range is omitted, all remaining "
-"items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say"
-" '*' to choose everything. Also when you are satisfied with the filtered "
+"items are selected. E.g. \"7-\" to choose 7,8,9 from the list. You can say "
+"'*' to choose everything. Also when you are satisfied with the filtered "
"result, press ENTER (empty) back to the main menu."
msgstr ""
-"Isso mostra os arquivos e diret처rios a serem exclu챠dos e emite um prompt \""
-"Selecionar itens para excluir>>\". Quando o prompt terminar com '>>' duplo, "
-"voc챗 poder찼 fazer mais de uma sele챌찾o, concatenada com espa챌o em branco ou "
-"v챠rgula. Al챕m disso, voc챗 pode dizer intervalos. Por exemplo. \"2-5 7,9\" "
-"para escolher 2,3,4,5,7,9 da lista. Se o segundo n첬mero de um intervalo for "
-"omitido, todos os itens restantes ser찾o selecionados. Por exemplo. \"7-\" "
-"para escolher 7,8,9 da lista. Voc챗 pode dizer '*' para escolher tudo. Al챕m "
-"disso, quando estiver satisfeito com o resultado filtrado, pressione ENTER "
-"(vazio) de volta ao menu principal."
+"Isso mostra os arquivos e diret처rios a serem exclu챠dos e emite um prompt "
+"\"Selecionar itens para excluir>>\". Quando o prompt terminar com '>>' "
+"duplo, voc챗 poder찼 fazer mais de uma sele챌찾o, concatenada com espa챌o em "
+"branco ou v챠rgula. Al챕m disso, voc챗 pode dizer intervalos. Por exemplo. "
+"\"2-5 7,9\" para escolher 2,3,4,5,7,9 da lista. Se o segundo n첬mero de um "
+"intervalo for omitido, todos os itens restantes ser찾o selecionados. Por "
+"exemplo. \"7-\" para escolher 7,8,9 da lista. Voc챗 pode dizer '*' para "
+"escolher tudo. Al챕m disso, quando estiver satisfeito com o resultado "
+"filtrado, pressione ENTER (vazio) de volta ao menu principal."
#. type: Labeled list
#: en/git-clean.txt:121
@@ -17458,8 +17389,8 @@ msgstr "pergunte a cada"
#. type: Plain text
#: en/git-clean.txt:126
msgid ""
-"This will start to clean, and you must confirm one by one in order to delete"
-" items. Please note that this action is not as efficient as the above two "
+"This will start to clean, and you must confirm one by one in order to delete "
+"items. Please note that this action is not as efficient as the above two "
"actions."
msgstr ""
"Isso come챌ar찼 a ser limpo e voc챗 dever찼 confirmar um por um para excluir "
@@ -17490,13 +17421,12 @@ msgstr "Mostrar um breve uso do git-limpo interativo."
#. type: Plain text
#: en/git-clean.txt:138 en/git-status.txt:432
-#, ignore-same
msgid "linkgit:gitignore[5]"
msgstr "linkgit:gitignore[5]"
#. type: Title =
#: en/git-clone.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-clone(1)"
msgstr "git-clone(1)"
@@ -17522,8 +17452,8 @@ msgstr ""
#: en/git-clone.txt:28
msgid ""
"Clones a repository into a newly created directory, creates remote-tracking "
-"branches for each branch in the cloned repository (visible using `git branch"
-" -r`), and creates and checks out an initial branch that is forked from the "
+"branches for each branch in the cloned repository (visible using `git branch "
+"-r`), and creates and checks out an initial branch that is forked from the "
"cloned repository's currently active branch."
msgstr ""
"Clona um reposit처rio em um diret처rio rec챕m-criado, cria ramifica챌천es de "
@@ -17541,15 +17471,15 @@ msgid ""
msgstr ""
"Ap처s o clone, uma simples `git buscar` sem argumentos atualizar찼 todas as "
"ramifica챌천es de controle remoto, e um` git puxar` sem argumentos ir찼, al챕m "
-"disso, mesclar a ramifica챌찾o mestre remota na ramifica챌찾o atual, se houver ("
-"isto n찾o 챕 verdade quando \"- 첬nico ramo\" 챕 dado; veja abaixo)."
+"disso, mesclar a ramifica챌찾o mestre remota na ramifica챌찾o atual, se houver "
+"(isto n찾o 챕 verdade quando \"- 첬nico ramo\" 챕 dado; veja abaixo)."
#. type: Plain text
#: en/git-clone.txt:39
msgid ""
"This default configuration is achieved by creating references to the remote "
-"branch heads under `refs/remotes/origin` and by initializing "
-"`remote.origin.url` and `remote.origin.fetch` configuration variables."
+"branch heads under `refs/remotes/origin` and by initializing `remote.origin."
+"url` and `remote.origin.fetch` configuration variables."
msgstr ""
"Esta configura챌찾o padr찾o 챕 obtida atrav챕s da cria챌찾o de refer챗ncias aos "
"cabe챌alhos de ramifica챌천es remotas em `refs/remotos/origem` e inicializando "
@@ -17558,7 +17488,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:43 en/git-config.txt:127 en/git-instaweb.txt:24
#: en/git-pack-objects.txt:142 en/git-svn.txt:245
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--local"
msgstr "--local"
@@ -17580,11 +17510,11 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:58
msgid ""
-"If the repository is specified as a local path (e.g., `/path/to/repo`), this"
-" is the default, and --local is essentially a no-op. If the repository is "
+"If the repository is specified as a local path (e.g., `/path/to/repo`), this "
+"is the default, and --local is essentially a no-op. If the repository is "
"specified as a URL, then this flag is ignored (and we never use the local "
-"optimizations). Specifying `--no-local` will override the default when "
-"`/path/to/repo` is given, using the regular Git transport instead."
+"optimizations). Specifying `--no-local` will override the default when `/"
+"path/to/repo` is given, using the regular Git transport instead."
msgstr ""
"Se o reposit처rio for especificado como um caminho local (por exemplo, `/path/"
"to/repo`), este 챕 o padr찾o, e --local 챕 essencialmente um n찾o operacional. "
@@ -17595,7 +17525,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:59
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-hardlinks"
msgstr "--no-hardlinks"
@@ -17604,8 +17534,7 @@ msgstr "--no-hardlinks"
msgid ""
"Force the cloning process from a repository on a local filesystem to copy "
"the files under the `.git/objects` directory instead of using hardlinks. "
-"This may be desirable if you are trying to make a back-up of your "
-"repository."
+"This may be desirable if you are trying to make a back-up of your repository."
msgstr ""
"For챌a o processo de clonagem de um reposit처rio em um sistema de arquivos "
"local para copiar os arquivos sob o diret처rio `.git/objetos` em vez de usar "
@@ -17614,7 +17543,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:65
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--shared"
msgstr "--shared"
@@ -17650,9 +17579,9 @@ msgstr ""
#: en/git-clone.txt:88
msgid ""
"Note that running `git repack` without the `-l` option in a repository "
-"cloned with `-s` will copy objects from the source repository into a pack in"
-" the cloned repository, removing the disk space savings of `clone -s`. It "
-"is safe, however, to run `git gc`, which uses the `-l` option by default."
+"cloned with `-s` will copy objects from the source repository into a pack in "
+"the cloned repository, removing the disk space savings of `clone -s`. It is "
+"safe, however, to run `git gc`, which uses the `-l` option by default."
msgstr ""
"Note que executar o `git reempacotamento` sem a op챌찾o `-l` em um reposit처rio "
"clonado com `-s` copiar찼 objetos do reposit처rio de origem em um pacote no "
@@ -17680,8 +17609,8 @@ msgstr "--refer챗ncia [-if-able] <reposit처rio>"
#. type: Plain text
#: en/git-clone.txt:103
msgid ""
-"If the reference repository is on the local machine, automatically setup "
-"`.git/objects/info/alternates` to obtain objects from the reference "
+"If the reference repository is on the local machine, automatically setup `."
+"git/objects/info/alternates` to obtain objects from the reference "
"repository. Using an already existing repository as an alternate will "
"require fewer objects to be copied from the repository being cloned, "
"reducing network and local storage costs. When using the `--reference-if-"
@@ -17708,20 +17637,20 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:107 en/git-submodule.txt:380
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--dissociate"
msgstr "--dissociate"
#. type: Plain text
#: en/git-clone.txt:117
msgid ""
-"Borrow the objects from reference repositories specified with the "
-"`--reference` options only to reduce network transfer, and stop borrowing "
-"from them after a clone is made by making necessary local copies of borrowed"
-" objects. This option can also be used when cloning locally from a "
+"Borrow the objects from reference repositories specified with the `--"
+"reference` options only to reduce network transfer, and stop borrowing from "
+"them after a clone is made by making necessary local copies of borrowed "
+"objects. This option can also be used when cloning locally from a "
"repository that already borrows objects from another repository--the new "
-"repository will borrow objects from the same repository, and this option can"
-" be used to stop the borrowing."
+"repository will borrow objects from the same repository, and this option can "
+"be used to stop the borrowing."
msgstr ""
"Emprestar os objetos dos reposit처rios de refer챗ncia especificados com as "
"op챌천es `--reference` somente para reduzir a transfer챗ncia de rede e parar de "
@@ -17752,7 +17681,7 @@ msgstr "Nenhum checkout de HEAD 챕 executado ap처s o clone estar completo."
#. type: Labeled list
#: en/git-clone.txt:138 en/git-init.txt:46 en/git-p4.txt:305 en/git.txt:133
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--bare"
msgstr "--bare"
@@ -17761,25 +17690,24 @@ msgstr "--bare"
msgid ""
"Make a 'bare' Git repository. That is, instead of creating `<directory>` "
"and placing the administrative files in `<directory>/.git`, make the "
-"`<directory>` itself the `$GIT_DIR`. This obviously implies the `-n` because"
-" there is nowhere to check out the working tree. Also the branch heads at "
+"`<directory>` itself the `$GIT_DIR`. This obviously implies the `-n` because "
+"there is nowhere to check out the working tree. Also the branch heads at "
"the remote are copied directly to corresponding local branch heads, without "
"mapping them to `refs/remotes/origin/`. When this option is used, neither "
-"remote-tracking branches nor the related configuration variables are "
-"created."
+"remote-tracking branches nor the related configuration variables are created."
msgstr ""
"Fa챌a um reposit처rio 'bare' Git. Isto 챕, ao inv챕s de criar o `<directory>` e "
"colocar os arquivos administrativos em `<directory>/.git`, fa챌a o pr처prio` "
"<directory> `o` $GIT_DIR`. Isto obviamente implica o `-n` porque n찾o h찼 "
"nenhum lugar para verificar a 찼rvore de trabalho. Al챕m disso, as cabe챌as de "
"ramifica챌찾o no controle remoto s찾o copiadas diretamente para as cabe챌as de "
-"ramifica챌찾o locais correspondentes, sem mape찼-las para `refs/remotes/origin/`"
-". Quando essa op챌찾o 챕 usada, nem as ramifica챌천es de rastreamento remoto nem "
-"as vari찼veis de configura챌찾o relacionadas s찾o criadas."
+"ramifica챌찾o locais correspondentes, sem mape찼-las para `refs/remotes/origin/"
+"`. Quando essa op챌찾o 챕 usada, nem as ramifica챌천es de rastreamento remoto "
+"nem as vari찼veis de configura챌찾o relacionadas s찾o criadas."
#. type: Labeled list
#: en/git-clone.txt:150 en/git-push.txt:161
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--mirror"
msgstr "--mirror"
@@ -17790,15 +17718,14 @@ msgid ""
"to `--bare`, `--mirror` not only maps local branches of the source to local "
"branches of the target, it maps all refs (including remote-tracking "
"branches, notes etc.) and sets up a refspec configuration such that all "
-"these refs are overwritten by a `git remote update` in the target "
-"repository."
+"these refs are overwritten by a `git remote update` in the target repository."
msgstr ""
"Configure um espelho do reposit처rio de origem. Isso implica `--bare`. \n"
" Comparado com `--bare`,` --mirror` n찾o apenas mapeia as ramifica챌천es locais "
-"da origem para as ramifica챌천es locais do destino, ele mapeia todas as refs ("
-"incluindo ramifica챌천es de controle remoto, notas, etc.) e configura uma "
-"configura챌찾o de refspec como que todos esses refs s찾o sobrescritos por um `"
-"git remote update` no reposit처rio de destino."
+"da origem para as ramifica챌천es locais do destino, ele mapeia todas as refs "
+"(incluindo ramifica챌천es de controle remoto, notas, etc.) e configura uma "
+"configura챌찾o de refspec como que todos esses refs s찾o sobrescritos por um "
+"`git remote update` no reposit처rio de destino."
#. type: Labeled list
#: en/git-clone.txt:158
@@ -17870,8 +17797,8 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:181
msgid ""
-"Specify the directory from which templates will be used; (See the \"TEMPLATE"
-" DIRECTORY\" section of linkgit:git-init[1].)"
+"Specify the directory from which templates will be used; (See the \"TEMPLATE "
+"DIRECTORY\" section of linkgit:git-init[1].)"
msgstr ""
#. type: Labeled list
@@ -17903,8 +17830,8 @@ msgstr ""
msgid ""
"Due to limitations of the current implementation, some configuration "
"variables do not take effect until after the initial fetch and checkout. "
-"Configuration variables known to not take effect are: `remote.<name>.mirror`"
-" and `remote.<name>.tagOpt`. Use the corresponding `--mirror` and `--no-"
+"Configuration variables known to not take effect are: `remote.<name>.mirror` "
+"and `remote.<name>.tagOpt`. Use the corresponding `--mirror` and `--no-"
"tags` options instead."
msgstr ""
@@ -17917,8 +17844,8 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:205
msgid ""
-"Create a 'shallow' clone with a history truncated to the specified number of"
-" commits. Implies `--single-branch` unless `--no-single-branch` is given to "
+"Create a 'shallow' clone with a history truncated to the specified number of "
+"commits. Implies `--single-branch` unless `--no-single-branch` is given to "
"fetch the histories near the tips of all branches. If you want to clone "
"submodules shallowly, also pass `--shallow-submodules`."
msgstr ""
@@ -17932,13 +17859,12 @@ msgstr ""
#: en/git-clone.txt:213
msgid ""
"Create a shallow clone with a history, excluding commits reachable from a "
-"specified remote branch or tag. This option can be specified multiple "
-"times."
+"specified remote branch or tag. This option can be specified multiple times."
msgstr ""
#. type: Labeled list
#: en/git-clone.txt:214
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]single-branch"
msgstr "--[no-]single-branch"
@@ -17949,8 +17875,8 @@ msgid ""
"specified by the `--branch` option or the primary branch remote's `HEAD` "
"points at. Further fetches into the resulting repository will only update "
"the remote-tracking branch for the branch this option was used for the "
-"initial cloning. If the HEAD at the remote did not point at any branch when"
-" `--single-branch` clone was made, no remote-tracking branch is created."
+"initial cloning. If the HEAD at the remote did not point at any branch when "
+"`--single-branch` clone was made, no remote-tracking branch is created."
msgstr ""
#. type: Plain text
@@ -17967,8 +17893,8 @@ msgstr ""
msgid ""
"Can be used in conjunction with `--single-branch` to clone and maintain a "
"branch with no references other than a single cloned branch. This is useful "
-"e.g. to maintain minimal clones of the default branch of some repository for"
-" search indexing."
+"e.g. to maintain minimal clones of the default branch of some repository for "
+"search indexing."
msgstr ""
#. type: Labeled list
@@ -18000,7 +17926,7 @@ msgstr ""
#. type: Labeled list
#: en/git-clone.txt:252
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]shallow-submodules"
msgstr "--[no-]shallow-submodules"
@@ -18069,8 +17995,8 @@ msgstr ""
#: en/git-clone.txt:278
msgid ""
"The name of a new directory to clone into. The \"humanish\" part of the "
-"source repository is used if no directory is explicitly given (`repo` for "
-"`/path/to/repo.git` and `foo` for `host.xz:foo/.git`). Cloning into an "
+"source repository is used if no directory is explicitly given (`repo` for `/"
+"path/to/repo.git` and `foo` for `host.xz:foo/.git`). Cloning into an "
"existing directory is only allowed if the directory is empty."
msgstr ""
@@ -18091,8 +18017,8 @@ msgstr ""
#. type: Plain text
#: en/git-clone.txt:295
msgid ""
-"Make a local clone that borrows from the current directory, without checking"
-" things out:"
+"Make a local clone that borrows from the current directory, without checking "
+"things out:"
msgstr ""
#. type: delimited block -
@@ -18132,7 +18058,7 @@ msgstr ""
#. type: Title =
#: en/git-column.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-column(1)"
msgstr "git-column(1)"
@@ -18153,8 +18079,8 @@ msgstr ""
#: en/git-column.txt:20
msgid ""
"This command formats the lines of its standard input into a table with "
-"multiple columns. Each input line occupies one cell of the table. It is used"
-" internally by other git commands to format output into columns."
+"multiple columns. Each input line occupies one cell of the table. It is used "
+"internally by other git commands to format output into columns."
msgstr ""
#. type: Labeled list
@@ -18166,8 +18092,7 @@ msgstr ""
#. type: Plain text
#: en/git-column.txt:26
msgid ""
-"Look up layout mode using configuration variable column.<name> and "
-"column.ui."
+"Look up layout mode using configuration variable column.<name> and column.ui."
msgstr ""
#. type: Labeled list
@@ -18205,8 +18130,8 @@ msgstr ""
#. type: Plain text
#: en/git-column.txt:38
msgid ""
-"Specify the terminal width. By default 'git column' will detect the terminal"
-" width, or fall back to 80 if it is unable to do so."
+"Specify the terminal width. By default 'git column' will detect the terminal "
+"width, or fall back to 80 if it is unable to do so."
msgstr ""
#. type: Labeled list
@@ -18291,7 +18216,7 @@ msgstr ""
#. type: Title =
#: en/git-commit-tree.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-commit-tree(1)"
msgstr "git-commit-tree(1)"
@@ -18312,8 +18237,8 @@ msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:21
msgid ""
-"This is usually not what an end user wants to run directly. See "
-"linkgit:git-commit[1] instead."
+"This is usually not what an end user wants to run directly. See linkgit:git-"
+"commit[1] instead."
msgstr ""
#. type: Plain text
@@ -18335,15 +18260,15 @@ msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:34
msgid ""
-"While a tree represents a particular directory state of a working directory,"
-" a commit represents that state in \"time\", and explains how to get there."
+"While a tree represents a particular directory state of a working directory, "
+"a commit represents that state in \"time\", and explains how to get there."
msgstr ""
#. type: Plain text
#: en/git-commit-tree.txt:40
msgid ""
-"Normally a commit would identify a new \"HEAD\" state, and while Git doesn't"
-" care where you save the note about that state, in practice we tend to just "
+"Normally a commit would identify a new \"HEAD\" state, and while Git doesn't "
+"care where you save the note about that state, in practice we tend to just "
"write the result to the file that is pointed at by `.git/HEAD`, so that we "
"can always see what the last committed state was."
msgstr ""
@@ -18399,7 +18324,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit-tree.txt:63 en/git-commit.txt:339
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-gpg-sign"
msgstr "--no-gpg-sign"
@@ -18466,10 +18391,9 @@ msgstr ""
msgid ""
"In case (some of) these environment variables are not set, the information "
"is taken from the configuration items user.name and user.email, or, if not "
-"present, the environment variable EMAIL, or, if that is not set, system user"
-" name and the hostname used for outgoing mail (taken from `/etc/mailname` "
-"and falling back to the fully qualified hostname when that file does not "
-"exist)."
+"present, the environment variable EMAIL, or, if that is not set, system user "
+"name and the hostname used for outgoing mail (taken from `/etc/mailname` and "
+"falling back to the fully qualified hostname when that file does not exist)."
msgstr ""
#. type: Plain text
@@ -18501,7 +18425,7 @@ msgstr ""
#. type: Title =
#: en/git-commit.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-commit(1)"
msgstr "git-commit(1)"
@@ -18527,9 +18451,9 @@ msgstr ""
msgid ""
"Create a new commit containing the current contents of the index and the "
"given log message describing the changes. The new commit is a direct child "
-"of HEAD, usually the tip of the current branch, and the branch is updated to"
-" point to it (unless no branch is associated with the working tree, in which"
-" case HEAD is \"detached\" as described in linkgit:git-checkout[1])."
+"of HEAD, usually the tip of the current branch, and the branch is updated to "
+"point to it (unless no branch is associated with the working tree, in which "
+"case HEAD is \"detached\" as described in linkgit:git-checkout[1])."
msgstr ""
#. type: Plain text
@@ -18541,8 +18465,8 @@ msgstr ""
#: en/git-commit.txt:32
msgid ""
"by using linkgit:git-add[1] to incrementally \"add\" changes to the index "
-"before using the 'commit' command (Note: even modified files must be "
-"\"added\");"
+"before using the 'commit' command (Note: even modified files must be \"added"
+"\");"
msgstr ""
#. type: Plain text
@@ -18555,10 +18479,10 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:41
msgid ""
-"by listing files as arguments to the 'commit' command (without --interactive"
-" or --patch switch), in which case the commit will ignore changes staged in "
-"the index, and instead record the current content of the listed files (which"
-" must already be known to Git);"
+"by listing files as arguments to the 'commit' command (without --interactive "
+"or --patch switch), in which case the commit will ignore changes staged in "
+"the index, and instead record the current content of the listed files (which "
+"must already be known to Git);"
msgstr ""
#. type: Plain text
@@ -18566,8 +18490,8 @@ msgstr ""
msgid ""
"by using the -a switch with the 'commit' command to automatically \"add\" "
"changes from all known files (i.e. all files that are already listed in the "
-"index) and to automatically \"rm\" files in the index that have been removed"
-" from the working tree, and then perform the actual commit;"
+"index) and to automatically \"rm\" files in the index that have been removed "
+"from the working tree, and then perform the actual commit;"
msgstr ""
#. type: Plain text
@@ -18584,15 +18508,15 @@ msgstr ""
#: en/git-commit.txt:57
msgid ""
"The `--dry-run` option can be used to obtain a summary of what is included "
-"by any of the above for the next commit by giving the same set of parameters"
-" (options and paths)."
+"by any of the above for the next commit by giving the same set of parameters "
+"(options and paths)."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:60
msgid ""
-"If you make a commit and then find a mistake immediately after that, you can"
-" recover from it with 'git reset'."
+"If you make a commit and then find a mistake immediately after that, you can "
+"recover from it with 'git reset'."
msgstr ""
#. type: Plain text
@@ -18624,8 +18548,8 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:81
msgid ""
-"Take an existing commit object, and reuse the log message and the authorship"
-" information (including the timestamp) when creating the commit."
+"Take an existing commit object, and reuse the log message and the authorship "
+"information (including the timestamp) when creating the commit."
msgstr ""
#. type: Labeled list
@@ -18643,8 +18567,8 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:86
msgid ""
-"Like '-C', but with `-c` the editor is invoked, so that the user can further"
-" edit the commit message."
+"Like '-C', but with `-c` the editor is invoked, so that the user can further "
+"edit the commit message."
msgstr ""
#. type: Labeled list
@@ -18672,27 +18596,27 @@ msgstr ""
msgid ""
"Construct a commit message for use with `rebase --autosquash`. The commit "
"message subject line is taken from the specified commit with a prefix of "
-"\"squash! \". Can be used with additional commit message options "
-"(`-m`/`-c`/`-C`/`-F`). See linkgit:git-rebase[1] for details."
+"\"squash! \". Can be used with additional commit message options (`-m`/`-c`/"
+"`-C`/`-F`). See linkgit:git-rebase[1] for details."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:100
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--reset-author"
msgstr "--reset-author"
#. type: Plain text
#: en/git-commit.txt:105
msgid ""
-"When used with -C/-c/--amend options, or when committing after a conflicting"
-" cherry-pick, declare that the authorship of the resulting commit now "
-"belongs to the committer. This also renews the author timestamp."
+"When used with -C/-c/--amend options, or when committing after a conflicting "
+"cherry-pick, declare that the authorship of the resulting commit now belongs "
+"to the committer. This also renews the author timestamp."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:106 en/git-status.txt:28 en/git-symbolic-ref.txt:45
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--short"
msgstr "--short"
@@ -18705,7 +18629,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:110 en/git-status.txt:32 en/git-submodule.txt:259
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--branch"
msgstr "--branch"
@@ -18724,7 +18648,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:118 en/git-describe.txt:87 en/git-ls-tree.txt:52
#: en/git-status.txt:47
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--long"
msgstr "--long"
@@ -18737,7 +18661,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:123 en/git-config.txt:207 en/git-grep.txt:207
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--null"
msgstr "--null"
@@ -18745,8 +18669,8 @@ msgstr "--null"
#: en/git-commit.txt:130
msgid ""
"When showing `short` or `porcelain` status output, print the filename "
-"verbatim and terminate the entries with NUL, instead of LF. If no format is"
-" given, implies the `--porcelain` output format. Without the `-z` option, "
+"verbatim and terminate the entries with NUL, instead of LF. If no format is "
+"given, implies the `--porcelain` output format. Without the `-z` option, "
"filenames with \"unusual\" characters are quoted as explained for the "
"configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
@@ -18774,8 +18698,8 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:142
msgid ""
-"Override the commit author. Specify an explicit author using the standard `A"
-" U Thor <author@example.com>` format. Otherwise <author> is assumed to be a "
+"Override the commit author. Specify an explicit author using the standard `A "
+"U Thor <author@example.com>` format. Otherwise <author> is assumed to be a "
"pattern and is used to search for an existing commit by that author (i.e. "
"rev-list --all -i --author=<author>); the commit author is then copied from "
"the first such commit found."
@@ -18836,10 +18760,10 @@ msgid ""
"When editing the commit message, start the editor with the contents in the "
"given file. The `commit.template` configuration variable is often used to "
"give this option implicitly to the command. This mechanism can be used by "
-"projects that want to guide participants with some hints on what to write in"
-" the message in what order. If the user exits the editor without editing "
-"the message, the commit is aborted. This has no effect when a message is "
-"given by other means, e.g. with the `-m` or `-F` options."
+"projects that want to guide participants with some hints on what to write in "
+"the message in what order. If the user exits the editor without editing the "
+"message, the commit is aborted. This has no effect when a message is given "
+"by other means, e.g. with the `-m` or `-F` options."
msgstr ""
#. type: Plain text
@@ -18848,30 +18772,30 @@ msgid ""
"Add Signed-off-by line by the committer at the end of the commit log "
"message. The meaning of a signoff depends on the project, but it typically "
"certifies that committer has the rights to submit this work under the same "
-"license and agrees to a Developer Certificate of Origin (see "
-"http://developercertificate.org/ for more information)."
+"license and agrees to a Developer Certificate of Origin (see http://"
+"developercertificate.org/ for more information)."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:175 en/git-rebase.txt:325
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-verify"
msgstr "--no-verify"
#. type: Plain text
#: en/git-commit.txt:178
msgid ""
-"This option bypasses the pre-commit and commit-msg hooks. See also "
-"linkgit:githooks[5]."
+"This option bypasses the pre-commit and commit-msg hooks. See also linkgit:"
+"githooks[5]."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:184
msgid ""
"Usually recording a commit that has the exact same tree as its sole parent "
-"commit is a mistake, and the command prevents you from making such a commit."
-" This option bypasses the safety, and is primarily for use by foreign SCM "
-"interface scripts."
+"commit is a mistake, and the command prevents you from making such a "
+"commit. This option bypasses the safety, and is primarily for use by "
+"foreign SCM interface scripts."
msgstr ""
#. type: Plain text
@@ -18975,7 +18899,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:226 en/git-revert.txt:65 en/merge-options.txt:12
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-edit"
msgstr "--no-edit"
@@ -18989,20 +18913,20 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:231
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--amend"
msgstr "--amend"
#. type: Plain text
#: en/git-commit.txt:241
msgid ""
-"Replace the tip of the current branch by creating a new commit. The recorded"
-" tree is prepared as usual (including the effect of the `-i` and `-o` "
-"options and explicit pathspec), and the message from the original commit is "
-"used as the starting point, instead of an empty message, when no other "
-"message is specified from the command line via options such as `-m`, `-F`, "
-"`-c`, etc. The new commit has the same parents and author as the current "
-"one (the `--reset-author` option can countermand this)."
+"Replace the tip of the current branch by creating a new commit. The recorded "
+"tree is prepared as usual (including the effect of the `-i` and `-o` options "
+"and explicit pathspec), and the message from the original commit is used as "
+"the starting point, instead of an empty message, when no other message is "
+"specified from the command line via options such as `-m`, `-F`, `-c`, etc. "
+"The new commit has the same parents and author as the current one (the `--"
+"reset-author` option can countermand this)."
msgstr ""
#. type: Plain text
@@ -19028,13 +18952,13 @@ msgstr ""
#: en/git-commit.txt:256
msgid ""
"You should understand the implications of rewriting history if you amend a "
-"commit that has already been published. (See the \"RECOVERING FROM UPSTREAM"
-" REBASE\" section in linkgit:git-rebase[1].)"
+"commit that has already been published. (See the \"RECOVERING FROM UPSTREAM "
+"REBASE\" section in linkgit:git-rebase[1].)"
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:257
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-post-rewrite"
msgstr "--no-post-rewrite"
@@ -19045,7 +18969,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:261
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--include"
msgstr "--include"
@@ -19059,7 +18983,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:268
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--only"
msgstr "--only"
@@ -19070,8 +18994,8 @@ msgid ""
"specified on the command line, disregarding any contents that have been "
"staged for other paths. This is the default mode of operation of 'git "
"commit' if any paths are given on the command line, in which case this "
-"option can be omitted. If this option is specified together with `--amend`,"
-" then no paths need to be specified, which can be used to amend the last "
+"option can be omitted. If this option is specified together with `--amend`, "
+"then no paths need to be specified, which can be used to amend the last "
"commit without committing changes that have already been staged. If used "
"together with `--allow-empty` paths are also not required, and an empty "
"commit will be created."
@@ -19128,15 +19052,15 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:297 en/git-status.txt:84
msgid ""
-"The default can be changed using the status.showUntrackedFiles configuration"
-" variable documented in linkgit:git-config[1]."
+"The default can be changed using the status.showUntrackedFiles configuration "
+"variable documented in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:308
msgid ""
-"Show unified diff between the HEAD commit and what would be committed at the"
-" bottom of the commit message template to help the user describe the commit "
+"Show unified diff between the HEAD commit and what would be committed at the "
+"bottom of the commit message template to help the user describe the commit "
"by reminding what changes the commit has. Note that this diff output "
"doesn't have its lines prefixed with '#'. This diff will not be a part of "
"the commit message. See the `commit.verbose` configuration variable in "
@@ -19147,8 +19071,7 @@ msgstr ""
#: en/git-commit.txt:312
msgid ""
"If specified twice, show in addition the unified diff between what would be "
-"committed and the worktree files, i.e. the unstaged changes to tracked "
-"files."
+"committed and the worktree files, i.e. the unstaged changes to tracked files."
msgstr ""
#. type: Plain text
@@ -19166,7 +19089,7 @@ msgstr ""
#. type: Labeled list
#: en/git-commit.txt:322
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--status"
msgstr "--status"
@@ -19174,13 +19097,13 @@ msgstr "--status"
#: en/git-commit.txt:327
msgid ""
"Include the output of linkgit:git-status[1] in the commit message template "
-"when using an editor to prepare the commit message. Defaults to on, but can"
-" be used to override configuration variable commit.status."
+"when using an editor to prepare the commit message. Defaults to on, but can "
+"be used to override configuration variable commit.status."
msgstr ""
#. type: Labeled list
#: en/git-commit.txt:328
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-status"
msgstr "--no-status"
@@ -19216,15 +19139,15 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:369
msgid ""
-"When recording your own work, the contents of modified files in your working"
-" tree are temporarily stored to a staging area called the \"index\" with "
-"'git add'. A file can be reverted back, only in the index but not in the "
-"working tree, to that of the last commit with `git reset HEAD -- <file>`, "
-"which effectively reverts 'git add' and prevents the changes to this file "
-"from participating in the next commit. After building the state to be "
-"committed incrementally with these commands, `git commit` (without any "
-"pathname parameter) is used to record what has been staged so far. This is "
-"the most basic form of the command. An example:"
+"When recording your own work, the contents of modified files in your working "
+"tree are temporarily stored to a staging area called the \"index\" with 'git "
+"add'. A file can be reverted back, only in the index but not in the working "
+"tree, to that of the last commit with `git reset HEAD -- <file>`, which "
+"effectively reverts 'git add' and prevents the changes to this file from "
+"participating in the next commit. After building the state to be committed "
+"incrementally with these commands, `git commit` (without any pathname "
+"parameter) is used to record what has been staged so far. This is the most "
+"basic form of the command. An example:"
msgstr ""
#. type: delimited block -
@@ -19242,8 +19165,8 @@ msgstr ""
msgid ""
"Instead of staging files after each individual change, you can tell `git "
"commit` to notice the changes to the files whose contents are tracked in "
-"your working tree and do corresponding `git add` and `git rm` for you. That"
-" is, this example does the same as the earlier example if there is no other "
+"your working tree and do corresponding `git add` and `git rm` for you. That "
+"is, this example does the same as the earlier example if there is no other "
"change in your working tree:"
msgstr ""
@@ -19260,17 +19183,17 @@ msgstr ""
#: en/git-commit.txt:393
msgid ""
"The command `git commit -a` first looks at your working tree, notices that "
-"you have modified hello.c and removed goodbye.c, and performs necessary `git"
-" add` and `git rm` for you."
+"you have modified hello.c and removed goodbye.c, and performs necessary `git "
+"add` and `git rm` for you."
msgstr ""
#. type: Plain text
#: en/git-commit.txt:398
msgid ""
-"After staging changes to many files, you can alter the order the changes are"
-" recorded in, by giving pathnames to `git commit`. When pathnames are "
-"given, the command makes a commit that only records the changes made to the "
-"named paths:"
+"After staging changes to many files, you can alter the order the changes are "
+"recorded in, by giving pathnames to `git commit`. When pathnames are given, "
+"the command makes a commit that only records the changes made to the named "
+"paths:"
msgstr ""
#. type: delimited block -
@@ -19287,8 +19210,8 @@ msgstr ""
#: en/git-commit.txt:411
msgid ""
"This makes a commit that records the modification to `Makefile`. The "
-"changes staged for `hello.c` and `hello.h` are not included in the resulting"
-" commit. However, their changes are not lost -- they are still staged and "
+"changes staged for `hello.c` and `hello.h` are not included in the resulting "
+"commit. However, their changes are not lost -- they are still staged and "
"merely held back. After the above sequence, if you do:"
msgstr ""
@@ -19312,8 +19235,8 @@ msgid ""
"conflicts, cleanly merged paths are already staged to be committed for you, "
"and paths that conflicted are left in unmerged state. You would have to "
"first check which paths are conflicting with 'git status' and after fixing "
-"them manually in your working tree, you would stage the result as usual with"
-" 'git add':"
+"them manually in your working tree, you would stage the result as usual with "
+"'git add':"
msgstr ""
#. type: delimited block -
@@ -19330,15 +19253,15 @@ msgstr ""
#: en/git-commit.txt:437
msgid ""
"After resolving conflicts and staging the result, `git ls-files -u` would "
-"stop mentioning the conflicted path. When you are done, run `git commit` to"
-" finally record the merge:"
+"stop mentioning the conflicted path. When you are done, run `git commit` to "
+"finally record the merge:"
msgstr ""
#. type: Plain text
#: en/git-commit.txt:448
msgid ""
-"As with the case to record your own changes, you can use `-a` option to save"
-" typing. One difference is that during a merge resolution, you cannot use "
+"As with the case to record your own changes, you can use `-a` option to save "
+"typing. One difference is that during a merge resolution, you cannot use "
"`git commit` with pathnames to alter the order the changes are committed, "
"because the merge should be recorded as a single commit. In fact, the "
"command refuses to run when given pathnames (but see `-i` option)."
@@ -19351,9 +19274,9 @@ msgid ""
"single short (less than 50 character) line summarizing the change, followed "
"by a blank line and then a more thorough description. The text up to the "
"first blank line in a commit message is treated as the commit title, and "
-"that title is used throughout Git. For example, linkgit:git-format-patch[1]"
-" turns a commit into email, and it uses the title on the Subject line and "
-"the rest of the commit in the body."
+"that title is used throughout Git. For example, linkgit:git-format-patch[1] "
+"turns a commit into email, and it uses the title on the Subject line and the "
+"rest of the commit in the body."
msgstr ""
#. type: Title -
@@ -19374,8 +19297,8 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:475
msgid ""
-"This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, "
-"`post-commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more "
+"This command can run `commit-msg`, `prepare-commit-msg`, `pre-commit`, `post-"
+"commit` and `post-rewrite` hooks. See linkgit:githooks[5] for more "
"information."
msgstr ""
@@ -19397,7 +19320,6 @@ msgstr ""
#. type: Plain text
#: en/git-commit.txt:493
-#, ignore-same
msgid ""
"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mv[1], linkgit:git-"
"merge[1], linkgit:git-commit-tree[1]"
@@ -19407,7 +19329,7 @@ msgstr ""
#. type: Title =
#: en/git-config.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-config(1)"
msgstr "git-config(1)"
@@ -19450,35 +19372,35 @@ msgstr ""
msgid ""
"Multiple lines can be added to an option by using the `--add` option. If "
"you want to update or unset an option which can occur on multiple lines, a "
-"POSIX regexp `value_regex` needs to be given. Only the existing values that"
-" match the regexp are updated or unset. If you want to handle the lines "
-"that do *not* match the regex, just prepend a single exclamation mark in "
-"front (see also <<EXAMPLES>>)."
+"POSIX regexp `value_regex` needs to be given. Only the existing values that "
+"match the regexp are updated or unset. If you want to handle the lines that "
+"do *not* match the regex, just prepend a single exclamation mark in front "
+"(see also <<EXAMPLES>>)."
msgstr ""
#. type: Plain text
#: en/git-config.txt:45
msgid ""
"The `--type=<type>` option instructs 'git config' to ensure that incoming "
-"and outgoing values are canonicalize-able under the given <type>. If no "
-"`--type=<type>` is given, no canonicalization will be performed. Callers may"
-" unset an existing `--type` specifier with `--no-type`."
+"and outgoing values are canonicalize-able under the given <type>. If no `--"
+"type=<type>` is given, no canonicalization will be performed. Callers may "
+"unset an existing `--type` specifier with `--no-type`."
msgstr ""
#. type: Plain text
#: en/git-config.txt:51
msgid ""
"When reading, the values are read from the system, global and repository "
-"local configuration files by default, and options `--system`, `--global`, "
-"`--local`, `--worktree` and `--file <filename>` can be used to tell the "
-"command to read from only that location (see <<FILES>>)."
+"local configuration files by default, and options `--system`, `--global`, `--"
+"local`, `--worktree` and `--file <filename>` can be used to tell the command "
+"to read from only that location (see <<FILES>>)."
msgstr ""
#. type: Plain text
#: en/git-config.txt:57
msgid ""
-"When writing, the new value is written to the repository local configuration"
-" file by default, and options `--system`, `--global`, `--worktree`, `--file "
+"When writing, the new value is written to the repository local configuration "
+"file by default, and options `--system`, `--global`, `--worktree`, `--file "
"<filename>` can be used to tell the command to write to that location (you "
"can say `--local` but that is the default)."
msgstr ""
@@ -19486,8 +19408,7 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:60
msgid ""
-"This command will fail with non-zero status upon error. Some exit codes "
-"are:"
+"This command will fail with non-zero status upon error. Some exit codes are:"
msgstr ""
#. type: Plain text
@@ -19533,7 +19454,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:74
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--replace-all"
msgstr "--replace-all"
@@ -19548,22 +19469,22 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:78 en/git-update-index.txt:44
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--add"
msgstr "--add"
#. type: Plain text
#: en/git-config.txt:82
msgid ""
-"Adds a new line to the option without altering any existing values. This is"
-" the same as providing '^$' as the value_regex in `--replace-all`."
+"Adds a new line to the option without altering any existing values. This is "
+"the same as providing '^$' as the value_regex in `--replace-all`."
msgstr ""
"Adiciona uma nova linha 횪 op챌찾o sem alterar nenhum valor existente. Isto 챕 "
"o mesmo que fornecer '^$' como o value_regex em `--replace-all`."
#. type: Labeled list
#: en/git-config.txt:83
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--get"
msgstr "--get"
@@ -19581,7 +19502,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:88
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--get-all"
msgstr "--get-all"
@@ -19593,7 +19514,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:91
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--get-regexp"
msgstr "--get-regexp"
@@ -19626,16 +19547,16 @@ msgid ""
"just the section as name, do so for all the keys in the section and list "
"them. Returns error code 1 if no value is found."
msgstr ""
-"Quando 챕 dado um nome de duas partes section.key, o valor para a se챌찾o. <url>"
-".key cuja parte <url> corresponde 횪 melhor para a URL fornecida 챕 retornada ("
-"se n찾o houver essa chave, o valor para section.key 챕 usado como um fallback)"
-". Quando for dada apenas a se챌찾o como nome, fa챌a isso para todas as chaves "
-"na se챌찾o e liste-as. Retorna o c처digo de erro 1 se nenhum valor for "
-"encontrado."
+"Quando 챕 dado um nome de duas partes section.key, o valor para a se챌찾o. "
+"<url>.key cuja parte <url> corresponde 횪 melhor para a URL fornecida 챕 "
+"retornada (se n찾o houver essa chave, o valor para section.key 챕 usado como "
+"um fallback). Quando for dada apenas a se챌찾o como nome, fa챌a isso para "
+"todas as chaves na se챌찾o e liste-as. Retorna o c처digo de erro 1 se nenhum "
+"valor for encontrado."
#. type: Labeled list
#: en/git-config.txt:106
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--global"
msgstr "--global"
@@ -19653,11 +19574,11 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:114
msgid ""
-"For reading options: read only from global `~/.gitconfig` and from "
-"`$XDG_CONFIG_HOME/git/config` rather than from all available files."
+"For reading options: read only from global `~/.gitconfig` and from `"
+"$XDG_CONFIG_HOME/git/config` rather than from all available files."
msgstr ""
-"Para op챌천es de leitura: leia somente do global `~/.gitconfig` e de` $"
-"XDG_CONFIG_HOME/git/config` ao inv챕s de todos os arquivos dispon챠veis."
+"Para op챌천es de leitura: leia somente do global `~/.gitconfig` e de` "
+"$XDG_CONFIG_HOME/git/config` ao inv챕s de todos os arquivos dispon챠veis."
#. type: Plain text
#: en/git-config.txt:116 en/git-config.txt:126 en/git-config.txt:135
@@ -19667,7 +19588,7 @@ msgstr "Veja tamb챕m << FILES >>."
#. type: Labeled list
#: en/git-config.txt:117
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--system"
msgstr "--system"
@@ -19692,24 +19613,24 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:130
msgid ""
-"For writing options: write to the repository `.git/config` file. This "
-"is\tthe default behavior."
+"For writing options: write to the repository `.git/config` file. This is"
+"\tthe default behavior."
msgstr ""
-"Para op챌천es de escrita: escreva para o arquivo de reposit처rio `.git/config`"
-". Este 챕\to comportamento padr찾o."
+"Para op챌천es de escrita: escreva para o arquivo de reposit처rio `.git/"
+"config`. Este 챕\to comportamento padr찾o."
#. type: Plain text
#: en/git-config.txt:133
msgid ""
-"For reading options: read only from the repository `.git/config` rather than"
-" from all available files."
+"For reading options: read only from the repository `.git/config` rather than "
+"from all available files."
msgstr ""
"Para op챌천es de leitura: leia somente no reposit처rio `.git/config` em vez de "
"em todos os arquivos dispon챠veis."
#. type: Labeled list
#: en/git-config.txt:136
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--worktree"
msgstr "--worktree"
@@ -19721,8 +19642,8 @@ msgid ""
"as `--local`."
msgstr ""
"Semelhante a `--local`, exceto que `.git/config.worktree` 챕 lido ou escrito "
-"em if `extensions.worktreeConfig` est찼 presente. Se n찾o, 챕 o mesmo que "
-"`--local`."
+"em if `extensions.worktreeConfig` est찼 presente. Se n찾o, 챕 o mesmo que `--"
+"local`."
#. type: Labeled list
#: en/git-config.txt:141
@@ -19754,19 +19675,18 @@ msgstr ""
msgid ""
"Similar to `--file` but use the given blob instead of a file. E.g. you can "
"use 'master:.gitmodules' to read values from the file '.gitmodules' in the "
-"master branch. See \"SPECIFYING REVISIONS\" section in "
-"linkgit:gitrevisions[7] for a more complete list of ways to spell blob "
-"names."
+"master branch. See \"SPECIFYING REVISIONS\" section in linkgit:"
+"gitrevisions[7] for a more complete list of ways to spell blob names."
msgstr ""
"Semelhante ao `--file`, mas usa o blob fornecido em vez de um arquivo. Por "
-"exemplo. voc챗 pode usar 'mestre: .gitmodules' para ler valores do arquivo "
-"'.gitmodules' no ramo mestre. Veja a se챌찾o \"ESPECIFICANDO REVIS횛ES\" em "
+"exemplo. voc챗 pode usar 'mestre: .gitmodules' para ler valores do arquivo '."
+"gitmodules' no ramo mestre. Veja a se챌찾o \"ESPECIFICANDO REVIS횛ES\" em "
"linkgit:gitrevisions[7] para uma lista mais completa de maneiras de soletrar "
"nomes de blobs."
#. type: Labeled list
#: en/git-config.txt:152
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--remove-section"
msgstr "--remove-section"
@@ -19777,7 +19697,7 @@ msgstr "Remova a se챌찾o dada do arquivo de configura챌찾o."
#. type: Labeled list
#: en/git-config.txt:155
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--rename-section"
msgstr "--rename-section"
@@ -19788,7 +19708,7 @@ msgstr "Renomeie a se챌찾o dada para um novo nome."
#. type: Labeled list
#: en/git-config.txt:158
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--unset"
msgstr "--unset"
@@ -19799,7 +19719,7 @@ msgstr "Remova a linha correspondente 횪 chave do arquivo de configura챌찾o."
#. type: Labeled list
#: en/git-config.txt:161
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--unset-all"
msgstr "--unset-all"
@@ -19889,8 +19809,8 @@ msgstr ""
#: en/git-config.txt:191
msgid ""
"'color': When getting a value, canonicalize by converting to an ANSI color "
-"escape sequence. When setting a value, a sanity-check is performed to ensure"
-" that the given value is canonicalize-able as an ANSI color, but it is "
+"escape sequence. When setting a value, a sanity-check is performed to ensure "
+"that the given value is canonicalize-able as an ANSI color, but it is "
"written as-is."
msgstr ""
"'color': Ao obter um valor, canonize convertendo para uma sequ챗ncia de "
@@ -19900,31 +19820,31 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:193
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--bool"
msgstr "--bool"
#. type: Labeled list
#: en/git-config.txt:194
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--int"
msgstr "--int"
#. type: Labeled list
#: en/git-config.txt:195
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--bool-or-int"
msgstr "--bool-or-int"
#. type: Labeled list
#: en/git-config.txt:196 en/git-hash-object.txt:41
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--path"
msgstr "--path"
#. type: Labeled list
#: en/git-config.txt:197
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--expiry-date"
msgstr "--expiry-date"
@@ -19939,7 +19859,7 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:201
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-type"
msgstr "--no-type"
@@ -19952,8 +19872,8 @@ msgid ""
msgstr ""
"Desfaz o especificador de tipo definido anteriormente (se um tiver sido "
"configurado anteriormente). Esta op챌찾o solicita que 'git config' n찾o "
-"canonize a vari찼vel recuperada. `--n찾o-tipo` n찾o tem efeito sem` "
-"--tipo=<tipo> `ou` - <tipo> `."
+"canonize a vari찼vel recuperada. `--n찾o-tipo` n찾o tem efeito sem` --"
+"tipo=<tipo> `ou` - <tipo> `."
#. type: Plain text
#: en/git-config.txt:214
@@ -19978,20 +19898,20 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:219
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-origin"
msgstr "--show-origin"
#. type: Plain text
#: en/git-config.txt:224
msgid ""
-"Augment the output of all queried config options with the origin type (file,"
-" standard input, blob, command line) and the actual origin (config file "
-"path, ref, or blob id if applicable)."
+"Augment the output of all queried config options with the origin type (file, "
+"standard input, blob, command line) and the actual origin (config file path, "
+"ref, or blob id if applicable)."
msgstr ""
"Aumente a sa챠da de todas as op챌천es de configura챌찾o consultadas com o tipo de "
-"origem (arquivo, entrada padr찾o, blob, linha de comando) e a origem real ("
-"caminho do arquivo de configura챌찾o, ref ou ID do blob, se aplic찼vel)."
+"origem (arquivo, entrada padr찾o, blob, linha de comando) e a origem real "
+"(caminho do arquivo de configura챌찾o, ref ou ID do blob, se aplic찼vel)."
#. type: Labeled list
#: en/git-config.txt:225
@@ -20002,8 +19922,8 @@ msgstr "--get-colorbool nome [stdout-챕-tty]"
#. type: Plain text
#: en/git-config.txt:235
msgid ""
-"Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or"
-" \"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is "
+"Find the color setting for `name` (e.g. `color.diff`) and output \"true\" or "
+"\"false\". `stdout-is-tty` should be either \"true\" or \"false\", and is "
"taken into account when configuration says \"auto\". If `stdout-is-tty` is "
"missing, then checks the standard output of the command itself, and exits "
"with status 0 if color is to be used, or exits with status 1 otherwise. "
@@ -20045,15 +19965,15 @@ msgstr "`--tipo=color [--padr찾o=<padr찾o>]` 챕 prefer챠vel `--get-color`."
#. type: Plain text
#: en/git-config.txt:249
msgid ""
-"Opens an editor to modify the specified config file; either `--system`, "
-"`--global`, or repository (default)."
+"Opens an editor to modify the specified config file; either `--system`, `--"
+"global`, or repository (default)."
msgstr ""
-"Abre um editor para modificar o arquivo de configura챌찾o especificado; ou "
-"`--sistema`,` --global` ou reposit처rio (padr찾o)."
+"Abre um editor para modificar o arquivo de configura챌찾o especificado; ou `--"
+"sistema`,` --global` ou reposit처rio (padr찾o)."
#. type: Labeled list
#: en/git-config.txt:250
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]includes"
msgstr "--[no-]includes"
@@ -20061,8 +19981,8 @@ msgstr "--[no-]includes"
#: en/git-config.txt:255
msgid ""
"Respect `include.*` directives in config files when looking up values. "
-"Defaults to `off` when a specific file is given (e.g., using `--file`, "
-"`--global`, etc) and `on` when searching all config files."
+"Defaults to `off` when a specific file is given (e.g., using `--file`, `--"
+"global`, etc) and `on` when searching all config files."
msgstr ""
"Respeite as diretivas `include.*` Nos arquivos de configura챌찾o ao procurar "
"valores. O padr찾o 챕 `off` quando um arquivo espec챠fico 챕 dado (por exemplo, "
@@ -20098,8 +20018,8 @@ msgstr ""
#. type: Plain text
#: en/git-config.txt:272
msgid ""
-"If not set explicitly with `--file`, there are four files where 'git config'"
-" will search for configuration options:"
+"If not set explicitly with `--file`, there are four files where 'git config' "
+"will search for configuration options:"
msgstr ""
"Se n찾o for definido explicitamente com `--file`, existem quatro arquivos em "
"que 'git config' procurar찼 op챌천es de configura챌찾o:"
@@ -20174,16 +20094,16 @@ msgid ""
"This is optional and is only searched when `extensions.worktreeConfig` is "
"present in $GIT_DIR/config."
msgstr ""
-"Isso 챕 opcional e s처 챕 pesquisado quando o arquivo "
-"`extensions.worktreeConfig` est찼 presente em $GIT_DIR/config."
+"Isso 챕 opcional e s처 챕 pesquisado quando o arquivo `extensions."
+"worktreeConfig` est찼 presente em $GIT_DIR/config."
#. type: Plain text
#: en/git-config.txt:300
msgid ""
"If no further options are given, all reading options will read all of these "
"files that are available. If the global or the system-wide configuration "
-"file are not available they will be ignored. If the repository configuration"
-" file is not available or readable, 'git config' will exit with a non-zero "
+"file are not available they will be ignored. If the repository configuration "
+"file is not available or readable, 'git config' will exit with a non-zero "
"error code. However, in neither case will an error message be issued."
msgstr ""
"Se nenhuma outra op챌찾o for fornecida, todas as op챌천es de leitura ler찾o todos "
@@ -20218,8 +20138,8 @@ msgstr ""
#: en/git-config.txt:311
msgid ""
"All writing options will per default write to the repository specific "
-"configuration file. Note that this also affects options like `--replace-all`"
-" and `--unset`. *'git config' will only ever change one file at a time*."
+"configuration file. Note that this also affects options like `--replace-all` "
+"and `--unset`. *'git config' will only ever change one file at a time*."
msgstr ""
"Todas as op챌천es de grava챌찾o por padr찾o gravar찾o no arquivo de configura챌찾o "
"espec챠fico do reposit처rio. Note que isto tamb챕m afeta op챌천es como `--replace-"
@@ -20250,7 +20170,7 @@ msgstr "MEIO AMBIENTE"
#. type: Labeled list
#: en/git-config.txt:322
-#, ignore-same, no-wrap
+#, no-wrap
msgid "GIT_CONFIG"
msgstr "GIT_CONFIG"
@@ -20267,15 +20187,15 @@ msgstr ""
#. type: Labeled list
#: en/git-config.txt:327
-#, ignore-same, no-wrap
+#, no-wrap
msgid "GIT_CONFIG_NOSYSTEM"
msgstr "GIT_CONFIG_NOSYSTEM"
#. type: Plain text
#: en/git-config.txt:330
msgid ""
-"Whether to skip reading settings from the system-wide "
-"$(prefix)/etc/gitconfig file. See linkgit:git[1] for details."
+"Whether to skip reading settings from the system-wide $(prefix)/etc/"
+"gitconfig file. See linkgit:git[1] for details."
msgstr ""
"Se deve ignorar as configura챌천es de leitura do arquivo $/etc/gitconfig do "
"sistema (prefixo). Veja linkgit:git[1] para detalhes."
@@ -20557,7 +20477,7 @@ msgstr ""
#. type: Title =
#: en/git-count-objects.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-count-objects(1)"
msgstr "git-count-objects(1)"
@@ -20618,8 +20538,8 @@ msgstr ""
#. type: Plain text
#: en/git-count-objects.txt:38
msgid ""
-"garbage: the number of files in object database that are neither valid loose"
-" objects nor valid packs"
+"garbage: the number of files in object database that are neither valid loose "
+"objects nor valid packs"
msgstr ""
#. type: Plain text
@@ -20646,7 +20566,7 @@ msgstr ""
#. type: Labeled list
#: en/git-count-objects.txt:48
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--human-readable"
msgstr "--human-readable"
@@ -20657,7 +20577,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-cache--daemon.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-credential-cache--daemon(1)"
msgstr "git-credential-cache--daemon(1)"
@@ -20699,7 +20619,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-cache.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-credential-cache(1)"
msgstr "git-credential-cache(1)"
@@ -20727,8 +20647,8 @@ msgstr ""
#: en/git-credential-cache.txt:25
msgid ""
"You probably don't want to invoke this command directly; it is meant to be "
-"used as a credential helper by other parts of Git. See "
-"linkgit:gitcredentials[7] or `EXAMPLES` below."
+"used as a credential helper by other parts of Git. See linkgit:"
+"gitcredentials[7] or `EXAMPLES` below."
msgstr ""
#. type: Labeled list
@@ -20752,8 +20672,8 @@ msgstr ""
#: en/git-credential-cache.txt:43
msgid ""
"Use `<path>` to contact a running cache daemon (or start a new cache daemon "
-"if one is not started). Defaults to `$XDG_CACHE_HOME/git/credential/socket`"
-" unless `~/.git-credential-cache/` exists in which case `~/.git-credential-"
+"if one is not started). Defaults to `$XDG_CACHE_HOME/git/credential/socket` "
+"unless `~/.git-credential-cache/` exists in which case `~/.git-credential-"
"cache/socket` is used instead. If your home directory is on a network-"
"mounted filesystem, you may need to change this to a local filesystem. You "
"must specify an absolute path."
@@ -20781,8 +20701,8 @@ msgstr ""
#. type: Plain text
#: en/git-credential-cache.txt:59 en/git-credential-store.txt:75
msgid ""
-"The point of this helper is to reduce the number of times you must type your"
-" username or password. For example:"
+"The point of this helper is to reduce the number of times you must type your "
+"username or password. For example:"
msgstr ""
#. type: delimited block -
@@ -20819,7 +20739,7 @@ msgstr ""
#. type: Title =
#: en/git-credential-store.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-credential-store(1)"
msgstr "git-credential-store(1)"
@@ -20854,8 +20774,8 @@ msgstr ""
#: en/git-credential-store.txt:28
msgid ""
"You probably don't want to invoke this command directly; it is meant to be "
-"used as a credential helper by other parts of git. See "
-"linkgit:gitcredentials[7] or `EXAMPLES` below."
+"used as a credential helper by other parts of git. See linkgit:"
+"gitcredentials[7] or `EXAMPLES` below."
msgstr ""
#. type: Labeled list
@@ -20868,12 +20788,12 @@ msgstr ""
#: en/git-credential-store.txt:42
msgid ""
"Use `<path>` to lookup and store credentials. The file will have its "
-"filesystem permissions set to prevent other users on the system from reading"
-" it, but will not be encrypted or otherwise protected. If not specified, "
-"credentials will be searched for from `~/.git-credentials` and "
-"`$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to "
-"`~/.git-credentials` if it exists, or `$XDG_CONFIG_HOME/git/credentials` if "
-"it exists and the former does not. See also <<FILES>>."
+"filesystem permissions set to prevent other users on the system from reading "
+"it, but will not be encrypted or otherwise protected. If not specified, "
+"credentials will be searched for from `~/.git-credentials` and `"
+"$XDG_CONFIG_HOME/git/credentials`, and credentials will be written to `~/."
+"git-credentials` if it exists, or `$XDG_CONFIG_HOME/git/credentials` if it "
+"exists and the former does not. See also <<FILES>>."
msgstr ""
#. type: Plain text
@@ -20914,23 +20834,22 @@ msgstr ""
#: en/git-credential-store.txt:63
msgid ""
"For credential lookups, the files are read in the order given above, with "
-"the first matching credential found taking precedence over credentials found"
-" in files further down the list."
+"the first matching credential found taking precedence over credentials found "
+"in files further down the list."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:67
msgid ""
"Credential storage will by default write to the first existing file in the "
-"list. If none of these files exist, `~/.git-credentials` will be created and"
-" written to."
+"list. If none of these files exist, `~/.git-credentials` will be created and "
+"written to."
msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:69
msgid ""
-"When erasing credentials, matching credentials will be erased from all "
-"files."
+"When erasing credentials, matching credentials will be erased from all files."
msgstr ""
#. type: delimited block -
@@ -20974,16 +20893,16 @@ msgstr ""
#. type: Plain text
#: en/git-credential-store.txt:103
msgid ""
-"When Git needs authentication for a particular URL context, credential-store"
-" will consider that context a pattern to match against each entry in the "
+"When Git needs authentication for a particular URL context, credential-store "
+"will consider that context a pattern to match against each entry in the "
"credentials file. If the protocol, hostname, and username (if we already "
-"have one) match, then the password is returned to Git. See the discussion of"
-" configuration in linkgit:gitcredentials[7] for more information."
+"have one) match, then the password is returned to Git. See the discussion of "
+"configuration in linkgit:gitcredentials[7] for more information."
msgstr ""
#. type: Title =
#: en/git-credential.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-credential(1)"
msgstr "git-credential(1)"
@@ -21005,8 +20924,8 @@ msgid ""
"system-specific helpers, as well as prompting the user for usernames and "
"passwords. The git-credential command exposes this interface to scripts "
"which may want to retrieve, store, or prompt for credentials in the same "
-"manner as Git. The design of this scriptable interface models the internal C"
-" API; see link:technical/api-credentials.html[the Git credential API] for "
+"manner as Git. The design of this scriptable interface models the internal C "
+"API; see link:technical/api-credentials.html[the Git credential API] for "
"more background on the concepts."
msgstr ""
@@ -21021,8 +20940,8 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:36
msgid ""
-"If the action is `fill`, git-credential will attempt to add \"username\" and"
-" \"password\" attributes to the description by reading config files, by "
+"If the action is `fill`, git-credential will attempt to add \"username\" and "
+"\"password\" attributes to the description by reading config files, by "
"contacting any configured credential helpers, or by prompting the user. The "
"username and password attributes of the credential description are then "
"printed to stdout together with the attributes already provided."
@@ -21107,8 +21026,8 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:80
msgid ""
-"In most cases, this means the attributes given in the input will be repeated"
-" in the output, but Git may also modify the credential description, for "
+"In most cases, this means the attributes given in the input will be repeated "
+"in the output, but Git may also modify the credential description, for "
"example by removing the `path` attribute when the protocol is HTTP(s) and "
"`credential.useHttpPath` is false."
msgstr ""
@@ -21125,8 +21044,8 @@ msgstr ""
#. type: Plain text
#: en/git-credential.txt:89
msgid ""
-"Use the credential (e.g., access the URL with the username and password from"
-" step (2)), and see if it's accepted."
+"Use the credential (e.g., access the URL with the username and password from "
+"step (2)), and see if it's accepted."
msgstr ""
#. type: Plain text
@@ -21137,8 +21056,8 @@ msgid ""
"\"approve\" action to tell `git credential` to reuse it in its next "
"invocation. If the credential was rejected during the operation, use the "
"\"reject\" action so that `git credential` will ask for a new password in "
-"its next invocation. In either case, `git credential` should be fed with the"
-" credential description obtained from step (2) (which also contain the ones "
+"its next invocation. In either case, `git credential` should be fed with the "
+"credential description obtained from step (2) (which also contain the ones "
"provided in step (1))."
msgstr ""
@@ -21153,8 +21072,8 @@ msgstr ""
msgid ""
"`git credential` reads and/or writes (depending on the action used) "
"credential information in its standard input/output. This information can "
-"correspond either to keys for which `git credential` will obtain the "
-"login/password information (e.g. host, protocol, path), or to the actual "
+"correspond either to keys for which `git credential` will obtain the login/"
+"password information (e.g. host, protocol, path), or to the actual "
"credential data to be obtained (login/password)."
msgstr ""
@@ -21173,7 +21092,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:120
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`protocol`"
msgstr "`protocol`"
@@ -21184,7 +21103,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:125
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`host`"
msgstr "`host`"
@@ -21195,7 +21114,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:129
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`path`"
msgstr "`path`"
@@ -21208,7 +21127,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:135
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`username`"
msgstr "`username`"
@@ -21221,7 +21140,7 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:140
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`password`"
msgstr "`password`"
@@ -21232,26 +21151,26 @@ msgstr ""
#. type: Labeled list
#: en/git-credential.txt:144
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`url`"
msgstr "`url`"
#. type: Plain text
#: en/git-credential.txt:154
msgid ""
-"When this special attribute is read by `git credential`, the value is parsed"
-" as a URL and treated as if its constituent parts were read (e.g., "
+"When this special attribute is read by `git credential`, the value is parsed "
+"as a URL and treated as if its constituent parts were read (e.g., "
"`url=https://example.com` would behave as if `protocol=https` and "
"`host=example.com` had been provided). This can help callers avoid parsing "
-"URLs themselves. Note that any components which are missing from the URL "
-"(e.g., there is no username in the example above) will be set to empty; if "
-"you want to provide a URL and override some attributes, provide the URL "
+"URLs themselves. Note that any components which are missing from the URL (e."
+"g., there is no username in the example above) will be set to empty; if you "
+"want to provide a URL and override some attributes, provide the URL "
"attribute first, followed by any overrides."
msgstr ""
#. type: Title =
#: en/git-cvsexportcommit.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-cvsexportcommit(1)"
msgstr "git-cvsexportcommit(1)"
@@ -21307,8 +21226,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsexportcommit.txt:40
msgid ""
-"Commit automatically if the patch applied cleanly. It will not commit if any"
-" hunks fail to apply or there were other problems."
+"Commit automatically if the patch applied cleanly. It will not commit if any "
+"hunks fail to apply or there were other problems."
msgstr ""
#. type: Plain text
@@ -21365,9 +21284,9 @@ msgstr ""
#: en/git-cvsexportcommit.txt:76
msgid ""
"Specify the location of the CVS checkout to use for the export. This option "
-"does not require GIT_DIR to be set before execution if the current directory"
-" is within a Git repository. The default is the value of "
-"'cvsexportcommit.cvsdir'."
+"does not require GIT_DIR to be set before execution if the current directory "
+"is within a Git repository. The default is the value of 'cvsexportcommit."
+"cvsdir'."
msgstr ""
#. type: Plain text
@@ -21413,9 +21332,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsexportcommit.txt:102
#, no-wrap
-msgid ""
-"Merge one patch into CVS (-c and -w options). The working directory is "
-"within the Git Repo"
+msgid "Merge one patch into CVS (-c and -w options). The working directory is within the Git Repo"
msgstr ""
#. type: delimited block -
@@ -21427,9 +21344,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsexportcommit.txt:108
#, no-wrap
-msgid ""
-"Merge pending patches into CVS automatically -- only if you really know what"
-" you are doing"
+msgid "Merge pending patches into CVS automatically -- only if you really know what you are doing"
msgstr ""
#. type: delimited block -
@@ -21443,7 +21358,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsimport.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-cvsimport(1)"
msgstr "git-cvsimport(1)"
@@ -21502,10 +21417,10 @@ msgstr ""
msgid ""
"You should *never* do any work of your own on the branches that are created "
"by 'git cvsimport'. By default initial import will create and populate a "
-"\"master\" branch from the CVS repository's main branch which you're free to"
-" work with; after that, you need to 'git merge' incremental imports, or any "
-"CVS branches, yourself. It is advisable to specify a named remote via -r to"
-" separate and protect the incoming branches."
+"\"master\" branch from the CVS repository's main branch which you're free to "
+"work with; after that, you need to 'git merge' incremental imports, or any "
+"CVS branches, yourself. It is advisable to specify a named remote via -r to "
+"separate and protect the incoming branches."
msgstr ""
#. type: Plain text
@@ -21533,8 +21448,8 @@ msgstr ""
msgid ""
"The root of the CVS archive. May be local (a simple path) or remote; "
"currently, only the :local:, :ext: and :pserver: access methods are "
-"supported. If not given, 'git cvsimport' will try to read it from "
-"`CVS/Root`. If no such file exists, it checks for the `CVSROOT` environment "
+"supported. If not given, 'git cvsimport' will try to read it from `CVS/"
+"Root`. If no such file exists, it checks for the `CVSROOT` environment "
"variable."
msgstr ""
@@ -21609,8 +21524,8 @@ msgstr ""
#: en/git-cvsimport.txt:92
msgid ""
"Import-only: don't perform a checkout after importing. This option ensures "
-"the working directory and index remain untouched and will not create them if"
-" they do not exist."
+"the working directory and index remain untouched and will not create them if "
+"they do not exist."
msgstr ""
#. type: Plain text
@@ -21698,9 +21613,9 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:127
msgid ""
-"Attempt to detect merges based on the commit message with a custom regex. It"
-" can be used with `-m` to enable the default regexes as well. You must "
-"escape forward slashes."
+"Attempt to detect merges based on the commit message with a custom regex. It "
+"can be used with `-m` to enable the default regexes as well. You must escape "
+"forward slashes."
msgstr ""
#. type: Plain text
@@ -21771,8 +21686,8 @@ msgstr ""
#: en/git-cvsimport.txt:159
msgid ""
"'git cvsimport' will make it appear as those authors had their "
-"GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. If a time zone"
-" is specified, GIT_AUTHOR_DATE will have the corresponding offset applied."
+"GIT_AUTHOR_NAME and GIT_AUTHOR_EMAIL set properly all along. If a time zone "
+"is specified, GIT_AUTHOR_DATE will have the corresponding offset applied."
msgstr ""
#. type: Plain text
@@ -21795,8 +21710,8 @@ msgstr ""
msgid ""
"Generate a `$GIT_DIR/cvs-revisions` file containing a mapping from CVS "
"revision numbers to newly-created Git commit IDs. The generated file will "
-"contain one line for each (filename, revision) pair imported; each line will"
-" look like"
+"contain one line for each (filename, revision) pair imported; each line will "
+"look like"
msgstr ""
#. type: delimited block -
@@ -21808,8 +21723,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:180
msgid ""
-"The revision data is appended to the file if it already exists, for use when"
-" doing incremental imports."
+"The revision data is appended to the file if it already exists, for use when "
+"doing incremental imports."
msgstr ""
#. type: Plain text
@@ -21857,8 +21772,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:204
msgid ""
-"If any files were ever \"cvs import\"ed more than once (e.g., import of more"
-" than one vendor release) the HEAD contains the wrong content."
+"If any files were ever \"cvs import\"ed more than once (e.g., import of more "
+"than one vendor release) the HEAD contains the wrong content."
msgstr ""
#. type: Plain text
@@ -21881,8 +21796,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:213
msgid ""
-"All files from the branching point are added to a branch even if never added"
-" in CVS."
+"All files from the branching point are added to a branch even if never added "
+"in CVS."
msgstr ""
#. type: Plain text
@@ -21906,8 +21821,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsimport.txt:223
msgid ""
-"If you suspect that any of these issues may apply to the repository you want"
-" to import, consider using cvs2git:"
+"If you suspect that any of these issues may apply to the repository you want "
+"to import, consider using cvs2git:"
msgstr ""
#. type: Plain text
@@ -21917,7 +21832,7 @@ msgstr ""
#. type: Title =
#: en/git-cvsserver.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-cvsserver(1)"
msgstr "git-cvsserver(1)"
@@ -21947,9 +21862,7 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:21
#, no-wrap
-msgid ""
-"cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver "
-"pserver\n"
+msgid "cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
msgstr ""
#. type: Plain text
@@ -21966,9 +21879,9 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:33
msgid ""
-"All these options obviously only make sense if enforced by the server side."
-" They have been implemented to resemble the linkgit:git-daemon[1] options "
-"as closely as possible."
+"All these options obviously only make sense if enforced by the server side. "
+"They have been implemented to resemble the linkgit:git-daemon[1] options as "
+"closely as possible."
msgstr ""
#. type: Labeled list
@@ -21984,7 +21897,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:37 en/git-daemon.txt:49
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--strict-paths"
msgstr "--strict-paths"
@@ -21995,7 +21908,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:40 en/git-daemon.txt:78
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--export-all"
msgstr "--export-all"
@@ -22014,7 +21927,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:45 en/git.txt:41
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--version"
msgstr "--version"
@@ -22025,7 +21938,7 @@ msgstr ""
#. type: Labeled list
#: en/git-cvsserver.txt:50 en/git.txt:44
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--help"
msgstr "--help"
@@ -22077,8 +21990,8 @@ msgstr ""
#: en/git-cvsserver.txt:80
msgid ""
"'git-cvsserver' maps Git branches to CVS modules. This is very different "
-"from what most CVS users would expect since in CVS modules usually represent"
-" one or more directories."
+"from what most CVS users would expect since in CVS modules usually represent "
+"one or more directories."
msgstr ""
#. type: Title -
@@ -22090,8 +22003,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:86
msgid ""
-"If you are going to offer CVS access via pserver, add a line in "
-"/etc/inetd.conf like"
+"If you are going to offer CVS access via pserver, add a line in /etc/inetd."
+"conf like"
msgstr ""
#. type: delimited block -
@@ -22112,9 +22025,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:99
#, no-wrap
-msgid ""
-" cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver "
-"pserver\n"
+msgid " cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver\n"
msgstr ""
#. type: Plain text
@@ -22166,9 +22077,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:127
#, no-wrap
-msgid ""
-" perl -e 'my ($user, $pass) = @ARGV; printf \"%s:%s\\n\", $user, "
-"crypt($user, $pass)' $USER password\n"
+msgid " perl -e 'my ($user, $pass) = @ARGV; printf \"%s:%s\\n\", $user, crypt($user, $pass)' $USER password\n"
msgstr ""
#. type: Plain text
@@ -22179,9 +22088,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:132
#, no-wrap
-msgid ""
-" cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co "
-"<HEAD_name>\n"
+msgid " cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co <HEAD_name>\n"
msgstr ""
#. type: Plain text
@@ -22202,9 +22109,7 @@ msgstr ""
#. type: delimited block -
#: en/git-cvsserver.txt:142
#, no-wrap
-msgid ""
-"cvs -d \":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git\" co "
-"<HEAD_name>\n"
+msgid "cvs -d \":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git\" co <HEAD_name>\n"
msgstr ""
#. type: Plain text
@@ -22239,9 +22144,9 @@ msgstr ""
#: en/git-cvsserver.txt:164
msgid ""
"Note: you need to ensure each user that is going to invoke 'git-cvsserver' "
-"has write access to the log file and to the database (see "
-"<<dbbackend,Database Backend>>. If you want to offer write access over SSH, "
-"the users of course also need write access to the Git repository itself."
+"has write access to the log file and to the database (see <<dbbackend,"
+"Database Backend>>. If you want to offer write access over SSH, the users of "
+"course also need write access to the Git repository itself."
msgstr ""
#. type: Plain text
@@ -22255,8 +22160,8 @@ msgstr ""
#: en/git-cvsserver.txt:173
msgid ""
"All configuration variables can also be overridden for a specific method of "
-"access. Valid method names are \"ext\" (for SSH access) and \"pserver\". The"
-" following example configuration would disable pserver access while still "
+"access. Valid method names are \"ext\" (for SSH access) and \"pserver\". The "
+"following example configuration would disable pserver access while still "
"allowing access over SSH."
msgstr ""
@@ -22283,8 +22188,8 @@ msgid ""
"command, automatically saving it in your 'CVS/Root' files, then you need to "
"set them explicitly in your environment. CVSROOT should be set as per "
"normal, but the directory should point at the appropriate Git repo. As "
-"above, for SSH clients _not_ restricted to 'git-shell', CVS_SERVER should be"
-" set to 'git-cvsserver'."
+"above, for SSH clients _not_ restricted to 'git-shell', CVS_SERVER should be "
+"set to 'git-cvsserver'."
msgstr ""
#. type: delimited block -
@@ -22298,9 +22203,9 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:198
msgid ""
-"For SSH clients that will make commits, make sure their server-side "
-".ssh/environment files (or .bashrc, etc., according to their specific shell)"
-" export appropriate values for GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, "
+"For SSH clients that will make commits, make sure their server-side .ssh/"
+"environment files (or .bashrc, etc., according to their specific shell) "
+"export appropriate values for GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, "
"GIT_COMMITTER_NAME, and GIT_COMMITTER_EMAIL. For SSH clients whose login "
"shell is bash, .bashrc may be a reasonable alternative."
msgstr ""
@@ -22348,19 +22253,19 @@ msgstr ""
#: en/git-cvsserver.txt:227
msgid ""
"That means that even if you offer only read access (e.g. by using the "
-"pserver method), 'git-cvsserver' should have write access to the database to"
-" work reliably (otherwise you need to make sure that the database is up to "
+"pserver method), 'git-cvsserver' should have write access to the database to "
+"work reliably (otherwise you need to make sure that the database is up to "
"date any time 'git-cvsserver' is executed)."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:234
msgid ""
-"By default it uses SQLite databases in the Git directory, named "
-"`gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates "
-"temporary files in the same directory as the database file on write so it "
-"might not be enough to grant the users using 'git-cvsserver' write access to"
-" the database file without granting them write access to the directory, too."
+"By default it uses SQLite databases in the Git directory, named `gitcvs."
+"<module_name>.sqlite`. Note that the SQLite backend creates temporary files "
+"in the same directory as the database file on write so it might not be "
+"enough to grant the users using 'git-cvsserver' write access to the database "
+"file without granting them write access to the directory, too."
msgstr ""
#. type: Plain text
@@ -22368,12 +22273,12 @@ msgstr ""
msgid ""
"The database can not be reliably regenerated in a consistent form after the "
"branch it is tracking has changed. Example: For merged branches, 'git-"
-"cvsserver' only tracks one branch of development, and after a 'git merge' an"
-" incrementally updated database may track a different branch than a database"
-" regenerated from scratch, causing inconsistent CVS revision numbers. `git-"
-"cvsserver` has no way of knowing which branch it would have picked if it had"
-" been run incrementally pre-merge. So if you have to fully or partially "
-"(from old backup) regenerate the database, you should be suspicious of pre-"
+"cvsserver' only tracks one branch of development, and after a 'git merge' an "
+"incrementally updated database may track a different branch than a database "
+"regenerated from scratch, causing inconsistent CVS revision numbers. `git-"
+"cvsserver` has no way of knowing which branch it would have picked if it had "
+"been run incrementally pre-merge. So if you have to fully or partially (from "
+"old backup) regenerate the database, you should be suspicious of pre-"
"existing CVS sandboxes."
msgstr ""
@@ -22393,8 +22298,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:256
msgid ""
-"'git-cvsserver' uses the Perl DBI module. Please also read its documentation"
-" if changing these variables, especially about `DBI->connect()`."
+"'git-cvsserver' uses the Perl DBI module. Please also read its documentation "
+"if changing these variables, especially about `DBI->connect()`."
msgstr ""
#. type: Labeled list
@@ -22422,8 +22327,8 @@ msgstr ""
msgid ""
"Used DBI driver. You can specify any available driver for this here, but it "
"might not work. cvsserver is tested with 'DBD::SQLite', reported to work "
-"with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Please regard"
-" this as an experimental feature. May not contain colons (`:`). Default: "
+"with 'DBD::Pg', and reported *not* to work with 'DBD::mysql'. Please regard "
+"this as an experimental feature. May not contain colons (`:`). Default: "
"'SQLite'"
msgstr ""
@@ -22469,8 +22374,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:288
msgid ""
-"All variables can also be set per access method, see "
-"<<configaccessmethod,above>>."
+"All variables can also be set per access method, see <<configaccessmethod,"
+"above>>."
msgstr ""
#. type: Title ^
@@ -22504,8 +22409,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:300
msgid ""
-"Git directory name, where all characters except for alpha-numeric ones, `.`,"
-" and `-` are replaced with `_` (this should make it easier to use the "
+"Git directory name, where all characters except for alpha-numeric ones, `.`, "
+"and `-` are replaced with `_` (this should make it easier to use the "
"directory name in a filename if wanted)"
msgstr ""
@@ -22540,8 +22445,8 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:308
msgid ""
-"Name of the user running 'git-cvsserver'. If no name can be determined, the"
-" numeric uid is used."
+"Name of the user running 'git-cvsserver'. If no name can be determined, the "
+"numeric uid is used."
msgstr ""
#. type: Plain text
@@ -22553,16 +22458,15 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:316
-msgid ""
-"GIT_CVSSERVER_BASE_PATH takes the place of the argument to --base-path."
+msgid "GIT_CVSSERVER_BASE_PATH takes the place of the argument to --base-path."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:320
msgid ""
"GIT_CVSSERVER_ROOT specifies a single-directory whitelist. The repository "
-"must still be configured to allow access through git-cvsserver, as described"
-" above."
+"must still be configured to allow access through git-cvsserver, as described "
+"above."
msgstr ""
#. type: Plain text
@@ -22671,12 +22575,12 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:371
msgid ""
-"Most CVS command arguments that read CVS tags or revision numbers (typically"
-" -r) work, and also support any git refspec (tag, branch, commit ID, etc). "
+"Most CVS command arguments that read CVS tags or revision numbers (typically "
+"-r) work, and also support any git refspec (tag, branch, commit ID, etc). "
"However, CVS revision numbers for non-default branches are not well "
"emulated, and cvs log does not show tags or branches at all. (Non-main-"
-"branch CVS revision numbers superficially resemble CVS revision numbers, but"
-" they actually encode a git commit ID directly, rather than represent the "
+"branch CVS revision numbers superficially resemble CVS revision numbers, but "
+"they actually encode a git commit ID directly, rather than represent the "
"number of revisions since the branch point.)"
msgstr ""
@@ -22700,8 +22604,8 @@ msgstr ""
#: en/git-cvsserver.txt:398
msgid ""
"If you want to refer to a git refspec that has characters that are not "
-"allowed by CVS, you have two options. First, it may just work to supply the"
-" git refspec directly to the appropriate CVS -r argument; some CVS clients "
+"allowed by CVS, you have two options. First, it may just work to supply the "
+"git refspec directly to the appropriate CVS -r argument; some CVS clients "
"don't seem to do much sanity checking of the argument. Second, if that "
"fails, you can use a special character escape mechanism that only uses "
"characters that are valid in CVS tags. A sequence of 4 or 5 characters of "
@@ -22729,16 +22633,16 @@ msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:408
msgid ""
-"By default the server leaves the `-k` mode blank for all files, which causes"
-" the CVS client to treat them as a text files, subject to end-of-line "
+"By default the server leaves the `-k` mode blank for all files, which causes "
+"the CVS client to treat them as a text files, subject to end-of-line "
"conversion on some platforms."
msgstr ""
#. type: Plain text
#: en/git-cvsserver.txt:413
msgid ""
-"You can make the server use the end-of-line conversion attributes to set the"
-" `-k` modes for files by setting the `gitcvs.usecrlfattr` config variable. "
+"You can make the server use the end-of-line conversion attributes to set the "
+"`-k` modes for files by setting the `gitcvs.usecrlfattr` config variable. "
"See linkgit:gitattributes[5] for more information about end-of-line "
"conversion."
msgstr ""
@@ -22748,11 +22652,11 @@ msgstr ""
msgid ""
"Alternatively, if `gitcvs.usecrlfattr` config is not enabled or the "
"attributes do not allow automatic detection for a filename, then the server "
-"uses the `gitcvs.allBinary` config for the default setting. If "
-"`gitcvs.allBinary` is set, then file not otherwise specified will default to"
-" '-kb' mode. Otherwise the `-k` mode is left blank. But if "
-"`gitcvs.allBinary` is set to \"guess\", then the correct `-k` mode will be "
-"guessed based on the contents of the file."
+"uses the `gitcvs.allBinary` config for the default setting. If `gitcvs."
+"allBinary` is set, then file not otherwise specified will default to '-kb' "
+"mode. Otherwise the `-k` mode is left blank. But if `gitcvs.allBinary` is "
+"set to \"guess\", then the correct `-k` mode will be guessed based on the "
+"contents of the file."
msgstr ""
#. type: Plain text
@@ -22776,7 +22680,7 @@ msgstr ""
#. type: Title =
#: en/git-daemon.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-daemon(1)"
msgstr "git-daemon(1)"
@@ -22846,8 +22750,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:54
msgid ""
-"Match paths exactly (i.e. don't allow \"/foo/repo\" when the real path is "
-"\"/foo/repo.git\" or \"/foo/repo/.git\") and don't do user-relative paths. "
+"Match paths exactly (i.e. don't allow \"/foo/repo\" when the real path is \"/"
+"foo/repo.git\" or \"/foo/repo/.git\") and don't do user-relative paths. "
"'git daemon' will refuse to start when this option is enabled and no "
"whitelist is specified."
msgstr ""
@@ -22869,7 +22773,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:62
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--base-path-relaxed"
msgstr "--base-path-relaxed"
@@ -22902,23 +22806,23 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:82
msgid ""
-"Allow pulling from all directories that look like Git repositories (have the"
-" 'objects' and 'refs' subdirectories), even if they do not have the 'git-"
+"Allow pulling from all directories that look like Git repositories (have the "
+"'objects' and 'refs' subdirectories), even if they do not have the 'git-"
"daemon-export-ok' file."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:83
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--inetd"
msgstr "--inetd"
#. type: Plain text
#: en/git-daemon.txt:88
msgid ""
-"Have the server run as an inetd service. Implies --syslog (may be overridden"
-" with `--log-destination=`). Incompatible with --detach, --port, --listen, "
-"--user and --group options."
+"Have the server run as an inetd service. Implies --syslog (may be overridden "
+"with `--log-destination=`). Incompatible with --detach, --port, --listen, --"
+"user and --group options."
msgstr ""
#. type: Labeled list
@@ -22985,13 +22889,13 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:113
msgid ""
-"Maximum number of concurrent clients, defaults to 32. Set it to zero for no"
-" limit."
+"Maximum number of concurrent clients, defaults to 32. Set it to zero for no "
+"limit."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:114
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--syslog"
msgstr "--syslog"
@@ -23047,13 +22951,13 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:137
msgid ""
-"The default destination is `syslog` if `--inetd` or `--detach` is specified,"
-" otherwise `stderr`."
+"The default destination is `syslog` if `--inetd` or `--detach` is specified, "
+"otherwise `stderr`."
msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:138
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--user-path"
msgstr "--user-path"
@@ -23080,7 +22984,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:151
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--reuseaddr"
msgstr "--reuseaddr"
@@ -23105,8 +23009,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:162
msgid ""
-"Save the process id in 'file'. Ignored when the daemon is run under "
-"`--inetd`."
+"Save the process id in 'file'. Ignored when the daemon is run under `--"
+"inetd`."
msgstr ""
#. type: Labeled list
@@ -23124,10 +23028,10 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:170
msgid ""
-"Change daemon's uid and gid before entering the service loop. When only "
-"`--user` is given without `--group`, the primary group ID for the user is "
-"used. The values of the option are given to `getpwnam(3)` and `getgrnam(3)`"
-" and numeric IDs are not supported."
+"Change daemon's uid and gid before entering the service loop. When only `--"
+"user` is given without `--group`, the primary group ID for the user is "
+"used. The values of the option are given to `getpwnam(3)` and `getgrnam(3)` "
+"and numeric IDs are not supported."
msgstr ""
#. type: Plain text
@@ -23165,8 +23069,7 @@ msgstr ""
msgid ""
"Enable/disable the service site-wide per default. Note that a service "
"disabled site-wide can still be enabled per repository if it is marked "
-"overridable and the repository enables the service with a configuration "
-"item."
+"overridable and the repository enables the service with a configuration item."
msgstr ""
#. type: Labeled list
@@ -23190,7 +23093,7 @@ msgstr ""
#. type: Labeled list
#: en/git-daemon.txt:196
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]informative-errors"
msgstr "--[no-]informative-errors"
@@ -23198,8 +23101,8 @@ msgstr "--[no-]informative-errors"
#: en/git-daemon.txt:204
msgid ""
"When informative errors are turned on, git-daemon will report more verbose "
-"errors to the client, differentiating conditions like \"no such repository\""
-" from \"repository not exported\". This is more convenient for clients, but "
+"errors to the client, differentiating conditions like \"no such repository\" "
+"from \"repository not exported\". This is more convenient for clients, but "
"may leak information about the existence of unexported repositories. When "
"informative errors are not enabled, all errors report \"access denied\" to "
"the client. The default is --no-informative-errors."
@@ -23214,14 +23117,14 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:215
msgid ""
-"Every time a client connects, first run an external command specified by the"
-" <path> with service name (e.g. \"upload-pack\"), path to the repository, "
-"hostname (%H), canonical hostname (%CH), IP address (%IP), and TCP port (%P)"
-" as its command-line arguments. The external command can decide to decline "
+"Every time a client connects, first run an external command specified by the "
+"<path> with service name (e.g. \"upload-pack\"), path to the repository, "
+"hostname (%H), canonical hostname (%CH), IP address (%IP), and TCP port (%P) "
+"as its command-line arguments. The external command can decide to decline "
"the service by exiting with a non-zero status (or to allow it by exiting "
-"with a zero status). It can also look at the $REMOTE_ADDR and "
-"`$REMOTE_PORT` environment variables to learn about the requestor when "
-"making this decision."
+"with a zero status). It can also look at the $REMOTE_ADDR and `"
+"$REMOTE_PORT` environment variables to learn about the requestor when making "
+"this decision."
msgstr ""
#. type: Plain text
@@ -23250,8 +23153,8 @@ msgstr ""
#: en/git-daemon.txt:234
msgid ""
"These services can be globally enabled/disabled using the command-line "
-"options of this command. If finer-grained control is desired (e.g. to allow"
-" 'git archive' to be run against only in a few selected repositories the "
+"options of this command. If finer-grained control is desired (e.g. to allow "
+"'git archive' to be run against only in a few selected repositories the "
"daemon serves), the per-repository configuration file can be used to enable "
"or disable them."
msgstr ""
@@ -23297,8 +23200,8 @@ msgid ""
"disabled by default, as there is _no_ authentication in the protocol (in "
"other words, anybody can push anything into the repository, including "
"removal of refs). This is solely meant for a closed LAN setting where "
-"everybody is friendly. This service can be enabled by setting "
-"`daemon.receivepack` configuration item to `true`."
+"everybody is friendly. This service can be enabled by setting `daemon."
+"receivepack` configuration item to `true`."
msgstr ""
#. type: Labeled list
@@ -23324,8 +23227,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:270
msgid ""
-"To set up 'git daemon' as an inetd service that handles any repository under"
-" the whitelisted set of directories, /pub/foo and /pub/bar, place an entry "
+"To set up 'git daemon' as an inetd service that handles any repository under "
+"the whitelisted set of directories, /pub/foo and /pub/bar, place an entry "
"like the following into /etc/inetd all on one line:"
msgstr ""
@@ -23367,8 +23270,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:299
msgid ""
-"In this example, the root-level directory `/pub` will contain a subdirectory"
-" for each virtual host name supported. Further, both hosts advertise "
+"In this example, the root-level directory `/pub` will contain a subdirectory "
+"for each virtual host name supported. Further, both hosts advertise "
"repositories simply as `git://www.example.com/software/repo.git`. For "
"pre-1.4.0 clients, a symlink from `/software` into the appropriate default "
"repository could be made as well."
@@ -23401,8 +23304,8 @@ msgstr ""
#. type: Plain text
#: en/git-daemon.txt:317
msgid ""
-"In this example, the root-level directory `/pub` will contain a subdirectory"
-" for each virtual host IP address supported. Repositories can still be "
+"In this example, the root-level directory `/pub` will contain a subdirectory "
+"for each virtual host IP address supported. Repositories can still be "
"accessed by hostname though, assuming they correspond to these IP addresses."
msgstr ""
@@ -23439,15 +23342,14 @@ msgstr ""
#. type: Title =
#: en/git-describe.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-describe(1)"
msgstr "git-describe(1)"
#. type: Plain text
#: en/git-describe.txt:7
msgid ""
-"git-describe - Give an object a human readable name based on an available "
-"ref"
+"git-describe - Give an object a human readable name based on an available ref"
msgstr ""
#. type: Plain text
@@ -23465,8 +23367,8 @@ msgid ""
"The command finds the most recent tag that is reachable from a commit. If "
"the tag points to the commit, then only the tag is shown. Otherwise, it "
"suffixes the tag name with the number of additional commits on top of the "
-"tagged object and the abbreviated object name of the most recent commit. The"
-" result is a \"human-readable\" object name which can also be used to "
+"tagged object and the abbreviated object name of the most recent commit. The "
+"result is a \"human-readable\" object name which can also be used to "
"identify the commit to other git commands."
msgstr ""
@@ -23481,10 +23383,10 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:34
msgid ""
-"If the given object refers to a blob, it will be described as `<commit-"
-"ish>:<path>`, such that the blob can be found at `<path>` in the `<commit-"
-"ish>`, which itself describes the first commit in which this blob occurs in "
-"a reverse revision walk from HEAD."
+"If the given object refers to a blob, it will be described as `<commit-ish>:"
+"<path>`, such that the blob can be found at `<path>` in the `<commit-ish>`, "
+"which itself describes the first commit in which this blob occurs in a "
+"reverse revision walk from HEAD."
msgstr ""
#. type: Labeled list
@@ -23513,12 +23415,11 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:49
msgid ""
-"Describe the state of the working tree. When the working tree matches HEAD,"
-" the output is the same as \"git describe HEAD\". If the working tree has "
-"local modification \"-dirty\" is appended to it. If a repository is corrupt"
-" and Git cannot determine if there is local modification, Git will error "
-"out, unless `--broken' is given, which appends the suffix \"-broken\" "
-"instead."
+"Describe the state of the working tree. When the working tree matches HEAD, "
+"the output is the same as \"git describe HEAD\". If the working tree has "
+"local modification \"-dirty\" is appended to it. If a repository is corrupt "
+"and Git cannot determine if there is local modification, Git will error out, "
+"unless `--broken' is given, which appends the suffix \"-broken\" instead."
msgstr ""
#. type: Plain text
@@ -23538,15 +23439,15 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:60
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--contains"
msgstr "--contains"
#. type: Plain text
#: en/git-describe.txt:64
msgid ""
-"Instead of finding the tag that predates the commit, find the tag that comes"
-" after the commit, and thus contains it. Automatically implies --tags."
+"Instead of finding the tag that predates the commit, find the tag that comes "
+"after the commit, and thus contains it. Automatically implies --tags."
msgstr ""
#. type: Plain text
@@ -23567,14 +23468,14 @@ msgstr ""
#: en/git-describe.txt:77
msgid ""
"Instead of considering only the 10 most recent tags as candidates to "
-"describe the input commit-ish consider up to <n> candidates. Increasing <n>"
-" above 10 will take slightly longer but may produce a more accurate result."
-" An <n> of 0 will cause only exact matches to be output."
+"describe the input commit-ish consider up to <n> candidates. Increasing <n> "
+"above 10 will take slightly longer but may produce a more accurate result. "
+"An <n> of 0 will cause only exact matches to be output."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:78
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--exact-match"
msgstr "--exact-match"
@@ -23587,15 +23488,15 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:82 en/git-ls-files.txt:157
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--debug"
msgstr "--debug"
#. type: Plain text
#: en/git-describe.txt:86
msgid ""
-"Verbosely display information about the searching strategy being employed to"
-" standard error. The tag name will still be printed to standard out."
+"Verbosely display information about the searching strategy being employed to "
+"standard error. The tag name will still be printed to standard out."
msgstr ""
#. type: Plain text
@@ -23603,11 +23504,10 @@ msgstr ""
msgid ""
"Always output the long format (the tag, the number of commits and the "
"abbreviated commit name) even when it matches a tag. This is useful when "
-"you want to see parts of the commit object name in \"describe\" output, even"
-" when the commit in question happens to be a tagged version. Instead of "
-"just emitting the tag name, it will describe such a commit as "
-"v1.2-0-gdeadbee (0th commit since tag v1.2 that points at object "
-"deadbee....)."
+"you want to see parts of the commit object name in \"describe\" output, even "
+"when the commit in question happens to be a tagged version. Instead of just "
+"emitting the tag name, it will describe such a commit as v1.2-0-gdeadbee "
+"(0th commit since tag v1.2 that points at object deadbee....)."
msgstr ""
#. type: Labeled list
@@ -23638,19 +23538,19 @@ msgstr ""
#: en/git-describe.txt:117
msgid ""
"Do not consider tags matching the given `glob(7)` pattern, excluding the "
-"\"refs/tags/\" prefix. If used with `--all`, it also does not consider local"
-" branches and remote-tracking references matching the pattern, excluding "
+"\"refs/tags/\" prefix. If used with `--all`, it also does not consider local "
+"branches and remote-tracking references matching the pattern, excluding "
"respectively \"refs/heads/\" and \"refs/remotes/\" prefix; references of "
"other types are never considered. If given multiple times, a list of "
"patterns will be accumulated and tags matching any of the patterns will be "
"excluded. When combined with --match a tag will be considered when it "
-"matches at least one --match pattern and does not match any of the --exclude"
-" patterns. Use `--no-exclude` to clear and reset the list of patterns."
+"matches at least one --match pattern and does not match any of the --exclude "
+"patterns. Use `--no-exclude` to clear and reset the list of patterns."
msgstr ""
#. type: Labeled list
#: en/git-describe.txt:118 en/git-diff-tree.txt:108 en/git-name-rev.txt:61
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--always"
msgstr "--always"
@@ -23661,7 +23561,7 @@ msgstr ""
#. type: Labeled list
#: en/git-describe.txt:121 en/rev-list-options.txt:124
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--first-parent"
msgstr "--first-parent"
@@ -23699,8 +23599,8 @@ msgstr ""
#: en/git-describe.txt:147
msgid ""
"The number of additional commits is the number of commits which would be "
-"displayed by \"git log v1.0.4..parent\". The hash suffix is \"-g\" + 7-char"
-" abbreviation for the tip commit of parent (which was "
+"displayed by \"git log v1.0.4..parent\". The hash suffix is \"-g\" + 7-char "
+"abbreviation for the tip commit of parent (which was "
"`2414721b194453f058079d897d13c4e377f92dc6`). The \"g\" prefix stands for "
"\"git\" and is used to allow describing the version of a software depending "
"on the SCM the software is managed with. This is useful in an environment "
@@ -23762,10 +23662,10 @@ msgstr ""
#: en/git-describe.txt:173
msgid ""
"Note that the suffix you get if you type these commands today may be longer "
-"than what Linus saw above when he ran these commands, as your Git repository"
-" may have new commits whose object names begin with 975b that did not exist "
-"back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate"
-" these commits."
+"than what Linus saw above when he ran these commands, as your Git repository "
+"may have new commits whose object names begin with 975b that did not exist "
+"back then, and \"-g975b\" suffix alone may not be sufficient to disambiguate "
+"these commits."
msgstr ""
#. type: Title -
@@ -23777,8 +23677,8 @@ msgstr ""
#. type: Plain text
#: en/git-describe.txt:183
msgid ""
-"For each commit-ish supplied, 'git describe' will first look for a tag which"
-" tags exactly that commit. Annotated tags will always be preferred over "
+"For each commit-ish supplied, 'git describe' will first look for a tag which "
+"tags exactly that commit. Annotated tags will always be preferred over "
"lightweight tags, and tags with newer dates will always be preferred over "
"tags with older dates. If an exact match is found, its name will be output "
"and searching will stop."
@@ -23789,9 +23689,9 @@ msgstr ""
msgid ""
"If an exact match was not found, 'git describe' will walk back through the "
"commit history to locate an ancestor commit which has been tagged. The "
-"ancestor's tag will be output along with an abbreviation of the input "
-"commit-ish's SHA-1. If `--first-parent` was specified then the walk will "
-"only consider the first parent of each commit."
+"ancestor's tag will be output along with an abbreviation of the input commit-"
+"ish's SHA-1. If `--first-parent` was specified then the walk will only "
+"consider the first parent of each commit."
msgstr ""
#. type: Plain text
@@ -23809,13 +23709,13 @@ msgstr ""
msgid ""
"Tree objects as well as tag objects not pointing at commits, cannot be "
"described. When describing blobs, the lightweight tags pointing at blobs "
-"are ignored, but the blob is still described as <committ-ish>:<path> despite"
-" the lightweight tag being favorable."
+"are ignored, but the blob is still described as <committ-ish>:<path> despite "
+"the lightweight tag being favorable."
msgstr ""
#. type: Title =
#: en/git-diff-files.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-diff-files(1)"
msgstr "git-diff-files(1)"
@@ -23827,9 +23727,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-files.txt:13
#, no-wrap
-msgid ""
-"'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] "
-"[<path>...]\n"
+msgid "'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]\n"
msgstr ""
#. type: Plain text
@@ -23875,9 +23773,8 @@ msgid ""
msgstr ""
#. type: Labeled list
-#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98
-#: en/rev-list-options.txt:957
-#, ignore-same, no-wrap
+#: en/git-diff-files.txt:38 en/git-diff-tree.txt:98 en/rev-list-options.txt:957
+#, no-wrap
msgid "--cc"
msgstr "--cc"
@@ -23896,7 +23793,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-index.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-diff-index(1)"
msgstr "git-diff-index(1)"
@@ -23908,9 +23805,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:13
#, no-wrap
-msgid ""
-"'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> "
-"[<path>...]\n"
+msgid "'git diff-index' [-m] [--cached] [<common diff options>] <tree-ish> [<path>...]\n"
msgstr ""
#. type: Plain text
@@ -24015,8 +23910,8 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:75
msgid ""
-"In fact, `git diff-index --cached` *should* always be entirely equivalent to"
-" actually doing a 'git write-tree' and comparing that. Except this one is "
+"In fact, `git diff-index --cached` *should* always be entirely equivalent to "
+"actually doing a 'git write-tree' and comparing that. Except this one is "
"much nicer for the case where you just want to check where you are."
msgstr ""
@@ -24024,8 +23919,8 @@ msgstr ""
#: en/git-diff-index.txt:79
msgid ""
"So doing a `git diff-index --cached` is basically very useful when you are "
-"asking yourself \"what have I already marked for being committed, and what's"
-" the difference to a previous tree\"."
+"asking yourself \"what have I already marked for being committed, and what's "
+"the difference to a previous tree\"."
msgstr ""
#. type: Title -
@@ -24039,8 +23934,8 @@ msgstr ""
msgid ""
"The \"non-cached\" mode takes a different approach, and is potentially the "
"more useful of the two in that what it does can't be emulated with a 'git "
-"write-tree' + 'git diff-tree'. Thus that's the default mode. The non-cached"
-" version asks the question:"
+"write-tree' + 'git diff-tree'. Thus that's the default mode. The non-cached "
+"version asks the question:"
msgstr ""
#. type: Plain text
@@ -24054,9 +23949,9 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:93
msgid ""
-"which is obviously a very useful question too, since that tells you what you"
-" *could* commit. Again, the output matches the 'git diff-tree -r' output to "
-"a tee, but with a twist."
+"which is obviously a very useful question too, since that tells you what you "
+"*could* commit. Again, the output matches the 'git diff-tree -r' output to a "
+"tee, but with a twist."
msgstr ""
#. type: Plain text
@@ -24089,8 +23984,8 @@ msgstr ""
#. type: Plain text
#: en/git-diff-index.txt:113
msgid ""
-"As with other commands of this type, 'git diff-index' does not actually look"
-" at the contents of the file at all. So maybe `kernel/sched.c` hasn't "
+"As with other commands of this type, 'git diff-index' does not actually look "
+"at the contents of the file at all. So maybe `kernel/sched.c` hasn't "
"actually changed, and it's just that you touched it. In either case, it's a "
"note that you need to 'git update-index' it to make the index be in sync."
msgstr ""
@@ -24107,7 +24002,7 @@ msgstr ""
#. type: Title =
#: en/git-difftool.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-difftool(1)"
msgstr "git-difftool(1)"
@@ -24133,26 +24028,26 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:23
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--dir-diff"
msgstr "--dir-diff"
#. type: Plain text
#: en/git-difftool.txt:27
msgid ""
-"Copy the modified files to a temporary location and perform a directory diff"
-" on them. This mode never prompts before launching the diff tool."
+"Copy the modified files to a temporary location and perform a directory diff "
+"on them. This mode never prompts before launching the diff tool."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:28 en/git-mergetool.txt:70
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-y"
msgstr "-y"
#. type: Labeled list
#: en/git-difftool.txt:29 en/git-mergetool.txt:71
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-prompt"
msgstr "--no-prompt"
@@ -24163,7 +24058,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:32 en/git-mergetool.txt:78
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--prompt"
msgstr "--prompt"
@@ -24198,8 +24093,8 @@ msgstr ""
#: en/git-difftool.txt:47
msgid ""
"If a diff tool is not specified, 'git difftool' will use the configuration "
-"variable `diff.tool`. If the configuration variable `diff.tool` is not set,"
-" 'git difftool' will pick a suitable default."
+"variable `diff.tool`. If the configuration variable `diff.tool` is not set, "
+"'git difftool' will pick a suitable default."
msgstr ""
#. type: Plain text
@@ -24222,19 +24117,19 @@ msgstr ""
#. type: Plain text
#: en/git-difftool.txt:68
msgid ""
-"When 'git difftool' is invoked with this tool (either through the `-t` or "
-"`--tool` option or the `diff.tool` configuration variable) the configured "
-"command line will be invoked with the following variables available: "
-"`$LOCAL` is set to the name of the temporary file containing the contents of"
-" the diff pre-image and `$REMOTE` is set to the name of the temporary file "
+"When 'git difftool' is invoked with this tool (either through the `-t` or `--"
+"tool` option or the `diff.tool` configuration variable) the configured "
+"command line will be invoked with the following variables available: `"
+"$LOCAL` is set to the name of the temporary file containing the contents of "
+"the diff pre-image and `$REMOTE` is set to the name of the temporary file "
"containing the contents of the diff post-image. `$MERGED` is the name of "
-"the file which is being compared. `$BASE` is provided for compatibility with"
-" custom merge tool commands and has the same value as `$MERGED`."
+"the file which is being compared. `$BASE` is provided for compatibility with "
+"custom merge tool commands and has the same value as `$MERGED`."
msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:69 en/git-mergetool.txt:67
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--tool-help"
msgstr "--tool-help"
@@ -24245,7 +24140,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:72
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]symlinks"
msgstr "--[no-]symlinks"
@@ -24288,13 +24183,13 @@ msgstr ""
#: en/git-difftool.txt:88 en/git-help.txt:59 en/git-mergetool.txt:82
#: en/git-show-branch.txt:111 en/git-update-index.txt:122
#: en/rev-list-options.txt:256
-#, ignore-same, no-wrap
+#, no-wrap
msgid "-g"
msgstr "-g"
#. type: Labeled list
#: en/git-difftool.txt:89
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]gui"
msgstr "--[no-]gui"
@@ -24308,7 +24203,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:95
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]trust-exit-code"
msgstr "--[no-]trust-exit-code"
@@ -24348,7 +24243,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:111
-#, ignore-same, no-wrap
+#, no-wrap
msgid "diff.tool"
msgstr "diff.tool"
@@ -24359,7 +24254,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:114
-#, ignore-same, no-wrap
+#, no-wrap
msgid "diff.guitool"
msgstr "diff.guitool"
@@ -24399,7 +24294,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:126
-#, ignore-same, no-wrap
+#, no-wrap
msgid "difftool.prompt"
msgstr "difftool.prompt"
@@ -24410,7 +24305,7 @@ msgstr ""
#. type: Labeled list
#: en/git-difftool.txt:129
-#, ignore-same, no-wrap
+#, no-wrap
msgid "difftool.trustExitCode"
msgstr "difftool.trustExitCode"
@@ -24441,7 +24336,7 @@ msgstr ""
#. type: Title =
#: en/git-diff-tree.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-diff-tree(1)"
msgstr "git-diff-tree(1)"
@@ -24519,8 +24414,8 @@ msgstr ""
msgid ""
"When `--stdin` is specified, the command does not take <tree-ish> arguments "
"from the command line. Instead, it reads lines containing either two "
-"<tree>, one <commit>, or a list of <commit> from its standard input. (Use a"
-" single space as separator.)"
+"<tree>, one <commit>, or a list of <commit> from its standard input. (Use a "
+"single space as separator.)"
msgstr ""
#. type: Plain text
@@ -24573,7 +24468,7 @@ msgstr ""
#. type: Labeled list
#: en/git-diff-tree.txt:84
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-commit-id"
msgstr "--no-commit-id"
@@ -24610,13 +24505,13 @@ msgstr ""
#. type: Plain text
#: en/git-diff-tree.txt:111
msgid ""
-"Show the commit itself and the commit log message even if the diff itself is"
-" empty."
+"Show the commit itself and the commit log message even if the diff itself is "
+"empty."
msgstr ""
#. type: Title =
#: en/git-diff.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-diff(1)"
msgstr "git-diff(1)"
@@ -24640,8 +24535,8 @@ msgstr ""
#: en/git-diff.txt:23
msgid ""
"Show changes between the working tree and the index or a tree, changes "
-"between the index and a tree, changes between two trees, changes between two"
-" blob objects, or changes between two files on disk."
+"between the index and a tree, changes between two trees, changes between two "
+"blob objects, or changes between two files on disk."
msgstr ""
#. type: Labeled list
@@ -24655,8 +24550,8 @@ msgstr ""
msgid ""
"This form is to view the changes you made relative to the index (staging "
"area for the next commit). In other words, the differences are what you "
-"_could_ tell Git to further add to the index but you still haven't. You can"
-" stage these changes by using linkgit:git-add[1]."
+"_could_ tell Git to further add to the index but you still haven't. You can "
+"stage these changes by using linkgit:git-add[1]."
msgstr ""
#. type: Labeled list
@@ -24668,8 +24563,8 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:40
msgid ""
-"This form is to compare the given two paths on the filesystem. You can omit"
-" the `--no-index` option when running the command in a working tree "
+"This form is to compare the given two paths on the filesystem. You can omit "
+"the `--no-index` option when running the command in a working tree "
"controlled by Git and at least one of the paths points outside the working "
"tree, or when running the command outside a working tree controlled by Git."
msgstr ""
@@ -24738,8 +24633,8 @@ msgstr ""
#: en/git-diff.txt:77
msgid ""
"This form is to view the changes on the branch containing and up to the "
-"second <commit>, starting at a common ancestor of both <commit>. \"git diff"
-" A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\". You can "
+"second <commit>, starting at a common ancestor of both <commit>. \"git diff "
+"A\\...B\" is equivalent to \"git diff $(git merge-base A B) B\". You can "
"omit any one of <commit>, which has the same effect as using HEAD instead."
msgstr ""
@@ -24747,8 +24642,8 @@ msgstr ""
#: en/git-diff.txt:82
msgid ""
"Just in case you are doing something exotic, it should be noted that all of "
-"the <commit> in the above description, except in the last two forms that use"
-" \"..\" notations, can be any <tree>."
+"the <commit> in the above description, except in the last two forms that use "
+"\"..\" notations, can be any <tree>."
msgstr ""
#. type: Plain text
@@ -24756,9 +24651,9 @@ msgstr ""
msgid ""
"For a more complete list of ways to spell <commit>, see \"SPECIFYING "
"REVISIONS\" section in linkgit:gitrevisions[7]. However, \"diff\" is about "
-"comparing two _endpoints_, not ranges, and the range notations "
-"(\"<commit>..<commit>\" and \"<commit>\\...<commit>\") do not mean a range "
-"as defined in the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
+"comparing two _endpoints_, not ranges, and the range notations (\"<commit>.."
+"<commit>\" and \"<commit>\\...<commit>\") do not mean a range as defined in "
+"the \"SPECIFYING RANGES\" section in linkgit:gitrevisions[7]."
msgstr ""
#. type: Labeled list
@@ -24777,10 +24672,10 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:108
msgid ""
-"Compare the working tree with the \"base\" version (stage #1), \"our "
-"branch\" (stage #2) or \"their branch\" (stage #3). The index contains "
-"these stages only for unmerged entries i.e. while resolving conflicts. See"
-" linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
+"Compare the working tree with the \"base\" version (stage #1), \"our branch"
+"\" (stage #2) or \"their branch\" (stage #3). The index contains these "
+"stages only for unmerged entries i.e. while resolving conflicts. See "
+"linkgit:git-read-tree[1] section \"3-Way Merge\" for detailed information."
msgstr ""
#. type: Plain text
@@ -24820,8 +24715,8 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:136
msgid ""
-"Changes between the index and your last commit; what you would be committing"
-" if you run \"git commit\" without \"-a\" option."
+"Changes between the index and your last commit; what you would be committing "
+"if you run \"git commit\" without \"-a\" option."
msgstr ""
#. type: Plain text
@@ -24915,8 +24810,7 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:177
-msgid ""
-"Show only modification, rename, and copy, but not addition or deletion."
+msgid "Show only modification, rename, and copy, but not addition or deletion."
msgstr ""
#. type: Plain text
@@ -24958,13 +24852,13 @@ msgstr ""
#. type: Plain text
#: en/git-diff.txt:200
msgid ""
-"diff(1), linkgit:git-difftool[1], linkgit:git-log[1], "
-"linkgit:gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
+"diff(1), linkgit:git-difftool[1], linkgit:git-log[1], linkgit:"
+"gitdiffcore[7], linkgit:git-format-patch[1], linkgit:git-apply[1]"
msgstr ""
#. type: Title =
#: en/git-fast-export.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-fast-export(1)"
msgstr "git-fast-export(1)"
@@ -25025,9 +24919,9 @@ msgstr ""
msgid ""
"When asking to 'abort' (which is the default), this program will die when "
"encountering a signed tag. With 'strip', the tags will silently be made "
-"unsigned, with 'warn-strip' they will be made unsigned but a warning will be"
-" displayed, with 'verbatim', they will be silently exported and with 'warn',"
-" they will be exported, but you will see a warning."
+"unsigned, with 'warn-strip' they will be made unsigned but a warning will be "
+"displayed, with 'verbatim', they will be silently exported and with 'warn', "
+"they will be exported, but you will see a warning."
msgstr ""
#. type: Labeled list
@@ -25050,8 +24944,8 @@ msgid ""
"When asking to 'abort' (which is the default), this program will die when "
"encountering such a tag. With 'drop' it will omit such tags from the "
"output. With 'rewrite', if the tagged object is a commit, it will rewrite "
-"the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-"
-"rev-list[1])"
+"the tag to tag an ancestor commit (via parent rewriting; see linkgit:git-rev-"
+"list[1])"
msgstr ""
#. type: Plain text
@@ -25080,11 +24974,11 @@ msgstr ""
msgid ""
"Dumps the internal marks table to <file> when complete. Marks are written "
"one per line as `:markid SHA-1`. Only marks for revisions are dumped; marks "
-"for blobs are ignored. Backends can use this file to validate imports after"
-" they have been completed, or to save the marks table across incremental "
+"for blobs are ignored. Backends can use this file to validate imports after "
+"they have been completed, or to save the marks table across incremental "
"runs. As <file> is only opened and truncated at completion, the same path "
-"can also be safely given to --import-marks. The file will not be written if"
-" no new object has been marked/exported."
+"can also be safely given to --import-marks. The file will not be written if "
+"no new object has been marked/exported."
msgstr ""
#. type: Labeled list
@@ -25112,7 +25006,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:84
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--fake-missing-tagger"
msgstr "--fake-missing-tagger"
@@ -25126,7 +25020,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:90
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--use-done-feature"
msgstr "--use-done-feature"
@@ -25139,7 +25033,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:94
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-data"
msgstr "--no-data"
@@ -25155,7 +25049,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:102 en/git-ls-tree.txt:72
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--full-tree"
msgstr "--full-tree"
@@ -25170,7 +25064,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:108
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--anonymize"
msgstr "--anonymize"
@@ -25183,7 +25077,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:113
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--reference-excluded-parents"
msgstr "--reference-excluded-parents"
@@ -25196,13 +25090,13 @@ msgid ""
"and new master{tilde}4 will have all the same files). Use --reference-"
"excluded-parents to instead have the the stream refer to commits in the "
"excluded range of history by their sha1sum. Note that the resulting stream "
-"can only be used by a repository which already contains the necessary parent"
-" commits."
+"can only be used by a repository which already contains the necessary parent "
+"commits."
msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:125
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-original-ids"
msgstr "--show-original-ids"
@@ -25218,7 +25112,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-export.txt:132
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--refspec"
msgstr "--refspec"
@@ -25240,9 +25134,9 @@ msgstr ""
msgid ""
"A list of arguments, acceptable to 'git rev-parse' and 'git rev-list', that "
"specifies the specific objects and references to export. For example, "
-"`master~10..master` causes the current master reference to be exported along"
-" with all objects added since its 10th ancestor commit and (unless the "
-"--reference-excluded-parents option is specified) all files common to "
+"`master~10..master` causes the current master reference to be exported along "
+"with all objects added since its 10th ancestor commit and (unless the --"
+"reference-excluded-parents option is specified) all files common to "
"master{tilde}9 and master{tilde}10."
msgstr ""
@@ -25279,8 +25173,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:168
msgid ""
-"Note that this assumes that none of the blobs and commit messages referenced"
-" by that revision range contains the string 'refs/heads/master'."
+"Note that this assumes that none of the blobs and commit messages referenced "
+"by that revision range contains the string 'refs/heads/master'."
msgstr ""
#. type: Title -
@@ -25375,14 +25269,14 @@ msgstr ""
#. type: Plain text
#: en/git-fast-export.txt:232
msgid ""
-"Since 'git fast-import' cannot tag trees, you will not be able to export the"
-" linux.git repository completely, as it contains a tag referencing a tree "
+"Since 'git fast-import' cannot tag trees, you will not be able to export the "
+"linux.git repository completely, as it contains a tag referencing a tree "
"instead of a commit."
msgstr ""
#. type: Title =
#: en/git-fast-import.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-fast-import(1)"
msgstr "git-fast-import(1)"
@@ -25409,8 +25303,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:26
msgid ""
-"fast-import reads a mixed command/data stream from standard input and writes"
-" one or more packfiles directly into the current repository. When EOF is "
+"fast-import reads a mixed command/data stream from standard input and writes "
+"one or more packfiles directly into the current repository. When EOF is "
"received on standard input, fast import writes out updated branch and tag "
"refs, fully updating the current repository with the newly imported data."
msgstr ""
@@ -25418,8 +25312,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:32
msgid ""
-"The fast-import backend itself can import into an empty repository (one that"
-" has already been initialized by 'git init') or incrementally update an "
+"The fast-import backend itself can import into an empty repository (one that "
+"has already been initialized by 'git init') or incrementally update an "
"existing populated repository. Whether or not incremental imports are "
"supported from a particular foreign source depends on the frontend program "
"in use."
@@ -25437,23 +25331,23 @@ msgstr ""
msgid ""
"Disable the output shown by --stats, making fast-import usually be silent "
"when it is successful. However, if the import stream has directives "
-"intended to show user output (e.g. `progress` directives), the corresponding"
-" messages will still be shown."
+"intended to show user output (e.g. `progress` directives), the corresponding "
+"messages will still be shown."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:48
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--stats"
msgstr "--stats"
#. type: Plain text
#: en/git-fast-import.txt:53
msgid ""
-"Display some basic statistics about the objects fast-import has created, the"
-" packfiles they were stored into, and the memory used by fast-import during "
-"this run. Showing this output is currently the default, but can be disabled"
-" with --quiet."
+"Display some basic statistics about the objects fast-import has created, the "
+"packfiles they were stored into, and the memory used by fast-import during "
+"this run. Showing this output is currently the default, but can be disabled "
+"with --quiet."
msgstr ""
#. type: Title ~
@@ -25486,22 +25380,22 @@ msgstr ""
#: en/git-fast-import.txt:68
msgid ""
"Specify the type of dates the frontend will supply to fast-import within "
-"`author`, `committer` and `tagger` commands. See ``Date Formats'' below for"
-" details about which formats are supported, and their syntax."
+"`author`, `committer` and `tagger` commands. See ``Date Formats'' below for "
+"details about which formats are supported, and their syntax."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:69
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--done"
msgstr "--done"
#. type: Plain text
#: en/git-fast-import.txt:74
msgid ""
-"Terminate with error if there is no `done` command at the end of the stream."
-" This option might be useful for detecting errors that cause the frontend "
-"to terminate before it has started to write a stream."
+"Terminate with error if there is no `done` command at the end of the "
+"stream. This option might be useful for detecting errors that cause the "
+"frontend to terminate before it has started to write a stream."
msgstr ""
#. type: Title ~
@@ -25525,9 +25419,8 @@ msgstr ""
msgid ""
"Before processing any input, load the marks specified in <file>. The input "
"file must exist, must be readable, and must use the same format as produced "
-"by --export-marks. Multiple options may be supplied to import more than one"
-" set of marks. If a mark is defined to different values, the last file "
-"wins."
+"by --export-marks. Multiple options may be supplied to import more than one "
+"set of marks. If a mark is defined to different values, the last file wins."
msgstr ""
#. type: Labeled list
@@ -25545,7 +25438,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:99
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]relative-marks"
msgstr "--[no-]relative-marks"
@@ -25562,8 +25455,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:109
msgid ""
-"Relative and non-relative marks may be combined by interweaving "
-"--(no-)-relative-marks with the --(import|export)-marks= options."
+"Relative and non-relative marks may be combined by interweaving --(no-)-"
+"relative-marks with the --(import|export)-marks= options."
msgstr ""
#. type: Title ~
@@ -25595,8 +25488,8 @@ msgstr ""
#: en/git-fast-import.txt:122
msgid ""
"Maximum size of a blob that fast-import will attempt to create a delta for, "
-"expressed in bytes. The default is 512m (512 MiB). Some importers may wish"
-" to lower this on systems with constrained memory."
+"expressed in bytes. The default is 512m (512 MiB). Some importers may wish "
+"to lower this on systems with constrained memory."
msgstr ""
#. type: Labeled list
@@ -25621,15 +25514,14 @@ msgstr ""
#: en/git-fast-import.txt:135
msgid ""
"After creating a packfile, print a line of data to <file> listing the "
-"filename of the packfile and the last commit on each branch that was written"
-" to that packfile. This information may be useful after importing projects "
+"filename of the packfile and the last commit on each branch that was written "
+"to that packfile. This information may be useful after importing projects "
"whose total object set exceeds the 4 GiB packfile limit, as these commits "
"can be used as edge points during calls to 'git pack-objects'."
msgstr ""
#. type: Labeled list
-#: en/git-fast-import.txt:136 en/git-pack-objects.txt:114
-#: en/git-repack.txt:118
+#: en/git-fast-import.txt:136 en/git-pack-objects.txt:114 en/git-repack.txt:118
#, no-wrap
msgid "--max-pack-size=<n>"
msgstr ""
@@ -25641,7 +25533,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:140
-#, ignore-same, no-wrap
+#, no-wrap
msgid "fastimport.unpackLimit"
msgstr "fastimport.unpackLimit"
@@ -25663,18 +25555,18 @@ msgid ""
"amount of memory usage and processing time. Assuming the frontend is able "
"to keep up with fast-import and feed it a constant stream of data, import "
"times for projects holding 10+ years of history and containing 100,000+ "
-"individual commits are generally completed in just 1-2 hours on quite modest"
-" (~$2,000 USD) hardware."
+"individual commits are generally completed in just 1-2 hours on quite modest "
+"(~$2,000 USD) hardware."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:157
msgid ""
-"Most bottlenecks appear to be in foreign source data access (the source just"
-" cannot extract revisions fast enough) or disk IO (fast-import writes as "
-"fast as the disk will take the data). Imports will run faster if the source"
-" data is stored on a different drive than the destination Git repository "
-"(due to less IO contention)."
+"Most bottlenecks appear to be in foreign source data access (the source just "
+"cannot extract revisions fast enough) or disk IO (fast-import writes as fast "
+"as the disk will take the data). Imports will run faster if the source data "
+"is stored on a different drive than the destination Git repository (due to "
+"less IO contention)."
msgstr ""
#. type: Title -
@@ -25715,11 +25607,11 @@ msgid ""
"fast-import does not lock the branch or tag refs it is actively importing. "
"After the import, during its ref update phase, fast-import tests each "
"existing branch ref to verify the update will be a fast-forward update (the "
-"commit stored in the ref is contained in the new history of the commit to be"
-" written). If the update is not a fast-forward update, fast-import will "
-"skip updating that ref and instead prints a warning message. fast-import "
-"will always attempt to update all branch refs, and does not stop on the "
-"first failure."
+"commit stored in the ref is contained in the new history of the commit to be "
+"written). If the update is not a fast-forward update, fast-import will skip "
+"updating that ref and instead prints a warning message. fast-import will "
+"always attempt to update all branch refs, and does not stop on the first "
+"failure."
msgstr ""
#. type: Plain text
@@ -25750,8 +25642,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:207
msgid ""
-"fast-import does not use or alter the current working directory, or any file"
-" within it. (It does however update the current Git repository, as "
+"fast-import does not use or alter the current working directory, or any file "
+"within it. (It does however update the current Git repository, as "
"referenced by `GIT_DIR`.) Therefore an import frontend may use the working "
"directory for its own purposes, such as extracting file revisions from the "
"foreign source. This ignorance of the working directory also allows fast-"
@@ -25768,10 +25660,10 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:215
msgid ""
-"With the exception of raw file data (which Git does not interpret) the "
-"fast-import input format is text (ASCII) based. This text based format "
-"simplifies development and debugging of frontend programs, especially when a"
-" higher level language such as Perl, Python or Ruby is being used."
+"With the exception of raw file data (which Git does not interpret) the fast-"
+"import input format is text (ASCII) based. This text based format "
+"simplifies development and debugging of frontend programs, especially when a "
+"higher level language such as Perl, Python or Ruby is being used."
msgstr ""
#. type: Plain text
@@ -25780,9 +25672,9 @@ msgid ""
"fast-import is very strict about its input. Where we say SP below we mean "
"*exactly* one space. Likewise LF means one (and only one) linefeed and HT "
"one (and only one) horizontal tab. Supplying additional whitespace "
-"characters will cause unexpected results, such as branch names or file names"
-" with leading or trailing spaces in their name, or early termination of "
-"fast-import when it encounters unexpected input."
+"characters will cause unexpected results, such as branch names or file names "
+"with leading or trailing spaces in their name, or early termination of fast-"
+"import when it encounters unexpected input."
msgstr ""
#. type: Title ~
@@ -25818,7 +25710,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:239
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`raw`"
msgstr "`raw`"
@@ -25833,18 +25725,18 @@ msgstr ""
#: en/git-fast-import.txt:247
msgid ""
"The time of the event is specified by `<time>` as the number of seconds "
-"since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII"
-" decimal integer."
+"since the UNIX epoch (midnight, Jan 1, 1970, UTC) and is written as an ASCII "
+"decimal integer."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:253
msgid ""
-"The local offset is specified by `<offutc>` as a positive or negative offset"
-" from UTC. For example EST (which is 5 hours behind UTC) would be "
-"expressed in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset "
-"does not affect `<time>`; it is used only as an advisement to help "
-"formatting routines display the timestamp."
+"The local offset is specified by `<offutc>` as a positive or negative offset "
+"from UTC. For example EST (which is 5 hours behind UTC) would be expressed "
+"in `<tz>` by ``-0500'' while UTC is ``+0000''. The local offset does not "
+"affect `<time>`; it is used only as an advisement to help formatting "
+"routines display the timestamp."
msgstr ""
#. type: Plain text
@@ -25852,8 +25744,8 @@ msgstr ""
msgid ""
"If the local offset is not available in the source material, use ``+0000'', "
"or the most common local offset. For example many organizations have a CVS "
-"repository which has only ever been accessed by users who are located in the"
-" same location and time zone. In this case a reasonable offset from UTC "
+"repository which has only ever been accessed by users who are located in the "
+"same location and time zone. In this case a reasonable offset from UTC "
"could be assumed."
msgstr ""
@@ -25888,17 +25780,16 @@ msgstr ""
msgid ""
"Some malformed strings may be accepted as valid dates. In some of these "
"cases Git will still be able to obtain the correct date from the malformed "
-"string. There are also some types of malformed strings which Git will parse"
-" wrong, and yet consider valid. Seriously malformed strings will be "
-"rejected."
+"string. There are also some types of malformed strings which Git will parse "
+"wrong, and yet consider valid. Seriously malformed strings will be rejected."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:281
msgid ""
"Unlike the `raw` format above, the time zone/UTC offset information "
-"contained in an RFC 2822 date string is used to adjust the date value to UTC"
-" prior to storage. Therefore it is important that this information be as "
+"contained in an RFC 2822 date string is used to adjust the date value to UTC "
+"prior to storage. Therefore it is important that this information be as "
"accurate as possible."
msgstr ""
@@ -25913,22 +25804,22 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:291
msgid ""
-"Frontends should prefer the `raw` format if the source material already uses"
-" UNIX-epoch format, can be coaxed to give dates in that format, or its "
-"format is easily convertible to it, as there is no ambiguity in parsing."
+"Frontends should prefer the `raw` format if the source material already uses "
+"UNIX-epoch format, can be coaxed to give dates in that format, or its format "
+"is easily convertible to it, as there is no ambiguity in parsing."
msgstr ""
#. type: Labeled list
#: en/git-fast-import.txt:292
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`now`"
msgstr "`now`"
#. type: Plain text
#: en/git-fast-import.txt:295
msgid ""
-"Always use the current time and time zone. The literal `now` must always be"
-" supplied for `<when>`."
+"Always use the current time and time zone. The literal `now` must always be "
+"supplied for `<when>`."
msgstr ""
#. type: Plain text
@@ -25951,8 +25842,8 @@ msgstr ""
#: en/git-fast-import.txt:312
msgid ""
"If separate `author` and `committer` commands are used in a `commit` the "
-"timestamps may not match, as the system clock will be polled twice (once for"
-" each command). The only way to ensure that both author and committer "
+"timestamps may not match, as the system clock will be polled twice (once for "
+"each command). The only way to ensure that both author and committer "
"identity information has the same timestamp is to omit `author` (thus "
"copying from `committer`) or to use a date format other than `now`."
msgstr ""
@@ -25973,7 +25864,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:319 en/git-fast-import.txt:381
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`commit`"
msgstr "`commit`"
@@ -25986,7 +25877,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:324 en/git-fast-import.txt:759
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`tag`"
msgstr "`tag`"
@@ -26000,7 +25891,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:330 en/git-fast-import.txt:803
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`reset`"
msgstr "`reset`"
@@ -26014,7 +25905,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:335 en/git-fast-import.txt:832
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`blob`"
msgstr "`blob`"
@@ -26027,7 +25918,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:340 en/git-fast-import.txt:905
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`checkpoint`"
msgstr "`checkpoint`"
@@ -26041,20 +25932,20 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:346 en/git-fast-import.txt:933
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`progress`"
msgstr "`progress`"
#. type: Plain text
#: en/git-fast-import.txt:350
msgid ""
-"Causes fast-import to echo the entire line to its own standard output. This"
-" command is optional and is not needed to perform an import."
+"Causes fast-import to echo the entire line to its own standard output. This "
+"command is optional and is not needed to perform an import."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:351 en/git-fast-import.txt:1143
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`done`"
msgstr "`done`"
@@ -26068,7 +25959,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:356 en/git-fast-import.txt:958
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`get-mark`"
msgstr "`get-mark`"
@@ -26081,7 +25972,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:361 en/git-fast-import.txt:977
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`cat-blob`"
msgstr "`cat-blob`"
@@ -26094,21 +25985,21 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:366 en/git-fast-import.txt:1007
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`ls`"
msgstr "`ls`"
#. type: Plain text
#: en/git-fast-import.txt:370
msgid ""
-"Causes fast-import to print a line describing a directory entry in 'ls-tree'"
-" format to the file descriptor set with `--cat-blob-fd` or `stdout` if "
+"Causes fast-import to print a line describing a directory entry in 'ls-tree' "
+"format to the file descriptor set with `--cat-blob-fd` or `stdout` if "
"unspecified."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:371 en/git-fast-import.txt:1060
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`feature`"
msgstr "`feature`"
@@ -26121,7 +26012,7 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:375 en/git-fast-import.txt:1115
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`option`"
msgstr "`option`"
@@ -26136,8 +26027,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:384
msgid ""
-"Create or update a branch with a new commit, recording one logical change to"
-" the project."
+"Create or update a branch with a new commit, recording one logical change to "
+"the project."
msgstr ""
#. type: delimited block .
@@ -26180,11 +26071,11 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:416
msgid ""
-"The `data` command following `committer` must supply the commit message (see"
-" below for `data` command syntax). To import an empty commit message use a "
-"0 length data. Commit messages are free-form and are not interpreted by "
-"Git. Currently they must be encoded in UTF-8, as fast-import does not "
-"permit other encodings to be specified."
+"The `data` command following `committer` must supply the commit message (see "
+"below for `data` command syntax). To import an empty commit message use a 0 "
+"length data. Commit messages are free-form and are not interpreted by Git. "
+"Currently they must be encoded in UTF-8, as fast-import does not permit "
+"other encodings to be specified."
msgstr ""
#. type: Plain text
@@ -26207,7 +26098,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:428
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`author`"
msgstr "`author`"
@@ -26223,7 +26114,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:436
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`committer`"
msgstr "`committer`"
@@ -26237,11 +26128,11 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:447
msgid ""
-"Here `<name>` is the person's display name (for example ``Com M Itter'') and"
-" `<email>` is the person's email address (``\\cm@example.com''). `LT` and "
+"Here `<name>` is the person's display name (for example ``Com M Itter'') and "
+"`<email>` is the person's email address (``\\cm@example.com''). `LT` and "
"`GT` are the literal less-than (\\x3c) and greater-than (\\x3e) symbols. "
-"These are required to delimit the email address from the other fields in the"
-" line. Note that `<name>` and `<email>` are free-form and may contain any "
+"These are required to delimit the email address from the other fields in the "
+"line. Note that `<name>` and `<email>` are free-form and may contain any "
"sequence of bytes, except `LT`, `GT` and `LF`. `<name>` is typically UTF-8 "
"encoded."
msgstr ""
@@ -26256,7 +26147,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:454
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`from`"
msgstr "`from`"
@@ -26273,13 +26164,13 @@ msgstr ""
#: en/git-fast-import.txt:470
msgid ""
"Omitting the `from` command in the first commit of a new branch will cause "
-"fast-import to create that commit with no ancestor. This tends to be desired"
-" only for the initial commit of a project. If the frontend creates all "
-"files from scratch when making a new branch, a `merge` command may be used "
-"instead of `from` to start the commit with an empty tree. Omitting the "
-"`from` command on existing branches is usually desired, as the current "
-"commit on that branch is automatically assumed to be the first ancestor of "
-"the new commit."
+"fast-import to create that commit with no ancestor. This tends to be desired "
+"only for the initial commit of a project. If the frontend creates all files "
+"from scratch when making a new branch, a `merge` command may be used instead "
+"of `from` to start the commit with an empty tree. Omitting the `from` "
+"command on existing branches is usually desired, as the current commit on "
+"that branch is automatically assumed to be the first ancestor of the new "
+"commit."
msgstr ""
#. type: Plain text
@@ -26310,10 +26201,10 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:487
msgid ""
-"The reason fast-import uses `:` to denote a mark reference is this character"
-" is not legal in a Git branch name. The leading `:` makes it easy to "
-"distinguish between the mark 42 (`:42`) and the branch 42 (`42` or "
-"`refs/heads/42`), or an abbreviated SHA-1 which happened to consist only of "
+"The reason fast-import uses `:` to denote a mark reference is this character "
+"is not legal in a Git branch name. The leading `:` makes it easy to "
+"distinguish between the mark 42 (`:42`) and the branch 42 (`42` or `refs/"
+"heads/42`), or an abbreviated SHA-1 which happened to consist only of "
"base-10 digits."
msgstr ""
@@ -26337,15 +26228,14 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:497
msgid ""
-"The special null SHA-1 (40 zeros) specifies that the branch is to be "
-"removed."
+"The special null SHA-1 (40 zeros) specifies that the branch is to be removed."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:500
msgid ""
-"The special case of restarting an incremental import from the current branch"
-" value should be written as:"
+"The special case of restarting an incremental import from the current branch "
+"value should be written as:"
msgstr ""
#. type: delimited block -
@@ -26366,7 +26256,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:511
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`merge`"
msgstr "`merge`"
@@ -26375,8 +26265,8 @@ msgstr "`merge`"
msgid ""
"Includes one additional ancestor commit. The additional ancestry link does "
"not change the way the tree state is built at this commit. If the `from` "
-"command is omitted when creating a new branch, the first `merge` commit will"
-" be the first ancestor of the current commit, and the branch will start out "
+"command is omitted when creating a new branch, the first `merge` commit will "
+"be the first ancestor of the current commit, and the branch will start out "
"with no files. An unlimited number of `merge` commands per commit are "
"permitted by fast-import, thereby establishing an n-way merge."
msgstr ""
@@ -26390,15 +26280,15 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:524
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`filemodify`"
msgstr "`filemodify`"
#. type: Plain text
#: en/git-fast-import.txt:528
msgid ""
-"Included in a `commit` command to add a new file or change the content of an"
-" existing file. This command has two different means of specifying the "
+"Included in a `commit` command to add a new file or change the content of an "
+"existing file. This command has two different means of specifying the "
"content of the file."
msgstr ""
@@ -26440,8 +26330,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:547
msgid ""
-"The data content for the file has not been supplied yet. The frontend wants"
-" to supply it as part of this modify command."
+"The data content for the file has not been supplied yet. The frontend wants "
+"to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
@@ -26460,15 +26350,15 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:557
msgid ""
-"In both formats `<mode>` is the type of file entry, specified in octal. Git"
-" only supports the following modes:"
+"In both formats `<mode>` is the type of file entry, specified in octal. Git "
+"only supports the following modes:"
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:561
msgid ""
-"`100644` or `644`: A normal (not-executable) file. The majority of files in"
-" most projects use this mode. If in doubt, this is what you want."
+"`100644` or `644`: A normal (not-executable) file. The majority of files in "
+"most projects use this mode. If in doubt, this is what you want."
msgstr ""
#. type: Plain text
@@ -26485,8 +26375,8 @@ msgstr ""
#: en/git-fast-import.txt:566
msgid ""
"`160000`: A gitlink, SHA-1 of the object refers to a commit in another "
-"repository. Git links can only be specified by SHA or through a commit mark."
-" They are used to implement submodules."
+"repository. Git links can only be specified by SHA or through a commit mark. "
+"They are used to implement submodules."
msgstr ""
#. type: Plain text
@@ -26506,8 +26396,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:575
msgid ""
-"A `<path>` string must use UNIX-style directory separators (forward slash "
-"`/`), may contain any byte other than `LF`, and must not start with double "
+"A `<path>` string must use UNIX-style directory separators (forward slash `/"
+"`), may contain any byte other than `LF`, and must not start with double "
"quote (`\"`)."
msgstr ""
@@ -26515,11 +26405,11 @@ msgstr ""
#: en/git-fast-import.txt:582
msgid ""
"A path can use C-style string quoting; this is accepted in all cases and "
-"mandatory if the filename starts with double quote or contains `LF`. In "
-"C-style quoting, the complete name should be surrounded with double quotes, "
+"mandatory if the filename starts with double quote or contains `LF`. In C-"
+"style quoting, the complete name should be surrounded with double quotes, "
"and any `LF`, backslash, or double quote characters must be escaped by "
-"preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in "
-"it\"`)."
+"preceding them with a backslash (e.g., `\"path/with\\n, \\\\ and \\\" in it"
+"\"`)."
msgstr ""
#. type: Plain text
@@ -26545,14 +26435,13 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:590
msgid ""
-"contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar`"
-" are invalid)."
+"contain the special component `.` or `..` (e.g. `foo/./bar` and `foo/../bar` "
+"are invalid)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:592
-msgid ""
-"The root of the tree can be represented by an empty string as `<path>`."
+msgid "The root of the tree can be represented by an empty string as `<path>`."
msgstr ""
#. type: Plain text
@@ -26562,7 +26451,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:596
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`filedelete`"
msgstr "`filedelete`"
@@ -26585,14 +26474,14 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:610
msgid ""
-"here `<path>` is the complete path of the file or subdirectory to be removed"
-" from the branch. See `filemodify` above for a detailed description of "
+"here `<path>` is the complete path of the file or subdirectory to be removed "
+"from the branch. See `filemodify` above for a detailed description of "
"`<path>`."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:612
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`filecopy`"
msgstr "`filecopy`"
@@ -26601,8 +26490,8 @@ msgstr "`filecopy`"
msgid ""
"Recursively copies an existing file or subdirectory to a different location "
"within the branch. The existing file or directory must exist. If the "
-"destination exists it will be completely replaced by the content copied from"
-" the source."
+"destination exists it will be completely replaced by the content copied from "
+"the source."
msgstr ""
#. type: delimited block .
@@ -26616,21 +26505,21 @@ msgstr ""
msgid ""
"here the first `<path>` is the source location and the second `<path>` is "
"the destination. See `filemodify` above for a detailed description of what "
-"`<path>` may look like. To use a source path that contains SP the path must"
-" be quoted."
+"`<path>` may look like. To use a source path that contains SP the path must "
+"be quoted."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:631
msgid ""
-"A `filecopy` command takes effect immediately. Once the source location has"
-" been copied to the destination any future commands applied to the source "
+"A `filecopy` command takes effect immediately. Once the source location has "
+"been copied to the destination any future commands applied to the source "
"location will not impact the destination of the copy."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:633
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`filerename`"
msgstr "`filerename`"
@@ -26671,7 +26560,7 @@ msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:662
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`filedeleteall`"
msgstr "`filedeleteall`"
@@ -26703,15 +26592,15 @@ msgstr ""
msgid ""
"Issuing a `filedeleteall` followed by the needed `filemodify` commands to "
"set the correct content will produce the same results as sending only the "
-"needed `filemodify` and `filedelete` commands. The `filedeleteall` approach"
-" may however require fast-import to use slightly more memory per active "
-"branch (less than 1 MiB for even most large projects); so frontends that can"
-" easily obtain only the affected paths for a commit are encouraged to do so."
+"needed `filemodify` and `filedelete` commands. The `filedeleteall` approach "
+"may however require fast-import to use slightly more memory per active "
+"branch (less than 1 MiB for even most large projects); so frontends that can "
+"easily obtain only the affected paths for a commit are encouraged to do so."
msgstr ""
#. type: Title ^
#: en/git-fast-import.txt:686
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`notemodify`"
msgstr "`notemodify`"
@@ -26719,8 +26608,8 @@ msgstr "`notemodify`"
#: en/git-fast-import.txt:695
msgid ""
"Included in a `commit` `<notes_ref>` command to add a new note annotating a "
-"`<commit-ish>` or change this annotation contents. Internally it is similar"
-" to filemodify 100644 on `<commit-ish>` path (maybe split into "
+"`<commit-ish>` or change this annotation contents. Internally it is similar "
+"to filemodify 100644 on `<commit-ish>` path (maybe split into "
"subdirectories). It's not advised to use any other commands to write to the "
"`<notes_ref>` tree except `filedeleteall` to delete all existing notes in "
"this tree. This command has two different means of specifying the content "
@@ -26744,15 +26633,15 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:708
msgid ""
-"Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior"
-" `blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
+"Here `<dataref>` can be either a mark reference (`:<idnum>`) set by a prior "
+"`blob` command, or a full 40-byte SHA-1 of an existing Git blob object."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:713
msgid ""
-"The data content for the note has not been supplied yet. The frontend wants"
-" to supply it as part of this modify command."
+"The data content for the note has not been supplied yet. The frontend wants "
+"to supply it as part of this modify command."
msgstr ""
#. type: delimited block .
@@ -26772,18 +26661,18 @@ msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:725
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`mark`"
msgstr "`mark`"
#. type: Plain text
#: en/git-fast-import.txt:731
msgid ""
-"Arranges for fast-import to save a reference to the current object, allowing"
-" the frontend to recall this object at a future point in time, without "
+"Arranges for fast-import to save a reference to the current object, allowing "
+"the frontend to recall this object at a future point in time, without "
"knowing its SHA-1. Here the current object is the object creation command "
-"the `mark` command appears within. This can be `commit`, `tag`, and `blob`,"
-" but `commit` is the most common usage."
+"the `mark` command appears within. This can be `commit`, `tag`, and `blob`, "
+"but `commit` is the most common usage."
msgstr ""
#. type: delimited block .
@@ -26796,31 +26685,31 @@ msgstr ""
#: en/git-fast-import.txt:740
msgid ""
"where `<idnum>` is the number assigned by the frontend to this mark. The "
-"value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is"
-" reserved and cannot be used as a mark. Only values greater than or equal "
-"to 1 may be used as marks."
+"value of `<idnum>` is expressed as an ASCII decimal integer. The value 0 is "
+"reserved and cannot be used as a mark. Only values greater than or equal to "
+"1 may be used as marks."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:744
msgid ""
-"New marks are created automatically. Existing marks can be moved to another"
-" object simply by reusing the same `<idnum>` in another `mark` command."
+"New marks are created automatically. Existing marks can be moved to another "
+"object simply by reusing the same `<idnum>` in another `mark` command."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:746
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`original-oid`"
msgstr "`original-oid`"
#. type: Plain text
#: en/git-fast-import.txt:751
msgid ""
-"Provides the name of the object in the original source control system. "
-"fast-import will simply ignore this directive, but filter processes which "
-"operate on and modify the stream before feeding to fast-import may have uses"
-" for this information"
+"Provides the name of the object in the original source control system. fast-"
+"import will simply ignore this directive, but filter processes which operate "
+"on and modify the stream before feeding to fast-import may have uses for "
+"this information"
msgstr ""
#. type: delimited block .
@@ -26892,9 +26781,9 @@ msgstr ""
#: en/git-fast-import.txt:793
msgid ""
"The `data` command following `tagger` must supply the annotated tag message "
-"(see below for `data` command syntax). To import an empty tag message use a"
-" 0 length data. Tag messages are free-form and are not interpreted by Git."
-" Currently they must be encoded in UTF-8, as fast-import does not permit "
+"(see below for `data` command syntax). To import an empty tag message use a "
+"0 length data. Tag messages are free-form and are not interpreted by Git. "
+"Currently they must be encoded in UTF-8, as fast-import does not permit "
"other encodings to be specified."
msgstr ""
@@ -26902,21 +26791,20 @@ msgstr ""
#: en/git-fast-import.txt:801
msgid ""
"Signing annotated tags during import from within fast-import is not "
-"supported. Trying to include your own PGP/GPG signature is not recommended,"
-" as the frontend does not (easily) have access to the complete set of bytes "
+"supported. Trying to include your own PGP/GPG signature is not recommended, "
+"as the frontend does not (easily) have access to the complete set of bytes "
"which normally goes into such a signature. If signing is required, create "
"lightweight tags from within fast-import with `reset`, then create the "
-"annotated versions of those tags offline with the standard 'git tag' "
-"process."
+"annotated versions of those tags offline with the standard 'git tag' process."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:808
msgid ""
-"Creates (or recreates) the named branch, optionally starting from a specific"
-" revision. The reset command allows a frontend to issue a new `from` "
-"command for an existing branch, or to create a new branch from an existing "
-"commit without creating a new commit."
+"Creates (or recreates) the named branch, optionally starting from a specific "
+"revision. The reset command allows a frontend to issue a new `from` command "
+"for an existing branch, or to create a new branch from an existing commit "
+"without creating a new commit."
msgstr ""
#. type: delimited block .
@@ -26979,14 +26867,14 @@ msgstr ""
#: en/git-fast-import.txt:849
msgid ""
"The mark command is optional here as some frontends have chosen to generate "
-"the Git SHA-1 for the blob on their own, and feed that directly to `commit`."
-" This is typically more work than it's worth however, as marks are "
+"the Git SHA-1 for the blob on their own, and feed that directly to "
+"`commit`. This is typically more work than it's worth however, as marks are "
"inexpensive to store and easy to use."
msgstr ""
#. type: Title ~
#: en/git-fast-import.txt:851
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`data`"
msgstr "`data`"
@@ -26994,8 +26882,8 @@ msgstr "`data`"
#: en/git-fast-import.txt:858
msgid ""
"Supplies raw data (for use as blob/file content, commit messages, or "
-"annotated tag messages) to fast-import. Data can be supplied using an exact"
-" byte count or delimited with a terminating line. Real frontends intended "
+"annotated tag messages) to fast-import. Data can be supplied using an exact "
+"byte count or delimited with a terminating line. Real frontends intended "
"for production-quality conversions should always use the exact byte count "
"format, as it is more robust and performs better. The delimited format is "
"intended primarily for testing fast-import."
@@ -27034,17 +26922,17 @@ msgstr ""
msgid ""
"where `<count>` is the exact number of bytes appearing within `<raw>`. The "
"value of `<count>` is expressed as an ASCII decimal integer. The `LF` on "
-"either side of `<raw>` is not included in `<count>` and will not be included"
-" in the imported data."
+"either side of `<raw>` is not included in `<count>` and will not be included "
+"in the imported data."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:881
msgid ""
-"The `LF` after `<raw>` is optional (it used to be required) but recommended."
-" Always including it makes debugging a fast-import stream easier as the "
-"next command always starts in column 0 of the next line, even if `<raw>` did"
-" not end with an `LF`."
+"The `LF` after `<raw>` is optional (it used to be required) but "
+"recommended. Always including it makes debugging a fast-import stream "
+"easier as the next command always starts in column 0 of the next line, even "
+"if `<raw>` did not end with an `LF`."
msgstr ""
#. type: Labeled list
@@ -27057,8 +26945,8 @@ msgstr ""
#: en/git-fast-import.txt:887
msgid ""
"A delimiter string is used to mark the end of the data. fast-import will "
-"compute the length by searching for the delimiter. This format is primarily"
-" useful for testing and is not recommended for real data."
+"compute the length by searching for the delimiter. This format is primarily "
+"useful for testing and is not recommended for real data."
msgstr ""
#. type: delimited block .
@@ -27075,8 +26963,8 @@ msgstr ""
#: en/git-fast-import.txt:901
msgid ""
"where `<delim>` is the chosen delimiter string. The string `<delim>` must "
-"not appear on a line by itself within `<raw>`, as otherwise fast-import will"
-" think the data ends earlier than it really does. The `LF` immediately "
+"not appear on a line by itself within `<raw>`, as otherwise fast-import will "
+"think the data ends earlier than it really does. The `LF` immediately "
"trailing `<raw>` is part of `<raw>`. This is one of the limitations of the "
"delimited format, it is impossible to supply a data chunk which does not "
"have an LF as its last byte."
@@ -27151,9 +27039,9 @@ msgstr ""
#: en/git-fast-import.txt:948
msgid ""
"The `<any>` part of the command may contain any sequence of bytes that does "
-"not contain `LF`. The `LF` after the command is optional. Callers may wish"
-" to process the output through a tool such as sed to remove the leading part"
-" of the line, for example:"
+"not contain `LF`. The `LF` after the command is optional. Callers may wish "
+"to process the output through a tool such as sed to remove the leading part "
+"of the line, for example:"
msgstr ""
#. type: delimited block =
@@ -27166,8 +27054,8 @@ msgstr ""
#: en/git-fast-import.txt:956
msgid ""
"Placing a `progress` command immediately after a `checkpoint` will inform "
-"the reader when the `checkpoint` has been completed and it can safely access"
-" the refs that fast-import updated."
+"the reader when the `checkpoint` has been completed and it can safely access "
+"the refs that fast-import updated."
msgstr ""
#. type: Plain text
@@ -27189,9 +27077,9 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:972
msgid ""
-"This command can be used anywhere in the stream that comments are accepted."
-" In particular, the `get-mark` command can be used in the middle of a "
-"commit but not in the middle of a `data` command."
+"This command can be used anywhere in the stream that comments are accepted. "
+"In particular, the `get-mark` command can be used in the middle of a commit "
+"but not in the middle of a `data` command."
msgstr ""
#. type: Plain text
@@ -27240,17 +27128,17 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1002
msgid ""
-"This command can be used anywhere in the stream that comments are accepted."
-" In particular, the `cat-blob` command can be used in the middle of a "
-"commit but not in the middle of a `data` command."
+"This command can be used anywhere in the stream that comments are accepted. "
+"In particular, the `cat-blob` command can be used in the middle of a commit "
+"but not in the middle of a `data` command."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1013
msgid ""
"Prints information about the object at a path to a file descriptor "
-"previously arranged with the `--cat-blob-fd` argument. This allows printing"
-" a blob from the active commit (with `cat-blob`) or copying a blob or tree "
+"previously arranged with the `--cat-blob-fd` argument. This allows printing "
+"a blob from the active commit (with `cat-blob`) or copying a blob or tree "
"from a previous commit for use in the current one (with `filemodify`)."
msgstr ""
@@ -27271,8 +27159,8 @@ msgstr ""
#: en/git-fast-import.txt:1021
msgid ""
"This form can only be used in the middle of a `commit`. The path names a "
-"directory entry within fast-import's active commit. The path must be quoted"
-" in this case."
+"directory entry within fast-import's active commit. The path must be quoted "
+"in this case."
msgstr ""
#. type: delimited block .
@@ -27341,8 +27229,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1063
msgid ""
-"Require that fast-import supports the specified feature, or abort if it does"
-" not."
+"Require that fast-import supports the specified feature, or abort if it does "
+"not."
msgstr ""
#. type: delimited block .
@@ -27408,12 +27296,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1088
msgid ""
-"Like --import-marks except in two respects: first, only one \"feature "
-"import-marks\" or \"feature import-marks-if-exists\" command is allowed per "
-"stream; second, an --import-marks= or --import-marks-if-exists command-line "
-"option overrides any of these \"feature\" commands in the stream; third, "
-"\"feature import-marks-if-exists\" like a corresponding command-line option "
-"silently skips a nonexistent file."
+"Like --import-marks except in two respects: first, only one \"feature import-"
+"marks\" or \"feature import-marks-if-exists\" command is allowed per stream; "
+"second, an --import-marks= or --import-marks-if-exists command-line option "
+"overrides any of these \"feature\" commands in the stream; third, \"feature "
+"import-marks-if-exists\" like a corresponding command-line option silently "
+"skips a nonexistent file."
msgstr ""
#. type: Labeled list
@@ -27437,11 +27325,11 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1099
msgid ""
-"Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command"
-" respectively. Versions of fast-import not supporting the specified command"
-" will exit with a message indicating so. This lets the import error out "
-"early with a clear message, rather than wasting time on the early part of an"
-" import before the unsupported command is detected."
+"Require that the backend support the 'get-mark', 'cat-blob', or 'ls' command "
+"respectively. Versions of fast-import not supporting the specified command "
+"will exit with a message indicating so. This lets the import error out "
+"early with a clear message, rather than wasting time on the early part of an "
+"import before the unsupported command is detected."
msgstr ""
#. type: Labeled list
@@ -27477,10 +27365,9 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1120
msgid ""
-"Processes the specified option so that git fast-import behaves in a way that"
-" suits the frontend's needs. Note that options specified by the frontend "
-"are overridden by any options the user may specify to git fast-import "
-"itself."
+"Processes the specified option so that git fast-import behaves in a way that "
+"suits the frontend's needs. Note that options specified by the frontend are "
+"overridden by any options the user may specify to git fast-import itself."
msgstr ""
#. type: delimited block .
@@ -27493,23 +27380,23 @@ msgstr ""
#: en/git-fast-import.txt:1128
msgid ""
"The `<option>` part of the command may contain any of the options listed in "
-"the OPTIONS section that do not change import semantics, without the leading"
-" `--` and is treated in the same way."
+"the OPTIONS section that do not change import semantics, without the leading "
+"`--` and is treated in the same way."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1132
msgid ""
"Option commands must be the first commands on the input (not counting "
-"feature commands), to give an option command after any non-option command is"
-" an error."
+"feature commands), to give an option command after any non-option command is "
+"an error."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1135
msgid ""
-"The following command-line options change import semantics and may therefore"
-" not be passed as option:"
+"The following command-line options change import semantics and may therefore "
+"not be passed as option:"
msgstr ""
#. type: Plain text
@@ -27527,8 +27414,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1150
msgid ""
-"If the `--done` command-line option or `feature done` command is in use, the"
-" `done` command is mandatory and marks the end of the stream."
+"If the `--done` command-line option or `feature done` command is in use, the "
+"`done` command is mandatory and marks the end of the stream."
msgstr ""
#. type: Title -
@@ -27540,8 +27427,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1159
msgid ""
-"New objects written by fast-import are not available immediately. Most "
-"fast-import commands have no visible effect until the next checkpoint (or "
+"New objects written by fast-import are not available immediately. Most fast-"
+"import commands have no visible effect until the next checkpoint (or "
"completion). The frontend can send commands to fill fast-import's input "
"pipe without worrying about how quickly they will take effect, which "
"improves performance by simplifying scheduling."
@@ -27576,8 +27463,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1179
msgid ""
-"To avoid deadlock, such frontends must completely consume any pending output"
-" from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes "
+"To avoid deadlock, such frontends must completely consume any pending output "
+"from `progress`, `ls`, `get-mark`, and `cat-blob` before performing writes "
"to fast-import that might block."
msgstr ""
@@ -27591,8 +27478,8 @@ msgstr ""
#: en/git-fast-import.txt:1187
msgid ""
"If fast-import is supplied invalid input it will terminate with a non-zero "
-"exit status and create a crash report in the top level of the Git repository"
-" it was importing into. Crash reports contain a snapshot of the internal "
+"exit status and create a crash report in the top level of the Git repository "
+"it was importing into. Crash reports contain a snapshot of the internal "
"fast-import state as well as the most recent commands that lead up to the "
"crash."
msgstr ""
@@ -27610,12 +27497,12 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1202
msgid ""
-"After writing a crash report fast-import will close the current packfile and"
-" export the marks table. This allows the frontend developer to inspect the "
-"repository state and resume the import from the point where it crashed. The"
-" modified branches and tags are not updated during a crash, as the import "
-"did not complete successfully. Branch and tag information can be found in "
-"the crash report and must be applied manually if the update is needed."
+"After writing a crash report fast-import will close the current packfile and "
+"export the marks table. This allows the frontend developer to inspect the "
+"repository state and resume the import from the point where it crashed. The "
+"modified branches and tags are not updated during a crash, as the import did "
+"not complete successfully. Branch and tag information can be found in the "
+"crash report and must be applied manually if the update is needed."
msgstr ""
#. type: Plain text
@@ -27749,8 +27636,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1271
msgid ""
-"The following tips and tricks have been collected from various users of "
-"fast-import, and are offered here as suggestions."
+"The following tips and tricks have been collected from various users of fast-"
+"import, and are offered here as suggestions."
msgstr ""
#. type: Title ~
@@ -27762,20 +27649,20 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1281
msgid ""
-"When doing a repository conversion, use a unique mark per commit (`mark "
-":<n>`) and supply the --export-marks option on the command line. fast-"
-"import will dump a file which lists every mark and the Git object SHA-1 that"
-" corresponds to it. If the frontend can tie the marks back to the source "
-"repository, it is easy to verify the accuracy and completeness of the import"
-" by comparing each Git commit to the corresponding source revision."
+"When doing a repository conversion, use a unique mark per commit (`mark :"
+"<n>`) and supply the --export-marks option on the command line. fast-import "
+"will dump a file which lists every mark and the Git object SHA-1 that "
+"corresponds to it. If the frontend can tie the marks back to the source "
+"repository, it is easy to verify the accuracy and completeness of the import "
+"by comparing each Git commit to the corresponding source revision."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1285
msgid ""
"Coming from a system such as Perforce or Subversion this should be quite "
-"simple, as the fast-import mark can also be the Perforce changeset number or"
-" the Subversion revision number."
+"simple, as the fast-import mark can also be the Perforce changeset number or "
+"the Subversion revision number."
msgstr ""
#. type: Title ~
@@ -27797,8 +27684,8 @@ msgstr ""
#: en/git-fast-import.txt:1296
msgid ""
"The branch LRU builtin to fast-import tends to behave very well, and the "
-"cost of activating an inactive branch is so low that bouncing around between"
-" branches has virtually no impact on import performance."
+"cost of activating an inactive branch is so low that bouncing around between "
+"branches has virtually no impact on import performance."
msgstr ""
#. type: Title ~
@@ -27834,8 +27721,8 @@ msgstr ""
msgid ""
"Importing these tags as-is in Git is impossible without making at least one "
"commit which ``fixes up'' the files to match the content of the tag. Use "
-"fast-import's `reset` command to reset a dummy branch outside of your normal"
-" branch space to the base commit for the tag, then commit one or more file "
+"fast-import's `reset` command to reset a dummy branch outside of your normal "
+"branch space to the base commit for the tag, then commit one or more file "
"fixup commits, and finally tag the dummy branch."
msgstr ""
@@ -27845,24 +27732,24 @@ msgid ""
"For example since all normal branches are stored under `refs/heads/` name "
"the tag fixup branch `TAG_FIXUP`. This way it is impossible for the fixup "
"branch used by the importer to have namespace conflicts with real branches "
-"imported from the source (the name `TAG_FIXUP` is not "
-"`refs/heads/TAG_FIXUP`)."
+"imported from the source (the name `TAG_FIXUP` is not `refs/heads/"
+"TAG_FIXUP`)."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1328
msgid ""
"When committing fixups, consider using `merge` to connect the commit(s) "
-"which are supplying file revisions to the fixup branch. Doing so will allow"
-" tools such as 'git blame' to track through the real commit history and "
+"which are supplying file revisions to the fixup branch. Doing so will allow "
+"tools such as 'git blame' to track through the real commit history and "
"properly annotate the source files."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1331
msgid ""
-"After fast-import terminates the frontend will need to do `rm "
-".git/TAG_FIXUP` to remove the dummy branch."
+"After fast-import terminates the frontend will need to do `rm .git/"
+"TAG_FIXUP` to remove the dummy branch."
msgstr ""
#. type: Title ~
@@ -27907,11 +27794,11 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1358
msgid ""
-"If you are repacking very old imported data (e.g. older than the last year),"
-" consider expending some extra CPU time and supplying --window=50 (or "
-"higher) when you run 'git repack'. This will take longer, but will also "
-"produce a smaller packfile. You only need to expend the effort once, and "
-"everyone using your project will benefit from the smaller repository."
+"If you are repacking very old imported data (e.g. older than the last year), "
+"consider expending some extra CPU time and supplying --window=50 (or higher) "
+"when you run 'git repack'. This will take longer, but will also produce a "
+"smaller packfile. You only need to expend the effort once, and everyone "
+"using your project will benefit from the smaller repository."
msgstr ""
#. type: Title ~
@@ -27949,20 +27836,20 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1384
msgid ""
-"Frontends which have efficient access to all revisions of a single file (for"
-" example reading an RCS/CVS ,v file) can choose to supply all revisions of "
+"Frontends which have efficient access to all revisions of a single file (for "
+"example reading an RCS/CVS ,v file) can choose to supply all revisions of "
"that file as a sequence of consecutive `blob` commands. This allows fast-"
"import to deltify the different file revisions against each other, saving "
-"space in the final packfile. Marks can be used to later identify individual"
-" file revisions during a sequence of `commit` commands."
+"space in the final packfile. Marks can be used to later identify individual "
+"file revisions during a sequence of `commit` commands."
msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1391
msgid ""
"The packfile(s) created by fast-import do not encourage good disk access "
-"patterns. This is caused by fast-import writing the data in the order it is"
-" received on standard input, while Git typically organizes data within "
+"patterns. This is caused by fast-import writing the data in the order it is "
+"received on standard input, while Git typically organizes data within "
"packfiles to make the most recent (current tip) data appear before "
"historical data. Git also clusters commits together, speeding up revision "
"traversal through better cache locality."
@@ -27975,8 +27862,8 @@ msgid ""
"with `git repack -a -d` after fast-import completes, allowing Git to "
"reorganize the packfiles for faster data access. If blob deltas are "
"suboptimal (see above) then also adding the `-f` option to force "
-"recomputation of all deltas can significantly reduce the final packfile size"
-" (30-50% smaller can be quite typical)."
+"recomputation of all deltas can significantly reduce the final packfile size "
+"(30-50% smaller can be quite typical)."
msgstr ""
#. type: Title -
@@ -27991,8 +27878,8 @@ msgid ""
"There are a number of factors which affect how much memory fast-import "
"requires to perform an import. Like critical sections of core Git, fast-"
"import uses its own memory allocators to amortize any overheads associated "
-"with malloc. In practice fast-import tends to amortize any malloc overheads"
-" to 0, due to its use of large block allocations."
+"with malloc. In practice fast-import tends to amortize any malloc overheads "
+"to 0, due to its use of large block allocations."
msgstr ""
#. type: Title ~
@@ -28006,9 +27893,9 @@ msgstr ""
msgid ""
"fast-import maintains an in-memory structure for every object written in "
"this execution. On a 32 bit system the structure is 32 bytes, on a 64 bit "
-"system the structure is 40 bytes (due to the larger pointer sizes). Objects"
-" in the table are not deallocated until fast-import terminates. Importing 2"
-" million objects on a 32 bit system will require approximately 64 MiB of "
+"system the structure is 40 bytes (due to the larger pointer sizes). Objects "
+"in the table are not deallocated until fast-import terminates. Importing 2 "
+"million objects on a 32 bit system will require approximately 64 MiB of "
"memory."
msgstr ""
@@ -28046,8 +27933,8 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1435
msgid ""
-"Branches are classified as active and inactive. The memory usage of the two"
-" classes is significantly different."
+"Branches are classified as active and inactive. The memory usage of the two "
+"classes is significantly different."
msgstr ""
#. type: Plain text
@@ -28063,11 +27950,11 @@ msgstr ""
#: en/git-fast-import.txt:1448
msgid ""
"Active branches have the same overhead as inactive branches, but also "
-"contain copies of every tree that has been recently modified on that branch."
-" If subtree `include` has not been modified since the branch became active,"
-" its contents will not be loaded into memory, but if subtree `src` has been "
-"modified by a commit since the branch became active, then its contents will "
-"be loaded in memory."
+"contain copies of every tree that has been recently modified on that "
+"branch. If subtree `include` has not been modified since the branch became "
+"active, its contents will not be loaded into memory, but if subtree `src` "
+"has been modified by a commit since the branch became active, then its "
+"contents will be loaded in memory."
msgstr ""
#. type: Plain text
@@ -28082,8 +27969,8 @@ msgstr ""
msgid ""
"fast-import automatically moves active branches to inactive status based on "
"a simple least-recently-used algorithm. The LRU chain is updated on each "
-"`commit` command. The maximum number of active branches can be increased or"
-" decreased on the command line with --active-branches=."
+"`commit` command. The maximum number of active branches can be increased or "
+"decreased on the command line with --active-branches=."
msgstr ""
#. type: Title ~
@@ -28111,8 +27998,8 @@ msgstr ""
#: en/git-fast-import.txt:1472
msgid ""
"Files (and pointers to subtrees) within active trees require 52 or 64 bytes "
-"(32/64 bit platforms) per entry. To conserve space, file and tree names are"
-" pooled in a common string table, allowing the filename ``Makefile'' to use "
+"(32/64 bit platforms) per entry. To conserve space, file and tree names are "
+"pooled in a common string table, allowing the filename ``Makefile'' to use "
"just 16 bytes (after including the string header overhead) no matter how "
"many times it occurs within the project."
msgstr ""
@@ -28135,15 +28022,15 @@ msgstr ""
#. type: Plain text
#: en/git-fast-import.txt:1485
msgid ""
-"Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile"
-" early, simulating a `checkpoint` command. The impatient operator can use "
-"this facility to peek at the objects and refs from an import in progress, at"
-" the cost of some added running time and worse compression."
+"Sending *SIGUSR1* to the 'git fast-import' process ends the current packfile "
+"early, simulating a `checkpoint` command. The impatient operator can use "
+"this facility to peek at the objects and refs from an import in progress, at "
+"the cost of some added running time and worse compression."
msgstr ""
#. type: Title =
#: en/git-fetch-pack.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-fetch-pack(1)"
msgstr "git-fetch-pack(1)"
@@ -28195,15 +28082,15 @@ msgstr ""
#: en/git-fetch-pack.txt:43 en/git-send-pack.txt:46
msgid ""
"Take the list of refs from stdin, one per line. If there are refs specified "
-"on the command line in addition to this option, then the refs from stdin are"
-" processed after those on the command line."
+"on the command line in addition to this option, then the refs from stdin are "
+"processed after those on the command line."
msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:47 en/git-send-pack.txt:50
msgid ""
-"If `--stateless-rpc` is specified together with this option then the list of"
-" refs must be in packet format (pkt-line). Each ref must be in a separate "
+"If `--stateless-rpc` is specified together with this option then the list of "
+"refs must be in packet format (pkt-line). Each ref must be in a separate "
"packet, and the list must end with a flush packet."
msgstr ""
@@ -28218,14 +28105,13 @@ msgstr ""
#: en/git-fetch-pack.txt:59
msgid ""
"Do not invoke 'git unpack-objects' on received data, but create a single "
-"packfile out of it instead, and store it in the object database. If provided"
-" twice then the pack is locked against repacking."
+"packfile out of it instead, and store it in the object database. If provided "
+"twice then the pack is locked against repacking."
msgstr ""
#. type: Labeled list
-#: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:208
-#: en/git-send-pack.txt:64
-#, ignore-same, no-wrap
+#: en/git-fetch-pack.txt:60 en/git-pack-objects.txt:208 en/git-send-pack.txt:64
+#, no-wrap
msgid "--thin"
msgstr "--thin"
@@ -28238,17 +28124,17 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:64 en/git-pack-objects.txt:83
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--include-tag"
msgstr "--include-tag"
#. type: Plain text
#: en/git-fetch-pack.txt:69
msgid ""
-"If the remote side supports it, annotated tags objects will be downloaded on"
-" the same connection as the other objects if the object the tag references "
-"is downloaded. The caller must otherwise determine the tags this option "
-"made available."
+"If the remote side supports it, annotated tags objects will be downloaded on "
+"the same connection as the other objects if the object the tag references is "
+"downloaded. The caller must otherwise determine the tags this option made "
+"available."
msgstr ""
#. type: Labeled list
@@ -28285,13 +28171,13 @@ msgstr ""
#: en/git-fetch-pack.txt:89
msgid ""
"Limit fetching to ancestor-chains not longer than n. 'git-upload-pack' "
-"treats the special depth 2147483647 as infinite even if there is an "
-"ancestor-chain that long."
+"treats the special depth 2147483647 as infinite even if there is an ancestor-"
+"chain that long."
msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:99
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--deepen-relative"
msgstr "--deepen-relative"
@@ -28304,7 +28190,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:104 en/merge-options.txt:130
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-progress"
msgstr "--no-progress"
@@ -28315,7 +28201,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch-pack.txt:107 en/git-index-pack.txt:77
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--check-self-contained-and-connected"
msgstr "--check-self-contained-and-connected"
@@ -28345,9 +28231,9 @@ msgstr ""
#. type: Plain text
#: en/git-fetch-pack.txt:121
msgid ""
-"The remote heads to update from. This is relative to $GIT_DIR (e.g. "
-"\"HEAD\", \"refs/heads/master\"). When unspecified, update from all heads "
-"the remote side has."
+"The remote heads to update from. This is relative to $GIT_DIR (e.g. \"HEAD"
+"\", \"refs/heads/master\"). When unspecified, update from all heads the "
+"remote side has."
msgstr ""
#. type: Plain text
@@ -28360,7 +28246,7 @@ msgstr ""
#. type: Title =
#: en/git-fetch.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-fetch(1)"
msgstr "git-fetch(1)"
@@ -28383,9 +28269,9 @@ msgstr ""
#: en/git-fetch.txt:24
msgid ""
"Fetch branches and/or tags (collectively, \"refs\") from one or more other "
-"repositories, along with the objects necessary to complete their histories."
-" Remote-tracking branches are updated (see the description of <refspec> "
-"below for ways to control this behavior)."
+"repositories, along with the objects necessary to complete their histories. "
+"Remote-tracking branches are updated (see the description of <refspec> below "
+"for ways to control this behavior)."
msgstr ""
#. type: Plain text
@@ -28403,9 +28289,8 @@ msgstr ""
#: en/git-fetch.txt:37
msgid ""
"'git fetch' can fetch from either a single named repository or URL, or from "
-"several repositories at once if <group> is given and there is a "
-"remotes.<group> entry in the configuration file. (See linkgit:git-"
-"config[1])."
+"several repositories at once if <group> is given and there is a remotes."
+"<group> entry in the configuration file. (See linkgit:git-config[1])."
msgstr ""
#. type: Plain text
@@ -28419,8 +28304,8 @@ msgstr ""
#: en/git-fetch.txt:44
msgid ""
"The names of refs that are fetched, together with the object names they "
-"point at, are written to `.git/FETCH_HEAD`. This information may be used by"
-" scripts or other git commands, such as linkgit:git-pull[1]."
+"point at, are written to `.git/FETCH_HEAD`. This information may be used by "
+"scripts or other git commands, such as linkgit:git-pull[1]."
msgstr ""
#. type: Title -
@@ -28433,9 +28318,9 @@ msgstr ""
#: en/git-fetch.txt:61
msgid ""
"You often interact with the same remote repository by regularly and "
-"repeatedly fetching from it. In order to keep track of the progress of such"
-" a remote repository, `git fetch` allows you to configure "
-"`remote.<repository>.fetch` configuration variables."
+"repeatedly fetching from it. In order to keep track of the progress of such "
+"a remote repository, `git fetch` allows you to configure `remote."
+"<repository>.fetch` configuration variables."
msgstr ""
#. type: Plain text
@@ -28460,12 +28345,12 @@ msgstr ""
#: en/git-fetch.txt:80
msgid ""
"When `git fetch` is run without specifying what branches and/or tags to "
-"fetch on the command line, e.g. `git fetch origin` or `git fetch`, "
-"`remote.<repository>.fetch` values are used as the refspecs--they specify "
-"which refs to fetch and which local refs to update. The example above will "
-"fetch all branches that exist in the `origin` (i.e. any ref that matches the"
-" left-hand side of the value, `refs/heads/*`) and update the corresponding "
-"remote-tracking branches in the `refs/remotes/origin/*` hierarchy."
+"fetch on the command line, e.g. `git fetch origin` or `git fetch`, `remote."
+"<repository>.fetch` values are used as the refspecs--they specify which refs "
+"to fetch and which local refs to update. The example above will fetch all "
+"branches that exist in the `origin` (i.e. any ref that matches the left-hand "
+"side of the value, `refs/heads/*`) and update the corresponding remote-"
+"tracking branches in the `refs/remotes/origin/*` hierarchy."
msgstr ""
#. type: Plain text
@@ -28473,8 +28358,8 @@ msgstr ""
msgid ""
"When `git fetch` is run with explicit branches and/or tags to fetch on the "
"command line, e.g. `git fetch origin master`, the <refspec>s given on the "
-"command line determine what are to be fetched (e.g. `master` in the example,"
-" which is a short-hand for `master:`, which in turn means \"fetch the "
+"command line determine what are to be fetched (e.g. `master` in the example, "
+"which is a short-hand for `master:`, which in turn means \"fetch the "
"'master' branch but I do not explicitly say what remote-tracking branch to "
"update with it from the command line\"), and the example command will fetch "
"_only_ the 'master' branch. The `remote.<repository>.fetch` values "
@@ -28558,39 +28443,38 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:141
msgid ""
-"Therefore if the refspec for the remote includes e.g. "
-"`refs/tags/*:refs/tags/*`, or you manually run e.g. `git fetch --prune "
-"<name> \"refs/tags/*:refs/tags/*\"` it won't be stale remote tracking "
-"branches that are deleted, but any local tag that doesn't exist on the "
-"remote."
+"Therefore if the refspec for the remote includes e.g. `refs/tags/*:refs/tags/"
+"*`, or you manually run e.g. `git fetch --prune <name> \"refs/tags/*:refs/"
+"tags/*\"` it won't be stale remote tracking branches that are deleted, but "
+"any local tag that doesn't exist on the remote."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:146
msgid ""
"This might not be what you expect, i.e. you want to prune remote `<name>`, "
-"but also explicitly fetch tags from it, so when you fetch from it you delete"
-" all your local tags, most of which may not have come from the `<name>` "
+"but also explicitly fetch tags from it, so when you fetch from it you delete "
+"all your local tags, most of which may not have come from the `<name>` "
"remote in the first place."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:150
msgid ""
-"So be careful when using this with a refspec like `refs/tags/*:refs/tags/*`,"
-" or any other refspec which might map references from multiple remotes to "
-"the same local namespace."
+"So be careful when using this with a refspec like `refs/tags/*:refs/tags/*`, "
+"or any other refspec which might map references from multiple remotes to the "
+"same local namespace."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:157
msgid ""
"Since keeping up-to-date with both branches and tags on the remote is a "
-"common use-case the `--prune-tags` option can be supplied along with "
-"`--prune` to prune local tags that don't exist on the remote, and force-"
-"update those tags that differ. Tag pruning can also be enabled with "
-"`fetch.pruneTags` or `remote.<name>.pruneTags` in the config. See "
-"linkgit:git-config[1]."
+"common use-case the `--prune-tags` option can be supplied along with `--"
+"prune` to prune local tags that don't exist on the remote, and force-update "
+"those tags that differ. Tag pruning can also be enabled with `fetch."
+"pruneTags` or `remote.<name>.pruneTags` in the config. See linkgit:git-"
+"config[1]."
msgstr ""
#. type: Plain text
@@ -28630,8 +28514,8 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:181
msgid ""
-"Pruning tags with `--prune-tags` also works when fetching a URL instead of a"
-" named remote. These will all prune tags not found on origin:"
+"Pruning tags with `--prune-tags` also works when fetching a URL instead of a "
+"named remote. These will all prune tags not found on origin:"
msgstr ""
#. type: delimited block -
@@ -28675,9 +28559,9 @@ msgstr ""
#: en/git-fetch.txt:210
msgid ""
"In compact output mode, specified with configuration variable fetch.output, "
-"if either entire `<from>` or `<to>` is found in the other string, it will be"
-" substituted with `*` in the other string. For example, `master -> "
-"origin/master` becomes `master -> origin/*`."
+"if either entire `<from>` or `<to>` is found in the other string, it will be "
+"substituted with `*` in the other string. For example, `master -> origin/"
+"master` becomes `master -> origin/*`."
msgstr ""
#. type: Labeled list
@@ -28715,7 +28599,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:215 en/git-push.txt:435
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`-`"
msgstr "`-`"
@@ -28726,7 +28610,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fetch.txt:216
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`t`"
msgstr "`t`"
@@ -28818,8 +28702,7 @@ msgstr ""
#: en/git-fetch.txt:240
msgid ""
"A human-readable explanation. In the case of successfully fetched refs, no "
-"explanation is needed. For a failed ref, the reason for failure is "
-"described."
+"explanation is needed. For a failed ref, the reason for failure is described."
msgstr ""
#. type: Plain text
@@ -28855,16 +28738,16 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:264
msgid ""
-"This updates (or creates, as necessary) branches `pu` and `tmp` in the local"
-" repository by fetching from the branches (respectively) `pu` and `maint` "
+"This updates (or creates, as necessary) branches `pu` and `tmp` in the local "
+"repository by fetching from the branches (respectively) `pu` and `maint` "
"from the remote repository."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:267
msgid ""
-"The `pu` branch will be updated even if it is does not fast-forward, because"
-" it is prefixed with a plus sign; `tmp` will not be."
+"The `pu` branch will be updated even if it is does not fast-forward, because "
+"it is prefixed with a plus sign; `tmp` will not be."
msgstr ""
#. type: Plain text
@@ -28885,26 +28768,25 @@ msgstr ""
#. type: Plain text
#: en/git-fetch.txt:281
msgid ""
-"The first command fetches the `maint` branch from the repository at "
-"`git://git.kernel.org/pub/scm/git/git.git` and the second command uses "
-"`FETCH_HEAD` to examine the branch with linkgit:git-log[1]. The fetched "
-"objects will eventually be removed by git's built-in housekeeping (see "
-"linkgit:git-gc[1])."
+"The first command fetches the `maint` branch from the repository at `git://"
+"git.kernel.org/pub/scm/git/git.git` and the second command uses `FETCH_HEAD` "
+"to examine the branch with linkgit:git-log[1]. The fetched objects will "
+"eventually be removed by git's built-in housekeeping (see linkgit:git-gc[1])."
msgstr ""
#. type: Plain text
#: en/git-fetch.txt:292 en/git-pull.txt:255
msgid ""
-"Using --recurse-submodules can only fetch new commits in already checked out"
-" submodules right now. When e.g. upstream added a new submodule in the just "
-"fetched commits of the superproject the submodule itself can not be fetched,"
-" making it impossible to check out that submodule later without having to do"
-" a fetch again. This is expected to be fixed in a future Git version."
+"Using --recurse-submodules can only fetch new commits in already checked out "
+"submodules right now. When e.g. upstream added a new submodule in the just "
+"fetched commits of the superproject the submodule itself can not be fetched, "
+"making it impossible to check out that submodule later without having to do "
+"a fetch again. This is expected to be fixed in a future Git version."
msgstr ""
#. type: Title =
#: en/git-filter-branch.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-filter-branch(1)"
msgstr "git-filter-branch(1)"
@@ -28929,11 +28811,11 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:27
msgid ""
-"Lets you rewrite Git revision history by rewriting the branches mentioned in"
-" the <rev-list options>, applying custom filters on each revision. Those "
-"filters can modify each tree (e.g. removing a file or running a perl rewrite"
-" on all files) or information about each commit. Otherwise, all information"
-" (including original commit times or merge information) will be preserved."
+"Lets you rewrite Git revision history by rewriting the branches mentioned in "
+"the <rev-list options>, applying custom filters on each revision. Those "
+"filters can modify each tree (e.g. removing a file or running a perl rewrite "
+"on all files) or information about each commit. Otherwise, all information "
+"(including original commit times or merge information) will be preserved."
msgstr ""
#. type: Plain text
@@ -28941,10 +28823,9 @@ msgstr ""
msgid ""
"The command will only rewrite the _positive_ refs mentioned in the command "
"line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify "
-"no filters, the commits will be recommitted without any changes, which would"
-" normally have no effect. Nevertheless, this may be useful in the future "
-"for compensating for some Git bugs or such, therefore such a usage is "
-"permitted."
+"no filters, the commits will be recommitted without any changes, which would "
+"normally have no effect. Nevertheless, this may be useful in the future for "
+"compensating for some Git bugs or such, therefore such a usage is permitted."
msgstr ""
#. type: Plain text
@@ -28975,16 +28856,16 @@ msgstr ""
#: en/git-filter-branch.txt:52
msgid ""
"Always verify that the rewritten version is correct: The original refs, if "
-"different from the rewritten ones, will be stored in the namespace "
-"'refs/original/'."
+"different from the rewritten ones, will be stored in the namespace 'refs/"
+"original/'."
msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:56
msgid ""
"Note that since this operation is very I/O expensive, it might be a good "
-"idea to redirect the temporary directory off-disk with the `-d` option, e.g."
-" on tmpfs. Reportedly the speedup is very noticeable."
+"idea to redirect the temporary directory off-disk with the `-d` option, e.g. "
+"on tmpfs. Reportedly the speedup is very noticeable."
msgstr ""
#. type: Title ~
@@ -28999,11 +28880,11 @@ msgid ""
"The filters are applied in the order as listed below. The <command> "
"argument is always evaluated in the shell context using the 'eval' command "
"(with the notable exception of the commit filter, for technical reasons). "
-"Prior to that, the `$GIT_COMMIT` environment variable will be set to contain"
-" the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, "
+"Prior to that, the `$GIT_COMMIT` environment variable will be set to contain "
+"the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, "
"GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, "
-"and GIT_COMMITTER_DATE are taken from the current commit and exported to the"
-" environment, in order to affect the author and committer identities of the "
+"and GIT_COMMITTER_DATE are taken from the current commit and exported to the "
+"environment, in order to affect the author and committer identities of the "
"replacement commit created by linkgit:git-commit-tree[1] after the filters "
"have run."
msgstr ""
@@ -29020,9 +28901,8 @@ msgstr ""
msgid ""
"A 'map' function is available that takes an \"original sha1 id\" argument "
"and outputs a \"rewritten sha1 id\" if the commit has been already "
-"rewritten, and \"original sha1 id\" otherwise; the 'map' function can return"
-" several ids on separate lines if your commit filter emitted multiple "
-"commits."
+"rewritten, and \"original sha1 id\" otherwise; the 'map' function can return "
+"several ids on separate lines if your commit filter emitted multiple commits."
msgstr ""
#. type: Labeled list
@@ -29034,10 +28914,10 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:91
msgid ""
-"This is not a real filter executed for each commit but a one time setup just"
-" before the loop. Therefore no commit-specific variables are defined yet. "
-"Functions or variables defined here can be used or modified in the following"
-" filter steps except the commit filter, for technical reasons."
+"This is not a real filter executed for each commit but a one time setup just "
+"before the loop. Therefore no commit-specific variables are defined yet. "
+"Functions or variables defined here can be used or modified in the following "
+"filter steps except the commit filter, for technical reasons."
msgstr ""
#. type: Labeled list
@@ -29078,11 +28958,11 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:110
msgid ""
-"This is the filter for rewriting the tree and its contents. The argument is"
-" evaluated in shell with the working directory set to the root of the "
-"checked out tree. The new tree is then used as-is (new files are auto-"
-"added, disappeared files are auto-removed - neither .gitignore files nor any"
-" other ignore rules *HAVE ANY EFFECT*!)."
+"This is the filter for rewriting the tree and its contents. The argument is "
+"evaluated in shell with the working directory set to the root of the checked "
+"out tree. The new tree is then used as-is (new files are auto-added, "
+"disappeared files are auto-removed - neither .gitignore files nor any other "
+"ignore rules *HAVE ANY EFFECT*!)."
msgstr ""
#. type: Labeled list
@@ -29110,10 +28990,10 @@ msgstr ""
#: en/git-filter-branch.txt:125
msgid ""
"This is the filter for rewriting the commit's parent list. It will receive "
-"the parent string on stdin and shall output the new parent string on stdout."
-" The parent string is in the format described in linkgit:git-commit-"
-"tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and"
-" \"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
+"the parent string on stdin and shall output the new parent string on "
+"stdout. The parent string is in the format described in linkgit:git-commit-"
+"tree[1]: empty for the initial commit, \"-p parent\" for a normal commit and "
+"\"-p parent1 -p parent2 -p parent3 ...\" for a merge commit."
msgstr ""
#. type: Labeled list
@@ -29200,8 +29080,8 @@ msgid ""
"Nearly proper rewriting of tag objects is supported. If the tag has a "
"message attached, a new tag object will be created with the same message, "
"author, and timestamp. If the tag has a signature attached, the signature "
-"will be stripped. It is by definition impossible to preserve signatures. The"
-" reason this is \"nearly\" proper, is because ideally if the tag did not "
+"will be stripped. It is by definition impossible to preserve signatures. The "
+"reason this is \"nearly\" proper, is because ideally if the tag did not "
"change (points to the same object, has the same name, etc.) it should "
"retain any signature. That is not the case, signatures will always be "
"removed, buyer beware. There is also no support for changing the author or "
@@ -29211,7 +29091,7 @@ msgstr ""
#. type: Labeled list
#: en/git-filter-branch.txt:175
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--prune-empty"
msgstr "--prune-empty"
@@ -29258,8 +29138,8 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:200
msgid ""
-"'git filter-branch' refuses to start with an existing temporary directory or"
-" when there are already refs starting with 'refs/original/', unless forced."
+"'git filter-branch' refuses to start with an existing temporary directory or "
+"when there are already refs starting with 'refs/original/', unless forced."
msgstr ""
#. type: Labeled list
@@ -29271,8 +29151,8 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:206
msgid ""
-"This option will cause the mapping from old to new objects to be loaded from"
-" named branch upon startup and saved as a new commit to that branch upon "
+"This option will cause the mapping from old to new objects to be loaded from "
+"named branch upon startup and saved as a new commit to that branch upon "
"exit, enabling incremental of large trees. If '<branch>' does not exist it "
"will be created."
msgstr ""
@@ -29311,9 +29191,9 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:231
msgid ""
-"On success, the exit status is `0`. If the filter can't find any commits to"
-" rewrite, the exit status is `2`. On any other error, the exit status may "
-"be any other non-zero value."
+"On success, the exit status is `0`. If the filter can't find any commits to "
+"rewrite, the exit status is `2`. On any other error, the exit status may be "
+"any other non-zero value."
msgstr ""
#. type: Plain text
@@ -29340,19 +29220,17 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:252
msgid ""
-"Using `--index-filter` with 'git rm' yields a significantly faster version."
-" Like with using `rm filename`, `git rm --cached filename` will fail if the"
-" file is absent from the tree of a commit. If you want to \"completely "
-"forget\" a file, it does not matter when it entered history, so we also add "
-"`--ignore-unmatch`:"
+"Using `--index-filter` with 'git rm' yields a significantly faster version. "
+"Like with using `rm filename`, `git rm --cached filename` will fail if the "
+"file is absent from the tree of a commit. If you want to \"completely forget"
+"\" a file, it does not matter when it entered history, so we also add `--"
+"ignore-unmatch`:"
msgstr ""
#. type: delimited block -
#: en/git-filter-branch.txt:255
#, no-wrap
-msgid ""
-"git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename'"
-" HEAD\n"
+msgid "git filter-branch --index-filter 'git rm --cached --ignore-unmatch filename' HEAD\n"
msgstr ""
#. type: Plain text
@@ -29363,8 +29241,8 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:261
msgid ""
-"To rewrite the repository to look as if `foodir/` had been its project root,"
-" and discard all other history:"
+"To rewrite the repository to look as if `foodir/` had been its project root, "
+"and discard all other history:"
msgstr ""
#. type: delimited block -
@@ -29384,8 +29262,8 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:273
msgid ""
-"To set a commit (which typically is at the tip of another history) to be the"
-" parent of the current initial commit, in order to paste the other history "
+"To set a commit (which typically is at the tip of another history) to be the "
+"parent of the current initial commit, in order to paste the other history "
"behind the current history:"
msgstr ""
@@ -29646,9 +29524,9 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:432
msgid ""
-"Clone it with `git clone file:///path/to/repo`. The clone will not have the"
-" removed objects. See linkgit:git-clone[1]. (Note that cloning with a "
-"plain path just hardlinks everything!)"
+"Clone it with `git clone file:///path/to/repo`. The clone will not have the "
+"removed objects. See linkgit:git-clone[1]. (Note that cloning with a plain "
+"path just hardlinks everything!)"
msgstr ""
#. type: Plain text
@@ -29656,8 +29534,7 @@ msgstr ""
msgid ""
"If you really don't want to clone it, for whatever reasons, check the "
"following points instead (in this order). This is a very destructive "
-"approach, so *make a backup* or go back to cloning it. You have been "
-"warned."
+"approach, so *make a backup* or go back to cloning it. You have been warned."
msgstr ""
#. type: Plain text
@@ -29683,13 +29560,13 @@ msgstr ""
#. type: Plain text
#: en/git-filter-branch.txt:459
msgid ""
-"git-filter-branch allows you to make complex shell-scripted rewrites of your"
-" Git history, but you probably don't need this flexibility if you're simply "
+"git-filter-branch allows you to make complex shell-scripted rewrites of your "
+"Git history, but you probably don't need this flexibility if you're simply "
"_removing unwanted data_ like large files or passwords. For those "
-"operations you may want to consider http://rtyley.github.io/bfg-repo-"
-"cleaner/[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-"
-"branch, typically at least 10-50x faster for those use-cases, and with quite"
-" different characteristics:"
+"operations you may want to consider http://rtyley.github.io/bfg-repo-cleaner/"
+"[The BFG Repo-Cleaner], a JVM-based alternative to git-filter-branch, "
+"typically at least 10-50x faster for those use-cases, and with quite "
+"different characteristics:"
msgstr ""
#. type: Plain text
@@ -29707,10 +29584,10 @@ msgstr ""
#: en/git-filter-branch.txt:473
msgid ""
"By default The BFG takes full advantage of multi-core machines, cleansing "
-"commit file-trees in parallel. git-filter-branch cleans commits sequentially"
-" (i.e. in a single-threaded manner), though it _is_ possible to write "
-"filters that include their own parallelism, in the scripts executed against "
-"each commit."
+"commit file-trees in parallel. git-filter-branch cleans commits sequentially "
+"(i.e. in a single-threaded manner), though it _is_ possible to write filters "
+"that include their own parallelism, in the scripts executed against each "
+"commit."
msgstr ""
#. type: Plain text
@@ -29723,7 +29600,7 @@ msgstr ""
#. type: Title =
#: en/git-fmt-merge-msg.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-fmt-merge-msg(1)"
msgstr "git-fmt-merge-msg(1)"
@@ -29744,8 +29621,8 @@ msgstr ""
#: en/git-fmt-merge-msg.txt:20
msgid ""
"Takes the list of merged objects on stdin and produces a suitable commit "
-"message to be used for the merge commit, usually to be passed as the "
-"'<merge-message>' argument of 'git merge'."
+"message to be used for the merge commit, usually to be passed as the '<merge-"
+"message>' argument of 'git merge'."
msgstr ""
#. type: Plain text
@@ -29772,19 +29649,18 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:34 en/merge-options.txt:53
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-log"
msgstr "--no-log"
#. type: Plain text
#: en/git-fmt-merge-msg.txt:37
-msgid ""
-"Do not list one-line descriptions from the actual commits being merged."
+msgid "Do not list one-line descriptions from the actual commits being merged."
msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:38
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]summary"
msgstr "--[no-]summary"
@@ -29821,15 +29697,14 @@ msgstr ""
#. type: Labeled list
#: en/git-fmt-merge-msg.txt:56
-#, ignore-same, no-wrap
+#, no-wrap
msgid "merge.summary"
msgstr "merge.summary"
#. type: Plain text
#: en/git-fmt-merge-msg.txt:59
msgid ""
-"Synonym to `merge.log`; this is deprecated and will be removed in the "
-"future."
+"Synonym to `merge.log`; this is deprecated and will be removed in the future."
msgstr ""
#. type: delimited block -
@@ -29849,7 +29724,7 @@ msgstr ""
#. type: Title =
#: en/git-for-each-ref.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-for-each-ref(1)"
msgstr "git-for-each-ref(1)"
@@ -29873,11 +29748,10 @@ msgstr ""
#: en/git-for-each-ref.txt:26
msgid ""
"Iterate over all refs that match `<pattern>` and show them according to the "
-"given `<format>`, after sorting them according to the given set of `<key>`."
-" If `<count>` is given, stop after showing that many refs. The "
-"interpolated values in `<format>` can optionally be quoted as string "
-"literals in the specified host language allowing their direct evaluation in "
-"that language."
+"given `<format>`, after sorting them according to the given set of `<key>`. "
+"If `<count>` is given, stop after showing that many refs. The interpolated "
+"values in `<format>` can optionally be quoted as string literals in the "
+"specified host language allowing their direct evaluation in that language."
msgstr ""
#. type: Labeled list
@@ -29889,9 +29763,9 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:34
msgid ""
-"If one or more patterns are given, only refs are shown that match against at"
-" least one pattern, either using fnmatch(3) or literally, in the latter case"
-" matching completely or from the beginning up to a slash."
+"If one or more patterns are given, only refs are shown that match against at "
+"least one pattern, either using fnmatch(3) or literally, in the latter case "
+"matching completely or from the beginning up to a slash."
msgstr ""
#. type: Labeled list
@@ -29930,8 +29804,8 @@ msgid ""
"the ref points at a tag object, use the value for the field in the object "
"which the tag object refers to (instead of the field in the tag object). "
"When unspecified, `<format>` defaults to `%(objectname) SPC %(objecttype) "
-"TAB %(refname)`. It also interpolates `%%` to `%`, and `%xx` where `xx` are"
-" hex digits interpolates to character with hex code `xx`; for example `%00` "
+"TAB %(refname)`. It also interpolates `%%` to `%`, and `%xx` where `xx` are "
+"hex digits interpolates to character with hex code `xx`; for example `%00` "
"interpolates to `\\0` (NUL), `%09` to `\\t` (TAB) and `%0a` to `\\n` (LF)."
msgstr ""
@@ -29945,25 +29819,25 @@ msgstr ""
#. type: Labeled list
#: en/git-for-each-ref.txt:65
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--shell"
msgstr "--shell"
#. type: Labeled list
#: en/git-for-each-ref.txt:66
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--perl"
msgstr "--perl"
#. type: Labeled list
#: en/git-for-each-ref.txt:67
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--python"
msgstr "--python"
#. type: Labeled list
#: en/git-for-each-ref.txt:68
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--tcl"
msgstr "--tcl"
@@ -30072,16 +29946,15 @@ msgid ""
"The name of the ref (the part after $GIT_DIR/). For a non-ambiguous short "
"name of the ref append `:short`. The option core.warnAmbiguousRefs is used "
"to select the strict abbreviation mode. If `lstrip=<N>` (`rstrip=<N>`) is "
-"appended, strips `<N>` slash-separated path components from the front (back)"
-" of the refname (e.g. `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo`"
-" and `%(refname:rstrip=2)` turns `refs/tags/foo` into `refs`). If `<N>` is "
-"a negative number, strip as many path components as necessary from the "
+"appended, strips `<N>` slash-separated path components from the front (back) "
+"of the refname (e.g. `%(refname:lstrip=2)` turns `refs/tags/foo` into `foo` "
+"and `%(refname:rstrip=2)` turns `refs/tags/foo` into `refs`). If `<N>` is a "
+"negative number, strip as many path components as necessary from the "
"specified end to leave `-<N>` path components (e.g. `%(refname:lstrip=-2)` "
-"turns `refs/tags/foo` into `tags/foo` and `%(refname:rstrip=-1)` turns "
-"`refs/tags/foo` into `refs`). When the ref does not have enough components, "
-"the result becomes an empty string if stripping with positive <N>, or it "
-"becomes the full refname if stripping with negative <N>. Neither is an "
-"error."
+"turns `refs/tags/foo` into `tags/foo` and `%(refname:rstrip=-1)` turns `refs/"
+"tags/foo` into `refs`). When the ref does not have enough components, the "
+"result becomes an empty string if stripping with positive <N>, or it becomes "
+"the full refname if stripping with negative <N>. Neither is an error."
msgstr ""
#. type: Plain text
@@ -30109,9 +29982,9 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:133
msgid ""
-"The size of the object (the same as 'git cat-file -s' reports). Append "
-"`:disk` to get the size, in bytes, that the object takes up on disk. See the"
-" note about on-disk sizes in the `CAVEATS` section below."
+"The size of the object (the same as 'git cat-file -s' reports). Append `:"
+"disk` to get the size, in bytes, that the object takes up on disk. See the "
+"note about on-disk sizes in the `CAVEATS` section below."
msgstr ""
#. type: Labeled list
@@ -30123,10 +29996,10 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:139
msgid ""
-"The object name (aka SHA-1). For a non-ambiguous abbreviation of the object"
-" name append `:short`. For an abbreviation of the object name with desired "
-"length append `:short=<length>`, where the minimum length is MINIMUM_ABBREV."
-" The length may be exceeded to ensure unique object names."
+"The object name (aka SHA-1). For a non-ambiguous abbreviation of the object "
+"name append `:short`. For an abbreviation of the object name with desired "
+"length append `:short=<length>`, where the minimum length is MINIMUM_ABBREV. "
+"The length may be exceeded to ensure unique object names."
msgstr ""
#. type: Labeled list
@@ -30153,23 +30026,23 @@ msgstr ""
#: en/git-for-each-ref.txt:154
msgid ""
"The name of a local ref which can be considered ``upstream'' from the "
-"displayed ref. Respects `:short`, `:lstrip` and `:rstrip` in the same way as"
-" `refname` above. Additionally respects `:track` to show \"[ahead N, behind"
-" M]\" and `:trackshort` to show the terse version: \">\" (ahead), \"<\" "
-"(behind), \"<>\" (ahead and behind), or \"=\" (in sync). `:track` also "
-"prints \"[gone]\" whenever unknown upstream ref is encountered. Append "
-"`:track,nobracket` to show tracking information without brackets (i.e "
-"\"ahead N, behind M\")."
+"displayed ref. Respects `:short`, `:lstrip` and `:rstrip` in the same way as "
+"`refname` above. Additionally respects `:track` to show \"[ahead N, behind "
+"M]\" and `:trackshort` to show the terse version: \">\" (ahead), \"<"
+"\" (behind), \"<>\" (ahead and behind), or \"=\" (in sync). `:track` also "
+"prints \"[gone]\" whenever unknown upstream ref is encountered. Append `:"
+"track,nobracket` to show tracking information without brackets (i.e \"ahead "
+"N, behind M\")."
msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:161
msgid ""
-"For any remote-tracking branch `%(upstream)`, `%(upstream:remotename)` and "
-"`%(upstream:remoteref)` refer to the name of the remote and the name of the "
-"tracked remote ref, respectively. In other words, the remote-tracking branch"
-" can be updated explicitly and individually by using the refspec "
-"`%(upstream:remoteref):%(upstream)` to fetch from `%(upstream:remotename)`."
+"For any remote-tracking branch `%(upstream)`, `%(upstream:remotename)` and `"
+"%(upstream:remoteref)` refer to the name of the remote and the name of the "
+"tracked remote ref, respectively. In other words, the remote-tracking branch "
+"can be updated explicitly and individually by using the refspec `%(upstream:"
+"remoteref):%(upstream)` to fetch from `%(upstream:remotename)`."
msgstr ""
#. type: Plain text
@@ -30190,8 +30063,8 @@ msgstr ""
#: en/git-for-each-ref.txt:172
msgid ""
"The name of a local ref which represents the `@{push}` location for the "
-"displayed ref. Respects `:short`, `:lstrip`, `:rstrip`, `:track`, "
-"`:trackshort`, `:remotename`, and `:remoteref` options as `upstream` does. "
+"displayed ref. Respects `:short`, `:lstrip`, `:rstrip`, `:track`, `:"
+"trackshort`, `:remotename`, and `:remoteref` options as `upstream` does. "
"Produces an empty string if no `@{push}` ref is configured."
msgstr ""
@@ -30226,13 +30099,13 @@ msgstr ""
msgid ""
"Left-, middle-, or right-align the content between %(align:...) and %(end). "
"The \"align:\" is followed by `width=<width>` and `position=<position>` in "
-"any order separated by a comma, where the `<position>` is either left, right"
-" or middle, default being left and `<width>` is the total length of the "
+"any order separated by a comma, where the `<position>` is either left, right "
+"or middle, default being left and `<width>` is the total length of the "
"content with alignment. For brevity, the \"width=\" and/or \"position=\" "
"prefixes may be omitted, and bare <width> and <position> used instead. For "
-"instance, `%(align:<width>,<position>)`. If the contents length is more than"
-" the width then no alignment is performed. If used with `--quote` everything"
-" in between %(align:...) and %(end) is quoted, but if nested then only the "
+"instance, `%(align:<width>,<position>)`. If the contents length is more than "
+"the width then no alignment is performed. If used with `--quote` everything "
+"in between %(align:...) and %(end) is quoted, but if nested then only the "
"topmost level performs quoting."
msgstr ""
@@ -30249,10 +30122,10 @@ msgid ""
"there is an atom with value or string literal after the %(if) then "
"everything after the %(then) is printed, else if the %(else) atom is used, "
"then everything after %(else) is printed. We ignore space when evaluating "
-"the string before %(then), this is useful when we use the %(HEAD) atom which"
-" prints either \"*\" or \" \" and we want to apply the 'if' condition only "
-"on the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" "
-"to compare the value between the %(if:...) and %(then) atoms with the given "
+"the string before %(then), this is useful when we use the %(HEAD) atom which "
+"prints either \"*\" or \" \" and we want to apply the 'if' condition only on "
+"the 'HEAD' ref. Append \":equals=<string>\" or \":notequals=<string>\" to "
+"compare the value between the %(if:...) and %(then) atoms with the given "
"string."
msgstr ""
@@ -30273,8 +30146,8 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:220
msgid ""
-"In addition to the above, for commit and tag objects, the header field names"
-" (`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the "
+"In addition to the above, for commit and tag objects, the header field names "
+"(`tree`, `parent`, `object`, `type`, and `tag`) can be used to specify the "
"value in the header field."
msgstr ""
@@ -30301,11 +30174,11 @@ msgid ""
"The complete message in a commit and tag object is `contents`. Its first "
"line is `contents:subject`, where subject is the concatenation of all lines "
"of the commit message up to the first blank line. The next line is "
-"`contents:body`, where body is all of the lines after the first blank line."
-" The optional GPG signature is `contents:signature`. The first `N` lines "
-"of the message is obtained using `contents:lines=N`. Additionally, the "
-"trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as"
-" `trailers` (or by using the historical alias `contents:trailers`). Non-"
+"`contents:body`, where body is all of the lines after the first blank line. "
+"The optional GPG signature is `contents:signature`. The first `N` lines of "
+"the message is obtained using `contents:lines=N`. Additionally, the "
+"trailers as interpreted by linkgit:git-interpret-trailers[1] are obtained as "
+"`trailers` (or by using the historical alias `contents:trailers`). Non-"
"trailer lines from the trailer block can be omitted with `trailers:only`. "
"Whitespace-continuations can be removed from trailers so that each trailer "
"appears on a line by itself with its full content with `trailers:unfold`. "
@@ -30316,8 +30189,8 @@ msgstr ""
#: en/git-for-each-ref.txt:246
msgid ""
"For sorting purposes, fields with numeric values sort in numeric order "
-"(`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`)."
-" All other fields are used to sort in their byte-value order."
+"(`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`). "
+"All other fields are used to sort in their byte-value order."
msgstr ""
#. type: Plain text
@@ -30338,9 +30211,9 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:257
msgid ""
-"As a special case for the date-type fields, you may specify a format for the"
-" date by adding `:` followed by date format name (see the values the "
-"`--date` option to linkgit:git-rev-list[1] takes)."
+"As a special case for the date-type fields, you may specify a format for the "
+"date by adding `:` followed by date format name (see the values the `--date` "
+"option to linkgit:git-rev-list[1] takes)."
msgstr ""
#. type: Plain text
@@ -30362,8 +30235,8 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:272
msgid ""
-"An example directly producing formatted text. Show the most recent 3 tagged"
-" commits:"
+"An example directly producing formatted text. Show the most recent 3 tagged "
+"commits:"
msgstr ""
#. type: delimited block -
@@ -30414,8 +30287,8 @@ msgstr ""
#. type: Plain text
#: en/git-for-each-ref.txt:303
msgid ""
-"A bit more elaborate report on tags, demonstrating that the format may be an"
-" entire script:"
+"A bit more elaborate report on tags, demonstrating that the format may be an "
+"entire script:"
msgstr ""
#. type: delimited block -
@@ -30503,9 +30376,7 @@ msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:359
#, no-wrap
-msgid ""
-"git for-each-ref --format=\"%(if)%(HEAD)%(then)* %(else) "
-"%(end)%(refname:short)\" refs/heads/\n"
+msgid "git for-each-ref --format=\"%(if)%(HEAD)%(then)* %(else) %(end)%(refname:short)\" refs/heads/\n"
msgstr ""
#. type: Plain text
@@ -30518,14 +30389,12 @@ msgstr ""
#. type: delimited block -
#: en/git-for-each-ref.txt:367
#, no-wrap
-msgid ""
-"git for-each-ref --format=\"%(refname)%(if)%(authorname)%(then) Authored by:"
-" %(authorname)%(end)\"\n"
+msgid "git for-each-ref --format=\"%(refname)%(if)%(authorname)%(then) Authored by: %(authorname)%(end)\"\n"
msgstr ""
#. type: Title =
#: en/git-format-patch.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-format-patch(1)"
msgstr "git-format-patch(1)"
@@ -30583,8 +30452,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:49
msgid ""
-"Generic <revision range> expression (see \"SPECIFYING REVISIONS\" section in"
-" linkgit:gitrevisions[7]) means the commits in the specified range."
+"Generic <revision range> expression (see \"SPECIFYING REVISIONS\" section in "
+"linkgit:gitrevisions[7]) means the commits in the specified range."
msgstr ""
#. type: Plain text
@@ -30592,9 +30461,9 @@ msgstr ""
msgid ""
"The first rule takes precedence in the case of a single <commit>. To apply "
"the second rule, i.e., format everything since the beginning of history up "
-"until <commit>, use the `--root` option: `git format-patch --root <commit>`."
-" If you want to format only <commit> itself, you can do this with `git "
-"format-patch -1 <commit>`."
+"until <commit>, use the `--root` option: `git format-patch --root "
+"<commit>`. If you want to format only <commit> itself, you can do this with "
+"`git format-patch -1 <commit>`."
msgstr ""
#. type: Plain text
@@ -30611,12 +30480,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:69
msgid ""
-"If `-o` is specified, output files are created in <dir>. Otherwise they are"
-" created in the current working directory. The default path can be set with "
+"If `-o` is specified, output files are created in <dir>. Otherwise they are "
+"created in the current working directory. The default path can be set with "
"the `format.outputDirectory` configuration option. The `-o` option takes "
"precedence over `format.outputDirectory`. To store patches in the current "
-"working directory even when `format.outputDirectory` points elsewhere, use "
-"`-o .`."
+"working directory even when `format.outputDirectory` points elsewhere, use `-"
+"o .`."
msgstr ""
#. type: Plain text
@@ -30639,8 +30508,8 @@ msgstr ""
#: en/git-format-patch.txt:82
msgid ""
"If given `--thread`, `git-format-patch` will generate `In-Reply-To` and "
-"`References` headers to make the second and subsequent patch mails appear as"
-" replies to the first mail; this also generates a `Message-Id` header to "
+"`References` headers to make the second and subsequent patch mails appear as "
+"replies to the first mail; this also generates a `Message-Id` header to "
"reference."
msgstr ""
@@ -30676,7 +30545,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:97 en/git-shortlog.txt:30
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--numbered"
msgstr "--numbered"
@@ -30687,7 +30556,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:101
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-numbered"
msgstr "--no-numbered"
@@ -30709,20 +30578,20 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:107
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--numbered-files"
msgstr "--numbered-files"
#. type: Plain text
#: en/git-format-patch.txt:110
msgid ""
-"Output file names will be a simple number sequence without the default first"
-" line of the commit appended."
+"Output file names will be a simple number sequence without the default first "
+"line of the commit appended."
msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:112
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--keep-subject"
msgstr "--keep-subject"
@@ -30742,15 +30611,15 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:122 en/git-pack-objects.txt:59
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--stdout"
msgstr "--stdout"
#. type: Plain text
#: en/git-format-patch.txt:125
msgid ""
-"Print all commits to the standard output in mbox format, instead of creating"
-" a file for each one."
+"Print all commits to the standard output in mbox format, instead of creating "
+"a file for each one."
msgstr ""
#. type: Labeled list
@@ -30769,7 +30638,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:131
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-attach"
msgstr "--no-attach"
@@ -30801,7 +30670,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:141
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-thread"
msgstr "--no-thread"
@@ -30817,8 +30686,8 @@ msgstr ""
#: en/git-format-patch.txt:152
msgid ""
"The optional <style> argument can be either `shallow` or `deep`. 'shallow' "
-"threading makes every mail a reply to the head of the series, where the head"
-" is chosen from the cover letter, the `--in-reply-to`, and the first patch "
+"threading makes every mail a reply to the head of the series, where the head "
+"is chosen from the cover letter, the `--in-reply-to`, and the first patch "
"mail, in this order. 'deep' threading makes every mail a reply to the "
"previous one."
msgstr ""
@@ -30834,8 +30703,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:160
msgid ""
-"Beware that the default for 'git send-email' is to thread emails itself. If"
-" you want `git format-patch` to take care of threading, you will want to "
+"Beware that the default for 'git send-email' is to thread emails itself. If "
+"you want `git format-patch` to take care of threading, you will want to "
"ensure that threading is disabled for `git send-email`."
msgstr ""
@@ -30855,17 +30724,16 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:166
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-if-in-upstream"
msgstr "--ignore-if-in-upstream"
#. type: Plain text
#: en/git-format-patch.txt:172
msgid ""
-"Do not include a patch that matches a commit in <until>..<since>. This will"
-" examine all patches reachable from <since> but not from <until> and compare"
-" them with the patches being generated, and any patch that matches is "
-"ignored."
+"Do not include a patch that matches a commit in <until>..<since>. This will "
+"examine all patches reachable from <since> but not from <until> and compare "
+"them with the patches being generated, and any patch that matches is ignored."
msgstr ""
#. type: Labeled list
@@ -30884,16 +30752,16 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:179
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--rfc"
msgstr "--rfc"
#. type: Plain text
#: en/git-format-patch.txt:183
msgid ""
-"Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For "
-"Comments\"; use this when sending an experimental patch for discussion "
-"rather than application."
+"Alias for `--subject-prefix=\"RFC PATCH\"`. RFC means \"Request For Comments"
+"\"; use this when sending an experimental patch for discussion rather than "
+"application."
msgstr ""
#. type: Labeled list
@@ -30912,10 +30780,10 @@ msgstr ""
#: en/git-format-patch.txt:192
msgid ""
"Mark the series as the <n>-th iteration of the topic. The output filenames "
-"have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default,"
-" but configurable via the `--subject-prefix` option) has ` v<n>` appended to"
-" it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file"
-" that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
+"have `v<n>` prepended to them, and the subject prefix (\"PATCH\" by default, "
+"but configurable via the `--subject-prefix` option) has ` v<n>` appended to "
+"it. E.g. `--reroll-count=4` may produce `v4-0001-add-makefile.patch` file "
+"that has \"Subject: [PATCH v4 1/20] Add makefile\" in it."
msgstr ""
#. type: Labeled list
@@ -30948,7 +30816,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:205
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--from"
msgstr "--from"
@@ -30995,7 +30863,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:228
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]cover-letter"
msgstr "--[no-]cover-letter"
@@ -31034,15 +30902,15 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:253
msgid ""
-"As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into"
-" the cover letter, or as commentary of the lone patch of a 1-patch series, "
-"showing the differences between the previous version of the patch series and"
-" the series currently being formatted. `previous` can be a single revision "
+"As a reviewer aid, insert a range-diff (see linkgit:git-range-diff[1]) into "
+"the cover letter, or as commentary of the lone patch of a 1-patch series, "
+"showing the differences between the previous version of the patch series and "
+"the series currently being formatted. `previous` can be a single revision "
"naming the tip of the previous series if it shares a common base with the "
-"series being formatted (for example `git format-patch --cover-letter "
-"--range-diff=feature/v1 -3 feature/v2`), or a revision range if the two "
-"versions of the series are disjoint (for example `git format-patch --cover-"
-"letter --range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
+"series being formatted (for example `git format-patch --cover-letter --range-"
+"diff=feature/v1 -3 feature/v2`), or a revision range if the two versions of "
+"the series are disjoint (for example `git format-patch --cover-letter --"
+"range-diff=feature/v1~3..feature/v1 -3 feature/v2`)."
msgstr ""
#. type: Plain text
@@ -31064,9 +30932,8 @@ msgstr ""
#: en/git-format-patch.txt:264
msgid ""
"Used with `--range-diff`, tweak the heuristic which matches up commits "
-"between the previous and current series of patches by adjusting the "
-"creation/deletion cost fudge factor. See linkgit:git-range-diff[1]) for "
-"details."
+"between the previous and current series of patches by adjusting the creation/"
+"deletion cost fudge factor. See linkgit:git-range-diff[1]) for details."
msgstr ""
#. type: Labeled list
@@ -31086,8 +30953,8 @@ msgstr ""
#: en/git-format-patch.txt:276
msgid ""
"The expected use case of this is to write supporting explanation for the "
-"commit that does not belong to the commit log message proper, and include it"
-" with the patch submission. While one can simply write these explanations "
+"commit that does not belong to the commit log message proper, and include it "
+"with the patch submission. While one can simply write these explanations "
"after `format-patch` has run but before sending, keeping them as Git notes "
"allows them to be maintained between versions of the patch series (but see "
"the discussion of the `notes.rewrite` configuration options in linkgit:git-"
@@ -31147,7 +31014,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:299
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-binary"
msgstr "--no-binary"
@@ -31161,7 +31028,7 @@ msgstr ""
#. type: Labeled list
#: en/git-format-patch.txt:305
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--zero-commit"
msgstr "--zero-commit"
@@ -31189,8 +31056,8 @@ msgstr ""
#: en/git-format-patch.txt:320
msgid ""
"Treat the revision argument as a <revision range>, even if it is just a "
-"single commit (that would normally be treated as a <since>). Note that root"
-" commits included in the specified range are always formatted as creation "
+"single commit (that would normally be treated as a <since>). Note that root "
+"commits included in the specified range are always formatted as creation "
"patches, independently of this flag."
msgstr ""
@@ -31315,11 +31182,11 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:401
msgid ""
-"When sending a patch this way, most often you are sending your own patch, so"
-" in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit"
-" `From:` and `Date:` lines from the patch file. The patch title is likely "
-"to be different from the subject of the discussion the patch is in response "
-"to, so it is likely that you would want to keep the Subject: line, like the "
+"When sending a patch this way, most often you are sending your own patch, so "
+"in addition to the \"`From $SHA1 $magic_timestamp`\" marker you should omit "
+"`From:` and `Date:` lines from the patch file. The patch title is likely to "
+"be different from the subject of the discussion the patch is in response to, "
+"so it is likely that you would want to keep the Subject: line, like the "
"example above."
msgstr ""
@@ -31389,8 +31256,8 @@ msgstr ""
#: en/git-format-patch.txt:434
msgid ""
"The patch itself does not apply cleanly. That is _bad_ but does not have "
-"much to do with your MUA. You might want to rebase the patch with "
-"linkgit:git-rebase[1] before regenerating it in this case."
+"much to do with your MUA. You might want to rebase the patch with linkgit:"
+"git-rebase[1] before regenerating it in this case."
msgstr ""
#. type: Plain text
@@ -31436,8 +31303,8 @@ msgstr ""
msgid ""
"GMail does not have any way to turn off line wrapping in the web interface, "
"so it will mangle any emails that you send. You can however use \"git send-"
-"email\" and send your patches through the GMail SMTP server, or use any IMAP"
-" email client to connect to the google IMAP server and forward the emails "
+"email\" and send your patches through the GMail SMTP server, or use any IMAP "
+"email client to connect to the google IMAP server and forward the emails "
"through that."
msgstr ""
@@ -31451,8 +31318,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:466
msgid ""
-"For hints on submission using the IMAP interface, see the EXAMPLE section of"
-" linkgit:git-imap-send[1]."
+"For hints on submission using the IMAP interface, see the EXAMPLE section of "
+"linkgit:git-imap-send[1]."
msgstr ""
#. type: Title ~
@@ -31465,8 +31332,7 @@ msgstr ""
#: en/git-format-patch.txt:472
msgid ""
"By default, Thunderbird will both wrap emails as well as flag them as being "
-"'format=flowed', both of which will make the resulting email unusable by "
-"Git."
+"'format=flowed', both of which will make the resulting email unusable by Git."
msgstr ""
#. type: Plain text
@@ -31486,12 +31352,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:486
msgid ""
-"Install the Toggle Word Wrap add-on that is available from "
-"https://addons.mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a "
-"menu entry \"Enable Word Wrap\" in the composer's \"Options\" menu that you "
-"can tick off. Now you can compose the message as you otherwise do (cut + "
-"paste, 'git format-patch' | 'git imap-send', etc), but you have to insert "
-"line breaks manually in any text that you type."
+"Install the Toggle Word Wrap add-on that is available from https://addons."
+"mozilla.org/thunderbird/addon/toggle-word-wrap/ It adds a menu entry "
+"\"Enable Word Wrap\" in the composer's \"Options\" menu that you can tick "
+"off. Now you can compose the message as you otherwise do (cut + paste, 'git "
+"format-patch' | 'git imap-send', etc), but you have to insert line breaks "
+"manually in any text that you type."
msgstr ""
#. type: Title ^
@@ -31557,9 +31423,9 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:521
msgid ""
-"The following Thunderbird extensions are needed: AboutConfig from "
-"http://aboutconfig.mozdev.org/ and External Editor from "
-"http://globs.org/articles.php?lng=en&pg=8"
+"The following Thunderbird extensions are needed: AboutConfig from http://"
+"aboutconfig.mozdev.org/ and External Editor from http://globs.org/articles."
+"php?lng=en&pg=8"
msgstr ""
#. type: Plain text
@@ -31571,16 +31437,15 @@ msgstr ""
#: en/git-format-patch.txt:528
msgid ""
"Before opening a compose window, use Edit->Account Settings to uncheck the "
-"\"Compose messages in HTML format\" setting in the \"Composition & "
-"Addressing\" panel of the account to be used to send the patch."
+"\"Compose messages in HTML format\" setting in the \"Composition & Addressing"
+"\" panel of the account to be used to send the patch."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:532
msgid ""
-"In the main Thunderbird window, 'before' you open the compose window for the"
-" patch, use Tools->about:config to set the following to the indicated "
-"values:"
+"In the main Thunderbird window, 'before' you open the compose window for the "
+"patch, use Tools->about:config to set the following to the indicated values:"
msgstr ""
#. type: delimited block -
@@ -31663,8 +31528,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:571
msgid ""
-"Back in the compose window: add whatever other text you wish to the message,"
-" complete the addressing and subject fields, and press send."
+"Back in the compose window: add whatever other text you wish to the message, "
+"complete the addressing and subject fields, and press send."
msgstr ""
#. type: Title -
@@ -31711,10 +31576,10 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:602
msgid ""
-"With `git format-patch --base=P -3 C` (or variants thereof, e.g. with "
-"`--cover-letter` or using `Z..C` instead of `-3 C` to specify the range), "
-"the base tree information block is shown at the end of the first message the"
-" command outputs (either the first patch, or the cover letter), like this:"
+"With `git format-patch --base=P -3 C` (or variants thereof, e.g. with `--"
+"cover-letter` or using `Z..C` instead of `-3 C` to specify the range), the "
+"base tree information block is shown at the end of the first message the "
+"command outputs (either the first patch, or the cover letter), like this:"
msgstr ""
#. type: delimited block -
@@ -31744,8 +31609,8 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:621
msgid ""
-"You can also use `git format-patch --base=P -3 C` to generate patches for A,"
-" B and C, and the identifiers for P, X, Y, Z are appended at the end of the "
+"You can also use `git format-patch --base=P -3 C` to generate patches for A, "
+"B and C, and the identifiers for P, X, Y, Z are appended at the end of the "
"first message."
msgstr ""
@@ -31755,8 +31620,8 @@ msgid ""
"If set `--base=auto` in cmdline, it will track base commit automatically, "
"the base commit will be the merge base of tip commit of the remote-tracking "
"branch and revision-range specified in cmdline. For a local branch, you "
-"need to track a remote branch by `git branch --set-upstream-to` before using"
-" this option."
+"need to track a remote branch by `git branch --set-upstream-to` before using "
+"this option."
msgstr ""
#. type: Plain text
@@ -31793,8 +31658,7 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:649
msgid ""
-"Extract all commits that lead to 'origin' since the inception of the "
-"project:"
+"Extract all commits that lead to 'origin' since the inception of the project:"
msgstr ""
#. type: delimited block -
@@ -31820,15 +31684,15 @@ msgid ""
"Additionally, it detects and handles renames and complete rewrites "
"intelligently to produce a renaming patch. A renaming patch reduces the "
"amount of text output, and generally makes it easier to review. Note that "
-"non-Git \"patch\" programs won't understand renaming patches, so use it only"
-" when you know the recipient uses Git to apply your patch."
+"non-Git \"patch\" programs won't understand renaming patches, so use it only "
+"when you know the recipient uses Git to apply your patch."
msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:668
msgid ""
-"Extract three topmost commits from the current branch and format them as "
-"e-mailable patches:"
+"Extract three topmost commits from the current branch and format them as e-"
+"mailable patches:"
msgstr ""
#. type: delimited block -
@@ -31839,13 +31703,12 @@ msgstr ""
#. type: Plain text
#: en/git-format-patch.txt:676
-#, ignore-same
msgid "linkgit:git-am[1], linkgit:git-send-email[1]"
msgstr "linkgit:git-am[1], linkgit:git-send-email[1]"
#. type: Title =
#: en/git-fsck-objects.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-fsck-objects(1)"
msgstr "git-fsck-objects(1)"
@@ -31871,7 +31734,7 @@ msgstr ""
#. type: Title =
#: en/git-fsck.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-fsck(1)"
msgstr "git-fsck(1)"
@@ -31907,7 +31770,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:30
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--unreachable"
msgstr "--unreachable"
@@ -31920,15 +31783,15 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:34
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]dangling"
msgstr "--[no-]dangling"
#. type: Plain text
#: en/git-fsck.txt:37
msgid ""
-"Print objects that exist but that are never 'directly' used (default). "
-"`--no-dangling` can be used to omit this information from the output."
+"Print objects that exist but that are never 'directly' used (default). `--"
+"no-dangling` can be used to omit this information from the output."
msgstr ""
#. type: Plain text
@@ -31943,7 +31806,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:44
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--cache"
msgstr "--cache"
@@ -31956,7 +31819,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:48
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-reflogs"
msgstr "--no-reflogs"
@@ -31970,7 +31833,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:54
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--full"
msgstr "--full"
@@ -31979,15 +31842,15 @@ msgstr "--full"
msgid ""
"Check not just objects in GIT_OBJECT_DIRECTORY ($GIT_DIR/objects), but also "
"the ones found in alternate object pools listed in "
-"GIT_ALTERNATE_OBJECT_DIRECTORIES or $GIT_DIR/objects/info/alternates, and in"
-" packed Git archives found in $GIT_DIR/objects/pack and corresponding pack "
-"subdirectories in alternate object pools. This is now default; you can turn"
-" it off with --no-full."
+"GIT_ALTERNATE_OBJECT_DIRECTORIES or $GIT_DIR/objects/info/alternates, and in "
+"packed Git archives found in $GIT_DIR/objects/pack and corresponding pack "
+"subdirectories in alternate object pools. This is now default; you can turn "
+"it off with --no-full."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:64
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--connectivity-only"
msgstr "--connectivity-only"
@@ -32001,7 +31864,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:69 en/git-index-pack.txt:74 en/git-unpack-objects.txt:44
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--strict"
msgstr "--strict"
@@ -32009,8 +31872,8 @@ msgstr "--strict"
#: en/git-fsck.txt:76
msgid ""
"Enable more strict checking, namely to catch a file mode recorded with g+w "
-"bit set, which was created by older versions of Git. Existing repositories,"
-" including the Linux kernel, Git itself, and sparse repository have old "
+"bit set, which was created by older versions of Git. Existing repositories, "
+"including the Linux kernel, Git itself, and sparse repository have old "
"objects that triggers this check, but it is recommended to check new "
"projects with this flag."
msgstr ""
@@ -32022,21 +31885,21 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:80
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--lost-found"
msgstr "--lost-found"
#. type: Plain text
#: en/git-fsck.txt:85
msgid ""
-"Write dangling objects into .git/lost-found/commit/ or .git/lost-"
-"found/other/, depending on type. If the object is a blob, the contents are "
+"Write dangling objects into .git/lost-found/commit/ or .git/lost-found/"
+"other/, depending on type. If the object is a blob, the contents are "
"written into the file, rather than its object name."
msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:86
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--name-objects"
msgstr "--name-objects"
@@ -32052,28 +31915,27 @@ msgstr ""
#: en/git-fsck.txt:98
msgid ""
"Progress status is reported on the standard error stream by default when it "
-"is attached to a terminal, unless --no-progress or --verbose is specified. "
-"--progress forces progress status even if the standard error stream is not "
+"is attached to a terminal, unless --no-progress or --verbose is specified. --"
+"progress forces progress status even if the standard error stream is not "
"directed to a terminal."
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:108
msgid ""
-"git-fsck tests SHA-1 and general object sanity, and it does full tracking of"
-" the resulting reachability and everything else. It prints out any "
-"corruption it finds (missing or bad objects), and if you use the "
-"`--unreachable` flag it will also print out objects that exist but that "
-"aren't reachable from any of the specified head nodes (or the default set, "
-"as mentioned above)."
+"git-fsck tests SHA-1 and general object sanity, and it does full tracking of "
+"the resulting reachability and everything else. It prints out any corruption "
+"it finds (missing or bad objects), and if you use the `--unreachable` flag "
+"it will also print out objects that exist but that aren't reachable from any "
+"of the specified head nodes (or the default set, as mentioned above)."
msgstr ""
#. type: Plain text
#: en/git-fsck.txt:112
msgid ""
-"Any corrupt objects you will have to find in backups or other archives "
-"(i.e., you can just remove them and do an 'rsync' with some other site in "
-"the hopes that somebody else has the object you have corrupted)."
+"Any corrupt objects you will have to find in backups or other archives (i."
+"e., you can just remove them and do an 'rsync' with some other site in the "
+"hopes that somebody else has the object you have corrupted)."
msgstr ""
#. type: Plain text
@@ -32092,8 +31954,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:119
#, no-wrap
-msgid ""
-"expect dangling commits - potential heads - due to lack of head information"
+msgid "expect dangling commits - potential heads - due to lack of head information"
msgstr ""
#. type: Plain text
@@ -32125,8 +31986,8 @@ msgstr ""
msgid ""
"The <type> object <object>, isn't actually referred to directly or "
"indirectly in any of the trees or commits seen. This can mean that there's "
-"another root node that you're not specifying or that the tree is corrupt. If"
-" you haven't missed a root node then you might as well delete unreachable "
+"another root node that you're not specifying or that the tree is corrupt. If "
+"you haven't missed a root node then you might as well delete unreachable "
"nodes since they can't be used."
msgstr ""
@@ -32139,8 +32000,7 @@ msgstr ""
#. type: Plain text
#: en/git-fsck.txt:138
msgid ""
-"The <type> object <object>, is referred to but isn't present in the "
-"database."
+"The <type> object <object>, is referred to but isn't present in the database."
msgstr ""
#. type: Labeled list
@@ -32177,7 +32037,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:151
-#, ignore-same, no-wrap
+#, no-wrap
msgid "GIT_OBJECT_DIRECTORY"
msgstr "GIT_OBJECT_DIRECTORY"
@@ -32188,7 +32048,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:154
-#, ignore-same, no-wrap
+#, no-wrap
msgid "GIT_INDEX_FILE"
msgstr "GIT_INDEX_FILE"
@@ -32199,7 +32059,7 @@ msgstr ""
#. type: Labeled list
#: en/git-fsck.txt:157
-#, ignore-same, no-wrap
+#, no-wrap
msgid "GIT_ALTERNATE_OBJECT_DIRECTORIES"
msgstr "GIT_ALTERNATE_OBJECT_DIRECTORIES"
@@ -32210,7 +32070,7 @@ msgstr ""
#. type: Title =
#: en/git-gc.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-gc(1)"
msgstr "git-gc(1)"
@@ -32222,9 +32082,7 @@ msgstr ""
#. type: Plain text
#: en/git-gc.txt:13
#, no-wrap
-msgid ""
-"'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] "
-"[--force] [--keep-largest-pack]\n"
+msgid "'git gc' [--aggressive] [--auto] [--quiet] [--prune=<date> | --no-prune] [--force] [--keep-largest-pack]\n"
msgstr ""
#. type: Plain text
@@ -32262,7 +32120,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:38 en/git-read-tree.txt:71
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--aggressive"
msgstr "--aggressive"
@@ -32278,7 +32136,7 @@ msgstr ""
#. type: Labeled list
#: en/git-gc.txt:46
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--auto"
msgstr "--auto"
@@ -32286,8 +32144,8 @@ msgstr "--auto"
#: en/git-gc.txt:53
msgid ""
"With this option, 'git gc' checks whether any housekeeping is required; if "
-"not, it exits without performing any work. Some git commands run `git gc "
-"--auto` after performing operations that could create many loose objects. "
+"not, it exits without performing any work. Some git commands run `git gc --"
+"auto` after performing operations that could create many loose objects. "
"Housekeeping is required if there are too many loose objects or too many "
"packs in the repository."
msgstr ""
@@ -32297,29 +32155,29 @@ msgstr ""
msgid ""
"If the number of loose objects exceeds the value of the `gc.auto` "
"configuration variable, then all loose objects are combined into a single "
-"pack using `git repack -d -l`. Setting the value of `gc.auto` to 0 disables"
-" automatic packing of loose objects."
+"pack using `git repack -d -l`. Setting the value of `gc.auto` to 0 disables "
+"automatic packing of loose objects."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:70
msgid ""
"If the number of packs exceeds the value of `gc.autoPackLimit`, then "
-"existing packs (except those marked with a `.keep` file or over "
-"`gc.bigPackThreshold` limit) are consolidated into a single pack by using "
-"the `-A` option of 'git repack'. If the amount of memory is estimated not "
-"enough for `git repack` to run smoothly and `gc.bigPackThreshold` is not "
-"set, the largest pack will also be excluded (this is the equivalent of "
-"running `git gc` with `--keep-base-pack`). Setting `gc.autoPackLimit` to 0 "
-"disables automatic consolidation of packs."
+"existing packs (except those marked with a `.keep` file or over `gc."
+"bigPackThreshold` limit) are consolidated into a single pack by using the `-"
+"A` option of 'git repack'. If the amount of memory is estimated not enough "
+"for `git repack` to run smoothly and `gc.bigPackThreshold` is not set, the "
+"largest pack will also be excluded (this is the equivalent of running `git "
+"gc` with `--keep-base-pack`). Setting `gc.autoPackLimit` to 0 disables "
+"automatic consolidation of packs."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:74
msgid ""
"If houskeeping is required due to many loose objects or packs, all other "
-"housekeeping tasks (e.g. rerere, working trees, reflog...) will be performed"
-" as well."
+"housekeeping tasks (e.g. rerere, working trees, reflog...) will be performed "
+"as well."
msgstr ""
#. type: Labeled list
@@ -32334,13 +32192,13 @@ msgid ""
"Prune loose objects older than date (default is 2 weeks ago, overridable by "
"the config variable `gc.pruneExpire`). --prune=all prunes loose objects "
"regardless of their age and increases the risk of corruption if another "
-"process is writing to the repository concurrently; see \"NOTES\" below. "
-"--prune is on by default."
+"process is writing to the repository concurrently; see \"NOTES\" below. --"
+"prune is on by default."
msgstr ""
#. type: Labeled list
#: en/git-gc.txt:84 en/git-pack-refs.txt:57
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-prune"
msgstr "--no-prune"
@@ -32357,13 +32215,13 @@ msgstr ""
#. type: Plain text
#: en/git-gc.txt:93
msgid ""
-"Force `git gc` to run even if there may be another `git gc` instance running"
-" on this repository."
+"Force `git gc` to run even if there may be another `git gc` instance running "
+"on this repository."
msgstr ""
#. type: Labeled list
#: en/git-gc.txt:94
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--keep-largest-pack"
msgstr "--keep-largest-pack"
@@ -32371,17 +32229,17 @@ msgstr "--keep-largest-pack"
#: en/git-gc.txt:98
msgid ""
"All packs except the largest pack and those marked with a `.keep` files are "
-"consolidated into a single pack. When this option is used, "
-"`gc.bigPackThreshold` is ignored."
+"consolidated into a single pack. When this option is used, `gc."
+"bigPackThreshold` is ignored."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:107
msgid ""
-"The optional configuration variable `gc.reflogExpire` can be set to indicate"
-" how long historical entries within each branch's reflog should remain "
-"available in this repository. The setting is expressed as a length of time,"
-" for example '90 days' or '3 months'. It defaults to '90 days'."
+"The optional configuration variable `gc.reflogExpire` can be set to indicate "
+"how long historical entries within each branch's reflog should remain "
+"available in this repository. The setting is expressed as a length of time, "
+"for example '90 days' or '3 months'. It defaults to '90 days'."
msgstr ""
#. type: Plain text
@@ -32392,8 +32250,8 @@ msgid ""
"current branch should remain available in this repository. These types of "
"entries are generally created as a result of using `git commit --amend` or "
"`git rebase` and are the commits prior to the amend or rebase occurring. "
-"Since these changes are not part of the current project most users will want"
-" to expire them sooner. This option defaults to '30 days'."
+"Since these changes are not part of the current project most users will want "
+"to expire them sooner. This option defaults to '30 days'."
msgstr ""
#. type: Plain text
@@ -32417,15 +32275,15 @@ msgstr ""
#: en/git-gc.txt:130
msgid ""
"The optional configuration variable `gc.rerereResolved` indicates how long "
-"records of conflicted merge you resolved earlier are kept. This defaults to"
-" 60 days."
+"records of conflicted merge you resolved earlier are kept. This defaults to "
+"60 days."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:134
msgid ""
-"The optional configuration variable `gc.rerereUnresolved` indicates how long"
-" records of conflicted merge you have not resolved are kept. This defaults "
+"The optional configuration variable `gc.rerereUnresolved` indicates how long "
+"records of conflicted merge you have not resolved are kept. This defaults "
"to 15 days."
msgstr ""
@@ -32433,16 +32291,16 @@ msgstr ""
#: en/git-gc.txt:139
msgid ""
"The optional configuration variable `gc.packRefs` determines if 'git gc' "
-"runs 'git pack-refs'. This can be set to \"notbare\" to enable it within all"
-" non-bare repos or it can be set to a boolean value. This defaults to true."
+"runs 'git pack-refs'. This can be set to \"notbare\" to enable it within all "
+"non-bare repos or it can be set to a boolean value. This defaults to true."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:143
msgid ""
-"The optional configuration variable `gc.writeCommitGraph` determines if 'git"
-" gc' should run 'git commit-graph write'. This can be set to a boolean "
-"value. This defaults to false."
+"The optional configuration variable `gc.writeCommitGraph` determines if 'git "
+"gc' should run 'git commit-graph write'. This can be set to a boolean value. "
+"This defaults to false."
msgstr ""
#. type: Plain text
@@ -32450,8 +32308,8 @@ msgstr ""
msgid ""
"The optional configuration variable `gc.aggressiveWindow` controls how much "
"time is spent optimizing the delta compression of the objects in the "
-"repository when the --aggressive option is specified. The larger the value,"
-" the more time is spent optimizing the delta compression. See the "
+"repository when the --aggressive option is specified. The larger the value, "
+"the more time is spent optimizing the delta compression. See the "
"documentation for the --window option in linkgit:git-repack[1] for more "
"details. This defaults to 250."
msgstr ""
@@ -32459,8 +32317,8 @@ msgstr ""
#. type: Plain text
#: en/git-gc.txt:153
msgid ""
-"Similarly, the optional configuration variable `gc.aggressiveDepth` controls"
-" --depth option in linkgit:git-repack[1]. This defaults to 50."
+"Similarly, the optional configuration variable `gc.aggressiveDepth` controls "
+"--depth option in linkgit:git-repack[1]. This defaults to 50."
msgstr ""
#. type: Plain text
@@ -32475,8 +32333,8 @@ msgstr ""
#: en/git-gc.txt:161
msgid ""
"Optional configuration variable `gc.worktreePruneExpire` controls how old a "
-"stale working tree should be before `git worktree prune` deletes it. Default"
-" is \"3 months ago\"."
+"stale working tree should be before `git worktree prune` deletes it. Default "
+"is \"3 months ago\"."
msgstr ""
#. type: Plain text
@@ -32484,23 +32342,23 @@ msgstr ""
msgid ""
"'git gc' tries very hard not to delete objects that are referenced anywhere "
"in your repository. In particular, it will keep not only objects referenced "
-"by your current set of branches and tags, but also objects referenced by the"
-" index, remote-tracking branches, refs saved by 'git filter-branch' in "
-"refs/original/, or reflogs (which may reference commits in branches that "
-"were later amended or rewound). If you are expecting some objects to be "
-"deleted and they aren't, check all of those locations and decide whether it "
-"makes sense in your case to remove those references."
+"by your current set of branches and tags, but also objects referenced by the "
+"index, remote-tracking branches, refs saved by 'git filter-branch' in refs/"
+"original/, or reflogs (which may reference commits in branches that were "
+"later amended or rewound). If you are expecting some objects to be deleted "
+"and they aren't, check all of those locations and decide whether it makes "
+"sense in your case to remove those references."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:183
msgid ""
"On the other hand, when 'git gc' runs concurrently with another process, "
-"there is a risk of it deleting an object that the other process is using but"
-" hasn't created a reference to. This may just cause the other process to "
-"fail or may corrupt the repository if the other process later adds a "
-"reference to the deleted object. Git has two features that significantly "
-"mitigate this problem:"
+"there is a risk of it deleting an object that the other process is using but "
+"hasn't created a reference to. This may just cause the other process to fail "
+"or may corrupt the repository if the other process later adds a reference to "
+"the deleted object. Git has two features that significantly mitigate this "
+"problem:"
msgstr ""
#. type: Plain text
@@ -32521,31 +32379,30 @@ msgstr ""
#: en/git-gc.txt:195
msgid ""
"However, these features fall short of a complete solution, so users who run "
-"commands concurrently have to live with some risk of corruption (which seems"
-" to be low in practice) unless they turn off automatic garbage collection "
+"commands concurrently have to live with some risk of corruption (which seems "
+"to be low in practice) unless they turn off automatic garbage collection "
"with 'git config gc.auto 0'."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:201
msgid ""
-"The 'git gc --auto' command will run the 'pre-auto-gc' hook. See "
-"linkgit:githooks[5] for more information."
+"The 'git gc --auto' command will run the 'pre-auto-gc' hook. See linkgit:"
+"githooks[5] for more information."
msgstr ""
#. type: Plain text
#: en/git-gc.txt:209
-#, ignore-same
msgid ""
-"linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] "
-"linkgit:git-rerere[1]"
+"linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-"
+"rerere[1]"
msgstr ""
-"linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] "
-"linkgit:git-rerere[1]"
+"linkgit:git-prune[1] linkgit:git-reflog[1] linkgit:git-repack[1] linkgit:git-"
+"rerere[1]"
#. type: Title =
#: en/git-get-tar-commit-id.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-get-tar-commit-id(1)"
msgstr "git-get-tar-commit-id(1)"
@@ -32575,14 +32432,14 @@ msgstr ""
#: en/git-get-tar-commit-id.txt:27
msgid ""
"If no commit ID is found, 'git get-tar-commit-id' quietly exists with a "
-"return code of 1. This can happen if the archive had not been created using"
-" 'git archive' or if the first parameter of 'git archive' had been a tree ID"
-" instead of a commit ID or tag."
+"return code of 1. This can happen if the archive had not been created using "
+"'git archive' or if the first parameter of 'git archive' had been a tree ID "
+"instead of a commit ID or tag."
msgstr ""
#. type: Title =
#: en/git-grep.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-grep(1)"
msgstr "git-grep(1)"
@@ -32622,8 +32479,8 @@ msgstr ""
msgid ""
"Look for specified patterns in the tracked files in the work tree, blobs "
"registered in the index file, or blobs in given tree objects. Patterns are "
-"lists of one or more search expressions separated by newline characters. An"
-" empty string as search expression matches all lines."
+"lists of one or more search expressions separated by newline characters. An "
+"empty string as search expression matches all lines."
msgstr ""
#. type: Labeled list
@@ -32658,8 +32515,8 @@ msgstr ""
#: en/git-grep.txt:55
msgid ""
"Set the default matching behavior. Using a value of 'basic', 'extended', "
-"'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, "
-"`--fixed-strings`, or `--perl-regexp` option accordingly, while the value "
+"'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, `--"
+"fixed-strings`, or `--perl-regexp` option accordingly, while the value "
"'default' will return to the default matching behavior."
msgstr ""
@@ -32672,8 +32529,8 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:60
msgid ""
-"If set to true, enable `--extended-regexp` option by default. This option is"
-" ignored when the `grep.patternType` option is set to a value other than "
+"If set to true, enable `--extended-regexp` option by default. This option is "
+"ignored when the `grep.patternType` option is set to a value other than "
"'default'."
msgstr ""
@@ -32686,8 +32543,8 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:64
msgid ""
-"Number of grep worker threads to use. If unset (or set to 0), 8 threads are"
-" used by default (for now)."
+"Number of grep worker threads to use. If unset (or set to 0), 8 threads are "
+"used by default (for now)."
msgstr ""
#. type: Labeled list
@@ -32728,7 +32585,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:82
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--untracked"
msgstr "--untracked"
@@ -32741,7 +32598,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:86
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-exclude-standard"
msgstr "--no-exclude-standard"
@@ -32754,7 +32611,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:90 en/git-ls-files.txt:98
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--exclude-standard"
msgstr "--exclude-standard"
@@ -32768,7 +32625,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:95 en/git-ls-files.txt:148
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--recurse-submodules"
msgstr "--recurse-submodules"
@@ -32821,8 +32678,8 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:126
msgid ""
-"For each <pathspec> given on command line, descend at most <depth> levels of"
-" directories. A value of -1 means no limit. This option is ignored if "
+"For each <pathspec> given on command line, descend at most <depth> levels of "
+"directories. A value of -1 means no limit. This option is ignored if "
"<pathspec> contains active wildcards. In other words if \"a*\" matches a "
"directory named \"a*\", \"*\" is matched literally so --max-depth is still "
"effective."
@@ -32830,7 +32687,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:128 en/git-submodule.txt:387
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--recursive"
msgstr "--recursive"
@@ -32841,7 +32698,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:131
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-recursive"
msgstr "--no-recursive"
@@ -32852,7 +32709,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:135
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--word-regexp"
msgstr "--word-regexp"
@@ -32866,7 +32723,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:141
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--invert-match"
msgstr "--invert-match"
@@ -32885,7 +32742,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:152 en/git-ls-files.txt:142 en/git-ls-tree.txt:68
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--full-name"
msgstr "--full-name"
@@ -32905,7 +32762,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:159 en/rev-list-options.txt:83
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--extended-regexp"
msgstr "--extended-regexp"
@@ -32917,7 +32774,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:161 en/rev-list-options.txt:78
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--basic-regexp"
msgstr "--basic-regexp"
@@ -32930,7 +32787,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:166 en/rev-list-options.txt:93
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--perl-regexp"
msgstr "--perl-regexp"
@@ -32955,7 +32812,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:174 en/rev-list-options.txt:88
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--fixed-strings"
msgstr "--fixed-strings"
@@ -32966,7 +32823,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:179
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--line-number"
msgstr "--line-number"
@@ -32977,7 +32834,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:182
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--column"
msgstr "--column"
@@ -32990,7 +32847,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:187
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--files-with-matches"
msgstr "--files-with-matches"
@@ -33002,7 +32859,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:190
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--files-without-match"
msgstr "--files-without-match"
@@ -33044,7 +32901,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:212
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--only-matching"
msgstr "--only-matching"
@@ -33057,7 +32914,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:217 en/rev-list-options.txt:932
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--count"
msgstr "--count"
@@ -33083,7 +32940,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:230
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--break"
msgstr "--break"
@@ -33094,7 +32951,7 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:233
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--heading"
msgstr "--heading"
@@ -33107,17 +32964,17 @@ msgstr ""
#. type: Labeled list
#: en/git-grep.txt:238
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-function"
msgstr "--show-function"
#. type: Plain text
#: en/git-grep.txt:244
msgid ""
-"Show the preceding line that contains the function name of the match, unless"
-" the matching line is a function name itself. The name is determined in the"
-" same way as 'git diff' works out patch hunk headers (see 'Defining a custom"
-" hunk-header' in linkgit:gitattributes[5])."
+"Show the preceding line that contains the function name of the match, unless "
+"the matching line is a function name itself. The name is determined in the "
+"same way as 'git diff' works out patch hunk headers (see 'Defining a custom "
+"hunk-header' in linkgit:gitattributes[5])."
msgstr ""
#. type: Labeled list
@@ -33200,8 +33057,8 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:271
msgid ""
-"Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION'"
-" for more information."
+"Number of grep worker threads to use. See `grep.threads` in 'CONFIGURATION' "
+"for more information."
msgstr ""
#. type: Labeled list
@@ -33219,25 +33076,25 @@ msgstr ""
#: en/git-grep.txt:280
msgid ""
"The next parameter is the pattern. This option has to be used for patterns "
-"starting with `-` and should be used in scripts passing user input to grep."
-" Multiple patterns are combined by 'or'."
+"starting with `-` and should be used in scripts passing user input to grep. "
+"Multiple patterns are combined by 'or'."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:281
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--and"
msgstr "--and"
#. type: Labeled list
#: en/git-grep.txt:282
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--or"
msgstr "--or"
#. type: Labeled list
#: en/git-grep.txt:283 en/git-rev-parse.txt:135 en/rev-list-options.txt:134
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--not"
msgstr "--not"
@@ -33250,14 +33107,14 @@ msgstr ""
#. type: Plain text
#: en/git-grep.txt:289
msgid ""
-"Specify how multiple patterns are combined using Boolean expressions. "
-"`--or` is the default operator. `--and` has higher precedence than `--or`."
-" `-e` has to be used for all patterns."
+"Specify how multiple patterns are combined using Boolean expressions. `--"
+"or` is the default operator. `--and` has higher precedence than `--or`. `-"
+"e` has to be used for all patterns."
msgstr ""
#. type: Labeled list
#: en/git-grep.txt:290 en/rev-list-options.txt:65
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--all-match"
msgstr "--all-match"
@@ -33353,7 +33210,7 @@ msgstr ""
#. type: Title =
#: en/git-gui.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-gui(1)"
msgstr "git-gui(1)"
@@ -33395,9 +33252,9 @@ msgid ""
msgstr ""
#. type: Title -
-#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42
-#: en/git-rerere.txt:32 en/git-shell.txt:25 en/git-submodule.txt:30
-#: en/git-svn.txt:29 en/git-worktree.txt:46
+#: en/git-gui.txt:31 en/git-p4.txt:63 en/git-remote.txt:42 en/git-rerere.txt:32
+#: en/git-shell.txt:25 en/git-submodule.txt:30 en/git-svn.txt:29
+#: en/git-worktree.txt:46
#, no-wrap
msgid "COMMANDS"
msgstr ""
@@ -33439,8 +33296,7 @@ msgstr ""
msgid ""
"Start 'git gui' and arrange to make exactly one commit before exiting and "
"returning to the shell. The interface is limited to only commit actions, "
-"slightly reducing the application's startup time and simplifying the "
-"menubar."
+"slightly reducing the application's startup time and simplifying the menubar."
msgstr ""
#. type: Labeled list
@@ -33585,8 +33441,8 @@ msgstr ""
#: en/git-gui.txt:114
msgid ""
"'git gui' is actually maintained as an independent project, but stable "
-"versions are distributed as part of the Git suite for the convenience of end"
-" users."
+"versions are distributed as part of the Git suite for the convenience of end "
+"users."
msgstr ""
#. type: Plain text
@@ -33613,15 +33469,14 @@ msgstr ""
#. type: Title =
#: en/git-hash-object.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-hash-object(1)"
msgstr "git-hash-object(1)"
#. type: Plain text
#: en/git-hash-object.txt:7
msgid ""
-"git-hash-object - Compute object ID and optionally creates a blob from a "
-"file"
+"git-hash-object - Compute object ID and optionally creates a blob from a file"
msgstr ""
#. type: Plain text
@@ -33666,7 +33521,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:37
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--stdin-paths"
msgstr "--stdin-paths"
@@ -33681,8 +33536,8 @@ msgstr ""
#: en/git-hash-object.txt:50
msgid ""
"Hash object as it were located at the given path. The location of file does "
-"not directly influence on the hash value, but path is used to determine what"
-" Git filters should be applied to the object before it can be placed to the "
+"not directly influence on the hash value, but path is used to determine what "
+"Git filters should be applied to the object before it can be placed to the "
"object database, and, as result of applying filters, the actual blob put "
"into the object database may differ from the given file. This option is "
"mainly useful for hashing temporary files located outside of the working "
@@ -33691,7 +33546,7 @@ msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:51
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-filters"
msgstr "--no-filters"
@@ -33699,14 +33554,14 @@ msgstr "--no-filters"
#: en/git-hash-object.txt:56
msgid ""
"Hash the contents as is, ignoring any input filter that would have been "
-"chosen by the attributes mechanism, including the end-of-line conversion. If"
-" the file is read from standard input then this is always implied, unless "
-"the `--path` option is given."
+"chosen by the attributes mechanism, including the end-of-line conversion. If "
+"the file is read from standard input then this is always implied, unless the "
+"`--path` option is given."
msgstr ""
#. type: Labeled list
#: en/git-hash-object.txt:57
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--literally"
msgstr "--literally"
@@ -33714,14 +33569,14 @@ msgstr "--literally"
#: en/git-hash-object.txt:62
msgid ""
"Allow `--stdin` to hash any garbage into a loose object which might not "
-"otherwise pass standard object parsing or git-fsck checks. Useful for "
-"stress-testing Git itself or reproducing characteristics of corrupt or bogus"
-" objects encountered in the wild."
+"otherwise pass standard object parsing or git-fsck checks. Useful for stress-"
+"testing Git itself or reproducing characteristics of corrupt or bogus "
+"objects encountered in the wild."
msgstr ""
#. type: Title =
#: en/git-help.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-help(1)"
msgstr "git-help(1)"
@@ -33742,8 +33597,8 @@ msgstr ""
#: en/git-help.txt:20
msgid ""
"With no options and no COMMAND or GUIDE given, the synopsis of the 'git' "
-"command and a list of the most commonly used Git commands are printed on the"
-" standard output."
+"command and a list of the most commonly used Git commands are printed on the "
+"standard output."
msgstr ""
#. type: Plain text
@@ -33756,8 +33611,8 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:26
msgid ""
-"If the option `--guide` or `-g` is given, a list of the useful Git guides is"
-" also printed on the standard output."
+"If the option `--guide` or `-g` is given, a list of the useful Git guides is "
+"also printed on the standard output."
msgstr ""
#. type: Plain text
@@ -33772,15 +33627,15 @@ msgstr ""
#: en/git-help.txt:35
msgid ""
"If an alias is given, git shows the definition of the alias on standard "
-"output. To get the manual page for the aliased command, use `git COMMAND "
-"--help`."
+"output. To get the manual page for the aliased command, use `git COMMAND --"
+"help`."
msgstr ""
#. type: Plain text
#: en/git-help.txt:38
msgid ""
-"Note that `git --help ...` is identical to `git help ...` because the former"
-" is internally converted into the latter."
+"Note that `git --help ...` is identical to `git help ...` because the former "
+"is internally converted into the latter."
msgstr ""
#. type: Plain text
@@ -33809,7 +33664,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:55
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--config"
msgstr "--config"
@@ -33822,33 +33677,33 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:60
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--guides"
msgstr "--guides"
#. type: Plain text
#: en/git-help.txt:63
msgid ""
-"Prints a list of useful guides on the standard output. This option overrides"
-" any given command or guide name."
+"Prints a list of useful guides on the standard output. This option overrides "
+"any given command or guide name."
msgstr ""
#. type: Labeled list
#: en/git-help.txt:65
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--info"
msgstr "--info"
#. type: Plain text
#: en/git-help.txt:68
msgid ""
-"Display manual page for the command in the 'info' format. The 'info' program"
-" will be used for that purpose."
+"Display manual page for the command in the 'info' format. The 'info' program "
+"will be used for that purpose."
msgstr ""
#. type: Labeled list
#: en/git-help.txt:70
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--man"
msgstr "--man"
@@ -33869,7 +33724,7 @@ msgstr ""
#. type: Labeled list
#: en/git-help.txt:80
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--web"
msgstr "--web"
@@ -33883,11 +33738,11 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:89
msgid ""
-"The web browser can be specified using the configuration variable "
-"`help.browser`, or `web.browser` if the former is not set. If none of these "
-"config variables is set, the 'git web{litdd}browse' helper script (called by"
-" 'git help') will pick a suitable default. See linkgit:git-"
-"web{litdd}browse[1] for more information about this."
+"The web browser can be specified using the configuration variable `help."
+"browser`, or `web.browser` if the former is not set. If none of these config "
+"variables is set, the 'git web{litdd}browse' helper script (called by 'git "
+"help') will pick a suitable default. See linkgit:git-web{litdd}browse[1] for "
+"more information about this."
msgstr ""
#. type: Title -
@@ -33899,7 +33754,7 @@ msgstr ""
#. type: Title ~
#: en/git-help.txt:94
-#, ignore-same, no-wrap
+#, no-wrap
msgid "help.format"
msgstr "help.format"
@@ -33977,8 +33832,8 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:127
msgid ""
-"Values for other tools can be used if there is a corresponding "
-"`man.<tool>.cmd` configuration entry (see below)."
+"Values for other tools can be used if there is a corresponding `man.<tool>."
+"cmd` configuration entry (see below)."
msgstr ""
#. type: Plain text
@@ -34014,8 +33869,8 @@ msgstr ""
#: en/git-help.txt:146
msgid ""
"If everything fails, or if no viewer is configured, the viewer specified in "
-"the `GIT_MAN_VIEWER` environment variable will be tried. If that fails too,"
-" the 'man' program will be tried anyway."
+"the `GIT_MAN_VIEWER` environment variable will be tried. If that fails too, "
+"the 'man' program will be tried anyway."
msgstr ""
#. type: Title ~
@@ -34058,8 +33913,8 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:172
msgid ""
-"When 'konqueror' is specified in the `man.viewer` configuration variable, we"
-" launch 'kfmclient' to try to open the man page on an already opened "
+"When 'konqueror' is specified in the `man.viewer` configuration variable, we "
+"launch 'kfmclient' to try to open the man page on an already opened "
"konqueror in a new tab if possible."
msgstr ""
@@ -34103,8 +33958,8 @@ msgstr ""
#. type: Plain text
#: en/git-help.txt:193
msgid ""
-"Note that all these configuration variables should probably be set using the"
-" `--global` flag, for example like this:"
+"Note that all these configuration variables should probably be set using the "
+"`--global` flag, for example like this:"
msgstr ""
#. type: delimited block -
@@ -34124,7 +33979,7 @@ msgstr ""
#. type: Title =
#: en/git-http-backend.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-http-backend(1)"
msgstr "git-http-backend(1)"
@@ -34144,8 +33999,8 @@ msgstr ""
msgid ""
"A simple CGI program to serve the contents of a Git repository to Git "
"clients accessing the repository over http:// and https:// protocols. The "
-"program supports clients fetching using both the smart HTTP protocol and the"
-" backwards-compatible dumb HTTP protocol, as well as clients pushing using "
+"program supports clients fetching using both the smart HTTP protocol and the "
+"backwards-compatible dumb HTTP protocol, as well as clients pushing using "
"the smart HTTP protocol."
msgstr ""
@@ -34162,8 +34017,8 @@ msgstr ""
#: en/git-http-backend.txt:31
msgid ""
"By default, only the `upload-pack` service is enabled, which serves 'git "
-"fetch-pack' and 'git ls-remote' clients, which are invoked from 'git fetch',"
-" 'git pull', and 'git clone'. If the client is authenticated, the `receive-"
+"fetch-pack' and 'git ls-remote' clients, which are invoked from 'git fetch', "
+"'git pull', and 'git clone'. If the client is authenticated, the `receive-"
"pack` service is enabled, which serves 'git send-pack' clients, which is "
"invoked from 'git push'."
msgstr ""
@@ -34185,10 +34040,10 @@ msgstr ""
#: en/git-http-backend.txt:44
msgid ""
"This serves Git clients older than version 1.6.6 that are unable to use the "
-"upload pack service. When enabled, clients are able to read any file within"
-" the repository, including objects that are no longer reachable from a "
-"branch but are still present. It is enabled by default, but a repository "
-"can disable it by setting this configuration item to `false`."
+"upload pack service. When enabled, clients are able to read any file within "
+"the repository, including objects that are no longer reachable from a branch "
+"but are still present. It is enabled by default, but a repository can "
+"disable it by setting this configuration item to `false`."
msgstr ""
#. type: Labeled list
@@ -34230,8 +34085,8 @@ msgstr ""
#: en/git-http-backend.txt:65
msgid ""
"To determine the location of the repository on disk, 'git http-backend' "
-"concatenates the environment variables PATH_INFO, which is set automatically"
-" by the web server, and GIT_PROJECT_ROOT, which must be set manually in the "
+"concatenates the environment variables PATH_INFO, which is set automatically "
+"by the web server, and GIT_PROJECT_ROOT, which must be set manually in the "
"web server configuration. If GIT_PROJECT_ROOT is not set, 'git http-"
"backend' reads PATH_TRANSLATED, which is also set automatically by the web "
"server."
@@ -34240,8 +34095,8 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:70
msgid ""
-"All of the following examples map `http://$hostname/git/foo/bar.git` to "
-"`/var/www/git/foo/bar.git`."
+"All of the following examples map `http://$hostname/git/foo/bar.git` to `/"
+"var/www/git/foo/bar.git`."
msgstr ""
#. type: Labeled list
@@ -34253,8 +34108,8 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:75
msgid ""
-"Ensure mod_cgi, mod_alias, and mod_env are enabled, set GIT_PROJECT_ROOT (or"
-" DocumentRoot) appropriately, and create a ScriptAlias to the CGI:"
+"Ensure mod_cgi, mod_alias, and mod_env are enabled, set GIT_PROJECT_ROOT (or "
+"DocumentRoot) appropriately, and create a ScriptAlias to the CGI:"
msgstr ""
#. type: delimited block -
@@ -34328,13 +34183,13 @@ msgstr ""
#: en/git-http-backend.txt:125
msgid ""
"In this mode, the server will not request authentication until the client "
-"actually starts the object negotiation phase of the push, rather than during"
-" the initial contact. For this reason, you must also enable the "
-"`http.receivepack` config option in any repositories that should accept a "
-"push. The default behavior, if `http.receivepack` is not set, is to reject "
-"any pushes by unauthenticated users; the initial request will therefore "
-"report `403 Forbidden` to the client, without even giving an opportunity for"
-" authentication."
+"actually starts the object negotiation phase of the push, rather than during "
+"the initial contact. For this reason, you must also enable the `http."
+"receivepack` config option in any repositories that should accept a push. "
+"The default behavior, if `http.receivepack` is not set, is to reject any "
+"pushes by unauthenticated users; the initial request will therefore report "
+"`403 Forbidden` to the client, without even giving an opportunity for "
+"authentication."
msgstr ""
#. type: Plain text
@@ -34407,8 +34262,8 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:168
msgid ""
-"Similar to the above, but Apache can be used to return static files that are"
-" stored on disk.\tOn many systems this may be more efficient as Apache can "
+"Similar to the above, but Apache can be used to return static files that are "
+"stored on disk.\tOn many systems this may be more efficient as Apache can "
"ask the kernel to copy the file contents from the file system directly to "
"the network:"
msgstr ""
@@ -34574,13 +34429,13 @@ msgstr ""
#. type: Plain text
#: en/git-http-backend.txt:266
msgid ""
-"The `GIT_HTTP_MAX_REQUEST_BUFFER` environment variable (or the "
-"`http.maxRequestBuffer` config variable) may be set to change the largest "
-"ref negotiation request that git will handle during a fetch; any fetch "
-"requiring a larger buffer will not succeed. This value should not normally "
-"need to be changed, but may be helpful if you are fetching from a repository"
-" with an extremely large number of refs. The value can be specified with a "
-"unit (e.g., `100M` for 100 megabytes). The default is 10 megabytes."
+"The `GIT_HTTP_MAX_REQUEST_BUFFER` environment variable (or the `http."
+"maxRequestBuffer` config variable) may be set to change the largest ref "
+"negotiation request that git will handle during a fetch; any fetch requiring "
+"a larger buffer will not succeed. This value should not normally need to be "
+"changed, but may be helpful if you are fetching from a repository with an "
+"extremely large number of refs. The value can be specified with a unit (e."
+"g., `100M` for 100 megabytes). The default is 10 megabytes."
msgstr ""
#. type: Plain text
@@ -34601,7 +34456,7 @@ msgstr ""
#. type: Title =
#: en/git-http-fetch.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-http-fetch(1)"
msgstr "git-http-fetch(1)"
@@ -34613,9 +34468,7 @@ msgstr ""
#. type: Plain text
#: en/git-http-fetch.txt:13
#, no-wrap
-msgid ""
-"'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] "
-"[--stdin] <commit> <url>\n"
+msgid "'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin] <commit> <url>\n"
msgstr ""
#. type: Plain text
@@ -34626,8 +34479,8 @@ msgstr ""
#. type: Plain text
#: en/git-http-fetch.txt:21
msgid ""
-"This command always gets all objects. Historically, there were three options"
-" `-a`, `-c` and `-t` for choosing which objects to download. They are now "
+"This command always gets all objects. Historically, there were three options "
+"`-a`, `-c` and `-t` for choosing which objects to download. They are now "
"silently ignored."
msgstr ""
@@ -34667,8 +34520,8 @@ msgstr ""
#. type: Plain text
#: en/git-http-fetch.txt:36
msgid ""
-"Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on the"
-" local end after the transfer is complete."
+"Writes the commit-id into the filename under $GIT_DIR/refs/<filename> on the "
+"local end after the transfer is complete."
msgstr ""
#. type: Plain text
@@ -34686,7 +34539,7 @@ msgstr ""
#. type: Labeled list
#: en/git-http-fetch.txt:43
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--recover"
msgstr "--recover"
@@ -34699,7 +34552,7 @@ msgstr ""
#. type: Title =
#: en/git-http-push.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-http-push(1)"
msgstr "git-http-push(1)"
@@ -34711,9 +34564,7 @@ msgstr ""
#. type: Plain text
#: en/git-http-push.txt:13
#, no-wrap
-msgid ""
-"'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> "
-"[<ref>...]\n"
+msgid "'git http-push' [--all] [--dry-run] [--force] [--verbose] <url> <ref> [<ref>...]\n"
msgstr ""
#. type: Plain text
@@ -34735,8 +34586,8 @@ msgstr ""
#: en/git-http-push.txt:29
msgid ""
"Do not assume that the remote repository is complete in its current state, "
-"and verify all objects in the entire local ref's history exist in the remote"
-" repository."
+"and verify all objects in the entire local ref's history exist in the remote "
+"repository."
msgstr ""
#. type: Plain text
@@ -34763,8 +34614,8 @@ msgstr ""
#: en/git-http-push.txt:49
msgid ""
"Remove <ref> from remote repository. The specified branch cannot be the "
-"remote HEAD. If -d is specified the following other conditions must also be"
-" met:"
+"remote HEAD. If -d is specified the following other conditions must also be "
+"met:"
msgstr ""
#. type: Plain text
@@ -34804,8 +34655,8 @@ msgstr ""
msgid ""
"A '<ref>' specification can be either a single pattern, or a pair of such "
"patterns separated by a colon \":\" (this means that a ref name cannot have "
-"a colon in it). A single pattern '<name>' is just a shorthand for "
-"'<name>:<name>'."
+"a colon in it). A single pattern '<name>' is just a shorthand for '<name>:"
+"<name>'."
msgstr ""
#. type: Plain text
@@ -34848,8 +34699,8 @@ msgid ""
"Without `--force`, the <src> ref is stored at the remote only if <dst> does "
"not exist, or <dst> is a proper subset (i.e. an ancestor) of <src>. This "
"check, known as \"fast-forward check\", is performed in order to avoid "
-"accidentally overwriting the remote ref and lose other peoples' commits from"
-" there."
+"accidentally overwriting the remote ref and lose other peoples' commits from "
+"there."
msgstr ""
#. type: Plain text
@@ -34866,7 +34717,7 @@ msgstr ""
#. type: Title =
#: en/git-imap-send.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-imap-send(1)"
msgstr "git-imap-send(1)"
@@ -34887,8 +34738,8 @@ msgstr ""
msgid ""
"This command uploads a mailbox generated with 'git format-patch' into an "
"IMAP drafts folder. This allows patches to be sent as other email is when "
-"using mail clients that cannot read mailbox files directly. The command also"
-" works with any general mailbox in which emails have the fields \"From\", "
+"using mail clients that cannot read mailbox files directly. The command also "
+"works with any general mailbox in which emails have the fields \"From\", "
"\"Date\", and \"Subject\" in that order."
msgstr ""
@@ -34909,7 +34760,7 @@ msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:40
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--curl"
msgstr "--curl"
@@ -34922,7 +34773,7 @@ msgstr ""
#. type: Labeled list
#: en/git-imap-send.txt:45
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-curl"
msgstr "--no-curl"
@@ -34936,8 +34787,8 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:56
msgid ""
-"To use the tool, imap.folder and either imap.tunnel or imap.host must be set"
-" to appropriate values."
+"To use the tool, imap.folder and either imap.tunnel or imap.host must be set "
+"to appropriate values."
msgstr ""
#. type: Plain text
@@ -34991,8 +34842,8 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:100
msgid ""
-"To submit patches using GMail's IMAP interface, first, edit your "
-"~/.gitconfig to specify your account settings:"
+"To submit patches using GMail's IMAP interface, first, edit your ~/."
+"gitconfig to specify your account settings:"
msgstr ""
#. type: delimited block -
@@ -35022,9 +34873,7 @@ msgstr ""
#. type: Plain text
#: en/git-imap-send.txt:116
#, no-wrap
-msgid ""
-" $ git format-patch --cover-letter -M --stdout origin/master | git imap-"
-"send\n"
+msgid " $ git format-patch --cover-letter -M --stdout origin/master | git imap-send\n"
msgstr ""
#. type: Plain text
@@ -35046,9 +34895,9 @@ msgstr ""
msgid ""
"It is still your responsibility to make sure that the email message sent by "
"your email program meets the standards of your project. Many projects do "
-"not like patches to be attached. Some mail agents will transform patches "
-"(e.g. wrap lines, send them as format=flowed) in ways that make them fail. "
-"You will get angry flames ridiculing you if you don't check this."
+"not like patches to be attached. Some mail agents will transform patches (e."
+"g. wrap lines, send them as format=flowed) in ways that make them fail. You "
+"will get angry flames ridiculing you if you don't check this."
msgstr ""
#. type: Plain text
@@ -35067,7 +34916,7 @@ msgstr ""
#. type: Title =
#: en/git-index-pack.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-index-pack(1)"
msgstr "git-index-pack(1)"
@@ -35107,8 +34956,8 @@ msgstr ""
#. type: Plain text
#: en/git-index-pack.txt:37
msgid ""
-"Write the generated pack index into the specified file. Without this option"
-" the name of pack index file is constructed from the name of packed archive "
+"Write the generated pack index into the specified file. Without this option "
+"the name of pack index file is constructed from the name of packed archive "
"file by replacing .pack with .idx (and the program fails if the name of "
"packed archive does not end with .pack)."
msgstr ""
@@ -35117,8 +34966,8 @@ msgstr ""
#: en/git-index-pack.txt:47
msgid ""
"When this flag is provided, the pack is read from stdin instead and a copy "
-"is then written to <pack-file>. If <pack-file> is not specified, the pack is"
-" written to objects/pack/ directory of the current Git repository with a "
+"is then written to <pack-file>. If <pack-file> is not specified, the pack is "
+"written to objects/pack/ directory of the current Git repository with a "
"default name determined from the pack content. If <pack-file> is not "
"specified consider using --keep to prevent a race condition between this "
"process and 'git repack'."
@@ -35126,7 +34975,7 @@ msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:48
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--fix-thin"
msgstr "--fix-thin"
@@ -35143,9 +34992,9 @@ msgstr ""
#: en/git-index-pack.txt:61
msgid ""
"Before moving the index into its final destination create an empty .keep "
-"file for the associated pack file. This option is usually necessary with "
-"--stdin to prevent a simultaneous 'git repack' process from deleting the "
-"newly constructed pack and index before refs can be updated to use objects "
+"file for the associated pack file. This option is usually necessary with --"
+"stdin to prevent a simultaneous 'git repack' process from deleting the newly "
+"constructed pack and index before refs can be updated to use objects "
"contained in the pack."
msgstr ""
@@ -35160,8 +35009,8 @@ msgstr ""
msgid ""
"Like --keep create a .keep file before moving the index into its final "
"destination, but rather than creating an empty file place '<msg>' followed "
-"by an LF into the .keep file. The '<msg>' message can later be searched for"
-" within all .keep files to locate any which have outlived their usefulness."
+"by an LF into the .keep file. The '<msg>' message can later be searched for "
+"within all .keep files to locate any which have outlived their usefulness."
msgstr ""
#. type: Labeled list
@@ -35190,7 +35039,7 @@ msgstr ""
#. type: Labeled list
#: en/git-index-pack.txt:80
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--fsck-objects"
msgstr "--fsck-objects"
@@ -35249,7 +35098,7 @@ msgstr ""
#. type: Title =
#: en/git-init-db.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-init-db(1)"
msgstr "git-init-db(1)"
@@ -35261,9 +35110,7 @@ msgstr ""
#. type: Plain text
#: en/git-init-db.txt:13
#, no-wrap
-msgid ""
-"'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] "
-"[--separate-git-dir <git dir>] [--shared[=<permissions>]]\n"
+msgid "'git init-db' [-q | --quiet] [--bare] [--template=<template_directory>] [--separate-git-dir <git dir>] [--shared[=<permissions>]]\n"
msgstr ""
#. type: Plain text
@@ -35275,7 +35122,7 @@ msgstr ""
#. type: Title =
#: en/git-init.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-init(1)"
msgstr "git-init(1)"
@@ -35299,8 +35146,8 @@ msgstr ""
msgid ""
"This command creates an empty Git repository - basically a `.git` directory "
"with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template "
-"files. An initial `HEAD` file that references the HEAD of the master branch"
-" is also created."
+"files. An initial `HEAD` file that references the HEAD of the master branch "
+"is also created."
msgstr ""
#. type: Plain text
@@ -35313,8 +35160,8 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:32
msgid ""
-"If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY`"
-" environment variable then the sha1 directories are created underneath - "
+"If the object storage directory is specified via the `$GIT_OBJECT_DIRECTORY` "
+"environment variable then the sha1 directories are created underneath - "
"otherwise the default `$GIT_DIR/objects` directory is used."
msgstr ""
@@ -35372,10 +35219,10 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:73
msgid ""
-"Specify that the Git repository is to be shared amongst several users. This"
-" allows users belonging to the same group to push into that repository. "
-"When specified, the config variable \"core.sharedRepository\" is set so that"
-" files and directories under `$GIT_DIR` are created with the requested "
+"Specify that the Git repository is to be shared amongst several users. This "
+"allows users belonging to the same group to push into that repository. When "
+"specified, the config variable \"core.sharedRepository\" is set so that "
+"files and directories under `$GIT_DIR` are created with the requested "
"permissions. When not specified, Git will use permissions reported by "
"umask(2)."
msgstr ""
@@ -35469,8 +35316,8 @@ msgstr ""
#. type: Plain text
#: en/git-init.txt:117
msgid ""
-"Files and directories in the template directory whose name do not start with"
-" a dot will be copied to the `$GIT_DIR` after it is created."
+"Files and directories in the template directory whose name do not start with "
+"a dot will be copied to the `$GIT_DIR` after it is created."
msgstr ""
#. type: Plain text
@@ -35550,7 +35397,7 @@ msgstr ""
#. type: Title =
#: en/git-instaweb.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-instaweb(1)"
msgstr "git-instaweb(1)"
@@ -35582,7 +35429,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:28
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--httpd"
msgstr "--httpd"
@@ -35591,26 +35438,26 @@ msgstr "--httpd"
msgid ""
"The HTTP daemon command-line that will be executed. Command-line options "
"may be specified here, and the configuration file will be added at the end "
-"of the command-line. Currently apache2, lighttpd, mongoose, plackup, python"
-" and webrick are supported. (Default: lighttpd)"
+"of the command-line. Currently apache2, lighttpd, mongoose, plackup, python "
+"and webrick are supported. (Default: lighttpd)"
msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:37
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--module-path"
msgstr "--module-path"
#. type: Plain text
#: en/git-instaweb.txt:40
msgid ""
-"The module path (only needed if httpd is Apache). (Default: "
-"/usr/lib/apache2/modules)"
+"The module path (only needed if httpd is Apache). (Default: /usr/lib/"
+"apache2/modules)"
msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:42
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--port"
msgstr "--port"
@@ -35621,7 +35468,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:46
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--browser"
msgstr "--browser"
@@ -35629,8 +35476,8 @@ msgstr "--browser"
#: en/git-instaweb.txt:52
msgid ""
"The web browser that should be used to view the gitweb page. This will be "
-"passed to the 'git web{litdd}browse' helper script along with the URL of the"
-" gitweb instance. See linkgit:git-web{litdd}browse[1] for more information "
+"passed to the 'git web{litdd}browse' helper script along with the URL of the "
+"gitweb instance. See linkgit:git-web{litdd}browse[1] for more information "
"about this. If the script fails, the URL will be printed to stdout."
msgstr ""
@@ -35642,7 +35489,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:54
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--start"
msgstr "--start"
@@ -35661,7 +35508,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:59
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--stop"
msgstr "--stop"
@@ -35681,7 +35528,7 @@ msgstr ""
#. type: Labeled list
#: en/git-instaweb.txt:65
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--restart"
msgstr "--restart"
@@ -35719,7 +35566,7 @@ msgstr ""
#. type: Title =
#: en/git-interpret-trailers.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-interpret-trailers(1)"
msgstr "git-interpret-trailers(1)"
@@ -35741,8 +35588,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:19
msgid ""
-"Help parsing or adding 'trailers' lines, that look similar to RFC 822 e-mail"
-" headers, at the end of the otherwise free-form part of a commit message."
+"Help parsing or adding 'trailers' lines, that look similar to RFC 822 e-mail "
+"headers, at the end of the otherwise free-form part of a commit message."
msgstr ""
#. type: Plain text
@@ -35757,8 +35604,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:27
msgid ""
"Otherwise, this command applies the arguments passed using the `--trailer` "
-"option, if any, to the commit message part of each input file. The result is"
-" emitted on the standard output."
+"option, if any, to the commit message part of each input file. The result is "
+"emitted on the standard output."
msgstr ""
#. type: Plain text
@@ -35773,8 +35620,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:39
msgid ""
-"By default, a '<token>=<value>' or '<token>:<value>' argument given using "
-"`--trailer` will be appended after the existing trailers only if the last "
+"By default, a '<token>=<value>' or '<token>:<value>' argument given using `--"
+"trailer` will be appended after the existing trailers only if the last "
"trailer has a different (<token>, <value>) pair (or if there is no existing "
"trailer). The <token> and <value> parts will be trimmed to remove starting "
"and trailing whitespace, and the resulting trimmed <token> and <value> will "
@@ -35798,8 +35645,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:52
msgid ""
"By default the new trailer will appear at the end of all the existing "
-"trailers. If there is no existing trailer, the new trailer will appear after"
-" the commit message part of the output, and, if there is no line with only "
+"trailers. If there is no existing trailer, the new trailer will appear after "
+"the commit message part of the output, and, if there is no line with only "
"spaces at the end of the commit message part, one blank line will be added "
"before the new trailer."
msgstr ""
@@ -35812,9 +35659,9 @@ msgid ""
"least one Git-generated or user-configured trailer and consists of at least "
"25% trailers. The group must be preceded by one or more empty (or "
"whitespace-only) lines. The group must either be at the end of the message "
-"or be the last non-whitespace lines before a line that starts with '---' "
-"(followed by a space or the end of the line). Such three minus signs start "
-"the patch part of the message. See also `--no-divider` below."
+"or be the last non-whitespace lines before a line that starts with "
+"'---' (followed by a space or the end of the line). Such three minus signs "
+"start the patch part of the message. See also `--no-divider` below."
msgstr ""
#. type: Plain text
@@ -35829,14 +35676,14 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:71
msgid ""
-"Note that 'trailers' do not follow and are not intended to follow many rules"
-" for RFC 822 headers. For example they do not follow the encoding rules and "
+"Note that 'trailers' do not follow and are not intended to follow many rules "
+"for RFC 822 headers. For example they do not follow the encoding rules and "
"probably many other rules."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:74
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--in-place"
msgstr "--in-place"
@@ -35847,7 +35694,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:77
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--trim-empty"
msgstr "--trim-empty"
@@ -35868,8 +35715,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:86
msgid ""
-"Specify a (<token>, <value>) pair that should be applied as a trailer to the"
-" input messages. See the description of this command."
+"Specify a (<token>, <value>) pair that should be applied as a trailer to the "
+"input messages. See the description of this command."
msgstr ""
#. type: Labeled list
@@ -35880,7 +35727,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:88
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-where"
msgstr "--no-where"
@@ -35901,7 +35748,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:96
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-if-exists"
msgstr "--no-if-exists"
@@ -35909,11 +35756,11 @@ msgstr "--no-if-exists"
#: en/git-interpret-trailers.txt:103
msgid ""
"Specify what action will be performed when there is already at least one "
-"trailer with the same <token> in the message. A setting provided with '--"
-"if-exists' overrides all configuration variables and applies to all '--"
-"trailer' options until the next occurrence of '--if-exists' or '--no-if-"
-"exists'. Possible actions are `addIfDifferent`, `addIfDifferentNeighbor`, "
-"`add`, `replace` and `doNothing`."
+"trailer with the same <token> in the message. A setting provided with '--if-"
+"exists' overrides all configuration variables and applies to all '--trailer' "
+"options until the next occurrence of '--if-exists' or '--no-if-exists'. "
+"Possible actions are `addIfDifferent`, `addIfDifferentNeighbor`, `add`, "
+"`replace` and `doNothing`."
msgstr ""
#. type: Labeled list
@@ -35924,7 +35771,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:105
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-if-missing"
msgstr "--no-if-missing"
@@ -35933,14 +35780,14 @@ msgstr "--no-if-missing"
msgid ""
"Specify what action will be performed when there is no other trailer with "
"the same <token> in the message. A setting provided with '--if-missing' "
-"overrides all configuration variables and applies to all '--trailer' options"
-" until the next occurrence of '--if-missing' or '--no-if-missing'. Possible "
+"overrides all configuration variables and applies to all '--trailer' options "
+"until the next occurrence of '--if-missing' or '--no-if-missing'. Possible "
"actions are `doNothing` or `add`."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:113
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--only-trailers"
msgstr "--only-trailers"
@@ -35951,7 +35798,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:116
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--only-input"
msgstr "--only-input"
@@ -35964,20 +35811,20 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:121
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--unfold"
msgstr "--unfold"
#. type: Plain text
#: en/git-interpret-trailers.txt:124
msgid ""
-"Remove any whitespace-continuation in trailers, so that each trailer appears"
-" on a line by itself with its full content."
+"Remove any whitespace-continuation in trailers, so that each trailer appears "
+"on a line by itself with its full content."
msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:125
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--parse"
msgstr "--parse"
@@ -35988,7 +35835,7 @@ msgstr ""
#. type: Labeled list
#: en/git-interpret-trailers.txt:129
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-divider"
msgstr "--no-divider"
@@ -36028,9 +35875,9 @@ msgid ""
"For example, if the value for this option is \"%=$\", then only lines using "
"the format '<token><sep><value>' with <sep> containing '%', '=' or '$' and "
"then spaces will be considered trailers. And '%' will be the default "
-"separator used, so by default trailers will appear like: '<token>% <value>' "
-"(one percent sign and one space will appear between the token and the "
-"value)."
+"separator used, so by default trailers will appear like: '<token>% "
+"<value>' (one percent sign and one space will appear between the token and "
+"the value)."
msgstr ""
#. type: Labeled list
@@ -36052,15 +35899,15 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:161
msgid ""
-"If it is `end`, then each new trailer will appear at the end of the existing"
-" trailers."
+"If it is `end`, then each new trailer will appear at the end of the existing "
+"trailers."
msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:164
msgid ""
-"If it is `start`, then each new trailer will appear at the start, instead of"
-" the end, of the existing trailers."
+"If it is `start`, then each new trailer will appear at the start, instead of "
+"the end, of the existing trailers."
msgstr ""
#. type: Plain text
@@ -36115,8 +35962,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:188
msgid ""
-"With `add`, a new trailer will be added, even if some trailers with the same"
-" (<token>, <value>) pair are already in the message."
+"With `add`, a new trailer will be added, even if some trailers with the same "
+"(<token>, <value>) pair are already in the message."
msgstr ""
#. type: Plain text
@@ -36130,8 +35977,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:196
msgid ""
-"With `doNothing`, nothing will be done; that is no new trailer will be added"
-" if there is already one with the same <token> in the message."
+"With `doNothing`, nothing will be done; that is no new trailer will be added "
+"if there is already one with the same <token> in the message."
msgstr ""
#. type: Labeled list
@@ -36175,8 +36022,8 @@ msgstr ""
msgid ""
"This `key` will be used instead of <token> in the trailer. At the end of "
"this key, a separator can appear and then some space characters. By default "
-"the only valid separator is ':', but this can be changed using the "
-"`trailer.separators` config variable."
+"the only valid separator is ':', but this can be changed using the `trailer."
+"separators` config variable."
msgstr ""
#. type: Plain text
@@ -36196,8 +36043,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:223
msgid ""
"This option takes the same values as the 'trailer.where' configuration "
-"variable and it overrides what is specified by that option for trailers with"
-" the specified <token>."
+"variable and it overrides what is specified by that option for trailers with "
+"the specified <token>."
msgstr ""
#. type: Labeled list
@@ -36210,8 +36057,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:228
msgid ""
"This option takes the same values as the 'trailer.ifexists' configuration "
-"variable and it overrides what is specified by that option for trailers with"
-" the specified <token>."
+"variable and it overrides what is specified by that option for trailers with "
+"the specified <token>."
msgstr ""
#. type: Labeled list
@@ -36224,8 +36071,8 @@ msgstr ""
#: en/git-interpret-trailers.txt:233
msgid ""
"This option takes the same values as the 'trailer.ifmissing' configuration "
-"variable and it overrides what is specified by that option for trailers with"
-" the specified <token>."
+"variable and it overrides what is specified by that option for trailers with "
+"the specified <token>."
msgstr ""
#. type: Labeled list
@@ -36253,8 +36100,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:248
msgid ""
-"If the command contains the `$ARG` string, this string will be replaced with"
-" the <value> part of an existing trailer with the same <token>, if any, "
+"If the command contains the `$ARG` string, this string will be replaced with "
+"the <value> part of an existing trailer with the same <token>, if any, "
"before the command is launched."
msgstr ""
@@ -36357,8 +36204,8 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:307
msgid ""
-"Configure a 'sign' trailer with a command to automatically add a 'Signed-"
-"off-by: ' with the author information only if there is no 'Signed-off-by: ' "
+"Configure a 'sign' trailer with a command to automatically add a 'Signed-off-"
+"by: ' with the author information only if there is no 'Signed-off-by: ' "
"already, and show how it works:"
msgstr ""
@@ -36478,7 +36325,6 @@ msgstr ""
#. type: Plain text
#: en/git-interpret-trailers.txt:387
-#, ignore-same
msgid ""
"linkgit:git-commit[1], linkgit:git-format-patch[1], linkgit:git-config[1]"
msgstr ""
@@ -36486,7 +36332,7 @@ msgstr ""
#. type: Title =
#: en/git-log.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-log(1)"
msgstr "git-log(1)"
@@ -36516,7 +36362,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:27
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--follow"
msgstr "--follow"
@@ -36529,7 +36375,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:31
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-decorate"
msgstr "--no-decorate"
@@ -36543,10 +36389,10 @@ msgstr ""
#: en/git-log.txt:40
msgid ""
"Print out the ref names of any commits that are shown. If 'short' is "
-"specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and "
-"'refs/remotes/' will not be printed. If 'full' is specified, the full ref "
-"name (including prefix) will be printed. If 'auto' is specified, then if the"
-" output is going to a terminal, the ref names are shown as if 'short' were "
+"specified, the ref name prefixes 'refs/heads/', 'refs/tags/' and 'refs/"
+"remotes/' will not be printed. If 'full' is specified, the full ref name "
+"(including prefix) will be printed. If 'auto' is specified, then if the "
+"output is going to a terminal, the ref names are shown as if 'short' were "
"given, otherwise no ref names are shown. The default option is 'short'."
msgstr ""
@@ -36565,15 +36411,15 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:47
msgid ""
-"If no `--decorate-refs` is given, pretend as if all refs were included. For"
-" each candidate, do not use it for decoration if it matches any patterns "
+"If no `--decorate-refs` is given, pretend as if all refs were included. For "
+"each candidate, do not use it for decoration if it matches any patterns "
"given to `--decorate-refs-exclude` or if it doesn't match any of the "
"patterns given to `--decorate-refs`."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:48
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--source"
msgstr "--source"
@@ -36586,7 +36432,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:52
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--use-mailmap"
msgstr "--use-mailmap"
@@ -36599,7 +36445,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:57
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--full-diff"
msgstr "--full-diff"
@@ -36622,7 +36468,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:67
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--log-size"
msgstr "--log-size"
@@ -36630,8 +36476,8 @@ msgstr "--log-size"
#: en/git-log.txt:72
msgid ""
"Include a line ``log size <number>'' in the output for each commit, where "
-"<number> is the length of that commit's message in bytes. Intended to speed"
-" up tools that read log messages from `git log` output by allowing them to "
+"<number> is the length of that commit's message in bytes. Intended to speed "
+"up tools that read log messages from `git log` output by allowing them to "
"allocate space in advance."
msgstr ""
@@ -36666,11 +36512,11 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:92
msgid ""
-"Show only commits in the specified revision range. When no <revision range>"
-" is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
+"Show only commits in the specified revision range. When no <revision range> "
+"is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
"current commit). `origin..HEAD` specifies all the commits reachable from "
-"the current commit (i.e. `HEAD`), but not from `origin`. For a complete list"
-" of ways to spell <revision range>, see the 'Specifying Ranges' section of "
+"the current commit (i.e. `HEAD`), but not from `origin`. For a complete list "
+"of ways to spell <revision range>, see the 'Specifying Ranges' section of "
"linkgit:gitrevisions[7]."
msgstr ""
@@ -36691,8 +36537,8 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:101 en/git-shortlog.txt:78
msgid ""
-"Paths may need to be prefixed with `--` to separate them from options or the"
-" revision range, when confusion arises."
+"Paths may need to be prefixed with `--` to separate them from options or the "
+"revision range, when confusion arises."
msgstr ""
#. type: Title -
@@ -36747,8 +36593,8 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:136
msgid ""
-"Show the commits that are in the \"test\" branch but not yet in the "
-"\"release\" branch, along with the list of paths each commit modifies."
+"Show the commits that are in the \"test\" branch but not yet in the \"release"
+"\" branch, along with the list of paths each commit modifies."
msgstr ""
#. type: Labeled list
@@ -36760,8 +36606,8 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:142
msgid ""
-"Shows the commits that changed `builtin/rev-list.c`, including those commits"
-" that occurred before the file was given its present name."
+"Shows the commits that changed `builtin/rev-list.c`, including those commits "
+"that occurred before the file was given its present name."
msgstr ""
#. type: Labeled list
@@ -36773,8 +36619,8 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:148
msgid ""
-"Shows all commits that are in any of local branches but not in any of "
-"remote-tracking branches for 'origin' (what you have that origin doesn't)."
+"Shows all commits that are in any of local branches but not in any of remote-"
+"tracking branches for 'origin' (what you have that origin doesn't)."
msgstr ""
#. type: Labeled list
@@ -36814,8 +36660,7 @@ msgstr ""
#. type: Plain text
#: en/git-log.txt:166
-msgid ""
-"Shows how the function `main()` in the file `main.c` evolved over time."
+msgid "Shows how the function `main()` in the file `main.c` evolved over time."
msgstr ""
#. type: Labeled list
@@ -36838,7 +36683,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:182
-#, ignore-same, no-wrap
+#, no-wrap
msgid "format.pretty"
msgstr "format.pretty"
@@ -36851,7 +36696,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:186
-#, ignore-same, no-wrap
+#, no-wrap
msgid "i18n.logOutputEncoding"
msgstr "i18n.logOutputEncoding"
@@ -36864,7 +36709,7 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:191
-#, ignore-same, no-wrap
+#, no-wrap
msgid "log.date"
msgstr "log.date"
@@ -36872,20 +36717,20 @@ msgstr "log.date"
#: en/git-log.txt:195
msgid ""
"Default format for human-readable dates. (Compare the `--date` option.) "
-"Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34"
-" 2010 -0500`."
+"Defaults to \"default\", which means to write dates like `Sat May 8 19:35:34 "
+"2010 -0500`."
msgstr ""
#. type: Plain text
#: en/git-log.txt:199
msgid ""
-"If the format is set to \"auto:foo\" and the pager is in use, format \"foo\""
-" will be the used for the date format. Otherwise \"default\" will be used."
+"If the format is set to \"auto:foo\" and the pager is in use, format \"foo\" "
+"will be the used for the date format. Otherwise \"default\" will be used."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:200
-#, ignore-same, no-wrap
+#, no-wrap
msgid "log.follow"
msgstr "log.follow"
@@ -36900,21 +36745,21 @@ msgstr ""
#. type: Labeled list
#: en/git-log.txt:206
-#, ignore-same, no-wrap
+#, no-wrap
msgid "log.showRoot"
msgstr "log.showRoot"
#. type: Plain text
#: en/git-log.txt:211
msgid ""
-"If `false`, `git log` and related commands will not treat the initial commit"
-" as a big creation event. Any root commits in `git log -p` output would be "
+"If `false`, `git log` and related commands will not treat the initial commit "
+"as a big creation event. Any root commits in `git log -p` output would be "
"shown without a diff attached. The default is `true`."
msgstr ""
#. type: Labeled list
#: en/git-log.txt:212
-#, ignore-same, no-wrap
+#, no-wrap
msgid "log.showSignature"
msgstr "log.showSignature"
@@ -36954,29 +36799,28 @@ msgstr ""
#: en/git-log.txt:228
msgid ""
"May be an unabbreviated ref name or a glob and may be specified multiple "
-"times. A warning will be issued for refs that do not exist, but a glob that"
-" does not match any refs is silently ignored."
+"times. A warning will be issued for refs that do not exist, but a glob that "
+"does not match any refs is silently ignored."
msgstr ""
#. type: Plain text
#: en/git-log.txt:232
msgid ""
"This setting can be disabled by the `--no-notes` option, overridden by the "
-"`GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the "
-"`--notes=<ref>` option."
+"`GIT_NOTES_DISPLAY_REF` environment variable, and overridden by the `--"
+"notes=<ref>` option."
msgstr ""
#. type: Title =
#: en/git-ls-files.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-ls-files(1)"
msgstr "git-ls-files(1)"
#. type: Plain text
#: en/git-ls-files.txt:7
msgid ""
-"git-ls-files - Show information about files in the index and the working "
-"tree"
+"git-ls-files - Show information about files in the index and the working tree"
msgstr ""
#. type: Plain text
@@ -37016,7 +36860,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:40
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--deleted"
msgstr "--deleted"
@@ -37027,7 +36871,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:44
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--modified"
msgstr "--modified"
@@ -37038,7 +36882,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:48
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--others"
msgstr "--others"
@@ -37049,7 +36893,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:52
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignored"
msgstr "--ignored"
@@ -37065,7 +36909,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:60
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--stage"
msgstr "--stage"
@@ -37077,7 +36921,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:63
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--directory"
msgstr "--directory"
@@ -37090,7 +36934,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:67
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-empty-directory"
msgstr "--no-empty-directory"
@@ -37101,7 +36945,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:71 en/git-update-index.txt:67
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--unmerged"
msgstr "--unmerged"
@@ -37112,7 +36956,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:75
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--killed"
msgstr "--killed"
@@ -37126,8 +36970,8 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:83
msgid ""
-"\\0 line termination on output and do not quote filenames. See OUTPUT below"
-" for more information."
+"\\0 line termination on output and do not quote filenames. See OUTPUT below "
+"for more information."
msgstr ""
#. type: Labeled list
@@ -37182,7 +37026,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:102
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--error-unmatch"
msgstr "--error-unmatch"
@@ -37328,21 +37172,21 @@ msgstr ""
#: en/git-ls-files.txt:156 en/git-ls-tree.txt:67
msgid ""
"Instead of showing the full 40-byte hexadecimal object lines, show only a "
-"partial prefix. Non default number of digits can be specified with "
-"--abbrev=<n>."
+"partial prefix. Non default number of digits can be specified with --"
+"abbrev=<n>."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:162
msgid ""
-"After each line that describes a file, add more data about its cache entry."
-" This is intended to show as much information as possible for manual "
+"After each line that describes a file, add more data about its cache entry. "
+"This is intended to show as much information as possible for manual "
"inspection; the exact format may change at any time."
msgstr ""
#. type: Labeled list
#: en/git-ls-files.txt:163
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--eol"
msgstr "--eol"
@@ -37351,8 +37195,8 @@ msgstr "--eol"
msgid ""
"Show <eolinfo> and <eolattr> of files. <eolinfo> is the file content "
"identification used by Git when the \"text\" attribute is \"auto\" (or not "
-"set and core.autocrlf is not false). <eolinfo> is either \"-text\", "
-"\"none\", \"lf\", \"crlf\", \"mixed\" or \"\"."
+"set and core.autocrlf is not false). <eolinfo> is either \"-text\", \"none"
+"\", \"lf\", \"crlf\", \"mixed\" or \"\"."
msgstr ""
#. type: Plain text
@@ -37375,8 +37219,8 @@ msgstr ""
#: en/git-ls-files.txt:179
msgid ""
"Both the <eolinfo> in the index (\"i/<eolinfo>\") and in the working tree "
-"(\"w/<eolinfo>\") are shown for regular files, followed by the "
-"(\"attr/<eolattr>\")."
+"(\"w/<eolinfo>\") are shown for regular files, followed by the (\"attr/"
+"<eolattr>\")."
msgstr ""
#. type: Labeled list
@@ -37424,8 +37268,8 @@ msgstr ""
#: en/git-ls-files.txt:205
msgid ""
"For an unmerged path, instead of recording a single mode/SHA-1 pair, the "
-"index records up to three such pairs; one from tree O in stage 1, A in stage"
-" 2, and B in stage 3. This information can be used by the user (or the "
+"index records up to three such pairs; one from tree O in stage 1, A in stage "
+"2, and B in stage 3. This information can be used by the user (or the "
"porcelain) to see what should eventually be recorded at the path. (see "
"linkgit:git-read-tree[1] for more information on state)"
msgstr ""
@@ -37440,9 +37284,9 @@ msgstr ""
#: en/git-ls-files.txt:219
msgid ""
"'git ls-files' can use a list of \"exclude patterns\" when traversing the "
-"directory tree and finding files to show when the flags --others or "
-"--ignored are specified. linkgit:gitignore[5] specifies the format of "
-"exclude patterns."
+"directory tree and finding files to show when the flags --others or --"
+"ignored are specified. linkgit:gitignore[5] specifies the format of exclude "
+"patterns."
msgstr ""
#. type: Plain text
@@ -37461,15 +37305,15 @@ msgstr ""
#: en/git-ls-files.txt:229
msgid ""
"The command-line flag --exclude-from=<file> specifies a file containing a "
-"list of patterns. Patterns are ordered in the same order they appear in the"
-" file."
+"list of patterns. Patterns are ordered in the same order they appear in the "
+"file."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:235
msgid ""
-"The command-line flag --exclude-per-directory=<name> specifies a name of the"
-" file in each directory 'git ls-files' examines, normally `.gitignore`. "
+"The command-line flag --exclude-per-directory=<name> specifies a name of the "
+"file in each directory 'git ls-files' examines, normally `.gitignore`. "
"Files in deeper directories take precedence. Patterns are ordered in the "
"same order they appear in the files."
msgstr ""
@@ -37477,21 +37321,20 @@ msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:241
msgid ""
-"A pattern specified on the command line with --exclude or read from the file"
-" specified with --exclude-from is relative to the top of the directory tree."
-" A pattern read from a file specified by --exclude-per-directory is "
-"relative to the directory that the pattern file appears in."
+"A pattern specified on the command line with --exclude or read from the file "
+"specified with --exclude-from is relative to the top of the directory tree. "
+"A pattern read from a file specified by --exclude-per-directory is relative "
+"to the directory that the pattern file appears in."
msgstr ""
#. type: Plain text
#: en/git-ls-files.txt:245
-#, ignore-same
msgid "linkgit:git-read-tree[1], linkgit:gitignore[5]"
msgstr "linkgit:git-read-tree[1], linkgit:gitignore[5]"
#. type: Title =
#: en/git-ls-remote.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-ls-remote(1)"
msgstr "git-ls-remote(1)"
@@ -37518,7 +37361,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:25 en/git-show-ref.txt:40
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--heads"
msgstr "--heads"
@@ -37532,7 +37375,7 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:33
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--refs"
msgstr "--refs"
@@ -37571,21 +37414,21 @@ msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:52
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--get-url"
msgstr "--get-url"
#. type: Plain text
#: en/git-ls-remote.txt:56
msgid ""
-"Expand the URL of the given remote repository taking into account any "
-"\"url.<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit"
-" without talking to the remote."
+"Expand the URL of the given remote repository taking into account any \"url."
+"<base>.insteadOf\" config setting (See linkgit:git-config[1]) and exit "
+"without talking to the remote."
msgstr ""
#. type: Labeled list
#: en/git-ls-remote.txt:57
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--symref"
msgstr "--symref"
@@ -37602,8 +37445,8 @@ msgstr ""
msgid ""
"Sort based on the key given. Prefix `-` to sort in descending order of the "
"value. Supports \"version:refname\" or \"v:refname\" (tag names are treated "
-"as versions). The \"version:refname\" sort order can also be affected by the"
-" \"versionsort.suffix\" configuration variable. See linkgit:git-for-each-"
+"as versions). The \"version:refname\" sort order can also be affected by the "
+"\"versionsort.suffix\" configuration variable. See linkgit:git-for-each-"
"ref[1] for more sort options, but be aware keys like `committerdate` that "
"require access to the objects themselves will not work for refs whose "
"objects have not yet been fetched from the remote, and will give a `missing "
@@ -37621,9 +37464,9 @@ msgstr ""
#. type: Plain text
#: en/git-ls-remote.txt:91
msgid ""
-"When unspecified, all references, after filtering done with --heads and "
-"--tags, are shown. When <refs>... are specified, only references matching "
-"the given patterns are displayed."
+"When unspecified, all references, after filtering done with --heads and --"
+"tags, are shown. When <refs>... are specified, only references matching the "
+"given patterns are displayed."
msgstr ""
#. type: Plain text
@@ -37654,7 +37497,7 @@ msgstr ""
#. type: Title =
#: en/git-ls-tree.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-ls-tree(1)"
msgstr "git-ls-tree(1)"
@@ -37693,12 +37536,12 @@ msgstr ""
msgid ""
"the behaviour is similar to that of \"/bin/ls\" in that the '<path>' is "
"taken as relative to the current working directory. E.g. when you are in a "
-"directory 'sub' that has a directory 'dir', you can run 'git ls-tree -r HEAD"
-" dir' to list the contents of the tree (that is 'sub/dir' in `HEAD`). You "
-"don't want to give a tree that is not at the root level (e.g. `git ls-tree "
-"-r HEAD:sub dir`) in this case, as that would result in asking for "
-"'sub/sub/dir' in the `HEAD` commit. However, the current working directory "
-"can be ignored by passing --full-tree option."
+"directory 'sub' that has a directory 'dir', you can run 'git ls-tree -r HEAD "
+"dir' to list the contents of the tree (that is 'sub/dir' in `HEAD`). You "
+"don't want to give a tree that is not at the root level (e.g. `git ls-tree -"
+"r HEAD:sub dir`) in this case, as that would result in asking for 'sub/sub/"
+"dir' in the `HEAD` commit. However, the current working directory can be "
+"ignored by passing --full-tree option."
msgstr ""
#. type: Plain text
@@ -37719,8 +37562,8 @@ msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:50
msgid ""
-"Show tree entries even when going to recurse them. Has no effect if `-r` was"
-" not passed. `-d` implies `-t`."
+"Show tree entries even when going to recurse them. Has no effect if `-r` was "
+"not passed. `-d` implies `-t`."
msgstr ""
#. type: Plain text
@@ -37743,8 +37586,8 @@ msgstr ""
#. type: Plain text
#: en/git-ls-tree.txt:71
msgid ""
-"Instead of showing the path names relative to the current working directory,"
-" show the full path names."
+"Instead of showing the path names relative to the current working directory, "
+"show the full path names."
msgstr ""
#. type: Plain text
@@ -37764,8 +37607,8 @@ msgstr ""
#: en/git-ls-tree.txt:80
msgid ""
"When paths are given, show them (note that this isn't really raw pathnames, "
-"but rather a list of patterns to match). Otherwise implicitly uses the root"
-" level of the tree as the sole path argument."
+"but rather a list of patterns to match). Otherwise implicitly uses the root "
+"level of the tree as the sole path argument."
msgstr ""
#. type: Title -
@@ -37808,7 +37651,7 @@ msgstr ""
#. type: Title =
#: en/git-mailinfo.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-mailinfo(1)"
msgstr "git-mailinfo(1)"
@@ -37821,18 +37664,16 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:13
#, no-wrap
-msgid ""
-"'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--[no-]scissors] "
-"<msg> <patch>\n"
+msgid "'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--[no-]scissors] <msg> <patch>\n"
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:23
msgid ""
-"Reads a single e-mail message from the standard input, and writes the commit"
-" log message in <msg> file, and the patches in <patch> file. The author "
-"name, e-mail and e-mail subject are written out to the standard output to be"
-" used by 'git am' to create a commit. It is usually not necessary to use "
+"Reads a single e-mail message from the standard input, and writes the commit "
+"log message in <msg> file, and the patches in <patch> file. The author "
+"name, e-mail and e-mail subject are written out to the standard output to be "
+"used by 'git am' to create a commit. It is usually not necessary to use "
"this command directly. See linkgit:git-am[1] instead."
msgstr ""
@@ -37841,8 +37682,8 @@ msgstr ""
msgid ""
"Usually the program removes email cruft from the Subject: header line to "
"extract the title line for the commit log message. This option prevents "
-"this munging, and is most useful when used to read back 'git format-patch "
-"-k' output."
+"this munging, and is most useful when used to read back 'git format-patch -"
+"k' output."
msgstr ""
#. type: Plain text
@@ -37873,8 +37714,7 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:46
msgid ""
-"Finally, runs of whitespace are normalized to a single ASCII space "
-"character."
+"Finally, runs of whitespace are normalized to a single ASCII space character."
msgstr ""
#. type: Plain text
@@ -37888,9 +37728,9 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:58
msgid ""
-"The commit log message, author name and author email are taken from the "
-"e-mail, and after minimally decoding MIME transfer encoding, re-coded in the"
-" charset specified by i18n.commitencoding (defaulting to UTF-8) by "
+"The commit log message, author name and author email are taken from the e-"
+"mail, and after minimally decoding MIME transfer encoding, re-coded in the "
+"charset specified by i18n.commitencoding (defaulting to UTF-8) by "
"transliterating them. This used to be optional but now it is the default."
msgstr ""
@@ -37916,8 +37756,8 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:73
msgid ""
-"Copy the Message-ID header at the end of the commit message. This is useful"
-" in order to associate commits with mailing list discussions."
+"Copy the Message-ID header at the end of the commit message. This is useful "
+"in order to associate commits with mailing list discussions."
msgstr ""
#. type: Plain text
@@ -37926,16 +37766,16 @@ msgid ""
"Remove everything in body before a scissors line. A line that mainly "
"consists of scissors (either \">8\" or \"8<\") and perforation (dash \"-\") "
"marks is called a scissors line, and is used to request the reader to cut "
-"the message at that line. If such a line appears in the body of the message"
-" before the patch, everything before it (including the scissors line itself)"
-" is ignored when this option is used."
+"the message at that line. If such a line appears in the body of the message "
+"before the patch, everything before it (including the scissors line itself) "
+"is ignored when this option is used."
msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:87
msgid ""
-"This is useful if you want to begin your message in a discussion thread with"
-" comments and suggestions on the message you are responding to, and to "
+"This is useful if you want to begin your message in a discussion thread with "
+"comments and suggestions on the message you are responding to, and to "
"conclude it with a patch submission, separating the discussion and the "
"beginning of the proposed commit log message with a scissors line."
msgstr ""
@@ -37943,8 +37783,8 @@ msgstr ""
#. type: Plain text
#: en/git-mailinfo.txt:89
msgid ""
-"This can be enabled by default with the configuration option "
-"mailinfo.scissors."
+"This can be enabled by default with the configuration option mailinfo."
+"scissors."
msgstr ""
#. type: Plain text
@@ -37979,7 +37819,7 @@ msgstr ""
#. type: Title =
#: en/git-mailsplit.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-mailsplit(1)"
msgstr "git-mailsplit(1)"
@@ -38031,8 +37871,8 @@ msgstr ""
#. type: Plain text
#: en/git-mailsplit.txt:31
msgid ""
-"Root of the Maildir to split. This directory should contain the cur, tmp and"
-" new subdirectories."
+"Root of the Maildir to split. This directory should contain the cur, tmp and "
+"new subdirectories."
msgstr ""
#. type: Labeled list
@@ -38081,7 +37921,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:48
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--keep-cr"
msgstr "--keep-cr"
@@ -38092,18 +37932,19 @@ msgstr ""
#. type: Labeled list
#: en/git-mailsplit.txt:51
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--mboxrd"
msgstr "--mboxrd"
#. type: Plain text
#: en/git-mailsplit.txt:54
-msgid "Input is of the \"mboxrd\" format and \"^>+From \" line escaping is reversed."
+msgid ""
+"Input is of the \"mboxrd\" format and \"^>+From \" line escaping is reversed."
msgstr ""
#. type: Title =
#: en/git-merge-base.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-merge-base(1)"
msgstr "git-merge-base(1)"
@@ -38126,12 +37967,12 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:27
msgid ""
-"'git merge-base' finds best common ancestor(s) between two commits to use in"
-" a three-way merge. One common ancestor is 'better' than another common "
-"ancestor if the latter is an ancestor of the former. A common ancestor that"
-" does not have any better common ancestor is a 'best common ancestor', i.e. "
-"a 'merge base'. Note that there can be more than one merge base for a pair "
-"of commits."
+"'git merge-base' finds best common ancestor(s) between two commits to use in "
+"a three-way merge. One common ancestor is 'better' than another common "
+"ancestor if the latter is an ancestor of the former. A common ancestor that "
+"does not have any better common ancestor is a 'best common ancestor', i.e. a "
+"'merge base'. Note that there can be more than one merge base for a pair of "
+"commits."
msgstr ""
#. type: Title -
@@ -38150,10 +37991,10 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:38
msgid ""
-"More generally, among the two commits to compute the merge base from, one is"
-" specified by the first commit argument on the command line; the other "
-"commit is a (possibly hypothetical) commit that is a merge across all the "
-"remaining commits on the command line."
+"More generally, among the two commits to compute the merge base from, one is "
+"specified by the first commit argument on the command line; the other commit "
+"is a (possibly hypothetical) commit that is a merge across all the remaining "
+"commits on the command line."
msgstr ""
#. type: Plain text
@@ -38167,7 +38008,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:43
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--octopus"
msgstr "--octopus"
@@ -38181,7 +38022,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:48 en/git-show-branch.txt:90
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--independent"
msgstr "--independent"
@@ -38190,13 +38031,13 @@ msgstr "--independent"
msgid ""
"Instead of printing merge bases, print a minimal subset of the supplied "
"commits with the same ancestors. In other words, among the commits given, "
-"list those which cannot be reached from any other. This mimics the behavior"
-" of 'git show-branch --independent'."
+"list those which cannot be reached from any other. This mimics the behavior "
+"of 'git show-branch --independent'."
msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:55
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--is-ancestor"
msgstr "--is-ancestor"
@@ -38210,7 +38051,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-base.txt:60 en/git-rebase.txt:353
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--fork-point"
msgstr "--fork-point"
@@ -38219,10 +38060,9 @@ msgstr "--fork-point"
msgid ""
"Find the point at which a branch (or any history that leads to <commit>) "
"forked from another branch (or any reference) <ref>. This does not just "
-"look for the common ancestor of the two commits, but also takes into account"
-" the reflog of <ref> to see if the history leading to <commit> forked from "
-"an earlier incarnation of the branch <ref> (see discussion on this mode "
-"below)."
+"look for the common ancestor of the two commits, but also takes into account "
+"the reflog of <ref> to see if the history leading to <commit> forked from an "
+"earlier incarnation of the branch <ref> (see discussion on this mode below)."
msgstr ""
#. type: Plain text
@@ -38278,8 +38118,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:101
msgid ""
-"the result of `git merge-base A B C` is '1'. This is because the equivalent"
-" topology with a merge commit 'M' between 'B' and 'C' is:"
+"the result of `git merge-base A B C` is '1'. This is because the equivalent "
+"topology with a merge commit 'M' between 'B' and 'C' is:"
msgstr ""
#. type: Plain text
@@ -38329,16 +38169,16 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:128
msgid ""
-"both '1' and '2' are merge-bases of A and B. Neither one is better than the"
-" other (both are 'best' merge bases). When the `--all` option is not given,"
-" it is unspecified which best one is output."
+"both '1' and '2' are merge-bases of A and B. Neither one is better than the "
+"other (both are 'best' merge bases). When the `--all` option is not given, "
+"it is unspecified which best one is output."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:133
msgid ""
-"A common idiom to check \"fast-forward-ness\" between two commits A and B is"
-" (or at least used to be) to compute the merge base between A and B, and "
+"A common idiom to check \"fast-forward-ness\" between two commits A and B is "
+"(or at least used to be) to compute the merge base between A and B, and "
"check if it is the same as A, in which case, A is an ancestor of B. You "
"will see this idiom used often in older scripts."
msgstr ""
@@ -38405,20 +38245,20 @@ msgstr ""
#: en/git-merge-base.txt:170
msgid ""
"where `origin/master` used to point at commits B0, B1, B2 and now it points "
-"at B, and your `topic` branch was started on top of it back when "
-"`origin/master` was at B0, and you built three commits, D0, D1, and D, on "
-"top of it. Imagine that you now want to rebase the work you did on the "
-"topic on top of the updated origin/master."
+"at B, and your `topic` branch was started on top of it back when `origin/"
+"master` was at B0, and you built three commits, D0, D1, and D, on top of "
+"it. Imagine that you now want to rebase the work you did on the topic on "
+"top of the updated origin/master."
msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:176
msgid ""
-"In such a case, `git merge-base origin/master topic` would return the parent"
-" of B0 in the above picture, but B0^..D is *not* the range of commits you "
+"In such a case, `git merge-base origin/master topic` would return the parent "
+"of B0 in the above picture, but B0^..D is *not* the range of commits you "
"would want to replay on top of B (it includes B0, which is not what you "
-"wrote; it is a commit the other side discarded when it moved its tip from B0"
-" to B1)."
+"wrote; it is a commit the other side discarded when it moved its tip from B0 "
+"to B1)."
msgstr ""
#. type: Plain text
@@ -38428,8 +38268,8 @@ msgid ""
"such a case. It takes not only B but also B0, B1, and B2 (i.e. old tips of "
"the remote-tracking branches your repository's reflog knows about) into "
"account to see on which commit your topic branch was built and finds B0, "
-"allowing you to replay only the commits on your topic, excluding the commits"
-" the other side later discarded."
+"allowing you to replay only the commits on your topic, excluding the commits "
+"the other side later discarded."
msgstr ""
#. type: Plain text
@@ -38478,8 +38318,8 @@ msgstr ""
msgid ""
"A caveat is that older reflog entries in your repository may be expired by "
"`git gc`. If B0 no longer appears in the reflog of the remote-tracking "
-"branch `origin/master`, the `--fork-point` mode obviously cannot find it and"
-" fails, avoiding to give a random and useless result (such as the parent of "
+"branch `origin/master`, the `--fork-point` mode obviously cannot find it and "
+"fails, avoiding to give a random and useless result (such as the parent of "
"B0, like the same command without the `--fork-point` option gives)."
msgstr ""
@@ -38488,13 +38328,13 @@ msgstr ""
msgid ""
"Also, the remote-tracking branch you use the `--fork-point` mode with must "
"be the one your topic forked from its tip. If you forked from an older "
-"commit than the tip, this mode would not find the fork point (imagine in the"
-" above sample history B0 did not exist, origin/master started at B1, moved "
-"to B2 and then B, and you forked your topic at origin/master^ when "
-"origin/master was B1; the shape of the history would be the same as above, "
-"without B0, and the parent of B1 is what `git merge-base origin/master "
-"topic` correctly finds, but the `--fork-point` mode will not, because it is "
-"not one of the commits that used to be at the tip of origin/master)."
+"commit than the tip, this mode would not find the fork point (imagine in the "
+"above sample history B0 did not exist, origin/master started at B1, moved to "
+"B2 and then B, and you forked your topic at origin/master^ when origin/"
+"master was B1; the shape of the history would be the same as above, without "
+"B0, and the parent of B1 is what `git merge-base origin/master topic` "
+"correctly finds, but the `--fork-point` mode will not, because it is not one "
+"of the commits that used to be at the tip of origin/master)."
msgstr ""
#. type: Title -
@@ -38505,7 +38345,6 @@ msgstr ""
#. type: Plain text
#: en/git-merge-base.txt:228
-#, ignore-same
msgid ""
"linkgit:git-rev-list[1], linkgit:git-show-branch[1], linkgit:git-merge[1]"
msgstr ""
@@ -38513,7 +38352,7 @@ msgstr ""
#. type: Title =
#: en/git-merge-file.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-merge-file(1)"
msgstr "git-merge-file(1)"
@@ -38567,10 +38406,9 @@ msgstr ""
msgid ""
"If there are conflicts, the user should edit the result and delete one of "
"the alternatives. When `--ours`, `--theirs`, or `--union` option is in "
-"effect, however, these conflicts are resolved favouring lines from "
-"`<current-file>`, lines from `<other-file>`, or lines from both "
-"respectively. The length of the conflict markers can be given with the "
-"`--marker-size` option."
+"effect, however, these conflicts are resolved favouring lines from `<current-"
+"file>`, lines from `<other-file>`, or lines from both respectively. The "
+"length of the conflict markers can be given with the `--marker-size` option."
msgstr ""
#. type: Plain text
@@ -38585,8 +38423,8 @@ msgstr ""
#: en/git-merge-file.txt:50
msgid ""
"'git merge-file' is designed to be a minimal clone of RCS 'merge'; that is, "
-"it implements all of RCS 'merge''s functionality which is needed by "
-"linkgit:git[1]."
+"it implements all of RCS 'merge''s functionality which is needed by linkgit:"
+"git[1]."
msgstr ""
#. type: Labeled list
@@ -38617,7 +38455,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:70
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--diff3"
msgstr "--diff3"
@@ -38628,7 +38466,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge-file.txt:75
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--union"
msgstr "--union"
@@ -38648,8 +38486,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:87
msgid ""
-"combines the changes of README.my and README.upstream since README, tries to"
-" merge them and writes the result into README.my."
+"combines the changes of README.my and README.upstream since README, tries to "
+"merge them and writes the result into README.my."
msgstr ""
#. type: Labeled list
@@ -38661,13 +38499,13 @@ msgstr ""
#. type: Plain text
#: en/git-merge-file.txt:92
msgid ""
-"merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels `a` and"
-" `c` instead of `tmp/a123` and `tmp/c345`."
+"merges tmp/a123 and tmp/c345 with the base tmp/b234, but uses labels `a` and "
+"`c` instead of `tmp/a123` and `tmp/c345`."
msgstr ""
#. type: Title =
#: en/git-merge-index.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-merge-index(1)"
msgstr "git-merge-index(1)"
@@ -38773,14 +38611,14 @@ msgstr ""
#: en/git-merge-index.txt:76
msgid ""
"where the latter example shows how 'git merge-index' will stop trying to "
-"merge once anything has returned an error (i.e., `cat` returned an error for"
-" the AA file, because it didn't exist in the original, and thus 'git merge-"
+"merge once anything has returned an error (i.e., `cat` returned an error for "
+"the AA file, because it didn't exist in the original, and thus 'git merge-"
"index' didn't even try to merge the MM thing)."
msgstr ""
#. type: Title =
#: en/git-merge-one-file.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-merge-one-file(1)"
msgstr "git-merge-one-file(1)"
@@ -38799,8 +38637,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge-one-file.txt:18
msgid ""
-"This is the standard helper program to use with 'git merge-index' to resolve"
-" a merge after the trivial merge done with 'git read-tree -m'."
+"This is the standard helper program to use with 'git merge-index' to resolve "
+"a merge after the trivial merge done with 'git read-tree -m'."
msgstr ""
#. type: Title =
@@ -38824,15 +38662,15 @@ msgstr ""
#: en/git-mergetool--lib.txt:19 en/git-sh-i18n.txt:19 en/git-sh-setup.txt:19
msgid ""
"This is not a command the end user would want to run. Ever. This "
-"documentation is meant for people who are studying the Porcelain-ish scripts"
-" and/or are writing new ones."
+"documentation is meant for people who are studying the Porcelain-ish scripts "
+"and/or are writing new ones."
msgstr ""
#. type: Plain text
#: en/git-mergetool--lib.txt:23
msgid ""
-"The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using "
-"`.`) by other shell scripts to set up functions for working with Git merge "
+"The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using `."
+"`) by other shell scripts to set up functions for working with Git merge "
"tools."
msgstr ""
@@ -38899,7 +38737,7 @@ msgstr ""
#. type: Title =
#: en/git-mergetool.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-mergetool(1)"
msgstr "git-mergetool(1)"
@@ -38927,9 +38765,9 @@ msgstr ""
#: en/git-mergetool.txt:24
msgid ""
"If one or more <file> parameters are given, the merge tool program will be "
-"run to resolve differences on each file (skipping those without conflicts)."
-" Specifying a directory will include all unresolved files in that path. If"
-" no <file> names are specified, 'git mergetool' will run the merge tool "
+"run to resolve differences on each file (skipping those without conflicts). "
+"Specifying a directory will include all unresolved files in that path. If "
+"no <file> names are specified, 'git mergetool' will run the merge tool "
"program on every file with merge conflicts."
msgstr ""
@@ -38944,9 +38782,9 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:38
msgid ""
-"If a merge resolution program is not specified, 'git mergetool' will use the"
-" configuration variable `merge.tool`. If the configuration variable "
-"`merge.tool` is not set, 'git mergetool' will pick a suitable default."
+"If a merge resolution program is not specified, 'git mergetool' will use the "
+"configuration variable `merge.tool`. If the configuration variable `merge."
+"tool` is not set, 'git mergetool' will pick a suitable default."
msgstr ""
#. type: Plain text
@@ -38961,8 +38799,8 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:49
msgid ""
-"Instead of running one of the known merge tool programs, 'git mergetool' can"
-" be customized to run an alternative program by specifying the command line "
+"Instead of running one of the known merge tool programs, 'git mergetool' can "
+"be customized to run an alternative program by specifying the command line "
"to invoke in a configuration variable `mergetool.<tool>.cmd`."
msgstr ""
@@ -38972,22 +38810,21 @@ msgid ""
"When 'git mergetool' is invoked with this tool (either through the `-t` or "
"`--tool` option or the `merge.tool` configuration variable) the configured "
"command line will be invoked with `$BASE` set to the name of a temporary "
-"file containing the common base for the merge, if available; `$LOCAL` set to"
-" the name of a temporary file containing the contents of the file on the "
-"current branch; `$REMOTE` set to the name of a temporary file containing the"
-" contents of the file to be merged, and `$MERGED` set to the name of the "
-"file to which the merge tool should write the result of the merge "
-"resolution."
+"file containing the common base for the merge, if available; `$LOCAL` set to "
+"the name of a temporary file containing the contents of the file on the "
+"current branch; `$REMOTE` set to the name of a temporary file containing the "
+"contents of the file to be merged, and `$MERGED` set to the name of the file "
+"to which the merge tool should write the result of the merge resolution."
msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:66
msgid ""
"If the custom merge tool correctly indicates the success of a merge "
-"resolution with its exit code, then the configuration variable "
-"`mergetool.<tool>.trustExitCode` can be set to `true`. Otherwise, 'git "
-"mergetool' will prompt the user to indicate the success of the resolution "
-"after the custom tool has exited."
+"resolution with its exit code, then the configuration variable `mergetool."
+"<tool>.trustExitCode` can be set to `true`. Otherwise, 'git mergetool' will "
+"prompt the user to indicate the success of the resolution after the custom "
+"tool has exited."
msgstr ""
#. type: Plain text
@@ -39012,7 +38849,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mergetool.txt:83
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--gui"
msgstr "--gui"
@@ -39020,13 +38857,13 @@ msgstr "--gui"
#: en/git-mergetool.txt:87
msgid ""
"When 'git-mergetool' is invoked with the `-g` or `--gui` option the default "
-"merge tool will be read from the configured `merge.guitool` variable instead"
-" of `merge.tool`."
+"merge tool will be read from the configured `merge.guitool` variable instead "
+"of `merge.tool`."
msgstr ""
#. type: Labeled list
#: en/git-mergetool.txt:88
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-gui"
msgstr "--no-gui"
@@ -39040,10 +38877,10 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:99
msgid ""
-"Process files in the order specified in the <orderfile>, which has one shell"
-" glob pattern per line. This overrides the `diff.orderFile` configuration "
-"variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use "
-"`-O/dev/null`."
+"Process files in the order specified in the <orderfile>, which has one shell "
+"glob pattern per line. This overrides the `diff.orderFile` configuration "
+"variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/"
+"dev/null`."
msgstr ""
#. type: Title -
@@ -39055,8 +38892,8 @@ msgstr ""
#. type: Plain text
#: en/git-mergetool.txt:105
msgid ""
-"`git mergetool` creates `*.orig` backup files while resolving merges. These"
-" are safe to remove once a file has been merged and its `git mergetool` "
+"`git mergetool` creates `*.orig` backup files while resolving merges. These "
+"are safe to remove once a file has been merged and its `git mergetool` "
"session has completed."
msgstr ""
@@ -39064,13 +38901,13 @@ msgstr ""
#: en/git-mergetool.txt:109
msgid ""
"Setting the `mergetool.keepBackup` configuration variable to `false` causes "
-"`git mergetool` to automatically remove the backup as files are successfully"
-" merged."
+"`git mergetool` to automatically remove the backup as files are successfully "
+"merged."
msgstr ""
#. type: Title =
#: en/git-merge-tree.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-merge-tree(1)"
msgstr "git-merge-tree(1)"
@@ -39105,7 +38942,7 @@ msgstr ""
#. type: Title =
#: en/git-merge.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-merge(1)"
msgstr "git-merge(1)"
@@ -39131,8 +38968,8 @@ msgstr ""
msgid ""
"Incorporates changes from the named commits (since the time their histories "
"diverged from the current branch) into the current branch. This command is "
-"used by 'git pull' to incorporate changes from another repository and can be"
-" used by hand to merge changes from one branch into another."
+"used by 'git pull' to incorporate changes from another repository and can be "
+"used by hand to merge changes from one branch into another."
msgstr ""
#. type: Plain text
@@ -39176,8 +39013,8 @@ msgid ""
"has resulted in conflicts. 'git merge --abort' will abort the merge process "
"and try to reconstruct the pre-merge state. However, if there were "
"uncommitted changes when the merge started (and especially if those changes "
-"were further modified after the merge was started), 'git merge --abort' will"
-" in some cases be unable to reconstruct the original (pre-merge) changes. "
+"were further modified after the merge was started), 'git merge --abort' will "
+"in some cases be unable to reconstruct the original (pre-merge) changes. "
"Therefore:"
msgstr ""
@@ -39228,7 +39065,7 @@ msgstr ""
#. type: Labeled list
#: en/git-merge.txt:86
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]rerere-autoupdate"
msgstr "--[no-]rerere-autoupdate"
@@ -39305,8 +39142,8 @@ msgstr ""
msgid ""
"Before applying outside changes, you should get your own work in good shape "
"and committed locally, so it will not be clobbered if there are conflicts. "
-"See also linkgit:git-stash[1]. 'git pull' and 'git merge' will stop without"
-" doing anything when local uncommitted changes overlap with files that 'git "
+"See also linkgit:git-stash[1]. 'git pull' and 'git merge' will stop without "
+"doing anything when local uncommitted changes overlap with files that 'git "
"pull'/'git merge' may need to update."
msgstr ""
@@ -39314,10 +39151,10 @@ msgstr ""
#: en/git-merge.txt:136
msgid ""
"To avoid recording unrelated changes in the merge commit, 'git pull' and "
-"'git merge' will also abort if there are any changes registered in the index"
-" relative to the `HEAD` commit. (Special narrow exceptions to this rule may"
-" exist depending on which merge strategy is in use, but generally, the index"
-" must match HEAD.)"
+"'git merge' will also abort if there are any changes registered in the index "
+"relative to the `HEAD` commit. (Special narrow exceptions to this rule may "
+"exist depending on which merge strategy is in use, but generally, the index "
+"must match HEAD.)"
msgstr ""
#. type: Plain text
@@ -39368,8 +39205,8 @@ msgstr ""
msgid ""
"A merged version reconciling the changes from all branches to be merged is "
"committed, and your `HEAD`, index, and working tree are updated to it. It "
-"is possible to have modifications in the working tree as long as they do not"
-" overlap; the update will preserve them."
+"is possible to have modifications in the working tree as long as they do not "
+"overlap; the update will preserve them."
msgstr ""
#. type: Plain text
@@ -39401,8 +39238,8 @@ msgid ""
"For conflicting paths, the index file records up to three versions: stage 1 "
"stores the version from the common ancestor, stage 2 from `HEAD`, and stage "
"3 from `MERGE_HEAD` (you can inspect the stages with `git ls-files -u`). "
-"The working tree files contain the result of the \"merge\" program; i.e. "
-"3-way merge results with familiar conflict markers `<<<` `===` `>>>`."
+"The working tree files contain the result of the \"merge\" program; i.e. 3-"
+"way merge results with familiar conflict markers `<<<` `===` `>>>`."
msgstr ""
#. type: Plain text
@@ -39431,8 +39268,8 @@ msgstr ""
msgid ""
"When merging an annotated (and possibly signed) tag, Git always creates a "
"merge commit even if a fast-forward merge is possible, and the commit "
-"message template is prepared with the tag message. Additionally, if the tag"
-" is signed, the signature check is reported as a comment in the message "
+"message template is prepared with the tag message. Additionally, if the tag "
+"is signed, the signature check is reported as a comment in the message "
"template. See also linkgit:git-tag[1]."
msgstr ""
@@ -39440,8 +39277,8 @@ msgstr ""
#: en/git-merge.txt:199
msgid ""
"When you want to just integrate with the work leading to the commit that "
-"happens to be tagged, e.g. synchronizing with an upstream release point, you"
-" may not want to make an unnecessary merge commit."
+"happens to be tagged, e.g. synchronizing with an upstream release point, you "
+"may not want to make an unnecessary merge commit."
msgstr ""
#. type: Plain text
@@ -39475,15 +39312,15 @@ msgid ""
"overlapping ones (that is, you changed an area of the file while the other "
"side left that area intact, or vice versa) are incorporated in the final "
"result verbatim. When both sides made changes to the same area, however, "
-"Git cannot randomly pick one side over the other, and asks you to resolve it"
-" by leaving what both sides did to that area."
+"Git cannot randomly pick one side over the other, and asks you to resolve it "
+"by leaving what both sides did to that area."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:224
msgid ""
-"By default, Git uses the same style as the one used by the \"merge\" program"
-" from the RCS suite to present such a conflicted hunk, like this:"
+"By default, Git uses the same style as the one used by the \"merge\" program "
+"from the RCS suite to present such a conflicted hunk, like this:"
msgstr ""
#. type: delimited block -
@@ -39504,8 +39341,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:240
msgid ""
-"The area where a pair of conflicting changes happened is marked with markers"
-" `<<<<<<<`, `=======`, and `>>>>>>>`. The part before the `=======` is "
+"The area where a pair of conflicting changes happened is marked with markers "
+"`<<<<<<<`, `=======`, and `>>>>>>>`. The part before the `=======` is "
"typically your side, and the part afterwards is typically their side."
msgstr ""
@@ -39513,18 +39350,18 @@ msgstr ""
#: en/git-merge.txt:246
msgid ""
"The default format does not show what the original said in the conflicting "
-"area. You cannot tell how many lines are deleted and replaced with Barbie's"
-" remark on your side. The only thing you can tell is that your side wants "
-"to say it is hard and you'd prefer to go shopping, while the other side "
-"wants to claim it is easy."
+"area. You cannot tell how many lines are deleted and replaced with Barbie's "
+"remark on your side. The only thing you can tell is that your side wants to "
+"say it is hard and you'd prefer to go shopping, while the other side wants "
+"to claim it is easy."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:250
msgid ""
"An alternative style can be used by setting the \"merge.conflictStyle\" "
-"configuration variable to \"diff3\". In \"diff3\" style, the above conflict"
-" may look like this:"
+"configuration variable to \"diff3\". In \"diff3\" style, the above conflict "
+"may look like this:"
msgstr ""
#. type: delimited block -
@@ -39570,16 +39407,16 @@ msgstr ""
#: en/git-merge.txt:282
msgid ""
"Decide not to merge. The only clean-ups you need are to reset the index "
-"file to the `HEAD` commit to reverse 2. and to clean up working tree changes"
-" made by 2. and 3.; `git merge --abort` can be used for this."
+"file to the `HEAD` commit to reverse 2. and to clean up working tree changes "
+"made by 2. and 3.; `git merge --abort` can be used for this."
msgstr ""
#. type: Plain text
#: en/git-merge.txt:289
msgid ""
"Resolve the conflicts. Git will mark the conflicts in the working tree. "
-"Edit the files into shape and 'git add' them to the index. Use 'git commit'"
-" or 'git merge --continue' to seal the deal. The latter command checks "
+"Edit the files into shape and 'git add' them to the index. Use 'git commit' "
+"or 'git merge --continue' to seal the deal. The latter command checks "
"whether there is a (interrupted) merge in progress before calling 'git "
"commit'."
msgstr ""
@@ -39592,8 +39429,8 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:294
msgid ""
-"Use a mergetool. `git mergetool` to launch a graphical mergetool which will"
-" work you through the merge."
+"Use a mergetool. `git mergetool` to launch a graphical mergetool which will "
+"work you through the merge."
msgstr ""
#. type: Plain text
@@ -39634,8 +39471,7 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:321
msgid ""
-"Merge branch `obsolete` into the current branch, using `ours` merge "
-"strategy:"
+"Merge branch `obsolete` into the current branch, using `ours` merge strategy:"
msgstr ""
#. type: delimited block -
@@ -39688,19 +39524,18 @@ msgstr ""
#. type: Plain text
#: en/git-merge.txt:360
-#, ignore-same
msgid ""
-"linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5],"
-" linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], "
-"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
+"linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], "
+"linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:"
+"git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
msgstr ""
-"linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5],"
-" linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], "
-"linkgit:git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
+"linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], linkgit:gitattributes[5], "
+"linkgit:git-reset[1], linkgit:git-diff[1], linkgit:git-ls-files[1], linkgit:"
+"git-add[1], linkgit:git-rm[1], linkgit:git-mergetool[1]"
#. type: Title =
#: en/git-mktag.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-mktag(1)"
msgstr "git-mktag(1)"
@@ -39736,8 +39571,8 @@ msgstr ""
#. type: Plain text
#: en/git-mktag.txt:25
msgid ""
-"A tag signature file, to be fed to this command's standard input, has a very"
-" simple fixed format: four lines of"
+"A tag signature file, to be fed to this command's standard input, has a very "
+"simple fixed format: four lines of"
msgstr ""
#. type: Plain text
@@ -39755,13 +39590,13 @@ msgstr ""
msgid ""
"followed by some 'optional' free-form message (some tags created by older "
"Git may not have `tagger` line). The message, when exists, is separated by "
-"a blank line from the header. The message part may contain a signature that"
-" Git itself doesn't care about, but that can be verified with gpg."
+"a blank line from the header. The message part may contain a signature that "
+"Git itself doesn't care about, but that can be verified with gpg."
msgstr ""
#. type: Title =
#: en/git-mktree.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-mktree(1)"
msgstr "git-mktree(1)"
@@ -39779,10 +39614,10 @@ msgstr ""
#. type: Plain text
#: en/git-mktree.txt:20
msgid ""
-"Reads standard input in non-recursive `ls-tree` output format, and creates a"
-" tree object. The order of the tree entries is normalized by mktree so pre-"
-"sorting the input is not required. The object name of the tree object built"
-" is written to the standard output."
+"Reads standard input in non-recursive `ls-tree` output format, and creates a "
+"tree object. The order of the tree entries is normalized by mktree so pre-"
+"sorting the input is not required. The object name of the tree object built "
+"is written to the standard output."
msgstr ""
#. type: Plain text
@@ -39792,7 +39627,7 @@ msgstr ""
#. type: Labeled list
#: en/git-mktree.txt:26
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--missing"
msgstr "--missing"
@@ -39801,8 +39636,8 @@ msgstr "--missing"
msgid ""
"Allow missing objects. The default behaviour (without this option) is to "
"verify that each tree entry's sha1 identifies an existing object. This "
-"option has no effect on the treatment of gitlink entries (aka "
-"\"submodules\") which are always allowed to be missing."
+"option has no effect on the treatment of gitlink entries (aka \"submodules"
+"\") which are always allowed to be missing."
msgstr ""
#. type: Plain text
@@ -39815,7 +39650,7 @@ msgstr ""
#. type: Title =
#: en/git-mv.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-mv(1)"
msgstr "git-mv(1)"
@@ -39867,9 +39702,9 @@ msgstr ""
#. type: Plain text
#: en/git-mv.txt:39
msgid ""
-"Skip move or rename actions which would lead to an error condition. An error"
-" happens when a source is neither existing nor controlled by Git, or when it"
-" would overwrite an existing file unless `-f` is given."
+"Skip move or rename actions which would lead to an error condition. An error "
+"happens when a source is neither existing nor controlled by Git, or when it "
+"would overwrite an existing file unless `-f` is given."
msgstr ""
#. type: Plain text
@@ -39886,10 +39721,10 @@ msgstr ""
#: en/git-mv.txt:54
msgid ""
"Moving a submodule using a gitfile (which means they were cloned with a Git "
-"version 1.7.8 or newer) will update the gitfile and core.worktree setting to"
-" make the submodule work in the new location. It also will attempt to "
-"update the submodule.<name>.path setting in the linkgit:gitmodules[5] file "
-"and stage that file (unless -n is used)."
+"version 1.7.8 or newer) will update the gitfile and core.worktree setting to "
+"make the submodule work in the new location. It also will attempt to update "
+"the submodule.<name>.path setting in the linkgit:gitmodules[5] file and "
+"stage that file (unless -n is used)."
msgstr ""
#. type: Plain text
@@ -39898,16 +39733,16 @@ msgid ""
"Each time a superproject update moves a populated submodule (e.g. when "
"switching between commits before and after the move) a stale submodule "
"checkout will remain in the old location and an empty directory will appear "
-"in the new location. To populate the submodule again in the new location the"
-" user will have to run \"git submodule update\" afterwards. Removing the old"
-" directory is only safe when it uses a gitfile, as otherwise the history of "
+"in the new location. To populate the submodule again in the new location the "
+"user will have to run \"git submodule update\" afterwards. Removing the old "
+"directory is only safe when it uses a gitfile, as otherwise the history of "
"the submodule will be deleted too. Both steps will be obsolete when "
"recursive submodule update has been implemented."
msgstr ""
#. type: Title =
#: en/git-name-rev.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-name-rev(1)"
msgstr "git-name-rev(1)"
@@ -39927,8 +39762,8 @@ msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:19
msgid ""
-"Finds symbolic names suitable for human digestion for revisions given in any"
-" format parsable by 'git rev-parse'."
+"Finds symbolic names suitable for human digestion for revisions given in any "
+"format parsable by 'git rev-parse'."
msgstr ""
#. type: Plain text
@@ -39947,20 +39782,19 @@ msgstr ""
msgid ""
"Only use refs whose names match a given shell pattern. The pattern can be "
"one of branch name, tag name or fully qualified ref name. If given multiple "
-"times, use refs whose names match any of the given shell patterns. Use "
-"`--no-refs` to clear any previous ref patterns given."
+"times, use refs whose names match any of the given shell patterns. Use `--no-"
+"refs` to clear any previous ref patterns given."
msgstr ""
#. type: Plain text
#: en/git-name-rev.txt:41
msgid ""
-"Do not use any ref whose name matches a given shell pattern. The pattern can"
-" be one of branch name, tag name or fully qualified ref name. If given "
+"Do not use any ref whose name matches a given shell pattern. The pattern can "
+"be one of branch name, tag name or fully qualified ref name. If given "
"multiple times, a ref will be excluded when it matches any of the given "
-"patterns. When used together with --refs, a ref will be used as a match only"
-" when it matches at least one --refs pattern and does not match any "
-"--exclude patterns. Use `--no-exclude` to clear the list of exclude "
-"patterns."
+"patterns. When used together with --refs, a ref will be used as a match only "
+"when it matches at least one --refs pattern and does not match any --exclude "
+"patterns. Use `--no-exclude` to clear the list of exclude patterns."
msgstr ""
#. type: Plain text
@@ -39980,13 +39814,13 @@ msgstr ""
#: en/git-name-rev.txt:56
msgid ""
"Instead of printing both the SHA-1 and the name, print only the name. If "
-"given with --tags the usual tag prefix of \"tags/\" is also omitted from the"
-" name, matching the output of `git-describe` more closely."
+"given with --tags the usual tag prefix of \"tags/\" is also omitted from the "
+"name, matching the output of `git-describe` more closely."
msgstr ""
#. type: Labeled list
#: en/git-name-rev.txt:57
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-undefined"
msgstr "--no-undefined"
@@ -40039,7 +39873,7 @@ msgstr ""
#. type: Title =
#: en/git-notes.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-notes(1)"
msgstr "git-notes(1)"
@@ -40078,8 +39912,8 @@ msgstr ""
msgid ""
"By default, notes are saved to and read from `refs/notes/commits`, but this "
"default can be overridden. See the OPTIONS, CONFIGURATION, and ENVIRONMENT "
-"sections below. If this ref does not exist, it will be quietly created when"
-" it is first needed to store a note."
+"sections below. If this ref does not exist, it will be quietly created when "
+"it is first needed to store a note."
msgstr ""
#. type: Plain text
@@ -40095,8 +39929,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:45
msgid ""
-"Notes can also be added to patches prepared with `git format-patch` by using"
-" the `--notes` option. Such notes are added as a patch commentary after a "
+"Notes can also be added to patches prepared with `git format-patch` by using "
+"the `--notes` option. Such notes are added as a patch commentary after a "
"three dash separator line."
msgstr ""
@@ -40129,8 +39963,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:61
msgid ""
-"List the notes object for a given object. If no object is given, show a list"
-" of all note objects and the objects they annotate (in the format \"<note "
+"List the notes object for a given object. If no object is given, show a list "
+"of all note objects and the objects they annotate (in the format \"<note "
"object> <annotated object>\"). This is the default subcommand if no "
"subcommand is given."
msgstr ""
@@ -40144,9 +39978,9 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:69
msgid ""
-"Add notes for a given object (defaults to HEAD). Abort if the object already"
-" has notes (use `-f` to overwrite existing notes). However, if you're using"
-" `add` interactively (using an editor to supply the notes contents), then - "
+"Add notes for a given object (defaults to HEAD). Abort if the object already "
+"has notes (use `-f` to overwrite existing notes). However, if you're using "
+"`add` interactively (using an editor to supply the notes contents), then - "
"instead of aborting - the existing notes will be opened in the editor (like "
"the `edit` subcommand)."
msgstr ""
@@ -40195,8 +40029,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:90
msgid ""
-"Append to the notes of an existing object (defaults to HEAD). Creates a new"
-" notes object if needed."
+"Append to the notes of an existing object (defaults to HEAD). Creates a new "
+"notes object if needed."
msgstr ""
#. type: Labeled list
@@ -40239,10 +40073,10 @@ msgstr ""
#: en/git-notes.txt:111
msgid ""
"If conflicts arise and a strategy for automatically resolving conflicting "
-"notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the "
-"\"manual\" resolver is used. This resolver checks out the conflicting notes "
-"in a special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user "
-"to manually resolve the conflicts there. When done, the user can either "
+"notes (see the \"NOTES MERGE STRATEGIES\" section) is not given, the \"manual"
+"\" resolver is used. This resolver checks out the conflicting notes in a "
+"special worktree (`.git/NOTES_MERGE_WORKTREE`), and instructs the user to "
+"manually resolve the conflicts there. When done, the user can either "
"finalize the merge with 'git notes merge --commit', or abort the merge with "
"'git notes merge --abort'."
msgstr ""
@@ -40295,8 +40129,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:139
msgid ""
-"Use the given note message (instead of prompting). If multiple `-m` options"
-" are given, their values are concatenated as separate paragraphs. Lines "
+"Use the given note message (instead of prompting). If multiple `-m` options "
+"are given, their values are concatenated as separate paragraphs. Lines "
"starting with `#` and empty lines other than a single line between "
"paragraphs will be stripped out."
msgstr ""
@@ -40304,9 +40138,9 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:146
msgid ""
-"Take the note message from the given file. Use '-' to read the note message"
-" from the standard input. Lines starting with `#` and empty lines other "
-"than a single line between paragraphs will be stripped out."
+"Take the note message from the given file. Use '-' to read the note message "
+"from the standard input. Lines starting with `#` and empty lines other than "
+"a single line between paragraphs will be stripped out."
msgstr ""
#. type: Labeled list
@@ -40324,8 +40158,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:152
msgid ""
-"Take the given blob object (for\texample, another note) as the note message."
-" (Use `git notes copy <object>` instead to copy notes between objects.)"
+"Take the given blob object (for\texample, another note) as the note message. "
+"(Use `git notes copy <object>` instead to copy notes between objects.)"
msgstr ""
#. type: Labeled list
@@ -40343,8 +40177,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:157
msgid ""
-"Like '-C', but with `-c` the editor is invoked, so that the user can further"
-" edit the note message."
+"Like '-C', but with `-c` the editor is invoked, so that the user can further "
+"edit the note message."
msgstr ""
#. type: Plain text
@@ -40364,8 +40198,8 @@ msgstr ""
#: en/git-notes.txt:168
msgid ""
"Manipulate the notes tree in <ref>. This overrides `GIT_NOTES_REF` and the "
-"\"core.notesRef\" configuration. The ref specifies the full refname when it"
-" begins with `refs/notes/`; when it begins with `notes/`, `refs/` and "
+"\"core.notesRef\" configuration. The ref specifies the full refname when it "
+"begins with `refs/notes/`; when it begins with `notes/`, `refs/` and "
"otherwise `refs/notes/` is prefixed to form a full name of the ref."
msgstr ""
@@ -40379,8 +40213,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:177
msgid ""
-"Also read the object names to remove notes from the standard input (there is"
-" no reason you cannot combine this with object names from the command line)."
+"Also read the object names to remove notes from the standard input (there is "
+"no reason you cannot combine this with object names from the command line)."
msgstr ""
#. type: Plain text
@@ -40400,16 +40234,15 @@ msgstr ""
#: en/git-notes.txt:191
msgid ""
"When merging notes, resolve notes conflicts using the given strategy. The "
-"following strategies are recognized: \"manual\" (default), \"ours\", "
-"\"theirs\", \"union\" and \"cat_sort_uniq\". This option overrides the "
-"\"notes.mergeStrategy\" configuration setting. See the \"NOTES MERGE "
-"STRATEGIES\" section below for more information on each notes merge "
-"strategy."
+"following strategies are recognized: \"manual\" (default), \"ours\", \"theirs"
+"\", \"union\" and \"cat_sort_uniq\". This option overrides the \"notes."
+"mergeStrategy\" configuration setting. See the \"NOTES MERGE STRATEGIES\" "
+"section below for more information on each notes merge strategy."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:192 en/merge-options.txt:1
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--commit"
msgstr "--commit"
@@ -40417,11 +40250,11 @@ msgstr "--commit"
#: en/git-notes.txt:200
msgid ""
"Finalize an in-progress 'git notes merge'. Use this option when you have "
-"resolved the conflicts that 'git notes merge' stored in "
-".git/NOTES_MERGE_WORKTREE. This amends the partial merge commit created by "
-"'git notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes "
-"in .git/NOTES_MERGE_WORKTREE. The notes ref stored in the "
-".git/NOTES_MERGE_REF symref is updated to the resulting commit."
+"resolved the conflicts that 'git notes merge' stored in .git/"
+"NOTES_MERGE_WORKTREE. This amends the partial merge commit created by 'git "
+"notes merge' (stored in .git/NOTES_MERGE_PARTIAL) by adding the notes in ."
+"git/NOTES_MERGE_WORKTREE. The notes ref stored in the .git/NOTES_MERGE_REF "
+"symref is updated to the resulting commit."
msgstr ""
#. type: Plain text
@@ -40446,21 +40279,21 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:229
msgid ""
-"Commit notes are blobs containing extra information about an object (usually"
-" information to supplement a commit's message). These blobs are taken from "
+"Commit notes are blobs containing extra information about an object (usually "
+"information to supplement a commit's message). These blobs are taken from "
"notes refs. A notes ref is usually a branch which contains \"files\" whose "
"paths are the object names for the objects they describe, with some "
"directory separators included for performance reasons footnote:[Permitted "
-"pathnames have the form 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence"
-" of directory names of two hexadecimal digits each followed by a filename "
+"pathnames have the form 'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence "
+"of directory names of two hexadecimal digits each followed by a filename "
"with the rest of the object ID.]."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:236
msgid ""
-"Every notes change creates a new commit at the specified notes ref. You can"
-" therefore inspect the history of the notes by invoking, e.g., `git log -p "
+"Every notes change creates a new commit at the specified notes ref. You can "
+"therefore inspect the history of the notes by invoking, e.g., `git log -p "
"notes/commits`. Currently the commit message only records which operation "
"triggered the update, and the commit authorship is determined according to "
"the usual rules (see linkgit:git-commit[1]). These details may change in "
@@ -40484,12 +40317,11 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:252
msgid ""
-"The default notes merge strategy is \"manual\", which checks out conflicting"
-" notes in a special work tree for resolving notes conflicts "
-"(`.git/NOTES_MERGE_WORKTREE`), and instructs the user to resolve the "
-"conflicts in that work tree. When done, the user can either finalize the "
-"merge with 'git notes merge --commit', or abort the merge with 'git notes "
-"merge --abort'."
+"The default notes merge strategy is \"manual\", which checks out conflicting "
+"notes in a special work tree for resolving notes conflicts (`.git/"
+"NOTES_MERGE_WORKTREE`), and instructs the user to resolve the conflicts in "
+"that work tree. When done, the user can either finalize the merge with 'git "
+"notes merge --commit', or abort the merge with 'git notes merge --abort'."
msgstr ""
#. type: Plain text
@@ -40524,9 +40356,9 @@ msgstr ""
#: en/git-notes.txt:275
msgid ""
"\"cat_sort_uniq\" is similar to \"union\", but in addition to concatenating "
-"the local and remote versions, this strategy also sorts the resulting lines,"
-" and removes duplicate lines from the result. This is equivalent to applying"
-" the \"cat | sort | uniq\" shell pipeline to the local and remote versions. "
+"the local and remote versions, this strategy also sorts the resulting lines, "
+"and removes duplicate lines from the result. This is equivalent to applying "
+"the \"cat | sort | uniq\" shell pipeline to the local and remote versions. "
"This strategy is useful if the notes follow a line-based format where one "
"wants to avoid duplicated lines in the merge result. Note that if either "
"the local or remote version contain duplicate lines prior to the merge, "
@@ -40536,8 +40368,8 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:282
msgid ""
-"You can use notes to add annotations with information that was not available"
-" at the time a commit was written."
+"You can use notes to add annotations with information that was not available "
+"at the time a commit was written."
msgstr ""
#. type: delimited block -
@@ -40587,7 +40419,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:313
-#, ignore-same, no-wrap
+#, no-wrap
msgid "core.notesRef"
msgstr "core.notesRef"
@@ -40610,8 +40442,8 @@ msgstr ""
msgid ""
"Which merge strategy to choose by default when resolving notes conflicts. "
"Must be one of `manual`, `ours`, `theirs`, `union`, or `cat_sort_uniq`. "
-"Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more"
-" information on each strategy."
+"Defaults to `manual`. See \"NOTES MERGE STRATEGIES\" section above for more "
+"information on each strategy."
msgstr ""
#. type: Plain text
@@ -40628,10 +40460,10 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:332
msgid ""
-"Which merge strategy to choose when doing a notes merge into "
-"refs/notes/<name>. This overrides the more general \"notes.mergeStrategy\"."
-" See the \"NOTES MERGE STRATEGIES\" section above for more information on "
-"each available strategy."
+"Which merge strategy to choose when doing a notes merge into refs/notes/"
+"<name>. This overrides the more general \"notes.mergeStrategy\". See the "
+"\"NOTES MERGE STRATEGIES\" section above for more information on each "
+"available strategy."
msgstr ""
#. type: Plain text
@@ -40675,16 +40507,16 @@ msgstr ""
#. type: Plain text
#: en/git-notes.txt:356
msgid ""
-"When copying notes during a rewrite, what to do if the target commit already"
-" has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or"
-" `ignore`. Defaults to `concatenate`."
+"When copying notes during a rewrite, what to do if the target commit already "
+"has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or "
+"`ignore`. Defaults to `concatenate`."
msgstr ""
#. type: Plain text
#: en/git-notes.txt:359
msgid ""
-"This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment"
-" variable."
+"This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` environment "
+"variable."
msgstr ""
#. type: Labeled list
@@ -40717,7 +40549,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:375
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_NOTES_REF`"
msgstr "`GIT_NOTES_REF`"
@@ -40730,7 +40562,7 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:379
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_NOTES_DISPLAY_REF`"
msgstr "`GIT_NOTES_DISPLAY_REF`"
@@ -40738,8 +40570,8 @@ msgstr "`GIT_NOTES_DISPLAY_REF`"
#: en/git-notes.txt:385
msgid ""
"Colon-delimited list of refs or globs indicating which refs, in addition to "
-"the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when"
-" showing commit messages. This overrides the `notes.displayRef` setting."
+"the default from `core.notesRef` or `GIT_NOTES_REF`, to read notes from when "
+"showing commit messages. This overrides the `notes.displayRef` setting."
msgstr ""
#. type: Plain text
@@ -40751,21 +40583,21 @@ msgstr ""
#. type: Labeled list
#: en/git-notes.txt:389
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_NOTES_REWRITE_MODE`"
msgstr "`GIT_NOTES_REWRITE_MODE`"
#. type: Plain text
#: en/git-notes.txt:394
msgid ""
-"When copying notes during a rewrite, what to do if the target commit already"
-" has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or"
-" `ignore`. This overrides the `core.rewriteMode` setting."
+"When copying notes during a rewrite, what to do if the target commit already "
+"has a note. Must be one of `overwrite`, `concatenate`, `cat_sort_uniq`, or "
+"`ignore`. This overrides the `core.rewriteMode` setting."
msgstr ""
#. type: Labeled list
#: en/git-notes.txt:395
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_NOTES_REWRITE_REF`"
msgstr "`GIT_NOTES_REWRITE_REF`"
@@ -40785,7 +40617,7 @@ msgstr ""
#. type: Title =
#: en/git-p4.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4(1)"
msgstr "git-p4(1)"
@@ -40806,8 +40638,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:22
-msgid ""
-"This command provides a way to interact with p4 repositories using Git."
+msgid "This command provides a way to interact with p4 repositories using Git."
msgstr ""
#. type: Plain text
@@ -40816,8 +40647,8 @@ msgid ""
"Create a new Git repository from an existing p4 repository using 'git p4 "
"clone', giving it one or more p4 depot paths. Incorporate new commits from "
"p4 changes with 'git p4 sync'. The 'sync' command is also used to include "
-"new branches from other p4 depot paths. Submit Git changes back to p4 using"
-" 'git p4 submit'. The command 'git p4 rebase' does a sync plus rebases the "
+"new branches from other p4 depot paths. Submit Git changes back to p4 using "
+"'git p4 submit'. The command 'git p4 rebase' does a sync plus rebases the "
"current branch onto the updated p4 remote branch."
msgstr ""
@@ -40849,8 +40680,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:50
msgid ""
-"Update the Git repository with recent changes from p4, rebasing your work on"
-" top:"
+"Update the Git repository with recent changes from p4, rebasing your work on "
+"top:"
msgstr ""
#. type: delimited block -
@@ -40927,8 +40758,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:92
msgid ""
-"As development continues in the p4 repository, those changes can be included"
-" in the Git repository using:"
+"As development continues in the p4 repository, those changes can be included "
+"in the Git repository using:"
msgstr ""
#. type: delimited block -
@@ -41012,16 +40843,16 @@ msgstr ""
msgid ""
"Submitting changes from a Git repository back to the p4 repository requires "
"a separate p4 client workspace. This should be specified using the "
-"`P4CLIENT` environment variable or the Git configuration variable "
-"'git-p4.client'. The p4 client must exist, but the client root will be "
-"created and populated if it does not already exist."
+"`P4CLIENT` environment variable or the Git configuration variable 'git-p4."
+"client'. The p4 client must exist, but the client root will be created and "
+"populated if it does not already exist."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:143
msgid ""
-"To submit all changes that are in the current Git branch but not in the "
-"'p4/master' branch, use:"
+"To submit all changes that are in the current Git branch but not in the 'p4/"
+"master' branch, use:"
msgstr ""
#. type: Plain text
@@ -41058,9 +40889,9 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:165
msgid ""
-"The p4 changes will be created as the user invoking 'git p4 submit'. The "
-"`--preserve-user` option will cause ownership to be modified according to "
-"the author of the Git commit. This option requires admin privileges in p4, "
+"The p4 changes will be created as the user invoking 'git p4 submit'. The `--"
+"preserve-user` option will cause ownership to be modified according to the "
+"author of the Git commit. This option requires admin privileges in p4, "
"which can be granted using 'p4 protect'."
msgstr ""
@@ -41088,8 +40919,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:178
msgid ""
-"Unshelving will take a shelved P4 changelist, and produce the equivalent git"
-" commit in the branch refs/remotes/p4-unshelved/<changelist>."
+"Unshelving will take a shelved P4 changelist, and produce the equivalent git "
+"commit in the branch refs/remotes/p4-unshelved/<changelist>."
msgstr ""
#. type: Plain text
@@ -41182,8 +41013,8 @@ msgstr ""
#: en/git-p4.txt:225
msgid ""
"By default a <ref> not starting with refs/ is treated as the name of a "
-"remote-tracking branch (under refs/remotes/). This behavior can be modified"
-" using the --import-local option."
+"remote-tracking branch (under refs/remotes/). This behavior can be modified "
+"using the --import-local option."
msgstr ""
#. type: Plain text
@@ -41208,7 +41039,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:236
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--detect-branches"
msgstr "--detect-branches"
@@ -41235,7 +41066,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:245
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--silent"
msgstr "--silent"
@@ -41246,21 +41077,21 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:248
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--detect-labels"
msgstr "--detect-labels"
#. type: Plain text
#: en/git-p4.txt:252
msgid ""
-"Query p4 for labels associated with the depot paths, and add them as tags in"
-" Git. Limited usefulness as only imports labels associated with new "
+"Query p4 for labels associated with the depot paths, and add them as tags in "
+"Git. Limited usefulness as only imports labels associated with new "
"changelists. Deprecated."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:253 en/git-p4.txt:389
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--import-labels"
msgstr "--import-labels"
@@ -41271,15 +41102,15 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:256
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--import-local"
msgstr "--import-local"
#. type: Plain text
#: en/git-p4.txt:263
msgid ""
-"By default, p4 branches are stored in 'refs/remotes/p4/', where they will be"
-" treated as remote-tracking branches by linkgit:git-branch[1] and other "
+"By default, p4 branches are stored in 'refs/remotes/p4/', where they will be "
+"treated as remote-tracking branches by linkgit:git-branch[1] and other "
"commands. This option instead puts p4 branches in 'refs/heads/p4/'. Note "
"that future sync operations must specify `--import-local` as well so that "
"they can find the p4 branches in refs/heads."
@@ -41294,10 +41125,10 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:270
msgid ""
-"Import at most 'n' changes, rather than the entire range of changes included"
-" in the given revision specifier. A typical usage would be use '@all' as the"
-" revision specifier, but then to use '--max-changes 1000' to import only the"
-" last 1000 revisions rather than the entire revision history."
+"Import at most 'n' changes, rather than the entire range of changes included "
+"in the given revision specifier. A typical usage would be use '@all' as the "
+"revision specifier, but then to use '--max-changes 1000' to import only the "
+"last 1000 revisions rather than the entire revision history."
msgstr ""
#. type: Labeled list
@@ -41312,14 +41143,14 @@ msgid ""
"The internal block size to use when converting a revision specifier such as "
"'@all' into a list of specific change numbers. Instead of using a single "
"call to 'p4 changes' to find the full list of changes for the conversion, "
-"there are a sequence of calls to 'p4 changes -m', each of which requests one"
-" block of changes of the given size. The default block size is 500, which "
+"there are a sequence of calls to 'p4 changes -m', each of which requests one "
+"block of changes of the given size. The default block size is 500, which "
"should usually be suitable."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:280
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--keep-path"
msgstr "--keep-path"
@@ -41335,7 +41166,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:288
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--use-client-spec"
msgstr "--use-client-spec"
@@ -41415,27 +41246,27 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:322
msgid ""
-"Detect renames. See linkgit:git-diff[1]. Renames will be represented in p4"
-" using explicit 'move' operations. There is no corresponding option to "
+"Detect renames. See linkgit:git-diff[1]. Renames will be represented in p4 "
+"using explicit 'move' operations. There is no corresponding option to "
"detect copies, but there are variables for both moves and copies."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:323
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--preserve-user"
msgstr "--preserve-user"
#. type: Plain text
#: en/git-p4.txt:326
msgid ""
-"Re-author p4 changes before submitting to p4. This option requires p4 admin"
-" privileges."
+"Re-author p4 changes before submitting to p4. This option requires p4 admin "
+"privileges."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:327
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--export-labels"
msgstr "--export-labels"
@@ -41455,23 +41286,23 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:336
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--prepare-p4-only"
msgstr "--prepare-p4-only"
#. type: Plain text
#: en/git-p4.txt:342
msgid ""
-"Apply a commit to the p4 workspace, opening, adding and deleting files in p4"
-" as for a normal submit operation. Do not issue the final \"p4 submit\", "
-"but instead print a message about how to submit manually or revert. This "
-"option always stops after the first (oldest) commit. Git tags are not "
-"exported to p4."
+"Apply a commit to the p4 workspace, opening, adding and deleting files in p4 "
+"as for a normal submit operation. Do not issue the final \"p4 submit\", but "
+"instead print a message about how to submit manually or revert. This option "
+"always stops after the first (oldest) commit. Git tags are not exported to "
+"p4."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:343
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--shelve"
msgstr "--shelve"
@@ -41540,7 +41371,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:368
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--disable-rebase"
msgstr "--disable-rebase"
@@ -41553,7 +41384,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:372
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--disable-p4sync"
msgstr "--disable-p4sync"
@@ -41561,8 +41392,8 @@ msgstr "--disable-p4sync"
#: en/git-p4.txt:376
msgid ""
"Disable the automatic sync of p4/master from Perforce after commits have "
-"been submitted. Implies --disable-rebase. Can also be set with "
-"git-p4.disableP4Sync. Sync with origin/master still goes ahead if possible."
+"been submitted. Implies --disable-rebase. Can also be set with git-p4."
+"disableP4Sync. Sync with origin/master still goes ahead if possible."
msgstr ""
#. type: Title ~
@@ -41608,7 +41439,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:395
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--origin"
msgstr "--origin"
@@ -41628,9 +41459,9 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:404
msgid ""
-"The p4 depot path argument to 'git p4 sync' and 'git p4 clone' can be one or"
-" more space-separated p4 depot paths, with an optional p4 revision specifier"
-" on the end:"
+"The p4 depot path argument to 'git p4 sync' and 'git p4 clone' can be one or "
+"more space-separated p4 depot paths, with an optional p4 revision specifier "
+"on the end:"
msgstr ""
#. type: Labeled list
@@ -41641,8 +41472,7 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:407
-msgid ""
-"Import one commit with all files in the '#head' change under that tree."
+msgid "Import one commit with all files in the '#head' change under that tree."
msgstr ""
#. type: Labeled list
@@ -41678,11 +41508,11 @@ msgstr ""
msgid ""
"Import all changes from both named depot paths into a single repository. "
"Only files below these directories are included. There is not a "
-"subdirectory in Git for each \"proj1\" and \"proj2\". You must use the "
-"`--destination` option when specifying more than one depot path. The "
-"revision specifier must be specified identically on each depot path. If "
-"there are files in the depot paths with the same name, the path with the "
-"most recently updated version of the file is the one that appears in Git."
+"subdirectory in Git for each \"proj1\" and \"proj2\". You must use the `--"
+"destination` option when specifying more than one depot path. The revision "
+"specifier must be specified identically on each depot path. If there are "
+"files in the depot paths with the same name, the path with the most recently "
+"updated version of the file is the one that appears in Git."
msgstr ""
#. type: Plain text
@@ -41701,8 +41531,8 @@ msgstr ""
msgid ""
"The p4 client specification is maintained with the 'p4 client' command and "
"contains among other fields, a View that specifies how the depot is mapped "
-"into the client repository. The 'clone' and 'sync' commands can consult the"
-" client spec when given the `--use-client-spec` option or when the "
+"into the client repository. The 'clone' and 'sync' commands can consult the "
+"client spec when given the `--use-client-spec` option or when the "
"useClientSpec variable is true. After 'git p4 clone', the useClientSpec "
"variable is automatically set in the repository configuration file. This "
"allows future 'git p4 submit' commands to work properly; the submit command "
@@ -41713,10 +41543,10 @@ msgstr ""
#: en/git-p4.txt:445
msgid ""
"The full syntax for a p4 view is documented in 'p4 help views'. 'git p4' "
-"knows only a subset of the view syntax. It understands multi-line mappings,"
-" overlays with '+', exclusions with '-' and double-quotes around whitespace."
-" Of the possible wildcards, 'git p4' only handles '...', and only when it "
-"is at the end of the path. 'git p4' will complain if it encounters an "
+"knows only a subset of the view syntax. It understands multi-line mappings, "
+"overlays with '+', exclusions with '-' and double-quotes around whitespace. "
+"Of the possible wildcards, 'git p4' only handles '...', and only when it is "
+"at the end of the path. 'git p4' will complain if it encounters an "
"unhandled wildcard."
msgstr ""
@@ -41725,8 +41555,8 @@ msgstr ""
msgid ""
"Bugs in the implementation of overlap mappings exist. If multiple depot "
"paths map through overlays to the same location in the repository, 'git p4' "
-"can choose the wrong one. This is hard to solve without dedicating a client"
-" spec just for 'git p4'."
+"can choose the wrong one. This is hard to solve without dedicating a client "
+"spec just for 'git p4'."
msgstr ""
#. type: Plain text
@@ -41747,11 +41577,11 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:465
msgid ""
-"P4 does not have the same concept of a branch as Git. Instead, p4 organizes"
-" its content as a directory tree, where by convention different logical "
-"branches are in different locations in the tree. The 'p4 branch' command is"
-" used to maintain mappings between different areas in the tree, and indicate"
-" related content. 'git p4' can use these mappings to determine branch "
+"P4 does not have the same concept of a branch as Git. Instead, p4 organizes "
+"its content as a directory tree, where by convention different logical "
+"branches are in different locations in the tree. The 'p4 branch' command is "
+"used to maintain mappings between different areas in the tree, and indicate "
+"related content. 'git p4' can use these mappings to determine branch "
"relationships."
msgstr ""
@@ -41760,8 +41590,8 @@ msgstr ""
msgid ""
"If you have a repository where all the branches of interest exist as "
"subdirectories of a single depot path, you can use `--detect-branches` when "
-"cloning or syncing to have 'git p4' automatically find subdirectories in p4,"
-" and to generate these as branches in Git."
+"cloning or syncing to have 'git p4' automatically find subdirectories in p4, "
+"and to generate these as branches in Git."
msgstr ""
#. type: Plain text
@@ -41809,14 +41639,14 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:498
msgid ""
-"However, it is not necessary to create branches in p4 to be able to use them"
-" like branches. Because it is difficult to infer branch relationships "
+"However, it is not necessary to create branches in p4 to be able to use them "
+"like branches. Because it is difficult to infer branch relationships "
"automatically, a Git configuration setting 'git-p4.branchList' can be used "
-"to explicitly identify branch relationships. It is a list of "
-"\"source:destination\" pairs, like a simple p4 branch specification, where "
-"the \"source\" and \"destination\" are the path elements in the p4 "
-"repository. The example above relied on the presence of the p4 branch. "
-"Without p4 branches, the same result will occur with:"
+"to explicitly identify branch relationships. It is a list of \"source:"
+"destination\" pairs, like a simple p4 branch specification, where the "
+"\"source\" and \"destination\" are the path elements in the p4 repository. "
+"The example above relied on the presence of the p4 branch. Without p4 "
+"branches, the same result will occur with:"
msgstr ""
#. type: delimited block -
@@ -41833,16 +41663,16 @@ msgstr ""
#: en/git-p4.txt:512
msgid ""
"The fast-import mechanism used by 'git p4' creates one pack file for each "
-"invocation of 'git p4 sync'. Normally, Git garbage compression "
-"(linkgit:git-gc[1]) automatically compresses these to fewer pack files, but "
-"explicit invocation of 'git repack -adf' may improve performance."
+"invocation of 'git p4 sync'. Normally, Git garbage compression (linkgit:git-"
+"gc[1]) automatically compresses these to fewer pack files, but explicit "
+"invocation of 'git repack -adf' may improve performance."
msgstr ""
#. type: Plain text
#: en/git-p4.txt:518
msgid ""
-"The following config settings can be used to modify 'git p4' behavior. They"
-" all are in the 'git-p4' section."
+"The following config settings can be used to modify 'git p4' behavior. They "
+"all are in the 'git-p4' section."
msgstr ""
#. type: Title ~
@@ -41853,7 +41683,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:521
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.user"
msgstr "git-p4.user"
@@ -41866,7 +41696,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:525
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.password"
msgstr "git-p4.password"
@@ -41879,7 +41709,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:530
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.port"
msgstr "git-p4.port"
@@ -41892,7 +41722,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:535
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.host"
msgstr "git-p4.host"
@@ -41905,7 +41735,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:540
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.client"
msgstr "git-p4.client"
@@ -41918,7 +41748,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:544
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.retries"
msgstr "git-p4.retries"
@@ -41938,7 +41768,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:552
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.syncFromOrigin"
msgstr "git-p4.syncFromOrigin"
@@ -41954,7 +41784,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:559
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.branchUser"
msgstr "git-p4.branchUser"
@@ -41962,13 +41792,13 @@ msgstr "git-p4.branchUser"
#: en/git-p4.txt:564
msgid ""
"One phase in branch detection involves looking at p4 branches to find new "
-"ones to import. By default, all branches are inspected. This option limits"
-" the search to just those owned by the single user named in the variable."
+"ones to import. By default, all branches are inspected. This option limits "
+"the search to just those owned by the single user named in the variable."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:565
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.branchList"
msgstr "git-p4.branchList"
@@ -42003,7 +41833,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:580
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.importLabels"
msgstr "git-p4.importLabels"
@@ -42014,7 +41844,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:583
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.labelImportRegexp"
msgstr "git-p4.labelImportRegexp"
@@ -42027,22 +41857,22 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:587
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.useClientSpec"
msgstr "git-p4.useClientSpec"
#. type: Plain text
#: en/git-p4.txt:592
msgid ""
-"Specify that the p4 client spec should be used to identify p4 depot paths of"
-" interest. This is equivalent to specifying the option `--use-client-spec`."
-" See the \"CLIENT SPEC\" section above. This variable is a boolean, not "
-"the name of a p4 client."
+"Specify that the p4 client spec should be used to identify p4 depot paths of "
+"interest. This is equivalent to specifying the option `--use-client-spec`. "
+"See the \"CLIENT SPEC\" section above. This variable is a boolean, not the "
+"name of a p4 client."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:593
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.pathEncoding"
msgstr "git-p4.pathEncoding"
@@ -42050,15 +41880,15 @@ msgstr "git-p4.pathEncoding"
#: en/git-p4.txt:599
msgid ""
"Perforce keeps the encoding of a path as given by the originating OS. Git "
-"expects paths encoded as UTF-8. Use this config to tell git-p4 what encoding"
-" Perforce had used for the paths. This encoding is used to transcode the "
+"expects paths encoded as UTF-8. Use this config to tell git-p4 what encoding "
+"Perforce had used for the paths. This encoding is used to transcode the "
"paths to UTF-8. As an example, Perforce on Windows often uses \"cp1252\" to "
"encode path names."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:600
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.largeFileSystem"
msgstr "git-p4.largeFileSystem"
@@ -42066,10 +41896,10 @@ msgstr "git-p4.largeFileSystem"
#: en/git-p4.txt:606
msgid ""
"Specify the system that is used for large (binary) files. Please note that "
-"large file systems do not support the 'git p4 submit' command. Only Git LFS"
-" is implemented right now (see https://git-lfs.github.com/ for more "
-"information). Download and install the Git LFS command line extension to use"
-" this option and configure it like this:"
+"large file systems do not support the 'git p4 submit' command. Only Git LFS "
+"is implemented right now (see https://git-lfs.github.com/ for more "
+"information). Download and install the Git LFS command line extension to use "
+"this option and configure it like this:"
msgstr ""
#. type: delimited block -
@@ -42080,7 +41910,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:611
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.largeFileExtensions"
msgstr "git-p4.largeFileExtensions"
@@ -42093,7 +41923,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:615
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.largeFileThreshold"
msgstr "git-p4.largeFileThreshold"
@@ -42107,7 +41937,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:620
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.largeFileCompressedThreshold"
msgstr "git-p4.largeFileCompressedThreshold"
@@ -42122,7 +41952,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:626
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.largeFilePush"
msgstr "git-p4.largeFilePush"
@@ -42135,7 +41965,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:630
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.keepEmptyCommits"
msgstr "git-p4.keepEmptyCommits"
@@ -42148,7 +41978,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:634
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.mapUser"
msgstr "git-p4.mapUser"
@@ -42180,7 +42010,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:647
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.detectRenames"
msgstr "git-p4.detectRenames"
@@ -42193,7 +42023,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:651
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.detectCopies"
msgstr "git-p4.detectCopies"
@@ -42206,7 +42036,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:655
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.detectCopiesHarder"
msgstr "git-p4.detectCopiesHarder"
@@ -42217,7 +42047,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:658
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.preserveUser"
msgstr "git-p4.preserveUser"
@@ -42243,7 +42073,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:667
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.skipSubmitEdit"
msgstr "git-p4.skipSubmitEdit"
@@ -42256,7 +42086,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:672
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.skipSubmitEditCheck"
msgstr "git-p4.skipSubmitEditCheck"
@@ -42270,7 +42100,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:677
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.allowSubmit"
msgstr "git-p4.allowSubmit"
@@ -42279,14 +42109,14 @@ msgstr "git-p4.allowSubmit"
msgid ""
"By default, any branch can be used as the source for a 'git p4 submit' "
"operation. This configuration variable, if set, permits only the named "
-"branches to be used as submit sources. Branch names must be the short names"
-" (no \"refs/heads/\"), and should be separated by commas (\",\"), with no "
+"branches to be used as submit sources. Branch names must be the short names "
+"(no \"refs/heads/\"), and should be separated by commas (\",\"), with no "
"spaces."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:684
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.skipUserNameCheck"
msgstr "git-p4.skipUserNameCheck"
@@ -42299,7 +42129,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:689
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.attemptRCSCleanup"
msgstr "git-p4.attemptRCSCleanup"
@@ -42313,7 +42143,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:695
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.exportLabels"
msgstr "git-p4.exportLabels"
@@ -42324,7 +42154,7 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:698
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.labelExportRegexp"
msgstr "git-p4.labelExportRegexp"
@@ -42337,20 +42167,20 @@ msgstr ""
#. type: Labeled list
#: en/git-p4.txt:702
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.conflict"
msgstr "git-p4.conflict"
#. type: Plain text
#: en/git-p4.txt:705
msgid ""
-"Specify submit behavior when a conflict with p4 is found, as per --conflict."
-" The default behavior is 'ask'."
+"Specify submit behavior when a conflict with p4 is found, as per --"
+"conflict. The default behavior is 'ask'."
msgstr ""
#. type: Labeled list
#: en/git-p4.txt:706
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-p4.disableRebase"
msgstr "git-p4.disableRebase"
@@ -42368,8 +42198,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:711
msgid ""
-"Do not sync p4/master with Perforce following a submit. Implies "
-"git-p4.disableRebase."
+"Do not sync p4/master with Perforce following a submit. Implies git-p4."
+"disableRebase."
msgstr ""
#. type: Title -
@@ -42386,8 +42216,8 @@ msgstr ""
#. type: Plain text
#: en/git-p4.txt:717
msgid ""
-"Cloning or syncing does not require a p4 client; file contents are collected"
-" using 'p4 print'."
+"Cloning or syncing does not require a p4 client; file contents are collected "
+"using 'p4 print'."
msgstr ""
#. type: Plain text
@@ -42408,7 +42238,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-objects.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-pack-objects(1)"
msgstr "git-pack-objects(1)"
@@ -42432,9 +42262,9 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:25
msgid ""
-"Reads list of objects from the standard input, and writes either one or more"
-" packed archives with the specified base-name to disk, or a packed archive "
-"to the standard output."
+"Reads list of objects from the standard input, and writes either one or more "
+"packed archives with the specified base-name to disk, or a packed archive to "
+"the standard output."
msgstr ""
#. type: Plain text
@@ -42457,9 +42287,9 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:41
msgid ""
-"A pack index file (.idx) is generated for fast, random access to the objects"
-" in the pack. Placing both the index file (.idx) and the packed archive "
-"(.pack) in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or any of the "
+"A pack index file (.idx) is generated for fast, random access to the objects "
+"in the pack. Placing both the index file (.idx) and the packed archive (."
+"pack) in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or any of the "
"directories on $GIT_ALTERNATE_OBJECT_DIRECTORIES) enables Git to read from "
"the pack archive."
msgstr ""
@@ -42484,8 +42314,8 @@ msgstr ""
msgid ""
"Write into pairs of files (.pack and .idx), using <base-name> to determine "
"the name of the created file. When this option is used, the two files in a "
-"pair are written in <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash"
-" based on the pack content and is written to the standard output of the "
+"pair are written in <base-name>-<SHA-1>.{pack,idx} files. <SHA-1> is a hash "
+"based on the pack content and is written to the standard output of the "
"command."
msgstr ""
@@ -42498,7 +42328,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:63
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--revs"
msgstr "--revs"
@@ -42506,15 +42336,15 @@ msgstr "--revs"
#: en/git-pack-objects.txt:71
msgid ""
"Read the revision arguments from the standard input, instead of individual "
-"object names. The revision arguments are processed the same way as 'git "
-"rev-list' with the `--objects` flag uses its `commit` arguments to build the"
-" list of objects it outputs. The objects on the resulting list are packed."
-" Besides revisions, `--not` or `--shallow <SHA-1>` lines are also accepted."
+"object names. The revision arguments are processed the same way as 'git rev-"
+"list' with the `--objects` flag uses its `commit` arguments to build the "
+"list of objects it outputs. The objects on the resulting list are packed. "
+"Besides revisions, `--not` or `--shallow <SHA-1>` lines are also accepted."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:72 en/rev-list-options.txt:707
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--unpacked"
msgstr "--unpacked"
@@ -42537,8 +42367,8 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:87
msgid ""
-"Include unasked-for annotated tags if the object they reference was included"
-" in the resulting packfile. This can be useful to send new tags to native "
+"Include unasked-for annotated tags if the object they reference was included "
+"in the resulting packfile. This can be useful to send new tags to native "
"Git clients."
msgstr ""
@@ -42553,18 +42383,18 @@ msgstr ""
msgid ""
"These two options affect how the objects contained in the pack are stored "
"using delta compression. The objects are first internally sorted by type, "
-"size and optionally names and compared against the other objects within "
-"--window to see if using delta compression saves space. --depth limits the "
+"size and optionally names and compared against the other objects within --"
+"window to see if using delta compression saves space. --depth limits the "
"maximum delta depth; making it too deep affects the performance on the "
-"unpacker side, because delta data needs to be applied that many times to get"
-" to the necessary object."
+"unpacker side, because delta data needs to be applied that many times to get "
+"to the necessary object."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:102 en/git-repack.txt:101
msgid ""
-"The default value for --window is 10 and --depth is 50. The maximum depth is"
-" 4095."
+"The default value for --window is 10 and --depth is 50. The maximum depth is "
+"4095."
msgstr ""
#. type: Labeled list
@@ -42580,8 +42410,8 @@ msgid ""
"size will dynamically scale down so as to not take up more than '<n>' bytes "
"in memory. This is useful in repositories with a mix of large and small "
"objects to not run out of memory with a large window, but still be able to "
-"take advantage of the large window for the smaller objects. The size can be"
-" suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory "
+"take advantage of the large window for the smaller objects. The size can be "
+"suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory "
"usage unlimited. The default is taken from the `pack.windowMemory` "
"configuration variable."
msgstr ""
@@ -42592,15 +42422,15 @@ msgid ""
"In unusual scenarios, you may not be able to create files larger than a "
"certain size on your filesystem, and this option can be used to tell the "
"command to split the output packfile into multiple independent packfiles, "
-"each not larger than the given size. The size can be suffixed with \"k\", "
-"\"m\", or \"g\". The minimum size allowed is limited to 1 MiB. This option "
+"each not larger than the given size. The size can be suffixed with \"k\", \"m"
+"\", or \"g\". The minimum size allowed is limited to 1 MiB. This option "
"prevents the creation of a bitmap index. The default is unlimited, unless "
"the config variable `pack.packSizeLimit` is set."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:126
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--honor-pack-keep"
msgstr "--honor-pack-keep"
@@ -42621,8 +42451,8 @@ msgstr ""
#: en/git-pack-objects.txt:137
msgid ""
"This flag causes an object already in the given pack to be ignored, even if "
-"it would have otherwise been packed. `<pack-name>` is the the pack file name"
-" without leading directory (e.g. `pack-123.pack`). The option could be "
+"it would have otherwise been packed. `<pack-name>` is the the pack file name "
+"without leading directory (e.g. `pack-123.pack`). The option could be "
"specified multiple times to keep multiple packs."
msgstr ""
@@ -42642,7 +42472,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:147
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--non-empty"
msgstr "--non-empty"
@@ -42653,7 +42483,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:157
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--all-progress"
msgstr "--all-progress"
@@ -42662,8 +42492,8 @@ msgstr "--all-progress"
msgid ""
"When --stdout is specified then progress report is displayed during the "
"object count and compression phases but inhibited during the write-out "
-"phase. The reason is that in some cases the output stream is directly linked"
-" to another command which may wish to display progress status of its own as "
+"phase. The reason is that in some cases the output stream is directly linked "
+"to another command which may wish to display progress status of its own as "
"it processes incoming pack data. This flag is like --progress except that "
"it forces progress report for the write-out phase as well even if --stdout "
"is used."
@@ -42671,28 +42501,28 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:168
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--all-progress-implied"
msgstr "--all-progress-implied"
#. type: Plain text
#: en/git-pack-objects.txt:172
msgid ""
-"This is used to imply --all-progress whenever progress display is activated."
-" Unlike --all-progress this flag doesn't actually force any progress "
-"display by itself."
+"This is used to imply --all-progress whenever progress display is "
+"activated. Unlike --all-progress this flag doesn't actually force any "
+"progress display by itself."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:176
msgid ""
-"This flag makes the command not to report its progress on the standard error"
-" stream."
+"This flag makes the command not to report its progress on the standard error "
+"stream."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:177
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-reuse-delta"
msgstr "--no-reuse-delta"
@@ -42707,7 +42537,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:184
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-reuse-object"
msgstr "--no-reuse-object"
@@ -42729,17 +42559,17 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:198
msgid ""
-"Specifies compression level for newly-compressed data in the generated pack."
-" If not specified, pack compression level is determined first by "
-"pack.compression, then by core.compression, and defaults to -1, the zlib "
-"default, if neither is set. Add --no-reuse-object if you want to force a "
-"uniform compression level on all data no matter the source."
+"Specifies compression level for newly-compressed data in the generated "
+"pack. If not specified, pack compression level is determined first by pack."
+"compression, then by core.compression, and defaults to -1, the zlib default, "
+"if neither is set. Add --no-reuse-object if you want to force a uniform "
+"compression level on all data no matter the source."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:199 en/git-show-branch.txt:67
#: en/rev-list-options.txt:342 en/rev-list-options.txt:475
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--sparse"
msgstr "--sparse"
@@ -42757,8 +42587,8 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:212
msgid ""
-"Create a \"thin\" pack by omitting the common objects between a sender and a"
-" receiver in order to reduce network transfer. This option only makes sense "
+"Create a \"thin\" pack by omitting the common objects between a sender and a "
+"receiver in order to reduce network transfer. This option only makes sense "
"in conjunction with --stdout."
msgstr ""
@@ -42773,21 +42603,21 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:218
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--shallow"
msgstr "--shallow"
#. type: Plain text
#: en/git-pack-objects.txt:222
msgid ""
-"Optimize a pack that will be provided to a client with a shallow repository."
-" This option, combined with --thin, can result in a smaller pack at the "
-"cost of speed."
+"Optimize a pack that will be provided to a client with a shallow "
+"repository. This option, combined with --thin, can result in a smaller pack "
+"at the cost of speed."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:223
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--delta-base-offset"
msgstr "--delta-base-offset"
@@ -42795,12 +42625,11 @@ msgstr "--delta-base-offset"
#: en/git-pack-objects.txt:233
msgid ""
"A packed archive can express the base object of a delta as either a 20-byte "
-"object name or as an offset in the stream, but ancient versions of Git don't"
-" understand the latter. By default, 'git pack-objects' only uses the former"
-" format for better compatibility. This option allows the command to use the"
-" latter format for compactness. Depending on the average delta chain "
-"length, this option typically shrinks the resulting packfile by 3-5 per-"
-"cent."
+"object name or as an offset in the stream, but ancient versions of Git don't "
+"understand the latter. By default, 'git pack-objects' only uses the former "
+"format for better compatibility. This option allows the command to use the "
+"latter format for compactness. Depending on the average delta chain length, "
+"this option typically shrinks the resulting packfile by 3-5 per-cent."
msgstr ""
#. type: Plain text
@@ -42826,7 +42655,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:254
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--keep-true-parents"
msgstr "--keep-true-parents"
@@ -42852,7 +42681,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:263 en/rev-list-options.txt:741
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-filter"
msgstr "--no-filter"
@@ -42892,14 +42721,14 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:280
msgid ""
-"The form '--missing=allow-promisor' is like 'allow-any', but will only allow"
-" object traversal to continue for EXPECTED promisor missing objects. "
+"The form '--missing=allow-promisor' is like 'allow-any', but will only allow "
+"object traversal to continue for EXPECTED promisor missing objects. "
"Unexpected missing object will raise an error."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:281 en/rev-list-options.txt:766
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--exclude-promisor-objects"
msgstr "--exclude-promisor-objects"
@@ -42909,27 +42738,27 @@ msgid ""
"Omit objects that are known to be in the promisor remote. (This option has "
"the purpose of operating only on locally created objects, so that when we "
"repack, we still maintain a distinction between locally created objects "
-"[without .promisor] and objects from the promisor remote [with .promisor].)"
-" This is used with partial clone."
+"[without .promisor] and objects from the promisor remote [with .promisor].) "
+"This is used with partial clone."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:288 en/git-repack.txt:157
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--keep-unreachable"
msgstr "--keep-unreachable"
#. type: Plain text
#: en/git-pack-objects.txt:293
msgid ""
-"Objects unreachable from the refs in packs named with --unpacked= option are"
-" added to the resulting pack, in addition to the reachable objects that are "
+"Objects unreachable from the refs in packs named with --unpacked= option are "
+"added to the resulting pack, in addition to the reachable objects that are "
"not in packs marked with *.keep files. This implies `--revs`."
msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:294
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--pack-loose-unreachable"
msgstr "--pack-loose-unreachable"
@@ -42942,7 +42771,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:298
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--unpack-unreachable"
msgstr "--unpack-unreachable"
@@ -42953,7 +42782,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-objects.txt:301 en/git-repack.txt:164
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--delta-islands"
msgstr "--delta-islands"
@@ -42977,8 +42806,8 @@ msgid ""
"inflating most objects at all and just send the bytes directly from disk. "
"This optimization can't work when an object is stored as a delta against a "
"base which the receiver does not have (and which we are not already "
-"sending). In that case the server \"breaks\" the delta and has to find a new"
-" one, which has a high CPU cost. Therefore it's important for performance "
+"sending). In that case the server \"breaks\" the delta and has to find a new "
+"one, which has a high CPU cost. Therefore it's important for performance "
"that the set of objects in on-disk delta relationships match what a client "
"would fetch."
msgstr ""
@@ -42988,8 +42817,8 @@ msgstr ""
msgid ""
"In a normal repository, this tends to work automatically. The objects are "
"mostly reachable from the branches and tags, and that's what clients fetch. "
-"Any deltas we find on the server are likely to be between objects the client"
-" has or will have."
+"Any deltas we find on the server are likely to be between objects the client "
+"has or will have."
msgstr ""
#. type: Plain text
@@ -43009,30 +42838,30 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:340
msgid ""
-"A similar situation may exist if you have many refs outside of `refs/heads/`"
-" and `refs/tags/` that point to related objects (e.g., `refs/pull` or "
-"`refs/changes` used by some hosting providers). By default, clients fetch "
-"only heads and tags, and deltas against objects found only in those other "
-"groups cannot be sent as-is."
+"A similar situation may exist if you have many refs outside of `refs/heads/` "
+"and `refs/tags/` that point to related objects (e.g., `refs/pull` or `refs/"
+"changes` used by some hosting providers). By default, clients fetch only "
+"heads and tags, and deltas against objects found only in those other groups "
+"cannot be sent as-is."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:348
msgid ""
"Delta islands solve this problem by allowing you to group your refs into "
-"distinct \"islands\". Pack-objects computes which objects are reachable from"
-" which islands, and refuses to make a delta from an object `A` against a "
-"base which is not present in all of `A`'s islands. This results in slightly "
-"larger packs (because we miss some delta opportunities), but guarantees that"
-" a fetch of one island will not have to recompute deltas on the fly due to "
+"distinct \"islands\". Pack-objects computes which objects are reachable from "
+"which islands, and refuses to make a delta from an object `A` against a base "
+"which is not present in all of `A`'s islands. This results in slightly "
+"larger packs (because we miss some delta opportunities), but guarantees that "
+"a fetch of one island will not have to recompute deltas on the fly due to "
"crossing island boundaries."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:354
msgid ""
-"When repacking with delta islands the delta window tends to get clogged with"
-" candidates that are forbidden by the config. Repacking with a big --window "
+"When repacking with delta islands the delta window tends to get clogged with "
+"candidates that are forbidden by the config. Repacking with a big --window "
"helps (and doesn't take as long as it otherwise might because we can reject "
"some object pairs based on islands before doing any computation on the "
"content)."
@@ -43061,18 +42890,18 @@ msgid ""
"puts heads and tags into an island (whose name is the empty string; see "
"below for more on naming). Any refs which do not match those regular "
"expressions (e.g., `refs/pull/123`) is not in any island. Any object which "
-"is reachable only from `refs/pull/` (but not heads or tags) is therefore not"
-" a candidate to be used as a base for `refs/heads/`."
+"is reachable only from `refs/pull/` (but not heads or tags) is therefore not "
+"a candidate to be used as a base for `refs/heads/`."
msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:378
msgid ""
-"Refs are grouped into islands based on their \"names\", and two regexes that"
-" produce the same name are considered to be in the same island. The names "
-"are computed from the regexes by concatenating any capture groups from the "
-"regex, with a '-' dash in between. (And if there are no capture groups, then"
-" the name is the empty string, as in the above example.) This allows you to "
+"Refs are grouped into islands based on their \"names\", and two regexes that "
+"produce the same name are considered to be in the same island. The names are "
+"computed from the regexes by concatenating any capture groups from the "
+"regex, with a '-' dash in between. (And if there are no capture groups, then "
+"the name is the empty string, as in the above example.) This allows you to "
"create arbitrary numbers of islands. Only up to 14 such capture groups are "
"supported though."
msgstr ""
@@ -43098,8 +42927,8 @@ msgstr ""
#: en/git-pack-objects.txt:393
msgid ""
"That puts the heads and tags for each fork in their own island (named "
-"\"1234\" or similar), and the pull refs for each go into their own "
-"\"1234-pull\"."
+"\"1234\" or similar), and the pull refs for each go into their own \"1234-"
+"pull\"."
msgstr ""
#. type: Plain text
@@ -43112,7 +42941,6 @@ msgstr ""
#. type: Plain text
#: en/git-pack-objects.txt:403
-#, ignore-same
msgid ""
"linkgit:git-rev-list[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
msgstr ""
@@ -43120,7 +42948,7 @@ msgstr ""
#. type: Title =
#: en/git-pack-redundant.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-pack-redundant(1)"
msgstr "git-pack-redundant(1)"
@@ -43132,9 +42960,7 @@ msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:13
#, no-wrap
-msgid ""
-"'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename "
-"... >\n"
+msgid "'git pack-redundant' [ --verbose ] [ --alt-odb ] < --all | .pack filename ... >\n"
msgstr ""
#. type: Plain text
@@ -43157,8 +42983,8 @@ msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:27
msgid ""
-"git fsck --full --unreachable | cut -d ' ' -f3 | \\ git pack-redundant --all"
-" | xargs rm"
+"git fsck --full --unreachable | cut -d ' ' -f3 | \\ git pack-redundant --all "
+"| xargs rm"
msgstr ""
#. type: Plain text
@@ -43168,7 +42994,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pack-redundant.txt:35
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--alt-odb"
msgstr "--alt-odb"
@@ -43186,17 +43012,14 @@ msgstr ""
#. type: Plain text
#: en/git-pack-redundant.txt:47
-#, ignore-same
msgid ""
-"linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-"
-"packed[1]"
+"linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
msgstr ""
-"linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-"
-"packed[1]"
+"linkgit:git-pack-objects[1] linkgit:git-repack[1] linkgit:git-prune-packed[1]"
#. type: Title =
#: en/git-pack-refs.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-pack-refs(1)"
msgstr "git-pack-refs(1)"
@@ -43214,8 +43037,8 @@ msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:24
msgid ""
-"Traditionally, tips of branches and tags (collectively known as 'refs') were"
-" stored one file per ref in a (sub)directory under `$GIT_DIR/refs` "
+"Traditionally, tips of branches and tags (collectively known as 'refs') were "
+"stored one file per ref in a (sub)directory under `$GIT_DIR/refs` "
"directory. While many branch tips tend to be updated often, most tags and "
"some branch tips are never updated. When a repository has hundreds or "
"thousands of tags, this one-file-per-ref format both wastes storage and "
@@ -43225,25 +43048,25 @@ msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:31
msgid ""
-"This command is used to solve the storage and performance problem by storing"
-" the refs in a single file, `$GIT_DIR/packed-refs`. When a ref is missing "
-"from the traditional `$GIT_DIR/refs` directory hierarchy, it is looked up in"
-" this file and used if found."
+"This command is used to solve the storage and performance problem by storing "
+"the refs in a single file, `$GIT_DIR/packed-refs`. When a ref is missing "
+"from the traditional `$GIT_DIR/refs` directory hierarchy, it is looked up in "
+"this file and used if found."
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:34
msgid ""
-"Subsequent updates to branches always create new files under `$GIT_DIR/refs`"
-" directory hierarchy."
+"Subsequent updates to branches always create new files under `$GIT_DIR/refs` "
+"directory hierarchy."
msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:43
msgid ""
"A recommended practice to deal with a repository with too many refs is to "
-"pack its refs with `--all` once, and occasionally run `git pack-refs`. Tags"
-" are by definition stationary and are not expected to change. Branch heads "
+"pack its refs with `--all` once, and occasionally run `git pack-refs`. Tags "
+"are by definition stationary and are not expected to change. Branch heads "
"will be packed with the initial `pack-refs --all`, but only the currently "
"active branch heads will become unpacked, and the next `pack-refs` (without "
"`--all`) will leave them unpacked."
@@ -43262,8 +43085,8 @@ msgstr ""
#. type: Plain text
#: en/git-pack-refs.txt:61
msgid ""
-"The command usually removes loose refs under `$GIT_DIR/refs` hierarchy after"
-" packing them. This option tells it not to."
+"The command usually removes loose refs under `$GIT_DIR/refs` hierarchy after "
+"packing them. This option tells it not to."
msgstr ""
#. type: Plain text
@@ -43276,7 +43099,7 @@ msgstr ""
#. type: Title =
#: en/git-parse-remote.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-parse-remote(1)"
msgstr "git-parse-remote(1)"
@@ -43296,14 +43119,14 @@ msgstr ""
#. type: Plain text
#: en/git-parse-remote.txt:20
msgid ""
-"This script is included in various scripts to supply routines to parse files"
-" under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables "
+"This script is included in various scripts to supply routines to parse files "
+"under $GIT_DIR/remotes/ and $GIT_DIR/branches/ and configuration variables "
"that are related to fetching, pulling and pushing."
msgstr ""
#. type: Title =
#: en/git-patch-id.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-patch-id(1)"
msgstr "git-patch-id(1)"
@@ -43350,7 +43173,7 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:33
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--stable"
msgstr "--stable"
@@ -43365,15 +43188,15 @@ msgid ""
"Reordering file diffs that make up a patch does not affect the ID. In "
"particular, two patches produced by comparing the same two trees with two "
"different settings for \"-O<orderfile>\" result in the same patch ID "
-"signature, thereby allowing the computed result to be used as a key to index"
-" some meta-information about the change between the two trees;"
+"signature, thereby allowing the computed result to be used as a key to index "
+"some meta-information about the change between the two trees;"
msgstr ""
#. type: Plain text
#: en/git-patch-id.txt:47
msgid ""
-"Result is different from the value produced by git 1.9 and older or produced"
-" when an \"unstable\" hash (see --unstable below) is configured - even when "
+"Result is different from the value produced by git 1.9 and older or produced "
+"when an \"unstable\" hash (see --unstable below) is configured - even when "
"used on a diff output taken without any use of \"-O<orderfile>\", thereby "
"making existing databases storing such \"unstable\" or historical patch-ids "
"unusable."
@@ -43387,7 +43210,7 @@ msgstr ""
#. type: Labeled list
#: en/git-patch-id.txt:50
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--unstable"
msgstr "--unstable"
@@ -43408,7 +43231,7 @@ msgstr ""
#. type: Title =
#: en/git-prune-packed.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-prune-packed(1)"
msgstr "git-prune-packed(1)"
@@ -43427,8 +43250,7 @@ msgstr ""
#: en/git-prune-packed.txt:19
msgid ""
"This program searches the `$GIT_OBJECT_DIRECTORY` for all objects that "
-"currently exist in a pack file as well as the independent object "
-"directories."
+"currently exist in a pack file as well as the independent object directories."
msgstr ""
#. type: Plain text
@@ -43464,13 +43286,12 @@ msgstr ""
#. type: Plain text
#: en/git-prune-packed.txt:44
-#, ignore-same
msgid "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
msgstr "linkgit:git-pack-objects[1] linkgit:git-repack[1]"
#. type: Title =
#: en/git-prune.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-prune(1)"
msgstr "git-prune(1)"
@@ -43496,9 +43317,9 @@ msgstr ""
#: en/git-prune.txt:29
msgid ""
"This runs 'git fsck --unreachable' using all the refs available in `refs/`, "
-"optionally with additional set of objects specified on the command line, and"
-" prunes all unpacked objects unreachable from any of these head objects from"
-" the object database. In addition, it prunes the unpacked objects that are "
+"optionally with additional set of objects specified on the command line, and "
+"prunes all unpacked objects unreachable from any of these head objects from "
+"the object database. In addition, it prunes the unpacked objects that are "
"also found in packs by running 'git prune-packed'. It also removes entries "
"from .git/shallow that are not reachable by any ref."
msgstr ""
@@ -43579,21 +43400,19 @@ msgstr ""
#. type: Plain text
#: en/git-prune.txt:86
-#, ignore-same
msgid "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]"
msgstr "linkgit:git-fsck[1], linkgit:git-gc[1], linkgit:git-reflog[1]"
#. type: Title =
#: en/git-pull.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-pull(1)"
msgstr "git-pull(1)"
#. type: Plain text
#: en/git-pull.txt:7
msgid ""
-"git-pull - Fetch from and integrate with another repository or a local "
-"branch"
+"git-pull - Fetch from and integrate with another repository or a local branch"
msgstr ""
#. type: Plain text
@@ -43621,12 +43440,11 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:33
msgid ""
-"<repository> should be the name of a remote repository as passed to "
-"linkgit:git-fetch[1]. <refspec> can name an arbitrary remote ref (for "
-"example, the name of a tag) or even a collection of refs with corresponding "
-"remote-tracking branches (e.g., "
-"refs/heads/{asterisk}:refs/remotes/origin/{asterisk}), but usually it is the"
-" name of a branch in the remote repository."
+"<repository> should be the name of a remote repository as passed to linkgit:"
+"git-fetch[1]. <refspec> can name an arbitrary remote ref (for example, the "
+"name of a tag) or even a collection of refs with corresponding remote-"
+"tracking branches (e.g., refs/heads/{asterisk}:refs/remotes/origin/"
+"{asterisk}), but usually it is the name of a branch in the remote repository."
msgstr ""
#. type: Plain text
@@ -43652,10 +43470,10 @@ msgstr ""
#: en/git-pull.txt:54
msgid ""
"Then \"`git pull`\" will fetch and replay the changes from the remote "
-"`master` branch since it diverged from the local `master` (i.e., `E`) until"
-" its current commit (`C`) on top of `master` and record the result in a new "
-"commit along with the names of the two parent commits and a log message from"
-" the user describing the changes."
+"`master` branch since it diverged from the local `master` (i.e., `E`) until "
+"its current commit (`C`) on top of `master` and record the result in a new "
+"commit along with the names of the two parent commits and a log message from "
+"the user describing the changes."
msgstr ""
#. type: delimited block -
@@ -43677,10 +43495,10 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:68
msgid ""
-"In Git 1.7.0 or later, to cancel a conflicting merge, use `git reset "
-"--merge`. *Warning*: In older versions of Git, running 'git pull' with "
-"uncommitted changes is discouraged: while possible, it leaves you in a state"
-" that may be hard to back out of in the case of a conflict."
+"In Git 1.7.0 or later, to cancel a conflicting merge, use `git reset --"
+"merge`. *Warning*: In older versions of Git, running 'git pull' with "
+"uncommitted changes is discouraged: while possible, it leaves you in a state "
+"that may be hard to back out of in the case of a conflict."
msgstr ""
#. type: Plain text
@@ -43714,8 +43532,8 @@ msgstr ""
#: en/git-pull.txt:91
msgid ""
"This option controls if new commits of all populated submodules should be "
-"fetched and updated, too (see linkgit:git-config[1] and "
-"linkgit:gitmodules[5])."
+"fetched and updated, too (see linkgit:git-config[1] and linkgit:"
+"gitmodules[5])."
msgstr ""
#. type: Plain text
@@ -43748,8 +43566,8 @@ msgstr ""
#: en/git-pull.txt:110
msgid ""
"When true, rebase the current branch on top of the upstream branch after "
-"fetching. If there is a remote-tracking branch corresponding to the upstream"
-" branch and the upstream branch was rebased since last fetched, the rebase "
+"fetching. If there is a remote-tracking branch corresponding to the upstream "
+"branch and the upstream branch was rebased since last fetched, the rebase "
"uses that information to avoid rebasing non-local changes."
msgstr ""
@@ -43796,7 +43614,7 @@ msgstr ""
#. type: Labeled list
#: en/git-pull.txt:132 en/git-svn.txt:261
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-rebase"
msgstr "--no-rebase"
@@ -43807,13 +43625,13 @@ msgstr ""
#. type: Labeled list
#: en/git-pull.txt:135 en/git-rebase.txt:496
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--autostash"
msgstr "--autostash"
#. type: Labeled list
#: en/git-pull.txt:136 en/git-rebase.txt:497
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-autostash"
msgstr "--no-autostash"
@@ -43864,13 +43682,13 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:177
msgid ""
-"In order to determine what remote branches to fetch (and optionally store in"
-" the remote-tracking branches) when the command is run without any refspec "
-"parameters on the command line, values of the configuration variable "
-"`remote.<origin>.fetch` are consulted, and if there aren't any, "
-"`$GIT_DIR/remotes/<origin>` is consulted and its `Pull:` lines are used. In"
-" addition to the refspec formats described in the OPTIONS section, you can "
-"have a globbing refspec that looks like this:"
+"In order to determine what remote branches to fetch (and optionally store in "
+"the remote-tracking branches) when the command is run without any refspec "
+"parameters on the command line, values of the configuration variable `remote."
+"<origin>.fetch` are consulted, and if there aren't any, `$GIT_DIR/remotes/"
+"<origin>` is consulted and its `Pull:` lines are used. In addition to the "
+"refspec formats described in the OPTIONS section, you can have a globbing "
+"refspec that looks like this:"
msgstr ""
#. type: delimited block -
@@ -43883,10 +43701,9 @@ msgstr ""
#: en/git-pull.txt:187
msgid ""
"A globbing refspec must have a non-empty RHS (i.e. must store what were "
-"fetched in remote-tracking branches), and its LHS and RHS must end with "
-"`/*`. The above specifies that all remote branches are tracked using "
-"remote-tracking branches in `refs/remotes/origin/` hierarchy under the same "
-"name."
+"fetched in remote-tracking branches), and its LHS and RHS must end with `/"
+"*`. The above specifies that all remote branches are tracked using remote-"
+"tracking branches in `refs/remotes/origin/` hierarchy under the same name."
msgstr ""
#. type: Plain text
@@ -43931,8 +43748,8 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:215
msgid ""
-"Update the remote-tracking branches for the repository you cloned from, then"
-" merge one of them into your current branch:"
+"Update the remote-tracking branches for the repository you cloned from, then "
+"merge one of them into your current branch:"
msgstr ""
#. type: delimited block -
@@ -43987,13 +43804,12 @@ msgstr ""
#. type: Plain text
#: en/git-pull.txt:259
-#, ignore-same
msgid "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]"
msgstr "linkgit:git-fetch[1], linkgit:git-merge[1], linkgit:git-config[1]"
#. type: Title =
#: en/git-push.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-push(1)"
msgstr "git-push(1)"
@@ -44032,8 +43848,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:33
msgid ""
-"When the command line does not specify where to push with the `<repository>`"
-" argument, `branch.*.remote` configuration for the current branch is "
+"When the command line does not specify where to push with the `<repository>` "
+"argument, `branch.*.remote` configuration for the current branch is "
"consulted to determine where to push. If the configuration is missing, it "
"defaults to 'origin'."
msgstr ""
@@ -44083,15 +43899,14 @@ msgstr ""
msgid ""
"Specify what destination ref to update with what source object. The format "
"of a <refspec> parameter is an optional plus `+`, followed by the source "
-"object <src>, followed by a colon `:`, followed by the destination ref "
-"<dst>."
+"object <src>, followed by a colon `:`, followed by the destination ref <dst>."
msgstr ""
#. type: Plain text
#: en/git-push.txt:65
msgid ""
-"The <src> is often the name of the branch you would want to push, but it can"
-" be any arbitrary \"SHA-1 expression\", such as `master~4` or `HEAD` (see "
+"The <src> is often the name of the branch you would want to push, but it can "
+"be any arbitrary \"SHA-1 expression\", such as `master~4` or `HEAD` (see "
"linkgit:gitrevisions[7])."
msgstr ""
@@ -44119,8 +43934,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:84
msgid ""
-"If <dst> unambiguously refers to a ref on the <repository> remote, then push"
-" to that ref."
+"If <dst> unambiguously refers to a ref on the <repository> remote, then push "
+"to that ref."
msgstr ""
#. type: Plain text
@@ -44135,9 +43950,8 @@ msgstr ""
msgid ""
"Other ambiguity resolutions might be added in the future, but for now any "
"other cases will error out with an error indicating what we tried, and "
-"depending on the `advice.pushUnqualifiedRefname` configuration (see "
-"linkgit:git-config[1]) suggest what refs/ namespace you may have wanted to "
-"push to."
+"depending on the `advice.pushUnqualifiedRefname` configuration (see linkgit:"
+"git-config[1]) suggest what refs/ namespace you may have wanted to push to."
msgstr ""
#. type: Plain text
@@ -44167,10 +43981,10 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:113
msgid ""
-"It's possible to push any type of object to any namespace outside of "
-"`refs/{tags,heads}/*`. In the case of tags and commits, these will be "
-"treated as if they were the commits inside `refs/heads/*` for the purposes "
-"of whether the update is allowed."
+"It's possible to push any type of object to any namespace outside of `refs/"
+"{tags,heads}/*`. In the case of tags and commits, these will be treated as "
+"if they were the commits inside `refs/heads/*` for the purposes of whether "
+"the update is allowed."
msgstr ""
#. type: Plain text
@@ -44180,8 +43994,8 @@ msgid ""
"allowed, even in cases where what's being fast-forwarded is not a commit, "
"but a tag object which happens to point to a new commit which is a fast-"
"forward of the commit the last tag (or commit) it's replacing. Replacing a "
-"tag with an entirely different tag is also allowed, if it points to the same"
-" commit, as well as pushing a peeled tag, i.e. pushing the commit that "
+"tag with an entirely different tag is also allowed, if it points to the same "
+"commit, as well as pushing a peeled tag, i.e. pushing the commit that "
"existing tag object points to, or a new tag object which an existing commit "
"points to."
msgstr ""
@@ -44199,8 +44013,8 @@ msgstr ""
msgid ""
"All of the rules described above about what's not allowed as an update can "
"be overridden by adding an the optional leading `+` to a refspec (or using "
-"`--force` command line option). The only exception to this is that no amount"
-" of forcing will make the `refs/heads/*` namespace accept a non-commit "
+"`--force` command line option). The only exception to this is that no amount "
+"of forcing will make the `refs/heads/*` namespace accept a non-commit "
"object. Hooks and configuration can also override or amend these rules, see "
"e.g. `receive.denyNonFastForwards` in linkgit:git-config[1] and `pre-"
"receive` and `update` in linkgit:githooks[5]."
@@ -44211,18 +44025,18 @@ msgstr ""
msgid ""
"Pushing an empty <src> allows you to delete the <dst> ref from the remote "
"repository. Deletions are always accepted without a leading `+` in the "
-"refspec (or `--force`), except when forbidden by configuration or hooks. See"
-" `receive.denyDeletes` in linkgit:git-config[1] and `pre-receive` and "
+"refspec (or `--force`), except when forbidden by configuration or hooks. See "
+"`receive.denyDeletes` in linkgit:git-config[1] and `pre-receive` and "
"`update` in linkgit:githooks[5]."
msgstr ""
#. type: Plain text
#: en/git-push.txt:146
msgid ""
-"The special refspec `:` (or `+:` to allow non-fast-forward updates) directs"
-" Git to push \"matching\" branches: for every branch that exists on the "
-"local side, the remote side is updated if a branch of the same name already "
-"exists on the remote side."
+"The special refspec `:` (or `+:` to allow non-fast-forward updates) directs "
+"Git to push \"matching\" branches: for every branch that exists on the local "
+"side, the remote side is updated if a branch of the same name already exists "
+"on the remote side."
msgstr ""
#. type: Plain text
@@ -44233,8 +44047,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:152
msgid ""
-"Push all branches (i.e. refs under `refs/heads/`); cannot be used with other"
-" <refspec>."
+"Push all branches (i.e. refs under `refs/heads/`); cannot be used with other "
+"<refspec>."
msgstr ""
#. type: Plain text
@@ -44242,8 +44056,8 @@ msgstr ""
msgid ""
"Remove remote branches that don't have a local counterpart. For example a "
"remote branch `tmp` will be removed if a local branch with the same name "
-"doesn't exist any more. This also respects refspecs, e.g. `git push --prune"
-" remote refs/heads/*:refs/tmp/*` would make sure that remote `refs/tmp/foo` "
+"doesn't exist any more. This also respects refspecs, e.g. `git push --prune "
+"remote refs/heads/*:refs/tmp/*` would make sure that remote `refs/tmp/foo` "
"will be removed if `refs/heads/foo` doesn't exist."
msgstr ""
@@ -44255,8 +44069,8 @@ msgid ""
"`refs/tags/`) be mirrored to the remote repository. Newly created local "
"refs will be pushed to the remote end, locally updated refs will be force "
"updated on the remote end, and deleted refs will be removed from the remote "
-"end. This is the default if the configuration option "
-"`remote.<remote>.mirror` is set."
+"end. This is the default if the configuration option `remote.<remote>."
+"mirror` is set."
msgstr ""
#. type: Plain text
@@ -44283,7 +44097,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:191
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--follow-tags"
msgstr "--follow-tags"
@@ -44299,7 +44113,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:199 en/git-send-pack.txt:73
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]signed"
msgstr "--[no-]signed"
@@ -44315,15 +44129,15 @@ msgid ""
"GPG-sign the push request to update refs on the receiving side, to allow it "
"to be checked by the hooks and/or be logged. If `false` or `--no-signed`, "
"no signing will be attempted. If `true` or `--signed`, the push will fail "
-"if the server does not support signed pushes. If set to `if-asked`, sign if"
-" and only if the server supports signed pushes. The push will also fail if "
+"if the server does not support signed pushes. If set to `if-asked`, sign if "
+"and only if the server supports signed pushes. The push will also fail if "
"the actual call to `gpg --sign` fails. See linkgit:git-receive-pack[1] for "
"the details on the receiving end."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:210
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]atomic"
msgstr "--[no-]atomic"
@@ -44347,8 +44161,8 @@ msgid ""
"Transmit the given string to the server, which passes them to the pre-"
"receive as well as the post-receive hook. The given string must not contain "
"a NUL or LF character. When multiple `--push-option=<option>` are given, "
-"they are all sent to the other side in the order listed on the command line."
-" When no `--push-option=<option>` is given from the command line, the "
+"they are all sent to the other side in the order listed on the command "
+"line. When no `--push-option=<option>` is given from the command line, the "
"values of configuration variable `push.pushOption` are used instead."
msgstr ""
@@ -44374,7 +44188,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:234
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]force-with-lease"
msgstr "--[no-]force-with-lease"
@@ -44393,8 +44207,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:239
msgid ""
-"Usually, \"git push\" refuses to update a remote ref that is not an ancestor"
-" of the local ref used to overwrite it."
+"Usually, \"git push\" refuses to update a remote ref that is not an ancestor "
+"of the local ref used to overwrite it."
msgstr ""
#. type: Plain text
@@ -44409,10 +44223,10 @@ msgstr ""
msgid ""
"Imagine that you have to rebase what you have already published. You will "
"have to bypass the \"must fast-forward\" rule in order to replace the "
-"history you originally published with the rebased history. If somebody else"
-" built on top of your original history while you are rebasing, the tip of "
-"the branch at the remote may advance with her commit, and blindly pushing "
-"with `--force` will lose her work."
+"history you originally published with the rebased history. If somebody else "
+"built on top of your original history while you are rebasing, the tip of the "
+"branch at the remote may advance with her commit, and blindly pushing with "
+"`--force` will lose her work."
msgstr ""
#. type: Plain text
@@ -44429,9 +44243,9 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:261
msgid ""
-"`--force-with-lease` alone, without specifying the details, will protect all"
-" remote refs that are going to be updated by requiring their current value "
-"to be the same as the remote-tracking branch we have for them."
+"`--force-with-lease` alone, without specifying the details, will protect all "
+"remote refs that are going to be updated by requiring their current value to "
+"be the same as the remote-tracking branch we have for them."
msgstr ""
#. type: Plain text
@@ -44448,8 +44262,8 @@ msgstr ""
msgid ""
"`--force-with-lease=<refname>:<expect>` will protect the named ref (alone), "
"if it is going to be updated, by requiring its current value to be the same "
-"as the specified value `<expect>` (which is allowed to be different from the"
-" remote-tracking branch we have for the refname, or we do not even have to "
+"as the specified value `<expect>` (which is allowed to be different from the "
+"remote-tracking branch we have for the refname, or we do not even have to "
"have such a remote-tracking branch when this form is used). If `<expect>` "
"is the empty string, then the named ref must not already exist."
msgstr ""
@@ -44466,18 +44280,18 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:282
msgid ""
-"\"--no-force-with-lease\" will cancel all the previous --force-with-lease on"
-" the command line."
+"\"--no-force-with-lease\" will cancel all the previous --force-with-lease on "
+"the command line."
msgstr ""
#. type: Plain text
#: en/git-push.txt:288
msgid ""
-"A general note on safety: supplying this option without an expected value, "
-"i.e. as `--force-with-lease` or `--force-with-lease=<refname>` interacts "
-"very badly with anything that implicitly runs `git fetch` on the remote to "
-"be pushed to in the background, e.g. `git fetch origin` on your repository "
-"in a cronjob."
+"A general note on safety: supplying this option without an expected value, i."
+"e. as `--force-with-lease` or `--force-with-lease=<refname>` interacts very "
+"badly with anything that implicitly runs `git fetch` on the remote to be "
+"pushed to in the background, e.g. `git fetch origin` on your repository in a "
+"cronjob."
msgstr ""
#. type: Plain text
@@ -44485,16 +44299,16 @@ msgstr ""
msgid ""
"The protection it offers over `--force` is ensuring that subsequent changes "
"your work wasn't based on aren't clobbered, but this is trivially defeated "
-"if some background process is updating refs in the background. We don't have"
-" anything except the remote tracking info to go by as a heuristic for refs "
+"if some background process is updating refs in the background. We don't have "
+"anything except the remote tracking info to go by as a heuristic for refs "
"you're expected to have seen & are willing to clobber."
msgstr ""
#. type: Plain text
#: en/git-push.txt:299
msgid ""
-"If your editor or some other system is running `git fetch` in the background"
-" for you a way to mitigate this is to simply set up another remote:"
+"If your editor or some other system is running `git fetch` in the background "
+"for you a way to mitigate this is to simply set up another remote:"
msgstr ""
#. type: Plain text
@@ -44521,8 +44335,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:312
msgid ""
-"Will fail unless you manually run `git fetch origin-push`. This method is of"
-" course entirely defeated by something that runs `git fetch --all`, in that "
+"Will fail unless you manually run `git fetch origin-push`. This method is of "
+"course entirely defeated by something that runs `git fetch --all`, in that "
"case you'd need to either disable it or do something more tedious like:"
msgstr ""
@@ -44558,8 +44372,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:334
msgid ""
-"This flag disables these checks, and can cause the remote repository to lose"
-" commits; use it with care."
+"This flag disables these checks, and can cause the remote repository to lose "
+"commits; use it with care."
msgstr ""
#. type: Plain text
@@ -44569,8 +44383,8 @@ msgid ""
"with `push.default` set to `matching` or with multiple push destinations "
"configured with `remote.*.push` may overwrite refs other than the current "
"branch (including local refs that are strictly behind their remote "
-"counterpart). To force a push to only one branch, use a `+` in front of the"
-" refspec to push (e.g `git push origin +master` to force a push to the "
+"counterpart). To force a push to only one branch, use a `+` in front of the "
+"refspec to push (e.g `git push origin +master` to force a push to the "
"`master` branch). See the `<refspec>...` section above for details."
msgstr ""
@@ -44598,7 +44412,7 @@ msgstr ""
#. type: Labeled list
#: en/git-push.txt:355
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]thin"
msgstr "--[no-]thin"
@@ -44629,29 +44443,29 @@ msgid ""
"May be used to make sure all submodule commits used by the revisions to be "
"pushed are available on a remote-tracking branch. If 'check' is used Git "
"will verify that all submodule commits that changed in the revisions to be "
-"pushed are available on at least one remote of the submodule. If any commits"
-" are missing the push will be aborted and exit with non-zero status. If 'on-"
+"pushed are available on at least one remote of the submodule. If any commits "
+"are missing the push will be aborted and exit with non-zero status. If 'on-"
"demand' is used all submodules that changed in the revisions to be pushed "
-"will be pushed. If on-demand was not able to push all necessary revisions it"
-" will also be aborted and exit with non-zero status. If 'only' is used all "
+"will be pushed. If on-demand was not able to push all necessary revisions it "
+"will also be aborted and exit with non-zero status. If 'only' is used all "
"submodules will be recursively pushed while the superproject is left "
"unpushed. A value of 'no' or using `--no-recurse-submodules` can be used to "
-"override the push.recurseSubmodules configuration variable when no submodule"
-" recursion is required."
+"override the push.recurseSubmodules configuration variable when no submodule "
+"recursion is required."
msgstr ""
#. type: Labeled list
#: en/git-push.txt:393
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]verify"
msgstr "--[no-]verify"
#. type: Plain text
#: en/git-push.txt:397
msgid ""
-"Toggle the pre-push hook (see linkgit:githooks[5]). The default is "
-"--verify, giving the hook a chance to prevent the push. With --no-verify, "
-"the hook is bypassed completely."
+"Toggle the pre-push hook (see linkgit:githooks[5]). The default is --"
+"verify, giving the hook a chance to prevent the push. With --no-verify, the "
+"hook is bypassed completely."
msgstr ""
#. type: Plain text
@@ -44758,8 +44572,8 @@ msgid ""
"side, or because the remote repository has one of the following safety "
"options in effect: `receive.denyCurrentBranch` (for pushes to the checked "
"out branch), `receive.denyNonFastForwards` (for forced non-fast-forward "
-"updates), `receive.denyDeletes` or `receive.denyDeleteCurrent`. See "
-"linkgit:git-config[1]."
+"updates), `receive.denyDeletes` or `receive.denyDeleteCurrent`. See linkgit:"
+"git-config[1]."
msgstr ""
#. type: Labeled list
@@ -44793,8 +44607,7 @@ msgstr ""
#: en/git-push.txt:481
msgid ""
"A human-readable explanation. In the case of successfully pushed refs, no "
-"explanation is needed. For a failed ref, the reason for failure is "
-"described."
+"explanation is needed. For a failed ref, the reason for failure is described."
msgstr ""
#. type: Title -
@@ -44929,15 +44742,15 @@ msgstr ""
#: en/git-push.txt:567
msgid ""
"There is another common situation where you may encounter non-fast-forward "
-"rejection when you try to push, and it is possible even when you are pushing"
-" into a repository nobody else pushes into. After you push commit A yourself"
-" (in the first picture in this section), replace it with \"git commit "
-"--amend\" to produce commit B, and you try to push it out, because forgot "
-"that you have pushed A out already. In such a case, and only if you are "
-"certain that nobody in the meantime fetched your earlier commit A (and "
-"started building on top of it), you can run \"git push --force\" to "
-"overwrite it. In other words, \"git push --force\" is a method reserved for "
-"a case where you do mean to lose history."
+"rejection when you try to push, and it is possible even when you are pushing "
+"into a repository nobody else pushes into. After you push commit A yourself "
+"(in the first picture in this section), replace it with \"git commit --amend"
+"\" to produce commit B, and you try to push it out, because forgot that you "
+"have pushed A out already. In such a case, and only if you are certain that "
+"nobody in the meantime fetched your earlier commit A (and started building "
+"on top of it), you can run \"git push --force\" to overwrite it. In other "
+"words, \"git push --force\" is a method reserved for a case where you do "
+"mean to lose history."
msgstr ""
#. type: Labeled list
@@ -44963,8 +44776,8 @@ msgstr ""
#: en/git-push.txt:582
msgid ""
"Without additional configuration, pushes the current branch to the "
-"configured upstream (`remote.origin.merge` configuration variable) if it has"
-" the same name as the current branch, and errors out without pushing "
+"configured upstream (`remote.origin.merge` configuration variable) if it has "
+"the same name as the current branch, and errors out without pushing "
"otherwise."
msgstr ""
@@ -44972,16 +44785,16 @@ msgstr ""
#: en/git-push.txt:586
msgid ""
"The default behavior of this command when no <refspec> is given can be "
-"configured by setting the `push` option of the remote, or the `push.default`"
-" configuration variable."
+"configured by setting the `push` option of the remote, or the `push.default` "
+"configuration variable."
msgstr ""
#. type: Plain text
#: en/git-push.txt:591
msgid ""
"For example, to default to pushing only the current branch to `origin` use "
-"`git config remote.origin.push HEAD`. Any valid <refspec> (like the ones in"
-" the examples below) can be configured as the default for `git push origin`."
+"`git config remote.origin.push HEAD`. Any valid <refspec> (like the ones in "
+"the examples below) can be configured as the default for `git push origin`."
msgstr ""
#. type: Labeled list
@@ -44993,9 +44806,8 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:596
msgid ""
-"Push \"matching\" branches to `origin`. See <refspec> in the "
-"<<OPTIONS,OPTIONS>> section above for a description of \"matching\" "
-"branches."
+"Push \"matching\" branches to `origin`. See <refspec> in the <<OPTIONS,"
+"OPTIONS>> section above for a description of \"matching\" branches."
msgstr ""
#. type: Labeled list
@@ -45008,9 +44820,9 @@ msgstr ""
#: en/git-push.txt:603
msgid ""
"Find a ref that matches `master` in the source repository (most likely, it "
-"would find `refs/heads/master`), and update the same ref (e.g. "
-"`refs/heads/master`) in `origin` repository with it. If `master` did not "
-"exist remotely, it would be created."
+"would find `refs/heads/master`), and update the same ref (e.g. `refs/heads/"
+"master`) in `origin` repository with it. If `master` did not exist "
+"remotely, it would be created."
msgstr ""
#. type: Labeled list
@@ -45034,9 +44846,9 @@ msgstr ""
#: en/git-push.txt:613
msgid ""
"Use the source ref that matches `master` (e.g. `refs/heads/master`) to "
-"update the ref that matches `satellite/master` (most probably "
-"`refs/remotes/satellite/master`) in the `mothership` repository; do the same"
-" for `dev` and `satellite/dev`."
+"update the ref that matches `satellite/master` (most probably `refs/remotes/"
+"satellite/master`) in the `mothership` repository; do the same for `dev` and "
+"`satellite/dev`."
msgstr ""
#. type: Plain text
@@ -45049,10 +44861,10 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:623
msgid ""
-"This is to emulate `git fetch` run on the `mothership` using `git push` that"
-" is run in the opposite direction in order to integrate the work done on "
-"`satellite`, and is often necessary when you can only make connection in one"
-" way (i.e. satellite can ssh into mothership but mothership cannot initiate "
+"This is to emulate `git fetch` run on the `mothership` using `git push` that "
+"is run in the opposite direction in order to integrate the work done on "
+"`satellite`, and is often necessary when you can only make connection in one "
+"way (i.e. satellite can ssh into mothership but mothership cannot initiate "
"connection to satellite because the latter is behind a firewall or does not "
"run sshd)."
msgstr ""
@@ -45060,10 +44872,9 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:628
msgid ""
-"After running this `git push` on the `satellite` machine, you would ssh into"
-" the `mothership` and run `git merge` there to complete the emulation of "
-"`git pull` that were run on `mothership` to pull changes made on "
-"`satellite`."
+"After running this `git push` on the `satellite` machine, you would ssh into "
+"the `mothership` and run `git merge` there to complete the emulation of `git "
+"pull` that were run on `mothership` to pull changes made on `satellite`."
msgstr ""
#. type: Labeled list
@@ -45090,8 +44901,8 @@ msgstr ""
#: en/git-push.txt:640
msgid ""
"Create the branch `experimental` in the `origin` repository by copying the "
-"current `master` branch. This form is only needed to create a new branch or"
-" tag in the remote repository when the local name and the remote name are "
+"current `master` branch. This form is only needed to create a new branch or "
+"tag in the remote repository when the local name and the remote name are "
"different; otherwise, the ref name on its own will work."
msgstr ""
@@ -45149,14 +44960,14 @@ msgstr ""
#. type: Plain text
#: en/git-push.txt:668
msgid ""
-"Commits A and B would no longer belong to a branch with a symbolic name, and"
-" so would be unreachable. As such, these commits would be removed by a `git"
-" gc` command on the origin repository."
+"Commits A and B would no longer belong to a branch with a symbolic name, and "
+"so would be unreachable. As such, these commits would be removed by a `git "
+"gc` command on the origin repository."
msgstr ""
#. type: Title =
#: en/git-quiltimport.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-quiltimport(1)"
msgstr "git-quiltimport(1)"
@@ -45185,8 +44996,8 @@ msgstr ""
#: en/git-quiltimport.txt:27
msgid ""
"For each patch the code attempts to extract the author from the patch "
-"description. If that fails it falls back to the author specified with "
-"--author. If the --author flag was not given the patch description is "
+"description. If that fails it falls back to the author specified with --"
+"author. If the --author flag was not given the patch description is "
"displayed and the user is asked to interactively enter the author of the "
"patch."
msgstr ""
@@ -45201,8 +45012,8 @@ msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:40
msgid ""
-"Walk through the patches in the series and warn if we cannot find all of the"
-" necessary information to commit a patch. At the time of this writing only "
+"Walk through the patches in the series and warn if we cannot find all of the "
+"necessary information to commit a patch. At the time of this writing only "
"missing author information is warned about."
msgstr ""
@@ -45233,8 +45044,8 @@ msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:51
msgid ""
-"The default for the patch directory is patches or the value of the "
-"`$QUILT_PATCHES` environment variable."
+"The default for the patch directory is patches or the value of the `"
+"$QUILT_PATCHES` environment variable."
msgstr ""
#. type: Labeled list
@@ -45251,13 +45062,13 @@ msgstr ""
#. type: Plain text
#: en/git-quiltimport.txt:58
msgid ""
-"The default for the series file is <patches>/series or the value of the "
-"`$QUILT_SERIES` environment variable."
+"The default for the series file is <patches>/series or the value of the `"
+"$QUILT_SERIES` environment variable."
msgstr ""
#. type: Title =
#: en/git-read-tree.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-read-tree(1)"
msgstr "git-read-tree(1)"
@@ -45280,15 +45091,15 @@ msgstr ""
#: en/git-read-tree.txt:23
msgid ""
"Reads the tree information given by <tree-ish> into the index, but does not "
-"actually *update* any of the files it \"caches\". (see: linkgit:git-"
-"checkout-index[1])"
+"actually *update* any of the files it \"caches\". (see: linkgit:git-checkout-"
+"index[1])"
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:28
msgid ""
-"Optionally, it can merge a tree into the index, perform a fast-forward (i.e."
-" 2-way) merge, or a 3-way merge, with the `-m` flag. When used with `-m`, "
+"Optionally, it can merge a tree into the index, perform a fast-forward (i.e. "
+"2-way) merge, or a 3-way merge, with the `-m` flag. When used with `-m`, "
"the `-u` flag causes it to also update the files in the work tree with the "
"result of the merge."
msgstr ""
@@ -45310,7 +45121,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:40
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--reset"
msgstr "--reset"
@@ -45351,7 +45162,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:65
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--trivial"
msgstr "--trivial"
@@ -45375,8 +45186,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:80
msgid ""
-"when one side removes a path and the other side leaves the path unmodified."
-" The resolution is to remove that path."
+"when one side removes a path and the other side leaves the path unmodified. "
+"The resolution is to remove that path."
msgstr ""
#. type: Plain text
@@ -45399,8 +45210,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:89
msgid ""
-"Keep the current index contents, and read the contents of the named tree-ish"
-" under the directory at `<prefix>`. The command will refuse to overwrite "
+"Keep the current index contents, and read the contents of the named tree-ish "
+"under the directory at `<prefix>`. The command will refuse to overwrite "
"entries that already existed in the original index file."
msgstr ""
@@ -45416,13 +45227,13 @@ msgid ""
"When running the command with `-u` and `-m` options, the merge result may "
"need to overwrite paths that are not tracked in the current branch. The "
"command usually refuses to proceed with the merge to avoid losing such a "
-"path. However this safety valve sometimes gets in the way. For example, it"
-" often happens that the other branch added a file that used to be a "
-"generated file in your branch, and the safety valve triggers when you try to"
-" switch to that branch after you ran `make` but before running `make clean` "
-"to remove the generated file. This option tells the command to read per-"
-"directory exclude file (usually '.gitignore') and allows such an untracked "
-"but explicitly ignored file to be overwritten."
+"path. However this safety valve sometimes gets in the way. For example, it "
+"often happens that the other branch added a file that used to be a generated "
+"file in your branch, and the safety valve triggers when you try to switch to "
+"that branch after you ran `make` but before running `make clean` to remove "
+"the generated file. This option tells the command to read per-directory "
+"exclude file (usually '.gitignore') and allows such an untracked but "
+"explicitly ignored file to be overwritten."
msgstr ""
#. type: Labeled list
@@ -45434,13 +45245,13 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:116
msgid ""
-"Instead of writing the results out to `$GIT_INDEX_FILE`, write the resulting"
-" index in the named file. While the command is operating, the original "
-"index file is locked with the same mechanism as usual. The file must allow "
-"to be rename(2)ed into from a temporary file that is created next to the "
-"usual index file; typically this means it needs to be on the same filesystem"
-" as the index file itself, and you need write permission to the directories "
-"the index file and index output file are located in."
+"Instead of writing the results out to `$GIT_INDEX_FILE`, write the resulting "
+"index in the named file. While the command is operating, the original index "
+"file is locked with the same mechanism as usual. The file must allow to be "
+"rename(2)ed into from a temporary file that is created next to the usual "
+"index file; typically this means it needs to be on the same filesystem as "
+"the index file itself, and you need write permission to the directories the "
+"index file and index output file are located in."
msgstr ""
#. type: Plain text
@@ -45454,7 +45265,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:123
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-sparse-checkout"
msgstr "--no-sparse-checkout"
@@ -45465,7 +45276,7 @@ msgstr ""
#. type: Labeled list
#: en/git-read-tree.txt:127
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--empty"
msgstr "--empty"
@@ -45494,9 +45305,9 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:141
msgid ""
-"If `-m` is specified, 'git read-tree' can perform 3 kinds of merge, a single"
-" tree merge if only 1 tree is given, a fast-forward merge with 2 trees, or a"
-" 3-way merge if 3 or more trees are provided."
+"If `-m` is specified, 'git read-tree' can perform 3 kinds of merge, a single "
+"tree merge if only 1 tree is given, a fast-forward merge with 2 trees, or a "
+"3-way merge if 3 or more trees are provided."
msgstr ""
#. type: Title ~
@@ -45508,8 +45319,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:150
msgid ""
-"If only 1 tree is specified, 'git read-tree' operates as if the user did not"
-" specify `-m`, except that if the original index has an entry for a given "
+"If only 1 tree is specified, 'git read-tree' operates as if the user did not "
+"specify `-m`, except that if the original index has an entry for a given "
"pathname, and the contents of the path match with the tree being read, the "
"stat info from the index is used. (In other words, the index's stat()s take "
"precedence over the merged tree's)."
@@ -45519,8 +45330,8 @@ msgstr ""
#: en/git-read-tree.txt:154
msgid ""
"That means that if you do a `git read-tree -m <newtree>` followed by a `git "
-"checkout-index -f -u -a`, the 'git checkout-index' only checks out the stuff"
-" that really changed."
+"checkout-index -f -u -a`, the 'git checkout-index' only checks out the stuff "
+"that really changed."
msgstr ""
#. type: Plain text
@@ -45539,8 +45350,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:166
msgid ""
-"Typically, this is invoked as `git read-tree -m $H $M`, where $H is the head"
-" commit of the current repository, and $M is the head of a foreign tree, "
+"Typically, this is invoked as `git read-tree -m $H $M`, where $H is the head "
+"commit of the current repository, and $M is the head of a foreign tree, "
"which is simply ahead of $H (i.e. we are in a fast-forward situation)."
msgstr ""
@@ -45570,10 +45381,10 @@ msgstr ""
#: en/git-read-tree.txt:180
msgid ""
"In this case, the `git read-tree -m $H $M` command makes sure that no local "
-"change is lost as the result of this \"merge\". Here are the \"carry "
-"forward\" rules, where \"I\" denotes the index, \"clean\" means that index "
-"and work tree coincide, and \"exists\"/\"nothing\" refer to the presence of "
-"a path in the specified commit:"
+"change is lost as the result of this \"merge\". Here are the \"carry forward"
+"\" rules, where \"I\" denotes the index, \"clean\" means that index and work "
+"tree coincide, and \"exists\"/\"nothing\" refer to the presence of a path in "
+"the specified commit:"
msgstr ""
#. type: delimited block .
@@ -45649,20 +45460,20 @@ msgstr ""
#: en/git-read-tree.txt:226
msgid ""
"In all \"keep index\" cases, the index entry stays as in the original index "
-"file. If the entry is not up to date, 'git read-tree' keeps the copy in the"
-" work tree intact when operating under the -u flag."
+"file. If the entry is not up to date, 'git read-tree' keeps the copy in the "
+"work tree intact when operating under the -u flag."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:237
msgid ""
-"When this form of 'git read-tree' returns successfully, you can see which of"
-" the \"local changes\" that you made were carried forward by running `git "
+"When this form of 'git read-tree' returns successfully, you can see which of "
+"the \"local changes\" that you made were carried forward by running `git "
"diff-index --cached $M`. Note that this does not necessarily match what "
"`git diff-index --cached $H` would have produced before such a two tree "
"merge. This is because of cases 18 and 19 --- if you already had the "
-"changes in $M (e.g. maybe you picked it up via e-mail in a patch form), `git"
-" diff-index --cached $H` would have told you about the change before this "
+"changes in $M (e.g. maybe you picked it up via e-mail in a patch form), `git "
+"diff-index --cached $H` would have told you about the change before this "
"merge, but it would not show in `git diff-index --cached $M` output after "
"the two-tree merge."
msgstr ""
@@ -45671,10 +45482,10 @@ msgstr ""
#: en/git-read-tree.txt:244
msgid ""
"Case 3 is slightly tricky and needs explanation. The result from this rule "
-"logically should be to remove the path if the user staged the removal of the"
-" path and then switching to a new branch. That however will prevent the "
-"initial checkout from happening, so the rule is modified to use M (new tree)"
-" only when the content of the index is empty. Otherwise the removal of the "
+"logically should be to remove the path if the user staged the removal of the "
+"path and then switching to a new branch. That however will prevent the "
+"initial checkout from happening, so the rule is modified to use M (new tree) "
+"only when the content of the index is empty. Otherwise the removal of the "
"path is kept as long as $H and $M are the same."
msgstr ""
@@ -45738,8 +45549,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:278
msgid ""
-"stage 1 and stage 2 are the same and stage 3 is different; take stage 3 (our"
-" branch in stage 2 did not do anything since the ancestor in stage 1 while "
+"stage 1 and stage 2 are the same and stage 3 is different; take stage 3 (our "
+"branch in stage 2 did not do anything since the ancestor in stage 1 while "
"their branch in stage 3 worked on it)"
msgstr ""
@@ -45761,10 +45572,10 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:291
msgid ""
-"OK, this all sounds like a collection of totally nonsensical rules, but it's"
-" actually exactly what you want in order to do a fast merge. The different "
-"stages represent the \"result tree\" (stage 0, aka \"merged\"), the original"
-" tree (stage 1, aka \"orig\"), and the two trees you are trying to merge "
+"OK, this all sounds like a collection of totally nonsensical rules, but it's "
+"actually exactly what you want in order to do a fast merge. The different "
+"stages represent the \"result tree\" (stage 0, aka \"merged\"), the original "
+"tree (stage 1, aka \"orig\"), and the two trees you are trying to merge "
"(stage 2 and 3 respectively)."
msgstr ""
@@ -45796,8 +45607,8 @@ msgstr ""
#: en/git-read-tree.txt:309
msgid ""
"the index file saves and restores with all this information, so you can "
-"merge things incrementally, but as long as it has entries in stages 1/2/3 "
-"(i.e., \"unmerged entries\") you can't write the result. So now the merge "
+"merge things incrementally, but as long as it has entries in stages 1/2/3 (i."
+"e., \"unmerged entries\") you can't write the result. So now the merge "
"algorithm ends up being really simple:"
msgstr ""
@@ -45811,8 +45622,8 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:316
msgid ""
-"if you find a \"stage1\", but no matching \"stage2\" or \"stage3\", you know"
-" it's been removed from both trees (it only existed in the original tree), "
+"if you find a \"stage1\", but no matching \"stage2\" or \"stage3\", you know "
+"it's been removed from both trees (it only existed in the original tree), "
"and you remove that entry."
msgstr ""
@@ -45879,8 +45690,8 @@ msgstr ""
#: en/git-read-tree.txt:358
msgid ""
"Your work tree is still based on your HEAD ($JC), but you have some edits "
-"since. Three-way merge makes sure that you have not added or modified index"
-" entries since $JC, and if you haven't, then does the right thing. So with "
+"since. Three-way merge makes sure that you have not added or modified index "
+"entries since $JC, and if you haven't, then does the right thing. So with "
"the following sequence:"
msgstr ""
@@ -45915,12 +45726,12 @@ msgstr ""
msgid ""
"In other words, there is no need to worry about what exists only in the "
"working tree. When you have local changes in a part of the project that is "
-"not involved in the merge, your changes do not interfere with the merge, and"
-" are kept intact. When they *do* interfere, the merge does not even start "
-"('git read-tree' complains loudly and fails without modifying anything). In"
-" such a case, you can simply continue doing what you were in the middle of "
-"doing, and when your working tree is ready (i.e. you have finished your "
-"work-in-progress), attempt the merge again."
+"not involved in the merge, your changes do not interfere with the merge, and "
+"are kept intact. When they *do* interfere, the merge does not even start "
+"('git read-tree' complains loudly and fails without modifying anything). In "
+"such a case, you can simply continue doing what you were in the middle of "
+"doing, and when your working tree is ready (i.e. you have finished your work-"
+"in-progress), attempt the merge again."
msgstr ""
#. type: Title -
@@ -45942,12 +45753,12 @@ msgstr ""
msgid ""
"'git read-tree' and other merge-based commands ('git merge', 'git "
"checkout'...) can help maintaining the skip-worktree bitmap and working "
-"directory update. `$GIT_DIR/info/sparse-checkout` is used to define the "
-"skip-worktree reference bitmap. When 'git read-tree' needs to update the "
-"working directory, it resets the skip-worktree bit in the index based on "
-"this file, which uses the same syntax as .gitignore files. If an entry "
-"matches a pattern in this file, skip-worktree will not be set on that entry."
-" Otherwise, skip-worktree will be set."
+"directory update. `$GIT_DIR/info/sparse-checkout` is used to define the skip-"
+"worktree reference bitmap. When 'git read-tree' needs to update the working "
+"directory, it resets the skip-worktree bit in the index based on this file, "
+"which uses the same syntax as .gitignore files. If an entry matches a "
+"pattern in this file, skip-worktree will not be set on that entry. "
+"Otherwise, skip-worktree will be set."
msgstr ""
#. type: Plain text
@@ -45962,8 +45773,8 @@ msgstr ""
#: en/git-read-tree.txt:408
msgid ""
"While `$GIT_DIR/info/sparse-checkout` is usually used to specify what files "
-"are in, you can also specify what files are _not_ in, using negate patterns."
-" For example, to remove the file `unwanted`:"
+"are in, you can also specify what files are _not_ in, using negate patterns. "
+"For example, to remove the file `unwanted`:"
msgstr ""
#. type: delimited block -
@@ -45977,10 +45788,10 @@ msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:420
msgid ""
-"Another tricky thing is fully repopulating the working directory when you no"
-" longer want sparse checkout. You cannot just disable \"sparse checkout\" "
-"because skip-worktree bits are still in the index and your working directory"
-" is still sparsely populated. You should re-populate the working directory "
+"Another tricky thing is fully repopulating the working directory when you no "
+"longer want sparse checkout. You cannot just disable \"sparse checkout\" "
+"because skip-worktree bits are still in the index and your working directory "
+"is still sparsely populated. You should re-populate the working directory "
"with the `$GIT_DIR/info/sparse-checkout` file content as follows:"
msgstr ""
@@ -45994,13 +45805,12 @@ msgstr ""
#: en/git-read-tree.txt:429
msgid ""
"Then you can disable sparse checkout. Sparse checkout support in 'git read-"
-"tree' and similar commands is disabled by default. You need to turn "
-"`core.sparseCheckout` on in order to have sparse checkout support."
+"tree' and similar commands is disabled by default. You need to turn `core."
+"sparseCheckout` on in order to have sparse checkout support."
msgstr ""
#. type: Plain text
#: en/git-read-tree.txt:435
-#, ignore-same
msgid ""
"linkgit:git-write-tree[1]; linkgit:git-ls-files[1]; linkgit:gitignore[5]"
msgstr ""
@@ -46008,7 +45818,7 @@ msgstr ""
#. type: Title =
#: en/git-rebase.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-rebase(1)"
msgstr "git-rebase(1)"
@@ -46039,11 +45849,11 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:28
msgid ""
-"If <upstream> is not specified, the upstream configured in "
-"branch.<name>.remote and branch.<name>.merge options will be used (see "
-"linkgit:git-config[1] for details) and the `--fork-point` option is assumed."
-" If you are currently not on any branch or if the current branch does not "
-"have a configured upstream, the rebase will abort."
+"If <upstream> is not specified, the upstream configured in branch.<name>."
+"remote and branch.<name>.merge options will be used (see linkgit:git-"
+"config[1] for details) and the `--fork-point` option is assumed. If you are "
+"currently not on any branch or if the current branch does not have a "
+"configured upstream, the rebase will abort."
msgstr ""
#. type: Plain text
@@ -46052,16 +45862,16 @@ msgid ""
"All changes made by commits in the current branch but that are not in "
"<upstream> are saved to a temporary area. This is the same set of commits "
"that would be shown by `git log <upstream>..HEAD`; or by `git log "
-"'fork_point'..HEAD`, if `--fork-point` is active (see the description on "
-"`--fork-point` below); or by `git log HEAD`, if the `--root` option is "
+"'fork_point'..HEAD`, if `--fork-point` is active (see the description on `--"
+"fork-point` below); or by `git log HEAD`, if the `--root` option is "
"specified."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:40
msgid ""
-"The current branch is reset to <upstream>, or <newbase> if the --onto option"
-" was supplied. This has the exact same effect as `git reset --hard "
+"The current branch is reset to <upstream>, or <newbase> if the --onto option "
+"was supplied. This has the exact same effect as `git reset --hard "
"<upstream>` (or <newbase>). ORIG_HEAD is set to point at the tip of the "
"branch before the reset."
msgstr ""
@@ -46070,10 +45880,10 @@ msgstr ""
#: en/git-rebase.txt:46
msgid ""
"The commits that were previously saved into the temporary area are then "
-"reapplied to the current branch, one by one, in order. Note that any commits"
-" in HEAD which introduce the same textual changes as a commit in "
-"HEAD..<upstream> are omitted (i.e., a patch already accepted upstream with a"
-" different commit message or timestamp will be skipped)."
+"reapplied to the current branch, one by one, in order. Note that any commits "
+"in HEAD which introduce the same textual changes as a commit in HEAD.."
+"<upstream> are omitted (i.e., a patch already accepted upstream with a "
+"different commit message or timestamp will be skipped)."
msgstr ""
#. type: Plain text
@@ -46089,7 +45899,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:55
-msgid "Assume the following history exists and the current branch is \"topic\":"
+msgid ""
+"Assume the following history exists and the current branch is \"topic\":"
msgstr ""
#. type: delimited block -
@@ -46174,16 +45985,16 @@ msgstr ""
#: en/git-rebase.txt:103
msgid ""
"Here is how you would transplant a topic branch based on one branch to "
-"another, to pretend that you forked the topic branch from the latter branch,"
-" using `rebase --onto`."
+"another, to pretend that you forked the topic branch from the latter branch, "
+"using `rebase --onto`."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:107
msgid ""
"First let's assume your 'topic' is based on branch 'next'. For example, a "
-"feature developed in 'topic' depends on some functionality which is found in"
-" 'next'."
+"feature developed in 'topic' depends on some functionality which is found in "
+"'next'."
msgstr ""
#. type: delimited block -
@@ -46373,8 +46184,8 @@ msgstr ""
#: en/git-rebase.txt:219
msgid ""
"As a special case, you may use \"A\\...B\" as a shortcut for the merge base "
-"of A and B if there is exactly one merge base. You can leave out at most one"
-" of A and B, in which case it defaults to HEAD."
+"of A and B if there is exactly one merge base. You can leave out at most one "
+"of A and B, in which case it defaults to HEAD."
msgstr ""
#. type: Plain text
@@ -46408,7 +46219,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:243 en/git-rebase.txt:532
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--keep-empty"
msgstr "--keep-empty"
@@ -46441,7 +46252,7 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:259 en/git-rebase.txt:534
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--edit-todo"
msgstr "--edit-todo"
@@ -46505,8 +46316,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:300
msgid ""
-"Pass the <strategy-option> through to the merge strategy. This implies "
-"`--merge` and, if no strategy has been specified, `-s recursive`. Note the "
+"Pass the <strategy-option> through to the merge strategy. This implies `--"
+"merge` and, if no strategy has been specified, `-s recursive`. Note the "
"reversal of 'ours' and 'theirs' as noted above for the `-m` option."
msgstr ""
@@ -46523,8 +46334,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:320
msgid ""
-"Show a diffstat of what changed upstream since the last rebase. The diffstat"
-" is also controlled by the configuration option rebase.stat."
+"Show a diffstat of what changed upstream since the last rebase. The diffstat "
+"is also controlled by the configuration option rebase.stat."
msgstr ""
#. type: Plain text
@@ -46541,26 +46352,26 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:328 en/git-rev-parse.txt:98 en/git-show-ref.txt:59
#: en/git-tag.txt:81
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--verify"
msgstr "--verify"
#. type: Plain text
#: en/git-rebase.txt:331
msgid ""
-"Allows the pre-rebase hook to run, which is the default. This option can be"
-" used to override --no-verify. See also linkgit:githooks[5]."
+"Allows the pre-rebase hook to run, which is the default. This option can be "
+"used to override --no-verify. See also linkgit:githooks[5]."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:340 en/merge-options.txt:35
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-ff"
msgstr "--no-ff"
#. type: Labeled list
#: en/git-rebase.txt:341
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--force-rebase"
msgstr "--force-rebase"
@@ -46577,14 +46388,13 @@ msgstr ""
msgid ""
"You may find this helpful after reverting a topic branch merge, as this "
"option recreates the topic branch with fresh commits so it can be remerged "
-"successfully without needing to \"revert the reversion\" (see the "
-"link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for "
-"details)."
+"successfully without needing to \"revert the reversion\" (see the link:howto/"
+"revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details)."
msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:354
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-fork-point"
msgstr "--no-fork-point"
@@ -46598,11 +46408,11 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:364
msgid ""
-"When --fork-point is active, 'fork_point' will be used instead of <upstream>"
-" to calculate the set of commits to rebase, where 'fork_point' is the result"
-" of `git merge-base --fork-point <upstream> <branch>` command (see "
-"linkgit:git-merge-base[1]). If 'fork_point' ends up being empty, the "
-"<upstream> will be used as a fallback."
+"When --fork-point is active, 'fork_point' will be used instead of <upstream> "
+"to calculate the set of commits to rebase, where 'fork_point' is the result "
+"of `git merge-base --fork-point <upstream> <branch>` command (see linkgit:"
+"git-merge-base[1]). If 'fork_point' ends up being empty, the <upstream> "
+"will be used as a fallback."
msgstr ""
#. type: Plain text
@@ -46622,24 +46432,24 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:379
msgid ""
-"These flags are passed to 'git am' to easily change the dates of the rebased"
-" commits (see linkgit:git-am[1])."
+"These flags are passed to 'git am' to easily change the dates of the rebased "
+"commits (see linkgit:git-am[1])."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:386
msgid ""
-"Add a Signed-off-by: trailer to all the rebased commits. Note that if "
-"`--interactive` is given then only commits marked to be picked, edited or "
+"Add a Signed-off-by: trailer to all the rebased commits. Note that if `--"
+"interactive` is given then only commits marked to be picked, edited or "
"reworded will have the trailer added."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:394
msgid ""
-"Make a list of the commits which are about to be rebased. Let the user edit"
-" that list before rebasing. This mode can also be used to split commits "
-"(see SPLITTING COMMITS below)."
+"Make a list of the commits which are about to be rebased. Let the user edit "
+"that list before rebasing. This mode can also be used to split commits (see "
+"SPLITTING COMMITS below)."
msgstr ""
#. type: Plain text
@@ -46682,8 +46492,8 @@ msgstr ""
#: en/git-rebase.txt:421
msgid ""
"The `--rebase-merges` mode is similar in spirit to `--preserve-merges`, but "
-"in contrast to that option works well in interactive rebases: commits can be"
-" reordered, inserted and dropped at will."
+"in contrast to that option works well in interactive rebases: commits can be "
+"reordered, inserted and dropped at will."
msgstr ""
#. type: Plain text
@@ -46701,7 +46511,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:429 en/git-rebase.txt:529 en/git-svn.txt:680
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--preserve-merges"
msgstr "--preserve-merges"
@@ -46783,9 +46593,9 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:474
msgid ""
-"Rebase all commits reachable from <branch>, instead of limiting them with an"
-" <upstream>. This allows you to rebase the root commit(s) on a branch. "
-"When used with --onto, it will skip changes already contained in <newbase> "
+"Rebase all commits reachable from <branch>, instead of limiting them with an "
+"<upstream>. This allows you to rebase the root commit(s) on a branch. When "
+"used with --onto, it will skip changes already contained in <newbase> "
"(instead of <upstream>) whereas without --onto it will operate on every "
"change. When used together with both --onto and --preserve-merges, 'all' "
"root commits will be rewritten to have <newbase> as parent instead."
@@ -46793,22 +46603,22 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:477 en/git-rebase.txt:533
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--autosquash"
msgstr "--autosquash"
#. type: Labeled list
#: en/git-rebase.txt:478
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-autosquash"
msgstr "--no-autosquash"
#. type: Plain text
#: en/git-rebase.txt:489
msgid ""
-"When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"),"
-" and there is already a commit in the todo list that matches the same `...`,"
-" automatically modify the todo list of rebase -i so that the commit marked "
+"When the commit log message begins with \"squash! ...\" (or \"fixup! ...\"), "
+"and there is already a commit in the todo list that matches the same `...`, "
+"automatically modify the todo list of rebase -i so that the commit marked "
"for squashing comes right after the commit to be modified, and change the "
"action of the moved commit from `pick` to `squash` (or `fixup`). A commit "
"matches the `...` if the commit subject matches, or if the `...` refers to "
@@ -46836,13 +46646,13 @@ msgstr ""
#. type: Labeled list
#: en/git-rebase.txt:504
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--reschedule-failed-exec"
msgstr "--reschedule-failed-exec"
#. type: Labeled list
#: en/git-rebase.txt:505
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-reschedule-failed-exec"
msgstr "--no-reschedule-failed-exec"
@@ -46866,7 +46676,6 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:517
-#, ignore-same
msgid "--whitespace"
msgstr "--whitespace"
@@ -46877,31 +46686,26 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:524
-#, ignore-same
msgid "--strategy"
msgstr "--strategy"
#. type: Plain text
#: en/git-rebase.txt:525
-#, ignore-same
msgid "--strategy-option"
msgstr "--strategy-option"
#. type: Plain text
#: en/git-rebase.txt:527
-#, ignore-same
msgid "--[no-]autosquash"
msgstr "--[no-]autosquash"
#. type: Plain text
#: en/git-rebase.txt:528
-#, ignore-same
msgid "--rebase-merges"
msgstr "--rebase-merges"
#. type: Plain text
#: en/git-rebase.txt:531
-#, ignore-same
msgid "--exec"
msgstr "--exec"
@@ -47017,8 +46821,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:579
msgid ""
-"You should understand the implications of using 'git rebase' on a repository"
-" that you share. See also RECOVERING FROM UPSTREAM REBASE below."
+"You should understand the implications of using 'git rebase' on a repository "
+"that you share. See also RECOVERING FROM UPSTREAM REBASE below."
msgstr ""
#. type: Plain text
@@ -47026,8 +46830,8 @@ msgstr ""
msgid ""
"When the git-rebase command is run, it will first execute a \"pre-rebase\" "
"hook if one exists. You can use this hook to do sanity checks and reject "
-"the rebase if it isn't appropriate. Please see the template pre-rebase hook"
-" script for an example."
+"the rebase if it isn't appropriate. Please see the template pre-rebase hook "
+"script for an example."
msgstr ""
#. type: Plain text
@@ -47111,11 +46915,11 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:619
msgid ""
-"Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect"
-" commit it fixes, because that commit is buried deeply in a patch series. "
-"That is exactly what interactive rebase is for: use it after plenty of "
-"\"a\"s and \"b\"s, by rearranging and editing commits, and squashing "
-"multiple commits into one."
+"Sometimes the thing fixed in b.2. cannot be amended to the not-quite perfect "
+"commit it fixes, because that commit is buried deeply in a patch series. "
+"That is exactly what interactive rebase is for: use it after plenty of \"a"
+"\"s and \"b\"s, by rearranging and editing commits, and squashing multiple "
+"commits into one."
msgstr ""
#. type: Plain text
@@ -47134,8 +46938,8 @@ msgstr ""
msgid ""
"An editor will be fired up with all the commits in your current branch "
"(ignoring merge commits), which come after the given commit. You can "
-"reorder the commits in this list to your heart's content, and you can remove"
-" them. The list looks more or less like this:"
+"reorder the commits in this list to your heart's content, and you can remove "
+"them. The list looks more or less like this:"
msgstr ""
#. type: delimited block -
@@ -47150,8 +46954,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:638
msgid ""
-"The oneline descriptions are purely for your pleasure; 'git rebase' will not"
-" look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this "
+"The oneline descriptions are purely for your pleasure; 'git rebase' will not "
+"look at them but at the commit names (\"deadbee\" and \"fa1afe1\" in this "
"example), so do not delete or edit the names."
msgstr ""
@@ -47166,8 +46970,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:646
msgid ""
-"To interrupt the rebase (just like an \"edit\" command would do, but without"
-" cherry-picking any commit first), use the \"break\" command."
+"To interrupt the rebase (just like an \"edit\" command would do, but without "
+"cherry-picking any commit first), use the \"break\" command."
msgstr ""
#. type: Plain text
@@ -47180,27 +46984,27 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:652
msgid ""
-"To drop a commit, replace the command \"pick\" with \"drop\", or just delete"
-" the matching line."
+"To drop a commit, replace the command \"pick\" with \"drop\", or just delete "
+"the matching line."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:660
msgid ""
-"If you want to fold two or more commits into one, replace the command "
-"\"pick\" for the second and subsequent commits with \"squash\" or \"fixup\"."
-" If the commits had different authors, the folded commit will be attributed"
-" to the author of the first commit. The suggested commit message for the "
-"folded commit is the concatenation of the commit messages of the first "
-"commit and of those with the \"squash\" command, but omits the commit "
-"messages of commits with the \"fixup\" command."
+"If you want to fold two or more commits into one, replace the command \"pick"
+"\" for the second and subsequent commits with \"squash\" or \"fixup\". If "
+"the commits had different authors, the folded commit will be attributed to "
+"the author of the first commit. The suggested commit message for the folded "
+"commit is the concatenation of the commit messages of the first commit and "
+"of those with the \"squash\" command, but omits the commit messages of "
+"commits with the \"fixup\" command."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:664
msgid ""
-"'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when"
-" a command fails due to merge errors. When you are done editing and/or "
+"'git rebase' will stop when \"pick\" has been replaced with \"edit\" or when "
+"a command fails due to merge errors. When you are done editing and/or "
"resolving conflicts you can continue with `git rebase --continue`."
msgstr ""
@@ -47255,10 +47059,10 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:697
msgid ""
-"Reordering and editing commits usually creates untested intermediate steps."
-" You may want to check that your history editing did not break anything by "
-"running a test, or at least recompiling at intermediate points in history by"
-" using the \"exec\" command (shortcut \"x\"). You may do so by creating a "
+"Reordering and editing commits usually creates untested intermediate steps. "
+"You may want to check that your history editing did not break anything by "
+"running a test, or at least recompiling at intermediate points in history by "
+"using the \"exec\" command (shortcut \"x\"). You may do so by creating a "
"todo list like this one:"
msgstr ""
@@ -47278,17 +47082,17 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:711
msgid ""
-"The interactive rebase will stop when a command fails (i.e. exits with non-0"
-" status) to give you an opportunity to fix the problem. You can continue "
-"with `git rebase --continue`."
+"The interactive rebase will stop when a command fails (i.e. exits with non-0 "
+"status) to give you an opportunity to fix the problem. You can continue with "
+"`git rebase --continue`."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:716
msgid ""
-"The \"exec\" command launches the command in a shell (the one specified in "
-"`$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell"
-" features (like \"cd\", \">\", \";\" ...). The command is run from the root "
+"The \"exec\" command launches the command in a shell (the one specified in `"
+"$SHELL`, or the default shell if `$SHELL` is not set), so you can use shell "
+"features (like \"cd\", \">\", \";\" ...). The command is run from the root "
"of the working tree."
msgstr ""
@@ -47329,17 +47133,17 @@ msgstr ""
#: en/git-rebase.txt:742
msgid ""
"In interactive mode, you can mark commits with the action \"edit\". "
-"However, this does not necessarily mean that 'git rebase' expects the result"
-" of this edit to be exactly one commit. Indeed, you can undo the commit, or"
-" you can add other commits. This can be used to split a commit into two:"
+"However, this does not necessarily mean that 'git rebase' expects the result "
+"of this edit to be exactly one commit. Indeed, you can undo the commit, or "
+"you can add other commits. This can be used to split a commit into two:"
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:746
msgid ""
"Start an interactive rebase with `git rebase -i <commit>^`, where <commit> "
-"is the commit you want to split. In fact, any commit range will do, as long"
-" as it contains that commit."
+"is the commit you want to split. In fact, any commit range will do, as long "
+"as it contains that commit."
msgstr ""
#. type: Plain text
@@ -47350,24 +47154,23 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:752
msgid ""
-"When it comes to editing that commit, execute `git reset HEAD^`. The effect"
-" is that the HEAD is rewound by one, and the index follows suit. However, "
+"When it comes to editing that commit, execute `git reset HEAD^`. The effect "
+"is that the HEAD is rewound by one, and the index follows suit. However, "
"the working tree stays the same."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:756
msgid ""
-"Now add the changes to the index that you want to have in the first commit."
-" You can use `git add` (possibly interactively) or 'git gui' (or both) to "
-"do that."
+"Now add the changes to the index that you want to have in the first commit. "
+"You can use `git add` (possibly interactively) or 'git gui' (or both) to do "
+"that."
msgstr ""
#. type: Plain text
#: en/git-rebase.txt:759
msgid ""
-"Commit the now-current index with whatever commit message is appropriate "
-"now."
+"Commit the now-current index with whatever commit message is appropriate now."
msgstr ""
#. type: Plain text
@@ -47495,8 +47298,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:832
msgid ""
-"This happens if the 'subsystem' rebase had conflicts, or used "
-"`--interactive` to omit, edit, squash, or fixup commits; or if the upstream "
+"This happens if the 'subsystem' rebase had conflicts, or used `--"
+"interactive` to omit, edit, squash, or fixup commits; or if the upstream "
"used one of `commit --amend`, `reset`, or `filter-branch`."
msgstr ""
@@ -47571,8 +47374,8 @@ msgstr ""
#: en/git-rebase.txt:872
msgid ""
"The idea is to manually tell 'git rebase' \"where the old 'subsystem' ended "
-"and your 'topic' began\", that is, what the old merge-base between them was."
-" You will have to find a way to name the last commit of the old "
+"and your 'topic' began\", that is, what the old merge-base between them "
+"was. You will have to find a way to name the last commit of the old "
"'subsystem', for example:"
msgstr ""
@@ -47587,8 +47390,8 @@ msgstr ""
#. type: Plain text
#: en/git-rebase.txt:879
msgid ""
-"Relative to the tip of 'topic': knowing that your 'topic' has three commits,"
-" the old tip of 'subsystem' must be `topic~3`."
+"Relative to the tip of 'topic': knowing that your 'topic' has three commits, "
+"the old tip of 'subsystem' must be `topic~3`."
msgstr ""
#. type: Plain text
@@ -47622,8 +47425,8 @@ msgstr ""
#: en/git-rebase.txt:899
msgid ""
"The interactive rebase command was originally designed to handle individual "
-"patch series. As such, it makes sense to exclude merge commits from the todo"
-" list, as the developer may have merged the then-current `master` while "
+"patch series. As such, it makes sense to exclude merge commits from the todo "
+"list, as the developer may have merged the then-current `master` while "
"working on the branch, only to rebase all the commits onto `master` "
"eventually (skipping the merge commits)."
msgstr ""
@@ -47640,9 +47443,9 @@ msgstr ""
#: en/git-rebase.txt:908
msgid ""
"In the following example, the developer works on a topic branch that "
-"refactors the way buttons are defined, and on another topic branch that uses"
-" that refactoring to implement a \"Report a bug\" button. The output of `git"
-" log --graph --format=%s -5` may look like this:"
+"refactors the way buttons are defined, and on another topic branch that uses "
+"that refactoring to implement a \"Report a bug\" button. The output of `git "
+"log --graph --format=%s -5` may look like this:"
msgstr ""
#. type: delimited block -
@@ -47723,11 +47526,11 @@ msgstr ""
#: en/git-rebase.txt:958
msgid ""
"The `label` command associates a label with the current HEAD when that "
-"command is executed. These labels are created as worktree-local refs "
-"(`refs/rewritten/<label>`) that will be deleted when the rebase finishes. "
-"That way, rebase operations in multiple worktrees linked to the same "
-"repository do not interfere with one another. If the `label` command fails, "
-"it is rescheduled immediately, with a helpful message how to proceed."
+"command is executed. These labels are created as worktree-local refs (`refs/"
+"rewritten/<label>`) that will be deleted when the rebase finishes. That way, "
+"rebase operations in multiple worktrees linked to the same repository do not "
+"interfere with one another. If the `label` command fails, it is rescheduled "
+"immediately, with a helpful message how to proceed."
msgstr ""
#. type: Plain text
@@ -47841,10 +47644,10 @@ msgstr ""
#: en/git-rebase.txt:1031
msgid ""
"The todo list presented by `--preserve-merges --interactive` does not "
-"represent the topology of the revision graph. Editing commits and rewording"
-" their commit messages should work fine, but attempts to reorder commits "
-"tend to produce counterintuitive results. Use `--rebase-merges` in such "
-"scenarios instead."
+"represent the topology of the revision graph. Editing commits and rewording "
+"their commit messages should work fine, but attempts to reorder commits tend "
+"to produce counterintuitive results. Use `--rebase-merges` in such scenarios "
+"instead."
msgstr ""
#. type: Plain text
@@ -47880,7 +47683,7 @@ msgstr ""
#. type: Title =
#: en/git-receive-pack.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-receive-pack(1)"
msgstr "git-receive-pack(1)"
@@ -47914,10 +47717,10 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:28
msgid ""
-"The command allows for creation and fast-forwarding of sha1 refs "
-"(heads/tags) on the remote end (strictly speaking, it is the local end 'git-"
-"receive-pack' runs, but to the user who is sitting at the send-pack end, it "
-"is updating the remote. Confused?)"
+"The command allows for creation and fast-forwarding of sha1 refs (heads/"
+"tags) on the remote end (strictly speaking, it is the local end 'git-receive-"
+"pack' runs, but to the user who is sitting at the send-pack end, it is "
+"updating the remote. Confused?)"
msgstr ""
#. type: Plain text
@@ -47983,27 +47786,27 @@ msgstr ""
msgid ""
"When accepting a signed push (see linkgit:git-push[1]), the signed push "
"certificate is stored in a blob and an environment variable `GIT_PUSH_CERT` "
-"can be consulted for its object name. See the description of `post-receive`"
-" hook for an example. In addition, the certificate is verified using GPG "
-"and the result is exported with the following environment variables:"
+"can be consulted for its object name. See the description of `post-receive` "
+"hook for an example. In addition, the certificate is verified using GPG and "
+"the result is exported with the following environment variables:"
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:66
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_PUSH_CERT_SIGNER`"
msgstr "`GIT_PUSH_CERT_SIGNER`"
#. type: Plain text
#: en/git-receive-pack.txt:69
msgid ""
-"The name and the e-mail address of the owner of the key that signed the push"
-" certificate."
+"The name and the e-mail address of the owner of the key that signed the push "
+"certificate."
msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:70
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_PUSH_CERT_KEY`"
msgstr "`GIT_PUSH_CERT_KEY`"
@@ -48014,7 +47817,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:73
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_PUSH_CERT_STATUS`"
msgstr "`GIT_PUSH_CERT_STATUS`"
@@ -48028,7 +47831,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:78
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_PUSH_CERT_NONCE`"
msgstr "`GIT_PUSH_CERT_NONCE`"
@@ -48043,13 +47846,13 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:85
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_PUSH_CERT_NONCE_STATUS`"
msgstr "`GIT_PUSH_CERT_NONCE_STATUS`"
#. type: Labeled list
#: en/git-receive-pack.txt:86
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`UNSOLICITED`"
msgstr "`UNSOLICITED`"
@@ -48060,7 +47863,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:89
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`MISSING`"
msgstr "`MISSING`"
@@ -48071,7 +47874,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:91
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`BAD`"
msgstr "`BAD`"
@@ -48082,7 +47885,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:93
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`OK`"
msgstr "`OK`"
@@ -48093,7 +47896,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:95
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`SLOP`"
msgstr "`SLOP`"
@@ -48107,7 +47910,7 @@ msgstr ""
#. type: Labeled list
#: en/git-receive-pack.txt:100
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_PUSH_CERT_NONCE_SLOP`"
msgstr "`GIT_PUSH_CERT_NONCE_SLOP`"
@@ -48117,8 +47920,8 @@ msgid ""
"\"git push --signed\" sent a nonce different from what we asked it to send "
"now, but in a different session whose starting time is different by this "
"many seconds from the current session. Only meaningful when "
-"`GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`. Also read about "
-"`receive.certNonceSlop` variable in linkgit:git-config[1]."
+"`GIT_PUSH_CERT_NONCE_STATUS` says `SLOP`. Also read about `receive."
+"certNonceSlop` variable in linkgit:git-config[1]."
msgstr ""
#. type: Plain text
@@ -48131,10 +47934,10 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:116
msgid ""
-"If the pre-receive hook exits with a non-zero exit status no updates will be"
-" performed, and the update, post-receive and post-update hooks will not be "
-"invoked either. This can be useful to quickly bail out if the update is not"
-" to be supported."
+"If the pre-receive hook exits with a non-zero exit status no updates will be "
+"performed, and the update, post-receive and post-update hooks will not be "
+"invoked either. This can be useful to quickly bail out if the update is not "
+"to be supported."
msgstr ""
#. type: Plain text
@@ -48164,8 +47967,8 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:132
msgid ""
-"The refname parameter is relative to $GIT_DIR; e.g. for the master head this"
-" is \"refs/heads/master\". The two sha1 arguments are the object names for "
+"The refname parameter is relative to $GIT_DIR; e.g. for the master head this "
+"is \"refs/heads/master\". The two sha1 arguments are the object names for "
"the refname before and after the update. Note that the hook is called "
"before the refname is updated, so either sha1-old is 0\\{40} (meaning there "
"is no such ref yet), or it should match what is recorded in refname."
@@ -48183,8 +47986,8 @@ msgstr ""
msgid ""
"Successful execution (a zero exit status) of this hook does not ensure the "
"ref will actually be updated, it is only a prerequisite. As such it is not "
-"a good idea to send notices (e.g. email) from this hook. Consider using the"
-" post-receive hook instead."
+"a good idea to send notices (e.g. email) from this hook. Consider using the "
+"post-receive hook instead."
msgstr ""
#. type: Title -
@@ -48216,8 +48019,8 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:161
msgid ""
-"The `GIT_PUSH_CERT*` environment variables can be inspected, just as in "
-"`pre-receive` hook, after accepting a signed push."
+"The `GIT_PUSH_CERT*` environment variables can be inspected, just as in `pre-"
+"receive` hook, after accepting a signed push."
msgstr ""
#. type: Plain text
@@ -48270,9 +48073,9 @@ msgstr ""
msgid ""
"Note that it is possible for refname to not have sha1-new when this hook "
"runs. This can easily occur if another user modifies the ref after it was "
-"updated by 'git-receive-pack', but before the hook was able to evaluate it."
-" It is recommended that hooks rely on sha1-new rather than the current "
-"value of refname."
+"updated by 'git-receive-pack', but before the hook was able to evaluate it. "
+"It is recommended that hooks rely on sha1-new rather than the current value "
+"of refname."
msgstr ""
#. type: Title -
@@ -48284,10 +48087,10 @@ msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:207
msgid ""
-"After all other processing, if at least one ref was updated, and if "
-"$GIT_DIR/hooks/post-update file exists and is executable, then post-update "
-"will be called with the list of refs that have been updated. This can be "
-"used to implement any repository wide cleanup tasks."
+"After all other processing, if at least one ref was updated, and if $GIT_DIR/"
+"hooks/post-update file exists and is executable, then post-update will be "
+"called with the list of refs that have been updated. This can be used to "
+"implement any repository wide cleanup tasks."
msgstr ""
#. type: Plain text
@@ -48324,8 +48127,8 @@ msgid ""
"When `receive-pack` takes in objects, they are placed into a temporary "
"\"quarantine\" directory within the `$GIT_DIR/objects` directory and "
"migrated into the main object store only after the `pre-receive` hook has "
-"completed. If the push fails before then, the temporary directory is removed"
-" entirely."
+"completed. If the push fails before then, the temporary directory is removed "
+"entirely."
msgstr ""
#. type: Plain text
@@ -48338,8 +48141,8 @@ msgstr ""
msgid ""
"Pushes which fail due to problems with the incoming pack, missing objects, "
"or due to the `pre-receive` hook will not leave any on-disk data. This is "
-"usually helpful to prevent repeated failed pushes from filling up your disk,"
-" but can make debugging more challenging."
+"usually helpful to prevent repeated failed pushes from filling up your disk, "
+"but can make debugging more challenging."
msgstr ""
#. type: Plain text
@@ -48353,21 +48156,20 @@ msgstr ""
#: en/git-receive-pack.txt:244
msgid ""
"The `pre-receive` hook MUST NOT update any refs to point to quarantined "
-"objects. Other programs accessing the repository will not be able to see the"
-" objects (and if the pre-receive hook fails, those refs would become "
+"objects. Other programs accessing the repository will not be able to see the "
+"objects (and if the pre-receive hook fails, those refs would become "
"corrupted). For safety, any ref updates from within `pre-receive` are "
"automatically rejected."
msgstr ""
#. type: Plain text
#: en/git-receive-pack.txt:249
-#, ignore-same
msgid "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
msgstr "linkgit:git-send-pack[1], linkgit:gitnamespaces[7]"
#. type: Title =
#: en/git-reflog.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-reflog(1)"
msgstr "git-reflog(1)"
@@ -48401,10 +48203,9 @@ msgid ""
"Reference logs, or \"reflogs\", record when the tips of branches and other "
"references were updated in the local repository. Reflogs are useful in "
"various Git commands, to specify the old value of a reference. For example, "
-"`HEAD@{2}` means \"where HEAD used to be two moves ago\", "
-"`master@{one.week.ago}` means \"where master used to point to one week ago "
-"in this local repository\", and so on. See linkgit:gitrevisions[7] for more "
-"details."
+"`HEAD@{2}` means \"where HEAD used to be two moves ago\", `master@{one.week."
+"ago}` means \"where master used to point to one week ago in this local "
+"repository\", and so on. See linkgit:gitrevisions[7] for more details."
msgstr ""
#. type: Plain text
@@ -48416,8 +48217,8 @@ msgstr ""
#: en/git-reflog.txt:44
msgid ""
"The \"show\" subcommand (which is also the default, in the absence of any "
-"subcommands) shows the log of the reference provided in the command-line (or"
-" `HEAD`, by default). The reflog covers all recent actions, and in addition "
+"subcommands) shows the log of the reference provided in the command-line (or "
+"`HEAD`, by default). The reflog covers all recent actions, and in addition "
"the `HEAD` reflog records branch switching. `git reflog show` is an alias "
"for `git log -g --abbrev-commit --pretty=oneline`; see linkgit:git-log[1] "
"for more information."
@@ -48436,8 +48237,8 @@ msgstr ""
#: en/git-reflog.txt:55
msgid ""
"The \"delete\" subcommand deletes single entries from the reflog. Its "
-"argument must be an _exact_ entry (e.g. \"`git reflog delete master@{2}`\")."
-" This subcommand is also typically not used directly by end users."
+"argument must be an _exact_ entry (e.g. \"`git reflog delete master@{2}`\"). "
+"This subcommand is also typically not used directly by end users."
msgstr ""
#. type: Plain text
@@ -48471,7 +48272,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:75 en/rev-list-options.txt:185
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--single-worktree"
msgstr "--single-worktree"
@@ -48493,8 +48294,8 @@ msgstr ""
#: en/git-reflog.txt:87
msgid ""
"Prune entries older than the specified time. If this option is not "
-"specified, the expiration time is taken from the configuration setting "
-"`gc.reflogExpire`, which in turn defaults to 90 days. `--expire=all` prunes "
+"specified, the expiration time is taken from the configuration setting `gc."
+"reflogExpire`, which in turn defaults to 90 days. `--expire=all` prunes "
"entries regardless of their age; `--expire=never` turns off pruning of "
"reachable entries (but see `--expire-unreachable`)."
msgstr ""
@@ -48518,21 +48319,21 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:98
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--updateref"
msgstr "--updateref"
#. type: Plain text
#: en/git-reflog.txt:102
msgid ""
-"Update the reference to the value of the top reflog entry (i.e. "
-"<ref>@\\{0\\}) if the previous top entry was pruned. (This option is "
-"ignored for symbolic references.)"
+"Update the reference to the value of the top reflog entry (i.e. <ref>@"
+"\\{0\\}) if the previous top entry was pruned. (This option is ignored for "
+"symbolic references.)"
msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:103
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--rewrite"
msgstr "--rewrite"
@@ -48545,7 +48346,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reflog.txt:108
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--stale-fix"
msgstr "--stale-fix"
@@ -48586,14 +48387,14 @@ msgstr ""
#. type: Plain text
#: en/git-reflog.txt:134
msgid ""
-"`git reflog delete` accepts options `--updateref`, `--rewrite`, `-n`, "
-"`--dry-run`, and `--verbose`, with the same meanings as when they are used "
-"with `expire`."
+"`git reflog delete` accepts options `--updateref`, `--rewrite`, `-n`, `--dry-"
+"run`, and `--verbose`, with the same meanings as when they are used with "
+"`expire`."
msgstr ""
#. type: Title =
#: en/git-remote-ext.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-remote-ext(1)"
msgstr "git-remote-ext(1)"
@@ -48611,8 +48412,8 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:17
msgid ""
-"This remote helper uses the specified '<command>' to connect to a remote Git"
-" server."
+"This remote helper uses the specified '<command>' to connect to a remote Git "
+"server."
msgstr ""
#. type: Plain text
@@ -48725,7 +48526,7 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:61 en/git-remote-fd.txt:33
-#, ignore-same, no-wrap
+#, no-wrap
msgid "GIT_TRANSLOOP_DEBUG"
msgstr "GIT_TRANSLOOP_DEBUG"
@@ -48742,20 +48543,19 @@ msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:67
-#, ignore-same, no-wrap
+#, no-wrap
msgid "GIT_EXT_SERVICE"
msgstr "GIT_EXT_SERVICE"
#. type: Plain text
#: en/git-remote-ext.txt:70
msgid ""
-"Set to long name (git-upload-pack, etc...) of service helper needs to "
-"invoke."
+"Set to long name (git-upload-pack, etc...) of service helper needs to invoke."
msgstr ""
#. type: Labeled list
#: en/git-remote-ext.txt:71
-#, ignore-same, no-wrap
+#, no-wrap
msgid "GIT_EXT_SERVICE_NOPREFIX"
msgstr "GIT_EXT_SERVICE_NOPREFIX"
@@ -48825,8 +48625,8 @@ msgstr ""
msgid ""
"Represents a repository with path /repo accessed using the helper program "
"\"git-server-alias foo\". The hostname for the remote server passed in the "
-"protocol stream will be \"foo\" (this allows multiple virtual Git servers to"
-" share a link-level address)."
+"protocol stream will be \"foo\" (this allows multiple virtual Git servers to "
+"share a link-level address)."
msgstr ""
#. type: Labeled list
@@ -48839,9 +48639,9 @@ msgstr ""
#: en/git-remote-ext.txt:112
msgid ""
"Represents a repository with path '/repo with spaces' accessed using the "
-"helper program \"git-server-alias foo\". The hostname for the remote server"
-" passed in the protocol stream will be \"foo\" (this allows multiple virtual"
-" Git servers to share a link-level address)."
+"helper program \"git-server-alias foo\". The hostname for the remote server "
+"passed in the protocol stream will be \"foo\" (this allows multiple virtual "
+"Git servers to share a link-level address)."
msgstr ""
#. type: Labeled list
@@ -48853,21 +48653,20 @@ msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:118
msgid ""
-"Represents a repository accessed using the helper program \"git-ssl "
-"foo.example /bar\". The type of request can be determined by the helper "
-"using environment variables (see above)."
+"Represents a repository accessed using the helper program \"git-ssl foo."
+"example /bar\". The type of request can be determined by the helper using "
+"environment variables (see above)."
msgstr ""
#. type: Plain text
#: en/git-remote-ext.txt:122 en/git-remote-fd.txt:56
#: en/git-remote-testgit.txt:27
-#, ignore-same
msgid "linkgit:gitremote-helpers[1]"
msgstr "linkgit:gitremote-helpers[1]"
#. type: Title =
#: en/git-remote-fd.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-remote-fd(1)"
msgstr "git-remote-fd(1)"
@@ -48895,8 +48694,8 @@ msgid ""
"If only <infd> is given, it is assumed to be a bidirectional socket "
"connected to remote Git server (git-upload-pack, git-receive-pack or git-"
"upload-archive). If both <infd> and <outfd> are given, they are assumed to "
-"be pipes connected to a remote Git server (<infd> being the inbound pipe and"
-" <outfd> being the outbound pipe."
+"be pipes connected to a remote Git server (<infd> being the inbound pipe and "
+"<outfd> being the outbound pipe."
msgstr ""
#. type: Plain text
@@ -48910,8 +48709,7 @@ msgstr ""
#: en/git-remote-fd.txt:30
msgid ""
"<anything> can be any string. It is ignored. It is meant for providing "
-"information to user in the URL in case that URL is displayed in some "
-"context."
+"information to user in the URL in case that URL is displayed in some context."
msgstr ""
#. type: Labeled list
@@ -48941,8 +48739,8 @@ msgstr ""
#. type: Plain text
#: en/git-remote-fd.txt:49
msgid ""
-"Push master, using file descriptor #7 to read data from git-receive-pack and"
-" file descriptor #8 to write data to same service."
+"Push master, using file descriptor #7 to read data from git-receive-pack and "
+"file descriptor #8 to write data to same service."
msgstr ""
#. type: Labeled list
@@ -48953,7 +48751,7 @@ msgstr ""
#. type: Title =
#: en/git-remote-testgit.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-remote-testgit(1)"
msgstr "git-remote-testgit(1)"
@@ -48985,7 +48783,7 @@ msgstr ""
#. type: Title =
#: en/git-remote.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-remote(1)"
msgstr "git-remote(1)"
@@ -49021,8 +48819,8 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:39
msgid ""
-"Be a little more verbose and show remote url after name. NOTE: This must be"
-" placed between `remote` and `subcommand`."
+"Be a little more verbose and show remote url after name. NOTE: This must be "
+"placed between `remote` and `subcommand`."
msgstr ""
#. type: Plain text
@@ -49042,8 +48840,8 @@ msgstr ""
#: en/git-remote.txt:52
msgid ""
"Adds a remote named <name> for the repository at <url>. The command `git "
-"fetch <name>` can then be used to create and update remote-tracking branches"
-" <name>/<branch>."
+"fetch <name>` can then be used to create and update remote-tracking branches "
+"<name>/<branch>."
msgstr ""
#. type: Plain text
@@ -49079,8 +48877,8 @@ msgstr ""
msgid ""
"With `-t <branch>` option, instead of the default glob refspec for the "
"remote to track all branches under the `refs/remotes/<name>/` namespace, a "
-"refspec to track only `<branch>` is created. You can give more than one `-t"
-" <branch>` to track multiple branches without grabbing all branches."
+"refspec to track only `<branch>` is created. You can give more than one `-t "
+"<branch>` to track multiple branches without grabbing all branches."
msgstr ""
#. type: Plain text
@@ -49094,8 +48892,8 @@ msgstr ""
#: en/git-remote.txt:79
msgid ""
"When a fetch mirror is created with `--mirror=fetch`, the refs will not be "
-"stored in the 'refs/remotes/' namespace, but rather everything in 'refs/' on"
-" the remote will be directly mirrored into 'refs/' in the local repository. "
+"stored in the 'refs/remotes/' namespace, but rather everything in 'refs/' on "
+"the remote will be directly mirrored into 'refs/' in the local repository. "
"This option only makes sense in bare repositories, because a fetch would "
"overwrite any local commits."
msgstr ""
@@ -49123,8 +48921,8 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:91
msgid ""
-"In case <old> and <new> are the same, and <old> is a file under "
-"`$GIT_DIR/remotes` or `$GIT_DIR/branches`, the remote is converted to the "
+"In case <old> and <new> are the same, and <old> is a file under `$GIT_DIR/"
+"remotes` or `$GIT_DIR/branches`, the remote is converted to the "
"configuration file format."
msgstr ""
@@ -49160,8 +48958,8 @@ msgid ""
"`refs/remotes/<name>/HEAD`) for the named remote. Having a default branch "
"for a remote is not required, but allows the name of the remote to be "
"specified in lieu of a specific branch. For example, if the default branch "
-"for `origin` is set to `master`, then `origin` may be specified wherever you"
-" would normally specify `origin/master`."
+"for `origin` is set to `master`, then `origin` may be specified wherever you "
+"would normally specify `origin/master`."
msgstr ""
#. type: Plain text
@@ -49175,11 +48973,11 @@ msgstr ""
#: en/git-remote.txt:116
msgid ""
"With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then "
-"the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g.,"
-" if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin "
-"-a`\" will set the symbolic-ref `refs/remotes/origin/HEAD` to "
-"`refs/remotes/origin/next`. This will only work if "
-"`refs/remotes/origin/next` already exists; if not it must be fetched first."
+"the symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., "
+"if the remote `HEAD` is pointed at `next`, \"`git remote set-head origin -a`"
+"\" will set the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/"
+"origin/next`. This will only work if `refs/remotes/origin/next` already "
+"exists; if not it must be fetched first."
msgstr ""
#. type: Plain text
@@ -49300,8 +49098,8 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:172
msgid ""
-"With `-n` option, the remote heads are not queried first with `git ls-remote"
-" <name>`; cached information is used instead."
+"With `-n` option, the remote heads are not queried first with `git ls-remote "
+"<name>`; cached information is used instead."
msgstr ""
#. type: Labeled list
@@ -49345,10 +49143,10 @@ msgstr ""
msgid ""
"Fetch updates for remotes or remote groups in the repository as defined by "
"remotes.<group>. If neither group nor remote is specified on the command "
-"line, the configuration parameter remotes.default will be used; if "
-"remotes.default is not defined, all remotes which do not have the "
-"configuration parameter remote.<name>.skipDefaultUpdate set to true will be "
-"updated. (See linkgit:git-config[1])."
+"line, the configuration parameter remotes.default will be used; if remotes."
+"default is not defined, all remotes which do not have the configuration "
+"parameter remote.<name>.skipDefaultUpdate set to true will be updated. (See "
+"linkgit:git-config[1])."
msgstr ""
#. type: Plain text
@@ -49416,13 +49214,12 @@ msgstr ""
#. type: Plain text
#: en/git-remote.txt:253
-#, ignore-same
msgid "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
msgstr "linkgit:git-fetch[1] linkgit:git-branch[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-repack.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-repack(1)"
msgstr "git-repack(1)"
@@ -49434,9 +49231,7 @@ msgstr ""
#. type: Plain text
#: en/git-repack.txt:13
#, no-wrap
-msgid ""
-"'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] "
-"[--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
+msgid "'git repack' [-a] [-A] [-d] [-f] [-F] [-l] [-n] [-q] [-b] [--window=<n>] [--depth=<n>] [--threads=<n>] [--keep-pack=<pack-name>]\n"
msgstr ""
#. type: Plain text
@@ -49452,8 +49247,8 @@ msgstr ""
msgid ""
"Instead of incrementally packing the unpacked objects, pack everything "
"referenced into a single pack. Especially useful when packing a repository "
-"that is used for private development. Use with `-d`. This will clean up the"
-" objects that `git prune` leaves behind, but `git fsck --full --dangling` "
+"that is used for private development. Use with `-d`. This will clean up the "
+"objects that `git prune` leaves behind, but `git fsck --full --dangling` "
"shows as dangling."
msgstr ""
@@ -49468,8 +49263,8 @@ msgstr ""
#. type: Plain text
#: en/git-repack.txt:48
msgid ""
-"Promisor packfiles are repacked separately: if there are packfiles that have"
-" an associated \".promisor\" file, these packfiles will be repacked into "
+"Promisor packfiles are repacked separately: if there are packfiles that have "
+"an associated \".promisor\" file, these packfiles will be repacked into "
"another separate pack, and an empty \".promisor\" file corresponding to the "
"new separate pack will be written."
msgstr ""
@@ -49479,8 +49274,8 @@ msgstr ""
msgid ""
"Same as `-a`, unless `-d` is used. Then any unreachable objects in a "
"previous pack become loose, unpacked objects, instead of being left in the "
-"old pack. Unreachable objects are never intentionally added to a pack, even"
-" when repacking. This option prevents unreachable objects from being "
+"old pack. Unreachable objects are never intentionally added to a pack, even "
+"when repacking. This option prevents unreachable objects from being "
"immediately deleted by way of being left in the old pack and then removed. "
"Instead, the loose unreachable objects will be pruned according to normal "
"expiry rules with the next 'git gc' invocation. See linkgit:git-gc[1]."
@@ -49535,11 +49330,11 @@ msgstr ""
msgid ""
"These two options affect how the objects contained in the pack are stored "
"using delta compression. The objects are first internally sorted by type, "
-"size and optionally names and compared against the other objects within "
-"`--window` to see if using delta compression saves space. `--depth` limits "
-"the maximum delta depth; making it too deep affects the performance on the "
-"unpacker side, because delta data needs to be applied that many times to get"
-" to the necessary object."
+"size and optionally names and compared against the other objects within `--"
+"window` to see if using delta compression saves space. `--depth` limits the "
+"maximum delta depth; making it too deep affects the performance on the "
+"unpacker side, because delta data needs to be applied that many times to get "
+"to the necessary object."
msgstr ""
#. type: Plain text
@@ -49554,11 +49349,11 @@ msgid ""
"size will dynamically scale down so as to not take up more than '<n>' bytes "
"in memory. This is useful in repositories with a mix of large and small "
"objects to not run out of memory with a large window, but still be able to "
-"take advantage of the large window for the smaller objects. The size can be"
-" suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory "
+"take advantage of the large window for the smaller objects. The size can be "
+"suffixed with \"k\", \"m\", or \"g\". `--window-memory=0` makes memory "
"usage unlimited. The default is taken from the `pack.windowMemory` "
-"configuration variable. Note that the actual memory usage will be the limit"
-" multiplied by the number of threads used by linkgit:git-pack-objects[1]."
+"configuration variable. Note that the actual memory usage will be the limit "
+"multiplied by the number of threads used by linkgit:git-pack-objects[1]."
msgstr ""
#. type: Plain text
@@ -49573,7 +49368,7 @@ msgstr ""
#. type: Labeled list
#: en/git-repack.txt:127
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--write-bitmap-index"
msgstr "--write-bitmap-index"
@@ -49582,14 +49377,13 @@ msgstr "--write-bitmap-index"
msgid ""
"Write a reachability bitmap index as part of the repack. This only makes "
"sense when used with `-a` or `-A`, as the bitmaps must be able to refer to "
-"all reachable objects. This option overrides the setting of "
-"`repack.writeBitmaps`. This option has no effect if multiple packfiles are "
-"created."
+"all reachable objects. This option overrides the setting of `repack."
+"writeBitmaps`. This option has no effect if multiple packfiles are created."
msgstr ""
#. type: Labeled list
#: en/git-repack.txt:134
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--pack-kept-objects"
msgstr "--pack-kept-objects"
@@ -49607,8 +49401,8 @@ msgstr ""
#. type: Plain text
#: en/git-repack.txt:149
msgid ""
-"Exclude the given pack from repacking. This is the equivalent of having "
-"`.keep` file on the pack. `<pack-name>` is the the pack file name without "
+"Exclude the given pack from repacking. This is the equivalent of having `."
+"keep` file on the pack. `<pack-name>` is the the pack file name without "
"leading directory (e.g. `pack-123.pack`). The option could be specified "
"multiple times to keep multiple packs."
msgstr ""
@@ -49664,13 +49458,12 @@ msgstr ""
#. type: Plain text
#: en/git-repack.txt:185
-#, ignore-same
msgid "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
msgstr "linkgit:git-pack-objects[1] linkgit:git-prune-packed[1]"
#. type: Title =
#: en/git-replace.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-replace(1)"
msgstr "git-replace(1)"
@@ -49792,20 +49585,20 @@ msgstr ""
#. type: Plain text
#: en/git-replace.txt:77
msgid ""
-"Edit an object's content interactively. The existing content for <object> is"
-" pretty-printed into a temporary file, an editor is launched on the file, "
-"and the result is parsed to create a new object of the same type as "
-"<object>. A replacement ref is then created to replace <object> with the "
-"newly created object. See linkgit:git-var[1] for details about how the "
-"editor will be chosen."
+"Edit an object's content interactively. The existing content for <object> is "
+"pretty-printed into a temporary file, an editor is launched on the file, and "
+"the result is parsed to create a new object of the same type as <object>. A "
+"replacement ref is then created to replace <object> with the newly created "
+"object. See linkgit:git-var[1] for details about how the editor will be "
+"chosen."
msgstr ""
#. type: Plain text
#: en/git-replace.txt:85
msgid ""
"When editing, provide the raw object contents rather than pretty-printed "
-"ones. Currently this only affects trees, which will be shown in their binary"
-" form. This is harder to work with, but can help when repairing a tree that "
+"ones. Currently this only affects trees, which will be shown in their binary "
+"form. This is harder to work with, but can help when repairing a tree that "
"is so corrupted it cannot be pretty-printed. Note that you may need to "
"configure your editor to cleanly read and write binary data."
msgstr ""
@@ -49820,15 +49613,15 @@ msgstr ""
#: en/git-replace.txt:93
msgid ""
"Create a graft commit. A new commit is created with the same content as "
-"<commit> except that its parents will be [<parent>...] instead of <commit>'s"
-" parents. A replacement ref is then created to replace <commit> with the "
-"newly created commit. Use `--convert-graft-file` to convert a "
-"`$GIT_DIR/info/grafts` file and use replace refs instead."
+"<commit> except that its parents will be [<parent>...] instead of <commit>'s "
+"parents. A replacement ref is then created to replace <commit> with the "
+"newly created commit. Use `--convert-graft-file` to convert a `$GIT_DIR/info/"
+"grafts` file and use replace refs instead."
msgstr ""
#. type: Labeled list
#: en/git-replace.txt:94
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--convert-graft-file"
msgstr "--convert-graft-file"
@@ -49856,8 +49649,8 @@ msgstr ""
#: en/git-replace.txt:105
msgid ""
"List replace refs for objects that match the given pattern (or all if no "
-"pattern is given). Typing \"git replace\" without arguments, also lists all"
-" replace refs."
+"pattern is given). Typing \"git replace\" without arguments, also lists all "
+"replace refs."
msgstr ""
#. type: Plain text
@@ -49959,7 +49752,7 @@ msgstr ""
#. type: Title =
#: en/git-request-pull.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-request-pull(1)"
msgstr "git-request-pull(1)"
@@ -50037,17 +49830,16 @@ msgstr ""
#: en/git-request-pull.txt:47
msgid ""
"When the repository named by `<url>` has the commit at a tip of a ref that "
-"is different from the ref you have locally, you can use the "
-"`<local>:<remote>` syntax, to have its local name, a colon `:`, and its "
-"remote name."
+"is different from the ref you have locally, you can use the `<local>:"
+"<remote>` syntax, to have its local name, a colon `:`, and its remote name."
msgstr ""
#. type: Plain text
#: en/git-request-pull.txt:56
msgid ""
"Imagine that you built your work on your `master` branch on top of the "
-"`v1.0` release, and want it to be integrated to the project. First you push"
-" that change to your public repository for others to see:"
+"`v1.0` release, and want it to be integrated to the project. First you push "
+"that change to your public repository for others to see:"
msgstr ""
#. type: Plain text
@@ -50101,7 +49893,7 @@ msgstr ""
#. type: Title =
#: en/git-rerere.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-rerere(1)"
msgstr "git-rerere(1)"
@@ -50113,9 +49905,7 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:12
#, no-wrap
-msgid ""
-"'git rerere' ['clear'|'forget' "
-"<pathspec>|'diff'|'remaining'|'status'|'gc']\n"
+msgid "'git rerere' ['clear'|'forget' <pathspec>|'diff'|'remaining'|'status'|'gc']\n"
msgstr ""
#. type: Plain text
@@ -50139,8 +49929,8 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:29
msgid ""
-"You need to set the configuration variable rerere.enabled in order to enable"
-" this command."
+"You need to set the configuration variable rerere.enabled in order to enable "
+"this command."
msgstr ""
#. type: Plain text
@@ -50188,9 +49978,8 @@ msgstr ""
#: en/git-rerere.txt:55
msgid ""
"Display diffs for the current state of the resolution. It is useful for "
-"tracking what has changed while the user is resolving conflicts. Additional"
-" arguments are passed directly to the system 'diff' command installed in "
-"PATH."
+"tracking what has changed while the user is resolving conflicts. Additional "
+"arguments are passed directly to the system 'diff' command installed in PATH."
msgstr ""
#. type: Labeled list
@@ -50229,8 +50018,8 @@ msgstr ""
msgid ""
"Prune records of conflicted merges that occurred a long time ago. By "
"default, unresolved conflicts older than 15 days and resolved conflicts "
-"older than 60 days are pruned. These defaults are controlled via the "
-"`gc.rerereUnresolved` and `gc.rerereResolved` configuration variables "
+"older than 60 days are pruned. These defaults are controlled via the `gc."
+"rerereUnresolved` and `gc.rerereResolved` configuration variables "
"respectively."
msgstr ""
@@ -50239,8 +50028,8 @@ msgstr ""
msgid ""
"When your topic branch modifies an overlapping area that your master branch "
"(or upstream) touched since your topic branch forked from it, you may want "
-"to test it with the latest master, even before your topic branch is ready to"
-" be pushed upstream:"
+"to test it with the latest master, even before your topic branch is ready to "
+"be pushed upstream:"
msgstr ""
#. type: delimited block -
@@ -50280,9 +50069,9 @@ msgstr ""
#: en/git-rerere.txt:106
msgid ""
"The commits marked with `*` touch the same area in the same file; you need "
-"to resolve the conflicts when creating the commit marked with `+`. Then you"
-" can test the result to make sure your work-in-progress still works with "
-"what is in the latest master."
+"to resolve the conflicts when creating the commit marked with `+`. Then you "
+"can test the result to make sure your work-in-progress still works with what "
+"is in the latest master."
msgstr ""
#. type: Plain text
@@ -50322,8 +50111,8 @@ msgid ""
"When your topic branch is long-lived, however, your topic branch would end "
"up having many such \"Merge from master\" commits on it, which would "
"unnecessarily clutter the development history. Readers of the Linux kernel "
-"mailing list may remember that Linus complained about such too frequent test"
-" merges when a subsystem maintainer asked to pull from a branch full of "
+"mailing list may remember that Linus complained about such too frequent test "
+"merges when a subsystem maintainer asked to pull from a branch full of "
"\"useless merges\"."
msgstr ""
@@ -50373,17 +50162,17 @@ msgid ""
"Running the 'git rerere' command immediately after a conflicted automerge "
"records the conflicted working tree files, with the usual conflict markers "
"`<<<<<<<`, `=======`, and `>>>>>>>` in them. Later, after you are done "
-"resolving the conflicts, running 'git rerere' again will record the resolved"
-" state of these files. Suppose you did this when you created the test merge"
-" of master into the topic branch."
+"resolving the conflicts, running 'git rerere' again will record the resolved "
+"state of these files. Suppose you did this when you created the test merge "
+"of master into the topic branch."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:177
msgid ""
"Next time, after seeing the same conflicted automerge, running 'git rerere' "
-"will perform a three-way merge between the earlier conflicted automerge, the"
-" earlier manual resolution, and the current conflicted automerge. If this "
+"will perform a three-way merge between the earlier conflicted automerge, the "
+"earlier manual resolution, and the current conflicted automerge. If this "
"three-way merge resolves cleanly, the result is written out to your working "
"tree file, so you do not have to manually resolve it. Note that 'git "
"rerere' leaves the index file alone, so you still need to do the final "
@@ -50407,16 +50196,16 @@ msgstr ""
msgid ""
"In our example, when you do the test merge, the manual resolution is "
"recorded, and it will be reused when you do the actual merge later with the "
-"updated master and topic branch, as long as the recorded resolution is still"
-" applicable."
+"updated master and topic branch, as long as the recorded resolution is still "
+"applicable."
msgstr ""
#. type: Plain text
#: en/git-rerere.txt:194
msgid ""
-"The information 'git rerere' records is also used when running 'git rebase'."
-" After blowing away the test merge and continuing development on the topic "
-"branch:"
+"The information 'git rerere' records is also used when running 'git "
+"rebase'. After blowing away the test merge and continuing development on "
+"the topic branch:"
msgstr ""
#. type: delimited block -
@@ -50446,9 +50235,9 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:213
msgid ""
-"you could run `git rebase master topic`, to bring yourself up to date before"
-" your topic is ready to be sent upstream. This would result in falling back"
-" to a three-way merge, and it would conflict the same way as the test merge "
+"you could run `git rebase master topic`, to bring yourself up to date before "
+"your topic is ready to be sent upstream. This would result in falling back "
+"to a three-way merge, and it would conflict the same way as the test merge "
"you resolved earlier. 'git rerere' will be run by 'git rebase' to help you "
"resolve this conflict."
msgstr ""
@@ -50456,8 +50245,8 @@ msgstr ""
#. type: Plain text
#: en/git-rerere.txt:219
msgid ""
-"[NOTE] 'git rerere' relies on the conflict markers in the file to detect the"
-" conflict. If the file already contains lines that look the same as lines "
+"[NOTE] 'git rerere' relies on the conflict markers in the file to detect the "
+"conflict. If the file already contains lines that look the same as lines "
"with conflict markers, 'git rerere' may fail to record a conflict "
"resolution. To work around this, the `conflict-marker-size` setting in "
"linkgit:gitattributes[5] can be used."
@@ -50465,7 +50254,7 @@ msgstr ""
#. type: Title =
#: en/git-reset.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-reset(1)"
msgstr "git-reset(1)"
@@ -50488,8 +50277,8 @@ msgstr ""
msgid ""
"In the first and second form, copy entries from `<tree-ish>` to the index. "
"In the third form, set the current branch head (`HEAD`) to `<commit>`, "
-"optionally modifying index and working tree to match. The `<tree-"
-"ish>`/`<commit>` defaults to `HEAD` in all forms."
+"optionally modifying index and working tree to match. The `<tree-ish>`/"
+"`<commit>` defaults to `HEAD` in all forms."
msgstr ""
#. type: Labeled list
@@ -50516,9 +50305,9 @@ msgstr ""
msgid ""
"After running `git reset <paths>` to update the index entry, you can use "
"linkgit:git-checkout[1] to check the contents out of the index to the "
-"working tree. Alternatively, using linkgit:git-checkout[1] and specifying a"
-" commit, you can copy the contents of a path out of a commit to the index "
-"and to the working tree in one go."
+"working tree. Alternatively, using linkgit:git-checkout[1] and specifying a "
+"commit, you can copy the contents of a path out of a commit to the index and "
+"to the working tree in one go."
msgstr ""
#. type: Labeled list
@@ -50560,7 +50349,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:53
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--soft"
msgstr "--soft"
@@ -50574,7 +50363,7 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:59
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--mixed"
msgstr "--mixed"
@@ -50589,13 +50378,13 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:66
msgid ""
-"If `-N` is specified, removed paths are marked as intent-to-add (see "
-"linkgit:git-add[1])."
+"If `-N` is specified, removed paths are marked as intent-to-add (see linkgit:"
+"git-add[1])."
msgstr ""
#. type: Labeled list
#: en/git-reset.txt:67
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--hard"
msgstr "--hard"
@@ -50610,8 +50399,8 @@ msgstr ""
#: en/git-reset.txt:78
msgid ""
"Resets the index and updates the files in the working tree that are "
-"different between `<commit>` and `HEAD`, but keeps those which are different"
-" between the index and working tree (i.e. which have changes which have not "
+"different between `<commit>` and `HEAD`, but keeps those which are different "
+"between the index and working tree (i.e. which have changes which have not "
"been added). If a file that is different between `<commit>` and the index "
"has unstaged changes, reset is aborted."
msgstr ""
@@ -50640,16 +50429,16 @@ msgstr ""
#. type: Labeled list
#: en/git-reset.txt:98
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-quiet"
msgstr "--no-quiet"
#. type: Plain text
#: en/git-reset.txt:102
msgid ""
-"Be quiet, only report errors. The default behavior is set by the "
-"`reset.quiet` config option. `--quiet` and `--no-quiet` will override the "
-"default behavior."
+"Be quiet, only report errors. The default behavior is set by the `reset."
+"quiet` config option. `--quiet` and `--no-quiet` will override the default "
+"behavior."
msgstr ""
#. type: Labeled list
@@ -50687,8 +50476,8 @@ msgstr ""
#: en/git-reset.txt:127
msgid ""
"However, you already dirtied the index (i.e. your index does not match the "
-"`HEAD` commit). But you know the pull you are going to make does not affect"
-" `frotz.c` or `filfre.c`, so you revert the index changes for these two "
+"`HEAD` commit). But you know the pull you are going to make does not affect "
+"`frotz.c` or `filfre.c`, so you revert the index changes for these two "
"files. Your changes in working tree remain there."
msgstr ""
@@ -50792,9 +50581,9 @@ msgstr ""
#: en/git-reset.txt:176
msgid ""
"The last three commits (`HEAD`, `HEAD^`, and `HEAD~2`) were bad and you do "
-"not want to ever see them again. Do *not* do this if you have already given"
-" these commits to somebody else. (See the \"RECOVERING FROM UPSTREAM "
-"REBASE\" section in linkgit:git-rebase[1] for the implications of doing so.)"
+"not want to ever see them again. Do *not* do this if you have already given "
+"these commits to somebody else. (See the \"RECOVERING FROM UPSTREAM REBASE"
+"\" section in linkgit:git-rebase[1] for the implications of doing so.)"
msgstr ""
#. type: Labeled list
@@ -50821,16 +50610,16 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:194
msgid ""
-"Try to update from the upstream resulted in a lot of conflicts; you were not"
-" ready to spend a lot of time merging right now, so you decide to do that "
+"Try to update from the upstream resulted in a lot of conflicts; you were not "
+"ready to spend a lot of time merging right now, so you decide to do that "
"later."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:197
msgid ""
-"\"pull\" has not made merge commit, so `git reset --hard` which is a synonym"
-" for `git reset --hard HEAD` clears the mess from the index file and the "
+"\"pull\" has not made merge commit, so `git reset --hard` which is a synonym "
+"for `git reset --hard HEAD` clears the mess from the index file and the "
"working tree."
msgstr ""
@@ -50873,8 +50662,8 @@ msgstr ""
#: en/git-reset.txt:220
msgid ""
"Even if you may have local modifications in your working tree, you can "
-"safely say `git pull` when you know that the change in the other branch does"
-" not overlap with them."
+"safely say `git pull` when you know that the change in the other branch does "
+"not overlap with them."
msgstr ""
#. type: Plain text
@@ -50925,8 +50714,8 @@ msgstr ""
#. type: Plain text
#: en/git-reset.txt:249
msgid ""
-"This removes the 'WIP' commit from the commit history, and sets your working"
-" tree to the state just before you made that snapshot."
+"This removes the 'WIP' commit from the commit history, and sets your working "
+"tree to the state just before you made that snapshot."
msgstr ""
#. type: Plain text
@@ -51067,8 +50856,8 @@ msgstr ""
#: en/git-reset.txt:322
msgid ""
"First, reset the history back one commit so that we remove the original "
-"commit, but leave the working tree with all the changes. The -N ensures that"
-" any new files added with `HEAD` are still marked so that `git add -p` will "
+"commit, but leave the working tree with all the changes. The -N ensures that "
+"any new files added with `HEAD` are still marked so that `git add -p` will "
"find them."
msgstr ""
@@ -51076,9 +50865,9 @@ msgstr ""
#: en/git-reset.txt:326
msgid ""
"Next, we interactively select diff hunks to add using the `git add -p` "
-"facility. This will ask you about each diff hunk in sequence and you can use"
-" simple commands such as \"yes, include this\", \"No don't include this\" or"
-" even the very powerful \"edit\" facility."
+"facility. This will ask you about each diff hunk in sequence and you can use "
+"simple commands such as \"yes, include this\", \"No don't include this\" or "
+"even the very powerful \"edit\" facility."
msgstr ""
#. type: Plain text
@@ -51095,11 +50884,10 @@ msgstr ""
msgid ""
"Next, commit the changes stored in the index. The `-c` option specifies to "
"pre-populate the commit message from the original message that you started "
-"with in the first commit. This is helpful to avoid retyping it. The "
-"`HEAD@{1}` is a special notation for the commit that `HEAD` used to be at "
-"prior to the original reset commit (1 change ago). See linkgit:git-"
-"reflog[1] for more details. You may also use any other valid commit "
-"reference."
+"with in the first commit. This is helpful to avoid retyping it. The `HEAD@{1}"
+"` is a special notation for the commit that `HEAD` used to be at prior to "
+"the original reset commit (1 change ago). See linkgit:git-reflog[1] for "
+"more details. You may also use any other valid commit reference."
msgstr ""
#. type: Plain text
@@ -51156,8 +50944,8 @@ msgid ""
"state `A` in the working tree, in state `B` in the index, in state `C` in "
"`HEAD` and in state `D` in the target, then `git reset --soft target` will "
"leave the file in the working tree in state `A` and in the index in state "
-"`B`. It resets (i.e. moves) the `HEAD` (i.e. the tip of the current branch,"
-" if you are on one) to `target` (which has the file in state `D`)."
+"`B`. It resets (i.e. moves) the `HEAD` (i.e. the tip of the current branch, "
+"if you are on one) to `target` (which has the file in state `D`)."
msgstr ""
#. type: delimited block .
@@ -51247,26 +51035,25 @@ msgid ""
"starts, and that it writes the result out to the working tree. So if we see "
"some difference between the index and the target and also between the index "
"and the working tree, then it means that we are not resetting out from a "
-"state that a mergy operation left after failing with a conflict. That is why"
-" we disallow `--merge` option in this case."
+"state that a mergy operation left after failing with a conflict. That is why "
+"we disallow `--merge` option in this case."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:446
msgid ""
-"`reset --keep` is meant to be used when removing some of the last commits in"
-" the current branch while keeping changes in the working tree. If there "
-"could be conflicts between the changes in the commit we want to remove and "
-"the changes in the working tree we want to keep, the reset is disallowed. "
-"That's why it is disallowed if there are both changes between the working "
-"tree and `HEAD`, and between `HEAD` and the target. To be safe, it is also "
-"disallowed when there are unmerged entries."
+"`reset --keep` is meant to be used when removing some of the last commits in "
+"the current branch while keeping changes in the working tree. If there could "
+"be conflicts between the changes in the commit we want to remove and the "
+"changes in the working tree we want to keep, the reset is disallowed. That's "
+"why it is disallowed if there are both changes between the working tree and "
+"`HEAD`, and between `HEAD` and the target. To be safe, it is also disallowed "
+"when there are unmerged entries."
msgstr ""
#. type: Plain text
#: en/git-reset.txt:449
-msgid ""
-"The following tables show what happens when there are unmerged entries:"
+msgid "The following tables show what happens when there are unmerged entries:"
msgstr ""
#. type: delimited block .
@@ -51302,7 +51089,7 @@ msgstr ""
#. type: Title =
#: en/git-revert.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-revert(1)"
msgstr "git-revert(1)"
@@ -51355,8 +51142,8 @@ msgstr ""
#. type: Plain text
#: en/git-revert.txt:48
msgid ""
-"With this option, 'git revert' will let you edit the commit message prior to"
-" committing the revert. This is the default if you run the command from a "
+"With this option, 'git revert' will let you edit the commit message prior to "
+"committing the revert. This is the default if you run the command from a "
"terminal."
msgstr ""
@@ -51395,8 +51182,8 @@ msgstr ""
#: en/git-revert.txt:79
msgid ""
"Usually the command automatically creates some commits with commit log "
-"messages stating which commits were reverted. This flag applies the changes"
-" necessary to revert the named commits to your working tree and the index, "
+"messages stating which commits were reverted. This flag applies the changes "
+"necessary to revert the named commits to your working tree and the index, "
"but does not make the commits. In addition, when this option is used, your "
"index does not have to match the HEAD commit. The revert is done against "
"the beginning state of your index."
@@ -51405,8 +51192,8 @@ msgstr ""
#. type: Plain text
#: en/git-revert.txt:82
msgid ""
-"This is useful when reverting more than one commits' effect to your index in"
-" a row."
+"This is useful when reverting more than one commits' effect to your index in "
+"a row."
msgstr ""
#. type: Labeled list
@@ -51439,7 +51226,7 @@ msgstr ""
#. type: Title =
#: en/git-rev-list.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-rev-list(1)"
msgstr "git-rev-list(1)"
@@ -51518,10 +51305,10 @@ msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:79
msgid ""
-"You can think of this as a set operation. Commits given on the command line"
-" form a set of commits that are reachable from any of them, and then commits"
-" reachable from any of the ones given with '{caret}' in front are subtracted"
-" from that set. The remaining commits are what comes out in the command's "
+"You can think of this as a set operation. Commits given on the command line "
+"form a set of commits that are reachable from any of them, and then commits "
+"reachable from any of the ones given with '{caret}' in front are subtracted "
+"from that set. The remaining commits are what comes out in the command's "
"output. Various other options and paths parameters can be used to further "
"limit the result."
msgstr ""
@@ -51548,8 +51335,8 @@ msgstr ""
#: en/git-rev-list.txt:92
msgid ""
"A special notation \"'<commit1>'..'<commit2>'\" can be used as a short-hand "
-"for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following"
-" may be used interchangeably:"
+"for \"{caret}'<commit1>' '<commit2>'\". For example, either of the following "
+"may be used interchangeably:"
msgstr ""
#. type: delimited block -
@@ -51579,15 +51366,15 @@ msgstr ""
#. type: Plain text
#: en/git-rev-list.txt:112
msgid ""
-"'rev-list' is a very essential Git command, since it provides the ability to"
-" build and traverse commit ancestry graphs. For this reason, it has a lot of"
-" different options that enables it to be used by commands as different as "
+"'rev-list' is a very essential Git command, since it provides the ability to "
+"build and traverse commit ancestry graphs. For this reason, it has a lot of "
+"different options that enables it to be used by commands as different as "
"'git bisect' and 'git repack'."
msgstr ""
#. type: Title =
#: en/git-rev-parse.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-rev-parse(1)"
msgstr "git-rev-parse(1)"
@@ -51625,7 +51412,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:33
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--parseopt"
msgstr "--parseopt"
@@ -51637,7 +51424,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:36
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--sq-quote"
msgstr "--sq-quote"
@@ -51657,7 +51444,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:44
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--keep-dashdash"
msgstr "--keep-dashdash"
@@ -51670,7 +51457,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:48
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--stop-at-non-option"
msgstr "--stop-at-non-option"
@@ -51678,13 +51465,13 @@ msgstr "--stop-at-non-option"
#: en/git-rev-parse.txt:52
msgid ""
"Only meaningful in `--parseopt` mode. Lets the option parser stop at the "
-"first non-option argument. This can be used to parse sub-commands that take"
-" options themselves."
+"first non-option argument. This can be used to parse sub-commands that take "
+"options themselves."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:53
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--stuck-long"
msgstr "--stuck-long"
@@ -51703,7 +51490,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:60
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--revs-only"
msgstr "--revs-only"
@@ -51715,7 +51502,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:64
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-revs"
msgstr "--no-revs"
@@ -51726,7 +51513,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:68
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--flags"
msgstr "--flags"
@@ -51737,7 +51524,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:71
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-flags"
msgstr "--no-flags"
@@ -51781,8 +51568,8 @@ msgstr ""
#: en/git-rev-parse.txt:90
msgid ""
"This can be used to convert arguments to a command run in a subdirectory so "
-"that they can still be used after moving to the top-level of the repository."
-" For example:"
+"that they can still be used after moving to the top-level of the "
+"repository. For example:"
msgstr ""
#. type: delimited block -
@@ -51807,8 +51594,8 @@ msgstr ""
#: en/git-rev-parse.txt:112
msgid ""
"If you want to make sure that the output actually names an object in your "
-"object database and/or can be used as a specific type of object you require,"
-" you can add the `^{type}` peeling operator to the parameter. For example, "
+"object database and/or can be used as a specific type of object you require, "
+"you can add the `^{type}` peeling operator to the parameter. For example, "
"`git rev-parse \"$VAR^{commit}\"` will make sure `$VAR` names an existing "
"object that is a commit-ish (i.e. a commit, or an annotated tag that points "
"at a commit). To make sure that `$VAR` names an existing object of any "
@@ -51819,13 +51606,13 @@ msgstr ""
#: en/git-rev-parse.txt:119
msgid ""
"Only meaningful in `--verify` mode. Do not output an error message if the "
-"first argument is not a valid object name; instead exit with non-zero status"
-" silently. SHA-1s for valid object names are printed to stdout on success."
+"first argument is not a valid object name; instead exit with non-zero status "
+"silently. SHA-1s for valid object names are printed to stdout on success."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:120
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--sq"
msgstr "--sq"
@@ -51834,9 +51621,9 @@ msgstr "--sq"
msgid ""
"Usually the output is made one line per flag and parameter. This option "
"makes output a single line, properly quoted for consumption by shell. "
-"Useful when you expect your parameter to contain whitespaces and newlines "
-"(e.g. when using pickaxe `-S` with 'git diff-{asterisk}'). In contrast to "
-"the `--sq-quote` option, the command input is still interpreted as usual."
+"Useful when you expect your parameter to contain whitespaces and newlines (e."
+"g. when using pickaxe `-S` with 'git diff-{asterisk}'). In contrast to the "
+"`--sq-quote` option, the command input is still interpreted as usual."
msgstr ""
#. type: Labeled list
@@ -51850,8 +51637,8 @@ msgstr ""
msgid ""
"Same as `--verify` but shortens the object name to a unique prefix with at "
"least `length` characters. The minimum length is 4, the default is the "
-"effective value of the `core.abbrev` configuration variable (see "
-"linkgit:git-config[1])."
+"effective value of the `core.abbrev` configuration variable (see linkgit:git-"
+"config[1])."
msgstr ""
#. type: Plain text
@@ -51870,13 +51657,13 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:144
msgid ""
-"A non-ambiguous short name of the objects name. The option "
-"core.warnAmbiguousRefs is used to select the strict abbreviation mode."
+"A non-ambiguous short name of the objects name. The option core."
+"warnAmbiguousRefs is used to select the strict abbreviation mode."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:145
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--symbolic"
msgstr "--symbolic"
@@ -51890,7 +51677,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:150
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--symbolic-full-name"
msgstr "--symbolic-full-name"
@@ -51943,9 +51730,9 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:174
msgid ""
-"If a `pattern` is given, only refs matching the given shell glob are shown."
-" If the pattern does not contain a globbing character (`?`, `*`, or `[`), "
-"it is turned into a prefix match by appending `/*`."
+"If a `pattern` is given, only refs matching the given shell glob are shown. "
+"If the pattern does not contain a globbing character (`?`, `*`, or `[`), it "
+"is turned into a prefix match by appending `/*`."
msgstr ""
#. type: Labeled list
@@ -51957,8 +51744,8 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:181
msgid ""
-"Show all refs matching the shell glob pattern `pattern`. If the pattern does"
-" not start with `refs/`, this is automatically prepended. If the pattern "
+"Show all refs matching the shell glob pattern `pattern`. If the pattern does "
+"not start with `refs/`, this is automatically prepended. If the pattern "
"does not contain a globbing character (`?`, `*`, or `[`), it is turned into "
"a prefix match by appending `/*`."
msgstr ""
@@ -51972,18 +51759,18 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:189 en/rev-list-options.txt:174
msgid ""
-"Do not include refs matching '<glob-pattern>' that the next `--all`, "
-"`--branches`, `--tags`, `--remotes`, or `--glob` would otherwise consider. "
-"Repetitions of this option accumulate exclusion patterns up to the next "
-"`--all`, `--branches`, `--tags`, `--remotes`, or `--glob` option (other "
-"options or arguments do not clear accumulated patterns)."
+"Do not include refs matching '<glob-pattern>' that the next `--all`, `--"
+"branches`, `--tags`, `--remotes`, or `--glob` would otherwise consider. "
+"Repetitions of this option accumulate exclusion patterns up to the next `--"
+"all`, `--branches`, `--tags`, `--remotes`, or `--glob` option (other options "
+"or arguments do not clear accumulated patterns)."
msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:195 en/rev-list-options.txt:180
msgid ""
-"The patterns given should not begin with `refs/heads`, `refs/tags`, or "
-"`refs/remotes` when applied to `--branches`, `--tags`, or `--remotes`, "
+"The patterns given should not begin with `refs/heads`, `refs/tags`, or `refs/"
+"remotes` when applied to `--branches`, `--tags`, or `--remotes`, "
"respectively, and they must begin with `refs/` when applied to `--glob` or "
"`--all`. If a trailing '/{asterisk}' is intended, it must be given "
"explicitly."
@@ -52011,7 +51798,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:205
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--local-env-vars"
msgstr "--local-env-vars"
@@ -52025,7 +51812,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:211
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--git-dir"
msgstr "--git-dir"
@@ -52040,13 +51827,13 @@ msgstr ""
#: en/git-rev-parse.txt:219
msgid ""
"If `$GIT_DIR` is not defined and the current directory is not detected to "
-"lie in a Git repository or work tree print a message to stderr and exit with"
-" nonzero status."
+"lie in a Git repository or work tree print a message to stderr and exit with "
+"nonzero status."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:220
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--absolute-git-dir"
msgstr "--absolute-git-dir"
@@ -52058,7 +51845,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:224
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--git-common-dir"
msgstr "--git-common-dir"
@@ -52069,7 +51856,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:227
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--is-inside-git-dir"
msgstr "--is-inside-git-dir"
@@ -52082,20 +51869,20 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:231
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--is-inside-work-tree"
msgstr "--is-inside-work-tree"
#. type: Plain text
#: en/git-rev-parse.txt:234
msgid ""
-"When the current working directory is inside the work tree of the repository"
-" print \"true\", otherwise \"false\"."
+"When the current working directory is inside the work tree of the repository "
+"print \"true\", otherwise \"false\"."
msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:235
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--is-bare-repository"
msgstr "--is-bare-repository"
@@ -52106,7 +51893,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:238
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--is-shallow-repository"
msgstr "--is-shallow-repository"
@@ -52146,7 +51933,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:254
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-cdup"
msgstr "--show-cdup"
@@ -52160,7 +51947,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:259
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-prefix"
msgstr "--show-prefix"
@@ -52173,7 +51960,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:264
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-toplevel"
msgstr "--show-toplevel"
@@ -52184,7 +51971,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:267
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-superproject-working-tree"
msgstr "--show-superproject-working-tree"
@@ -52198,7 +51985,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rev-parse.txt:273
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--shared-index-path"
msgstr "--shared-index-path"
@@ -52230,8 +52017,8 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:284
msgid ""
-"Parse the date string, and output the corresponding --max-age= parameter for"
-" 'git rev-list'."
+"Parse the date string, and output the corresponding --max-age= parameter for "
+"'git rev-list'."
msgstr ""
#. type: Labeled list
@@ -52249,8 +52036,8 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:289
msgid ""
-"Parse the date string, and output the corresponding --min-age= parameter for"
-" 'git rev-list'."
+"Parse the date string, and output the corresponding --min-age= parameter for "
+"'git rev-list'."
msgstr ""
#. type: Labeled list
@@ -52282,10 +52069,10 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:307
msgid ""
-"It takes on the standard input the specification of the options to parse and"
-" understand, and echoes on the standard output a string suitable for `sh(1)`"
-" `eval` to replace the arguments with normalized ones. In case of error, it"
-" outputs usage on the standard error stream, and exits with code 129."
+"It takes on the standard input the specification of the options to parse and "
+"understand, and echoes on the standard output a string suitable for `sh(1)` "
+"`eval` to replace the arguments with normalized ones. In case of error, it "
+"outputs usage on the standard error stream, and exits with code 129."
msgstr ""
#. type: Plain text
@@ -52363,9 +52150,9 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:342
msgid ""
-"Use `*` to mean that this option should not be listed in the usage generated"
-" for the `-h` argument. It's shown for `--help-all` as documented in "
-"linkgit:gitcli[7]."
+"Use `*` to mean that this option should not be listed in the usage generated "
+"for the `-h` argument. It's shown for `--help-all` as documented in linkgit:"
+"gitcli[7]."
msgstr ""
#. type: Plain text
@@ -52446,9 +52233,7 @@ msgstr ""
#. type: delimited block -
#: en/git-rev-parse.txt:378
#, no-wrap
-msgid ""
-"eval \"$(echo \"$OPTS_SPEC\" | git rev-parse --parseopt -- \"$@\" || echo "
-"exit $?)\"\n"
+msgid "eval \"$(echo \"$OPTS_SPEC\" | git rev-parse --parseopt -- \"$@\" || echo exit $?)\"\n"
msgstr ""
#. type: Title ~
@@ -52504,8 +52289,8 @@ msgstr ""
#. type: Plain text
#: en/git-rev-parse.txt:409
msgid ""
-"In `--sq-quote` mode, 'git rev-parse' echoes on the standard output a single"
-" line suitable for `sh(1)` `eval`. This line is made by normalizing the "
+"In `--sq-quote` mode, 'git rev-parse' echoes on the standard output a single "
+"line suitable for `sh(1)` `eval`. This line is made by normalizing the "
"arguments following `--sq-quote`. Nothing other than quoting the arguments "
"is done."
msgstr ""
@@ -52583,7 +52368,7 @@ msgstr ""
#. type: Title =
#: en/git-rm.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-rm(1)"
msgstr "git-rm(1)"
@@ -52595,9 +52380,7 @@ msgstr ""
#. type: Plain text
#: en/git-rm.txt:12
#, no-wrap
-msgid ""
-"'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] "
-"[--] <file>...\n"
+msgid "'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...\n"
msgstr ""
#. type: Plain text
@@ -52610,19 +52393,19 @@ msgid ""
"to be identical to the tip of the branch, and no updates to their contents "
"can be staged in the index, though that default behavior can be overridden "
"with the `-f` option. When `--cached` is given, the staged content has to "
-"match either the tip of the branch or the file on disk, allowing the file to"
-" be removed from just the index."
+"match either the tip of the branch or the file on disk, allowing the file to "
+"be removed from just the index."
msgstr ""
#. type: Plain text
#: en/git-rm.txt:38
msgid ""
-"Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching"
-" files. If you want Git to expand file glob characters, you may need to "
-"shell-escape them. A leading directory name (e.g. `dir` to remove "
-"`dir/file1` and `dir/file2`) can be given to remove all files in the "
-"directory, and recursively all sub-directories, but this requires the `-r` "
-"option to be explicitly given."
+"Files to remove. Fileglobs (e.g. `*.c`) can be given to remove all matching "
+"files. If you want Git to expand file glob characters, you may need to "
+"shell-escape them. A leading directory name (e.g. `dir` to remove `dir/"
+"file1` and `dir/file2`) can be given to remove all files in the directory, "
+"and recursively all sub-directories, but this requires the `-r` option to be "
+"explicitly given."
msgstr ""
#. type: Plain text
@@ -52651,7 +52434,7 @@ msgstr ""
#. type: Labeled list
#: en/git-rm.txt:63
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-unmatch"
msgstr "--ignore-unmatch"
@@ -52672,8 +52455,8 @@ msgstr ""
msgid ""
"The <file> list given to the command can be exact pathnames, file glob "
"patterns, or leading directory names. The command removes only the paths "
-"that are known to Git. Giving the name of a file that you have not told Git"
-" about does not remove that file."
+"that are known to Git. Giving the name of a file that you have not told Git "
+"about does not remove that file."
msgstr ""
#. type: Plain text
@@ -52693,8 +52476,8 @@ msgstr ""
#. type: Plain text
#: en/git-rm.txt:91
msgid ""
-"There is no option for `git rm` to remove from the index only the paths that"
-" have disappeared from the filesystem. However, depending on the use case, "
+"There is no option for `git rm` to remove from the index only the paths that "
+"have disappeared from the filesystem. However, depending on the use case, "
"there are several ways that can be done."
msgstr ""
@@ -52708,8 +52491,8 @@ msgstr ""
#: en/git-rm.txt:100
msgid ""
"If you intend that your next commit should record all modifications of "
-"tracked files in the working tree and record all removals of files that have"
-" been removed from the working tree with `rm` (as opposed to `git rm`), use "
+"tracked files in the working tree and record all removals of files that have "
+"been removed from the working tree with `rm` (as opposed to `git rm`), use "
"`git commit -a`, as it will automatically notice and record all removals. "
"You can also have a similar effect without committing by using `git add -u`."
msgstr ""
@@ -52794,9 +52577,9 @@ msgid ""
"repository lives inside the .git directory of the superproject. If a "
"submodule (or one of those nested inside it) still uses a .git directory, "
"`git rm` will move the submodules git directory into the superprojects git "
-"directory to protect the submodule's history. If it exists the "
-"submodule.<name> section in the linkgit:gitmodules[5] file will also be "
-"removed and that file will be staged (unless --cached or -n are used)."
+"directory to protect the submodule's history. If it exists the submodule."
+"<name> section in the linkgit:gitmodules[5] file will also be removed and "
+"that file will be staged (unless --cached or -n are used)."
msgstr ""
#. type: Plain text
@@ -52855,15 +52638,15 @@ msgstr ""
msgid ""
"Each time a superproject update removes a populated submodule (e.g. when "
"switching between commits before and after the removal) a stale submodule "
-"checkout will remain in the old location. Removing the old directory is only"
-" safe when it uses a gitfile, as otherwise the history of the submodule will"
-" be deleted too. This step will be obsolete when recursive submodule update "
+"checkout will remain in the old location. Removing the old directory is only "
+"safe when it uses a gitfile, as otherwise the history of the submodule will "
+"be deleted too. This step will be obsolete when recursive submodule update "
"has been implemented."
msgstr ""
#. type: Title =
#: en/git-send-email.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-send-email(1)"
msgstr "git-send-email(1)"
@@ -52936,7 +52719,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:48 en/git-tag.txt:61
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--annotate"
msgstr "--annotate"
@@ -52944,8 +52727,8 @@ msgstr "--annotate"
#: en/git-send-email.txt:52
msgid ""
"Review and edit each patch you're about to send. Default is the value of "
-"`sendemail.annotate`. See the CONFIGURATION section for "
-"`sendemail.multiEdit`."
+"`sendemail.annotate`. See the CONFIGURATION section for `sendemail."
+"multiEdit`."
msgstr ""
#. type: Labeled list
@@ -52957,8 +52740,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:56
msgid ""
-"Specify a \"Bcc:\" value for each email. Default is the value of "
-"`sendemail.bcc`."
+"Specify a \"Bcc:\" value for each email. Default is the value of `sendemail."
+"bcc`."
msgstr ""
#. type: Plain text
@@ -52981,7 +52764,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:65
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--compose"
msgstr "--compose"
@@ -53021,9 +52804,9 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:86
msgid ""
-"Specify the sender of the emails. If not specified on the command line, the"
-" value of the `sendemail.from` configuration option is used. If neither the"
-" command-line option nor `sendemail.from` are set, then the user will be "
+"Specify the sender of the emails. If not specified on the command line, the "
+"value of the `sendemail.from` configuration option is used. If neither the "
+"command-line option nor `sendemail.from` are set, then the user will be "
"prompted for the value. The default for the prompt will be the value of "
"GIT_AUTHOR_IDENT, or GIT_COMMITTER_IDENT if that is not set, as returned by "
"\"git var -l\"."
@@ -53038,9 +52821,9 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:91
msgid ""
-"Specify the address where replies from recipients should go to. Use this if"
-" replies to messages should go to another address than what is specified "
-"with the --from parameter."
+"Specify the address where replies from recipients should go to. Use this if "
+"replies to messages should go to another address than what is specified with "
+"the --from parameter."
msgstr ""
#. type: Labeled list
@@ -53082,8 +52865,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:113
msgid ""
-"Only necessary if --compose is also set. If --compose is not set, this will"
-" be prompted for."
+"Only necessary if --compose is also set. If --compose is not set, this will "
+"be prompted for."
msgstr ""
#. type: Labeled list
@@ -53095,8 +52878,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:118
msgid ""
-"Specify the initial subject of the email thread. Only necessary if "
-"--compose is also set. If --compose is not set, this will be prompted for."
+"Specify the initial subject of the email thread. Only necessary if --"
+"compose is also set. If --compose is not set, this will be prompted for."
msgstr ""
#. type: Labeled list
@@ -53110,8 +52893,8 @@ msgstr ""
msgid ""
"Specify the primary recipient of the emails generated. Generally, this will "
"be the upstream maintainer of the project involved. Default is the value of "
-"the `sendemail.to` configuration value; if that is unspecified, and --to-cmd"
-" is not specified, this will be prompted for."
+"the `sendemail.to` configuration value; if that is unspecified, and --to-cmd "
+"is not specified, this will be prompted for."
msgstr ""
#. type: Labeled list
@@ -53144,8 +52927,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:139
msgid ""
-"Specify encoding of compose message. Default is the value of the "
-"'sendemail.composeencoding'; if that is unspecified, UTF-8 is assumed."
+"Specify encoding of compose message. Default is the value of the 'sendemail."
+"composeencoding'; if that is unspecified, UTF-8 is assumed."
msgstr ""
#. type: Labeled list
@@ -53174,21 +52957,21 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:152
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--xmailer"
msgstr "--xmailer"
#. type: Labeled list
#: en/git-send-email.txt:153
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-xmailer"
msgstr "--no-xmailer"
#. type: Plain text
#: en/git-send-email.txt:157
msgid ""
-"Add (or prevent adding) the \"X-Mailer:\" header. By default, the header is"
-" added, but it can be turned off by setting the `sendemail.xmailer` "
+"Add (or prevent adding) the \"X-Mailer:\" header. By default, the header is "
+"added, but it can be turned off by setting the `sendemail.xmailer` "
"configuration variable to `false`."
msgstr ""
@@ -53207,13 +52990,12 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:169
msgid ""
-"Specify the envelope sender used to send the emails. This is useful if your"
-" default address is not the address that is subscribed to a list. In order "
-"to use the 'From' address, set the value to \"auto\". If you use the "
-"sendmail binary, you must have suitable privileges for the -f parameter. "
-"Default is the value of the `sendemail.envelopeSender` configuration "
-"variable; if that is unspecified, choosing the envelope sender is left to "
-"your MTA."
+"Specify the envelope sender used to send the emails. This is useful if your "
+"default address is not the address that is subscribed to a list. In order to "
+"use the 'From' address, set the value to \"auto\". If you use the sendmail "
+"binary, you must have suitable privileges for the -f parameter. Default is "
+"the value of the `sendemail.envelopeSender` configuration variable; if that "
+"is unspecified, choosing the envelope sender is left to your MTA."
msgstr ""
#. type: Labeled list
@@ -53268,9 +53050,9 @@ msgstr ""
msgid ""
"If at least one of the specified mechanisms matches the ones advertised by "
"the SMTP server and if it is supported by the utilized SASL library, the "
-"mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor "
-"`--smtp-auth` is specified, all mechanisms supported by the SASL library can"
-" be used. The special value 'none' maybe specified to completely disable "
+"mechanism is used for authentication. If neither 'sendemail.smtpAuth' nor `--"
+"smtp-auth` is specified, all mechanisms supported by the SASL library can be "
+"used. The special value 'none' maybe specified to completely disable "
"authentication independently of `--smtp-user`"
msgstr ""
@@ -53301,7 +53083,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:209
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-smtp-auth"
msgstr "--no-smtp-auth"
@@ -53323,9 +53105,9 @@ msgid ""
"or a raw IP address). Alternatively it can specify a full pathname of a "
"sendmail-like program instead; the program must support the `-i` option. "
"Default value can be specified by the `sendemail.smtpServer` configuration "
-"option; the built-in default is to search for `sendmail` in `/usr/sbin`, "
-"`/usr/lib` and $PATH if such program is available, falling back to "
-"`localhost` otherwise."
+"option; the built-in default is to search for `sendmail` in `/usr/sbin`, `/"
+"usr/lib` and $PATH if such program is available, falling back to `localhost` "
+"otherwise."
msgstr ""
#. type: Labeled list
@@ -53340,8 +53122,8 @@ msgid ""
"Specifies a port different from the default port (SMTP servers typically "
"listen to smtp port 25, but may also listen to submission port 587, or the "
"common SSL smtp port 465); symbolic port names (e.g. \"submission\" instead "
-"of 587) are also accepted. The port can also be set with the "
-"`sendemail.smtpServerPort` configuration variable."
+"of 587) are also accepted. The port can also be set with the `sendemail."
+"smtpServerPort` configuration variable."
msgstr ""
#. type: Labeled list
@@ -53353,21 +53135,21 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:234
msgid ""
-"If set, specifies the outgoing SMTP server option to use. Default value can"
-" be specified by the `sendemail.smtpServerOption` configuration option."
+"If set, specifies the outgoing SMTP server option to use. Default value can "
+"be specified by the `sendemail.smtpServerOption` configuration option."
msgstr ""
#. type: Plain text
#: en/git-send-email.txt:238
msgid ""
-"The --smtp-server-option option must be repeated for each option you want to"
-" pass to the server. Likewise, different lines in the configuration files "
+"The --smtp-server-option option must be repeated for each option you want to "
+"pass to the server. Likewise, different lines in the configuration files "
"must be used for each option."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:239
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--smtp-ssl"
msgstr "--smtp-ssl"
@@ -53378,7 +53160,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:242
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--smtp-ssl-cert-path"
msgstr "--smtp-ssl-cert-path"
@@ -53390,9 +53172,9 @@ msgid ""
"single file containing one or more PEM format certificates concatenated "
"together: see verify(1) -CAfile and -CApath for more information on these). "
"Set it to an empty string to disable certificate verification. Defaults to "
-"the value of the `sendemail.smtpsslcertpath` configuration variable, if set,"
-" or the backing SSL library's compiled-in default otherwise (which should be"
-" the best choice on most platforms)."
+"the value of the `sendemail.smtpsslcertpath` configuration variable, if set, "
+"or the backing SSL library's compiled-in default otherwise (which should be "
+"the best choice on most platforms)."
msgstr ""
#. type: Labeled list
@@ -53405,8 +53187,8 @@ msgstr ""
#: en/git-send-email.txt:257
msgid ""
"Username for SMTP-AUTH. Default is the value of `sendemail.smtpUser`; if a "
-"username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then"
-" authentication is not attempted."
+"username is not specified (with `--smtp-user` or `sendemail.smtpUser`), then "
+"authentication is not attempted."
msgstr ""
#. type: Labeled list
@@ -53434,9 +53216,9 @@ msgstr ""
msgid ""
"Some email servers (e.g. smtp.163.com) limit the number emails to be sent "
"per session (connection) and this will lead to a failure when sending many "
-"messages. With this option, send-email will disconnect after sending $<num>"
-" messages and wait for a few seconds (see --relogin-delay) and reconnect, "
-"to work around such a limit. You may want to use some form of credential "
+"messages. With this option, send-email will disconnect after sending $<num> "
+"messages and wait for a few seconds (see --relogin-delay) and reconnect, to "
+"work around such a limit. You may want to use some form of credential "
"helper to avoid having to retype your password every time this happens. "
"Defaults to the `sendemail.smtpBatchSize` configuration variable."
msgstr ""
@@ -53470,9 +53252,9 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:286
msgid ""
-"Specify a command to execute once per patch file which should generate patch"
-" file specific \"To:\" entries. Output of this command must be single email"
-" address per line. Default is the value of 'sendemail.tocmd' configuration "
+"Specify a command to execute once per patch file which should generate patch "
+"file specific \"To:\" entries. Output of this command must be single email "
+"address per line. Default is the value of 'sendemail.tocmd' configuration "
"value."
msgstr ""
@@ -53485,15 +53267,15 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:292
msgid ""
-"Specify a command to execute once per patch file which should generate patch"
-" file specific \"Cc:\" entries. Output of this command must be single email"
-" address per line. Default is the value of `sendemail.ccCmd` configuration "
+"Specify a command to execute once per patch file which should generate patch "
+"file specific \"Cc:\" entries. Output of this command must be single email "
+"address per line. Default is the value of `sendemail.ccCmd` configuration "
"value."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:293
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]chain-reply-to"
msgstr "--[no-]chain-reply-to"
@@ -53517,15 +53299,14 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:306
msgid ""
-"A configuration identity. When given, causes values in the "
-"'sendemail.<identity>' subsection to take precedence over values in the "
-"'sendemail' section. The default identity is the value of "
-"`sendemail.identity`."
+"A configuration identity. When given, causes values in the 'sendemail."
+"<identity>' subsection to take precedence over values in the 'sendemail' "
+"section. The default identity is the value of `sendemail.identity`."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:307
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]signed-off-by-cc"
msgstr "--[no-]signed-off-by-cc"
@@ -53533,36 +53314,36 @@ msgstr "--[no-]signed-off-by-cc"
#: en/git-send-email.txt:311
msgid ""
"If this is set, add emails found in Signed-off-by: or Cc: lines to the cc "
-"list. Default is the value of `sendemail.signedoffbycc` configuration value;"
-" if that is unspecified, default to --signed-off-by-cc."
+"list. Default is the value of `sendemail.signedoffbycc` configuration value; "
+"if that is unspecified, default to --signed-off-by-cc."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:312
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]cc-cover"
msgstr "--[no-]cc-cover"
#. type: Plain text
#: en/git-send-email.txt:317
msgid ""
-"If this is set, emails found in Cc: headers in the first patch of the series"
-" (typically the cover letter) are added to the cc list for each email set. "
+"If this is set, emails found in Cc: headers in the first patch of the series "
+"(typically the cover letter) are added to the cc list for each email set. "
"Default is the value of 'sendemail.cccover' configuration value; if that is "
"unspecified, default to --no-cc-cover."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:318
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]to-cover"
msgstr "--[no-]to-cover"
#. type: Plain text
#: en/git-send-email.txt:323
msgid ""
-"If this is set, emails found in To: headers in the first patch of the series"
-" (typically the cover letter) are added to the to list for each email set. "
+"If this is set, emails found in To: headers in the first patch of the series "
+"(typically the cover letter) are added to the to list for each email set. "
"Default is the value of 'sendemail.tocover' configuration value; if that is "
"unspecified, default to --no-to-cover."
msgstr ""
@@ -53599,8 +53380,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:335
msgid ""
-"'bodycc' will avoid including anyone mentioned in Cc lines in the patch body"
-" (commit message) except for self (use 'self' for that)."
+"'bodycc' will avoid including anyone mentioned in Cc lines in the patch body "
+"(commit message) except for self (use 'self' for that)."
msgstr ""
#. type: Plain text
@@ -53643,7 +53424,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:349
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]suppress-from"
msgstr "--[no-]suppress-from"
@@ -53657,15 +53438,15 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:354
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]thread"
msgstr "--[no-]thread"
#. type: Plain text
#: en/git-send-email.txt:360
msgid ""
-"If this is set, the In-Reply-To and References headers will be added to each"
-" email sent. Whether each mail refers to the previous email (`deep` "
+"If this is set, the In-Reply-To and References headers will be added to each "
+"email sent. Whether each mail refers to the previous email (`deep` "
"threading per 'git format-patch' wording) or to the first email (`shallow` "
"threading) is governed by \"--[no-]chain-reply-to\"."
msgstr ""
@@ -53674,9 +53455,8 @@ msgstr ""
#: en/git-send-email.txt:365
msgid ""
"If disabled with \"--no-thread\", those headers will not be added (unless "
-"specified with --in-reply-to). Default is the value of the "
-"`sendemail.thread` configuration value; if that is unspecified, default to "
-"--thread."
+"specified with --in-reply-to). Default is the value of the `sendemail."
+"thread` configuration value; if that is unspecified, default to --thread."
msgstr ""
#. type: Plain text
@@ -53725,8 +53505,7 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:385
msgid ""
-"'compose' will confirm before sending the first message when using "
-"--compose."
+"'compose' will confirm before sending the first message when using --compose."
msgstr ""
#. type: Plain text
@@ -53749,7 +53528,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:395
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]format-patch"
msgstr "--[no-]format-patch"
@@ -53757,9 +53536,9 @@ msgstr "--[no-]format-patch"
#: en/git-send-email.txt:400
msgid ""
"When an argument may be understood either as a reference or as a file name, "
-"choose to understand it as a format-patch argument (`--format-patch`) or as"
-" a file name (`--no-format-patch`). By default, when such a conflict occurs,"
-" git send-email will fail."
+"choose to understand it as a format-patch argument (`--format-patch`) or as "
+"a file name (`--no-format-patch`). By default, when such a conflict occurs, "
+"git send-email will fail."
msgstr ""
#. type: Plain text
@@ -53771,15 +53550,14 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:405
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]validate"
msgstr "--[no-]validate"
#. type: Plain text
#: en/git-send-email.txt:408
msgid ""
-"Perform sanity checks on patches. Currently, validation means the "
-"following:"
+"Perform sanity checks on patches. Currently, validation means the following:"
msgstr ""
#. type: Plain text
@@ -53806,8 +53584,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:420
msgid ""
-"Default is the value of `sendemail.validate`; if this is not set, default to"
-" `--validate`."
+"Default is the value of `sendemail.validate`; if this is not set, default to "
+"`--validate`."
msgstr ""
#. type: Plain text
@@ -53823,7 +53601,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:428
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--dump-aliases"
msgstr "--dump-aliases"
@@ -53838,7 +53616,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:438
-#, ignore-same, no-wrap
+#, no-wrap
msgid "sendemail.aliasesFile"
msgstr "sendemail.aliasesFile"
@@ -53851,7 +53629,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:442
-#, ignore-same, no-wrap
+#, no-wrap
msgid "sendemail.aliasFileType"
msgstr "sendemail.aliasFileType"
@@ -53915,7 +53693,7 @@ msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:463
-#, ignore-same, no-wrap
+#, no-wrap
msgid "sendemail.multiEdit"
msgstr "sendemail.multiEdit"
@@ -53923,14 +53701,14 @@ msgstr "sendemail.multiEdit"
#: en/git-send-email.txt:468
msgid ""
"If true (default), a single editor instance will be spawned to edit files "
-"you have to edit (patches when `--annotate` is used, and the summary when "
-"`--compose` is used). If false, files will be edited one after the other, "
+"you have to edit (patches when `--annotate` is used, and the summary when `--"
+"compose` is used). If false, files will be edited one after the other, "
"spawning a new editor each time."
msgstr ""
#. type: Labeled list
#: en/git-send-email.txt:469
-#, ignore-same, no-wrap
+#, no-wrap
msgid "sendemail.confirm"
msgstr "sendemail.confirm"
@@ -53969,8 +53747,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:490
msgid ""
-"If you have multifactor authentication setup on your gmail account, you will"
-" need to generate an app-specific password for use with 'git send-email'. "
+"If you have multifactor authentication setup on your gmail account, you will "
+"need to generate an app-specific password for use with 'git send-email'. "
"Visit https://security.google.com/settings/security/apppasswords to create "
"it."
msgstr ""
@@ -53994,8 +53772,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-email.txt:502
msgid ""
-"The first time you run it, you will be prompted for your credentials. Enter"
-" the app-specific or your regular password as appropriate. If you have "
+"The first time you run it, you will be prompted for your credentials. Enter "
+"the app-specific or your regular password as appropriate. If you have "
"credential helper configured (see linkgit:git-credential[1]), the password "
"will be saved in the credential store so you won't have to type it the next "
"time."
@@ -54016,7 +53794,7 @@ msgstr ""
#. type: Title =
#: en/git-send-pack.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-send-pack(1)"
msgstr "git-send-pack(1)"
@@ -54038,8 +53816,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:21
msgid ""
-"Usually you would want to use 'git push', which is a higher-level wrapper of"
-" this command, instead. See linkgit:git-push[1]."
+"Usually you would want to use 'git push', which is a higher-level wrapper of "
+"this command, instead. See linkgit:git-push[1]."
msgstr ""
#. type: Plain text
@@ -54057,8 +53835,8 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:40
msgid ""
-"Instead of explicitly specifying which refs to update, update all heads that"
-" locally exist."
+"Instead of explicitly specifying which refs to update, update all heads that "
+"locally exist."
msgstr ""
#. type: Plain text
@@ -54070,15 +53848,15 @@ msgstr ""
#. type: Labeled list
#: en/git-send-pack.txt:68
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--atomic"
msgstr "--atomic"
#. type: Plain text
#: en/git-send-pack.txt:72
msgid ""
-"Use an atomic transaction for updating the refs. If any of the refs fails to"
-" update then the entire push will fail without changing any refs."
+"Use an atomic transaction for updating the refs. If any of the refs fails to "
+"update then the entire push will fail without changing any refs."
msgstr ""
#. type: Labeled list
@@ -54115,15 +53893,14 @@ msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:107
-msgid ""
-"There are three ways to specify which refs to update on the remote end."
+msgid "There are three ways to specify which refs to update on the remote end."
msgstr ""
#. type: Plain text
#: en/git-send-pack.txt:111
msgid ""
-"With `--all` flag, all refs that exist locally are transferred to the remote"
-" side. You cannot specify any '<ref>' if you use this flag."
+"With `--all` flag, all refs that exist locally are transferred to the remote "
+"side. You cannot specify any '<ref>' if you use this flag."
msgstr ""
#. type: Plain text
@@ -54137,10 +53914,10 @@ msgstr ""
#: en/git-send-pack.txt:120
msgid ""
"When one or more '<ref>' are specified explicitly (whether on the command "
-"line or via `--stdin`), it can be either a single pattern, or a pair of such"
-" pattern separated by a colon \":\" (this means that a ref name cannot have "
-"a colon in it). A single pattern '<name>' is just a shorthand for "
-"'<name>:<name>'."
+"line or via `--stdin`), it can be either a single pattern, or a pair of such "
+"pattern separated by a colon \":\" (this means that a ref name cannot have a "
+"colon in it). A single pattern '<name>' is just a shorthand for '<name>:"
+"<name>'."
msgstr ""
#. type: Plain text
@@ -54161,7 +53938,7 @@ msgstr ""
#. type: Title =
#: en/git-shell.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-shell(1)"
msgstr "git-shell(1)"
@@ -54182,10 +53959,10 @@ msgstr ""
#. type: Plain text
#: en/git-shell.txt:23
msgid ""
-"This is a login shell for SSH accounts to provide restricted Git access. It"
-" permits execution only of server-side Git commands implementing the "
-"pull/push functionality, plus custom commands present in a subdirectory "
-"named `git-shell-commands` in the user's home directory."
+"This is a login shell for SSH accounts to provide restricted Git access. It "
+"permits execution only of server-side Git commands implementing the pull/"
+"push functionality, plus custom commands present in a subdirectory named "
+"`git-shell-commands` in the user's home directory."
msgstr ""
#. type: Plain text
@@ -54264,8 +54041,8 @@ msgstr ""
#. type: Plain text
#: en/git-shell.txt:61
msgid ""
-"Generally this mode is used as an administrative interface to allow users to"
-" list repositories they have access to, create, delete, or rename "
+"Generally this mode is used as an administrative interface to allow users to "
+"list repositories they have access to, create, delete, or rename "
"repositories, or change repository descriptions and permissions."
msgstr ""
@@ -54351,8 +54128,8 @@ msgstr ""
#: en/git-sh-i18n--envsubst.txt:24
msgid ""
"This is not a command the end user would want to run. Ever. This "
-"documentation is meant for people who are studying the plumbing scripts "
-"and/or are writing new ones."
+"documentation is meant for people who are studying the plumbing scripts and/"
+"or are writing new ones."
msgstr ""
#. type: Plain text
@@ -54373,7 +54150,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-i18n.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-sh-i18n(1)"
msgstr "git-sh-i18n(1)"
@@ -54392,10 +54169,10 @@ msgstr ""
#: en/git-sh-i18n.txt:26
msgid ""
"The 'git sh-i18n scriptlet is designed to be sourced (using `.`) by Git's "
-"porcelain programs implemented in shell script. It provides wrappers for the"
-" GNU `gettext` and `eval_gettext` functions accessible through the "
-"`gettext.sh` script, and provides pass-through fallbacks on systems without "
-"GNU gettext."
+"porcelain programs implemented in shell script. It provides wrappers for the "
+"GNU `gettext` and `eval_gettext` functions accessible through the `gettext."
+"sh` script, and provides pass-through fallbacks on systems without GNU "
+"gettext."
msgstr ""
#. type: Labeled list
@@ -54422,14 +54199,14 @@ msgstr ""
#: en/git-sh-i18n.txt:40
msgid ""
"Currently a dummy fall-through function implemented as a wrapper around "
-"`printf(1)` with variables expanded by the linkgit:git-"
-"sh-i18n{litdd}envsubst[1] helper. Will be replaced by a real gettext "
-"implementation in a later version."
+"`printf(1)` with variables expanded by the linkgit:git-sh-i18n{litdd}"
+"envsubst[1] helper. Will be replaced by a real gettext implementation in a "
+"later version."
msgstr ""
#. type: Title =
#: en/git-shortlog.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-shortlog(1)"
msgstr "git-shortlog(1)"
@@ -54481,7 +54258,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:39
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--email"
msgstr "--email"
@@ -54512,7 +54289,7 @@ msgstr ""
#. type: Labeled list
#: en/git-shortlog.txt:51
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--committer"
msgstr "--committer"
@@ -54546,12 +54323,12 @@ msgstr ""
#. type: Plain text
#: en/git-shortlog.txt:71
msgid ""
-"Show only commits in the specified revision range. When no <revision range>"
-" is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
+"Show only commits in the specified revision range. When no <revision range> "
+"is specified, it defaults to `HEAD` (i.e. the whole history leading to the "
"current commit). `origin..HEAD` specifies all the commits reachable from "
-"the current commit (i.e. `HEAD`), but not from `origin`. For a complete list"
-" of ways to spell <revision range>, see the \"Specifying Ranges\" section of"
-" linkgit:gitrevisions[7]."
+"the current commit (i.e. `HEAD`), but not from `origin`. For a complete list "
+"of ways to spell <revision range>, see the \"Specifying Ranges\" section of "
+"linkgit:gitrevisions[7]."
msgstr ""
#. type: Plain text
@@ -54571,7 +54348,7 @@ msgstr ""
#. type: Title =
#: en/git-show-branch.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-show-branch(1)"
msgstr "git-show-branch(1)"
@@ -54607,8 +54384,8 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:29
msgid ""
-"It uses `showbranch.default` multi-valued configuration items if no <rev> or"
-" <glob> is given on the command line."
+"It uses `showbranch.default` multi-valued configuration items if no <rev> or "
+"<glob> is given on the command line."
msgstr ""
#. type: Labeled list
@@ -54650,7 +54427,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:51
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--current"
msgstr "--current"
@@ -54663,7 +54440,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:56 en/rev-list-options.txt:644
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--topo-order"
msgstr "--topo-order"
@@ -54671,13 +54448,13 @@ msgstr "--topo-order"
#: en/git-show-branch.txt:61
msgid ""
"By default, the branches and their commits are shown in reverse "
-"chronological order. This option makes them appear in topological order "
-"(i.e., descendant commits are shown before their parents)."
+"chronological order. This option makes them appear in topological order (i."
+"e., descendant commits are shown before their parents)."
msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:62 en/rev-list-options.txt:636
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--date-order"
msgstr "--date-order"
@@ -54718,7 +54495,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:83
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--merge-base"
msgstr "--merge-base"
@@ -54740,7 +54517,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:94
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-name"
msgstr "--no-name"
@@ -54751,7 +54528,7 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:97
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--sha1-name"
msgstr "--sha1-name"
@@ -54765,15 +54542,15 @@ msgstr ""
#. type: Labeled list
#: en/git-show-branch.txt:103
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--topics"
msgstr "--topics"
#. type: Plain text
#: en/git-show-branch.txt:110
msgid ""
-"Shows only commits that are NOT on the first branch given. This helps track"
-" topic branches by hiding any commit that is already in the main line of "
+"Shows only commits that are NOT on the first branch given. This helps track "
+"topic branches by hiding any commit that is already in the main line of "
"development. When given \"git show-branch --topics master topic1 topic2\", "
"this will show the revisions given by \"git rev-list {caret}master topic1 "
"topic2\""
@@ -54828,16 +54605,18 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:146
msgid ""
-"Following these N lines, one-line log for each commit is displayed, indented"
-" N places. If a commit is on the I-th branch, the I-th indentation "
-"character shows a `+` sign; otherwise it shows a space. Merge commits are "
-"denoted by a `-` sign. Each commit shows a short name that can be used as "
-"an extended SHA-1 to name that commit."
+"Following these N lines, one-line log for each commit is displayed, indented "
+"N places. If a commit is on the I-th branch, the I-th indentation character "
+"shows a `+` sign; otherwise it shows a space. Merge commits are denoted by "
+"a `-` sign. Each commit shows a short name that can be used as an extended "
+"SHA-1 to name that commit."
msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:149
-msgid "The following example shows three branches, \"master\", \"fixes\" and \"mhf\":"
+msgid ""
+"The following example shows three branches, \"master\", \"fixes\" and \"mhf"
+"\":"
msgstr ""
#. type: delimited block -
@@ -54871,11 +54650,11 @@ msgstr ""
#. type: Plain text
#: en/git-show-branch.txt:174
msgid ""
-"These three branches all forked from a common commit, [master], whose commit"
-" message is \"Add {apostrophe}git show-branch{apostrophe}\". The \"fixes\" "
+"These three branches all forked from a common commit, [master], whose commit "
+"message is \"Add {apostrophe}git show-branch{apostrophe}\". The \"fixes\" "
"branch adds one commit \"Introduce \"reset type\" flag to \"git reset\"\". "
-"The \"mhf\" branch adds many other commits. The current branch is "
-"\"master\"."
+"The \"mhf\" branch adds many other commits. The current branch is \"master"
+"\"."
msgstr ""
#. type: Plain text
@@ -54899,8 +54678,8 @@ msgstr ""
#: en/git-show-branch.txt:193
msgid ""
"With this, `git show-branch` without extra parameters would show only the "
-"primary branches. In addition, if you happen to be on your topic branch, it"
-" is shown as well."
+"primary branches. In addition, if you happen to be on your topic branch, it "
+"is shown as well."
msgstr ""
#. type: delimited block -
@@ -54919,7 +54698,7 @@ msgstr ""
#. type: Title =
#: en/git-show-index.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-show-index(1)"
msgstr "git-show-index(1)"
@@ -54979,7 +54758,7 @@ msgstr ""
#. type: Title =
#: en/git-show-ref.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-show-ref(1)"
msgstr "git-show-ref(1)"
@@ -55015,21 +54794,21 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:29
msgid ""
-"The --exclude-existing form is a filter that does the inverse. It reads refs"
-" from stdin, one ref per line, and shows those that don't exist in the local"
-" repository."
+"The --exclude-existing form is a filter that does the inverse. It reads refs "
+"from stdin, one ref per line, and shows those that don't exist in the local "
+"repository."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:32
msgid ""
-"Use of this utility is encouraged in favor of directly accessing files under"
-" the `.git` directory."
+"Use of this utility is encouraged in favor of directly accessing files under "
+"the `.git` directory."
msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:36
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--head"
msgstr "--head"
@@ -55042,21 +54821,21 @@ msgstr ""
#: en/git-show-ref.txt:46
msgid ""
"Limit to \"refs/heads\" and \"refs/tags\", respectively. These options are "
-"not mutually exclusive; when given both, references stored in \"refs/heads\""
-" and \"refs/tags\" are displayed."
+"not mutually exclusive; when given both, references stored in \"refs/heads\" "
+"and \"refs/tags\" are displayed."
msgstr ""
#. type: Labeled list
#: en/git-show-ref.txt:48
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--dereference"
msgstr "--dereference"
#. type: Plain text
#: en/git-show-ref.txt:52
msgid ""
-"Dereference tags into object IDs as well. They will be shown with "
-"\"{caret}{}\" appended."
+"Dereference tags into object IDs as well. They will be shown with \"{caret}"
+"{}\" appended."
msgstr ""
#. type: Labeled list
@@ -55068,23 +54847,23 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:58
msgid ""
-"Only show the SHA-1 hash, not the reference name. When combined with "
-"--dereference the dereferenced tag will still be shown after the SHA-1."
+"Only show the SHA-1 hash, not the reference name. When combined with --"
+"dereference the dereferenced tag will still be shown after the SHA-1."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:64
msgid ""
"Enable stricter reference checking by requiring an exact ref path. Aside "
-"from returning an error code of 1, it will also print an error message if "
-"`--quiet` was not specified."
+"from returning an error code of 1, it will also print an error message if `--"
+"quiet` was not specified."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:69
msgid ""
-"Abbreviate the object name. When using `--hash`, you do not have to say "
-"`--hash --abbrev`; `--hash=n` would do."
+"Abbreviate the object name. When using `--hash`, you do not have to say `--"
+"hash --abbrev`; `--hash=n` would do."
msgstr ""
#. type: Plain text
@@ -55136,17 +54915,15 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:95
msgid ""
-"Show references matching one or more patterns. Patterns are matched from the"
-" end of the full name, and only complete parts are matched, e.g. 'master' "
-"matches 'refs/heads/master', 'refs/remotes/origin/master', "
-"'refs/tags/jedi/master' but not 'refs/heads/mymaster' or "
-"'refs/remotes/master/jedi'."
+"Show references matching one or more patterns. Patterns are matched from the "
+"end of the full name, and only complete parts are matched, e.g. 'master' "
+"matches 'refs/heads/master', 'refs/remotes/origin/master', 'refs/tags/jedi/"
+"master' but not 'refs/heads/mymaster' or 'refs/remotes/master/jedi'."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:100
-msgid ""
-"The output is in the format: '<SHA-1 ID>' '<space>' '<reference name>'."
+msgid "The output is in the format: '<SHA-1 ID>' '<space>' '<reference name>'."
msgstr ""
#. type: delimited block -
@@ -55185,8 +54962,8 @@ msgstr ""
#: en/git-show-ref.txt:129
msgid ""
"To show all references called \"master\", whether tags or heads or anything "
-"else, and regardless of how deep in the reference naming hierarchy they are,"
-" use:"
+"else, and regardless of how deep in the reference naming hierarchy they are, "
+"use:"
msgstr ""
#. type: delimited block -
@@ -55198,8 +54975,8 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:136
msgid ""
-"This will show \"refs/heads/master\" but also \"refs/remote/other-"
-"repo/master\", if such references exists."
+"This will show \"refs/heads/master\" but also \"refs/remote/other-repo/master"
+"\", if such references exists."
msgstr ""
#. type: Plain text
@@ -55252,15 +55029,15 @@ msgstr ""
#: en/git-show-ref.txt:163
msgid ""
"To show only tags, or only proper branch heads, use \"--tags\" and/or \"--"
-"heads\" respectively (using both means that it shows tags and heads, but not"
-" other random references under the refs/ subdirectory)."
+"heads\" respectively (using both means that it shows tags and heads, but not "
+"other random references under the refs/ subdirectory)."
msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:166
msgid ""
-"To do automatic tag object dereferencing, use the \"-d\" or \"--"
-"dereference\" flag, so you can do"
+"To do automatic tag object dereferencing, use the \"-d\" or \"--dereference"
+"\" flag, so you can do"
msgstr ""
#. type: delimited block -
@@ -55281,7 +55058,6 @@ msgstr ""
#. type: Plain text
#: en/git-show-ref.txt:183
-#, ignore-same
msgid ""
"linkgit:git-for-each-ref[1], linkgit:git-ls-remote[1], linkgit:git-update-"
"ref[1], linkgit:gitrepository-layout[5]"
@@ -55291,7 +55067,7 @@ msgstr ""
#. type: Title =
#: en/git-show.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-show(1)"
msgstr "git-show(1)"
@@ -55326,8 +55102,7 @@ msgstr ""
#. type: Plain text
#: en/git-show.txt:26
msgid ""
-"For trees, it shows the names (equivalent to 'git ls-tree' with --name-"
-"only)."
+"For trees, it shows the names (equivalent to 'git ls-tree' with --name-only)."
msgstr ""
#. type: Plain text
@@ -55356,8 +55131,8 @@ msgstr ""
#. type: Plain text
#: en/git-show.txt:41
msgid ""
-"The names of objects to show (defaults to 'HEAD'). For a more complete list"
-" of ways to spell object names, see \"SPECIFYING REVISIONS\" section in "
+"The names of objects to show (defaults to 'HEAD'). For a more complete list "
+"of ways to spell object names, see \"SPECIFYING REVISIONS\" section in "
"linkgit:gitrevisions[7]."
msgstr ""
@@ -55422,7 +55197,7 @@ msgstr ""
#. type: Title =
#: en/git-sh-setup.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-sh-setup(1)"
msgstr "git-sh-setup(1)"
@@ -55457,8 +55232,8 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:32
msgid ""
-"The scriptlet sets `GIT_DIR` and `GIT_OBJECT_DIRECTORY` shell variables, but"
-" does *not* export them to the environment."
+"The scriptlet sets `GIT_DIR` and `GIT_OBJECT_DIRECTORY` shell variables, but "
+"does *not* export them to the environment."
msgstr ""
#. type: Labeled list
@@ -55493,10 +55268,10 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:49
msgid ""
-"Set `GIT_REFLOG_ACTION` environment to a given string (typically the name of"
-" the program) unless it is already set. Whenever the script runs a `git` "
-"command that updates refs, a reflog entry is created using the value of this"
-" string to leave the record of what command updated the ref."
+"Set `GIT_REFLOG_ACTION` environment to a given string (typically the name of "
+"the program) unless it is already set. Whenever the script runs a `git` "
+"command that updates refs, a reflog entry is created using the value of this "
+"string to leave the record of what command updated the ref."
msgstr ""
#. type: Labeled list
@@ -55509,8 +55284,8 @@ msgstr ""
#: en/git-sh-setup.txt:54
msgid ""
"runs an editor of user's choice (GIT_EDITOR, core.editor, VISUAL or EDITOR) "
-"on a given file, but error out if no editor is specified and the terminal is"
-" dumb."
+"on a given file, but error out if no editor is specified and the terminal is "
+"dumb."
msgstr ""
#. type: Labeled list
@@ -55606,14 +55381,14 @@ msgstr ""
#. type: Plain text
#: en/git-sh-setup.txt:92
msgid ""
-"modifies the first file so only lines in common with the second file remain."
-" If there is insufficient common material, then the first file is left "
-"empty. The result is suitable as a virtual base input for a 3-way merge."
+"modifies the first file so only lines in common with the second file remain. "
+"If there is insufficient common material, then the first file is left empty. "
+"The result is suitable as a virtual base input for a 3-way merge."
msgstr ""
#. type: Title =
#: en/git-stage.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-stage(1)"
msgstr "git-stage(1)"
@@ -55631,13 +55406,13 @@ msgstr ""
#. type: Plain text
#: en/git-stage.txt:20
msgid ""
-"This is a synonym for linkgit:git-add[1]. Please refer to the documentation"
-" of that command."
+"This is a synonym for linkgit:git-add[1]. Please refer to the documentation "
+"of that command."
msgstr ""
#. type: Title =
#: en/git-stash.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-stash(1)"
msgstr "git-stash(1)"
@@ -55675,12 +55450,12 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:38
msgid ""
-"The modifications stashed away by this command can be listed with `git stash"
-" list`, inspected with `git stash show`, and restored (potentially on top of"
-" a different commit) with `git stash apply`. Calling `git stash` without "
-"any arguments is equivalent to `git stash push`. A stash is by default "
-"listed as \"WIP on 'branchname' ...\", but you can give a more descriptive "
-"message on the command line when you create one."
+"The modifications stashed away by this command can be listed with `git stash "
+"list`, inspected with `git stash show`, and restored (potentially on top of "
+"a different commit) with `git stash apply`. Calling `git stash` without any "
+"arguments is equivalent to `git stash push`. A stash is by default listed "
+"as \"WIP on 'branchname' ...\", but you can give a more descriptive message "
+"on the command line when you create one."
msgstr ""
#. type: Plain text
@@ -55697,17 +55472,15 @@ msgstr ""
#. type: Labeled list
#: en/git-stash.txt:49
#, no-wrap
-msgid ""
-"push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all]"
-" [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
+msgid "push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]"
msgstr ""
#. type: Plain text
#: en/git-stash.txt:55
msgid ""
"Save your local modifications to a new 'stash entry' and roll them back to "
-"HEAD (in the working tree and in the index). The <message> part is optional"
-" and gives the description along with the stashed state."
+"HEAD (in the working tree and in the index). The <message> part is optional "
+"and gives the description along with the stashed state."
msgstr ""
#. type: Plain text
@@ -55733,8 +55506,8 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:70
msgid ""
-"If the `--keep-index` option is used, all changes already added to the index"
-" are left intact."
+"If the `--keep-index` option is used, all changes already added to the index "
+"are left intact."
msgstr ""
#. type: Plain text
@@ -55751,9 +55524,9 @@ msgstr ""
msgid ""
"With `--patch`, you can interactively select hunks from the diff between "
"HEAD and the working tree to be stashed. The stash entry is constructed "
-"such that its index state is the same as the index state of your repository,"
-" and its worktree contains only the changes you selected interactively. The"
-" selected changes are then rolled back from your worktree. See the "
+"such that its index state is the same as the index state of your repository, "
+"and its worktree contains only the changes you selected interactively. The "
+"selected changes are then rolled back from your worktree. See the "
"``Interactive Mode'' section of linkgit:git-add[1] to learn how to operate "
"the `--patch` mode."
msgstr ""
@@ -55768,9 +55541,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stash.txt:87
#, no-wrap
-msgid ""
-"save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all]"
-" [-q|--quiet] [<message>]"
+msgid "save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]"
msgstr ""
#. type: Plain text
@@ -55793,8 +55564,7 @@ msgid ""
"List the stash entries that you currently have. Each 'stash entry' is "
"listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is "
"the one before, etc.), the name of the branch that was current when the "
-"entry was made, and a short description of the commit the entry was based "
-"on."
+"entry was made, and a short description of the commit the entry was based on."
msgstr ""
#. type: delimited block -
@@ -55822,10 +55592,10 @@ msgstr ""
#: en/git-stash.txt:119
msgid ""
"Show the changes recorded in the stash entry as a diff between the stashed "
-"contents and the commit back when the stash entry was first created. When no"
-" `<stash>` is given, it shows the latest one. By default, the command shows"
-" the diffstat, but it will accept any format known to 'git diff' (e.g., `git"
-" stash show -p stash@{1}` to view the second most recent entry in patch "
+"contents and the commit back when the stash entry was first created. When no "
+"`<stash>` is given, it shows the latest one. By default, the command shows "
+"the diffstat, but it will accept any format known to 'git diff' (e.g., `git "
+"stash show -p stash@{1}` to view the second most recent entry in patch "
"form). You can use stash.showStat and/or stash.showPatch config variables "
"to change the default behavior."
msgstr ""
@@ -55839,8 +55609,8 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:126
msgid ""
-"Remove a single stashed state from the stash list and apply it on top of the"
-" current working tree state, i.e., do the inverse operation of `git stash "
+"Remove a single stashed state from the stash list and apply it on top of the "
+"current working tree state, i.e., do the inverse operation of `git stash "
"push`. The working directory must match the index."
msgstr ""
@@ -55848,8 +55618,8 @@ msgstr ""
#: en/git-stash.txt:130
msgid ""
"Applying the state can fail with conflicts; in this case, it is not removed "
-"from the stash list. You need to resolve the conflicts by hand and call `git"
-" stash drop` manually afterwards."
+"from the stash list. You need to resolve the conflicts by hand and call `git "
+"stash drop` manually afterwards."
msgstr ""
#. type: Plain text
@@ -55864,8 +55634,8 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:138
msgid ""
-"When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must"
-" be a reference of the form `stash@{<revision>}`."
+"When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must "
+"be a reference of the form `stash@{<revision>}`."
msgstr ""
#. type: Labeled list
@@ -55878,8 +55648,8 @@ msgstr ""
#: en/git-stash.txt:144
msgid ""
"Like `pop`, but do not remove the state from the stash list. Unlike `pop`, "
-"`<stash>` may be any commit that looks like a commit created by `stash push`"
-" or `stash create`."
+"`<stash>` may be any commit that looks like a commit created by `stash push` "
+"or `stash create`."
msgstr ""
#. type: Labeled list
@@ -55894,8 +55664,8 @@ msgid ""
"Creates and checks out a new branch named `<branchname>` starting from the "
"commit at which the `<stash>` was originally created, applies the changes "
"recorded in `<stash>` to the new working tree and index. If that succeeds, "
-"and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops"
-" the `<stash>`. When no `<stash>` is given, applies the latest one."
+"and `<stash>` is a reference of the form `stash@{<revision>}`, it then drops "
+"the `<stash>`. When no `<stash>` is given, applies the latest one."
msgstr ""
#. type: Plain text
@@ -55932,8 +55702,8 @@ msgstr ""
msgid ""
"Remove a single stash entry from the list of stash entries. When no "
"`<stash>` is given, it removes the latest one. i.e. `stash@{0}`, otherwise "
-"`<stash>` must be a valid stash log reference of the form "
-"`stash@{<revision>}`."
+"`<stash>` must be a valid stash log reference of the form `stash@{<revision>}"
+"`."
msgstr ""
#. type: Labeled list
@@ -55961,16 +55731,16 @@ msgstr ""
#: en/git-stash.txt:186
msgid ""
"Store a given stash created via 'git stash create' (which is a dangling "
-"merge commit) in the stash ref, updating the stash reflog. This is intended"
-" to be useful for scripts. It is probably not the command you want to use; "
+"merge commit) in the stash ref, updating the stash reflog. This is intended "
+"to be useful for scripts. It is probably not the command you want to use; "
"see \"push\" above."
msgstr ""
#. type: Plain text
#: en/git-stash.txt:195
msgid ""
-"A stash entry is represented as a commit whose tree records the state of the"
-" working directory, and its first parent is the commit at `HEAD` when the "
+"A stash entry is represented as a commit whose tree records the state of the "
+"working directory, and its first parent is the commit at `HEAD` when the "
"entry was created. The tree of the second parent records the state of the "
"index when the entry is made, and it is made a child of the `HEAD` commit. "
"The ancestry graph looks like this:"
@@ -56011,8 +55781,8 @@ msgstr ""
#: en/git-stash.txt:219
msgid ""
"However, there are cases in which your local changes do conflict with the "
-"upstream changes, and `git pull` refuses to overwrite your changes. In such"
-" a case, you can stash your changes away, perform a pull, and then unstash, "
+"upstream changes, and `git pull` refuses to overwrite your changes. In such "
+"a case, you can stash your changes away, perform a pull, and then unstash, "
"like this:"
msgstr ""
@@ -56031,9 +55801,9 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:235
msgid ""
-"When you are in the middle of something, your boss comes in and demands that"
-" you fix something immediately. Traditionally, you would make a commit to a"
-" temporary branch to store your changes away, and return to your original "
+"When you are in the middle of something, your boss comes in and demands that "
+"you fix something immediately. Traditionally, you would make a commit to a "
+"temporary branch to store your changes away, and return to your original "
"branch to make the emergency fix, like this:"
msgstr ""
@@ -56124,7 +55894,6 @@ msgstr ""
#. type: Plain text
#: en/git-stash.txt:297
-#, ignore-same
msgid ""
"linkgit:git-checkout[1], linkgit:git-commit[1], linkgit:git-reflog[1], "
"linkgit:git-reset[1]"
@@ -56134,7 +55903,7 @@ msgstr ""
#. type: Title =
#: en/git-status.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-status(1)"
msgstr "git-status(1)"
@@ -56167,7 +55936,7 @@ msgstr ""
#. type: Labeled list
#: en/git-status.txt:35
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-stash"
msgstr "--show-stash"
@@ -56207,17 +55976,17 @@ msgstr ""
msgid ""
"In addition to the names of files that have been changed, also show the "
"textual changes that are staged to be committed (i.e., like the output of "
-"`git diff --cached`). If `-v` is specified twice, then also show the changes"
-" in the working tree that have not yet been staged (i.e., like the output of"
-" `git diff`)."
+"`git diff --cached`). If `-v` is specified twice, then also show the changes "
+"in the working tree that have not yet been staged (i.e., like the output of "
+"`git diff`)."
msgstr ""
#. type: Plain text
#: en/git-status.txt:65
msgid ""
"The mode parameter is used to specify the handling of untracked files. It "
-"is optional: it defaults to 'all', and if specified, it must be stuck to the"
-" option (e.g. `-uno`, but not `-u no`)."
+"is optional: it defaults to 'all', and if specified, it must be stuck to the "
+"option (e.g. `-uno`, but not `-u no`)."
msgstr ""
#. type: Plain text
@@ -56235,10 +56004,10 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:81
msgid ""
-"When `-u` option is not used, untracked files and directories are shown "
-"(i.e. the same as specifying `normal`), to help you avoid forgetting to add "
-"newly created files. Because it takes extra work to find untracked files in"
-" the filesystem, this mode may take some time in a large working tree. "
+"When `-u` option is not used, untracked files and directories are shown (i."
+"e. the same as specifying `normal`), to help you avoid forgetting to add "
+"newly created files. Because it takes extra work to find untracked files in "
+"the filesystem, this mode may take some time in a large working tree. "
"Consider enabling untracked cache and split index if supported (see `git "
"update-index --untracked-cache` and `git update-index --split-index`), "
"Otherwise you can use `no` to have `git status` return more quickly without "
@@ -56253,14 +56022,14 @@ msgid ""
"\"none\" will consider the submodule modified when it either contains "
"untracked or modified files or its HEAD differs from the commit recorded in "
"the superproject and can be used to override any settings of the 'ignore' "
-"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\""
-" is used submodules are not considered dirty when they only contain "
-"untracked content (but they are still scanned for modified content). Using "
-"\"dirty\" ignores all changes to the work tree of submodules, only changes "
-"to the commits stored in the superproject are shown (this was the behavior "
-"before 1.7.0). Using \"all\" hides all changes to submodules (and suppresses"
-" the output of submodule summaries when the config option "
-"`status.submoduleSummary` is set)."
+"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\" "
+"is used submodules are not considered dirty when they only contain untracked "
+"content (but they are still scanned for modified content). Using \"dirty\" "
+"ignores all changes to the work tree of submodules, only changes to the "
+"commits stored in the superproject are shown (this was the behavior before "
+"1.7.0). Using \"all\" hides all changes to submodules (and suppresses the "
+"output of submodule summaries when the config option `status."
+"submoduleSummary` is set)."
msgstr ""
#. type: Labeled list
@@ -56318,35 +56087,35 @@ msgstr ""
msgid ""
"When 'matching' mode is specified, paths that explicitly match an ignored "
"pattern are shown. If a directory matches an ignore pattern, then it is "
-"shown, but not paths contained in the ignored directory. If a directory does"
-" not match an ignore pattern, but all contents are ignored, then the "
+"shown, but not paths contained in the ignored directory. If a directory does "
+"not match an ignore pattern, but all contents are ignored, then the "
"directory is not shown, but all contents are shown."
msgstr ""
#. type: Plain text
#: en/git-status.txt:125
msgid ""
-"Terminate entries with NUL, instead of LF. This implies the "
-"`--porcelain=v1` output format if no other format is given."
+"Terminate entries with NUL, instead of LF. This implies the `--"
+"porcelain=v1` output format if no other format is given."
msgstr ""
#. type: Plain text
#: en/git-status.txt:132
msgid ""
-"Display untracked files in columns. See configuration variable column.status"
-" for option syntax.`--column` and `--no-column` without options are "
+"Display untracked files in columns. See configuration variable column.status "
+"for option syntax.`--column` and `--no-column` without options are "
"equivalent to 'always' and 'never' respectively."
msgstr ""
#. type: Labeled list
#: en/git-status.txt:133
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ahead-behind"
msgstr "--ahead-behind"
#. type: Labeled list
#: en/git-status.txt:134
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-ahead-behind"
msgstr "--no-ahead-behind"
@@ -56359,7 +56128,7 @@ msgstr ""
#. type: Labeled list
#: en/git-status.txt:138
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--renames"
msgstr "--renames"
@@ -56395,8 +56164,8 @@ msgstr ""
#: en/git-status.txt:163
msgid ""
"The paths mentioned in the output, unlike many other Git commands, are made "
-"relative to the current directory if you are working in a subdirectory (this"
-" is on purpose, to help cutting and pasting). See the status.relativePaths "
+"relative to the current directory if you are working in a subdirectory (this "
+"is on purpose, to help cutting and pasting). See the status.relativePaths "
"config option below."
msgstr ""
@@ -56424,8 +56193,8 @@ msgstr ""
#: en/git-status.txt:176
msgid ""
"where `ORIG_PATH` is where the renamed/copied contents came from. "
-"`ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a"
-" two-letter status code."
+"`ORIG_PATH` is only shown when the entry is renamed or copied. The `XY` is a "
+"two-letter status code."
msgstr ""
#. type: Plain text
@@ -56433,8 +56202,8 @@ msgstr ""
msgid ""
"The fields (including the `->`) are separated from each other by a single "
"space. If a filename contains whitespace or other nonprintable characters, "
-"that field will be quoted in the manner of a C string literal: surrounded by"
-" ASCII double quote (34) characters, and with interior special characters "
+"that field will be quoted in the manner of a C string literal: surrounded by "
+"ASCII double quote (34) characters, and with interior special characters "
"backslash-escaped."
msgstr ""
@@ -56561,9 +56330,9 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:251
msgid ""
-"Version 1 porcelain format is similar to the short format, but is guaranteed"
-" not to change in a backwards-incompatible way between Git versions or based"
-" on user configuration. This makes it ideal for parsing by scripts. The "
+"Version 1 porcelain format is similar to the short format, but is guaranteed "
+"not to change in a backwards-incompatible way between Git versions or based "
+"on user configuration. This makes it ideal for parsing by scripts. The "
"description of the short format above also describes the porcelain format, "
"with a few exceptions:"
msgstr ""
@@ -56571,8 +56340,8 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:254
msgid ""
-"The user's color.status configuration is not respected; color will always be"
-" off."
+"The user's color.status configuration is not respected; color will always be "
+"off."
msgstr ""
#. type: Plain text
@@ -56683,8 +56452,7 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:312
#, no-wrap
-msgid ""
-" 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
+msgid " 2 <XY> <sub> <mH> <mI> <mW> <hH> <hI> <X><score> <path><sep><origPath>\n"
msgstr ""
#. type: delimited block .
@@ -56805,8 +56573,8 @@ msgstr ""
#. type: Plain text
#: en/git-status.txt:391
msgid ""
-"Without the `-z` option, pathnames with \"unusual\" characters are quoted as"
-" explained for the configuration variable `core.quotePath` (see linkgit:git-"
+"Without the `-z` option, pathnames with \"unusual\" characters are quoted as "
+"explained for the configuration variable `core.quotePath` (see linkgit:git-"
"config[1])."
msgstr ""
@@ -56814,8 +56582,8 @@ msgstr ""
#: en/git-status.txt:400
msgid ""
"The command honors `color.status` (or `status.color` -- they mean the same "
-"thing and the latter is kept for backward compatibility) and "
-"`color.status.<slot>` configuration variables to colorize its output."
+"thing and the latter is kept for backward compatibility) and `color.status."
+"<slot>` configuration variables to colorize its output."
msgstr ""
#. type: Plain text
@@ -56830,14 +56598,14 @@ msgstr ""
#: en/git-status.txt:415
msgid ""
"If `status.submoduleSummary` is set to a non zero number or true (identical "
-"to -1 or an unlimited number), the submodule summary will be enabled for the"
-" long format and a summary of commits for modified submodules will be shown "
+"to -1 or an unlimited number), the submodule summary will be enabled for the "
+"long format and a summary of commits for modified submodules will be shown "
"(see --summary-limit option of linkgit:git-submodule[1]). Please note that "
"the summary output from the status command will be suppressed for all "
"submodules when `diff.ignoreSubmodules` is set to 'all' or only for those "
-"submodules where `submodule.<name>.ignore=all`. To also view the summary for"
-" ignored submodules you can either use the --ignore-submodules=dirty command"
-" line option or the 'git submodule summary' command, which shows a similar "
+"submodules where `submodule.<name>.ignore=all`. To also view the summary for "
+"ignored submodules you can either use the --ignore-submodules=dirty command "
+"line option or the 'git submodule summary' command, which shows a similar "
"output but does not honor these settings."
msgstr ""
@@ -56863,7 +56631,7 @@ msgstr ""
#. type: Title =
#: en/git-stripspace.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-stripspace(1)"
msgstr "git-stripspace(1)"
@@ -56930,7 +56698,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:39
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--strip-comments"
msgstr "--strip-comments"
@@ -56942,7 +56710,7 @@ msgstr ""
#. type: Labeled list
#: en/git-stripspace.txt:43
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--comment-lines"
msgstr "--comment-lines"
@@ -57015,7 +56783,7 @@ msgstr ""
#. type: Title =
#: en/git-submodule.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-submodule(1)"
msgstr "git-submodule(1)"
@@ -57052,9 +56820,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:31
#, no-wrap
-msgid ""
-"add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] "
-"[--depth <depth>] [--] <repository> [<path>]"
+msgid "add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--depth <depth>] [--] <repository> [<path>]"
msgstr ""
#. type: Plain text
@@ -57072,9 +56838,9 @@ msgid ""
"be either an absolute URL, or (if it begins with ./ or ../), the location "
"relative to the superproject's default remote repository (Please note that "
"to specify a repository 'foo.git' which is located right next to a "
-"superproject 'bar.git', you'll have to use '../foo.git' instead of "
-"'./foo.git' - as one might expect when following the rules for relative URLs"
-" - because the evaluation of relative URLs in Git is identical to that of "
+"superproject 'bar.git', you'll have to use '../foo.git' instead of './foo."
+"git' - as one might expect when following the rules for relative URLs - "
+"because the evaluation of relative URLs in Git is identical to that of "
"relative directories)."
msgstr ""
@@ -57094,19 +56860,19 @@ msgstr ""
msgid ""
"The optional argument <path> is the relative location for the cloned "
"submodule to exist in the superproject. If <path> is not given, the "
-"canonical part of the source repository is used (\"repo\" for "
-"\"/path/to/repo.git\" and \"foo\" for \"host.xz:foo/.git\"). If <path> "
-"exists and is already a valid Git repository, then it is staged for commit "
-"without cloning. The <path> is also used as the submodule's logical name in "
-"its configuration entries unless `--name` is used to specify a logical name."
+"canonical part of the source repository is used (\"repo\" for \"/path/to/"
+"repo.git\" and \"foo\" for \"host.xz:foo/.git\"). If <path> exists and is "
+"already a valid Git repository, then it is staged for commit without "
+"cloning. The <path> is also used as the submodule's logical name in its "
+"configuration entries unless `--name` is used to specify a logical name."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:68
msgid ""
"The given URL is recorded into `.gitmodules` for use by subsequent users "
-"cloning the superproject. If the URL is given relative to the superproject's"
-" repository, the presumption is the superproject and submodule repositories "
+"cloning the superproject. If the URL is given relative to the superproject's "
+"repository, the presumption is the superproject and submodule repositories "
"will be kept together in the same relative location, and only the "
"superproject's URL needs to be provided. git-submodule will correctly "
"locate the submodule using the relative URL in `.gitmodules`."
@@ -57125,8 +56891,8 @@ msgid ""
"currently checked out commit for each submodule, along with the submodule "
"path and the output of 'git describe' for the SHA-1. Each SHA-1 will "
"possibly be prefixed with `-` if the submodule is not initialized, `+` if "
-"the currently checked out submodule commit does not match the SHA-1 found in"
-" the index of the containing repository and `U` if the submodule has merge "
+"the currently checked out submodule commit does not match the SHA-1 found in "
+"the index of the containing repository and `U` if the submodule has merge "
"conflicts."
msgstr ""
@@ -57165,8 +56931,8 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:98
msgid ""
-"Optional <path> arguments limit which submodules will be initialized. If no"
-" path is specified and submodule.active has been configured, submodules "
+"Optional <path> arguments limit which submodules will be initialized. If no "
+"path is specified and submodule.active has been configured, submodules "
"configured to be active will be initialized, otherwise all submodules are "
"initialized."
msgstr ""
@@ -57174,8 +56940,8 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:106
msgid ""
-"When present, it will also copy the value of `submodule.$name.update`. This"
-" command does not alter existing information in .git/config. You can then "
+"When present, it will also copy the value of `submodule.$name.update`. This "
+"command does not alter existing information in .git/config. You can then "
"customize the submodule clone URLs in .git/config for your local setup and "
"proceed to `git submodule update`; you can also just use `git submodule "
"update --init` without the explicit 'init' step if you do not intend to "
@@ -57200,8 +56966,8 @@ msgid ""
"section from .git/config together with their work tree. Further calls to "
"`git submodule update`, `git submodule foreach` and `git submodule sync` "
"will skip any unregistered submodules until they are initialized again, so "
-"use this command if you don't want to have a local checkout of the submodule"
-" in your working tree anymore."
+"use this command if you don't want to have a local checkout of the submodule "
+"in your working tree anymore."
msgstr ""
#. type: Plain text
@@ -57214,25 +56980,22 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:122
msgid ""
-"If `--force` is specified, the submodule's working tree will be removed even"
-" if it contains local modifications."
+"If `--force` is specified, the submodule's working tree will be removed even "
+"if it contains local modifications."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:126
msgid ""
-"If you really want to remove a submodule from the repository and commit that"
-" use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal "
+"If you really want to remove a submodule from the repository and commit that "
+"use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal "
"options."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:127
#, no-wrap
-msgid ""
-"update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] "
-"[-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] "
-"[--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
+msgid "update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -57242,10 +57005,10 @@ msgid ""
"cloning missing submodules and updating the working tree of the submodules. "
"The \"updating\" can be done in several ways depending on command line "
"options and the value of `submodule.<name>.update` configuration variable. "
-"The command line option takes precedence over the configuration variable. If"
-" neither is given, a 'checkout' is performed. The 'update' procedures "
-"supported both from the command line as well as through the "
-"`submodule.<name>.update` configuration are:"
+"The command line option takes precedence over the configuration variable. If "
+"neither is given, a 'checkout' is performed. The 'update' procedures "
+"supported both from the command line as well as through the `submodule."
+"<name>.update` configuration are:"
msgstr ""
#. type: Labeled list
@@ -57305,8 +57068,8 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:155
msgid ""
-"The following 'update' procedures are only available via the "
-"`submodule.<name>.update` configuration variable:"
+"The following 'update' procedures are only available via the `submodule."
+"<name>.update` configuration variable:"
msgstr ""
#. type: Labeled list
@@ -57346,16 +57109,14 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:170
msgid ""
-"If `--recursive` is specified, this command will recurse into the registered"
-" submodules, and update any nested submodules within."
+"If `--recursive` is specified, this command will recurse into the registered "
+"submodules, and update any nested submodules within."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:171
#, no-wrap
-msgid ""
-"summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] "
-"[<path>...]"
+msgid "summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]"
msgstr ""
#. type: Plain text
@@ -57387,9 +57148,9 @@ msgstr ""
#: en/git-submodule.txt:205
msgid ""
"Evaluates an arbitrary shell command in each checked out submodule. The "
-"command has access to the variables $name, $sm_path, $displaypath, $sha1 and"
-" $toplevel: $name is the name of the relevant submodule section in "
-"`.gitmodules`, $sm_path is the path of the submodule as recorded in the "
+"command has access to the variables $name, $sm_path, $displaypath, $sha1 and "
+"$toplevel: $name is the name of the relevant submodule section in `."
+"gitmodules`, $sm_path is the path of the submodule as recorded in the "
"immediate superproject, $displaypath contains the relative path from the "
"current working directory to the submodules root directory, $sha1 is the "
"commit as recorded in the immediate superproject, and $toplevel is the "
@@ -57398,11 +57159,10 @@ msgid ""
"deprecated synonym of '$sm_path' variable. Any submodules defined in the "
"superproject but not checked out are ignored by this command. Unless given "
"`--quiet`, foreach prints the name of each submodule before evaluating the "
-"command. If `--recursive` is given, submodules are traversed recursively "
-"(i.e. the given shell command is evaluated in nested submodules as well). "
-"A non-zero return from the command in any submodule causes the processing to"
-" terminate. This can be overridden by adding '|| :' to the end of the "
-"command."
+"command. If `--recursive` is given, submodules are traversed recursively (i."
+"e. the given shell command is evaluated in nested submodules as well). A "
+"non-zero return from the command in any submodule causes the processing to "
+"terminate. This can be overridden by adding '|| :' to the end of the command."
msgstr ""
#. type: Plain text
@@ -57444,8 +57204,8 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:226
msgid ""
-"If `--recursive` is specified, this command will recurse into the registered"
-" submodules, and sync any nested submodules within."
+"If `--recursive` is specified, this command will recurse into the registered "
+"submodules, and sync any nested submodules within."
msgstr ""
#. type: Labeled list
@@ -57467,9 +57227,9 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:238
msgid ""
-"A repository that was cloned independently and later added as a submodule or"
-" old setups have the submodules git directory inside the submodule instead "
-"of embedded into the superprojects git directory."
+"A repository that was cloned independently and later added as a submodule or "
+"old setups have the submodules git directory inside the submodule instead of "
+"embedded into the superprojects git directory."
msgstr ""
#. type: Plain text
@@ -57502,21 +57262,21 @@ msgstr ""
#: en/git-submodule.txt:265
msgid ""
"Branch of repository to add as submodule. The name of the branch is "
-"recorded as `submodule.<name>.branch` in `.gitmodules` for `update "
-"--remote`. A special value of `.` is used to indicate that the name of the "
-"branch in the submodule should be the same name as the current branch in the"
-" current repository."
+"recorded as `submodule.<name>.branch` in `.gitmodules` for `update --"
+"remote`. A special value of `.` is used to indicate that the name of the "
+"branch in the submodule should be the same name as the current branch in the "
+"current repository."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:278
msgid ""
-"This option is only valid for add, deinit and update commands. When running"
-" add, allow adding an otherwise ignored submodule path. When running deinit"
-" the submodule working trees will be removed even if they contain local "
+"This option is only valid for add, deinit and update commands. When running "
+"add, allow adding an otherwise ignored submodule path. When running deinit "
+"the submodule working trees will be removed even if they contain local "
"changes. When running update (only effective with the checkout procedure), "
-"throw away local changes in submodules when switching to a different commit;"
-" and always run a checkout operation in the submodule, even if the commit "
+"throw away local changes in submodules when switching to a different commit; "
+"and always run a checkout operation in the submodule, even if the commit "
"listed in the index of the containing repository matches the commit checked "
"out in the submodule."
msgstr ""
@@ -57531,21 +57291,20 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:284
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--files"
msgstr "--files"
#. type: Plain text
#: en/git-submodule.txt:288
msgid ""
-"This option is only valid for the summary command. This command compares the"
-" commit in the index with that in the submodule HEAD when this option is "
-"used."
+"This option is only valid for the summary command. This command compares the "
+"commit in the index with that in the submodule HEAD when this option is used."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:290
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--summary-limit"
msgstr "--summary-limit"
@@ -57555,13 +57314,13 @@ msgid ""
"This option is only valid for the summary command. Limit the summary size "
"(number of commits shown in total). Giving 0 will disable the summary; a "
"negative number means unlimited (the default). This limit only applies to "
-"modified submodules. The size is always limited to 1 for "
-"added/deleted/typechanged submodules."
+"modified submodules. The size is always limited to 1 for added/deleted/"
+"typechanged submodules."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:297
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--remote"
msgstr "--remote"
@@ -57569,8 +57328,8 @@ msgstr "--remote"
#: en/git-submodule.txt:306
msgid ""
"This option is only valid for the update command. Instead of using the "
-"superproject's recorded SHA-1 to update the submodule, use the status of the"
-" submodule's remote-tracking branch. The remote used is branch's remote "
+"superproject's recorded SHA-1 to update the submodule, use the status of the "
+"submodule's remote-tracking branch. The remote used is branch's remote "
"(`branch.<name>.remote`), defaulting to `origin`. The remote branch used "
"defaults to `master`, but the branch name may be overridden by setting the "
"`submodule.<name>.branch` option in either `.gitmodules` or `.git/config` "
@@ -57580,8 +57339,8 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:312
msgid ""
-"This works for any of the supported update procedures (`--checkout`, "
-"`--rebase`, etc.). The only change is the source of the target SHA-1. For "
+"This works for any of the supported update procedures (`--checkout`, `--"
+"rebase`, etc.). The only change is the source of the target SHA-1. For "
"example, `submodule update --remote --merge` will merge upstream submodule "
"changes into the submodules, while `submodule update --merge` will merge "
"superproject gitlink changes into the submodules."
@@ -57601,18 +57360,17 @@ msgstr ""
msgid ""
"Use this option to integrate changes from the upstream subproject with your "
"submodule's current HEAD. Alternatively, you can run `git pull` from the "
-"submodule, which is equivalent except for the remote branch name: `update "
-"--remote` uses the default upstream repository and "
-"`submodule.<name>.branch`, while `git pull` uses the submodule's "
-"`branch.<name>.merge`. Prefer `submodule.<name>.branch` if you want to "
-"distribute the default upstream branch with the superproject and "
-"`branch.<name>.merge` if you want a more native feel while working in the "
-"submodule itself."
+"submodule, which is equivalent except for the remote branch name: `update --"
+"remote` uses the default upstream repository and `submodule.<name>.branch`, "
+"while `git pull` uses the submodule's `branch.<name>.merge`. Prefer "
+"`submodule.<name>.branch` if you want to distribute the default upstream "
+"branch with the superproject and `branch.<name>.merge` if you want a more "
+"native feel while working in the submodule itself."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:329
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-fetch"
msgstr "--no-fetch"
@@ -57625,7 +57383,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:333
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--checkout"
msgstr "--checkout"
@@ -57634,58 +57392,56 @@ msgstr "--checkout"
msgid ""
"This option is only valid for the update command. Checkout the commit "
"recorded in the superproject on a detached HEAD in the submodule. This is "
-"the default behavior, the main use of this option is to override "
-"`submodule.$name.update` when set to a value other than `checkout`. If the "
-"key `submodule.$name.update` is either not explicitly set or set to "
-"`checkout`, this option is implicit."
+"the default behavior, the main use of this option is to override `submodule."
+"$name.update` when set to a value other than `checkout`. If the key "
+"`submodule.$name.update` is either not explicitly set or set to `checkout`, "
+"this option is implicit."
msgstr ""
#. type: Plain text
#: en/git-submodule.txt:351
msgid ""
-"This option is only valid for the update command. Merge the commit recorded"
-" in the superproject into the current branch of the submodule. If this "
-"option is given, the submodule's HEAD will not be detached. If a merge "
-"failure prevents this process, you will have to resolve the resulting "
-"conflicts within the submodule with the usual conflict resolution tools. If"
-" the key `submodule.$name.update` is set to `merge`, this option is "
-"implicit."
+"This option is only valid for the update command. Merge the commit recorded "
+"in the superproject into the current branch of the submodule. If this option "
+"is given, the submodule's HEAD will not be detached. If a merge failure "
+"prevents this process, you will have to resolve the resulting conflicts "
+"within the submodule with the usual conflict resolution tools. If the key "
+"`submodule.$name.update` is set to `merge`, this option is implicit."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:352
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--rebase"
msgstr "--rebase"
#. type: Plain text
#: en/git-submodule.txt:360
msgid ""
-"This option is only valid for the update command. Rebase the current branch"
-" onto the commit recorded in the superproject. If this option is given, the "
+"This option is only valid for the update command. Rebase the current branch "
+"onto the commit recorded in the superproject. If this option is given, the "
"submodule's HEAD will not be detached. If a merge failure prevents this "
-"process, you will have to resolve these failures with linkgit:git-rebase[1]."
-" If the key `submodule.$name.update` is set to `rebase`, this option is "
-"implicit."
+"process, you will have to resolve these failures with linkgit:git-"
+"rebase[1]. If the key `submodule.$name.update` is set to `rebase`, this "
+"option is implicit."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:361
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--init"
msgstr "--init"
#. type: Plain text
#: en/git-submodule.txt:365
msgid ""
-"This option is only valid for the update command. Initialize all submodules"
-" for which \"git submodule init\" has not been called so far before "
-"updating."
+"This option is only valid for the update command. Initialize all submodules "
+"for which \"git submodule init\" has not been called so far before updating."
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:366
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--name"
msgstr "--name"
@@ -57737,7 +57493,7 @@ msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:393
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--depth"
msgstr "--depth"
@@ -57745,13 +57501,13 @@ msgstr "--depth"
#: en/git-submodule.txt:397
msgid ""
"This option is valid for add and update commands. Create a 'shallow' clone "
-"with a history truncated to the specified number of revisions. See "
-"linkgit:git-clone[1]"
+"with a history truncated to the specified number of revisions. See linkgit:"
+"git-clone[1]"
msgstr ""
#. type: Labeled list
#: en/git-submodule.txt:398
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]recommend-shallow"
msgstr "--[no-]recommend-shallow"
@@ -57759,8 +57515,8 @@ msgstr "--[no-]recommend-shallow"
#: en/git-submodule.txt:403
msgid ""
"This option is only valid for the update command. The initial clone of a "
-"submodule will use the recommended `submodule.<name>.shallow` as provided by"
-" the `.gitmodules` file by default. To ignore the suggestions use `--no-"
+"submodule will use the recommended `submodule.<name>.shallow` as provided by "
+"the `.gitmodules` file by default. To ignore the suggestions use `--no-"
"recommend-shallow`."
msgstr ""
@@ -57774,8 +57530,8 @@ msgstr ""
#. type: Plain text
#: en/git-submodule.txt:414
msgid ""
-"Paths to submodule(s). When specified this will restrict the command to only"
-" operate on the submodules found at the specified paths. (This argument is "
+"Paths to submodule(s). When specified this will restrict the command to only "
+"operate on the submodules found at the specified paths. (This argument is "
"required with add)."
msgstr ""
@@ -57784,9 +57540,9 @@ msgstr ""
msgid ""
"When initializing submodules, a `.gitmodules` file in the top-level "
"directory of the containing repository is used to find the url of each "
-"submodule. This file should be formatted in the same way as "
-"`$GIT_DIR/config`. The key to each submodule url is \"submodule.$name.url\"."
-" See linkgit:gitmodules[5] for details."
+"submodule. This file should be formatted in the same way as `$GIT_DIR/"
+"config`. The key to each submodule url is \"submodule.$name.url\". See "
+"linkgit:gitmodules[5] for details."
msgstr ""
#. type: Plain text
@@ -57796,7 +57552,7 @@ msgstr ""
#. type: Title =
#: en/git-svn.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-svn(1)"
msgstr "git-svn(1)"
@@ -57815,8 +57571,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:18
msgid ""
-"'git svn' is a simple conduit for changesets between Subversion and Git. It"
-" provides a bidirectional flow of changes between a Subversion and a Git "
+"'git svn' is a simple conduit for changesets between Subversion and Git. It "
+"provides a bidirectional flow of changes between a Subversion and a Git "
"repository."
msgstr ""
@@ -57846,9 +57602,9 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:39
msgid ""
-"Initializes an empty Git repository with additional metadata directories for"
-" 'git svn'. The Subversion URL may be specified as a command-line argument,"
-" or as full URL arguments to -T/-t/-b. Optionally, the target directory to "
+"Initializes an empty Git repository with additional metadata directories for "
+"'git svn'. The Subversion URL may be specified as a command-line argument, "
+"or as full URL arguments to -T/-t/-b. Optionally, the target directory to "
"operate on can be specified as a second argument. Normally this command "
"initializes the current directory."
msgstr ""
@@ -57891,7 +57647,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:47
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--stdlayout"
msgstr "--stdlayout"
@@ -57899,18 +57655,17 @@ msgstr "--stdlayout"
#: en/git-svn.txt:58
msgid ""
"These are optional command-line options for init. Each of these flags can "
-"point to a relative repository path (--tags=project/tags) or a full url "
-"(--tags=https://foo.org/project/tags). You can specify more than one --tags"
-" and/or --branches options, in case your Subversion repository places tags "
-"or branches under multiple paths. The option --stdlayout is a shorthand way"
-" of setting trunk,tags,branches as the relative paths, which is the "
-"Subversion default. If any of the other options are given as well, they take"
-" precedence."
+"point to a relative repository path (--tags=project/tags) or a full url (--"
+"tags=https://foo.org/project/tags). You can specify more than one --tags "
+"and/or --branches options, in case your Subversion repository places tags or "
+"branches under multiple paths. The option --stdlayout is a shorthand way of "
+"setting trunk,tags,branches as the relative paths, which is the Subversion "
+"default. If any of the other options are given as well, they take precedence."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:58
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-metadata"
msgstr "--no-metadata"
@@ -57918,13 +57673,13 @@ msgstr "--no-metadata"
#: en/git-svn.txt:62
msgid ""
"Set the 'noMetadata' option in the [svn-remote] config. This option is not "
-"recommended, please read the 'svn.noMetadata' section of this manpage before"
-" using this option."
+"recommended, please read the 'svn.noMetadata' section of this manpage before "
+"using this option."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:62
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--use-svm-props"
msgstr "--use-svm-props"
@@ -57935,7 +57690,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:64
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--use-svnsync-props"
msgstr "--use-svnsync-props"
@@ -57977,8 +57732,8 @@ msgstr ""
msgid ""
"For transports that SVN handles authentication for (http, https, and plain "
"svn), specify the username. For other transports (e.g. `svn+ssh://`), you "
-"must include the username in the URL, e.g. "
-"`svn+ssh://foo@svn.bar.com/project`"
+"must include the username in the URL, e.g. `svn+ssh://foo@svn.bar.com/"
+"project`"
msgstr ""
#. type: Plain text
@@ -58000,10 +57755,10 @@ msgstr ""
#: en/git-svn.txt:97
msgid ""
"Before Git v2.0, the default prefix was \"\" (no prefix). This meant that "
-"SVN-tracking refs were put at \"refs/remotes/*\", which is incompatible with"
-" how Git's own remote-tracking refs are organized. If you still want the "
-"old default, you can get it by passing `--prefix \"\"` on the command line "
-"(`--prefix=\"\"` may not work if your Perl's Getopt::Long is < v2.37)."
+"SVN-tracking refs were put at \"refs/remotes/*\", which is incompatible with "
+"how Git's own remote-tracking refs are organized. If you still want the old "
+"default, you can get it by passing `--prefix \"\"` on the command line (`--"
+"prefix=\"\"` may not work if your Perl's Getopt::Long is < v2.37)."
msgstr ""
#. type: Labeled list
@@ -58047,19 +57802,19 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:110
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-minimize-url"
msgstr "--no-minimize-url"
#. type: Plain text
#: en/git-svn.txt:121
msgid ""
-"When tracking multiple directories (using --stdlayout, --branches, or --tags"
-" options), git svn will attempt to connect to the root (or highest allowed "
-"level) of the Subversion repository. This default allows better tracking of"
-" history if entire projects are moved within a repository, but may cause "
-"issues on repositories where read access restrictions are in place. Passing"
-" `--no-minimize-url` will allow git svn to accept URLs as-is without "
+"When tracking multiple directories (using --stdlayout, --branches, or --tags "
+"options), git svn will attempt to connect to the root (or highest allowed "
+"level) of the Subversion repository. This default allows better tracking of "
+"history if entire projects are moved within a repository, but may cause "
+"issues on repositories where read access restrictions are in place. Passing "
+"`--no-minimize-url` will allow git svn to accept URLs as-is without "
"attempting to connect to a higher level directory. This option is off by "
"default when only one URL/branch is tracked (it would do little good)."
msgstr ""
@@ -58081,13 +57836,13 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:130 en/git-svn.txt:243
msgid ""
-"This automatically updates the rev_map if needed (see "
-"'$GIT_DIR/svn/\\*\\*/.rev_map.*' in the FILES section below for details)."
+"This automatically updates the rev_map if needed (see '$GIT_DIR/svn/\\*\\*/."
+"rev_map.*' in the FILES section below for details)."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:131
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--localtime"
msgstr "--localtime"
@@ -58103,14 +57858,14 @@ msgstr ""
#: en/git-svn.txt:141
msgid ""
"This doesn't interfere with interoperating with the Subversion repository "
-"you cloned from, but if you wish for your local Git repository to be able to"
-" interoperate with someone else's local Git repository, either don't use "
-"this option or you should both use it in the same local time zone."
+"you cloned from, but if you wish for your local Git repository to be able to "
+"interoperate with someone else's local Git repository, either don't use this "
+"option or you should both use it in the same local time zone."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:142 en/git-svn.txt:536
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--parent"
msgstr "--parent"
@@ -58144,8 +57899,8 @@ msgstr ""
#: en/git-svn.txt:163
msgid ""
"This allows one to specify a Perl regular expression that will cause "
-"skipping of all matching paths from checkout from SVN. The `--ignore-paths`"
-" option should match for every 'fetch' (including automatic fetches due to "
+"skipping of all matching paths from checkout from SVN. The `--ignore-paths` "
+"option should match for every 'fetch' (including automatic fetches due to "
"'clone', 'dcommit', 'rebase', etc) on a given repository."
msgstr ""
@@ -58158,8 +57913,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:169
msgid ""
-"If the ignore-paths configuration key is set, and the command-line option is"
-" also given, both regular expressions will be used."
+"If the ignore-paths configuration key is set, and the command-line option is "
+"also given, both regular expressions will be used."
msgstr ""
#. type: Labeled list
@@ -58212,9 +57967,9 @@ msgstr ""
#: en/git-svn.txt:203
msgid ""
"Fetch <n> log entries per request when scanning Subversion history. The "
-"default is 100. For very large Subversion repositories, larger values may be"
-" needed for 'clone'/'fetch' to complete in reasonable time. But overly large"
-" values may lead to higher memory usage and request timeouts."
+"default is 100. For very large Subversion repositories, larger values may be "
+"needed for 'clone'/'fetch' to complete in reasonable time. But overly large "
+"values may lead to higher memory usage and request timeouts."
msgstr ""
#. type: Labeled list
@@ -58228,9 +57983,9 @@ msgstr ""
msgid ""
"Runs 'init' and 'fetch'. It will automatically create a directory based on "
"the basename of the URL passed to it; or if a second argument is passed; it "
-"will create a directory and work within that. It accepts all arguments that"
-" the 'init' and 'fetch' commands accept; with the exception of `--fetch-all`"
-" and `--parent`. After a repository is cloned, the 'fetch' command will be "
+"will create a directory and work within that. It accepts all arguments that "
+"the 'init' and 'fetch' commands accept; with the exception of `--fetch-all` "
+"and `--parent`. After a repository is cloned, the 'fetch' command will be "
"able to update revisions without affecting the working tree; and the "
"'rebase' command will be able to update the working tree with the latest "
"changes."
@@ -58238,7 +57993,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:215
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--preserve-empty-dirs"
msgstr "--preserve-empty-dirs"
@@ -58304,8 +58059,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:248
msgid ""
-"Do not fetch remotely; only run 'git rebase' against the last fetched commit"
-" from the upstream SVN."
+"Do not fetch remotely; only run 'git rebase' against the last fetched commit "
+"from the upstream SVN."
msgstr ""
#. type: Labeled list
@@ -58317,16 +58072,16 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:254
msgid ""
-"Commit each diff from the current branch directly to the SVN repository, and"
-" then rebase or reset (depending on whether or not there is a diff between "
+"Commit each diff from the current branch directly to the SVN repository, and "
+"then rebase or reset (depending on whether or not there is a diff between "
"SVN and head). This will create a revision in SVN for each commit in Git."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:258
msgid ""
-"When an optional Git branch name (or a Git commit object name) is specified"
-" as an argument, the subcommand works on the specified branch, not on the "
+"When an optional Git branch name (or a Git commit object name) is specified "
+"as an argument, the subcommand works on the specified branch, not on the "
"current branch."
msgstr ""
@@ -58388,12 +58143,12 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:288
msgid ""
-"Add the given merge information during the dcommit (e.g. "
-"`--mergeinfo=\"/branches/foo:1-10\"`). All svn server versions can store "
-"this information (as a property), and svn clients starting from version 1.5 "
-"can make use of it. To specify merge information from multiple branches, use"
-" a single space character between the branches "
-"(`--mergeinfo=\"/branches/foo:1-10 /branches/bar:3,5-6,8\"`)"
+"Add the given merge information during the dcommit (e.g. `--mergeinfo=\"/"
+"branches/foo:1-10\"`). All svn server versions can store this information "
+"(as a property), and svn clients starting from version 1.5 can make use of "
+"it. To specify merge information from multiple branches, use a single space "
+"character between the branches (`--mergeinfo=\"/branches/foo:1-10 /branches/"
+"bar:3,5-6,8\"`)"
msgstr ""
#. type: Plain text
@@ -58405,10 +58160,10 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:296
msgid ""
-"This option will cause git-svn to attempt to automatically populate the "
-"svn:mergeinfo property in the SVN repository when possible. Currently, this "
-"can only be done when dcommitting non-fast-forward merges where all parents "
-"but the first have already been pushed into SVN."
+"This option will cause git-svn to attempt to automatically populate the svn:"
+"mergeinfo property in the SVN repository when possible. Currently, this can "
+"only be done when dcommitting non-fast-forward merges where all parents but "
+"the first have already been pushed into SVN."
msgstr ""
#. type: Plain text
@@ -58439,7 +58194,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:309
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--message"
msgstr "--message"
@@ -58450,7 +58205,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:313
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--tag"
msgstr "--tag"
@@ -58478,9 +58233,9 @@ msgstr ""
msgid ""
"If more than one --branches (or --tags) option was given to the 'init' or "
"'clone' command, you must provide the location of the branch (or tag) you "
-"wish to create in the SVN repository. <path> specifies which path to use to"
-" create the branch or tag and should match the pattern on the left-hand side"
-" of one of the configured branches or tags refspecs. You can see these "
+"wish to create in the SVN repository. <path> specifies which path to use to "
+"create the branch or tag and should match the pattern on the left-hand side "
+"of one of the configured branches or tags refspecs. You can see these "
"refspecs with the commands"
msgstr ""
@@ -58494,13 +58249,13 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:332
msgid ""
-"where <name> is the name of the SVN repository as specified by the -R option"
-" to 'init' (or \"svn\" by default)."
+"where <name> is the name of the SVN repository as specified by the -R option "
+"to 'init' (or \"svn\" by default)."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:333
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--username"
msgstr "--username"
@@ -58513,7 +58268,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:337
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--commit-url"
msgstr "--commit-url"
@@ -58532,16 +58287,15 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:346 en/rev-list-options.txt:870
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--parents"
msgstr "--parents"
#. type: Plain text
#: en/git-svn.txt:350
msgid ""
-"Create parent folders. This parameter is equivalent to the parameter "
-"--parents on svn cp commands and is useful for non-standard repository "
-"layouts."
+"Create parent folders. This parameter is equivalent to the parameter --"
+"parents on svn cp commands and is useful for non-standard repository layouts."
msgstr ""
#. type: Labeled list
@@ -58565,8 +58319,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:358
msgid ""
-"This should make it easy to look up svn log messages when svn users refer to"
-" -r/--revision numbers."
+"This should make it easy to look up svn log messages when svn users refer to "
+"-r/--revision numbers."
msgstr ""
#. type: Plain text
@@ -58588,8 +58342,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:366
-msgid ""
-"is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
+msgid "is supported, non-numeric args are not: HEAD, NEXT, BASE, PREV, etc ..."
msgstr ""
#. type: Plain text
@@ -58622,7 +58375,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:380
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-commit"
msgstr "--show-commit"
@@ -58633,7 +58386,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:382 en/pretty-options.txt:31
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--oneline"
msgstr "--oneline"
@@ -58645,8 +58398,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:389
msgid ""
-"SVN itself only stores times in UTC and nothing else. The regular svn client"
-" converts the UTC time to the local time (or based on the TZ= environment). "
+"SVN itself only stores times in UTC and nothing else. The regular svn client "
+"converts the UTC time to the local time (or based on the TZ= environment). "
"This command has the same behaviour."
msgstr ""
@@ -58665,15 +58418,15 @@ msgstr ""
#: en/git-svn.txt:399
msgid ""
"Show what revision and author last modified each line of a file. The output "
-"of this mode is format-compatible with the output of `svn blame' by default."
-" Like the SVN blame command, local uncommitted changes in the working tree "
+"of this mode is format-compatible with the output of `svn blame' by default. "
+"Like the SVN blame command, local uncommitted changes in the working tree "
"are ignored; the version of the file in the HEAD revision is annotated. "
"Unknown arguments are passed directly to 'git blame'."
msgstr ""
#. type: Labeled list
#: en/git-svn.txt:400
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--git-format"
msgstr "--git-format"
@@ -58696,9 +58449,9 @@ msgstr ""
#: en/git-svn.txt:411
msgid ""
"When given an SVN revision number of the form 'rN', returns the "
-"corresponding Git commit hash (this can optionally be followed by a tree-ish"
-" to specify which branch should be searched). When given a tree-ish, "
-"returns the corresponding SVN revision number."
+"corresponding Git commit hash (this can optionally be followed by a tree-ish "
+"to specify which branch should be searched). When given a tree-ish, returns "
+"the corresponding SVN revision number."
msgstr ""
#. type: Labeled list
@@ -58709,7 +58462,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:413
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--before"
msgstr "--before"
@@ -58723,7 +58476,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:419
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--after"
msgstr "--after"
@@ -58744,8 +58497,8 @@ msgstr ""
#: en/git-svn.txt:432
msgid ""
"You should consider using 'dcommit' instead of this command. Commit "
-"specified commit or tree objects to SVN. This relies on your imported fetch"
-" data being up to date. This makes absolutely no attempts to do patching "
+"specified commit or tree objects to SVN. This relies on your imported fetch "
+"data being up to date. This makes absolutely no attempts to do patching "
"when committing to SVN, it simply overwrites files with those specified in "
"the tree or commit. All merging is assumed to have taken place "
"independently of 'git svn' functions."
@@ -58808,16 +58561,16 @@ msgid ""
"command does not rely on being inside a `git svn init`-ed repository. This "
"command takes three arguments, (a) the original tree to diff against, (b) "
"the new tree result, (c) the URL of the target Subversion repository. The "
-"final argument (URL) may be omitted if you are working from a 'git "
-"svn'-aware repository (that has been `init`-ed with 'git svn'). The "
-"-r<revision> option is required for this."
+"final argument (URL) may be omitted if you are working from a 'git svn'-"
+"aware repository (that has been `init`-ed with 'git svn'). The -r<revision> "
+"option is required for this."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:467
msgid ""
-"The commit message is supplied either directly with the `-m` or `-F` option,"
-" or indirectly from the tag or commit when the second tree-ish denotes such "
+"The commit message is supplied either directly with the `-m` or `-F` option, "
+"or indirectly from the tag or commit when the second tree-ish denotes such "
"an object, or it is requested by invoking an editor (see `--edit` option "
"below)."
msgstr ""
@@ -58825,8 +58578,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:472
msgid ""
-"Use the given `msg` as the commit message. This option disables the `--edit`"
-" option."
+"Use the given `msg` as the commit message. This option disables the `--edit` "
+"option."
msgstr ""
#. type: Labeled list
@@ -58844,8 +58597,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:477
msgid ""
-"Take the commit message from the given file. This option disables the "
-"`--edit` option."
+"Take the commit message from the given file. This option disables the `--"
+"edit` option."
msgstr ""
#. type: Labeled list
@@ -58858,8 +58611,8 @@ msgstr ""
#: en/git-svn.txt:483
msgid ""
"Shows information about a file or directory similar to what `svn info' "
-"provides. Does not currently support a -r/--revision argument. Use the "
-"--url option to output only the value of the 'URL:' field."
+"provides. Does not currently support a -r/--revision argument. Use the --"
+"url option to output only the value of the 'URL:' field."
msgstr ""
#. type: Labeled list
@@ -58897,8 +58650,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:497
msgid ""
-"Sets the Subversion property given as the first argument, to the value given"
-" as the second argument for the file given as the third argument."
+"Sets the Subversion property given as the first argument, to the value given "
+"as the second argument for the file given as the third argument."
msgstr ""
#. type: delimited block -
@@ -58930,8 +58683,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:514
msgid ""
-"Compress $GIT_DIR/svn/<refname>/unhandled.log files and remove "
-"$GIT_DIR/svn/<refname>/index files."
+"Compress $GIT_DIR/svn/<refname>/unhandled.log files and remove $GIT_DIR/svn/"
+"<refname>/index files."
msgstr ""
#. type: Labeled list
@@ -58944,8 +58697,8 @@ msgstr ""
#: en/git-svn.txt:525
msgid ""
"Undoes the effects of 'fetch' back to the specified revision. This allows "
-"you to re-'fetch' an SVN revision. Normally the contents of an SVN revision"
-" should never change and 'reset' should not be necessary. However, if SVN "
+"you to re-'fetch' an SVN revision. Normally the contents of an SVN revision "
+"should never change and 'reset' should not be necessary. However, if SVN "
"permissions change, or if you alter your --ignore-paths option, a 'fetch' "
"may fail with \"not found in commit\" (file not previously visible) or "
"\"checksum mismatch\" (missed a modification). If the problem file cannot "
@@ -58956,10 +58709,10 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:530
msgid ""
-"Only the rev_map and refs/remotes/git-svn are changed (see "
-"'$GIT_DIR/svn/\\*\\*/.rev_map.*' in the FILES section below for details). "
-"Follow 'reset' with a 'fetch' and then 'git reset' or 'git rebase' to move "
-"local branches onto the new tree."
+"Only the rev_map and refs/remotes/git-svn are changed (see '$GIT_DIR/svn/\\*"
+"\\*/.rev_map.*' in the FILES section below for details). Follow 'reset' "
+"with a 'fetch' and then 'git reset' or 'git rebase' to move local branches "
+"onto the new tree."
msgstr ""
#. type: Labeled list
@@ -58977,8 +58730,7 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:535
msgid ""
-"Specify the most recent revision to keep. All later revisions are "
-"discarded."
+"Specify the most recent revision to keep. All later revisions are discarded."
msgstr ""
#. type: Plain text
@@ -58989,7 +58741,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:541
-msgid "Assume you have local changes in \"master\", but you need to refetch \"r2\"."
+msgid ""
+"Assume you have local changes in \"master\", but you need to refetch \"r2\"."
msgstr ""
#. type: delimited block -
@@ -59079,9 +58832,9 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:589
msgid ""
-"This allows revision ranges for partial/cauterized history to be supported."
-" $NUMBER, $NUMBER1:$NUMBER2 (numeric ranges), $NUMBER:HEAD, and "
-"BASE:$NUMBER are all supported."
+"This allows revision ranges for partial/cauterized history to be supported. "
+"$NUMBER, $NUMBER1:$NUMBER2 (numeric ranges), $NUMBER:HEAD, and BASE:$NUMBER "
+"are all supported."
msgstr ""
#. type: Plain text
@@ -59112,7 +58865,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:602
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--rmdir"
msgstr "--rmdir"
@@ -59124,10 +58877,10 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:610
msgid ""
-"Remove directories from the SVN tree if there are no files left behind. SVN"
-" can version empty directories, and they are not removed by default if there"
-" are no files left in them. Git cannot version empty directories. Enabling"
-" this flag will make the commit to SVN act like Git."
+"Remove directories from the SVN tree if there are no files left behind. SVN "
+"can version empty directories, and they are not removed by default if there "
+"are no files left in them. Git cannot version empty directories. Enabling "
+"this flag will make the commit to SVN act like Git."
msgstr ""
#. type: Plain text
@@ -59193,8 +58946,8 @@ msgstr ""
#: en/git-svn.txt:650
msgid ""
"If this option is specified and 'git svn' encounters an SVN committer name "
-"that does not exist in the authors-file, 'git svn' will abort operation. The"
-" user will then have to add the appropriate entry. Re-running the previous "
+"that does not exist in the authors-file, 'git svn' will abort operation. The "
+"user will then have to add the appropriate entry. Re-running the previous "
"'git svn' command after the authors-file is modified should continue "
"operation."
msgstr ""
@@ -59214,8 +58967,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:661
msgid ""
-"If this option is specified, for each SVN committer name that does not exist"
-" in the authors file, the given file is executed with the committer name as "
+"If this option is specified, for each SVN committer name that does not exist "
+"in the authors file, the given file is executed with the committer name as "
"the first argument. The program is expected to return a single line of the "
"form \"Name <email>\" or \"Name <>\", which will be treated as if included "
"in the authors file."
@@ -59257,8 +59010,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:685
msgid ""
-"Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot"
-" be used (see 'dcommit')."
+"Passed directly to 'git rebase' when using 'dcommit' if a 'git reset' cannot "
+"be used (see 'dcommit')."
msgstr ""
#. type: Plain text
@@ -59291,7 +59044,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:701
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--use-log-author"
msgstr "--use-log-author"
@@ -59311,7 +59064,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:709
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--add-author-from"
msgstr "--add-author-from"
@@ -59379,7 +59132,7 @@ msgstr ""
#. type: Labeled list
#: en/git-svn.txt:735
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--follow-parent"
msgstr "--follow-parent"
@@ -59388,8 +59141,8 @@ msgstr "--follow-parent"
msgid ""
"This option is only relevant if we are tracking branches (using one of the "
"repository layout options --trunk, --tags, --branches, --stdlayout). For "
-"each tracked branch, try to find out where its revision was copied from, and"
-" set a suitable parent in the first Git commit for the branch. This is "
+"each tracked branch, try to find out where its revision was copied from, and "
+"set a suitable parent in the first Git commit for the branch. This is "
"especially helpful when we're tracking a directory that has been moved "
"around within the repository. If this feature is disabled, the branches "
"created by 'git svn' will all be linear and not share any history, meaning "
@@ -59440,9 +59193,9 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:769
msgid ""
-"The 'git svn log' command will not work on repositories using this, either."
-" Using this conflicts with the 'useSvmProps' option for (hopefully) obvious"
-" reasons."
+"The 'git svn log' command will not work on repositories using this, either. "
+"Using this conflicts with the 'useSvmProps' option for (hopefully) obvious "
+"reasons."
msgstr ""
#. type: Plain text
@@ -59543,9 +59296,9 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:819
msgid ""
-"Similar to Git's `remote.<name>.pushurl`, this key is designed to be used in"
-" cases where 'url' points to an SVN repository via a read-only transport, to"
-" provide an alternate read/write transport. It is assumed that both keys "
+"Similar to Git's `remote.<name>.pushurl`, this key is designed to be used in "
+"cases where 'url' points to an SVN repository via a read-only transport, to "
+"provide an alternate read/write transport. It is assumed that both keys "
"point to the same repository. Unlike 'commiturl', 'pushurl' is a base path. "
"If either 'commiturl' or 'pushurl' could be used, 'commiturl' takes "
"precedence."
@@ -59563,8 +59316,8 @@ msgid ""
"This disables potentially expensive checks to workaround broken symlinks "
"checked into SVN by broken clients. Set this option to \"false\" if you "
"track a SVN repository with many empty blobs that are not symlinks. This "
-"option may be changed while 'git svn' is running and take effect on the next"
-" revision fetched. If unset, 'git svn' assumes this option to be \"true\"."
+"option may be changed while 'git svn' is running and take effect on the next "
+"revision fetched. If unset, 'git svn' assumes this option to be \"true\"."
msgstr ""
#. type: Labeled list
@@ -59602,9 +59355,9 @@ msgstr ""
#: en/git-svn.txt:847
msgid ""
"Since the noMetadata, rewriteRoot, rewriteUUID, useSvnsyncProps and "
-"useSvmProps options all affect the metadata generated and used by 'git svn';"
-" they *must* be set in the configuration file before any history is imported"
-" and these settings should never be changed once they are set."
+"useSvmProps options all affect the metadata generated and used by 'git svn'; "
+"they *must* be set in the configuration file before any history is imported "
+"and these settings should never be changed once they are set."
msgstr ""
#. type: Plain text
@@ -59780,9 +59533,9 @@ msgid ""
"'git svn' will read this commit to get the SVN revision the branch was "
"created from. It will then try to find the Git commit that corresponds to "
"this SVN revision, and use that as the parent of the branch. However, it is "
-"possible that there is no suitable Git commit to serve as parent. This will"
-" happen, among other reasons, if the SVN branch is a copy of a revision that"
-" was not fetched by 'git svn' (e.g. because it is an old revision that was "
+"possible that there is no suitable Git commit to serve as parent. This will "
+"happen, among other reasons, if the SVN branch is a copy of a revision that "
+"was not fetched by 'git svn' (e.g. because it is an old revision that was "
"skipped with `--revision`), or if in SVN a directory was copied that is not "
"tracked by 'git svn' (such as a branch that is not tracked at all, or a "
"subdirectory of a tracked branch). In these cases, 'git svn' will still "
@@ -59812,12 +59565,12 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:996
msgid ""
-"An example: in an SVN repository with a standard trunk/tags/branches layout,"
-" a directory trunk/sub is created in r.100. In r.200, trunk/sub is branched"
-" by copying it to branches/. 'git svn clone -s' will then create a branch "
+"An example: in an SVN repository with a standard trunk/tags/branches layout, "
+"a directory trunk/sub is created in r.100. In r.200, trunk/sub is branched "
+"by copying it to branches/. 'git svn clone -s' will then create a branch "
"'sub'. It will also create new Git commits for r.100 through r.199 and use "
-"these as the history of branch 'sub'. Thus there will be two Git commits for"
-" each revision from r.100 to r.199 (one containing trunk/, one containing "
+"these as the history of branch 'sub'. Thus there will be two Git commits for "
+"each revision from r.100 to r.199 (one containing trunk/, one containing "
"trunk/sub/). Finally, it will create a branch 'sub@200' pointing to the new "
"parent commit of branch 'sub' (i.e. the commit for r.200 and trunk/sub/)."
msgstr ""
@@ -59828,18 +59581,18 @@ msgid ""
"For the sake of simplicity and interoperating with Subversion, it is "
"recommended that all 'git svn' users clone, fetch and dcommit directly from "
"the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push' operations "
-"between Git repositories and branches. The recommended method of exchanging"
-" code between Git branches and users is 'git format-patch' and 'git am', or "
+"between Git repositories and branches. The recommended method of exchanging "
+"code between Git branches and users is 'git format-patch' and 'git am', or "
"just 'dcommit'ing to the SVN repository."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1012
msgid ""
-"Running 'git merge' or 'git pull' is NOT recommended on a branch you plan to"
-" 'dcommit' from because Subversion users cannot see any merges you've made."
-" Furthermore, if you merge or pull from a Git branch that is a mirror of an"
-" SVN branch, 'dcommit' may commit to the wrong branch."
+"Running 'git merge' or 'git pull' is NOT recommended on a branch you plan to "
+"'dcommit' from because Subversion users cannot see any merges you've made. "
+"Furthermore, if you merge or pull from a Git branch that is a mirror of an "
+"SVN branch, 'dcommit' may commit to the wrong branch."
msgstr ""
#. type: Plain text
@@ -59860,15 +59613,15 @@ msgstr ""
msgid ""
"You 'must' therefore ensure that the most recent commit of the branch you "
"want to dcommit to is the 'first' parent of the merge. Chaos will ensue "
-"otherwise, especially if the first parent is an older commit on the same SVN"
-" branch."
+"otherwise, especially if the first parent is an older commit on the same SVN "
+"branch."
msgstr ""
#. type: Plain text
#: en/git-svn.txt:1027
msgid ""
-"'git clone' does not clone branches under the refs/remotes/ hierarchy or any"
-" 'git svn' metadata, or config. So repositories created and managed with "
+"'git clone' does not clone branches under the refs/remotes/ hierarchy or any "
+"'git svn' metadata, or config. So repositories created and managed with "
"using 'git svn' should use 'rsync' for cloning, if cloning is to be done at "
"all."
msgstr ""
@@ -59877,8 +59630,8 @@ msgstr ""
#: en/git-svn.txt:1032
msgid ""
"Since 'dcommit' uses rebase internally, any Git branches you 'git push' to "
-"before 'dcommit' on will require forcing an overwrite of the existing ref on"
-" the remote repository. This is generally considered bad practice, see the "
+"before 'dcommit' on will require forcing an overwrite of the existing ref on "
+"the remote repository. This is generally considered bad practice, see the "
"linkgit:git-push[1] documentation for details."
msgstr ""
@@ -59886,9 +59639,9 @@ msgstr ""
#: en/git-svn.txt:1037
msgid ""
"Do not use the --amend option of linkgit:git-commit[1] on a change you've "
-"already dcommitted. It is considered bad practice to --amend commits you've"
-" already pushed to a remote repository for other users, and dcommit with SVN"
-" is analogous to that."
+"already dcommitted. It is considered bad practice to --amend commits you've "
+"already pushed to a remote repository for other users, and dcommit with SVN "
+"is analogous to that."
msgstr ""
#. type: Plain text
@@ -59897,16 +59650,16 @@ msgid ""
"When cloning an SVN repository, if none of the options for describing the "
"repository layout is used (--trunk, --tags, --branches, --stdlayout), 'git "
"svn clone' will create a Git repository with completely linear history, "
-"where branches and tags appear as separate directories in the working copy."
-" While this is the easiest way to get a copy of a complete repository, for "
-"projects with many branches it will lead to a working copy many times larger"
-" than just the trunk. Thus for projects using the standard directory "
-"structure (trunk/branches/tags), it is recommended to clone with option "
-"`--stdlayout`. If the project uses a non-standard structure, and/or if "
-"branches and tags are not required, it is easiest to only clone one "
-"directory (typically trunk), without giving any repository layout options. "
-"If the full history with branches and tags is required, the options "
-"`--trunk` / `--branches` / `--tags` must be used."
+"where branches and tags appear as separate directories in the working copy. "
+"While this is the easiest way to get a copy of a complete repository, for "
+"projects with many branches it will lead to a working copy many times larger "
+"than just the trunk. Thus for projects using the standard directory "
+"structure (trunk/branches/tags), it is recommended to clone with option `--"
+"stdlayout`. If the project uses a non-standard structure, and/or if branches "
+"and tags are not required, it is easiest to only clone one directory "
+"(typically trunk), without giving any repository layout options. If the "
+"full history with branches and tags is required, the options `--trunk` / `--"
+"branches` / `--tags` must be used."
msgstr ""
#. type: Plain text
@@ -59938,8 +59691,8 @@ msgstr ""
#. type: Plain text
#: en/git-svn.txt:1075
msgid ""
-"Renamed and copied directories are not detected by Git and hence not tracked"
-" when committing to SVN. I do not plan on adding support for this as it's "
+"Renamed and copied directories are not detected by Git and hence not tracked "
+"when committing to SVN. I do not plan on adding support for this as it's "
"quite difficult and time-consuming to get working for all the possible "
"corner cases (Git doesn't do it, either). Committing renamed and copied "
"files is fully supported if they're similar enough for Git to detect them."
@@ -60087,8 +59840,8 @@ msgstr ""
msgid ""
"Mapping between Subversion revision numbers and Git commit names. In a "
"repository where the noMetadata option is not set, this can be rebuilt from "
-"the git-svn-id: lines that are at the end of every commit (see the "
-"'svn.noMetadata' section above for details)."
+"the git-svn-id: lines that are at the end of every commit (see the 'svn."
+"noMetadata' section above for details)."
msgstr ""
#. type: Plain text
@@ -60100,7 +59853,7 @@ msgstr ""
#. type: Title =
#: en/git-symbolic-ref.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-symbolic-ref(1)"
msgstr "git-symbolic-ref(1)"
@@ -60121,8 +59874,8 @@ msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:21
msgid ""
-"Given one argument, reads which branch head the given symbolic ref refers to"
-" and outputs its path, relative to the `.git/` directory. Typically you "
+"Given one argument, reads which branch head the given symbolic ref refers to "
+"and outputs its path, relative to the `.git/` directory. Typically you "
"would give `HEAD` as the <name> argument to see which branch your working "
"tree is on."
msgstr ""
@@ -60143,8 +59896,8 @@ msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:31
msgid ""
-"A symbolic ref is a regular file that stores a string that begins with `ref:"
-" refs/`. For example, your `.git/HEAD` is a regular file whose contents is "
+"A symbolic ref is a regular file that stores a string that begins with `ref: "
+"refs/`. For example, your `.git/HEAD` is a regular file whose contents is "
"`ref: refs/heads/master`."
msgstr ""
@@ -60177,12 +59930,12 @@ msgstr ""
#. type: Plain text
#: en/git-symbolic-ref.txt:62
msgid ""
-"In the past, `.git/HEAD` was a symbolic link pointing at "
-"`refs/heads/master`. When we wanted to switch to another branch, we did `ln"
-" -sf refs/heads/newbranch .git/HEAD`, and when we wanted to find out which "
-"branch we are on, we did `readlink .git/HEAD`. But symbolic links are not "
-"entirely portable, so they are now deprecated and symbolic refs (as "
-"described above) are used by default."
+"In the past, `.git/HEAD` was a symbolic link pointing at `refs/heads/"
+"master`. When we wanted to switch to another branch, we did `ln -sf refs/"
+"heads/newbranch .git/HEAD`, and when we wanted to find out which branch we "
+"are on, we did `readlink .git/HEAD`. But symbolic links are not entirely "
+"portable, so they are now deprecated and symbolic refs (as described above) "
+"are used by default."
msgstr ""
#. type: Plain text
@@ -60195,7 +59948,7 @@ msgstr ""
#. type: Title =
#: en/git-tag.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-tag(1)"
msgstr "git-tag(1)"
@@ -60233,8 +59986,8 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:33
msgid ""
-"If one of `-a`, `-s`, or `-u <keyid>` is passed, the command creates a 'tag'"
-" object, and requires a tag message. Unless `-m <msg>` or `-F <file>` is "
+"If one of `-a`, `-s`, or `-u <keyid>` is passed, the command creates a 'tag' "
+"object, and requires a tag message. Unless `-m <msg>` or `-F <file>` is "
"given, an editor is started for the user to type in the tag message."
msgstr ""
@@ -60248,16 +60001,16 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:39
msgid ""
-"Otherwise, a tag reference that points directly at the given object (i.e., a"
-" lightweight tag) is created."
+"Otherwise, a tag reference that points directly at the given object (i.e., a "
+"lightweight tag) is created."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:45
msgid ""
-"A GnuPG signed tag object will be created when `-s` or `-u <keyid>` is used."
-" When `-u <keyid>` is not used, the committer identity for the current user"
-" is used to find the GnuPG key for signing. \tThe configuration variable "
+"A GnuPG signed tag object will be created when `-s` or `-u <keyid>` is "
+"used. When `-u <keyid>` is not used, the committer identity for the current "
+"user is used to find the GnuPG key for signing. \tThe configuration variable "
"`gpg.program` is used to specify custom GnuPG binary."
msgstr ""
@@ -60275,8 +60028,7 @@ msgstr ""
msgid ""
"Annotated tags are meant for release while lightweight tags are meant for "
"private or temporary object labels. For this reason, some git commands for "
-"naming objects (like `git describe`) will ignore lightweight tags by "
-"default."
+"naming objects (like `git describe`) will ignore lightweight tags by default."
msgstr ""
#. type: Plain text
@@ -60286,7 +60038,7 @@ msgstr ""
#. type: Labeled list
#: en/git-tag.txt:65
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--sign"
msgstr "--sign"
@@ -60336,8 +60088,8 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:87
msgid ""
-"<num> specifies how many lines from the annotation, if any, are printed when"
-" using -l. Implies `--list`."
+"<num> specifies how many lines from the annotation, if any, are printed when "
+"using -l. Implies `--list`."
msgstr ""
#. type: Plain text
@@ -60366,19 +60118,19 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:104
msgid ""
-"This option is implicitly supplied if any other list-like option such as "
-"`--contains` is provided. See the documentation for each of those options "
-"for details."
+"This option is implicitly supplied if any other list-like option such as `--"
+"contains` is provided. See the documentation for each of those options for "
+"details."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:117
msgid ""
"Sort based on the key given. Prefix `-` to sort in descending order of the "
-"value. You may use the --sort=<key> option multiple times, in which case the"
-" last key becomes the primary key. Also supports \"version:refname\" or "
-"\"v:refname\" (tag names are treated as versions). The \"version:refname\" "
-"sort order can also be affected by the \"versionsort.suffix\" configuration "
+"value. You may use the --sort=<key> option multiple times, in which case the "
+"last key becomes the primary key. Also supports \"version:refname\" or \"v:"
+"refname\" (tag names are treated as versions). The \"version:refname\" sort "
+"order can also be affected by the \"versionsort.suffix\" configuration "
"variable. The keys supported are the same as those in `git for-each-ref`. "
"Sort order defaults to the value configured for the `tag.sort` variable if "
"it exists, or lexicographic order otherwise. See linkgit:git-config[1]."
@@ -60393,8 +60145,8 @@ msgstr ""
#: en/git-tag.txt:132
msgid ""
"Display tag listing in columns. See configuration variable column.tag for "
-"option syntax.`--column` and `--no-column` without options are equivalent to"
-" 'always' and 'never' respectively."
+"option syntax.`--column` and `--no-column` without options are equivalent to "
+"'always' and 'never' respectively."
msgstr ""
#. type: Plain text
@@ -60420,8 +60172,8 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:146
msgid ""
-"Only list tags whose commits are reachable from the specified commit (`HEAD`"
-" if not specified), incompatible with `--no-merged`."
+"Only list tags whose commits are reachable from the specified commit (`HEAD` "
+"if not specified), incompatible with `--no-merged`."
msgstr ""
#. type: Plain text
@@ -60434,16 +60186,15 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:154
msgid ""
-"Only list tags of the given object (HEAD if not specified). Implies "
-"`--list`."
+"Only list tags of the given object (HEAD if not specified). Implies `--list`."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:162
msgid ""
"Use the given tag message (instead of prompting). If multiple `-m` options "
-"are given, their values are concatenated as separate paragraphs. Implies "
-"`-a` if none of `-a`, `-s`, or `-u <keyid>` is given."
+"are given, their values are concatenated as separate paragraphs. Implies `-"
+"a` if none of `-a`, `-s`, or `-u <keyid>` is given."
msgstr ""
#. type: Plain text
@@ -60457,16 +60208,16 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:175
msgid ""
-"The message taken from file with `-F` and command line with `-m` are usually"
-" used as the tag message unmodified. This option lets you further edit the "
+"The message taken from file with `-F` and command line with `-m` are usually "
+"used as the tag message unmodified. This option lets you further edit the "
"message taken from these sources."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:182
msgid ""
-"This option sets how the tag message is cleaned up. The '<mode>' can be one"
-" of 'verbatim', 'whitespace' and 'strip'. The 'strip' mode is default. The "
+"This option sets how the tag message is cleaned up. The '<mode>' can be one "
+"of 'verbatim', 'whitespace' and 'strip'. The 'strip' mode is default. The "
"'verbatim' mode does not change message at all, 'whitespace' removes just "
"leading/trailing whitespace lines and 'strip' removes both whitespace and "
"commentary."
@@ -60475,18 +60226,18 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:189
msgid ""
-"Create a reflog for the tag. To globally enable reflogs for tags, see "
-"`core.logAllRefUpdates` in linkgit:git-config[1]. The negated form `--no-"
-"create-reflog` only overrides an earlier `--create-reflog`, but currently "
-"does not negate the setting of `core.logAllRefUpdates`."
+"Create a reflog for the tag. To globally enable reflogs for tags, see `core."
+"logAllRefUpdates` in linkgit:git-config[1]. The negated form `--no-create-"
+"reflog` only overrides an earlier `--create-reflog`, but currently does not "
+"negate the setting of `core.logAllRefUpdates`."
msgstr ""
#. type: Plain text
#: en/git-tag.txt:195
msgid ""
-"A string that interpolates `%(fieldname)` from a tag ref being shown and the"
-" object it points at. The format is the same as that of linkgit:git-for-"
-"each-ref[1]. When unspecified, defaults to `%(refname:strip=2)`."
+"A string that interpolates `%(fieldname)` from a tag ref being shown and the "
+"object it points at. The format is the same as that of linkgit:git-for-each-"
+"ref[1]. When unspecified, defaults to `%(refname:strip=2)`."
msgstr ""
#. type: Labeled list
@@ -60519,8 +60270,8 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:213
msgid ""
-"By default, 'git tag' in sign-with-default mode (-s) will use your committer"
-" identity (of the form `Your Name <your@email.address>`) to find a key. If "
+"By default, 'git tag' in sign-with-default mode (-s) will use your committer "
+"identity (of the form `Your Name <your@email.address>`) to find a key. If "
"you want to use a different default key, you can specify it in the "
"repository configuration as follows:"
msgstr ""
@@ -60562,17 +60313,17 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:238
msgid ""
-"But if you have pushed things out (or others could just read your repository"
-" directly), then others will have already seen the old tag. In that case you"
-" can do one of two things:"
+"But if you have pushed things out (or others could just read your repository "
+"directly), then others will have already seen the old tag. In that case you "
+"can do one of two things:"
msgstr ""
#. type: Plain text
#: en/git-tag.txt:245
msgid ""
-"The sane thing. Just admit you screwed up, and use a different name. Others"
-" have already seen one tag-name, and if you keep the same name, you may be "
-"in the situation that two people both have \"version X\", but they actually "
+"The sane thing. Just admit you screwed up, and use a different name. Others "
+"have already seen one tag-name, and if you keep the same name, you may be in "
+"the situation that two people both have \"version X\", but they actually "
"have 'different' \"X\"'s. So just call it \"X.1\" and be done with it."
msgstr ""
@@ -60660,8 +60411,8 @@ msgstr ""
#: en/git-tag.txt:287
msgid ""
"Does this seem a bit complicated? It *should* be. There is no way that it "
-"would be correct to just \"fix\" it automatically. People need to know that"
-" their tags might have been changed."
+"would be correct to just \"fix\" it automatically. People need to know that "
+"their tags might have been changed."
msgstr ""
#. type: Title ~
@@ -60682,8 +60433,8 @@ msgstr ""
#: en/git-tag.txt:302
msgid ""
"On the other hand, if you are fetching because you would want a one-shot "
-"merge from somebody else, you typically do not want to get tags from there."
-" This happens more often for people near the toplevel but not limited to "
+"merge from somebody else, you typically do not want to get tags from there. "
+"This happens more often for people near the toplevel but not limited to "
"them. Mere mortals when pulling from each other do not necessarily want to "
"automatically get private anchor point tags from the other person."
msgstr ""
@@ -60746,13 +60497,13 @@ msgstr ""
#. type: Plain text
#: en/git-tag.txt:344
msgid ""
-"A one-shot pull is a sign that a commit history is now crossing the boundary"
-" between one circle of people (e.g. \"people who are primarily interested in"
-" the networking part of the kernel\") who may have their own set of tags "
-"(e.g. \"this is the third release candidate from the networking group to be "
-"proposed for general consumption with 2.6.21 release\") to another circle of"
-" people (e.g. \"people who integrate various subsystem improvements\"). The"
-" latter are usually not interested in the detailed tags used internally in "
+"A one-shot pull is a sign that a commit history is now crossing the boundary "
+"between one circle of people (e.g. \"people who are primarily interested in "
+"the networking part of the kernel\") who may have their own set of tags (e."
+"g. \"this is the third release candidate from the networking group to be "
+"proposed for general consumption with 2.6.21 release\") to another circle of "
+"people (e.g. \"people who integrate various subsystem improvements\"). The "
+"latter are usually not interested in the detailed tags used internally in "
"the former group (that is what \"internal\" means). That is why it is "
"desirable not to follow tags automatically in this case."
msgstr ""
@@ -60776,9 +60527,9 @@ msgstr ""
#: en/git-tag.txt:360
msgid ""
"If you have imported some changes from another VCS and would like to add "
-"tags for major releases of your work, it is useful to be able to specify the"
-" date to embed inside of the tag object; such data in the tag object "
-"affects, for example, the ordering of tags in the gitweb interface."
+"tags for major releases of your work, it is useful to be able to specify the "
+"date to embed inside of the tag object; such data in the tag object affects, "
+"for example, the ordering of tags in the gitweb interface."
msgstr ""
#. type: Plain text
@@ -60827,8 +60578,8 @@ msgstr ""
#: en/git.txt:24
msgid ""
"Git is a fast, scalable, distributed revision control system with an "
-"unusually rich command set that provides both high-level operations and full"
-" access to internals."
+"unusually rich command set that provides both high-level operations and full "
+"access to internals."
msgstr ""
#. type: Plain text
@@ -60844,8 +60595,8 @@ msgstr ""
msgid ""
"After you mastered the basic concepts, you can come back to this page to "
"learn what commands Git offers. You can learn more about individual Git "
-"commands with \"git help command\". linkgit:gitcli[7] manual page gives you"
-" an overview of the command-line command syntax."
+"commands with \"git help command\". linkgit:gitcli[7] manual page gives you "
+"an overview of the command-line command syntax."
msgstr ""
#. type: Plain text
@@ -60872,8 +60623,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:54
msgid ""
-"Other options are available to control how the manual page is displayed. See"
-" linkgit:git-help[1] for more information, because `git --help ...` is "
+"Other options are available to control how the manual page is displayed. See "
+"linkgit:git-help[1] for more information, because `git --help ...` is "
"converted internally into `git help ...`."
msgstr ""
@@ -60894,10 +60645,10 @@ msgstr ""
#. type: Plain text
#: en/git.txt:65
msgid ""
-"This option affects options that expect path name like `--git-dir` and "
-"`--work-tree` in that their interpretations of the path names would be made "
-"relative to the working directory caused by the `-C` option. For example the"
-" following invocations are equivalent:"
+"This option affects options that expect path name like `--git-dir` and `--"
+"work-tree` in that their interpretations of the path names would be made "
+"relative to the working directory caused by the `-C` option. For example the "
+"following invocations are equivalent:"
msgstr ""
#. type: Plain text
@@ -60917,19 +60668,19 @@ msgstr ""
#. type: Plain text
#: en/git.txt:74
msgid ""
-"Pass a configuration parameter to the command. The value given will override"
-" values from configuration files. The <name> is expected in the same format"
-" as listed by 'git config' (subkeys separated by dots)."
+"Pass a configuration parameter to the command. The value given will override "
+"values from configuration files. The <name> is expected in the same format "
+"as listed by 'git config' (subkeys separated by dots)."
msgstr ""
#. type: Plain text
#: en/git.txt:80
msgid ""
-"Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets "
-"`foo.bar` to the boolean true value (just like `[foo]bar` would in a config "
-"file). Including the equals but with an empty value (like `git -c foo.bar= "
-"...`) sets `foo.bar` to the empty string which `git config --type=bool` will"
-" convert to `false`."
+"Note that omitting the `=` in `git -c foo.bar ...` is allowed and sets `foo."
+"bar` to the boolean true value (just like `[foo]bar` would in a config "
+"file). Including the equals but with an empty value (like `git -c foo."
+"bar= ...`) sets `foo.bar` to the empty string which `git config --type=bool` "
+"will convert to `false`."
msgstr ""
#. type: Labeled list
@@ -60948,7 +60699,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:87
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--html-path"
msgstr "--html-path"
@@ -60961,7 +60712,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:91
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--man-path"
msgstr "--man-path"
@@ -60974,7 +60725,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:95
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--info-path"
msgstr "--info-path"
@@ -60987,7 +60738,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:100
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--paginate"
msgstr "--paginate"
@@ -61001,7 +60752,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:107
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-pager"
msgstr "--no-pager"
@@ -61062,9 +60813,9 @@ msgstr ""
#. type: Plain text
#: en/git.txt:132
msgid ""
-"Currently for internal use only. Set a prefix which gives a path from above"
-" a repository down to its root. One use is to give submodules context about"
-" the superproject that invoked it."
+"Currently for internal use only. Set a prefix which gives a path from above "
+"a repository down to its root. One use is to give submodules context about "
+"the superproject that invoked it."
msgstr ""
#. type: Plain text
@@ -61076,7 +60827,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:138
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-replace-objects"
msgstr "--no-replace-objects"
@@ -61089,7 +60840,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:142
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--literal-pathspecs"
msgstr "--literal-pathspecs"
@@ -61103,7 +60854,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:147
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--glob-pathspecs"
msgstr "--glob-pathspecs"
@@ -61117,7 +60868,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:153
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--noglob-pathspecs"
msgstr "--noglob-pathspecs"
@@ -61131,7 +60882,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:159
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--icase-pathspecs"
msgstr "--icase-pathspecs"
@@ -61144,15 +60895,15 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:163
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-optional-locks"
msgstr "--no-optional-locks"
#. type: Plain text
#: en/git.txt:166
msgid ""
-"Do not perform optional operations that require locks. This is equivalent to"
-" setting the `GIT_OPTIONAL_LOCKS` to `0`."
+"Do not perform optional operations that require locks. This is equivalent to "
+"setting the `GIT_OPTIONAL_LOCKS` to `0`."
msgstr ""
#. type: Labeled list
@@ -61165,8 +60916,8 @@ msgstr ""
#: en/git.txt:176
msgid ""
"List commands by group. This is an internal/experimental option and may "
-"change or be removed in the future. Supported groups are: builtins, parseopt"
-" (builtin commands that use parse-options), main (all commands in libexec "
+"change or be removed in the future. Supported groups are: builtins, parseopt "
+"(builtin commands that use parse-options), main (all commands in libexec "
"directory), others (all other commands in `$PATH` that have git- prefix), "
"list-<category> (see categories in command-list.txt), nohelpers (exclude "
"helper commands), alias and config (retrieve command list from config "
@@ -61195,8 +60946,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:188
msgid ""
-"We separate the porcelain commands into the main commands and some ancillary"
-" user utilities."
+"We separate the porcelain commands into the main commands and some ancillary "
+"user utilities."
msgstr ""
#. type: Title ~
@@ -61245,8 +60996,8 @@ msgstr ""
msgid ""
"Although Git includes its own porcelain layer, its low-level commands are "
"sufficient to support development of alternative porcelains. Developers of "
-"such porcelains might start by reading about linkgit:git-update-index[1] and"
-" linkgit:git-read-tree[1]."
+"such porcelains might start by reading about linkgit:git-update-index[1] and "
+"linkgit:git-read-tree[1]."
msgstr ""
#. type: Plain text
@@ -61358,8 +61109,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:299
msgid ""
-"Various commands read from the configuration file and adjust their operation"
-" accordingly. See linkgit:git-config[1] for a list and more details about "
+"Various commands read from the configuration file and adjust their operation "
+"accordingly. See linkgit:git-config[1] for a list and more details about "
"the configuration mechanism."
msgstr ""
@@ -61400,8 +61151,7 @@ msgstr ""
msgid ""
"Indicates a tree, commit or tag object name. A command that takes a <tree-"
"ish> argument ultimately wants to operate on a <tree> object but "
-"automatically dereferences <commit> and <tag> objects that point at a "
-"<tree>."
+"automatically dereferences <commit> and <tag> objects that point at a <tree>."
msgstr ""
#. type: Labeled list
@@ -61492,8 +61242,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:364
msgid ""
-"Higher level SCMs may provide and manage additional information in the "
-"`$GIT_DIR`."
+"Higher level SCMs may provide and manage additional information in the `"
+"$GIT_DIR`."
msgstr ""
#. type: Title -
@@ -61528,20 +61278,20 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:381
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_INDEX_FILE`"
msgstr "`GIT_INDEX_FILE`"
#. type: Plain text
#: en/git.txt:385
msgid ""
-"This environment allows the specification of an alternate index file. If not"
-" specified, the default of `$GIT_DIR/index` is used."
+"This environment allows the specification of an alternate index file. If not "
+"specified, the default of `$GIT_DIR/index` is used."
msgstr ""
#. type: Labeled list
#: en/git.txt:386
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_INDEX_VERSION`"
msgstr "`GIT_INDEX_VERSION`"
@@ -61556,7 +61306,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:392
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_OBJECT_DIRECTORY`"
msgstr "`GIT_OBJECT_DIRECTORY`"
@@ -61564,24 +61314,23 @@ msgstr "`GIT_OBJECT_DIRECTORY`"
#: en/git.txt:397
msgid ""
"If the object storage directory is specified via this environment variable "
-"then the sha1 directories are created underneath - otherwise the default "
-"`$GIT_DIR/objects` directory is used."
+"then the sha1 directories are created underneath - otherwise the default `"
+"$GIT_DIR/objects` directory is used."
msgstr ""
#. type: Labeled list
#: en/git.txt:398
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
msgstr "`GIT_ALTERNATE_OBJECT_DIRECTORIES`"
#. type: Plain text
#: en/git.txt:404
msgid ""
-"Due to the immutable nature of Git objects, old objects can be archived into"
-" shared, read-only directories. This variable specifies a \":\" separated "
-"(on Windows \";\" separated) list of Git object directories which can be "
-"used to search for Git objects. New objects will not be written to these "
-"directories."
+"Due to the immutable nature of Git objects, old objects can be archived into "
+"shared, read-only directories. This variable specifies a \":\" separated (on "
+"Windows \";\" separated) list of Git object directories which can be used to "
+"search for Git objects. New objects will not be written to these directories."
msgstr ""
#. type: Plain text
@@ -61595,21 +61344,21 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:411
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_DIR`"
msgstr "`GIT_DIR`"
#. type: Plain text
#: en/git.txt:416
msgid ""
-"If the `GIT_DIR` environment variable is set then it specifies a path to use"
-" instead of the default `.git` for the base of the repository. The `--git-"
+"If the `GIT_DIR` environment variable is set then it specifies a path to use "
+"instead of the default `.git` for the base of the repository. The `--git-"
"dir` command-line option also sets this value."
msgstr ""
#. type: Labeled list
#: en/git.txt:417
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_WORK_TREE`"
msgstr "`GIT_WORK_TREE`"
@@ -61617,26 +61366,26 @@ msgstr "`GIT_WORK_TREE`"
#: en/git.txt:421
msgid ""
"Set the path to the root of the working tree. This can also be controlled "
-"by the `--work-tree` command-line option and the core.worktree configuration"
-" variable."
+"by the `--work-tree` command-line option and the core.worktree configuration "
+"variable."
msgstr ""
#. type: Labeled list
#: en/git.txt:422
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_NAMESPACE`"
msgstr "`GIT_NAMESPACE`"
#. type: Plain text
#: en/git.txt:425
msgid ""
-"Set the Git namespace; see linkgit:gitnamespaces[7] for details. The "
-"`--namespace` command-line option also sets this value."
+"Set the Git namespace; see linkgit:gitnamespaces[7] for details. The `--"
+"namespace` command-line option also sets this value."
msgstr ""
#. type: Labeled list
#: en/git.txt:426
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_CEILING_DIRECTORIES`"
msgstr "`GIT_CEILING_DIRECTORIES`"
@@ -61647,17 +61396,17 @@ msgid ""
"list of directories that Git should not chdir up into while looking for a "
"repository directory (useful for excluding slow-loading network "
"directories). It will not exclude the current working directory or a "
-"GIT_DIR set on the command line or in the environment. Normally, Git has to"
-" read the entries in this list and resolve any symlink that might be present"
-" in order to compare them with the current directory. However, if even this"
-" access is slow, you can add an empty entry to the list to tell Git that the"
-" subsequent entries are not symlinks and needn't be resolved; e.g., "
+"GIT_DIR set on the command line or in the environment. Normally, Git has to "
+"read the entries in this list and resolve any symlink that might be present "
+"in order to compare them with the current directory. However, if even this "
+"access is slow, you can add an empty entry to the list to tell Git that the "
+"subsequent entries are not symlinks and needn't be resolved; e.g., "
"`GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink`."
msgstr ""
#. type: Labeled list
#: en/git.txt:441
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
@@ -61665,17 +61414,17 @@ msgstr "`GIT_DISCOVERY_ACROSS_FILESYSTEM`"
#: en/git.txt:450
msgid ""
"When run in a directory that does not have \".git\" repository directory, "
-"Git tries to find such a directory in the parent directories to find the top"
-" of the working tree, but by default it does not cross filesystem "
-"boundaries. This environment variable can be set to true to tell Git not to"
-" stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will "
+"Git tries to find such a directory in the parent directories to find the top "
+"of the working tree, but by default it does not cross filesystem "
+"boundaries. This environment variable can be set to true to tell Git not to "
+"stop at filesystem boundaries. Like `GIT_CEILING_DIRECTORIES`, this will "
"not affect an explicit repository directory set via `GIT_DIR` or on the "
"command line."
msgstr ""
#. type: Labeled list
#: en/git.txt:451
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_COMMON_DIR`"
msgstr "`GIT_COMMON_DIR`"
@@ -61698,37 +61447,37 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:462
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_AUTHOR_NAME`"
msgstr "`GIT_AUTHOR_NAME`"
#. type: Labeled list
#: en/git.txt:463
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_AUTHOR_EMAIL`"
msgstr "`GIT_AUTHOR_EMAIL`"
#. type: Labeled list
#: en/git.txt:464
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_AUTHOR_DATE`"
msgstr "`GIT_AUTHOR_DATE`"
#. type: Labeled list
#: en/git.txt:465
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_COMMITTER_NAME`"
msgstr "`GIT_COMMITTER_NAME`"
#. type: Labeled list
#: en/git.txt:466
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_COMMITTER_EMAIL`"
msgstr "`GIT_COMMITTER_EMAIL`"
#. type: Labeled list
#: en/git.txt:467
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_COMMITTER_DATE`"
msgstr "`GIT_COMMITTER_DATE`"
@@ -61751,7 +61500,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:473
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_DIFF_OPTS`"
msgstr "`GIT_DIFF_OPTS`"
@@ -61760,13 +61509,13 @@ msgstr "`GIT_DIFF_OPTS`"
msgid ""
"Only valid setting is \"--unified=??\" or \"-u??\" to set the number of "
"context lines shown when a unified diff is created. This takes precedence "
-"over any \"-U\" or \"--unified\" option value passed on the Git diff command"
-" line."
+"over any \"-U\" or \"--unified\" option value passed on the Git diff command "
+"line."
msgstr ""
#. type: Labeled list
#: en/git.txt:479
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_EXTERNAL_DIFF`"
msgstr "`GIT_EXTERNAL_DIFF`"
@@ -61774,8 +61523,8 @@ msgstr "`GIT_EXTERNAL_DIFF`"
#: en/git.txt:484
msgid ""
"When the environment variable `GIT_EXTERNAL_DIFF` is set, the program named "
-"by it is called, instead of the diff invocation described above. For a path"
-" that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 "
+"by it is called, instead of the diff invocation described above. For a path "
+"that is added, removed, or modified, `GIT_EXTERNAL_DIFF` is called with 7 "
"parameters:"
msgstr ""
@@ -61831,18 +61580,18 @@ msgstr ""
#. type: Plain text
#: en/git.txt:499
msgid ""
-"The file parameters can point at the user's working file (e.g. `new-file` in"
-" \"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is "
-"added), or a temporary file (e.g. `old-file` in the index). "
-"`GIT_EXTERNAL_DIFF` should not worry about unlinking the temporary file --- "
-"it is removed when `GIT_EXTERNAL_DIFF` exits."
+"The file parameters can point at the user's working file (e.g. `new-file` in "
+"\"git-diff-files\"), `/dev/null` (e.g. `old-file` when a new file is added), "
+"or a temporary file (e.g. `old-file` in the index). `GIT_EXTERNAL_DIFF` "
+"should not worry about unlinking the temporary file --- it is removed when "
+"`GIT_EXTERNAL_DIFF` exits."
msgstr ""
#. type: Plain text
#: en/git.txt:502
msgid ""
-"For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter,"
-" <path>."
+"For a path that is unmerged, `GIT_EXTERNAL_DIFF` is called with 1 parameter, "
+"<path>."
msgstr ""
#. type: Plain text
@@ -61854,7 +61603,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:506
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_DIFF_PATH_COUNTER`"
msgstr "`GIT_DIFF_PATH_COUNTER`"
@@ -61865,7 +61614,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:509
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_DIFF_PATH_TOTAL`"
msgstr "`GIT_DIFF_PATH_TOTAL`"
@@ -61876,7 +61625,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:514
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_MERGE_VERBOSITY`"
msgstr "`GIT_MERGE_VERBOSITY`"
@@ -61889,7 +61638,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:519
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_PAGER`"
msgstr "`GIT_PAGER`"
@@ -61903,7 +61652,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:525
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_EDITOR`"
msgstr "`GIT_EDITOR`"
@@ -61911,20 +61660,20 @@ msgstr "`GIT_EDITOR`"
#: en/git.txt:530
msgid ""
"This environment variable overrides `$EDITOR` and `$VISUAL`. It is used by "
-"several Git commands when, on interactive mode, an editor is to be launched."
-" See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-"
+"several Git commands when, on interactive mode, an editor is to be launched. "
+"See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-"
"config[1]."
msgstr ""
#. type: Labeled list
#: en/git.txt:531
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_SSH`"
msgstr "`GIT_SSH`"
#. type: Labeled list
#: en/git.txt:532
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_SSH_COMMAND`"
msgstr "`GIT_SSH_COMMAND`"
@@ -61957,7 +61706,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:551
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_SSH_VARIANT`"
msgstr "`GIT_SSH_VARIANT`"
@@ -61966,21 +61715,21 @@ msgstr "`GIT_SSH_VARIANT`"
msgid ""
"If this environment variable is set, it overrides Git's autodetection "
"whether `GIT_SSH`/`GIT_SSH_COMMAND`/`core.sshCommand` refer to OpenSSH, "
-"plink or tortoiseplink. This variable overrides the config setting "
-"`ssh.variant` that serves the same purpose."
+"plink or tortoiseplink. This variable overrides the config setting `ssh."
+"variant` that serves the same purpose."
msgstr ""
#. type: Labeled list
#: en/git.txt:557
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_ASKPASS`"
msgstr "`GIT_ASKPASS`"
#. type: Plain text
#: en/git.txt:563
msgid ""
-"If this environment variable is set, then Git commands which need to acquire"
-" passwords or passphrases (e.g. for HTTP or IMAP authentication) will call "
+"If this environment variable is set, then Git commands which need to acquire "
+"passwords or passphrases (e.g. for HTTP or IMAP authentication) will call "
"this program with a suitable prompt as command-line argument and read the "
"password from its STDOUT. See also the `core.askPass` option in linkgit:git-"
"config[1]."
@@ -61988,7 +61737,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:564
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_TERMINAL_PROMPT`"
msgstr "`GIT_TERMINAL_PROMPT`"
@@ -62001,24 +61750,24 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:568
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_CONFIG_NOSYSTEM`"
msgstr "`GIT_CONFIG_NOSYSTEM`"
#. type: Plain text
#: en/git.txt:575
msgid ""
-"Whether to skip reading settings from the system-wide "
-"`$(prefix)/etc/gitconfig` file. This environment variable can be used along"
-" with `$HOME` and `$XDG_CONFIG_HOME` to create a predictable environment for"
-" a picky script, or you can set it temporarily to avoid using a buggy "
-"`/etc/gitconfig` file while waiting for someone with sufficient permissions "
-"to fix it."
+"Whether to skip reading settings from the system-wide `$(prefix)/etc/"
+"gitconfig` file. This environment variable can be used along with `$HOME` "
+"and `$XDG_CONFIG_HOME` to create a predictable environment for a picky "
+"script, or you can set it temporarily to avoid using a buggy `/etc/"
+"gitconfig` file while waiting for someone with sufficient permissions to fix "
+"it."
msgstr ""
#. type: Labeled list
#: en/git.txt:576
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_FLUSH`"
msgstr "`GIT_FLUSH`"
@@ -62039,7 +61788,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:587
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_TRACE`"
msgstr "`GIT_TRACE`"
@@ -62061,8 +61810,8 @@ msgstr ""
#: en/git.txt:599
msgid ""
"If the variable is set to an integer value greater than 2 and lower than 10 "
-"(strictly) then Git will interpret this value as an open file descriptor and"
-" will try to write the trace messages into this file descriptor."
+"(strictly) then Git will interpret this value as an open file descriptor and "
+"will try to write the trace messages into this file descriptor."
msgstr ""
#. type: Plain text
@@ -62082,7 +61831,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:608
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_TRACE_FSMONITOR`"
msgstr "`GIT_TRACE_FSMONITOR`"
@@ -62095,7 +61844,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:612
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_TRACE_PACK_ACCESS`"
msgstr "`GIT_TRACE_PACK_ACCESS`"
@@ -62104,13 +61853,13 @@ msgstr "`GIT_TRACE_PACK_ACCESS`"
msgid ""
"Enables trace messages for all accesses to any packs. For each access, the "
"pack file name and an offset in the pack is recorded. This may be helpful "
-"for troubleshooting some pack-related performance problems. See `GIT_TRACE`"
-" for available trace output options."
+"for troubleshooting some pack-related performance problems. See `GIT_TRACE` "
+"for available trace output options."
msgstr ""
#. type: Labeled list
#: en/git.txt:619
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_TRACE_PACKET`"
msgstr "`GIT_TRACE_PACKET`"
@@ -62126,7 +61875,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:626
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_TRACE_PACKFILE`"
msgstr "`GIT_TRACE_PACKFILE`"
@@ -62136,8 +61885,8 @@ msgid ""
"Enables tracing of packfiles sent or received by a given program. Unlike "
"other trace output, this trace is verbatim: no headers, and no quoting of "
"binary data. You almost certainly want to direct into a file (e.g., "
-"`GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal"
-" or mixing it with other trace output."
+"`GIT_TRACE_PACKFILE=/tmp/my.pack`) rather than displaying it on the terminal "
+"or mixing it with other trace output."
msgstr ""
#. type: Plain text
@@ -62149,7 +61898,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:637
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_TRACE_PERFORMANCE`"
msgstr "`GIT_TRACE_PERFORMANCE`"
@@ -62162,7 +61911,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:642
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_TRACE_SETUP`"
msgstr "`GIT_TRACE_SETUP`"
@@ -62176,20 +61925,20 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:647
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_TRACE_SHALLOW`"
msgstr "`GIT_TRACE_SHALLOW`"
#. type: Plain text
#: en/git.txt:651
msgid ""
-"Enables trace messages that can help debugging fetching / cloning of shallow"
-" repositories. See `GIT_TRACE` for available trace output options."
+"Enables trace messages that can help debugging fetching / cloning of shallow "
+"repositories. See `GIT_TRACE` for available trace output options."
msgstr ""
#. type: Labeled list
#: en/git.txt:652
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_TRACE_CURL`"
msgstr "`GIT_TRACE_CURL`"
@@ -62205,7 +61954,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:660
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_TRACE_CURL_NO_DATA`"
msgstr "`GIT_TRACE_CURL_NO_DATA`"
@@ -62218,7 +61967,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:664
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_REDACT_COOKIES`"
msgstr "`GIT_REDACT_COOKIES`"
@@ -62226,14 +61975,14 @@ msgstr "`GIT_REDACT_COOKIES`"
#: en/git.txt:669
msgid ""
"This can be set to a comma-separated list of strings. When a curl trace is "
-"enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by"
-" the client is dumped, values of cookies whose key is in that list (case-"
+"enabled (see `GIT_TRACE_CURL` above), whenever a \"Cookies:\" header sent by "
+"the client is dumped, values of cookies whose key is in that list (case-"
"sensitive) are redacted."
msgstr ""
#. type: Labeled list
#: en/git.txt:670
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_LITERAL_PATHSPECS`"
msgstr "`GIT_LITERAL_PATHSPECS`"
@@ -62250,7 +61999,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:679
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_GLOB_PATHSPECS`"
msgstr "`GIT_GLOB_PATHSPECS`"
@@ -62263,7 +62012,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:683
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_NOGLOB_PATHSPECS`"
msgstr "`GIT_NOGLOB_PATHSPECS`"
@@ -62276,7 +62025,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:687
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_ICASE_PATHSPECS`"
msgstr "`GIT_ICASE_PATHSPECS`"
@@ -62289,7 +62038,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:691
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_REFLOG_ACTION`"
msgstr "`GIT_REFLOG_ACTION`"
@@ -62301,13 +62050,13 @@ msgid ""
"level command that updated the ref), in addition to the old and new values "
"of the ref. A scripted Porcelain command can use set_reflog_action helper "
"function in `git-sh-setup` to set its name to this variable when it is "
-"invoked as the top level command by the end user, to be recorded in the body"
-" of the reflog."
+"invoked as the top level command by the end user, to be recorded in the body "
+"of the reflog."
msgstr ""
#. type: Labeled list
#: en/git.txt:701
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_REF_PARANOIA`"
msgstr "`GIT_REF_PARANOIA`"
@@ -62316,34 +62065,34 @@ msgstr "`GIT_REF_PARANOIA`"
msgid ""
"If set to `1`, include broken or badly named refs when iterating over lists "
"of refs. In a normal, non-corrupted repository, this does nothing. However, "
-"enabling it may help git to detect and abort some operations in the presence"
-" of broken refs. Git sets this variable automatically when performing "
-"destructive operations like linkgit:git-prune[1]. You should not need to set"
-" it yourself unless you want to be paranoid about making sure an operation "
+"enabling it may help git to detect and abort some operations in the presence "
+"of broken refs. Git sets this variable automatically when performing "
+"destructive operations like linkgit:git-prune[1]. You should not need to set "
+"it yourself unless you want to be paranoid about making sure an operation "
"has touched every ref (e.g., because you are cloning a repository to make a "
"backup)."
msgstr ""
#. type: Labeled list
#: en/git.txt:712
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_ALLOW_PROTOCOL`"
msgstr "`GIT_ALLOW_PROTOCOL`"
#. type: Plain text
#: en/git.txt:720
msgid ""
-"If set to a colon-separated list of protocols, behave as if `protocol.allow`"
-" is set to `never`, and each of the listed protocols has "
-"`protocol.<name>.allow` set to `always` (overriding any existing "
-"configuration). In other words, any protocol not mentioned will be "
-"disallowed (i.e., this is a whitelist, not a blacklist). See the description"
-" of `protocol.allow` in linkgit:git-config[1] for more details."
+"If set to a colon-separated list of protocols, behave as if `protocol.allow` "
+"is set to `never`, and each of the listed protocols has `protocol.<name>."
+"allow` set to `always` (overriding any existing configuration). In other "
+"words, any protocol not mentioned will be disallowed (i.e., this is a "
+"whitelist, not a blacklist). See the description of `protocol.allow` in "
+"linkgit:git-config[1] for more details."
msgstr ""
#. type: Labeled list
#: en/git.txt:721
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_PROTOCOL_FROM_USER`"
msgstr "`GIT_PROTOCOL_FROM_USER`"
@@ -62359,7 +62108,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:728
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_PROTOCOL`"
msgstr "`GIT_PROTOCOL`"
@@ -62373,7 +62122,7 @@ msgstr ""
#. type: Labeled list
#: en/git.txt:734
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_OPTIONAL_LOCKS`"
msgstr "`GIT_OPTIONAL_LOCKS`"
@@ -62383,25 +62132,25 @@ msgid ""
"If set to `0`, Git will complete any requested operation without performing "
"any optional sub-operations that require taking a lock. For example, this "
"will prevent `git status` from refreshing the index as a side effect. This "
-"is useful for processes running in the background which do not want to cause"
-" lock contention with other operations on the repository. Defaults to `1`."
+"is useful for processes running in the background which do not want to cause "
+"lock contention with other operations on the repository. Defaults to `1`."
msgstr ""
#. type: Labeled list
#: en/git.txt:742
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_REDIRECT_STDIN`"
msgstr "`GIT_REDIRECT_STDIN`"
#. type: Labeled list
#: en/git.txt:743
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_REDIRECT_STDOUT`"
msgstr "`GIT_REDIRECT_STDOUT`"
#. type: Labeled list
#: en/git.txt:744
-#, ignore-same, no-wrap
+#, no-wrap
msgid "`GIT_REDIRECT_STDERR`"
msgstr "`GIT_REDIRECT_STDERR`"
@@ -62409,21 +62158,21 @@ msgstr "`GIT_REDIRECT_STDERR`"
#: en/git.txt:754
msgid ""
"Windows-only: allow redirecting the standard input/output/error handles to "
-"paths specified by the environment variables. This is particularly useful in"
-" multi-threaded applications where the canonical way to pass standard "
-"handles via `CreateProcess()` is not an option because it would require the "
-"handles to be marked inheritable (and consequently *every* spawned process "
-"would inherit them, possibly blocking regular Git operations). The primary "
-"intended use case is to use named pipes for communication (e.g. "
-"`\\\\.\\pipe\\my-git-stdin-123`)."
+"paths specified by the environment variables. This is particularly useful in "
+"multi-threaded applications where the canonical way to pass standard handles "
+"via `CreateProcess()` is not an option because it would require the handles "
+"to be marked inheritable (and consequently *every* spawned process would "
+"inherit them, possibly blocking regular Git operations). The primary "
+"intended use case is to use named pipes for communication (e.g. `\\\\.\\pipe"
+"\\my-git-stdin-123`)."
msgstr ""
#. type: Plain text
#: en/git.txt:759
msgid ""
"Two special values are supported: `off` will simply close the corresponding "
-"standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will"
-" be redirected to the same handle as standard output."
+"standard handle, and if `GIT_REDIRECT_STDERR` is `2>&1`, standard error will "
+"be redirected to the same handle as standard output."
msgstr ""
#. type: Labeled list
@@ -62436,8 +62185,8 @@ msgstr ""
#: en/git.txt:768
msgid ""
"If set to `yes`, print an ellipsis following an (abbreviated) SHA-1 value. "
-"This affects indications of detached HEADs (linkgit:git-checkout[1]) and the"
-" raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases "
+"This affects indications of detached HEADs (linkgit:git-checkout[1]) and the "
+"raw diff output (linkgit:git-diff[1]). Printing an ellipsis in the cases "
"mentioned is no longer considered adequate and support for it is likely to "
"be removed in the foreseeable future (along with the variable)."
msgstr ""
@@ -62451,9 +62200,9 @@ msgstr ""
#. type: Plain text
#: en/git.txt:775
msgid ""
-"More detail on the following is available from the link:user-"
-"manual.html#git-concepts[Git concepts chapter of the user-manual] and "
-"linkgit:gitcore-tutorial[7]."
+"More detail on the following is available from the link:user-manual.html#git-"
+"concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-"
+"tutorial[7]."
msgstr ""
#. type: Plain text
@@ -62471,9 +62220,9 @@ msgstr ""
#: en/git.txt:787
msgid ""
"The object database contains objects of three main types: blobs, which hold "
-"file data; trees, which point to blobs and other trees to build up directory"
-" hierarchies; and commits, which each reference a single tree and some "
-"number of parent commits."
+"file data; trees, which point to blobs and other trees to build up directory "
+"hierarchies; and commits, which each reference a single tree and some number "
+"of parent commits."
msgstr ""
#. type: Plain text
@@ -62481,8 +62230,8 @@ msgstr ""
msgid ""
"The commit, equivalent to what other systems call a \"changeset\" or "
"\"version\", represents a step in the project's history, and each parent "
-"represents an immediately preceding step. Commits with more than one parent"
-" represent merges of independent lines of development."
+"represents an immediately preceding step. Commits with more than one parent "
+"represent merges of independent lines of development."
msgstr ""
#. type: Plain text
@@ -62506,8 +62255,8 @@ msgstr ""
msgid ""
"Named pointers called refs mark interesting points in history. A ref may "
"contain the SHA-1 name of an object or the name of another ref. Refs with "
-"names beginning `ref/head/` contain the SHA-1 name of the most recent commit"
-" (or \"head\") of a branch under development. SHA-1 names of tags of "
+"names beginning `ref/head/` contain the SHA-1 name of the most recent commit "
+"(or \"head\") of a branch under development. SHA-1 names of tags of "
"interest are stored under `ref/tags/`. A special ref named `HEAD` contains "
"the name of the currently checked-out branch."
msgstr ""
@@ -62515,8 +62264,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:817
msgid ""
-"The index file is initialized with a list of all paths and, for each path, a"
-" blob object and a set of attributes. The blob object represents the "
+"The index file is initialized with a list of all paths and, for each path, a "
+"blob object and a set of attributes. The blob object represents the "
"contents of the file as of the head of the current branch. The attributes "
"(last modified time, size, etc.) are taken from the corresponding file in "
"the working tree. Subsequent changes to the working tree can be found by "
@@ -62541,9 +62290,8 @@ msgstr ""
#. type: Plain text
#: en/git.txt:828
msgid ""
-"See the references in the \"description\" section to get started using Git."
-" The following is probably more detail than necessary for a first-time "
-"user."
+"See the references in the \"description\" section to get started using Git. "
+"The following is probably more detail than necessary for a first-time user."
msgstr ""
#. type: Plain text
@@ -62562,8 +62310,7 @@ msgstr ""
#. type: Plain text
#: en/git.txt:837
msgid ""
-"See also the link:howto-index.html[howto] documents for some useful "
-"examples."
+"See also the link:howto-index.html[howto] documents for some useful examples."
msgstr ""
#. type: Plain text
@@ -62589,17 +62336,17 @@ msgstr ""
#: en/git.txt:851
msgid ""
"Git was started by Linus Torvalds, and is currently maintained by Junio C "
-"Hamano. Numerous contributions have come from the Git mailing list "
-"<git@vger.kernel.org>. http://www.openhub.net/p/git/contributors/summary "
-"gives you a more complete list of contributors."
+"Hamano. Numerous contributions have come from the Git mailing list <git@vger."
+"kernel.org>. http://www.openhub.net/p/git/contributors/summary gives you a "
+"more complete list of contributors."
msgstr ""
#. type: Plain text
#: en/git.txt:855
msgid ""
-"If you have a clone of git.git itself, the output of linkgit:git-shortlog[1]"
-" and linkgit:git-blame[1] can show you the authors for specific parts of the"
-" project."
+"If you have a clone of git.git itself, the output of linkgit:git-shortlog[1] "
+"and linkgit:git-blame[1] can show you the authors for specific parts of the "
+"project."
msgstr ""
#. type: Title -
@@ -62635,7 +62382,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-file.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-unpack-file(1)"
msgstr "git-unpack-file(1)"
@@ -62666,7 +62413,7 @@ msgstr ""
#. type: Title =
#: en/git-unpack-objects.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-unpack-objects(1)"
msgstr "git-unpack-objects(1)"
@@ -62684,17 +62431,17 @@ msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:20
msgid ""
-"Read a packed archive (.pack) from the standard input, expanding the objects"
-" contained within and writing them into the repository in \"loose\" (one "
+"Read a packed archive (.pack) from the standard input, expanding the objects "
+"contained within and writing them into the repository in \"loose\" (one "
"object per file) format."
msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:24
msgid ""
-"Objects that already exist in the repository will *not* be unpacked from the"
-" packfile. Therefore, nothing will be unpacked if you use this command on a"
-" packfile that exists within the target repository."
+"Objects that already exist in the repository will *not* be unpacked from the "
+"packfile. Therefore, nothing will be unpacked if you use this command on a "
+"packfile that exists within the target repository."
msgstr ""
#. type: Plain text
@@ -62723,9 +62470,9 @@ msgstr ""
#. type: Plain text
#: en/git-unpack-objects.txt:43
msgid ""
-"When unpacking a corrupt packfile, the command dies at the first corruption."
-" This flag tells it to keep going and make the best effort to recover as "
-"many objects as possible."
+"When unpacking a corrupt packfile, the command dies at the first "
+"corruption. This flag tells it to keep going and make the best effort to "
+"recover as many objects as possible."
msgstr ""
#. type: Plain text
@@ -62735,7 +62482,7 @@ msgstr ""
#. type: Title =
#: en/git-update-index.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-update-index(1)"
msgstr "git-update-index(1)"
@@ -62798,7 +62545,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:49
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--remove"
msgstr "--remove"
@@ -62812,8 +62559,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:57
msgid ""
-"Looks at the current index and checks to see if merges or updates are needed"
-" by checking stat() information."
+"Looks at the current index and checks to see if merges or updates are needed "
+"by checking stat() information."
msgstr ""
#. type: Plain text
@@ -62830,7 +62577,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:63
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ignore-submodules"
msgstr "--ignore-submodules"
@@ -62884,7 +62631,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:82
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--index-info"
msgstr "--index-info"
@@ -62900,34 +62647,34 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:88
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]assume-unchanged"
msgstr "--[no-]assume-unchanged"
#. type: Plain text
#: en/git-update-index.txt:100
msgid ""
-"When this flag is specified, the object names recorded for the paths are not"
-" updated. Instead, this option sets/unsets the \"assume unchanged\" bit for"
-" the paths. When the \"assume unchanged\" bit is on, the user promises not "
+"When this flag is specified, the object names recorded for the paths are not "
+"updated. Instead, this option sets/unsets the \"assume unchanged\" bit for "
+"the paths. When the \"assume unchanged\" bit is on, the user promises not "
"to change the file and allows Git to assume that the working tree file "
"matches what is recorded in the index. If you want to change the working "
-"tree file, you need to unset the bit to tell Git. This is sometimes helpful"
-" when working with a big project on a filesystem that has very slow lstat(2)"
-" system call (e.g. cifs)."
+"tree file, you need to unset the bit to tell Git. This is sometimes helpful "
+"when working with a big project on a filesystem that has very slow lstat(2) "
+"system call (e.g. cifs)."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:105
msgid ""
-"Git will fail (gracefully) in case it needs to modify this file in the index"
-" e.g. when merging in a commit; thus, in case the assumed-untracked file is "
+"Git will fail (gracefully) in case it needs to modify this file in the index "
+"e.g. when merging in a commit; thus, in case the assumed-untracked file is "
"changed upstream, you will need to handle the situation manually."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:106
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--really-refresh"
msgstr "--really-refresh"
@@ -62940,37 +62687,37 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:110
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]skip-worktree"
msgstr "--[no-]skip-worktree"
#. type: Plain text
#: en/git-update-index.txt:115
msgid ""
-"When one of these flags is specified, the object name recorded for the paths"
-" are not updated. Instead, these options set and unset the \"skip-worktree\""
-" bit for the paths. See section \"Skip-worktree bit\" below for more "
+"When one of these flags is specified, the object name recorded for the paths "
+"are not updated. Instead, these options set and unset the \"skip-worktree\" "
+"bit for the paths. See section \"Skip-worktree bit\" below for more "
"information."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:116
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]fsmonitor-valid"
msgstr "--[no-]fsmonitor-valid"
#. type: Plain text
#: en/git-update-index.txt:121
msgid ""
-"When one of these flags is specified, the object name recorded for the paths"
-" are not updated. Instead, these options set and unset the \"fsmonitor "
-"valid\" bit for the paths. See section \"File System Monitor\" below for "
-"more information."
+"When one of these flags is specified, the object name recorded for the paths "
+"are not updated. Instead, these options set and unset the \"fsmonitor valid"
+"\" bit for the paths. See section \"File System Monitor\" below for more "
+"information."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:123
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--again"
msgstr "--again"
@@ -62983,7 +62730,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:127
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--unresolve"
msgstr "--unresolve"
@@ -62996,7 +62743,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:131
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--info-only"
msgstr "--info-only"
@@ -63009,7 +62756,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:136
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--force-remove"
msgstr "--force-remove"
@@ -63022,7 +62769,7 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:140
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--replace"
msgstr "--replace"
@@ -63073,13 +62820,13 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:172
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--split-index"
msgstr "--split-index"
#. type: Labeled list
#: en/git-update-index.txt:173
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-split-index"
msgstr "--no-split-index"
@@ -63087,29 +62834,29 @@ msgstr "--no-split-index"
#: en/git-update-index.txt:178
msgid ""
"Enable or disable split index mode. If split-index mode is already enabled "
-"and `--split-index` is given again, all changes in $GIT_DIR/index are pushed"
-" back to the shared index file."
+"and `--split-index` is given again, all changes in $GIT_DIR/index are pushed "
+"back to the shared index file."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:184
msgid ""
"These options take effect whatever the value of the `core.splitIndex` "
-"configuration variable (see linkgit:git-config[1]). But a warning is emitted"
-" when the change goes against the configured value, as the configured value "
+"configuration variable (see linkgit:git-config[1]). But a warning is emitted "
+"when the change goes against the configured value, as the configured value "
"will take effect next time the index is read and this will remove the "
"intended effect of the option."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:185
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--untracked-cache"
msgstr "--untracked-cache"
#. type: Labeled list
#: en/git-update-index.txt:186
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-untracked-cache"
msgstr "--no-untracked-cache"
@@ -63124,23 +62871,23 @@ msgstr ""
#: en/git-update-index.txt:195
msgid ""
"These options take effect whatever the value of the `core.untrackedCache` "
-"configuration variable (see linkgit:git-config[1]). But a warning is emitted"
-" when the change goes against the configured value, as the configured value "
+"configuration variable (see linkgit:git-config[1]). But a warning is emitted "
+"when the change goes against the configured value, as the configured value "
"will take effect next time the index is read and this will remove the "
"intended effect of the option."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:196
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--test-untracked-cache"
msgstr "--test-untracked-cache"
#. type: Plain text
#: en/git-update-index.txt:205
msgid ""
-"Only perform tests on the working directory to make sure untracked cache can"
-" be used. You have to manually enable untracked cache using `--untracked-"
+"Only perform tests on the working directory to make sure untracked cache can "
+"be used. You have to manually enable untracked cache using `--untracked-"
"cache` or `--force-untracked-cache` or the `core.untrackedCache` "
"configuration variable afterwards if you really want to use it. If a test "
"fails the exit code is 1 and a message explains what is not working as "
@@ -63149,27 +62896,27 @@ msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:206
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--force-untracked-cache"
msgstr "--force-untracked-cache"
#. type: Plain text
#: en/git-update-index.txt:211
msgid ""
-"Same as `--untracked-cache`. Provided for backwards compatibility with older"
-" versions of Git where `--untracked-cache` used to imply `--test-untracked-"
+"Same as `--untracked-cache`. Provided for backwards compatibility with older "
+"versions of Git where `--untracked-cache` used to imply `--test-untracked-"
"cache` but this option would enable the extension unconditionally."
msgstr ""
#. type: Labeled list
#: en/git-update-index.txt:212
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--fsmonitor"
msgstr "--fsmonitor"
#. type: Labeled list
#: en/git-update-index.txt:213
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-fsmonitor"
msgstr "--no-fsmonitor"
@@ -63188,8 +62935,8 @@ msgstr ""
#: en/git-update-index.txt:230
msgid ""
"Files to act on. Note that files beginning with '.' are discarded. This "
-"includes `./file` and `dir/./file`. If you don't want this, then use cleaner"
-" names. The same applies to directories ending '/' and paths with '//'"
+"includes `./file` and `dir/./file`. If you don't want this, then use cleaner "
+"names. The same applies to directories ending '/' and paths with '//'"
msgstr ""
#. type: Title -
@@ -63201,17 +62948,17 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:238
msgid ""
-"`--refresh` does not calculate a new sha1 file or bring the index up to date"
-" for mode/content changes. But what it *does* do is to \"re-match\" the stat"
-" information of a file with the index, so that you can refresh the index for"
-" a file that hasn't been changed but where the stat entry is out of date."
+"`--refresh` does not calculate a new sha1 file or bring the index up to date "
+"for mode/content changes. But what it *does* do is to \"re-match\" the stat "
+"information of a file with the index, so that you can refresh the index for "
+"a file that hasn't been changed but where the stat entry is out of date."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:241
msgid ""
-"For example, you'd want to do this after doing a 'git read-tree', to link up"
-" the stat index details with the proper files."
+"For example, you'd want to do this after doing a 'git read-tree', to link up "
+"the stat index details with the proper files."
msgstr ""
#. type: Title -
@@ -63309,8 +63056,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:288
msgid ""
-"To place a higher stage entry to the index, the path should first be removed"
-" by feeding a mode=0 entry for the path, and then feeding necessary input "
+"To place a higher stage entry to the index, the path should first be removed "
+"by feeding a mode=0 entry for the path, and then feeding necessary input "
"lines in the third format."
msgstr ""
@@ -63373,12 +63120,12 @@ msgid ""
"`lstat(2)` implementation, so that `st_mtime` information for working tree "
"files can be cheaply checked to see if the file contents have changed from "
"the version recorded in the index file. Unfortunately, some filesystems "
-"have inefficient `lstat(2)`. If your filesystem is one of them, you can set"
-" \"assume unchanged\" bit to paths you have not changed to cause Git not to "
+"have inefficient `lstat(2)`. If your filesystem is one of them, you can set "
+"\"assume unchanged\" bit to paths you have not changed to cause Git not to "
"do this check. Note that setting this bit on a path does not mean Git will "
"check the contents of the file to see if it has changed -- it makes Git to "
-"omit any checking and assume it has *not* changed. When you make changes to"
-" working tree files, you have to explicitly tell Git about it by dropping "
+"omit any checking and assume it has *not* changed. When you make changes to "
+"working tree files, you have to explicitly tell Git about it by dropping "
"\"assume unchanged\" bit, either before or after you modify them."
msgstr ""
@@ -63393,14 +63140,14 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:348
msgid ""
-"The command looks at `core.ignorestat` configuration variable. When this is"
-" true, paths updated with `git update-index paths...` and paths updated with"
-" other Git commands that update both index and working tree (e.g. 'git apply"
-" --index', 'git checkout-index -u', and 'git read-tree -u') are "
-"automatically marked as \"assume unchanged\". Note that \"assume "
-"unchanged\" bit is *not* set if `git update-index --refresh` finds the "
-"working tree file matches the index (use `git update-index --really-refresh`"
-" if you want to mark them as \"assume unchanged\")."
+"The command looks at `core.ignorestat` configuration variable. When this is "
+"true, paths updated with `git update-index paths...` and paths updated with "
+"other Git commands that update both index and working tree (e.g. 'git apply "
+"--index', 'git checkout-index -u', and 'git read-tree -u') are automatically "
+"marked as \"assume unchanged\". Note that \"assume unchanged\" bit is *not* "
+"set if `git update-index --refresh` finds the working tree file matches the "
+"index (use `git update-index --really-refresh` if you want to mark them as "
+"\"assume unchanged\")."
msgstr ""
#. type: Plain text
@@ -63499,8 +63246,8 @@ msgid ""
"To elaborate, \"reading\" means checking for file existence, reading file "
"attributes or file content. The working directory version may be present or "
"absent. If present, its content may match against the index version or not. "
-"Writing is not affected by this bit, content safety is still first priority."
-" Note that Git _can_ update working directory file, that is marked skip-"
+"Writing is not affected by this bit, content safety is still first priority. "
+"Note that Git _can_ update working directory file, that is marked skip-"
"worktree, if it is safe to do so (i.e. working directory version matches "
"index version)"
msgstr ""
@@ -63529,25 +63276,25 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:417
msgid ""
-"In this mode, the index is split into two files, $GIT_DIR/index and "
-"$GIT_DIR/sharedindex.<SHA-1>. Changes are accumulated in $GIT_DIR/index, the"
-" split index, while the shared index file contains all index entries and "
-"stays unchanged."
+"In this mode, the index is split into two files, $GIT_DIR/index and $GIT_DIR/"
+"sharedindex.<SHA-1>. Changes are accumulated in $GIT_DIR/index, the split "
+"index, while the shared index file contains all index entries and stays "
+"unchanged."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:422
msgid ""
-"All changes in the split index are pushed back to the shared index file when"
-" the number of entries in the split index reaches a level specified by the "
+"All changes in the split index are pushed back to the shared index file when "
+"the number of entries in the split index reaches a level specified by the "
"splitIndex.maxPercentChange config variable (see linkgit:git-config[1])."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:427
msgid ""
-"Each time a new shared index file is created, the old shared index files are"
-" deleted if their modification time is older than what is specified by the "
+"Each time a new shared index file is created, the old shared index files are "
+"deleted if their modification time is older than what is specified by the "
"splitIndex.sharedIndexExpire config variable (see linkgit:git-config[1])."
msgstr ""
@@ -63555,8 +63302,8 @@ msgstr ""
#: en/git-update-index.txt:431
msgid ""
"To avoid deleting a shared index file that is still used, its modification "
-"time is updated to the current time everytime a new split index based on the"
-" shared index file is either created or read from."
+"time is updated to the current time everytime a new split index based on the "
+"shared index file is either created or read from."
msgstr ""
#. type: Title -
@@ -63585,9 +63332,9 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:449
msgid ""
-"You can test whether the filesystem supports that with the `--test-"
-"untracked-cache` option. The `--untracked-cache` option used to implicitly "
-"perform that test in older versions of Git, but that's no longer the case."
+"You can test whether the filesystem supports that with the `--test-untracked-"
+"cache` option. The `--untracked-cache` option used to implicitly perform "
+"that test in older versions of Git, but that's no longer the case."
msgstr ""
#. type: Plain text
@@ -63596,8 +63343,8 @@ msgid ""
"If you want to enable (or disable) this feature, it is easier to use the "
"`core.untrackedCache` configuration variable (see linkgit:git-config[1]) "
"than using the `--untracked-cache` option to `git update-index` in each "
-"repository, especially if you want to do so across all repositories you use,"
-" because you can set the configuration variable to `true` (or `false`) in "
+"repository, especially if you want to do so across all repositories you use, "
+"because you can set the configuration variable to `true` (or `false`) in "
"your `$HOME/.gitconfig` just once and have it affect all repositories you "
"touch."
msgstr ""
@@ -63649,9 +63396,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:489
msgid ""
-"As with the bug described above the solution is to one-off do a \"git "
-"status\" run with `core.untrackedCache=false` to flush out the leftover bad "
-"data."
+"As with the bug described above the solution is to one-off do a \"git status"
+"\" run with `core.untrackedCache=false` to flush out the leftover bad data."
msgstr ""
#. type: Title -
@@ -63671,8 +63417,8 @@ msgstr ""
#: en/git-update-index.txt:500
msgid ""
"It enables git to work together with a file system monitor (see the "
-"\"fsmonitor-watchman\" section of linkgit:githooks[5]) that can inform it as"
-" to what files have been modified. This enables git to avoid having to "
+"\"fsmonitor-watchman\" section of linkgit:githooks[5]) that can inform it as "
+"to what files have been modified. This enables git to avoid having to "
"lstat() every file to find modified files."
msgstr ""
@@ -63690,17 +63436,17 @@ msgid ""
"If you want to enable (or disable) this feature, it is easier to use the "
"`core.fsmonitor` configuration variable (see linkgit:git-config[1]) than "
"using the `--fsmonitor` option to `git update-index` in each repository, "
-"especially if you want to do so across all repositories you use, because you"
-" can set the configuration variable in your `$HOME/.gitconfig` just once and"
-" have it affect all repositories you touch."
+"especially if you want to do so across all repositories you use, because you "
+"can set the configuration variable in your `$HOME/.gitconfig` just once and "
+"have it affect all repositories you touch."
msgstr ""
#. type: Plain text
#: en/git-update-index.txt:517
msgid ""
-"When the `core.fsmonitor` configuration variable is changed, the file system"
-" monitor is added to or removed from the index the next time a command reads"
-" the index. When `--[no-]fsmonitor` are used, the file system monitor is "
+"When the `core.fsmonitor` configuration variable is changed, the file system "
+"monitor is added to or removed from the index the next time a command reads "
+"the index. When `--[no-]fsmonitor` are used, the file system monitor is "
"immediately added to or removed from the index."
msgstr ""
@@ -63720,10 +63466,10 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:533
msgid ""
-"Quite similarly, if `core.symlinks` configuration variable is set to 'false'"
-" (see linkgit:git-config[1]), symbolic links are checked out as plain files,"
-" and this command does not modify a recorded file mode from symbolic link to"
-" regular file."
+"Quite similarly, if `core.symlinks` configuration variable is set to "
+"'false' (see linkgit:git-config[1]), symbolic links are checked out as plain "
+"files, and this command does not modify a recorded file mode from symbolic "
+"link to regular file."
msgstr ""
#. type: Plain text
@@ -63751,13 +63497,12 @@ msgstr ""
#. type: Plain text
#: en/git-update-index.txt:551
-#, ignore-same
msgid "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
msgstr "linkgit:git-config[1], linkgit:git-add[1], linkgit:git-ls-files[1]"
#. type: Title =
#: en/git-update-ref.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-update-ref(1)"
msgstr "git-update-ref(1)"
@@ -63769,9 +63514,7 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:12
#, no-wrap
-msgid ""
-"'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<oldvalue>] | "
-"[--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z])\n"
+msgid "'git update-ref' [-m <reason>] [--no-deref] (-d <ref> [<oldvalue>] | [--create-reflog] <ref> <newvalue> [<oldvalue>] | --stdin [-z])\n"
msgstr ""
#. type: Plain text
@@ -63806,10 +63549,10 @@ msgstr ""
msgid ""
"More importantly, it allows the update of a ref file to follow these "
"symbolic pointers, whether they are symlinks or these \"regular file "
-"symbolic refs\". It follows *real* symlinks only if they start with "
-"\"refs/\": otherwise it will just try to read them and update them as a "
-"regular file (i.e. it will allow the filesystem to follow them, but will "
-"overwrite such a symlink to somewhere else with a regular filename)."
+"symbolic refs\". It follows *real* symlinks only if they start with \"refs/"
+"\": otherwise it will just try to read them and update them as a regular "
+"file (i.e. it will allow the filesystem to follow them, but will overwrite "
+"such a symlink to somewhere else with a regular filename)."
msgstr ""
#. type: Plain text
@@ -63844,18 +63587,18 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:57
msgid ""
-"both from a symlink following standpoint *and* an error checking standpoint."
-" The \"refs/\" rule for symlinks means that symlinks that point to "
-"\"outside\" the tree are safe: they'll be followed for reading but not for "
-"writing (so we'll never write through a ref symlink to some other tree, if "
-"you have copied a whole archive by creating a symlink tree)."
+"both from a symlink following standpoint *and* an error checking "
+"standpoint. The \"refs/\" rule for symlinks means that symlinks that point "
+"to \"outside\" the tree are safe: they'll be followed for reading but not "
+"for writing (so we'll never write through a ref symlink to some other tree, "
+"if you have copied a whole archive by creating a symlink tree)."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:60
msgid ""
-"With `-d` flag, it deletes the named <ref> after verifying it still contains"
-" <oldvalue>."
+"With `-d` flag, it deletes the named <ref> after verifying it still contains "
+"<oldvalue>."
msgstr ""
#. type: Plain text
@@ -63879,24 +63622,23 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:72
msgid ""
-"With `--create-reflog`, update-ref will create a reflog for each ref even if"
-" one would not ordinarily be created."
+"With `--create-reflog`, update-ref will create a reflog for each ref even if "
+"one would not ordinarily be created."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:77
msgid ""
-"Quote fields containing whitespace as if they were strings in C source code;"
-" i.e., surrounded by double-quotes and with backslash escapes. Use 40 \"0\""
-" characters or the empty string to specify a zero value. To specify a "
+"Quote fields containing whitespace as if they were strings in C source code; "
+"i.e., surrounded by double-quotes and with backslash escapes. Use 40 \"0\" "
+"characters or the empty string to specify a zero value. To specify a "
"missing value, omit the value and its preceding SP entirely."
msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:80
msgid ""
-"Alternatively, use `-z` to specify in NUL-terminated format, without "
-"quoting:"
+"Alternatively, use `-z` to specify in NUL-terminated format, without quoting:"
msgstr ""
#. type: Plain text
@@ -63920,9 +63662,9 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:93
msgid ""
-"In either format, values can be specified in any form that Git recognizes as"
-" an object name. Commands in any other format or a repeated <ref> produce "
-"an error. Command meanings are:"
+"In either format, values can be specified in any form that Git recognizes as "
+"an object name. Commands in any other format or a repeated <ref> produce an "
+"error. Command meanings are:"
msgstr ""
#. type: Plain text
@@ -63949,8 +63691,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:107
msgid ""
-"Delete <ref> after verifying it exists with <oldvalue>, if given. If given,"
-" <oldvalue> may not be zero."
+"Delete <ref> after verifying it exists with <oldvalue>, if given. If given, "
+"<oldvalue> may not be zero."
msgstr ""
#. type: Labeled list
@@ -63962,8 +63704,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:111
msgid ""
-"Verify <ref> against <oldvalue> but do not change it. If <oldvalue> zero or"
-" missing, the ref must not exist."
+"Verify <ref> against <oldvalue> but do not change it. If <oldvalue> zero or "
+"missing, the ref must not exist."
msgstr ""
#. type: Labeled list
@@ -64001,8 +63743,8 @@ msgid ""
"under \"refs/heads/\", \"refs/remotes/\", \"refs/notes/\", or the symbolic "
"ref HEAD; or the file \"$GIT_DIR/logs/<ref>\" exists then `git update-ref` "
"will append a line to the log file \"$GIT_DIR/logs/<ref>\" (dereferencing "
-"all symbolic refs before creating the log name) describing the change in ref"
-" value. Log lines are formatted as:"
+"all symbolic refs before creating the log name) describing the change in ref "
+"value. Log lines are formatted as:"
msgstr ""
#. type: Plain text
@@ -64014,8 +63756,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-ref.txt:138
msgid ""
-"Where \"oldsha1\" is the 40 character hexadecimal value previously stored in"
-" <ref>, \"newsha1\" is the 40 character hexadecimal value of <newvalue> and "
+"Where \"oldsha1\" is the 40 character hexadecimal value previously stored in "
+"<ref>, \"newsha1\" is the 40 character hexadecimal value of <newvalue> and "
"\"committer\" is the committer's name, email address and date in the "
"standard Git committer ident format."
msgstr ""
@@ -64048,7 +63790,7 @@ msgstr ""
#. type: Title =
#: en/git-update-server-info.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-update-server-info(1)"
msgstr "git-update-server-info(1)"
@@ -64081,8 +63823,8 @@ msgstr ""
#. type: Plain text
#: en/git-update-server-info.txt:37
msgid ""
-"Currently the command updates the following files. Please see "
-"linkgit:gitrepository-layout[5] for description of what they are for:"
+"Currently the command updates the following files. Please see linkgit:"
+"gitrepository-layout[5] for description of what they are for:"
msgstr ""
#. type: Plain text
@@ -64097,7 +63839,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-archive.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-upload-archive(1)"
msgstr "git-upload-archive(1)"
@@ -64115,8 +63857,8 @@ msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:18
msgid ""
-"Invoked by 'git archive --remote' and sends a generated archive to the other"
-" end over the Git protocol."
+"Invoked by 'git archive --remote' and sends a generated archive to the other "
+"end over the Git protocol."
msgstr ""
#. type: Plain text
@@ -64147,8 +63889,8 @@ msgstr ""
#. type: Plain text
#: en/git-upload-archive.txt:35
msgid ""
-"Clients may request a commit or tree that is pointed to directly by a ref. "
-"E.g., `git archive --remote=origin v1.0`."
+"Clients may request a commit or tree that is pointed to directly by a ref. E."
+"g., `git archive --remote=origin v1.0`."
msgstr ""
#. type: Plain text
@@ -64162,8 +63904,8 @@ msgstr ""
#: en/git-upload-archive.txt:43
msgid ""
"Clients may _not_ use other sha1 expressions, even if the end result is "
-"reachable. E.g., neither a relative commit like `master^` nor a literal sha1"
-" like `abcd1234` is allowed, even if the result is reachable from the refs."
+"reachable. E.g., neither a relative commit like `master^` nor a literal sha1 "
+"like `abcd1234` is allowed, even if the result is reachable from the refs."
msgstr ""
#. type: Plain text
@@ -64179,8 +63921,8 @@ msgstr ""
#: en/git-upload-archive.txt:54
msgid ""
"If the config option `uploadArchive.allowUnreachable` is true, these rules "
-"are ignored, and clients may use arbitrary sha1 expressions. This is useful"
-" if you do not care about the privacy of unreachable objects, or if your "
+"are ignored, and clients may use arbitrary sha1 expressions. This is useful "
+"if you do not care about the privacy of unreachable objects, or if your "
"object database is already publicly available for access via non-smart-http."
msgstr ""
@@ -64191,7 +63933,7 @@ msgstr ""
#. type: Title =
#: en/git-upload-pack.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-upload-pack(1)"
msgstr "git-upload-pack(1)"
@@ -64226,7 +63968,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:28
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]strict"
msgstr "--[no-]strict"
@@ -64242,7 +63984,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:34
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--stateless-rpc"
msgstr "--stateless-rpc"
@@ -64256,7 +63998,7 @@ msgstr ""
#. type: Labeled list
#: en/git-upload-pack.txt:39
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--advertise-refs"
msgstr "--advertise-refs"
@@ -64275,13 +64017,12 @@ msgstr ""
#. type: Plain text
#: en/git-upload-pack.txt:50
-#, ignore-same
msgid "linkgit:gitnamespaces[7]"
msgstr "linkgit:gitnamespaces[7]"
#. type: Title =
#: en/git-var.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-var(1)"
msgstr "git-var(1)"
@@ -64306,8 +64047,8 @@ msgstr ""
msgid ""
"Cause the logical variables to be listed. In addition, all the variables of "
"the Git configuration file .git/config are listed as well. (However, the "
-"configuration variables listing functionality is deprecated in favor of `git"
-" config -l`.)"
+"configuration variables listing functionality is deprecated in favor of `git "
+"config -l`.)"
msgstr ""
#. type: Plain text
@@ -64326,7 +64067,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:34
-#, ignore-same, no-wrap
+#, no-wrap
msgid "GIT_AUTHOR_IDENT"
msgstr "GIT_AUTHOR_IDENT"
@@ -64337,7 +64078,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:37
-#, ignore-same, no-wrap
+#, no-wrap
msgid "GIT_COMMITTER_IDENT"
msgstr "GIT_COMMITTER_IDENT"
@@ -64348,7 +64089,7 @@ msgstr ""
#. type: Labeled list
#: en/git-var.txt:40
-#, ignore-same, no-wrap
+#, no-wrap
msgid "GIT_EDITOR"
msgstr "GIT_EDITOR"
@@ -64356,23 +64097,22 @@ msgstr "GIT_EDITOR"
#: en/git-var.txt:48
msgid ""
"Text editor for use by Git commands. The value is meant to be interpreted "
-"by the shell when it is used. Examples: `~/bin/vi`, "
-"`$SOME_ENVIRONMENT_VARIABLE`, `\"C:\\Program Files\\Vim\\gvim.exe\" "
-"--nofork`. The order of preference is the `$GIT_EDITOR` environment "
-"variable, then `core.editor` configuration, then `$VISUAL`, then `$EDITOR`, "
-"and then the default chosen at compile time, which is usually 'vi'."
+"by the shell when it is used. Examples: `~/bin/vi`, `"
+"$SOME_ENVIRONMENT_VARIABLE`, `\"C:\\Program Files\\Vim\\gvim.exe\" --"
+"nofork`. The order of preference is the `$GIT_EDITOR` environment variable, "
+"then `core.editor` configuration, then `$VISUAL`, then `$EDITOR`, and then "
+"the default chosen at compile time, which is usually 'vi'."
msgstr ""
#. type: Plain text
#: en/git-var.txt:50
#, no-wrap
-msgid ""
-" The build you are using chose '{git-default-editor}' as the default.\n"
+msgid " The build you are using chose '{git-default-editor}' as the default.\n"
msgstr ""
#. type: Labeled list
#: en/git-var.txt:52
-#, ignore-same, no-wrap
+#, no-wrap
msgid "GIT_PAGER"
msgstr "GIT_PAGER"
@@ -64388,19 +64128,17 @@ msgstr ""
#. type: Plain text
#: en/git-var.txt:60
#, no-wrap
-msgid ""
-" The build you are using chose '{git-default-pager}' as the default.\n"
+msgid " The build you are using chose '{git-default-pager}' as the default.\n"
msgstr ""
#. type: Plain text
#: en/git-var.txt:67
-#, ignore-same
msgid "linkgit:git-commit-tree[1] linkgit:git-tag[1] linkgit:git-config[1]"
msgstr "linkgit:git-commit-tree[1] linkgit:git-tag[1] linkgit:git-config[1]"
#. type: Title =
#: en/git-verify-commit.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-verify-commit(1)"
msgstr "git-verify-commit(1)"
@@ -64439,7 +64177,7 @@ msgstr ""
#. type: Title =
#: en/git-verify-pack.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-verify-pack(1)"
msgstr "git-verify-pack(1)"
@@ -64481,7 +64219,7 @@ msgstr ""
#. type: Labeled list
#: en/git-verify-pack.txt:32
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--stat-only"
msgstr "--stat-only"
@@ -64527,7 +64265,7 @@ msgstr ""
#. type: Title =
#: en/git-verify-tag.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-verify-tag(1)"
msgstr "git-verify-tag(1)"
@@ -64743,8 +64481,8 @@ msgstr ""
#: en/git-web--browse.txt:67
msgid ""
"The web browser can be specified using a configuration variable passed with "
-"the -c (or --config) command-line option, or the `web.browser` configuration"
-" variable if the former is not used."
+"the -c (or --config) command-line option, or the `web.browser` configuration "
+"variable if the former is not used."
msgstr ""
#. type: Title ~
@@ -64774,8 +64512,8 @@ msgid ""
"When the browser, specified by options or configuration variables, is not "
"among the supported ones, then the corresponding `browser.<tool>.cmd` "
"configuration variable will be looked up. If this variable exists then 'git "
-"web{litdd}browse' will treat the specified tool as a custom command and will"
-" use a shell eval to run the command with the URLs passed as arguments."
+"web{litdd}browse' will treat the specified tool as a custom command and will "
+"use a shell eval to run the command with the URLs passed as arguments."
msgstr ""
#. type: Title -
@@ -64795,8 +64533,8 @@ msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:97
msgid ""
-"For consistency, we also try such a trick if 'browser.konqueror.path' is set"
-" to something like 'A_PATH_TO/konqueror'. That means we will try to launch "
+"For consistency, we also try such a trick if 'browser.konqueror.path' is set "
+"to something like 'A_PATH_TO/konqueror'. That means we will try to launch "
"'A_PATH_TO/kfmclient' instead."
msgstr ""
@@ -64825,8 +64563,8 @@ msgstr ""
#. type: Plain text
#: en/git-web--browse.txt:114
msgid ""
-"Note that these configuration variables should probably be set using the "
-"`--global` flag, for example like this:"
+"Note that these configuration variables should probably be set using the `--"
+"global` flag, for example like this:"
msgstr ""
#. type: delimited block -
@@ -64837,7 +64575,7 @@ msgstr ""
#. type: Title =
#: en/git-whatchanged.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-whatchanged(1)"
msgstr "git-whatchanged(1)"
@@ -64868,8 +64606,8 @@ msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:26
msgid ""
-"The command is kept primarily for historical reasons; fingers of many people"
-" who learned Git long before `git log` was invented by reading Linux kernel "
+"The command is kept primarily for historical reasons; fingers of many people "
+"who learned Git long before `git log` was invented by reading Linux kernel "
"mailing list are trained to type it."
msgstr ""
@@ -64882,8 +64620,8 @@ msgstr ""
#. type: Plain text
#: en/git-whatchanged.txt:34
msgid ""
-"Show as patches the commits since version 'v2.6.12' that changed any file in"
-" the include/scsi or drivers/scsi subdirectories"
+"Show as patches the commits since version 'v2.6.12' that changed any file in "
+"the include/scsi or drivers/scsi subdirectories"
msgstr ""
#. type: Labeled list
@@ -64901,7 +64639,7 @@ msgstr ""
#. type: Title =
#: en/git-worktree.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-worktree(1)"
msgstr "git-worktree(1)"
@@ -64945,10 +64683,10 @@ msgstr ""
msgid ""
"If a working tree is deleted without using `git worktree remove`, then its "
"associated administrative files, which reside in the repository (see "
-"\"DETAILS\" below), will eventually be removed automatically (see "
-"`gc.worktreePruneExpire` in linkgit:git-config[1]), or you can run `git "
-"worktree prune` in the main or any linked working tree to clean up any stale"
-" administrative files."
+"\"DETAILS\" below), will eventually be removed automatically (see `gc."
+"worktreePruneExpire` in linkgit:git-config[1]), or you can run `git worktree "
+"prune` in the main or any linked working tree to clean up any stale "
+"administrative files."
msgstr ""
#. type: Plain text
@@ -65006,8 +64744,8 @@ msgstr ""
#: en/git-worktree.txt:87
msgid ""
"List details of each worktree. The main worktree is listed first, followed "
-"by each of the linked worktrees. The output details include if the worktree"
-" is bare, the revision currently checked out, and the branch currently "
+"by each of the linked worktrees. The output details include if the worktree "
+"is bare, the revision currently checked out, and the branch currently "
"checked out (or 'detached HEAD' if none)."
msgstr ""
@@ -65048,9 +64786,9 @@ msgstr ""
#: en/git-worktree.txt:111
msgid ""
"Remove a working tree. Only clean working trees (no untracked files and no "
-"modification in tracked files) can be removed. Unclean working trees or ones"
-" with submodules can be removed with `--force`. The main working tree cannot"
-" be removed."
+"modification in tracked files) can be removed. Unclean working trees or ones "
+"with submodules can be removed with `--force`. The main working tree cannot "
+"be removed."
msgstr ""
#. type: Labeled list
@@ -65071,8 +64809,8 @@ msgid ""
"is a branch name and is already checked out by another working tree, or if "
"`<path>` is already assigned to some working tree but is missing (for "
"instance, if `<path>` was deleted manually). This option overrides these "
-"safeguards. To add a missing but locked working tree path, specify `--force`"
-" twice."
+"safeguards. To add a missing but locked working tree path, specify `--force` "
+"twice."
msgstr ""
#. type: Plain text
@@ -65085,8 +64823,8 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:133
msgid ""
-"`remove` refuses to remove an unclean working tree unless `--force` is used."
-" To remove a locked working tree, specify `--force` twice."
+"`remove` refuses to remove an unclean working tree unless `--force` is "
+"used. To remove a locked working tree, specify `--force` twice."
msgstr ""
#. type: Labeled list
@@ -65106,8 +64844,8 @@ msgstr ""
msgid ""
"With `add`, create a new branch named `<new-branch>` starting at `<commit-"
"ish>`, and check out `<new-branch>` into the new working tree. If `<commit-"
-"ish>` is omitted, it defaults to HEAD. By default, `-b` refuses to create a"
-" new branch if it already exists. `-B` overrides this safeguard, resetting "
+"ish>` is omitted, it defaults to HEAD. By default, `-b` refuses to create a "
+"new branch if it already exists. `-B` overrides this safeguard, resetting "
"`<new-branch>` to `<commit-ish>`."
msgstr ""
@@ -65120,22 +64858,22 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:147
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]checkout"
msgstr "--[no-]checkout"
#. type: Plain text
#: en/git-worktree.txt:152
msgid ""
-"By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be"
-" used to suppress checkout in order to make customizations, such as "
+"By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can be "
+"used to suppress checkout in order to make customizations, such as "
"configuring sparse-checkout. See \"Sparse checkout\" in linkgit:git-read-"
"tree[1]."
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:153
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]guess-remote"
msgstr "--[no-]guess-remote"
@@ -65152,13 +64890,13 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:162
msgid ""
-"This can also be set up as the default behaviour by using the "
-"`worktree.guessRemote` config option."
+"This can also be set up as the default behaviour by using the `worktree."
+"guessRemote` config option."
msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:163
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]track"
msgstr "--[no-]track"
@@ -65173,7 +64911,7 @@ msgstr ""
#. type: Labeled list
#: en/git-worktree.txt:169
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--lock"
msgstr "--lock"
@@ -65186,16 +64924,15 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:178
-msgid ""
-"With `prune`, do not remove anything; just report what it would remove."
+msgid "With `prune`, do not remove anything; just report what it would remove."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:183
msgid ""
"With `list`, output in an easy-to-parse format for scripts. This format "
-"will remain stable across Git versions and regardless of user configuration."
-" See below for details."
+"will remain stable across Git versions and regardless of user "
+"configuration. See below for details."
msgstr ""
#. type: Plain text
@@ -65239,9 +64976,9 @@ msgstr ""
#: en/git-worktree.txt:206
msgid ""
"If the last path components in the working tree's path is unique among "
-"working trees, it can be used to identify worktrees. For example if you only"
-" have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then "
-"\"ghi\" or \"def/ghi\" is enough to point to the former working tree."
+"working trees, it can be used to identify worktrees. For example if you only "
+"have two working trees, at \"/abc/def/ghi\" and \"/abc/def/ggg\", then \"ghi"
+"\" or \"def/ghi\" is enough to point to the former working tree."
msgstr ""
#. type: Title -
@@ -65254,9 +64991,9 @@ msgstr ""
#: en/git-worktree.txt:213
msgid ""
"In multiple working trees, some refs may be shared between all working "
-"trees, some refs are local. One example is HEAD is different for all working"
-" trees. This section is about the sharing rules and how to access refs of "
-"one working tree from another."
+"trees, some refs are local. One example is HEAD is different for all working "
+"trees. This section is about the sharing rules and how to access refs of one "
+"working tree from another."
msgstr ""
#. type: Plain text
@@ -65280,19 +65017,19 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:231
msgid ""
-"For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to"
-" the same value as the main working tree's HEAD and refs/bisect/good "
-"respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad"
-" are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and "
-"GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad."
+"For example, main-worktree/HEAD or main-worktree/refs/bisect/good resolve to "
+"the same value as the main working tree's HEAD and refs/bisect/good "
+"respectively. Similarly, worktrees/foo/HEAD or worktrees/bar/refs/bisect/bad "
+"are the same as GIT_COMMON_DIR/worktrees/foo/HEAD and GIT_COMMON_DIR/"
+"worktrees/bar/refs/bisect/bad."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:235
msgid ""
"To access refs, it's best not to look inside GIT_DIR directly. Instead use "
-"commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which"
-" will handle refs correctly."
+"commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1] which "
+"will handle refs correctly."
msgstr ""
#. type: Plain text
@@ -65329,9 +65066,9 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:260
msgid ""
-"Note that in this file, the exception for `core.bare` and `core.worktree` is"
-" gone. If you have them in $GIT_DIR/config before, you must move them to the"
-" `config.worktree` of the main working tree. You may also take this "
+"Note that in this file, the exception for `core.bare` and `core.worktree` is "
+"gone. If you have them in $GIT_DIR/config before, you must move them to the "
+"`config.worktree` of the main working tree. You may also take this "
"opportunity to review and move other configuration that you do not want to "
"share to all working trees:"
msgstr ""
@@ -65362,9 +65099,9 @@ msgid ""
"the base name of the linked working tree's path, possibly appended with a "
"number to make it unique. For example, when `$GIT_DIR=/path/main/.git` the "
"command `git worktree add /path/other/test-next next` creates the linked "
-"working tree in `/path/other/test-next` and also creates a "
-"`$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1`"
-" if `test-next` is already taken)."
+"working tree in `/path/other/test-next` and also creates a `$GIT_DIR/"
+"worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1` if `test-"
+"next` is already taken)."
msgstr ""
#. type: Plain text
@@ -65372,9 +65109,9 @@ msgstr ""
msgid ""
"Within a linked working tree, $GIT_DIR is set to point to this private "
"directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and "
-"$GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR "
-"(e.g. `/path/main/.git`). These settings are made in a `.git` file located "
-"at the top directory of the linked working tree."
+"$GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR (e."
+"g. `/path/main/.git`). These settings are made in a `.git` file located at "
+"the top directory of the linked working tree."
msgstr ""
#. type: Plain text
@@ -65382,12 +65119,11 @@ msgstr ""
msgid ""
"Path resolution via `git rev-parse --git-path` uses either $GIT_DIR or "
"$GIT_COMMON_DIR depending on the path. For example, in the linked working "
-"tree `git rev-parse --git-path HEAD` returns "
-"`/path/main/.git/worktrees/test-next/HEAD` (not `/path/other/test-"
-"next/.git/HEAD` or `/path/main/.git/HEAD`) while `git rev-parse --git-path "
-"refs/heads/master` uses $GIT_COMMON_DIR and returns "
-"`/path/main/.git/refs/heads/master`, since refs are shared across all "
-"working trees, except refs/bisect and refs/worktree."
+"tree `git rev-parse --git-path HEAD` returns `/path/main/.git/worktrees/test-"
+"next/HEAD` (not `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) "
+"while `git rev-parse --git-path refs/heads/master` uses $GIT_COMMON_DIR and "
+"returns `/path/main/.git/refs/heads/master`, since refs are shared across "
+"all working trees, except refs/bisect and refs/worktree."
msgstr ""
#. type: Plain text
@@ -65404,30 +65140,29 @@ msgstr ""
msgid ""
"If you manually move a linked working tree, you need to update the 'gitdir' "
"file in the entry's directory. For example, if a linked working tree is "
-"moved to `/newpath/test-next` and its `.git` file points to "
-"`/path/main/.git/worktrees/test-next`, then update "
-"`/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-"
-"next` instead."
+"moved to `/newpath/test-next` and its `.git` file points to `/path/main/.git/"
+"worktrees/test-next`, then update `/path/main/.git/worktrees/test-next/"
+"gitdir` to reference `/newpath/test-next` instead."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:315
msgid ""
-"To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful"
-" in some situations, such as when the entry's working tree is stored on a "
+"To prevent a $GIT_DIR/worktrees entry from being pruned (which can be useful "
+"in some situations, such as when the entry's working tree is stored on a "
"portable device), use the `git worktree lock` command, which adds a file "
"named 'locked' to the entry's directory. The file contains the reason in "
-"plain text. For example, if a linked working tree's `.git` file points to "
-"`/path/main/.git/worktrees/test-next` then a file named "
-"`/path/main/.git/worktrees/test-next/locked` will prevent the `test-next` "
-"entry from being pruned. See linkgit:gitrepository-layout[5] for details."
+"plain text. For example, if a linked working tree's `.git` file points to `/"
+"path/main/.git/worktrees/test-next` then a file named `/path/main/.git/"
+"worktrees/test-next/locked` will prevent the `test-next` entry from being "
+"pruned. See linkgit:gitrepository-layout[5] for details."
msgstr ""
#. type: Plain text
#: en/git-worktree.txt:318
msgid ""
-"When extensions.worktreeConfig is enabled, the config file "
-"`.git/worktrees/<id>/config.worktree` is read after `.git/config` is."
+"When extensions.worktreeConfig is enabled, the config file `.git/worktrees/"
+"<id>/config.worktree` is read after `.git/config` is."
msgstr ""
#. type: Title -
@@ -65462,8 +65197,8 @@ msgstr ""
#. type: Plain text
#: en/git-worktree.txt:338
msgid ""
-"The porcelain format has a line per attribute. Attributes are listed with a"
-" label and value separated by a single space. Boolean attributes (like "
+"The porcelain format has a line per attribute. Attributes are listed with a "
+"label and value separated by a single space. Boolean attributes (like "
"'bare' and 'detached') are listed as a label only, and are only present if "
"and only if the value is true. The first attribute of a worktree is always "
"`worktree`, an empty line indicates the end of the record. For example:"
@@ -65500,13 +65235,13 @@ msgstr ""
#: en/git-worktree.txt:364
msgid ""
"You are in the middle of a refactoring session and your boss comes in and "
-"demands that you fix something immediately. You might typically use "
-"linkgit:git-stash[1] to store your changes away temporarily, however, your "
-"working tree is in such a state of disarray (with new, moved, and removed "
-"files, and other bits and pieces strewn around) that you don't want to risk "
-"disturbing any of it. Instead, you create a temporary linked working tree to"
-" make the emergency fix, remove it when done, and then resume your earlier "
-"refactoring session."
+"demands that you fix something immediately. You might typically use linkgit:"
+"git-stash[1] to store your changes away temporarily, however, your working "
+"tree is in such a state of disarray (with new, moved, and removed files, and "
+"other bits and pieces strewn around) that you don't want to risk disturbing "
+"any of it. Instead, you create a temporary linked working tree to make the "
+"emergency fix, remove it when done, and then resume your earlier refactoring "
+"session."
msgstr ""
#. type: delimited block -
@@ -65531,7 +65266,7 @@ msgstr ""
#. type: Title =
#: en/git-write-tree.txt:2
-#, ignore-same, no-wrap
+#, no-wrap
msgid "git-write-tree(1)"
msgstr "git-write-tree(1)"
@@ -65561,15 +65296,15 @@ msgstr ""
#. type: Plain text
#: en/git-write-tree.txt:26
msgid ""
-"Conceptually, 'git write-tree' sync()s the current index contents into a set"
-" of tree files. In order to have that match what is actually in your "
-"directory right now, you need to have done a 'git update-index' phase before"
-" you did the 'git write-tree'."
+"Conceptually, 'git write-tree' sync()s the current index contents into a set "
+"of tree files. In order to have that match what is actually in your "
+"directory right now, you need to have done a 'git update-index' phase before "
+"you did the 'git write-tree'."
msgstr ""
#. type: Labeled list
#: en/git-write-tree.txt:30
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--missing-ok"
msgstr "--missing-ok"
@@ -65583,8 +65318,8 @@ msgstr ""
#. type: Plain text
#: en/git-write-tree.txt:39
msgid ""
-"Writes a tree object that represents a subdirectory `<prefix>`. This can be"
-" used to write the tree object for a subproject that is in the named "
+"Writes a tree object that represents a subdirectory `<prefix>`. This can be "
+"used to write the tree object for a subproject that is in the named "
"subdirectory."
msgstr ""
@@ -65613,10 +65348,10 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:23
msgid ""
-"Note that Git at the core level treats path names simply as sequences of "
-"non-NUL bytes, there are no path name encoding conversions (except on Mac "
-"and Windows). Therefore, using non-ASCII path names will mostly work even on"
-" platforms and file systems that use legacy extended ASCII encodings. "
+"Note that Git at the core level treats path names simply as sequences of non-"
+"NUL bytes, there are no path name encoding conversions (except on Mac and "
+"Windows). Therefore, using non-ASCII path names will mostly work even on "
+"platforms and file systems that use legacy extended ASCII encodings. "
"However, repositories created on such systems will not work properly on "
"UTF-8-based systems (e.g. Linux, Mac, Windows) and vice versa. "
"Additionally, many Git-based tools simply assume path names to be UTF-8 and "
@@ -65626,20 +65361,20 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:29
msgid ""
-"Commit log messages are typically encoded in UTF-8, but other extended ASCII"
-" encodings are also supported. This includes ISO-8859-x, CP125x and many "
-"others, but _not_ UTF-16/32, EBCDIC and CJK multi-byte encodings (GBK, "
-"Shift-JIS, Big5, EUC-x, CP9xx etc.)."
+"Commit log messages are typically encoded in UTF-8, but other extended ASCII "
+"encodings are also supported. This includes ISO-8859-x, CP125x and many "
+"others, but _not_ UTF-16/32, EBCDIC and CJK multi-byte encodings (GBK, Shift-"
+"JIS, Big5, EUC-x, CP9xx etc.)."
msgstr ""
#. type: Plain text
#: en/i18n.txt:36
msgid ""
"Although we encourage that the commit log messages are encoded in UTF-8, "
-"both the core and Git Porcelain are designed not to force UTF-8 on projects."
-" If all participants of a particular project find it more convenient to use"
-" legacy encodings, Git does not forbid it. However, there are a few things "
-"to keep in mind."
+"both the core and Git Porcelain are designed not to force UTF-8 on "
+"projects. If all participants of a particular project find it more "
+"convenient to use legacy encodings, Git does not forbid it. However, there "
+"are a few things to keep in mind."
msgstr ""
#. type: Plain text
@@ -65662,19 +65397,19 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:52
msgid ""
-"Commit objects created with the above setting record the value of "
-"`i18n.commitEncoding` in its `encoding` header. This is to help other "
-"people who look at them later. Lack of this header implies that the commit "
-"log message is encoded in UTF-8."
+"Commit objects created with the above setting record the value of `i18n."
+"commitEncoding` in its `encoding` header. This is to help other people who "
+"look at them later. Lack of this header implies that the commit log message "
+"is encoded in UTF-8."
msgstr ""
#. type: Plain text
#: en/i18n.txt:58
msgid ""
-"'git log', 'git show', 'git blame' and friends look at the `encoding` header"
-" of a commit object, and try to re-code the log message into UTF-8 unless "
-"otherwise specified. You can specify the desired output encoding with "
-"`i18n.logOutputEncoding` in `.git/config` file, like this:"
+"'git log', 'git show', 'git blame' and friends look at the `encoding` header "
+"of a commit object, and try to re-code the log message into UTF-8 unless "
+"otherwise specified. You can specify the desired output encoding with `i18n."
+"logOutputEncoding` in `.git/config` file, like this:"
msgstr ""
#. type: delimited block -
@@ -65688,16 +65423,16 @@ msgstr ""
#. type: Plain text
#: en/i18n.txt:66
msgid ""
-"If you do not have this configuration variable, the value of "
-"`i18n.commitEncoding` is used instead."
+"If you do not have this configuration variable, the value of `i18n."
+"commitEncoding` is used instead."
msgstr ""
#. type: Plain text
#: en/i18n.txt:70
msgid ""
-"Note that we deliberately chose not to re-code the commit log message when a"
-" commit is made to force UTF-8 at the commit object level, because re-coding"
-" to UTF-8 is not necessarily a reversible operation."
+"Note that we deliberately chose not to re-code the commit log message when a "
+"commit is made to force UTF-8 at the commit object level, because re-coding "
+"to UTF-8 is not necessarily a reversible operation."
msgstr ""
#. type: Plain text
@@ -65713,8 +65448,8 @@ msgstr ""
#. type: Plain text
#: en/line-range-format.txt:7
msgid ""
-"If <start> or <end> is a number, it specifies an absolute line number (lines"
-" count from 1)."
+"If <start> or <end> is a number, it specifies an absolute line number (lines "
+"count from 1)."
msgstr ""
#. type: Plain text
@@ -65725,11 +65460,11 @@ msgstr ""
#. type: Plain text
#: en/line-range-format.txt:17
msgid ""
-"This form will use the first line matching the given POSIX regex. If <start>"
-" is a regex, it will search from the end of the previous `-L` range, if any,"
-" otherwise from the start of file. If <start> is ``^/regex/'', it will "
-"search from the start of file. If <end> is a regex, it will search starting"
-" at the line given by <start>."
+"This form will use the first line matching the given POSIX regex. If <start> "
+"is a regex, it will search from the end of the previous `-L` range, if any, "
+"otherwise from the start of file. If <start> is ``^/regex/'', it will "
+"search from the start of file. If <end> is a regex, it will search starting "
+"at the line given by <start>."
msgstr ""
#. type: Plain text
@@ -65759,8 +65494,8 @@ msgstr ""
msgid ""
"If the file `.mailmap` exists at the toplevel of the repository, or at the "
"location pointed to by the mailmap.file or mailmap.blob configuration "
-"options, it is used to map author and committer names and email addresses to"
-" canonical real names and email addresses."
+"options, it is used to map author and committer names and email addresses to "
+"canonical real names and email addresses."
msgstr ""
#. type: Plain text
@@ -65822,8 +65557,8 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:32
msgid ""
-"Example 1: Your history contains commits by two authors, Jane and Joe, whose"
-" names appear in the repository under several forms:"
+"Example 1: Your history contains commits by two authors, Jane and Joe, whose "
+"names appear in the repository under several forms:"
msgstr ""
#. type: delimited block -
@@ -65861,8 +65596,7 @@ msgstr ""
#. type: Plain text
#: en/mailmap.txt:55
-msgid ""
-"Example 2: Your repository contains commits from the following authors:"
+msgid "Example 2: Your repository contains commits from the following authors:"
msgstr ""
#. type: delimited block -
@@ -65903,16 +65637,16 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:5
msgid ""
-"Perform the merge and commit the result. This option can be used to override"
-" --no-commit."
+"Perform the merge and commit the result. This option can be used to override "
+"--no-commit."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:9
msgid ""
"With --no-commit perform the merge but pretend the merge failed and do not "
-"autocommit, to give the user a chance to inspect and further tweak the merge"
-" result before committing."
+"autocommit, to give the user a chance to inspect and further tweak the merge "
+"result before committing."
msgstr ""
#. type: Plain text
@@ -65936,8 +65670,8 @@ msgstr ""
#: en/merge-options.txt:29
msgid ""
"Older scripts may depend on the historical behaviour of not allowing the "
-"user to edit the merge log message. They will see an editor opened when they"
-" run `git merge`. To make it easier to adjust such scripts to the updated "
+"user to edit the merge log message. They will see an editor opened when they "
+"run `git merge`. To make it easier to adjust such scripts to the updated "
"behaviour, the environment variable `GIT_MERGE_AUTOEDIT` can be set to `no` "
"at the beginning of them."
msgstr ""
@@ -65953,21 +65687,21 @@ msgstr ""
#: en/merge-options.txt:40
msgid ""
"Create a merge commit even when the merge resolves as a fast-forward. This "
-"is the default behaviour when merging an annotated (and possibly signed) tag"
-" that is not stored in its natural place in 'refs/tags/' hierarchy."
+"is the default behaviour when merging an annotated (and possibly signed) tag "
+"that is not stored in its natural place in 'refs/tags/' hierarchy."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:41
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ff-only"
msgstr "--ff-only"
#. type: Plain text
#: en/merge-options.txt:45
msgid ""
-"Refuse to merge and exit with a non-zero status unless the current `HEAD` is"
-" already up to date or the merge can be resolved as a fast-forward."
+"Refuse to merge and exit with a non-zero status unless the current `HEAD` is "
+"already up to date or the merge can be resolved as a fast-forward."
msgstr ""
#. type: Plain text
@@ -65982,8 +65716,8 @@ msgstr ""
#: en/merge-options.txt:57
msgid ""
"In addition to branch names, populate the log message with one-line "
-"descriptions from at most <n> actual commits that are being merged. See also"
-" linkgit:git-fmt-merge-msg[1]."
+"descriptions from at most <n> actual commits that are being merged. See also "
+"linkgit:git-fmt-merge-msg[1]."
msgstr ""
#. type: Plain text
@@ -65995,7 +65729,7 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:62
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-signoff"
msgstr "--no-signoff"
@@ -66018,21 +65752,21 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:81
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--squash"
msgstr "--squash"
#. type: Labeled list
#: en/merge-options.txt:82
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-squash"
msgstr "--no-squash"
#. type: Plain text
#: en/merge-options.txt:90
msgid ""
-"Produce the working tree and index state as if a real merge happened (except"
-" for the merge information), but do not actually make a commit, move the "
+"Produce the working tree and index state as if a real merge happened (except "
+"for the merge information), but do not actually make a commit, move the "
"`HEAD`, or record `$GIT_DIR/MERGE_HEAD` (to cause the next `git commit` "
"command to create a merge commit). This allows you to create a single "
"commit on top of the current branch whose effect is the same as merging "
@@ -66042,15 +65776,15 @@ msgstr ""
#. type: Plain text
#: en/merge-options.txt:93
msgid ""
-"With --no-squash perform the merge and commit the result. This option can be"
-" used to override --squash."
+"With --no-squash perform the merge and commit the result. This option can be "
+"used to override --squash."
msgstr ""
#. type: Plain text
#: en/merge-options.txt:101
msgid ""
-"Use the given merge strategy; can be supplied more than once to specify them"
-" in the order they should be tried. If there is no `-s` option, a built-in "
+"Use the given merge strategy; can be supplied more than once to specify them "
+"in the order they should be tried. If there is no `-s` option, a built-in "
"list of strategies is used instead ('git merge-recursive' when merging a "
"single head, 'git merge-octopus' otherwise)."
msgstr ""
@@ -66068,13 +65802,13 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:107
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--verify-signatures"
msgstr "--verify-signatures"
#. type: Labeled list
#: en/merge-options.txt:108
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-verify-signatures"
msgstr "--no-verify-signatures"
@@ -66082,14 +65816,14 @@ msgstr "--no-verify-signatures"
#: en/merge-options.txt:114
msgid ""
"Verify that the tip commit of the side branch being merged is signed with a "
-"valid key, i.e. a key that has a valid uid: in the default trust model, this"
-" means the signing key has been signed by a trusted key. If the tip commit "
+"valid key, i.e. a key that has a valid uid: in the default trust model, this "
+"means the signing key has been signed by a trusted key. If the tip commit "
"of the side branch is not signed with a valid key, the merge is aborted."
msgstr ""
#. type: Labeled list
#: en/merge-options.txt:116
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-summary"
msgstr "--no-summary"
@@ -66115,17 +65849,17 @@ msgstr ""
#. type: Labeled list
#: en/merge-options.txt:138
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--allow-unrelated-histories"
msgstr "--allow-unrelated-histories"
#. type: Plain text
#: en/merge-options.txt:144
msgid ""
-"By default, `git merge` command refuses to merge histories that do not share"
-" a common ancestor. This option can be used to override this safety when "
-"merging histories of two projects that started their lives independently. As"
-" that is a very rare occasion, no configuration variable to enable this by "
+"By default, `git merge` command refuses to merge histories that do not share "
+"a common ancestor. This option can be used to override this safety when "
+"merging histories of two projects that started their lives independently. As "
+"that is a very rare occasion, no configuration variable to enable this by "
"default exists and will not be added."
msgstr ""
@@ -66138,10 +65872,10 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:8
msgid ""
-"The merge mechanism (`git merge` and `git pull` commands) allows the backend"
-" 'merge strategies' to be chosen with `-s` option. Some strategies can also"
-" take their own options, which can be passed by giving `-X<option>` "
-"arguments to `git merge` and/or `git pull`."
+"The merge mechanism (`git merge` and `git pull` commands) allows the backend "
+"'merge strategies' to be chosen with `-s` option. Some strategies can also "
+"take their own options, which can be passed by giving `-X<option>` arguments "
+"to `git merge` and/or `git pull`."
msgstr ""
#. type: Labeled list
@@ -66170,13 +65904,13 @@ msgstr ""
msgid ""
"This can only resolve two heads using a 3-way merge algorithm. When there "
"is more than one common ancestor that can be used for 3-way merge, it "
-"creates a merged tree of the common ancestors and uses that as the reference"
-" tree for the 3-way merge. This has been reported to result in fewer merge "
+"creates a merged tree of the common ancestors and uses that as the reference "
+"tree for the 3-way merge. This has been reported to result in fewer merge "
"conflicts without causing mismerges by tests done on actual merge commits "
"taken from Linux 2.6 kernel development history. Additionally this can "
-"detect and handle merges involving renames, but currently cannot make use of"
-" detected copies. This is the default merge strategy when pulling or "
-"merging one branch."
+"detect and handle merges involving renames, but currently cannot make use of "
+"detected copies. This is the default merge strategy when pulling or merging "
+"one branch."
msgstr ""
#. type: Plain text
@@ -66193,8 +65927,8 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:37
msgid ""
-"This option forces conflicting hunks to be auto-resolved cleanly by favoring"
-" 'our' version. Changes from the other tree that do not conflict with our "
+"This option forces conflicting hunks to be auto-resolved cleanly by favoring "
+"'our' version. Changes from the other tree that do not conflict with our "
"side are reflected to the merge result. For a binary file, the entire "
"contents are taken from our side."
msgstr ""
@@ -66204,8 +65938,7 @@ msgstr ""
msgid ""
"This should not be confused with the 'ours' merge strategy, which does not "
"even look at what the other tree contains at all. It discards everything "
-"the other tree did, declaring 'our' history contains all that happened in "
-"it."
+"the other tree did, declaring 'our' history contains all that happened in it."
msgstr ""
#. type: Labeled list
@@ -66246,8 +65979,8 @@ msgstr ""
#: en/merge-strategies.txt:58
msgid ""
"Tells 'merge-recursive' to use a different diff algorithm, which can help "
-"avoid mismerges that occur due to unimportant matching lines (such as braces"
-" from distinct functions). See also linkgit:git-diff[1] `--diff-algorithm`."
+"avoid mismerges that occur due to unimportant matching lines (such as braces "
+"from distinct functions). See also linkgit:git-diff[1] `--diff-algorithm`."
msgstr ""
#. type: Labeled list
@@ -66261,8 +65994,8 @@ msgstr ""
msgid ""
"Treats lines with the indicated type of whitespace change as unchanged for "
"the sake of a three-way merge. Whitespace changes mixed with other changes "
-"to a line are not ignored. See also linkgit:git-diff[1] `-b`, `-w`, "
-"`--ignore-space-at-eol`, and `--ignore-cr-at-eol`."
+"to a line are not ignored. See also linkgit:git-diff[1] `-b`, `-w`, `--"
+"ignore-space-at-eol`, and `--ignore-cr-at-eol`."
msgstr ""
#. type: Plain text
@@ -66335,9 +66068,9 @@ msgstr ""
#. type: Plain text
#: en/merge-strategies.txt:97
msgid ""
-"Turn on rename detection, optionally setting the similarity threshold. This"
-" is the default. This overrides the 'merge.renames' configuration variable."
-" See also linkgit:git-diff[1] `--find-renames`."
+"Turn on rename detection, optionally setting the similarity threshold. This "
+"is the default. This overrides the 'merge.renames' configuration variable. "
+"See also linkgit:git-diff[1] `--find-renames`."
msgstr ""
#. type: Labeled list
@@ -66387,8 +66120,8 @@ msgid ""
"This resolves any number of heads, but the resulting tree of the merge is "
"always that of the current branch head, effectively ignoring all changes "
"from all other branches. It is meant to be used to supersede old "
-"development history of side branches. Note that this is different from the "
-"-Xours option to the 'recursive' merge strategy."
+"development history of side branches. Note that this is different from the -"
+"Xours option to the 'recursive' merge strategy."
msgstr ""
#. type: Labeled list
@@ -66420,151 +66153,126 @@ msgstr ""
#. type: Plain text
#: en/mergetools-merge.txt:2
-#, ignore-same
msgid "araxis"
msgstr "araxis"
#. type: Plain text
#: en/mergetools-merge.txt:3
-#, ignore-same
msgid "bc"
msgstr "bc"
#. type: Plain text
#: en/mergetools-merge.txt:4
-#, ignore-same
msgid "bc3"
msgstr "bc3"
#. type: Plain text
#: en/mergetools-merge.txt:5
-#, ignore-same
msgid "codecompare"
msgstr "codecompare"
#. type: Plain text
#: en/mergetools-merge.txt:6
-#, ignore-same
msgid "deltawalker"
msgstr "deltawalker"
#. type: Plain text
#: en/mergetools-merge.txt:7
-#, ignore-same
msgid "diffmerge"
msgstr "diffmerge"
#. type: Plain text
#: en/mergetools-merge.txt:8
-#, ignore-same
msgid "diffuse"
msgstr "diffuse"
#. type: Plain text
#: en/mergetools-merge.txt:9
-#, ignore-same
msgid "ecmerge"
msgstr "ecmerge"
#. type: Plain text
#: en/mergetools-merge.txt:10
-#, ignore-same
msgid "emerge"
msgstr "emerge"
#. type: Plain text
#: en/mergetools-merge.txt:11
-#, ignore-same
msgid "examdiff"
msgstr "examdiff"
#. type: Plain text
#: en/mergetools-merge.txt:12
-#, ignore-same
msgid "guiffy"
msgstr "guiffy"
#. type: Plain text
#: en/mergetools-merge.txt:13
-#, ignore-same
msgid "gvimdiff"
msgstr "gvimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:14
-#, ignore-same
msgid "gvimdiff2"
msgstr "gvimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:15
-#, ignore-same
msgid "gvimdiff3"
msgstr "gvimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:16
-#, ignore-same
msgid "kdiff3"
msgstr "kdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:17
-#, ignore-same
msgid "meld"
msgstr "meld"
#. type: Plain text
#: en/mergetools-merge.txt:18
-#, ignore-same
msgid "opendiff"
msgstr "opendiff"
#. type: Plain text
#: en/mergetools-merge.txt:19
-#, ignore-same
msgid "p4merge"
msgstr "p4merge"
#. type: Plain text
#: en/mergetools-merge.txt:20
-#, ignore-same
msgid "tkdiff"
msgstr "tkdiff"
#. type: Plain text
#: en/mergetools-merge.txt:21
-#, ignore-same
msgid "tortoisemerge"
msgstr "tortoisemerge"
#. type: Plain text
#: en/mergetools-merge.txt:22
-#, ignore-same
msgid "vimdiff"
msgstr "vimdiff"
#. type: Plain text
#: en/mergetools-merge.txt:23
-#, ignore-same
msgid "vimdiff2"
msgstr "vimdiff2"
#. type: Plain text
#: en/mergetools-merge.txt:24
-#, ignore-same
msgid "vimdiff3"
msgstr "vimdiff3"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same
msgid "winmerge"
msgstr "winmerge"
#. type: Plain text
#: en/mergetools-merge.txt:25
-#, ignore-same
msgid "xxdiff"
msgstr "xxdiff"
@@ -66577,10 +66285,10 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:13
msgid ""
-"If the commit is a merge, and if the pretty-format is not 'oneline', 'email'"
-" or 'raw', an additional line is inserted before the 'Author:' line. This "
-"line begins with \"Merge: \" and the sha1s of ancestral commits are printed,"
-" separated by spaces. Note that the listed commits may not necessarily be "
+"If the commit is a merge, and if the pretty-format is not 'oneline', 'email' "
+"or 'raw', an additional line is inserted before the 'Author:' line. This "
+"line begins with \"Merge: \" and the sha1s of ancestral commits are printed, "
+"separated by spaces. Note that the listed commits may not necessarily be "
"the list of the *direct* parent commits if you have limited your view of "
"history: for example, if you are only interested in changes related to a "
"certain directory or file."
@@ -66589,8 +66297,8 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:20
msgid ""
-"There are several built-in formats, and you can define additional formats by"
-" setting a pretty.<name> config option to either another format name, or a "
+"There are several built-in formats, and you can define additional formats by "
+"setting a pretty.<name> config option to either another format name, or a "
"'format:' string, as described below (see linkgit:git-config[1]). Here are "
"the details of the built-in formats:"
msgstr ""
@@ -66705,8 +66413,8 @@ msgstr ""
#: en/pretty-formats.txt:86
msgid ""
"The 'raw' format shows the entire commit exactly as stored in the commit "
-"object. Notably, the SHA-1s are displayed in full, regardless of whether "
-"--abbrev or --no-abbrev are used, and 'parents' information show the true "
+"object. Notably, the SHA-1s are displayed in full, regardless of whether --"
+"abbrev or --no-abbrev are used, and 'parents' information show the true "
"parent commits, without taking grafts or history simplification into "
"account. Note that this format affects the way commits are displayed, but "
"not the way the diff is shown e.g. with `git log --raw`. To get full object "
@@ -66940,10 +66648,10 @@ msgstr ""
#: en/pretty-formats.txt:156
msgid ""
"'%G?': show \"G\" for a good (valid) signature, \"B\" for a bad signature, "
-"\"U\" for a good signature with unknown validity, \"X\" for a good signature"
-" that has expired, \"Y\" for a good signature made by an expired key, \"R\" "
-"for a good signature made by a revoked key, \"E\" if the signature cannot be"
-" checked (e.g. missing key) and \"N\" for no signature"
+"\"U\" for a good signature with unknown validity, \"X\" for a good signature "
+"that has expired, \"Y\" for a good signature made by an expired key, \"R\" "
+"for a good signature made by a revoked key, \"E\" if the signature cannot be "
+"checked (e.g. missing key) and \"N\" for no signature"
msgstr ""
#. type: Plain text
@@ -66964,8 +66672,8 @@ msgstr ""
#. type: Plain text
#: en/pretty-formats.txt:161
msgid ""
-"'%GP': show the fingerprint of the primary key whose subkey was used to sign"
-" a signed commit"
+"'%GP': show the fingerprint of the primary key whose subkey was used to sign "
+"a signed commit"
msgstr ""
#. type: Plain text
@@ -67038,14 +66746,14 @@ msgstr ""
#: en/pretty-formats.txt:192
msgid ""
"'%C(...)': color specification, as described under Values in the "
-"\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors"
-" are shown only when enabled for log output (by `color.diff`, `color.ui`, or"
-" `--color`, and respecting the `auto` settings of the former if we are going"
-" to a terminal). `%C(auto,...)` is accepted as a historical synonym for the "
+"\"CONFIGURATION FILE\" section of linkgit:git-config[1]. By default, colors "
+"are shown only when enabled for log output (by `color.diff`, `color.ui`, or "
+"`--color`, and respecting the `auto` settings of the former if we are going "
+"to a terminal). `%C(auto,...)` is accepted as a historical synonym for the "
"default (e.g., `%C(auto,red)`). Specifying `%C(always,...)` will show the "
"colors even when color is not otherwise enabled (though consider just using "
-"`--color=always` to enable color for the whole output, including this format"
-" and anything else git might color). `auto` alone (i.e. `%C(auto)`) will "
+"`--color=always` to enable color for the whole output, including this format "
+"and anything else git might color). `auto` alone (i.e. `%C(auto)`) will "
"turn on auto coloring on the next placeholders until the color is switched "
"again."
msgstr ""
@@ -67131,10 +66839,10 @@ msgstr ""
#: en/pretty-formats.txt:226
msgid ""
"Some placeholders may depend on other options given to the revision "
-"traversal engine. For example, the `%g*` reflog options will insert an empty"
-" string unless we are traversing reflog entries (e.g., by `git log -g`). The"
-" `%d` and `%D` placeholders will use the \"short\" decoration format if "
-"`--decorate` was not already provided on the command line."
+"traversal engine. For example, the `%g*` reflog options will insert an empty "
+"string unless we are traversing reflog entries (e.g., by `git log -g`). The `"
+"%d` and `%D` placeholders will use the \"short\" decoration format if `--"
+"decorate` was not already provided on the command line."
msgstr ""
#. type: Plain text
@@ -67157,8 +66865,8 @@ msgstr ""
#: en/pretty-formats.txt:238
msgid ""
"If you add a ` ` (space) after '%' of a placeholder, a space is inserted "
-"immediately before the expansion if and only if the placeholder expands to a"
-" non-empty string."
+"immediately before the expansion if and only if the placeholder expands to a "
+"non-empty string."
msgstr ""
#. type: Plain text
@@ -67170,8 +66878,8 @@ msgstr ""
#: en/pretty-formats.txt:248
msgid ""
"The 'tformat:' format works exactly like 'format:', except that it provides "
-"\"terminator\" semantics instead of \"separator\" semantics. In other words,"
-" each commit has the message terminator character (usually a newline) "
+"\"terminator\" semantics instead of \"separator\" semantics. In other words, "
+"each commit has the message terminator character (usually a newline) "
"appended, rather than a separator placed between entries. This means that "
"the final entry of a single-line format will be properly terminated with a "
"new line, just as the \"oneline\" format does. For example:"
@@ -67244,7 +66952,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:17
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--abbrev-commit"
msgstr "--abbrev-commit"
@@ -67265,16 +66973,16 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:26
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-abbrev-commit"
msgstr "--no-abbrev-commit"
#. type: Plain text
#: en/pretty-options.txt:30
msgid ""
-"Show the full 40-byte hexadecimal commit object name. This negates "
-"`--abbrev-commit` and those options which imply it such as \"--oneline\". It"
-" also overrides the `log.abbrevCommit` variable."
+"Show the full 40-byte hexadecimal commit object name. This negates `--abbrev-"
+"commit` and those options which imply it such as \"--oneline\". It also "
+"overrides the `log.abbrevCommit` variable."
msgstr ""
#. type: Plain text
@@ -67289,8 +66997,8 @@ msgid ""
"The commit objects record the encoding used for the log message in their "
"encoding header; this option can be used to tell the command to re-code the "
"commit log message in the encoding preferred by the user. For non plumbing "
-"commands this defaults to UTF-8. Note that if an object claims to be encoded"
-" in `X` and we are outputting in `X`, we will output the object verbatim; "
+"commands this defaults to UTF-8. Note that if an object claims to be encoded "
+"in `X` and we are outputting in `X`, we will output the object verbatim; "
"this means that invalid sequences in the original commit may be copied to "
"the output."
msgstr ""
@@ -67303,13 +67011,13 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:46
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--expand-tabs"
msgstr "--expand-tabs"
#. type: Labeled list
#: en/pretty-options.txt:47
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-expand-tabs"
msgstr "--no-expand-tabs"
@@ -67319,8 +67027,8 @@ msgid ""
"Perform a tab expansion (replace each tab with enough spaces to fill to the "
"next display column that is multiple of '<n>') in the log message before "
"showing it in the output. `--expand-tabs` is a short-hand for `--expand-"
-"tabs=8`, and `--no-expand-tabs` is a short-hand for `--expand-tabs=0`, which"
-" disables tab expansion."
+"tabs=8`, and `--no-expand-tabs` is a short-hand for `--expand-tabs=0`, which "
+"disables tab expansion."
msgstr ""
#. type: Plain text
@@ -67341,49 +67049,49 @@ msgstr ""
msgid ""
"Show the notes (see linkgit:git-notes[1]) that annotate the commit, when "
"showing the commit log message. This is the default for `git log`, `git "
-"show` and `git whatchanged` commands when there is no `--pretty`, "
-"`--format`, or `--oneline` option given on the command line."
+"show` and `git whatchanged` commands when there is no `--pretty`, `--"
+"format`, or `--oneline` option given on the command line."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:70
msgid ""
-"By default, the notes shown are from the notes refs listed in the "
-"`core.notesRef` and `notes.displayRef` variables (or corresponding "
-"environment overrides). See linkgit:git-config[1] for more details."
+"By default, the notes shown are from the notes refs listed in the `core."
+"notesRef` and `notes.displayRef` variables (or corresponding environment "
+"overrides). See linkgit:git-config[1] for more details."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:75
msgid ""
"With an optional '<treeish>' argument, use the treeish to find the notes to "
-"display. The treeish can specify the full refname when it begins with "
-"`refs/notes/`; when it begins with `notes/`, `refs/` and otherwise "
-"`refs/notes/` is prefixed to form a full name of the ref."
+"display. The treeish can specify the full refname when it begins with `refs/"
+"notes/`; when it begins with `notes/`, `refs/` and otherwise `refs/notes/` "
+"is prefixed to form a full name of the ref."
msgstr ""
#. type: Plain text
#: en/pretty-options.txt:80
msgid ""
"Multiple --notes options can be combined to control which notes are being "
-"displayed. Examples: \"--notes=foo\" will show only notes from "
-"\"refs/notes/foo\"; \"--notes=foo --notes\" will show both notes from "
-"\"refs/notes/foo\" and from the default notes ref(s)."
+"displayed. Examples: \"--notes=foo\" will show only notes from \"refs/notes/"
+"foo\"; \"--notes=foo --notes\" will show both notes from \"refs/notes/foo\" "
+"and from the default notes ref(s)."
msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:81
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-notes"
msgstr "--no-notes"
#. type: Plain text
#: en/pretty-options.txt:87
msgid ""
-"Do not show notes. This negates the above `--notes` option, by resetting the"
-" list of notes refs from which notes are shown. Options are parsed in the "
-"order given on the command line, so e.g. \"--notes --notes=foo --no-notes "
-"--notes=bar\" will only show notes from \"refs/notes/bar\"."
+"Do not show notes. This negates the above `--notes` option, by resetting the "
+"list of notes refs from which notes are shown. Options are parsed in the "
+"order given on the command line, so e.g. \"--notes --notes=foo --no-notes --"
+"notes=bar\" will only show notes from \"refs/notes/bar\"."
msgstr ""
#. type: Labeled list
@@ -67394,7 +67102,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:89
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--[no-]standard-notes"
msgstr "--[no-]standard-notes"
@@ -67407,7 +67115,7 @@ msgstr ""
#. type: Labeled list
#: en/pretty-options.txt:94
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--show-signature"
msgstr "--show-signature"
@@ -67422,8 +67130,8 @@ msgstr ""
#: en/pull-fetch-param.txt:6
msgid ""
"The \"remote\" repository that is the source of a fetch or pull operation. "
-"This parameter can be either a URL (see the section <<URLS,GIT URLS>> below)"
-" or the name of a remote (see the section <<REMOTES,REMOTES>> below)."
+"This parameter can be either a URL (see the section <<URLS,GIT URLS>> below) "
+"or the name of a remote (see the section <<REMOTES,REMOTES>> below)."
msgstr ""
#. type: Labeled list
@@ -67468,8 +67176,8 @@ msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:31
msgid ""
-"The format of a <refspec> parameter is an optional plus `+`, followed by the"
-" source <src>, followed by a colon `:`, followed by the destination ref "
+"The format of a <refspec> parameter is an optional plus `+`, followed by the "
+"source <src>, followed by a colon `:`, followed by the destination ref "
"<dst>. The colon can be omitted when <dst> is empty. <src> is typically a "
"ref, but it can also be a fully spelled hex object name."
msgstr ""
@@ -67477,8 +67185,8 @@ msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:34
msgid ""
-"`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; it requests"
-" fetching everything up to the given tag."
+"`tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`; it requests "
+"fetching everything up to the given tag."
msgstr ""
#. type: Plain text
@@ -67495,8 +67203,8 @@ msgid ""
"namespace it's being fetched to, the type of object being fetched, and "
"whether the update is considered to be a fast-forward. Generally, the same "
"rules apply for fetching as when pushing, see the `<refspec>...` section of "
-"linkgit:git-push[1] for what those are. Exceptions to those rules particular"
-" to 'git fetch' are noted below."
+"linkgit:git-push[1] for what those are. Exceptions to those rules particular "
+"to 'git fetch' are noted below."
msgstr ""
#. type: Plain text
@@ -67513,19 +67221,18 @@ msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:59
msgid ""
-"Unlike when pushing with linkgit:git-push[1], any updates outside of "
-"`refs/{tags,heads}/*` will be accepted without `+` in the refspec (or "
-"`--force`), whether that's swapping e.g. a tree object for a blob, or a "
-"commit for another commit that's doesn't have the previous commit as an "
-"ancestor etc."
+"Unlike when pushing with linkgit:git-push[1], any updates outside of `refs/"
+"{tags,heads}/*` will be accepted without `+` in the refspec (or `--force`), "
+"whether that's swapping e.g. a tree object for a blob, or a commit for "
+"another commit that's doesn't have the previous commit as an ancestor etc."
msgstr ""
#. type: Plain text
#: en/pull-fetch-param.txt:63
msgid ""
"Unlike when pushing with linkgit:git-push[1], there is no configuration "
-"which'll amend these rules, and nothing like a `pre-fetch` hook analogous to"
-" the `pre-receive` hook."
+"which'll amend these rules, and nothing like a `pre-fetch` hook analogous to "
+"the `pre-receive` hook."
msgstr ""
#. type: Plain text
@@ -67534,8 +67241,8 @@ msgid ""
"As with pushing with linkgit:git-push[1], all of the rules described above "
"about what's not allowed as an update can be overridden by adding an the "
"optional leading `+` to a refspec (or using `--force` command line option). "
-"The only exception to this is that no amount of forcing will make the "
-"`refs/heads/*` namespace accept a non-commit object."
+"The only exception to this is that no amount of forcing will make the `refs/"
+"heads/*` namespace accept a non-commit object."
msgstr ""
#. type: Plain text
@@ -67559,8 +67266,8 @@ msgid ""
"in your configuration for a <repository> and running a 'git pull' command "
"without any explicit <refspec> parameters. <refspec>s listed explicitly on "
"the command line are always merged into the current branch after fetching. "
-"In other words, if you list more than one remote ref, 'git pull' will create"
-" an Octopus merge. On the other hand, if you do not list any explicit "
+"In other words, if you list more than one remote ref, 'git pull' will create "
+"an Octopus merge. On the other hand, if you do not list any explicit "
"<refspec> parameter on the command line, 'git pull' will fetch all the "
"<refspec>s it finds in the `remote.<repository>.fetch` configuration and "
"merge only the first <refspec> found into the current branch. This is "
@@ -67632,10 +67339,10 @@ msgstr ""
#: en/revisions.txt:33
msgid ""
"A symbolic ref name. E.g. 'master' typically means the commit object "
-"referenced by 'refs/heads/master'. If you happen to have both "
-"'heads/master' and 'tags/master', you can explicitly say 'heads/master' to "
-"tell Git which one you mean. When ambiguous, a '<refname>' is disambiguated"
-" by taking the first match in the following rules:"
+"referenced by 'refs/heads/master'. If you happen to have both 'heads/"
+"master' and 'tags/master', you can explicitly say 'heads/master' to tell Git "
+"which one you mean. When ambiguous, a '<refname>' is disambiguated by "
+"taking the first match in the following rules:"
msgstr ""
#. type: Plain text
@@ -67674,12 +67381,12 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:59
msgid ""
-"`HEAD` names the commit on which you based the changes in the working tree."
-" `FETCH_HEAD` records the branch which you fetched from a remote repository"
-" with your last `git fetch` invocation. `ORIG_HEAD` is created by commands "
-"that move your `HEAD` in a drastic way, to record the position of the `HEAD`"
-" before their operation, so that you can easily change the tip of the branch"
-" back to the state before you ran them. `MERGE_HEAD` records the commit(s) "
+"`HEAD` names the commit on which you based the changes in the working tree. "
+"`FETCH_HEAD` records the branch which you fetched from a remote repository "
+"with your last `git fetch` invocation. `ORIG_HEAD` is created by commands "
+"that move your `HEAD` in a drastic way, to record the position of the `HEAD` "
+"before their operation, so that you can easily change the tip of the branch "
+"back to the state before you ran them. `MERGE_HEAD` records the commit(s) "
"which you are merging into your branch when you run `git merge`. "
"`CHERRY_PICK_HEAD` records the commit which you are cherry-picking when you "
"run `git cherry-pick`."
@@ -67688,10 +67395,10 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:64
msgid ""
-"Note that any of the 'refs/*' cases above may come either from the "
-"'$GIT_DIR/refs' directory or from the '$GIT_DIR/packed-refs' file. While "
-"the ref name encoding is unspecified, UTF-8 is preferred as some output "
-"processing may assume ref names in UTF-8."
+"Note that any of the 'refs/*' cases above may come either from the '$GIT_DIR/"
+"refs' directory or from the '$GIT_DIR/packed-refs' file. While the ref name "
+"encoding is unspecified, UTF-8 is preferred as some output processing may "
+"assume ref names in UTF-8."
msgstr ""
#. type: Labeled list
@@ -67708,21 +67415,20 @@ msgstr ""
#. type: Labeled list
#: en/revisions.txt:68
#, no-wrap
-msgid ""
-"'<refname>@{<date>}', e.g. 'master@\\{yesterday\\}', 'HEAD@{5 minutes ago}'"
+msgid "'<refname>@{<date>}', e.g. 'master@\\{yesterday\\}', 'HEAD@{5 minutes ago}'"
msgstr ""
#. type: Plain text
#: en/revisions.txt:79
msgid ""
"A ref followed by the suffix '@' with a date specification enclosed in a "
-"brace pair (e.g. '\\{yesterday\\}', '{1 month 2 weeks 3 days 1 hour 1 second"
-" ago}' or '{1979-02-26 18:30:00}') specifies the value of the ref at a prior"
-" point in time. This suffix may only be used immediately following a ref "
+"brace pair (e.g. '\\{yesterday\\}', '{1 month 2 weeks 3 days 1 hour 1 second "
+"ago}' or '{1979-02-26 18:30:00}') specifies the value of the ref at a prior "
+"point in time. This suffix may only be used immediately following a ref "
"name and the ref must have an existing log ('$GIT_DIR/logs/<ref>'). Note "
-"that this looks up the state of your *local* ref at a given time; e.g., what"
-" was in your local 'master' branch last week. If you want to look at commits"
-" made during certain times, see `--since` and `--until`."
+"that this looks up the state of your *local* ref at a given time; e.g., what "
+"was in your local 'master' branch last week. If you want to look at commits "
+"made during certain times, see `--since` and `--until`."
msgstr ""
#. type: Labeled list
@@ -67734,8 +67440,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:88
msgid ""
-"A ref followed by the suffix '@' with an ordinal specification enclosed in a"
-" brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies the n-th prior value of "
+"A ref followed by the suffix '@' with an ordinal specification enclosed in a "
+"brace pair (e.g. '\\{1\\}', '\\{15\\}') specifies the n-th prior value of "
"that ref. For example 'master@\\{1\\}' is the immediate prior value of "
"'master' while 'master@\\{5\\}' is the 5th prior value of 'master'. This "
"suffix may only be used immediately following a ref name and the ref must "
@@ -67752,8 +67458,8 @@ msgstr ""
#: en/revisions.txt:93
msgid ""
"You can use the '@' construct with an empty ref part to get at a reflog "
-"entry of the current branch. For example, if you are on branch 'blabla' then"
-" '@\\{1\\}' means the same as 'blabla@\\{1\\}'."
+"entry of the current branch. For example, if you are on branch 'blabla' then "
+"'@\\{1\\}' means the same as 'blabla@\\{1\\}'."
msgstr ""
#. type: Labeled list
@@ -67765,8 +67471,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:97
msgid ""
-"The construct '@{-<n>}' means the <n>th branch/commit checked out before the"
-" current one."
+"The construct '@{-<n>}' means the <n>th branch/commit checked out before the "
+"current one."
msgstr ""
#. type: Labeled list
@@ -67778,12 +67484,12 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:105
msgid ""
-"The suffix '@\\{upstream\\}' to a branchname (short form "
-"'<branchname>@\\{u\\}') refers to the branch that the branch specified by "
-"branchname is set to build on top of (configured with `branch.<name>.remote`"
-" and `branch.<name>.merge`). A missing branchname defaults to the current "
-"one. These suffixes are also accepted when spelled in uppercase, and they "
-"mean the same thing no matter the case."
+"The suffix '@\\{upstream\\}' to a branchname (short form '<branchname>@\\{u"
+"\\}') refers to the branch that the branch specified by branchname is set "
+"to build on top of (configured with `branch.<name>.remote` and `branch."
+"<name>.merge`). A missing branchname defaults to the current one. These "
+"suffixes are also accepted when spelled in uppercase, and they mean the same "
+"thing no matter the case."
msgstr ""
#. type: Labeled list
@@ -67795,9 +67501,9 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:112
msgid ""
-"The suffix '@\\{push}' reports the branch \"where we would push to\" if `git"
-" push` were run while `branchname` was checked out (or the current `HEAD` if"
-" no branchname is specified). Since our push destination is in a remote "
+"The suffix '@\\{push}' reports the branch \"where we would push to\" if `git "
+"push` were run while `branchname` was checked out (or the current `HEAD` if "
+"no branchname is specified). Since our push destination is in a remote "
"repository, of course, we report the local tracking branch that corresponds "
"to that branch (i.e., something in 'refs/remotes/')."
msgstr ""
@@ -67835,9 +67541,9 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:130
msgid ""
-"Note in the example that we set up a triangular workflow, where we pull from"
-" one location and push to another. In a non-triangular workflow, '@\\{push}'"
-" is the same as '@\\{upstream}', and there is no need for it."
+"Note in the example that we set up a triangular workflow, where we pull from "
+"one location and push to another. In a non-triangular workflow, '@\\{push}' "
+"is the same as '@\\{upstream}', and there is no need for it."
msgstr ""
#. type: Plain text
@@ -67857,8 +67563,8 @@ msgstr ""
#: en/revisions.txt:141
msgid ""
"A suffix '{caret}' to a revision parameter means the first parent of that "
-"commit object. '{caret}<n>' means the <n>th parent (i.e. '<rev>{caret}' is"
-" equivalent to '<rev>{caret}1'). As a special rule, '<rev>{caret}0' means "
+"commit object. '{caret}<n>' means the <n>th parent (i.e. '<rev>{caret}' is "
+"equivalent to '<rev>{caret}1'). As a special rule, '<rev>{caret}0' means "
"the commit itself and is used when '<rev>' is the object name of a tag "
"object that refers to a commit object."
msgstr ""
@@ -67874,10 +67580,9 @@ msgstr ""
msgid ""
"A suffix '{tilde}<n>' to a revision parameter means the commit object that "
"is the <n>th generation ancestor of the named commit object, following only "
-"the first parents. I.e. '<rev>{tilde}3' is equivalent to "
-"'<rev>{caret}{caret}{caret}' which is equivalent to "
-"'<rev>{caret}1{caret}1{caret}1'. See below for an illustration of the usage"
-" of this form."
+"the first parents. I.e. '<rev>{tilde}3' is equivalent to '<rev>{caret}"
+"{caret}{caret}' which is equivalent to '<rev>{caret}1{caret}1{caret}1'. See "
+"below for an illustration of the usage of this form."
msgstr ""
#. type: Labeled list
@@ -67892,18 +67597,17 @@ msgid ""
"A suffix '{caret}' followed by an object type name enclosed in brace pair "
"means dereference the object at '<rev>' recursively until an object of type "
"'<type>' is found or the object cannot be dereferenced anymore (in which "
-"case, barf). For example, if '<rev>' is a commit-ish, "
-"'<rev>{caret}\\{commit\\}' describes the corresponding commit object. "
-"Similarly, if '<rev>' is a tree-ish, '<rev>{caret}\\{tree\\}' describes the "
-"corresponding tree object. '<rev>{caret}0' is a short-hand for "
-"'<rev>{caret}\\{commit\\}'."
+"case, barf). For example, if '<rev>' is a commit-ish, '<rev>{caret}\\{commit"
+"\\}' describes the corresponding commit object. Similarly, if '<rev>' is a "
+"tree-ish, '<rev>{caret}\\{tree\\}' describes the corresponding tree object. "
+"'<rev>{caret}0' is a short-hand for '<rev>{caret}\\{commit\\}'."
msgstr ""
#. type: Plain text
#: en/revisions.txt:166
msgid ""
-"'rev{caret}\\{object\\}' can be used to make sure 'rev' names an object that"
-" exists, without requiring 'rev' to be a tag, and without dereferencing "
+"'rev{caret}\\{object\\}' can be used to make sure 'rev' names an object that "
+"exists, without requiring 'rev' to be a tag, and without dereferencing "
"'rev'; because a tag is already an object, it does not have to be "
"dereferenced even once to get to an object."
msgstr ""
@@ -67924,8 +67628,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:175
msgid ""
-"A suffix '{caret}' followed by an empty brace pair means the object could be"
-" a tag, and dereference the tag recursively until a non-tag object is found."
+"A suffix '{caret}' followed by an empty brace pair means the object could be "
+"a tag, and dereference the tag recursively until a non-tag object is found."
msgstr ""
#. type: Labeled list
@@ -67939,8 +67643,8 @@ msgstr ""
msgid ""
"A suffix '{caret}' to a revision parameter, followed by a brace pair that "
"contains a text led by a slash, is the same as the ':/fix nasty bug' syntax "
-"below except that it returns the youngest matching commit which is reachable"
-" from the '<rev>' before '{caret}'."
+"below except that it returns the youngest matching commit which is reachable "
+"from the '<rev>' before '{caret}'."
msgstr ""
#. type: Labeled list
@@ -67957,8 +67661,8 @@ msgid ""
"the youngest matching commit which is reachable from any ref, including "
"HEAD. The regular expression can match any part of the commit message. To "
"match messages starting with a string, one can use e.g. ':/^foo'. The "
-"special sequence ':/!' is reserved for modifiers to what is matched. "
-"':/!-foo' performs a negative match, while ':/!!foo' matches a literal '!' "
+"special sequence ':/!' is reserved for modifiers to what is matched. ':/!-"
+"foo' performs a negative match, while ':/!!foo' matches a literal '!' "
"character, followed by 'foo'. Any other sequence beginning with ':/!' is "
"reserved for now. Depending on the given text, the shell's word splitting "
"rules might require additional quoting."
@@ -67976,11 +67680,11 @@ msgid ""
"A suffix ':' followed by a path names the blob or tree at the given path in "
"the tree-ish object named by the part before the colon. ':path' (with an "
"empty part before the colon) is a special case of the syntax described "
-"next: content recorded in the index at the given path. A path starting with"
-" './' or '../' is relative to the current working directory. The given path"
-" will be converted to be relative to the working tree's root directory. "
-"This is most useful to address a blob or tree from a commit or tree that has"
-" the same tree structure as the working tree."
+"next: content recorded in the index at the given path. A path starting with "
+"'./' or '../' is relative to the current working directory. The given path "
+"will be converted to be relative to the working tree's root directory. This "
+"is most useful to address a blob or tree from a commit or tree that has the "
+"same tree structure as the working tree."
msgstr ""
#. type: Labeled list
@@ -68050,8 +67754,8 @@ msgstr ""
#: en/revisions.txt:257
msgid ""
"For these commands, specifying a single revision, using the notation "
-"described in the previous section, means the set of commits `reachable` from"
-" the given commit."
+"described in the previous section, means the set of commits `reachable` from "
+"the given commit."
msgstr ""
#. type: Plain text
@@ -68077,8 +67781,8 @@ msgstr ""
#: en/revisions.txt:270
msgid ""
"To exclude commits reachable from a commit, a prefix '{caret}' notation is "
-"used. E.g. '{caret}r1 r2' means commits reachable from 'r2' but exclude the"
-" ones reachable from 'r1' (i.e. 'r1' and its ancestors)."
+"used. E.g. '{caret}r1 r2' means commits reachable from 'r2' but exclude the "
+"ones reachable from 'r1' (i.e. 'r1' and its ancestors)."
msgstr ""
#. type: Title ~
@@ -68114,19 +67818,19 @@ msgstr ""
msgid ""
"A similar notation 'r1\\...r2' is called symmetric difference of 'r1' and "
"'r2' and is defined as 'r1 r2 --not $(git merge-base --all r1 r2)'. It is "
-"the set of commits that are reachable from either one of 'r1' (left side) or"
-" 'r2' (right side) but not from both."
+"the set of commits that are reachable from either one of 'r1' (left side) or "
+"'r2' (right side) but not from both."
msgstr ""
#. type: Plain text
#: en/revisions.txt:294
msgid ""
-"In these two shorthand notations, you can omit one end and let it default to"
-" HEAD. For example, 'origin..' is a shorthand for 'origin..HEAD' and asks "
-"\"What did I do since I forked from the origin branch?\" Similarly, "
-"'..origin' is a shorthand for 'HEAD..origin' and asks \"What did the origin "
-"do since I forked from them?\" Note that '..' would mean 'HEAD..HEAD' which "
-"is an empty range that is both reachable and unreachable from HEAD."
+"In these two shorthand notations, you can omit one end and let it default to "
+"HEAD. For example, 'origin..' is a shorthand for 'origin..HEAD' and asks "
+"\"What did I do since I forked from the origin branch?\" Similarly, '.."
+"origin' is a shorthand for 'HEAD..origin' and asks \"What did the origin do "
+"since I forked from them?\" Note that '..' would mean 'HEAD..HEAD' which is "
+"an empty range that is both reachable and unreachable from HEAD."
msgstr ""
#. type: Title ~
@@ -68160,8 +67864,8 @@ msgid ""
"The '<rev>{caret}-<n>' notation includes '<rev>' but excludes the <n>th "
"parent (i.e. a shorthand for '<rev>{caret}<n>..<rev>'), with '<n>' = 1 if "
"not given. This is typically useful for merge commits where you can just "
-"pass '<commit>{caret}-' to get all the commits in the branch that was merged"
-" in merge commit '<commit>' (including '<commit>' itself)."
+"pass '<commit>{caret}-' to get all the commits in the branch that was merged "
+"in merge commit '<commit>' (including '<commit>' itself)."
msgstr ""
#. type: Plain text
@@ -68187,8 +67891,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:322
msgid ""
-"Include commits that are reachable from <rev> (i.e. <rev> and its "
-"ancestors)."
+"Include commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
msgstr ""
#. type: Labeled list
@@ -68200,8 +67903,7 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:326
msgid ""
-"Exclude commits that are reachable from <rev> (i.e. <rev> and its "
-"ancestors)."
+"Exclude commits that are reachable from <rev> (i.e. <rev> and its ancestors)."
msgstr ""
#. type: Labeled list
@@ -68214,8 +67916,8 @@ msgstr ""
#: en/revisions.txt:331
msgid ""
"Include commits that are reachable from <rev2> but exclude those that are "
-"reachable from <rev1>. When either <rev1> or <rev2> is omitted, it defaults"
-" to `HEAD`."
+"reachable from <rev1>. When either <rev1> or <rev2> is omitted, it defaults "
+"to `HEAD`."
msgstr ""
#. type: Labeled list
@@ -68241,8 +67943,8 @@ msgstr ""
#. type: Plain text
#: en/revisions.txt:341
msgid ""
-"A suffix '{caret}' followed by an at sign is the same as listing all parents"
-" of '<rev>' (meaning, include anything reachable from its parents, but not "
+"A suffix '{caret}' followed by an at sign is the same as listing all parents "
+"of '<rev>' (meaning, include anything reachable from its parents, but not "
"the commit itself)."
msgstr ""
@@ -68323,10 +68025,10 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:12
msgid ""
-"Using more options generally further limits the output (e.g. "
-"`--since=<date1>` limits to commits newer than `<date1>`, and using it with "
-"`--grep=<pattern>` further limits to commits whose log message has a line "
-"that matches `<pattern>`), unless otherwise noted."
+"Using more options generally further limits the output (e.g. `--"
+"since=<date1>` limits to commits newer than `<date1>`, and using it with `--"
+"grep=<pattern>` further limits to commits whose log message has a line that "
+"matches `<pattern>`), unless otherwise noted."
msgstr ""
#. type: Plain text
@@ -68437,9 +68139,9 @@ msgstr ""
#: en/rev-list-options.txt:45
msgid ""
"Limit the commits output to ones with author/committer header lines that "
-"match the specified pattern (regular expression). With more than one "
-"`--author=<pattern>`, commits whose author matches any of the given patterns"
-" are chosen (similarly for multiple `--committer=<pattern>`)."
+"match the specified pattern (regular expression). With more than one `--"
+"author=<pattern>`, commits whose author matches any of the given patterns "
+"are chosen (similarly for multiple `--committer=<pattern>`)."
msgstr ""
#. type: Labeled list
@@ -68466,8 +68168,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:59
msgid ""
-"Limit the commits output to ones with log message that matches the specified"
-" pattern (regular expression). With more than one `--grep=<pattern>`, "
+"Limit the commits output to ones with log message that matches the specified "
+"pattern (regular expression). With more than one `--grep=<pattern>`, "
"commits whose message matches any of the given patterns are chosen (but see "
"`--all-match`)."
msgstr ""
@@ -68488,7 +68190,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:69
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--invert-grep"
msgstr "--invert-grep"
@@ -68501,15 +68203,14 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:74
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--regexp-ignore-case"
msgstr "--regexp-ignore-case"
#. type: Plain text
#: en/rev-list-options.txt:77
msgid ""
-"Match the regular expression limiting patterns without regard to letter "
-"case."
+"Match the regular expression limiting patterns without regard to letter case."
msgstr ""
#. type: Plain text
@@ -68522,8 +68223,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:86
msgid ""
-"Consider the limiting patterns to be extended regular expressions instead of"
-" the default basic regular expressions."
+"Consider the limiting patterns to be extended regular expressions instead of "
+"the default basic regular expressions."
msgstr ""
#. type: Plain text
@@ -68541,7 +68242,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:101
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--remove-empty"
msgstr "--remove-empty"
@@ -68552,7 +68253,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:104
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--merges"
msgstr "--merges"
@@ -68564,7 +68265,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:107
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-merges"
msgstr "--no-merges"
@@ -68589,21 +68290,21 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:113
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-min-parents"
msgstr "--no-min-parents"
#. type: Labeled list
#: en/rev-list-options.txt:114
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--no-max-parents"
msgstr "--no-max-parents"
#. type: Plain text
#: en/rev-list-options.txt:119
msgid ""
-"Show only commits which have at least (or at most) that many parent commits."
-" In particular, `--max-parents=1` is the same as `--no-merges`, `--min-"
+"Show only commits which have at least (or at most) that many parent commits. "
+"In particular, `--max-parents=1` is the same as `--no-merges`, `--min-"
"parents=2` is the same as `--merges`. `--max-parents=0` gives all root "
"commits and `--min-parents=3` all octopus merges."
msgstr ""
@@ -68619,12 +68320,12 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:133
msgid ""
-"Follow only the first parent commit upon seeing a merge commit. This option"
-" can give a better overview when viewing the evolution of a particular topic"
-" branch, because merges into a topic branch tend to be only about adjusting "
+"Follow only the first parent commit upon seeing a merge commit. This option "
+"can give a better overview when viewing the evolution of a particular topic "
+"branch, because merges into a topic branch tend to be only about adjusting "
"to updated upstream from time to time, and this option allows you to ignore "
-"the individual commits brought in to your history by such a merge. Cannot be"
-" combined with --bisect."
+"the individual commits brought in to your history by such a merge. Cannot be "
+"combined with --bisect."
msgstr ""
#. type: Plain text
@@ -68650,10 +68351,10 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:147
msgid ""
-"Pretend as if all the refs in `refs/heads` are listed on the command line as"
-" '<commit>'. If '<pattern>' is given, limit branches to ones matching given "
-"shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the"
-" end is implied."
+"Pretend as if all the refs in `refs/heads` are listed on the command line as "
+"'<commit>'. If '<pattern>' is given, limit branches to ones matching given "
+"shell glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the "
+"end is implied."
msgstr ""
#. type: Labeled list
@@ -68666,8 +68367,8 @@ msgstr ""
#: en/rev-list-options.txt:153
msgid ""
"Pretend as if all the refs in `refs/tags` are listed on the command line as "
-"'<commit>'. If '<pattern>' is given, limit tags to ones matching given shell"
-" glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end "
+"'<commit>'. If '<pattern>' is given, limit tags to ones matching given shell "
+"glob. If pattern lacks '?', '{asterisk}', or '[', '/{asterisk}' at the end "
"is implied."
msgstr ""
@@ -68682,8 +68383,8 @@ msgstr ""
msgid ""
"Pretend as if all the refs in `refs/remotes` are listed on the command line "
"as '<commit>'. If '<pattern>' is given, limit remote-tracking branches to "
-"ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[',"
-" '/{asterisk}' at the end is implied."
+"ones matching given shell glob. If pattern lacks '?', '{asterisk}', or '[', "
+"'/{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
@@ -68697,13 +68398,13 @@ msgstr ""
msgid ""
"Pretend as if all the refs matching shell glob '<glob-pattern>' are listed "
"on the command line as '<commit>'. Leading 'refs/', is automatically "
-"prepended if missing. If pattern lacks '?', '{asterisk}', or '[', "
-"'/{asterisk}' at the end is implied."
+"prepended if missing. If pattern lacks '?', '{asterisk}', or '[', '/"
+"{asterisk}' at the end is implied."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:181
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--reflog"
msgstr "--reflog"
@@ -68717,8 +68418,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:192
msgid ""
-"By default, all working trees will be examined by the following options when"
-" there are more than one (see linkgit:git-worktree[1]): `--all`, `--reflog` "
+"By default, all working trees will be examined by the following options when "
+"there are more than one (see linkgit:git-worktree[1]): `--all`, `--reflog` "
"and `--indexed-objects`. This option forces them to examine the current "
"working tree only."
msgstr ""
@@ -68726,13 +68427,13 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:196
msgid ""
-"Upon seeing an invalid object name in the input, pretend as if the bad input"
-" was not given."
+"Upon seeing an invalid object name in the input, pretend as if the bad input "
+"was not given."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:198 en/rev-list-options.txt:578
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--bisect"
msgstr "--bisect"
@@ -68747,9 +68448,9 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:210
msgid ""
-"In addition to the '<commit>' listed on the command line, read them from the"
-" standard input. If a `--` separator is seen, stop reading commits and start"
-" reading paths to limit the result."
+"In addition to the '<commit>' listed on the command line, read them from the "
+"standard input. If a `--` separator is seen, stop reading commits and start "
+"reading paths to limit the result."
msgstr ""
#. type: Plain text
@@ -68757,26 +68458,26 @@ msgstr ""
msgid ""
"Don't print anything to standard output. This form is primarily meant to "
"allow the caller to test the exit status to see if a range of objects is "
-"fully connected (or not). It is faster than redirecting stdout to "
-"`/dev/null` as the output does not have to be formatted."
+"fully connected (or not). It is faster than redirecting stdout to `/dev/"
+"null` as the output does not have to be formatted."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:220
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--cherry-mark"
msgstr "--cherry-mark"
#. type: Plain text
#: en/rev-list-options.txt:223
msgid ""
-"Like `--cherry-pick` (see below) but mark equivalent commits with `=` rather"
-" than omitting them, and inequivalent ones with `+`."
+"Like `--cherry-pick` (see below) but mark equivalent commits with `=` rather "
+"than omitting them, and inequivalent ones with `+`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:224
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--cherry-pick"
msgstr "--cherry-pick"
@@ -68784,8 +68485,7 @@ msgstr "--cherry-pick"
#: en/rev-list-options.txt:228
msgid ""
"Omit any commit that introduces the same change as another commit on the "
-"``other side'' when the set of commits are limited with symmetric "
-"difference."
+"``other side'' when the set of commits are limited with symmetric difference."
msgstr ""
#. type: Plain text
@@ -68801,13 +68501,13 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:237
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--left-only"
msgstr "--left-only"
#. type: Labeled list
#: en/rev-list-options.txt:238
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--right-only"
msgstr "--right-only"
@@ -68821,15 +68521,15 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:248
msgid ""
-"For example, `--cherry-pick --right-only A...B` omits those commits from `B`"
-" which are in `A` or are patch-equivalent to a commit in `A`. In other "
-"words, this lists the `+` commits from `git cherry A B`. More precisely, "
-"`--cherry-pick --right-only --no-merges` gives the exact list."
+"For example, `--cherry-pick --right-only A...B` omits those commits from `B` "
+"which are in `A` or are patch-equivalent to a commit in `A`. In other words, "
+"this lists the `+` commits from `git cherry A B`. More precisely, `--cherry-"
+"pick --right-only --no-merges` gives the exact list."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:249
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--cherry"
msgstr "--cherry"
@@ -68838,13 +68538,13 @@ msgstr "--cherry"
msgid ""
"A synonym for `--right-only --cherry-mark --no-merges`; useful to limit the "
"output to the commits on our side and mark those that have been applied to "
-"the other side of a forked history with `git log --cherry "
-"upstream...mybranch`, similar to `git cherry upstream mybranch`."
+"the other side of a forked history with `git log --cherry upstream..."
+"mybranch`, similar to `git cherry upstream mybranch`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:257
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--walk-reflogs"
msgstr "--walk-reflogs"
@@ -68897,20 +68597,20 @@ msgstr ""
#: en/rev-list-options.txt:288
msgid ""
"Under `--pretty=oneline`, the commit message is prefixed with this "
-"information on the same line. This option cannot be combined with "
-"`--reverse`. See also linkgit:git-reflog[1]."
+"information on the same line. This option cannot be combined with `--"
+"reverse`. See also linkgit:git-reflog[1]."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:292
msgid ""
-"After a failed merge, show refs that touch files having a conflict and don't"
-" exist on all heads to merge."
+"After a failed merge, show refs that touch files having a conflict and don't "
+"exist on all heads to merge."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:293
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--boundary"
msgstr "--boundary"
@@ -68922,7 +68622,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:298
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--use-bitmap-index"
msgstr "--use-bitmap-index"
@@ -68930,8 +68630,8 @@ msgstr "--use-bitmap-index"
#: en/rev-list-options.txt:303
msgid ""
"Try to speed up the traversal using the pack bitmap index (if one is "
-"available). Note that when traversing with `--objects`, trees and blobs will"
-" not have their associated path printed."
+"available). Note that when traversing with `--objects`, trees and blobs will "
+"not have their associated path printed."
msgstr ""
#. type: Labeled list
@@ -68980,7 +68680,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:322
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--simplify-by-decoration"
msgstr "--simplify-by-decoration"
@@ -69008,14 +68708,14 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:334
msgid ""
-"Simplifies the history to the simplest history explaining the final state of"
-" the tree. Simplest because it prunes some side branches if the end result "
-"is the same (i.e. merging branches with the same content)"
+"Simplifies the history to the simplest history explaining the final state of "
+"the tree. Simplest because it prunes some side branches if the end result is "
+"the same (i.e. merging branches with the same content)"
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:335
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--full-history"
msgstr "--full-history"
@@ -69026,7 +68726,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:338 en/rev-list-options.txt:471
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--dense"
msgstr "--dense"
@@ -69043,7 +68743,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:345 en/rev-list-options.txt:482
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--simplify-merges"
msgstr "--simplify-merges"
@@ -69051,13 +68751,13 @@ msgstr "--simplify-merges"
#: en/rev-list-options.txt:349
msgid ""
"Additional option to `--full-history` to remove some needless merges from "
-"the resulting history, as there are no selected commits contributing to this"
-" merge."
+"the resulting history, as there are no selected commits contributing to this "
+"merge."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:350 en/rev-list-options.txt:529
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--ancestry-path"
msgstr "--ancestry-path"
@@ -69105,16 +68805,16 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:375
msgid ""
-"The horizontal line of history A---Q is taken to be the first parent of each"
-" merge. The commits are:"
+"The horizontal line of history A---Q is taken to be the first parent of each "
+"merge. The commits are:"
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:379
msgid ""
-"`I` is the initial commit, in which `foo` exists with contents ``asdf'', and"
-" a file `quux` exists with contents ``quux''. Initial commits are compared "
-"to an empty tree, so `I` is !TREESAME."
+"`I` is the initial commit, in which `foo` exists with contents ``asdf'', and "
+"a file `quux` exists with contents ``quux''. Initial commits are compared to "
+"an empty tree, so `I` is !TREESAME."
msgstr ""
#. type: Plain text
@@ -69132,8 +68832,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:387
msgid ""
-"`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it"
-" is not TREESAME to any parent."
+"`C` does not change `foo`, but its merge `N` changes it to ``foobar'', so it "
+"is not TREESAME to any parent."
msgstr ""
#. type: Plain text
@@ -69169,10 +68869,10 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:410
msgid ""
-"Commits are included if they are not TREESAME to any parent (though this can"
-" be changed, see `--sparse` below). If the commit was a merge, and it was "
-"TREESAME to one parent, follow only that parent. (Even if there are several"
-" TREESAME parents, follow only one of them.) Otherwise, follow all parents."
+"Commits are included if they are not TREESAME to any parent (though this can "
+"be changed, see `--sparse` below). If the commit was a merge, and it was "
+"TREESAME to one parent, follow only that parent. (Even if there are several "
+"TREESAME parents, follow only one of them.) Otherwise, follow all parents."
msgstr ""
#. type: Plain text
@@ -69193,8 +68893,8 @@ msgstr ""
#: en/rev-list-options.txt:423
msgid ""
"Note how the rule to only follow the TREESAME parent, if one is available, "
-"removed `B` from consideration entirely. `C` was considered via `N`, but is"
-" TREESAME. Root commits are compared to an empty tree, so `I` is !TREESAME."
+"removed `B` from consideration entirely. `C` was considered via `N`, but is "
+"TREESAME. Root commits are compared to an empty tree, so `I` is !TREESAME."
msgstr ""
#. type: Plain text
@@ -69250,8 +68950,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:450
msgid ""
-"Ordinary commits are only included if they are !TREESAME (though this can be"
-" changed, see `--sparse` below)."
+"Ordinary commits are only included if they are !TREESAME (though this can be "
+"changed, see `--sparse` below)."
msgstr ""
#. type: Plain text
@@ -69398,8 +69098,8 @@ msgstr ""
#: en/rev-list-options.txt:534
msgid ""
"Limit the displayed commits to those directly on the ancestry chain between "
-"the ``from'' and ``to'' commits in the given commit range. I.e. only display"
-" commits that are ancestor of the ``to'' commit and descendants of the "
+"the ``from'' and ``to'' commits in the given commit range. I.e. only display "
+"commits that are ancestor of the ``to'' commit and descendants of the "
"``from'' commit."
msgstr ""
@@ -69472,10 +69172,10 @@ msgstr ""
#: en/rev-list-options.txt:585
msgid ""
"Limit output to the one commit object which is roughly halfway between "
-"included and excluded commits. Note that the bad bisection ref "
-"`refs/bisect/bad` is added to the included commits (if it exists) and the "
-"good bisection refs `refs/bisect/good-*` are added to the excluded commits "
-"(if they exist). Thus, supposing there are no refs in `refs/bisect/`, if"
+"included and excluded commits. Note that the bad bisection ref `refs/bisect/"
+"bad` is added to the included commits (if it exists) and the good bisection "
+"refs `refs/bisect/good-*` are added to the excluded commits (if they exist). "
+"Thus, supposing there are no refs in `refs/bisect/`, if"
msgstr ""
#. type: delimited block -
@@ -69508,7 +69208,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:602
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--bisect-vars"
msgstr "--bisect-vars"
@@ -69518,9 +69218,9 @@ msgid ""
"This calculates the same as `--bisect`, except that refs in `refs/bisect/` "
"are not used, and except that this outputs text ready to be eval'ed by the "
"shell. These lines will assign the name of the midpoint revision to the "
-"variable `bisect_rev`, and the expected number of commits to be tested after"
-" `bisect_rev` is tested to `bisect_nr`, the expected number of commits to be"
-" tested if `bisect_rev` turns out to be good to `bisect_good`, the expected "
+"variable `bisect_rev`, and the expected number of commits to be tested after "
+"`bisect_rev` is tested to `bisect_nr`, the expected number of commits to be "
+"tested if `bisect_rev` turns out to be good to `bisect_good`, the expected "
"number of commits to be tested if `bisect_rev` turns out to be bad to "
"`bisect_bad`, and the number of commits we are bisecting right now to "
"`bisect_all`."
@@ -69528,7 +69228,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:614
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--bisect-all"
msgstr "--bisect-all"
@@ -69544,17 +69244,17 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:624
msgid ""
-"This is useful because it makes it easy to choose a good commit to test when"
-" you want to avoid to test some of them for some reason (they may not "
-"compile for example)."
+"This is useful because it makes it easy to choose a good commit to test when "
+"you want to avoid to test some of them for some reason (they may not compile "
+"for example)."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:628
msgid ""
"This option can be used along with `--bisect-vars`, in this case, after all "
-"the sorted commit objects, there will be the same text as if `--bisect-vars`"
-" had been used alone."
+"the sorted commit objects, there will be the same text as if `--bisect-vars` "
+"had been used alone."
msgstr ""
#. type: Title ~
@@ -69577,7 +69277,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:640
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--author-date-order"
msgstr "--author-date-order"
@@ -69613,23 +69313,23 @@ msgstr ""
#: en/rev-list-options.txt:662
msgid ""
"where the numbers denote the order of commit timestamps, `git rev-list` and "
-"friends with `--date-order` show the commits in the timestamp order: 8 7 6 5"
-" 4 3 2 1."
+"friends with `--date-order` show the commits in the timestamp order: 8 7 6 5 "
+"4 3 2 1."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:667
msgid ""
"With `--topo-order`, they would show 8 6 5 3 7 4 2 1 (or 8 7 4 2 6 5 3 1); "
-"some older commits are shown before newer ones in order to avoid showing the"
-" commits from two parallel development track mixed together."
+"some older commits are shown before newer ones in order to avoid showing the "
+"commits from two parallel development track mixed together."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:672
msgid ""
-"Output the commits chosen to be shown (see Commit Limiting section above) in"
-" reverse order. Cannot be combined with `--walk-reflogs`."
+"Output the commits chosen to be shown (see Commit Limiting section above) in "
+"reverse order. Cannot be combined with `--walk-reflogs`."
msgstr ""
#. type: Title ~
@@ -69645,21 +69345,21 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:679
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--objects"
msgstr "--objects"
#. type: Plain text
#: en/rev-list-options.txt:684
msgid ""
-"Print the object IDs of any object referenced by the listed commits. "
-"`--objects foo ^bar` thus means ``send me all object IDs which I need to "
+"Print the object IDs of any object referenced by the listed commits. `--"
+"objects foo ^bar` thus means ``send me all object IDs which I need to "
"download if I have the commit object _bar_ but not _foo_''."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:685
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--in-commit-order"
msgstr "--in-commit-order"
@@ -69672,7 +69372,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:690
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--objects-edge"
msgstr "--objects-edge"
@@ -69687,21 +69387,21 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:697
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--objects-edge-aggressive"
msgstr "--objects-edge-aggressive"
#. type: Plain text
#: en/rev-list-options.txt:701
msgid ""
-"Similar to `--objects-edge`, but it tries harder to find excluded commits at"
-" the cost of increased time. This is used instead of `--objects-edge` to "
+"Similar to `--objects-edge`, but it tries harder to find excluded commits at "
+"the cost of increased time. This is used instead of `--objects-edge` to "
"build ``thin'' packs for shallow repositories."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:702
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--indexed-objects"
msgstr "--indexed-objects"
@@ -69721,8 +69421,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:715
msgid ""
-"Only useful with one of the `--objects*`; omits objects (usually blobs) from"
-" the list of printed objects. The '<filter-spec>' may be one of the "
+"Only useful with one of the `--objects*`; omits objects (usually blobs) from "
+"the list of printed objects. The '<filter-spec>' may be one of the "
"following:"
msgstr ""
@@ -69736,8 +69436,8 @@ msgstr ""
msgid ""
"The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes or "
"units. n may be zero. The suffixes k, m, and g can be used to name units "
-"in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as "
-"'blob:limit=1024'."
+"in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same as 'blob:"
+"limit=1024'."
msgstr ""
#. type: Plain text
@@ -69777,7 +69477,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:744
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--filter-print-omitted"
msgstr "--filter-print-omitted"
@@ -69798,8 +69498,8 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:762
msgid ""
-"The form '--missing=allow-promisor' is like 'allow-any', but will only allow"
-" object traversal to continue for EXPECTED promisor missing objects. "
+"The form '--missing=allow-promisor' is like 'allow-any', but will only allow "
+"object traversal to continue for EXPECTED promisor missing objects. "
"Unexpected missing objects will raise an error."
msgstr ""
@@ -69815,8 +69515,8 @@ msgstr ""
msgid ""
"(For internal use only.) Prefilter object traversal at promisor boundary. "
"This is used with partial clone. This is stronger than `--missing=allow-"
-"promisor` because it limits the traversal, rather than just silencing errors"
-" about missing objects."
+"promisor` because it limits the traversal, rather than just silencing errors "
+"about missing objects."
msgstr ""
#. type: Labeled list
@@ -69832,13 +69532,13 @@ msgid ""
"no effect if a range is specified. If the argument `unsorted` is given, the "
"commits are shown in the order they were given on the command line. "
"Otherwise (if `sorted` or no argument was given), the commits are shown in "
-"reverse chronological order by commit time. Cannot be combined with "
-"`--graph`."
+"reverse chronological order by commit time. Cannot be combined with `--"
+"graph`."
msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:783
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--do-walk"
msgstr "--do-walk"
@@ -69863,7 +69563,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:797
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--relative-date"
msgstr "--relative-date"
@@ -69939,18 +69639,17 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:829
msgid ""
-"`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` "
-"format."
+"`--date=short` shows only the date, but not the time, in `YYYY-MM-DD` format."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:838
msgid ""
"`--date=raw` shows the date as seconds since the epoch (1970-01-01 00:00:00 "
-"UTC), followed by a space, and then the timezone as an offset from UTC (a "
-"`+` or `-` with four digits; the first two are hours, and the second two are"
-" minutes). I.e., as if the timestamp were formatted with `strftime(\"%s "
-"%z\")`). Note that the `-local` option does not affect the seconds-since-"
+"UTC), followed by a space, and then the timezone as an offset from UTC (a `"
+"+` or `-` with four digits; the first two are hours, and the second two are "
+"minutes). I.e., as if the timestamp were formatted with `strftime(\"%s %z"
+"\")`). Note that the `-local` option does not affect the seconds-since-"
"epoch value (which is always measured in UTC), but does switch the "
"accompanying timezone value."
msgstr ""
@@ -69958,27 +69657,27 @@ msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:845
msgid ""
-"`--date=human` shows the timezone if the timezone does not match the current"
-" time-zone, and doesn't print the whole date if that matches (ie skip "
-"printing year for dates that are \"this year\", but also skip the whole date"
-" itself if it's in the last few days and we can just say what weekday it "
+"`--date=human` shows the timezone if the timezone does not match the current "
+"time-zone, and doesn't print the whole date if that matches (ie skip "
+"printing year for dates that are \"this year\", but also skip the whole date "
+"itself if it's in the last few days and we can just say what weekday it "
"was). For older dates the hour and minute is also omitted."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:849
msgid ""
-"`--date=unix` shows the date as a Unix epoch timestamp (seconds since 1970)."
-" As with `--raw`, this is always in UTC and therefore `-local` has no "
+"`--date=unix` shows the date as a Unix epoch timestamp (seconds since "
+"1970). As with `--raw`, this is always in UTC and therefore `-local` has no "
"effect."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:856
msgid ""
-"`--date=format:...` feeds the format `...` to your system `strftime`, except"
-" for %z and %Z, which are handled internally. Use `--date=format:%c` to "
-"show the date in your system locale's preferred format. See the `strftime` "
+"`--date=format:...` feeds the format `...` to your system `strftime`, except "
+"for %z and %Z, which are handled internally. Use `--date=format:%c` to show "
+"the date in your system locale's preferred format. See the `strftime` "
"manual for a complete list of format placeholders. When using `-local`, the "
"correct syntax is `--date=format-local:...`."
msgstr ""
@@ -70002,7 +69701,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:865
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--header"
msgstr "--header"
@@ -70022,7 +69721,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:874
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--children"
msgstr "--children"
@@ -70035,7 +69734,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:879
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--timestamp"
msgstr "--timestamp"
@@ -70046,7 +69745,7 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:883
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--left-right"
msgstr "--left-right"
@@ -70055,8 +69754,8 @@ msgstr "--left-right"
msgid ""
"Mark which side of a symmetric difference a commit is reachable from. "
"Commits from the left side are prefixed with `<` and those from the right "
-"with `>`. If combined with `--boundary`, those commits are prefixed with "
-"`-`."
+"with `>`. If combined with `--boundary`, those commits are prefixed with `-"
+"`."
msgstr ""
#. type: Plain text
@@ -70100,15 +69799,15 @@ msgstr ""
#. type: Labeled list
#: en/rev-list-options.txt:912
-#, ignore-same, no-wrap
+#, no-wrap
msgid "--graph"
msgstr "--graph"
#. type: Plain text
#: en/rev-list-options.txt:918
msgid ""
-"Draw a text-based graphical representation of the commit history on the left"
-" hand side of the output. This may cause extra lines to be printed in "
+"Draw a text-based graphical representation of the commit history on the left "
+"hand side of the output. This may cause extra lines to be printed in "
"between commits, in order for the graph history to be drawn properly. "
"Cannot be combined with `--no-walk`."
msgstr ""
@@ -70137,18 +69836,18 @@ msgid ""
"When --graph is not used, all history branches are flattened which can make "
"it hard to see that the two consecutive commits do not belong to a linear "
"branch. This option puts a barrier in between them in that case. If "
-"`<barrier>` is specified, it is the string that will be shown instead of the"
-" default one."
+"`<barrier>` is specified, it is the string that will be shown instead of the "
+"default one."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:940
msgid ""
-"Print a number stating how many commits would have been listed, and suppress"
-" all other output. When used together with `--left-right`, instead print "
-"the counts for left and right commits, separated by a tab. When used "
-"together with `--cherry-mark`, omit patch equivalent commits from these "
-"counts and print the count for equivalent commits separated by a tab."
+"Print a number stating how many commits would have been listed, and suppress "
+"all other output. When used together with `--left-right`, instead print the "
+"counts for left and right commits, separated by a tab. When used together "
+"with `--cherry-mark`, omit patch equivalent commits from these counts and "
+"print the count for equivalent commits separated by a tab."
msgstr ""
#. type: Title ~
@@ -70170,15 +69869,15 @@ msgstr ""
msgid ""
"With this option, diff output for a merge commit shows the differences from "
"each of the parents to the merge result simultaneously instead of showing "
-"pairwise diff between a parent and the result one at a time. Furthermore, it"
-" lists only files which were modified from all parents."
+"pairwise diff between a parent and the result one at a time. Furthermore, it "
+"lists only files which were modified from all parents."
msgstr ""
#. type: Plain text
#: en/rev-list-options.txt:962
msgid ""
-"This flag implies the `-c` option and further compresses the patch output by"
-" omitting uninteresting hunks whose contents in the parents have only two "
+"This flag implies the `-c` option and further compresses the patch output by "
+"omitting uninteresting hunks whose contents in the parents have only two "
"variants and the merge result picks one of them without modification."
msgstr ""
@@ -70188,8 +69887,8 @@ msgid ""
"This flag makes the merge commits show the full diff like regular commits; "
"for each merge parent, a separate log entry and diff is generated. An "
"exception is that only diff against the first parent is shown when `--first-"
-"parent` option is given; in that case, the output represents the changes the"
-" merge brought _into_ the then-current branch."
+"parent` option is given; in that case, the output represents the changes the "
+"merge brought _into_ the then-current branch."
msgstr ""
#. type: Plain text
@@ -70205,9 +69904,9 @@ msgstr ""
#. type: Plain text
#: en/sequencer.txt:5
msgid ""
-"Continue the operation in progress using the information in "
-"'.git/sequencer'. Can be used to continue after resolving conflicts in a "
-"failed cherry-pick or revert."
+"Continue the operation in progress using the information in '.git/"
+"sequencer'. Can be used to continue after resolving conflicts in a failed "
+"cherry-pick or revert."
msgstr ""
#. type: Plain text
@@ -70229,9 +69928,9 @@ msgid ""
"stealing data from the other repository that was not intended to be shared. "
"If you have private data that you need to protect from a malicious peer, "
"your best option is to store it in another repository. This applies to both "
-"clients and servers. In particular, namespaces on a server are not effective"
-" for read access control; you should only grant read access to a namespace "
-"to clients that you would trust with read access to the entire repository."
+"clients and servers. In particular, namespaces on a server are not effective "
+"for read access control; you should only grant read access to a namespace to "
+"clients that you would trust with read access to the entire repository."
msgstr ""
#. type: Plain text
@@ -70246,8 +69945,8 @@ msgid ""
"are not explicitly intended to be shared but can be used to optimize the "
"transfer if the peer also has them. The attacker chooses an object ID X to "
"steal and sends a ref to X, but isn't required to send the content of X "
-"because the victim already has it. Now the victim believes that the attacker"
-" has X, and it sends the content of X back to the attacker later. (This "
+"because the victim already has it. Now the victim believes that the attacker "
+"has X, and it sends the content of X back to the attacker later. (This "
"attack is most straightforward for a client to perform on a server, by "
"creating a ref to X in the namespace the client has access to and then "
"fetching it. The most likely way for a server to perform it on a client is "
@@ -70313,8 +70012,8 @@ msgid ""
"configured using linkgit:git-remote[1], linkgit:git-config[1] or even by a "
"manual edit to the `$GIT_DIR/config` file. The URL of this remote will be "
"used to access the repository. The refspec of this remote will be used by "
-"default when you do not provide a refspec on the command line. The entry in"
-" the config file would appear like this:"
+"default when you do not provide a refspec on the command line. The entry in "
+"the config file would appear like this:"
msgstr ""
#. type: delimited block -
@@ -70344,8 +70043,8 @@ msgstr ""
#. type: Plain text
#: en/urls-remotes.txt:47
msgid ""
-"You can choose to provide the name of a file in `$GIT_DIR/remotes`. The URL"
-" in this file will be used to access the repository. The refspec in this "
+"You can choose to provide the name of a file in `$GIT_DIR/remotes`. The URL "
+"in this file will be used to access the repository. The refspec in this "
"file will be used as default when you do not provide a refspec on the "
"command line. This file should have the following format:"
msgstr ""
@@ -70439,9 +70138,9 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:12
msgid ""
-"Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps"
-" can be used for fetching, but this is inefficient and deprecated; do not "
-"use it)."
+"Git supports ssh, git, http, and https protocols (in addition, ftp, and ftps "
+"can be used for fetching, but this is inefficient and deprecated; do not use "
+"it)."
msgstr ""
#. type: Plain text
@@ -70504,7 +70203,8 @@ msgstr ""
#. type: Plain text
#: en/urls.txt:36
msgid ""
-"ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/"
+"ssh://{startsb}user@{endsb}host.xz{startsb}:port{endsb}/~{startsb}"
+"user{endsb}/path/to/repo.git/"
msgstr ""
#. type: Plain text
@@ -70566,8 +70266,8 @@ msgstr ""
#: en/urls.txt:66
msgid ""
"where <address> may be a path, a server and path, or an arbitrary URL-like "
-"string recognized by the specific remote helper being invoked. See "
-"linkgit:gitremote-helpers[1] for details."
+"string recognized by the specific remote helper being invoked. See linkgit:"
+"gitremote-helpers[1] for details."
msgstr ""
#. type: Plain text
@@ -70605,8 +70305,8 @@ msgstr ""
#: en/urls.txt:87
msgid ""
"a URL like \"work:repo.git\" or like \"host.xz:/path/to/repo.git\" will be "
-"rewritten in any context that takes a URL to be "
-"\"git://git.host.xz/repo.git\"."
+"rewritten in any context that takes a URL to be \"git://git.host.xz/repo.git"
+"\"."
msgstr ""
#. type: Plain text
--
GitLab