Skip to content

Conversation

@marielejeune
Copy link
Contributor

No description provided.

naousse and others added 30 commits October 19, 2022 14:29
* Copyright and various stuff
* Contributors
* External ID not found in the system: base.group_document_user
Currently translated at 93.9% (31 of 33 strings)

Translation: knowledge-11.0/knowledge-11.0-knowledge
Translate-URL: https://translation.odoo-community.org/projects/knowledge-11-0/knowledge-11-0-knowledge/pt_BR/
Updated by Update PO files to match POT (msgmerge) hook in Weblate.
Otherwise the module grants too wide permissions for all users.
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.

Translation: knowledge-12.0/knowledge-12.0-knowledge
Translate-URL: https://translation.odoo-community.org/projects/knowledge-12-0/knowledge-12-0-knowledge/
@marielejeune
Copy link
Contributor Author

@pedrobaeza I tried to re-create a PR here

@pedrobaeza
Copy link
Member

It worked!

Selección_002

@@ -0,0 +1,167 @@
# Translation of Odoo Server.
# This file contains the translation of the following modules:
# * knowledge
Copy link
Contributor

@MiquelRForgeFlow MiquelRForgeFlow Oct 26, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
# * knowledge
# * document_knowledge

and also rename the file to document_knowledge.pot

@OCA-git-bot
Copy link
Contributor

This PR has the approved label and has been created more than 5 days ago. It should therefore be ready to merge by a maintainer (or a PSC member if the concerned addon has no declared maintainer). 🤖

@pedrobaeza
Copy link
Member

As the bot will do the POT/PO adaptations without losing the translations, let's not block more time this:

/ocabot migration knowledge
/ocabot merge nobump

@OCA-git-bot OCA-git-bot added this to the 16.0 milestone Nov 11, 2022
@OCA-git-bot
Copy link
Contributor

On my way to merge this fine PR!
Prepared branch 16.0-ocabot-merge-pr-368-by-pedrobaeza-bump-nobump, awaiting test results.

@OCA-git-bot OCA-git-bot mentioned this pull request Nov 11, 2022
12 tasks
@OCA-git-bot
Copy link
Contributor

The migration issue (#366) has been updated to reference the current pull request.
however, a previous pull request was referenced : #367.
Perhaps you should check that there is no duplicate work.
CC : @marielejeune

@OCA-git-bot
Copy link
Contributor

@pedrobaeza The merge process could not be finalized, because command git push origin 16.0-ocabot-merge-pr-368-by-pedrobaeza-bump-nobump:16.0 failed with output:

To https://github.com/OCA/knowledge
 ! [rejected]          16.0-ocabot-merge-pr-368-by-pedrobaeza-bump-nobump -> 16.0 (fetch first)
error: failed to push some refs to 'https://***@github.com/OCA/knowledge'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first 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.

@OCA-git-bot OCA-git-bot merged commit 04d9ff2 into OCA:16.0 Nov 11, 2022
@OCA-git-bot
Copy link
Contributor

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

@sbidoul sbidoul deleted the 16.0-mig-knowledge branch December 7, 2022 18:42
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.