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

Feature 1471 german labels 4 #1895

Merged
merged 41 commits into from
Aug 8, 2024
Merged

Conversation

vismayajochem
Copy link
Contributor

@vismayajochem vismayajochem commented Jul 23, 2024

Summary of the discussion

I implemented several new german alternative labels, please check if everything is correct. To check see also the google doc https://docs.google.com/spreadsheets/d/1snsx6zF8dqXGM9WCX0EckrdGnorrB9lMnvdvP2fx9ZQ/edit#gid=687082420
I also implemented the english language tag to already existing english alternative labels.

Workflow checklist

Automation

Closes #

PR-Assignee

Reviewer

  • 🐙 Follow the Reviewer Guide
  • 🐙 Provided feedback and show sufficient appreciation for the work done

@vismayajochem
Copy link
Contributor Author

@l-emele: The conflict in CHANGELOG.md I could resolve but with the two other conflicts I was unsure which version was the accurate. If dev had been changed in the meantime and I should choose dev or if the dev is an old version and I should keep the feature branch. Could you have a look?

@github-actions github-actions bot added oeo-model changes the oeo-model module oeo-physical changes the oeo-physical module oeo-sector oeo-shared changes the oeo-shared module oeo-social changes the oeo-social module labels Jul 25, 2024
@vismayajochem
Copy link
Contributor Author

@areleu thanks for solving the conflicts! As far as I can tell the remarks in CHANGELOG should be under [2.x.x.] not under [2.3.0] as it currently is. So just putting #1895 after the #1883s under [2.X.X]...

Fixed reference confusion
Copy link
Contributor

@christian-rli christian-rli left a comment

Choose a reason for hiding this comment

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

Nice Work!

@vismayajochem vismayajochem merged commit b694044 into dev Aug 8, 2024
4 checks passed
@vismayajochem vismayajochem deleted the feature-1471-german-labels_4 branch August 8, 2024 09:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
oeo-model changes the oeo-model module oeo-physical changes the oeo-physical module oeo-sector oeo-shared changes the oeo-shared module oeo-social changes the oeo-social module
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants