<o​frnxmr:xmr.mx> What is this

<p​yxmr2025:mozilla.org> plowsof and your noreply email's header.

<p​yxmr2025:mozilla.org> monero-project/monero-site #2486 LGMT!

<p​yxmr2025:mozilla.org> Thank you very much!plowsof and ofrnxmr.I learnt a lot!

<p​yxmr2025:mozilla.org> @plowsof:matrix.org @ofrnxmr:xmr.mx That's the title, i18n: Fix fcmp keys and update documentation

<p​yxmr2025:mozilla.org> - Added hyphens to fcmp keys

<p​yxmr2025:mozilla.org> - Removed duplicate translation keys

<p​yxmr2025:mozilla.org> - Corrected FAQ and roadmap entries

<p​yxmr2025:mozilla.org> Co-authored-by: nahuhh <50635951+ nahuhh⊙ungc >

<p​yxmr2025:mozilla.org> Co-authored-by: plowsof <77655812+ plowsof⊙ungc >

<o​frnxmr:xmr.mx> No

<o​frnxmr:xmr.mx> Wtf bro

<o​frnxmr:xmr.mx> Remove the co-authors!

i can resubmit to stop the spam

<o​frnxmr:xmr.mx> The pr was correct a few hrs ago. Idk why Jackie @pyxmr2025:mozilla.org does not listen

<o​frnxmr:xmr.mx> I specifically said "dont add co-authors to this"

<p​yxmr2025:mozilla.org> OK,wait.

<p​yxmr2025:mozilla.org> OK,wait for an hour.

<p​yxmr2025:mozilla.org> sorry.

🙏

<p​yxmr2025:mozilla.org> I closed my PR and merged it directly monero-project/monero-site #2487 Okay.

thank you

<p​yxmr2025:mozilla.org> Well, I'm an impatient person. I will change my habit of sending spam. I'm really sorry to disturb you.

.merge- 2486

Removed

.merge+ 2487

Added

<p​yxmr2025:mozilla.org> Well, I'm an impatient person. I will change my habit of sending spam. I'm really sorry to disturb you and ofrnxmr.

<o​frnxmr:xmr.mx> Jackie @pyxmr2025:mozilla.org monero-project/monero-site #2487#issuecomment-3012794116

<o​frnxmr:xmr.mx> Stop

<p​yxmr2025:mozilla.org> ok,del

<p​yxmr2025:mozilla.org> sorry

<p​yxmr2025:mozilla.org> I have a question: Since it's already done, why hasn't it been merged yet?

<o​frnxmr:xmr.mx> because you're nagging and spamming our email

<p​yxmr2025:mozilla.org> Okay, I'll stop talking.

<p​yxmr2025:mozilla.org> I won't care about this

<o​frnxmr:xmr.mx> i didnt say stop talking, i'm saying stop asking every 60mins "when merge"

<p​yxmr2025:mozilla.org> well.Okay.

<o​frnxmr:xmr.mx> the work is done, it will be merged shortly

<p​yxmr2025:mozilla.org> good Thank you, I will not continue to inquire.

<o​frnxmr:xmr.mx> thank you. be patient

<o​frnxmr:xmr.mx> shouldnt be long, its not a big change

<o​frnxmr:xmr.mx> Merging when someone is pressuring you to merge, is a bad precedent to set. So just kick back and relax / continue work on the other pr

<p​yxmr2025:mozilla.org> Thank you for teaching.

<p​yxmr2025:mozilla.org> merged

<o​frnxmr:xmr.mx> delete your merge commit

<o​frnxmr:xmr.mx> We don't do merge commits in PRs

<o​frnxmr:xmr.mx> `git reset --hard HEAD~1`

<o​frnxmr:xmr.mx> then force push

<o​frnxmr:xmr.mx> if you have any uncommited work, it will be lost. Run `git stash` first if you have uncommitted work

<o​frnxmr:xmr.mx> Jackie @pyxmr2025:mozilla.org

<p​yxmr2025:mozilla.org> What do you mean, which PR

<o​frnxmr:xmr.mx> monero-project/monero-site #2485

<o​frnxmr:xmr.mx> if you didnt do the merge commit manually, then your IDE did it and you need to disable some setting

<p​yxmr2025:mozilla.org> OK,wait.

<p​yxmr2025:mozilla.org> Do I create a PR after completing my work?

<o​frnxmr:xmr.mx> what?

<p​yxmr2025:mozilla.org> This is a translation PR

<o​frnxmr:xmr.mx> in the translation pr, there is a merge commit here monero-project/monero-site ecdba51

<o​frnxmr:xmr.mx> This should not be here

<p​yxmr2025:mozilla.org> uh,yes

<p​yxmr2025:mozilla.org> I just need to delete it monero-project/monero-site #2485/commits/ecdba51fd0f70f69ef1621d864f8adfcd9bd8176 that's right

<o​frnxmr:xmr.mx> if it isnt caused by your IDE, its possibly due to using master and pulling in the latest master

<o​frnxmr:xmr.mx> Yes, just `git reset --hard HEAD~1`

