Skip to content

Commit

Permalink
Update sources after switching to po4a v0.62
Browse files Browse the repository at this point in the history
Signed-off-by: Jean-Noël Avila <[email protected]>
  • Loading branch information
Jean-Noël Avila committed Dec 21, 2020
1 parent 5bbb9d1 commit 730928e
Show file tree
Hide file tree
Showing 8 changed files with 3,225 additions and 3,243 deletions.
2 changes: 1 addition & 1 deletion ci/install_po4a.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh

git clone https://github.com/mquinson/po4a.git
cd po4a && git checkout v0.56 && cd ..
cd po4a && git checkout v0.62 && cd ..
20 changes: 9 additions & 11 deletions en/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,8 @@ are:
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 .git file is.
would be the final location where the .git directory is, not where the
.git file is.
+
The pattern can contain standard globbing wildcards and two additional
ones, `**/` and `/**`, that can match multiple path components. Please
Expand Down Expand Up @@ -240,15 +240,13 @@ boolean::
When a variable is said to take a boolean value, many
synonyms are accepted for 'true' and 'false'; these are all
case-insensitive.
+
true;;
Boolean true literals are `yes`, `on`, `true`,
and `1`. Also, a variable defined without `= <value>`
is taken as true.

false;;
Boolean false literals are `no`, `off`, `false`,
`0` and the empty string.

true;; Boolean true literals are `yes`, `on`, `true`,
and `1`. Also, a variable defined without `= <value>`
is taken as true.

false;; Boolean false literals are `no`, `off`, `false`,
`0` and the empty string.
+
When converting a value to its canonical form using the `--type=bool` type
specifier, 'git config' will ensure that the output is "true" or
Expand Down
8 changes: 4 additions & 4 deletions en/git-fast-import.txt
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ Submodule Rewriting
--rewrite-submodules-from=<name>:<file>::
--rewrite-submodules-to=<name>:<file>::
Rewrite the object IDs for the submodule specified by <name> from the values
used in the from <file> to those used in the to <file>. The from marks should
have been created by `git fast-export`, and the to marks should have been
created by `git fast-import` when importing that same submodule.
used in the from <file> to those used in the to <file>. The from marks should
have been created by `git fast-export`, and the to marks should have been
created by `git fast-import` when importing that same submodule.
+
<name> may be any arbitrary string not containing a colon character, but the
same value must be used with both options when specifying corresponding marks.
Expand Down Expand Up @@ -1317,7 +1317,7 @@ An example crash:

Active Branch LRU
-----------------
active_branches = 1 cur, 5 max
active_branches = 1 cur, 5 max

pos clock name
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
11 changes: 7 additions & 4 deletions en/git-init.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,9 @@ DESCRIPTION

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.
`refs/tags`, and template files. An initial branch without any
commits will be created (see the `--initial-branch` option below
for its name).

If the `$GIT_DIR` environment variable is set then it specifies a path
to use instead of `./.git` for the base of the repository.
Expand Down Expand Up @@ -73,8 +74,10 @@ If this is reinitialization, the repository will be moved to the specified path.
-b <branch-name>::
--initial-branch=<branch-name>::

Use the specified name for the initial branch in the newly created repository.
If not specified, fall back to the default name: `master`.
Use the specified name for the initial branch in the newly created
repository. If not specified, fall back to the default name (currently
`master`, but this is subject to change in the future; the name can be
customized via the `init.defaultBranch` configuration variable).

--shared[=(false|true|umask|group|all|world|everybody|0xxx)]::

Expand Down
2 changes: 1 addition & 1 deletion en/git-rebase.txt
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ In addition, the following pairs of options are incompatible:
* --fork-point and --root

BEHAVIORAL DIFFERENCES
-----------------------
----------------------

git rebase has two primary backends: apply and merge. (The apply
backend used to be known as the 'am' backend, but the name led to
Expand Down
14 changes: 7 additions & 7 deletions en/git-update-index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -57,18 +57,18 @@ OPTIONS
updates are needed by checking stat() information.

-q::
Quiet. If --refresh finds that the index needs an update, the
default behavior is to error out. This option makes
Quiet. If --refresh finds that the index needs an update, the
default behavior is to error out. This option makes
'git update-index' continue anyway.

--ignore-submodules::
Do not try to update submodules. This option is only respected
when passed before --refresh.

--unmerged::
If --refresh finds unmerged changes in the index, the default
If --refresh finds unmerged changes in the index, the default
behavior is to error out. This option makes 'git update-index'
continue anyway.
continue anyway.

--ignore-missing::
Ignores missing files during a --refresh
Expand All @@ -81,10 +81,10 @@ OPTIONS
encouraged to use a single-parameter form.

--index-info::
Read index information from stdin.
Read index information from stdin.

--chmod=(+|-)x::
Set the execute permissions on the updated files.
Set the execute permissions on the updated files.

--[no-]assume-unchanged::
When this flag is specified, the object names recorded
Expand Down Expand Up @@ -157,7 +157,7 @@ you will need to handle the situation manually.
separated by LF (i.e. one path per line) by default.

--verbose::
Report what is being added and removed from index.
Report what is being added and removed from index.

--index-version <n>::
Write the resulting index out in the named on-disk format version.
Expand Down
Loading

0 comments on commit 730928e

Please sign in to comment.