Skip to content

Commit

Permalink
po4a/update-po: Disable wrapping in .pot and .po files
Browse files Browse the repository at this point in the history
The .po files from the Translation Project come with unwrapped
strings so this matches it.

This may reduce the noise in diffs too. When the beginning of
a paragraph had changed, the rest of the lines got rewrapped
in msgsid. Now it's just one very long line that changes when
a paragraph has been edited.

The --add-location=file option was removed as redundant. The line
numbers don't exist in the .pot file due to --porefs file and thus
they cannot get copied to the .po files either.
  • Loading branch information
Larhzu committed May 28, 2024
1 parent b14c130 commit 4beba1c
Showing 1 changed file with 11 additions and 4 deletions.
15 changes: 11 additions & 4 deletions po4a/update-po
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,16 @@ done
# as long as this isn't run every time when "make" is run at the
# top level directory. (po4a isn't super-fast even without --force).
#
# Using --porefs file and --msgmerge-opt '--add-location=file' make diffing
# the .pot and .po files easier. If a translator prefers to have the line
# numbers available, one may delete those options and rerun this script.
# Make diffing the .pot and .po files easier:
#
# --porefs file Put only the input filenames, not line numbers,
# into the .pot file. This way they won't get
# copied to the .po files either.
#
# --wrap-po newlines Wrap msgids only at \n in the .pot file.
#
# --msgmerge-opt "--no-wrap"
# Wrap msgids and msgstrs only at \n in the .po files.
#
# The values from --package-name and --package-version are used to create
# the Project-Id-Version field. It likely makes sense that its value isn't
Expand All @@ -67,7 +74,7 @@ done
# best to use "xz-man" here to get the most consistent results.
set -x
po4a --force --verbose \
--porefs file --msgmerge-opt '--add-location=file' \
--porefs file --wrap-po newlines --msgmerge-opt "--no-wrap" \
--package-name="xz-man" \
--package-version="$PACKAGE_VERSION" \
--copyright-holder="The XZ Utils authors and contributors" \
Expand Down

0 comments on commit 4beba1c

Please sign in to comment.