Skip to content
Snippets Groups Projects
Commit 64976ebf authored by Jean-Noël Avila's avatar Jean-Noël Avila
Browse files

First commit

parents
No related branches found
No related tags found
No related merge requests found
Showing
with 798 additions and 0 deletions
manpage-base-url.xsl
po4a.conf
*/*.txt
*/*.1
*/*.html
*/*.xml
*/*.dep+
!en/*.txt
po/*.mo
\ No newline at end of file
GIT_VERSION = 2.12.1.431.g53026fc228
Makefile 0 → 100644
EN_SOURCES = $(wildcard en/*.txt)
LANGUAGE_PO = $(wildcard po/*.po)
ALL_LANGUAGES = $(subst po/documentation.,,$(subst .po,,$(LANGUAGE_PO)))
TARGETS = all man html clean install
ifneq ($(findstring $(MAKEFLAGS),s),s)
ifndef V
QUIET_PO4A = @echo ' ' PO4A $@;
QUIET_ASCIIDOC = @echo ' ' ASCIIDOC $@;
QUIET_XMLTO = @echo ' ' XMLTO $@;
QUIET_DB2TEXI = @echo ' ' DB2TEXI $@;
QUIET_MAKEINFO = @echo ' ' MAKEINFO $@;
QUIET_DBLATEX = @echo ' ' DBLATEX $@;
QUIET_XSLTPROC = @echo ' ' XSLTPROC $@;
QUIET_GEN = @echo ' ' GEN $@;
QUIET_LINT = @echo ' ' LINT $@;
QUIET_STDERR = 2> /dev/null
QUIET_SUBDIR0 = +@subdir=
QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo ' ' SUBDIR $$subdir; \
$(MAKE) $(PRINT_DIR) -C $$subdir
export V
endif
endif
po4a.conf: create_po4a_conf.sh sources.txt
./create_po4a_conf.sh
po4a-stamp: po4a.conf $(EN_SOURCES) $(LANGUAGE_PO) Makefile
$(QUIET_PO4A)po4a -v po4a.conf
@touch $@
update-sources:
./update-sources.sh
define MAKE_TARGET
$(1): po4a-stamp
$(foreach lang,$(ALL_LANGUAGES),@echo $lang; cd $(lang) && $(MAKE) -f ../makefile.locale $(1) lang=$(lang))
endef
$(foreach target, $(TARGETS), $(eval $(call MAKE_TARGET,$(target))))
README 0 → 100644
GIT Documentation Translations
=====================
This directory holds the translations for the documentation of
Git. This document describes how you can contribute to the effort of
enhancing the language coverage and maintaining the translation.
The two character language translation codes are defined by ISO_639-1, as
stated in the gettext(1) full manual, appendix A.1, Usual Language Codes.
Contributing to an existing translation
---------------------------------------
As a contributor for a language XX, you should first check TEAMS file in
this directory to see whether a dedicated team for your language XX
exists. Fork the dedicated repository and start to work if it exists.
Sometimes, contributors may find that the translations of their Git
documentation distributions are quite different with the translations
of the corresponding version from Git official. This is because some
Git distributions (such as from Ubuntu, etc.) have their own l10n
workflow. For this case, wrong translations should be reported and
fixed through their workflows.
Creating a new language translation
-----------------------------------
If you are the first contributor for the language XX, please fork this
repository, prepare and/or update the translated message file
po/documentation.XX.po (described later), and ask the l10n coordinator to
pull your work.
If there are multiple contributors for the same language, please first
coordinate among yourselves and nominate the team leader for your
language, so that the l10n coordinator only needs to interact with one
person per language.
Translation Process Flow
------------------------
The overall data-flow looks like this:
+-------------------+ +------------------+
| Git source code | ---(1)---> | L10n coordinator |
| repository | <---(4)--- | repository |
+-------------------+ +------------------+
| ^
(2) (3)
V |
+------------------+
| Language Team XX |
+------------------+
* The original documentation files are updated by the development team
* L10n coordinator pulls from the source (1) and updates the local
documentation source files and the message template
documentation.pot, and merges the changes into all
documentation.XX.po files
* Language team pulls from L10n coordinator (2)
* Language team updates the message file documentation.XX.po
* L10n coordinator pulls from Language team (3)
* L10n coordinator asks the result to be integrated (4).
Maintaining the documentation.pot file
--------------------------------------
(This is done by the documentation l10n coordinator).
The documentation.pot file contains a message catalog extracted from
Git's documentation sources. The l10n coordinator maintains it by
adding new translations or update existing ones with po4a(1). In
order to update the document sources to extract the messages from, the l10n
coordinator is expected to pull from the main git repository at
strategic point in history (e.g. when a major release and release
candidates are tagged), and then run "make update-sources" at the top-level
directory.
Language contributors use this file to prepare translations for their
language, but they are not expected to modify it.
Initializing a documentation.XX.po file
---------------------------------------
(This is done by the language teams).
If your language XX does not have translated message file
documentation.XX.po yet, you add a translation for the first time by
* editing the file create_po4a_conf.sh and adding your language code
to the first line, e.g. "[po4a_langs] fr XX", where XX is the
locale, such as "de", "is", "pt_BR", "zh_CN", etc. * running in
the Documentation/ directory
make man
A file po/documentation.XX.po was created, corresponding
to the newly created translation.
Then edit the automatically generated copyright info in your new
documentation.XX.po to be correct, e.g. for Icelandic:
@@ -1,6 +1,6 @@
-# Icelandic translations for PACKAGE package.
-# Copyright (C) 2010 THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# Icelandic translations for Git documentation.
+# Copyright (C) 2010 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
+# This file is distributed under the same license as the Git package.
# Ævar Arnfjörð Bjarmason <avarab@gmail.com>, 2010.
And change references to PACKAGE VERSION in the PO Header Entry to
just "Git Documentation":
perl -pi -e 's/(?<="Project-Id-Version: )PACKAGE VERSION/Git
Documentation/' documentation.XX.po
Once you are done testing the translation (see below), commit the
create_po4a_conf.sh and documentation.XX.po files and ask the l10n coordinator
to pull from you.
Updating a documentation.XX.po file
-----------------------------------
(This is done by the language teams).
If you are replacing translation strings in an existing
documentation.XX.po file to improve the translation, just edit the
file.
If there's an existing documentation.XX.po file for your language, but
the repository of the l10n coordinator has newer
documentation.pot file, you would need to first pull
from the l10n coordinator (see the beginning of this document for its
URL), and then update the existing translation by running:
msgmerge --add-location --backup=off -U documentation.XX.po documentation.pot
where documentation.XX.po is the file you want to update.
Once you are done testing the translation (see below), commit the result
and ask the l10n coordinator to pull from you.
Testing your changes
--------------------
(This is done by the language teams, after creating or updating
documentation.XX.po file).
Before you submit your changes do:
$ make install
On systems with GNU gettext (i.e. not Solaris) and po4a this will try
to merge translations with the source asciidoc files into translated
asciidoc files, compile them to manpages and install the resulting
files in your system.
Then you can check the translated manpage, for instance for `git add`:
$ man git add
and verify how your translated manpage is rendered.
TEAMS 0 → 100644
Git Documentation translation language teams
(please keep the list sorted alphabetically on language field)
Language: fr (French)
Repository: https://github.com/jnavila/git
Leader: Jean-Noël Avila <jn.avila@free.fr>
TRADUCTION
----------
Cette page de manuel a été traduite par Jean-Noël Avila <jn.avila AT free DOT fr> et les membres de la liste ???. Veuillez signaler toute erreur de traduction par un rapport de bogue sur le ???.
This diff is collapsed.
#!/bin/bash
(cat <<EOF
[po4a_langs] fr
[po4a_paths] po/documentation.pot \$lang:po/documentation.\$lang.po
[options] opt: " -k 80"
EOF
) >po4a.conf
for f in $(cat sources.txt)
do
echo "[type: asciidoc] en/$f \$lang:./\$lang/$f" >> po4a.conf
done
-b::
Show blank SHA-1 for boundary commits. This can also
be controlled via the `blame.blankboundary` config option.
--root::
Do not treat root commits as boundaries. This can also be
controlled via the `blame.showRoot` config option.
--show-stats::
Include additional statistics at the end of blame output.
-L <start>,<end>::
-L :<funcname>::
Annotate only the given line range. May be specified multiple times.
Overlapping ranges are allowed.
+
<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>.
+
include::line-range-format.txt[]
-l::
Show long rev (Default: off).
-t::
Show raw timestamp (Default: off).
-S <revs-file>::
Use revisions from revs-file instead of calling linkgit:git-rev-list[1].
--reverse <rev>..<rev>::
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.
-p::
--porcelain::
Show in a format designed for machine consumption.
--line-porcelain::
Show the porcelain format, but output commit information for
each line, not just the first time a commit is referenced.
Implies --porcelain.
--incremental::
Show the result incrementally in a format designed for
machine consumption.
--encoding=<encoding>::
Specifies the encoding used to output author names
and commit summaries. Setting it to `none` makes blame
output unconverted data. For more information see the
discussion about encoding in the linkgit:git-log[1]
manual page.
--contents <file>::
When <rev> is not specified, the command annotates the
changes starting backwards from the working tree copy.
This flag makes the command pretend as if the working
tree copy has the contents of the named file (specify
`-` to make the command read from the standard input).
--date <format>::
Specifies the format used to output dates. If --date is not
provided, the value of the blame.date config variable is
used. If the blame.date config variable is also not set, the
iso format is used. For supported values, see the discussion
of the --date option at linkgit:git-log[1].
--[no-]progress::
Progress status is reported on the standard error stream
by default when it is attached to a terminal. This flag
enables progress reporting even if not attached to a
terminal. Can't use `--progress` together with `--porcelain`
or `--incremental`.
-M[<num>]::
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. A) to the child commit. With this
option, both groups of lines are blamed on the parent by
running extra passes of inspection.
+
<num> is optional but it is the lower bound on the number of
alphanumeric characters that Git must detect as moving/copying
within a file for it to associate those lines with the parent
commit. The default value is 20.
-C[<num>]::
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.
+
<num> is optional but it is the lower bound on the number of
alphanumeric characters that Git must detect as moving/copying
between files for it to associate those lines with the parent
commit. And the default value is 40. If there are more than one
`-C` options given, the <num> argument of the last `-C` will
take effect.
-h::
Show help message.
linkgit:git-annotate[1]::
Annotate file lines with commit information.
linkgit:git-blame[1]::
Show what revision and author last modified each line of a file.
linkgit:git-cherry[1]::
Find commits yet to be applied to upstream.
linkgit:git-count-objects[1]::
Count unpacked number of objects and their disk consumption.
linkgit:git-difftool[1]::
Show changes using common diff tools.
linkgit:git-fsck[1]::
Verifies the connectivity and validity of the objects in the database.
linkgit:git-get-tar-commit-id[1]::
Extract commit ID from an archive created using git-archive.
linkgit:git-help[1]::
Display help information about Git.
linkgit:git-instaweb[1]::
Instantly browse your working repository in gitweb.
linkgit:git-merge-tree[1]::
Show three-way merge without touching index.
linkgit:git-rerere[1]::
Reuse recorded resolution of conflicted merges.
linkgit:git-rev-parse[1]::
Pick out and massage parameters.
linkgit:git-show-branch[1]::
Show branches and their commits.
linkgit:git-verify-commit[1]::
Check the GPG signature of commits.
linkgit:git-verify-tag[1]::
Check the GPG signature of tags.
linkgit:git-whatchanged[1]::
Show logs with difference each commit introduces.
linkgit:gitweb[1]::
Git web interface (web frontend to Git repositories).
linkgit:git-config[1]::
Get and set repository or global options.
linkgit:git-fast-export[1]::
Git data exporter.
linkgit:git-fast-import[1]::
Backend for fast Git data importers.
linkgit:git-filter-branch[1]::
Rewrite branches.
linkgit:git-mergetool[1]::
Run merge conflict resolution tools to resolve merge conflicts.
linkgit:git-pack-refs[1]::
Pack heads and tags for efficient repository access.
linkgit:git-prune[1]::
Prune all unreachable objects from the object database.
linkgit:git-reflog[1]::
Manage reflog information.
linkgit:git-remote[1]::
Manage set of tracked repositories.
linkgit:git-repack[1]::
Pack unpacked objects in a repository.
linkgit:git-replace[1]::
Create, list, delete refs to replace objects.
linkgit:git-archimport[1]::
Import an Arch repository into Git.
linkgit:git-cvsexportcommit[1]::
Export a single commit to a CVS checkout.
linkgit:git-cvsimport[1]::
Salvage your data out of another SCM people love to hate.
linkgit:git-cvsserver[1]::
A CVS server emulator for Git.
linkgit:git-imap-send[1]::
Send a collection of patches from stdin to an IMAP folder.
linkgit:git-p4[1]::
Import from and submit to Perforce repositories.
linkgit:git-quiltimport[1]::
Applies a quilt patchset onto the current branch.
linkgit:git-request-pull[1]::
Generates a summary of pending changes.
linkgit:git-send-email[1]::
Send a collection of patches as emails.
linkgit:git-svn[1]::
Bidirectional operation between a Subversion repository and Git.
linkgit:git-add[1]::
Add file contents to the index.
linkgit:git-am[1]::
Apply a series of patches from a mailbox.
linkgit:git-archive[1]::
Create an archive of files from a named tree.
linkgit:git-bisect[1]::
Use binary search to find the commit that introduced a bug.
linkgit:git-branch[1]::
List, create, or delete branches.
linkgit:git-bundle[1]::
Move objects and refs by archive.
linkgit:git-checkout[1]::
Switch branches or restore working tree files.
linkgit:git-cherry-pick[1]::
Apply the changes introduced by some existing commits.
linkgit:git-citool[1]::
Graphical alternative to git-commit.
linkgit:git-clean[1]::
Remove untracked files from the working tree.
linkgit:git-clone[1]::
Clone a repository into a new directory.
linkgit:git-commit[1]::
Record changes to the repository.
linkgit:git-describe[1]::
Give an object a human readable name based on an available ref.
linkgit:git-diff[1]::
Show changes between commits, commit and working tree, etc.
linkgit:git-fetch[1]::
Download objects and refs from another repository.
linkgit:git-format-patch[1]::
Prepare patches for e-mail submission.
linkgit:git-gc[1]::
Cleanup unnecessary files and optimize the local repository.
linkgit:git-grep[1]::
Print lines matching a pattern.
linkgit:git-gui[1]::
A portable graphical interface to Git.
linkgit:git-init[1]::
Create an empty Git repository or reinitialize an existing one.
linkgit:git-log[1]::
Show commit logs.
linkgit:git-merge[1]::
Join two or more development histories together.
linkgit:git-mv[1]::
Move or rename a file, a directory, or a symlink.
linkgit:git-notes[1]::
Add or inspect object notes.
linkgit:git-pull[1]::
Fetch from and integrate with another repository or a local branch.
linkgit:git-push[1]::
Update remote refs along with associated objects.
linkgit:git-rebase[1]::
Reapply commits on top of another base tip.
linkgit:git-reset[1]::
Reset current HEAD to the specified state.
linkgit:git-revert[1]::
Revert some existing commits.
linkgit:git-rm[1]::
Remove files from the working tree and from the index.
linkgit:git-shortlog[1]::
Summarize 'git log' output.
linkgit:git-show[1]::
Show various types of objects.
linkgit:git-stash[1]::
Stash the changes in a dirty working directory away.
linkgit:git-status[1]::
Show the working tree status.
linkgit:git-submodule[1]::
Initialize, update or inspect submodules.
linkgit:git-tag[1]::
Create, list, delete or verify a tag object signed with GPG.
linkgit:git-worktree[1]::
Manage multiple working trees.
linkgit:gitk[1]::
The Git repository browser.
linkgit:git-cat-file[1]::
Provide content or type and size information for repository objects.
linkgit:git-diff-files[1]::
Compares files in the working tree and the index.
linkgit:git-diff-index[1]::
Compare a tree to the working tree or index.
linkgit:git-diff-tree[1]::
Compares the content and mode of blobs found via two tree objects.
linkgit:git-for-each-ref[1]::
Output information on each ref.
linkgit:git-ls-files[1]::
Show information about files in the index and the working tree.
linkgit:git-ls-remote[1]::
List references in a remote repository.
linkgit:git-ls-tree[1]::
List the contents of a tree object.
linkgit:git-merge-base[1]::
Find as good common ancestors as possible for a merge.
linkgit:git-name-rev[1]::
Find symbolic names for given revs.
linkgit:git-pack-redundant[1]::
Find redundant pack files.
linkgit:git-rev-list[1]::
Lists commit objects in reverse chronological order.
linkgit:git-show-index[1]::
Show packed archive index.
linkgit:git-show-ref[1]::
List references in a local repository.
linkgit:git-unpack-file[1]::
Creates a temporary file with a blob's contents.
linkgit:git-var[1]::
Show a Git logical variable.
linkgit:git-verify-pack[1]::
Validate packed Git archive files.
linkgit:git-apply[1]::
Apply a patch to files and/or to the index.
linkgit:git-checkout-index[1]::
Copy files from the index to the working tree.
linkgit:git-commit-tree[1]::
Create a new commit object.
linkgit:git-hash-object[1]::
Compute object ID and optionally creates a blob from a file.
linkgit:git-index-pack[1]::
Build pack index file for an existing packed archive.
linkgit:git-merge-file[1]::
Run a three-way file merge.
linkgit:git-merge-index[1]::
Run a merge for files needing merging.
linkgit:git-mktag[1]::
Creates a tag object.
linkgit:git-mktree[1]::
Build a tree-object from ls-tree formatted text.
linkgit:git-pack-objects[1]::
Create a packed archive of objects.
linkgit:git-prune-packed[1]::
Remove extra objects that are already in pack files.
linkgit:git-read-tree[1]::
Reads tree information into the index.
linkgit:git-symbolic-ref[1]::
Read, modify and delete symbolic refs.
linkgit:git-unpack-objects[1]::
Unpack objects from a packed archive.
linkgit:git-update-index[1]::
Register file contents in the working tree to the index.
linkgit:git-update-ref[1]::
Update the object name stored in a ref safely.
linkgit:git-write-tree[1]::
Create a tree object from the current index.
linkgit:git-check-attr[1]::
Display gitattributes information.
linkgit:git-check-ignore[1]::
Debug gitignore / exclude files.
linkgit:git-check-mailmap[1]::
Show canonical names and email addresses of contacts.
linkgit:git-check-ref-format[1]::
Ensures that a reference name is well formed.
linkgit:git-column[1]::
Display data in columns.
linkgit:git-credential[1]::
Retrieve and store user credentials.
linkgit:git-credential-cache[1]::
Helper to temporarily store passwords in memory.
linkgit:git-credential-store[1]::
Helper to store credentials on disk.
linkgit:git-fmt-merge-msg[1]::
Produce a merge commit message.
linkgit:git-interpret-trailers[1]::
add or parse structured information in commit messages.
linkgit:git-mailinfo[1]::
Extracts patch and authorship from a single e-mail message.
linkgit:git-mailsplit[1]::
Simple UNIX mbox splitter program.
linkgit:git-merge-one-file[1]::
The standard helper program to use with git-merge-index.
linkgit:git-patch-id[1]::
Compute unique ID for a patch.
linkgit:git-sh-i18n[1]::
Git's i18n setup code for shell scripts.
linkgit:git-sh-setup[1]::
Common Git shell script setup code.
linkgit:git-stripspace[1]::
Remove unnecessary whitespace.
linkgit:git-http-fetch[1]::
Download from a remote Git repository via HTTP.
linkgit:git-http-push[1]::
Push objects over HTTP/DAV to another repository.
linkgit:git-parse-remote[1]::
Routines to help parsing remote repository access parameters.
linkgit:git-receive-pack[1]::
Receive what is pushed into the repository.
linkgit:git-shell[1]::
Restricted login shell for Git-only SSH access.
linkgit:git-upload-archive[1]::
Send archive back to git-archive.
linkgit:git-upload-pack[1]::
Send objects packed back to git-fetch-pack.
linkgit:git-daemon[1]::
A really simple server for Git repositories.
linkgit:git-fetch-pack[1]::
Receive missing objects from another repository.
linkgit:git-http-backend[1]::
Server side implementation of Git over HTTP.
linkgit:git-send-pack[1]::
Push objects over Git protocol to another repository.
linkgit:git-update-server-info[1]::
Update auxiliary info file to help dumb servers.
This diff is collapsed.
DATE FORMATS
------------
The `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` environment variables
ifdef::git-commit[]
and the `--date` option
endif::git-commit[]
support the following date formats:
Git internal format::
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`.
RFC 2822::
The standard email format as described by RFC 2822, for example
`Thu, 07 Apr 2005 22:13:13 +0200`.
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.
+
NOTE: In addition, the date part is accepted in the following formats:
`YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment