Due to translations being changed during the sync, a merge conflict
happened while squashing commits in Weblate.
This commit fixes that by incorporating the latest Weblate changes, so
we can reset Weblate to the changes in GitHub.
closesodoo/documentation#15544
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
As per usual, leave off developer.pot and contributing.pot since we
don't translate them (not useful, can't really contribute to/dev in
Odoo without knowing English)
closesodoo/documentation#15363
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
Weblate sometimes incorrectly msgmerges when a line ends with `/""`
and wraps one of the `"`'s to the next line causing an invalid po file
since the closing `"` is now escaped so the line never correctly ends.
This unfortunately has to be manually fixed directly in the code for
now.
closesodoo/documentation#15031
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
settings.pot hasn't been exported since 14.0 and doesn't seem to
correspond to anything in the documentation anymore so it's probably
leftover from an old refactoring.
Note that an audit of the other pot files was done and this was the only
obsolete one found.
closesodoo/documentation#14934
Signed-off-by: Louis Wicket (wil) <wil@odoo.com>
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
Includes pot files with no term changes to force Weblate to correctly
sync the terms to translate within it (otherwise it uses what was in the
existing .po file which may be incorrect).
Part-of: odoo/documentation#14934
Signed-off-by: Louis Wicket (wil) <wil@odoo.com>
Signed-off-by: Tiffany Chang (tic) <tic@odoo.com>