<p​yxmr2025:mozilla.org> matrix.monero.social/_matrix/media/…49c388502b42a02d1938595916839649280

<p​yxmr2025:mozilla.org> This was generated when I synchronized the branch

<o​frnxmr:xmr.mx> Oh, you did this using github. Even worse :D lol

<p​yxmr2025:mozilla.org> yes,github

<p​yxmr2025:mozilla.org> matrix.monero.social/_matrix/media/…d78a00c96bdbdc7f1938596213599240192

<p​yxmr2025:mozilla.org> Do I still need to delete it

<o​frnxmr:xmr.mx> It messed up your pr becauae you created the pr using your master branch

<o​frnxmr:xmr.mx> Yea, delete it

<p​yxmr2025:mozilla.org> Yes

<o​frnxmr:xmr.mx> Use the terminal

<p​yxmr2025:mozilla.org> Shall I delete it first and then open a new one?

<o​frnxmr:xmr.mx> use da terminal

<p​yxmr2025:mozilla.org> matrix.monero.social/_matrix/media/…6b66afb0e4a27df81938597015596302336

<p​yxmr2025:mozilla.org> ofrnxmr: hey.

<p​yxmr2025:mozilla.org> Deleted it, what should I do or not do

<o​frnxmr:xmr.mx> How did you delete it

<p​yxmr2025:mozilla.org> matrix.monero.social/_matrix/media/…2977c812672895c71938598217201483776

<o​frnxmr:xmr.mx> Ok, run `git remote -v`

<p​yxmr2025:mozilla.org> then?

<o​frnxmr:xmr.mx> What does it output?

<p​yxmr2025:mozilla.org> matrix.monero.social/_matrix/media/…155ce1744ada733e1938598573813792768

<o​frnxmr:xmr.mx> `git remote add upstream github.com/monero-project/monero-site`

<p​yxmr2025:mozilla.org> then

<o​frnxmr:xmr.mx> `git fetch upstream`

<p​yxmr2025:mozilla.org> root@61dd977e4482:/workspace/monero-site# git fetch upstream

<p​yxmr2025:mozilla.org> remote: Enumerating objects: 14, done.

<p​yxmr2025:mozilla.org> remote: Counting objects: 100% (8/8), done.

<p​yxmr2025:mozilla.org> remote: Compressing objects: 100% (3/3), done.

<p​yxmr2025:mozilla.org> remote: Total 14 (delta 5), reused 6 (delta 5), pack-reused 6 (from 2)

<p​yxmr2025:mozilla.org> Unpacking objects: 100% (14/14), done.

<p​yxmr2025:mozilla.org> From github.com/monero-project/monero-site

<p​yxmr2025:mozilla.org> * [new branch] dependabot/bundler/rexml-3.3.3 -> upstream/dependabot/bundler/rexml-3.3.3

<p​yxmr2025:mozilla.org> * [new branch] master -> upstream/master

<o​frnxmr:xmr.mx> `git rebase upstream/master`

<p​yxmr2025:mozilla.org> Applying: Translation on lines 1-46

<p​yxmr2025:mozilla.org> Applying: Fix errors on lines 1-46

<p​yxmr2025:mozilla.org> Applying: Translate lines 48-61 corresponding to en.yml

<p​yxmr2025:mozilla.org> Applying: Translate 63-120 lines and fix known errors

<p​yxmr2025:mozilla.org> Applying: Translate lines 122 to 143 in en.yml to zh-cn.yml

<p​yxmr2025:mozilla.org> Applying: Fix known details issues

<p​yxmr2025:mozilla.org> Applying: 128 line fix (IRC) for Chinese bracket issue

<p​yxmr2025:mozilla.org> Applying: Translated lines 145-245 (corresponding to en.yml) and fixed the issue with Chinese quotation marks.

<p​yxmr2025:mozilla.org> Applying: Translated lines 227-302 of en.yml and fixed quotation mark and colon issues

<p​yxmr2025:mozilla.org> Applying: Translated lines 384-589 of en.yml and improved the translation of 'Chat' to make it more colloquial

<p​yxmr2025:mozilla.org> Applying: Fixed 476 lines @mnemonic-seed

<p​yxmr2025:mozilla.org> git push -f origin <>?

<p​yxmr2025:mozilla.org> What does the branch write

<p​yxmr2025:mozilla.org> master?or

<p​yxmr2025:mozilla.org> matrix.monero.social/_matrix/media/…46177d00b83ee5261938599777201553408

<p​yxmr2025:mozilla.org> Thanks!

<o​frnxmr:xmr.mx> Np

<o​frnxmr:xmr.mx> You still need to edit the keys in the cn file

<o​frnxmr:xmr.mx> want me to get nahuhh to send diff?

<p​yxmr2025:mozilla.org> No need, thank you. I will

<p​yxmr2025:mozilla.org> matrix.monero.social/_matrix/media/…7953645cad5dbf3b1938607311161393152

<p​yxmr2025:mozilla.org> I also changed the translation of the previous video_ring, which I think is more appropriate

<p​yxmr2025:mozilla.org> Thank you very much.