Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

17.0 mig l10n fr hr check ssnid #506

Merged
merged 28 commits into from
Jan 19, 2024

Conversation

youelEl
Copy link

@youelEl youelEl commented Jan 4, 2024

No description provided.

alexis-via and others added 28 commits January 4, 2024 10:00
Convert README to new sub-dir format
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: l10n-france-14.0/l10n-france-14.0-l10n_fr_hr_check_ssnid
Translate-URL: https://translation.odoo-community.org/projects/l10n-france-14-0/l10n-france-14-0-l10n_fr_hr_check_ssnid/
Unfuck the "Donald Trump" pull request: this is the real/serious work made
by the anti-Donald Trump squad.
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: l10n-france-16.0/l10n-france-16.0-l10n_fr_hr_check_ssnid
Translate-URL: https://translation.odoo-community.org/projects/l10n-france-16-0/l10n-france-16-0-l10n_fr_hr_check_ssnid/
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: l10n-france-16.0/l10n-france-16.0-l10n_fr_hr_check_ssnid
Translate-URL: https://translation.odoo-community.org/projects/l10n-france-16-0/l10n-france-16-0-l10n_fr_hr_check_ssnid/
Currently translated at 100.0% (2 of 2 strings)

Translation: l10n-france-16.0/l10n-france-16.0-l10n_fr_hr_check_ssnid
Translate-URL: https://translation.odoo-community.org/projects/l10n-france-16-0/l10n-france-16-0-l10n_fr_hr_check_ssnid/fr/
@youelEl youelEl mentioned this pull request Jan 4, 2024
25 tasks
@alexis-via
Copy link
Contributor

/ocabot merge nobump

@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 17.0-ocabot-merge-pr-506-by-alexis-via-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot merged commit fe30948 into OCA:17.0 Jan 19, 2024
2 checks passed
@OCA-git-bot
Copy link
Contributor

Congratulations, your PR was merged at dff8fd8. Thanks a lot for contributing to OCA. ❤️

@OCA-git-bot
Copy link
Contributor

@alexis-via The merge process could not be finalized, because command git push origin 17.0-ocabot-merge-pr-506-by-alexis-via-bump-nobump:17.0 failed with output:

To https://github.com/OCA/l10n-france
 ! [rejected]          17.0-ocabot-merge-pr-506-by-alexis-via-bump-nobump -> 17.0 (non-fast-forward)
error: failed to push some refs to 'https://***@github.com/OCA/l10n-france'
hint: Updates were rejected because a pushed branch tip is behind its remote
hint: counterpart. Check out this branch and integrate the remote changes
hint: (e.g. 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants