comprehensive-rust icon indicating copy to clipboard operation
comprehensive-rust copied to clipboard

Published 20 hours ago • verified publisher icon google

zh-Hans: Translate src/android.md, src/android/build-rules.md, src/android/setup.md

Open jasminewu229 opened this issue 2 years ago • 4 comments

src/android.md, src/android/build-rules.md, src/android/setup.md

Part of #324.

jasminewu229 avatar May 30 '23 06:05 jasminewu229

Hi @jasminewu229, please work with @suetfei to resolve the merge conflicts. Then we can merge this :smile:

mgeisler avatar Jun 03 '23 07:06 mgeisler

@wnghl and @kongy, you're also welcome to try and resolve the conflicts here so we can get this merged.

mgeisler avatar Jun 08 '23 08:06 mgeisler

Hi, sorry for late reply as I had a few days off without internet. And thanks @kongy @wnghl @suetfei @mgeisler for working on this PR. It seems we need someone with write access to resolve conflicts and merge this PR?

jasminewu229 avatar Jun 12 '23 12:06 jasminewu229

It seems we need someone with write access to resolve conflicts and merge this PR?

Hey @jasminewu229, you should solve the conflicts in your fork, for example by merging the main branch from this repository into your main branch.

Since there are ~11 strings with translations, it might be easier for you to copy-paste them into a new fork and then open a new PR.

mgeisler avatar Jun 12 '23 14:06 mgeisler

Hey @jasminewu229, you should solve the conflicts in your fork, for example by merging the main branch from this repository into your main branch.

I went ahead and copied the commits onto the current main — there were no conflicts, so I'll merge the PR now.

mgeisler avatar Jun 13 '23 18:06 mgeisler