From: Karel Zak <kzak@redhat.com>
Date: Thu, 22 Apr 2021 13:23:27 +0000 (+0200)
Subject: Merge branch 'topic/po4a' of https://github.com/mariobl/util-linux
X-Git-Tag: v2.37-rc2~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2b84ac2dbd41d894bc9bb5d50173b5de1f08e4b7;p=thirdparty%2Futil-linux.git

Merge branch 'topic/po4a' of https://github.com/mariobl/util-linux

* 'topic/po4a' of https://github.com/mariobl/util-linux:
  mount.a.adoc: Fix markup
  Asciidoc: Add missing macro definition in uclampset.1
  Asciidoc: Fix markup in example man page
  Asciidoc: Fix markup
  Asciidoc: Remove artifact from merge conflict
  Asciidoc: Convert man-common/README to Markdown
  po-man: Fix the example man page
  po-man: Fix typos in po-man/README.md
  po-man: Update the example man page
  po-man: Add po-man/README.md
  po-man: Add (incomplete) de.po for testing purposes
  po-man: Add (incomplete) de.po for testing purposes
  po-man: Adjust paths in po4a.cfg and update .pot file
  po-man: Move Po4a config file and translation template to po-man
---

2b84ac2dbd41d894bc9bb5d50173b5de1f08e4b7