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

Russian translation update #3869

Closed
wants to merge 3 commits into from
Closed

Russian translation update #3869

wants to merge 3 commits into from

Conversation

AndylgTom
Copy link
Contributor

Russian translation update BambuStudio 1.9.0.70 Public Beta 3.
Improved translation, corrected errors.
Thx.

Russian translation update BambuStudio 1.9.0.70 Public Beta 3.
Improved translation, corrected errors.
Thx.
@lanewei120
Copy link
Collaborator

lanewei120 commented Apr 16, 2024

@AndylgTom
thanks for doing this
it seems has conflicts with our master codes
could you rebase to the newest and sove the conflicts?

@AndylgTom
Copy link
Contributor Author

@AndylgTom thanks for doing this it seems has conflicts with our master codes could you rebase to the newest and sove the conflicts?

I just updated the po file (based on the latest pot file) .
I hope I don't need to create new Pull requests.

@lanewei120
Copy link
Collaborator

image
you need to do the rebase
and resolve the conflicts

do you use "git rebase" before?

@AndylgTom
Copy link
Contributor Author

Done.

@lanewei120
Copy link
Collaborator

image
still failed
which commands are you using to solve this conflict?

if still failed, you can create a new pull request
and use a tool such as beyond compare to move the changes from old one to the new one

@AndylgTom AndylgTom closed this Apr 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants