Skip to content

Russian translation update#3869

Closed
AndylgTom wants to merge 3 commits intobambulab:masterfrom
AndylgTom:master
Closed

Russian translation update#3869
AndylgTom wants to merge 3 commits intobambulab:masterfrom
AndylgTom:master

Conversation

@AndylgTom
Copy link
Copy Markdown
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
Copy Markdown
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
Copy Markdown
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
Copy Markdown
Collaborator

image
you need to do the rebase
and resolve the conflicts

do you use "git rebase" before?

@AndylgTom
Copy link
Copy Markdown
Contributor Author

Done.

@lanewei120
Copy link
Copy Markdown
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