Newer
Older
" and `\\b` for backspace (BS). Other char escape sequences (including "
"octal escape sequences) are invalid."
msgid "Includes"
msgstr ""
#: en/config.txt:90
msgid ""
"The `include` and `includeIf` sections allow you to include config "
"directives from another source. These sections behave identically to each "
"other with the exception that `includeIf` sections may be ignored if their "
"condition does not evaluate to true; see \"Conditional includes\" below."
msgstr ""
#. type: Plain text
#: en/config.txt:95
"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."
"The contents of the included file are inserted immediately, as if they had "
"been found at the location of the include directive. If the value of the "
"variable is a relative path, the path is considered to be relative to the "
"configuration file in which the include directive was found. See below for "
"examples."
msgid "Conditional includes"
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 "
msgid ""
"The condition starts with a keyword followed by a colon and some data whose "
"format and meaning depends on the keyword. Supported keywords are:"
msgid ""
"The data that follows the keyword `gitdir:` is used as a glob pattern. If "
"the location of the .git directory matches the pattern, the include "
"condition is met."
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"
#. type: Block title
msgid "git file is."
msgstr ""
"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:"
"If the pattern starts with `~/`, `~` will be substituted with the content of"
" the environment variable `HOME`."
msgid ""
"If the pattern starts with `./`, it is replaced with the directory "
"containing the current config file."
#. type: Plain text
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`."
"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."
"This is the same as `gitdir` except that matching is done case-insensitively"
" (e.g. on case-insensitive file sytems)"
#. type: Plain text
msgid "A few more notes on matching via `gitdir` and `gitdir/i`:"
msgstr ""
msgid "Symlinks in `$GIT_DIR` are not resolved before matching."
msgstr ""
#. 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."
msgstr ""
#. type: Plain text
#: en/config.txt:160
msgid ""
"This was not the case in the initial release of this feature in v2.13.0, "
"which only matched the realpath version. Configuration that wants to be "
"compatible with the initial release of this feature needs to either specify "
"only the realpath version, or both versions."
msgstr ""
#. type: Plain text
#: en/config.txt:163
"Note that \"../\" is not special and will match literally, which is unlikely"
" what you want."
#: en/config.txt:165 en/git-rev-parse.txt:359 en/git-rev-parse.txt:415
msgid "Example"
msgstr ""
"\t# Core variables\n"
"\t[core]\n"
"\t\t; Don't trust file modes\n"
"\t\tfilemode = false\n"
"\t# Our diff algorithm\n"
"\t[diff]\n"
"\t\texternal = /usr/local/bin/diff-wrapper\n"
"\t\trenames = true\n"
"\t[branch \"devel\"]\n"
"\t\tremote = origin\n"
"\t\tmerge = refs/heads/devel\n"
"\t# Proxy settings\n"
"\t[core]\n"
"\t\tgitProxy=\"ssh\" for \"kernel.org\"\n"
"\t\tgitProxy=default-proxy ; for the rest\n"
#. type: Plain text
msgid ""
"\t[include]\n"
"\t\tpath = /path/to/foo.inc ; include by absolute path\n"
"\t\tpath = foo.inc ; find \"foo.inc\" relative to the current file\n"
"\t\tpath = ~/foo.inc ; find \"foo.inc\" in your `$HOME` directory\n"
"\t; include if $GIT_DIR is /path/to/foo/.git\n"
"\t[includeIf \"gitdir:/path/to/foo/.git\"]\n"
"\t\tpath = /path/to/foo.inc\n"
#. type: Plain text
msgid ""
"\t; include for all repositories inside /path/to/group\n"
"\t[includeIf \"gitdir:/path/to/group/\"]\n"
"\t\tpath = /path/to/foo.inc\n"
msgstr ""
"\t; include for all repositories inside $HOME/to/group\n"
"\t[includeIf \"gitdir:~/to/group/\"]\n"
"\t\tpath = /path/to/foo.inc\n"
#. type: Plain text
#: en/config.txt:208
#, no-wrap
msgid ""
"\t; relative paths are always relative to the including\n"
"\t; file (if the condition is true); their location is not\n"
"\t; affected by the condition\n"
"\t[includeIf \"gitdir:/path/to/group/\"]\n"
"\t\tpath = foo.inc\n"
msgstr ""
msgid "Values"
msgstr ""
msgid ""
"Values of many variables are treated as a simple string, but there are "
"variables that take values of specific types and there are rules as to how "
"to spell them."
msgid "boolean"
msgstr ""
msgid ""
"When a variable is said to take a boolean value, many synonyms are accepted "
"for 'true' and 'false'; these are all case-insensitive."
#: en/config.txt:223
msgid "Boolean true literals are `yes`, `on`, `true`,"
#: en/config.txt:225
#, no-wrap
"and `1`. Also, a variable defined without `= <value>`\n"
"is taken as true.\n"
msgid "false"
msgstr ""
#: en/config.txt:227
msgid "Boolean false literals are `no`, `off`, `false`,"
msgstr ""
#. type: Plain text
#: en/config.txt:228
#, no-wrap
msgid "`0` and the empty string.\n"
msgstr ""
#. type: Plain text
"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)."
#, no-wrap
msgid "integer"
msgstr ""
"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."
#: en/config.txt:238 en/diff-options.txt:339 en/git-for-each-ref.txt:177
msgid "color"
msgstr ""
msgid ""
"The value for a variable that takes a color is a list of colors (at most "
"two, one for foreground and one for background) and attributes (as many as "
"you want), separated by spaces."
msgid ""
"The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, "
"`blue`, `magenta`, `cyan` and `white`. The first color given is the "
"foreground; the second is the background."
"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`."
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)."
msgid ""
"An empty color string produces no color effect at all. This can be used to "
"avoid coloring specific elements without disabling color entirely."
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."
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 "
#: en/config.txt:280 en/git-imap-send.txt:58
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."
#. type: Plain text
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."
#. type: Title -
#: en/date-formats.txt:2
msgid "DATE FORMATS"
msgstr "FORMATS DE DATE"
#: en/date-formats.txt:5
msgid "The `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` environment variables"
msgstr "Les variables d'environnement `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE`"
#. type: Plain text
#: en/date-formats.txt:7
msgid "and the `--date` option"
msgstr "et l'option `--date`"
#: en/date-formats.txt:9
msgid "support the following date formats:"
msgstr "prend en charge les formats de date suivants :"
msgid "Git internal format"
msgstr "Format interne de Git"
"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`."
"Il est de la forme `<horodatage unix> <décalage de fuseau horaire>`, où "
"`<horodatage unix>` est un nombre de secondes depuis l'époque UNIX. "
"`<décalage de fuseau horaire>` est un décalage positif ou négative par "
"rapport à UTC. Par exemple, CET (qui est en avance d'une heure sur UTC) est "
"`+0100`."
msgid "RFC 2822"
msgstr "RFC 2822"
"The standard email format as described by RFC 2822, for example `Thu, 07 Apr"
" 2005 22:13:13 +0200`."
"Le standard de format des courriel tel que décrit par la RFC 2822, par "
"exemple `Thu, 07 Apr 2005 22:13:13 +0200`."
msgid "ISO 8601"
msgstr "ISO 8601"
"Time and date specified by the ISO 8601 standard, for example "
"`2005-04-07T22:13:13`. The parser accepts a space instead of the `T` "
"character as well."
"Les heures et les dates sont spécifiées par le standard ISO 8601, par "
"exemple `2005-04-07T22:13:13`. L'analyseur accepte aussi un espace au lieu "
"du caractère `T`."
"In addition, the date part is accepted in the following formats: "
"`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`."
"De plus, la partie date est acceptée dans les formats suivants : "
"`AAAA.MM.JJ`, `MM/JJ/AAAA` et `JJ.MM.AAAA`."
#. type: Title -
#: en/diff-format.txt:2
"The raw output format from \"git-diff-index\", \"git-diff-tree\", \"git-"
"diff-files\" and \"git diff --raw\" are very similar."
#. type: Plain text
"These commands all compare two sets of things; what is compared differs:"
msgid "git-diff-index <tree-ish>"
msgstr "git-diff-index <arbre-esque>"
#: en/diff-format.txt:12
msgid "compares the <tree-ish> and the files on the filesystem."
msgstr "compare l'<arbre-esque> et les fichiers du système de fichiers."
msgid "git-diff-index --cached <tree-ish>"
msgstr "git-diff-index --cached <arbre-esque>"
#: en/diff-format.txt:15
msgid "compares the <tree-ish> and the index."
msgstr "compare l'<arbre-esque> et l'index."
#. type: Labeled list
msgid "git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>...]"
#: en/diff-format.txt:18
msgid "compares the trees named by the two arguments."
msgid "git-diff-files [<pattern>...]"
#: en/diff-format.txt:21
msgid "compares the index and the files on the filesystem."
#. type: Plain text
"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."
#: en/diff-format.txt:27
msgid "An output line is formatted this way:"
#. type: delimited block -
#: en/diff-format.txt:35
"in-place edit :100644 100644 bcd1234 0123456 M file0\n"
"copy-edit :100644 100644 abcd123 1234567 C68 file1 file2\n"
"rename-edit :100644 100644 abcd123 1234567 R86 file1 file3\n"
"create :000000 100644 0000000 1234567 A file4\n"
"delete :100644 000000 1234567 0000000 D file5\n"
"unmerged :000000 000000 0000000 0000000 U file6\n"
#. type: Plain text
#: en/diff-format.txt:38
msgid "That is, from the left to the right:"
msgstr "C'est-à-dire, de gauche à droite :"
#. type: Plain text
#: en/diff-format.txt:40
msgid "a colon."
#. type: Plain text
#: en/diff-format.txt:41
msgid "mode for \"src\"; 000000 if creation or unmerged."
#. type: Plain text
#: en/diff-format.txt:42 en/diff-format.txt:44 en/diff-format.txt:46
#: en/diff-format.txt:48
msgid "a space."
#. type: Plain text
#: en/diff-format.txt:43
msgid "mode for \"dst\"; 000000 if deletion or unmerged."
#: en/diff-format.txt:45
msgid "sha1 for \"src\"; 0\\{40\\} if creation or unmerged."
#: en/diff-format.txt:47
msgid "sha1 for \"dst\"; 0\\{40\\} if creation, unmerged or \"look at work tree\"."
#: en/diff-format.txt:49
msgid "status, followed by optional \"score\" number."
#: en/diff-format.txt:50
msgid "a tab or a NUL when `-z` option is used."
#: en/diff-format.txt:51
msgid "path for \"src\""
#: en/diff-format.txt:52
msgid "a tab or a NUL when `-z` option is used; only exists for C or R."
#. type: Plain text
#: en/diff-format.txt:53
msgid "path for \"dst\"; only exists for C or R."
#: en/diff-format.txt:54
msgid "an LF or a NUL when `-z` option is used, to terminate the record."
#. type: Plain text
#: en/diff-format.txt:56
msgid "Possible status letters are:"
#: en/diff-format.txt:58
msgid "A: addition of a file"
#: en/diff-format.txt:59
msgid "C: copy of a file into a new one"
#: en/diff-format.txt:60
msgid "D: deletion of a file"
#. type: Plain text
#: en/diff-format.txt:61
msgid "M: modification of the contents or mode of a file"
msgstr "M : modification de contenu ou du mode d'un fichier"
#: en/diff-format.txt:62
msgid "R: renaming of a file"
#: en/diff-format.txt:63
msgid "T: change in the type of the file"
"U: file is unmerged (you must complete the merge before it can be committed)"
#: en/diff-format.txt:66
msgid "X: \"unknown\" change type (most probably a bug, please report it)"
"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."
"<sha1> is shown as all 0's if a file is new on the filesystem and it is out "
"of sync with the index."
#. type: Labeled list
#: en/diff-format.txt:76 en/diff-format.txt:101 en/git-svn.txt:499
#: en/git-svn.txt:539
#, no-wrap
msgid "Example:"
#. type: delimited block -
#: en/diff-format.txt:79
#, no-wrap
msgid ":100644 100644 5be4a4a 0000000 M file.c\n"
#: en/diff-format.txt:85 en/git-ls-files.txt:210 en/git-ls-tree.txt:101
"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."
#. type: Title -
#: en/diff-format.txt:87
#, no-wrap
msgid "diff format for merges"
"\"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:"
#: en/diff-format.txt:95
msgid "there is a colon for each parent"
#: en/diff-format.txt:96
msgid "there are more \"src\" modes and \"src\" sha1"
#: en/diff-format.txt:97
msgid "status is concatenated status characters for each parent"
#: en/diff-format.txt:98
msgid "no optional \"score\" number"
#: en/diff-format.txt:99
msgid "single path, only for \"dst\""
#. type: delimited block -
#: en/diff-format.txt:104
#, no-wrap
msgid "::100644 100644 100644 fabadb8 cc95eb0 4866510 MM\tdescribe.c\n"
msgstr ""
"Note that 'combined diff' lists only files which were modified from all "
"parents."
#. type: Title -
#: en/diff-format.txt:114
#, no-wrap
msgid "other diff formats"
msgstr "autres formats de diff"
"The `--summary` option describes newly added, deleted, renamed and copied "
"files. The `--stat` option adds diffstat(1) graph to the output. These "
"options can be combined with other options, such as `-p`, and are meant for "
"human consumption."
"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:"
#. type: delimited block -
#: en/diff-format.txt:128
msgid "arch/{i386 => x86}/Makefile | 4 +--\n"
"The `--numstat` option gives the diffstat(1) information but is designed for"
" easier machine consumption. An entry in `--numstat` output looks like "
"this:"
#. type: delimited block -
#: en/diff-format.txt:137
#, no-wrap
"1\t2\tREADME\n"
"3\t1\tarch/{i386 => x86}/Makefile\n"
#: en/diff-format.txt:140
msgid "That is, from left to right:"
#. type: Plain text
#: en/diff-format.txt:142 en/diff-format.txt:158
msgid "the number of added lines;"
#: en/diff-format.txt:143 en/diff-format.txt:145 en/diff-format.txt:159
#: en/diff-format.txt:161
msgid "a tab;"
#: en/diff-format.txt:144 en/diff-format.txt:160
msgid "the number of deleted lines;"
#: en/diff-format.txt:146
msgid "pathname (possibly with rename/copy information);"
#: en/diff-format.txt:147
msgid "a newline."
"When `-z` output option is in effect, the output is formatted this way:"
#. type: delimited block -
#: en/diff-format.txt:153
#, no-wrap
"1\t2\tREADME NUL\n"
"3\t1\tNUL arch/i386/Makefile NUL arch/x86/Makefile NUL\n"
#: en/diff-format.txt:156
msgid "That is:"
#: en/diff-format.txt:162 en/diff-format.txt:164
msgid "a NUL (only exists if renamed/copied);"
#: en/diff-format.txt:163
msgid "pathname in preimage;"
#. type: Plain text
#: en/diff-format.txt:165
msgid "pathname in postimage (only exists if renamed/copied);"
msgstr ""
#: en/diff-format.txt:166
msgid "a NUL."
"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."
#. type: Title -
#: en/diff-generate-patch.txt:2
#, no-wrap
msgid "Generating patches with -p"
msgstr ""
"When \"git-diff-index\", \"git-diff-tree\", or \"git-diff-files\" are run "
"with a `-p` option, \"git diff\" without the `--raw` option, or \"git log\" "
"with the \"-p\" option, they do not produce the output described above; "
"instead they produce a patch file. You can customize the creation of such "
"patches via the `GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment "
"variables."
"What the -p option produces is slightly different from the traditional diff "
"format:"
#. type: Plain text
#: en/diff-generate-patch.txt:15
msgid "It is preceded with a \"git diff\" header that looks like this:"
#: en/diff-generate-patch.txt:17
#, no-wrap
msgid "diff --git a/file1 b/file2\n"
"The `a/` and `b/` filenames are the same unless rename/copy is involved. "
"Especially, even for a creation or a deletion, `/dev/null` is _not_ used in "
"place of the `a/` or `b/` filenames."
"When rename/copy is involved, `file1` and `file2` show the name of the "
"source file of the rename/copy and the name of the file that rename/copy "
"produces, respectively."
#. type: Plain text
#: en/diff-generate-patch.txt:27