diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2020-09-19 07:01:34 -0400 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2020-11-20 22:53:31 -0500 |
| commit | 343946c08902aecad2b52cdda5761e6246825e99 (patch) | |
| tree | 4e664df178aeaf12e9c3fe19420b3c6a21c7b7a4 /HACKING | |
| parent | 6f6a58874ed66111ad0563e77fc01aef413f98ca (diff) | |
sq - docs
Diffstat (limited to 'HACKING')
| -rw-r--r-- | HACKING/translations.md | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/HACKING/translations.md b/HACKING/translations.md index 09de59b..2229d2a 100644 --- a/HACKING/translations.md +++ b/HACKING/translations.md @@ -77,19 +77,20 @@ line pair in the `msgmerge` output, with the new text as 'msgid', and an empty 'msgstr'; but the changes were too significant for the tool to determine the correlation. The standard output of `msgmerge` is the raw text for a new replacemnt .po file. Next, direct the output to a file, make the corrections -to the replacemnt .po file, using the `msgmerge` output as a guide. A merge tool -such as `meld`, is especially helpful for this task. A merge tool should -highlight the same merge conflicts, shown in the the `msgmerge` output, as a -side-by-side comparison. You want to merge all of the changes, including line -numbers (eg: # src/chroot-tools/libremakepkg:42) +to the replacemnt .po file, using the `msgmerge` output as a guide; then replace +the failed .po file with the new corrected file. $ msgmerge po/es/libretools.po po/libretools.pot > po/es/libretools.po-merged - $ meld po/es/libretools.po{-merged,} + $ mv po/es/libretools.po{-merged,} -Then delete the failed .po file, which is under sorce control, replace it with -the new corrected file. +Alternatively, a merge tool such as `meld`, is especially helpful for this task. +A merge tool should highlight the same merge conflicts, shown in the the +`msgmerge` output, as a side-by-side comparison, allowing you to merge the +changes from the generated '-merged' file, into the tracked .po file, in-place. +In order to minimize the possible merge conflict next time, it is best to merge +all of the changes, especially the comments with line numbers. - $ mv po/es/libretools.po{-merged,} + $ meld po/es/libretools.po{-merged,} Once `make clean && make` is able to complete successfully, commit the new .po file to the VCS. |