00:13:30 <m-relay> <o​frnxmr:xmr.mx> What is this
01:42:26 <m-relay> <p​yxmr2025:mozilla.org> plowsof and your noreply email's header.
02:53:17 <m-relay> <p​yxmr2025:mozilla.org> https://github.com/monero-project/monero-site/pull/2486 LGMT!
03:40:08 <m-relay> <p​yxmr2025:mozilla.org> Thank you very much!plowsof and ofrnxmr.I learnt a lot!
04:19:04 <m-relay> <p​yxmr2025:mozilla.org> @plowsof:matrix.org @ofrnxmr:xmr.mx That's the title, i18n: Fix fcmp keys and update documentation
04:19:05 <m-relay> <p​yxmr2025:mozilla.org> - Added hyphens to fcmp keys
04:19:07 <m-relay> <p​yxmr2025:mozilla.org> - Removed duplicate translation keys
04:19:09 <m-relay> <p​yxmr2025:mozilla.org> - Corrected FAQ and roadmap entries
04:19:11 <m-relay> <p​yxmr2025:mozilla.org> Co-authored-by: nahuhh <50635951+ nahuhh⊙ungc >
04:19:13 <m-relay> <p​yxmr2025:mozilla.org> Co-authored-by: plowsof <77655812+ plowsof⊙ungc >
07:36:11 <m-relay> <o​frnxmr:xmr.mx> No
07:36:46 <m-relay> <o​frnxmr:xmr.mx> Wtf bro
07:37:33 <m-relay> <o​frnxmr:xmr.mx> Remove the co-authors!
07:43:56 <plowsof> i can resubmit to stop the spam 
07:45:16 <m-relay> <o​frnxmr:xmr.mx> The pr was correct a few hrs ago. Idk why Jackie @pyxmr2025:mozilla.org does not listen
07:45:42 <m-relay> <o​frnxmr:xmr.mx> I specifically said "dont add co-authors to this"
08:06:34 <m-relay> <p​yxmr2025:mozilla.org> OK,wait.
08:06:56 <m-relay> <p​yxmr2025:mozilla.org> OK,wait for an hour.
08:07:05 <m-relay> <p​yxmr2025:mozilla.org> sorry.
08:22:41 <plowsof> 🙏
08:37:20 <m-relay> <p​yxmr2025:mozilla.org> I closed my PR and merged it directly https://github.com/monero-project/monero-site/pull/2487 Okay.
08:40:43 <plowsof> thank you 
08:42:19 <m-relay> <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.
08:50:12 <plowsof> .merge- 2486
08:50:12 <xmr-pr> Removed
08:50:23 <plowsof> .merge+ 2487
08:50:23 <xmr-pr> Added
09:55:39 <m-relay> <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.
12:09:57 <m-relay> <o​frnxmr:xmr.mx> Jackie @pyxmr2025:mozilla.org  https://github.com/monero-project/monero-site/pull/2487#issuecomment-3012794116 
12:09:57 <m-relay> <o​frnxmr:xmr.mx> Stop
12:10:24 <m-relay> <p​yxmr2025:mozilla.org> ok,del
12:10:32 <m-relay> <p​yxmr2025:mozilla.org> sorry
12:11:54 <m-relay> <p​yxmr2025:mozilla.org> I have a question: Since it's already done, why hasn't it been merged yet?
12:13:14 <m-relay> <o​frnxmr:xmr.mx> because you're nagging and spamming our email
12:14:07 <m-relay> <p​yxmr2025:mozilla.org> Okay, I'll stop talking.
12:14:21 <m-relay> <p​yxmr2025:mozilla.org> I won't care about this
12:14:44 <m-relay> <o​frnxmr:xmr.mx> i didnt say stop talking, i'm saying stop asking every 60mins "when merge"
12:15:10 <m-relay> <p​yxmr2025:mozilla.org> well.Okay.
12:15:42 <m-relay> <o​frnxmr:xmr.mx> the work is done, it will be merged shortly
12:16:29 <m-relay> <p​yxmr2025:mozilla.org> good Thank you, I will not continue to inquire.
12:16:49 <m-relay> <o​frnxmr:xmr.mx> thank you. be patient
12:17:27 <m-relay> <o​frnxmr:xmr.mx> shouldnt be long, its not a big change
12:18:15 <m-relay> <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
12:18:50 <m-relay> <p​yxmr2025:mozilla.org> Thank you for teaching.
13:36:51 <m-relay> <p​yxmr2025:mozilla.org> merged
13:40:53 <m-relay> <o​frnxmr:xmr.mx> delete your merge commit
13:41:29 <m-relay> <o​frnxmr:xmr.mx> We don't do merge commits in PRs
13:43:17 <m-relay> <o​frnxmr:xmr.mx> `git reset --hard HEAD~1`
13:43:19 <m-relay> <o​frnxmr:xmr.mx> then force push
13:43:21 <m-relay> <o​frnxmr:xmr.mx> if you have any uncommited work, it will be lost. Run `git stash` first if you have uncommitted work
13:43:23 <m-relay> <o​frnxmr:xmr.mx> Jackie @pyxmr2025:mozilla.org
13:44:27 <m-relay> <p​yxmr2025:mozilla.org> What do you mean, which PR
13:44:38 <m-relay> <o​frnxmr:xmr.mx> https://github.com/monero-project/monero-site/pull/2485
13:46:05 <m-relay> <o​frnxmr:xmr.mx> if you didnt do the merge commit manually, then your IDE did it and you need to disable some setting
13:46:20 <m-relay> <p​yxmr2025:mozilla.org> OK,wait.
13:47:14 <m-relay> <p​yxmr2025:mozilla.org> Do I create a PR after completing my work?
13:47:28 <m-relay> <o​frnxmr:xmr.mx> what?
13:47:47 <m-relay> <p​yxmr2025:mozilla.org> This is a translation PR
13:48:42 <m-relay> <o​frnxmr:xmr.mx> in the translation pr, there is a merge commit here https://github.com/monero-project/monero-site/commit/ecdba51fd0f70f69ef1621d864f8adfcd9bd8176
13:49:05 <m-relay> <o​frnxmr:xmr.mx> This should not be here
13:49:45 <m-relay> <p​yxmr2025:mozilla.org> uh,yes
13:50:07 <m-relay> <p​yxmr2025:mozilla.org> I just need to delete it https://github.com/monero-project/monero-site/pull/2485/commits/ecdba51fd0f70f69ef1621d864f8adfcd9bd8176 that's right
13:50:09 <m-relay> <o​frnxmr:xmr.mx> if it isnt caused by your IDE, its possibly due to using master and pulling in the latest master
13:50:42 <m-relay> <o​frnxmr:xmr.mx> Yes, just `git reset --hard HEAD~1`
13:51:00 <m-relay> <p​yxmr2025:mozilla.org> https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/14659db22b7dc6a6d6f5b9c849c388502b42a02d1938595916839649280
13:51:16 <m-relay> <p​yxmr2025:mozilla.org> This was generated when I synchronized the branch
13:51:40 <m-relay> <o​frnxmr:xmr.mx> Oh, you did this using github. Even worse :D lol
13:52:00 <m-relay> <p​yxmr2025:mozilla.org> yes,github
13:52:10 <m-relay> <p​yxmr2025:mozilla.org> https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/3d7c7aacc23f4f3bb96a2d02d78a00c96bdbdc7f1938596213599240192
13:52:23 <m-relay> <p​yxmr2025:mozilla.org> Do I still need to delete it
13:52:42 <m-relay> <o​frnxmr:xmr.mx> It messed up your pr becauae you created the pr using your master branch
13:52:50 <m-relay> <o​frnxmr:xmr.mx> Yea, delete it
13:53:02 <m-relay> <p​yxmr2025:mozilla.org> Yes
13:53:09 <m-relay> <o​frnxmr:xmr.mx> Use the terminal
13:53:26 <m-relay> <p​yxmr2025:mozilla.org> Shall I delete it first and then open a new one?
13:54:49 <m-relay> <o​frnxmr:xmr.mx> use da terminal
13:55:22 <m-relay> <p​yxmr2025:mozilla.org> https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/78f7b30aac6b13dbc383b1686b66afb0e4a27df81938597015596302336
13:58:26 <m-relay> <p​yxmr2025:mozilla.org> ofrnxmr: hey.
13:58:54 <m-relay> <p​yxmr2025:mozilla.org> Deleted it, what should I do or not do
13:59:46 <m-relay> <o​frnxmr:xmr.mx> How did you delete it
14:00:08 <m-relay> <p​yxmr2025:mozilla.org> https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/9894fea91b848f84adac12322977c812672895c71938598217201483776
14:00:30 <m-relay> <o​frnxmr:xmr.mx> Ok, run `git remote -v`
14:01:04 <m-relay> <p​yxmr2025:mozilla.org> then?
14:01:11 <m-relay> <o​frnxmr:xmr.mx> What does it output?
14:01:33 <m-relay> <p​yxmr2025:mozilla.org> https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/f943ae68055418e94d93cf36155ce1744ada733e1938598573813792768
14:02:12 <m-relay> <o​frnxmr:xmr.mx> `git remote add upstream https://github.com/monero-project/monero-site`
14:02:27 <m-relay> <p​yxmr2025:mozilla.org> then
14:02:29 <m-relay> <o​frnxmr:xmr.mx> `git fetch upstream`
14:02:52 <m-relay> <p​yxmr2025:mozilla.org> root@61dd977e4482:/workspace/monero-site# git fetch upstream
14:02:53 <m-relay> <p​yxmr2025:mozilla.org> remote: Enumerating objects: 14, done.
14:02:55 <m-relay> <p​yxmr2025:mozilla.org> remote: Counting objects: 100% (8/8), done.
14:02:57 <m-relay> <p​yxmr2025:mozilla.org> remote: Compressing objects: 100% (3/3), done.
14:02:59 <m-relay> <p​yxmr2025:mozilla.org> remote: Total 14 (delta 5), reused 6 (delta 5), pack-reused 6 (from 2)
14:03:01 <m-relay> <p​yxmr2025:mozilla.org> Unpacking objects: 100% (14/14), done.
14:03:03 <m-relay> <p​yxmr2025:mozilla.org> From https://github.com/monero-project/monero-site
14:03:05 <m-relay> <p​yxmr2025:mozilla.org>  * [new branch]        dependabot/bundler/rexml-3.3.3 -> upstream/dependabot/bundler/rexml-3.3.3
14:03:07 <m-relay> <p​yxmr2025:mozilla.org>  * [new branch]        master                         -> upstream/master
14:03:09 <m-relay> <o​frnxmr:xmr.mx> `git rebase upstream/master`
14:03:23 <m-relay> <p​yxmr2025:mozilla.org> Applying: Translation on lines 1-46
14:03:25 <m-relay> <p​yxmr2025:mozilla.org> Applying: Fix errors on lines 1-46
14:03:27 <m-relay> <p​yxmr2025:mozilla.org> Applying: Translate lines 48-61 corresponding to en.yml
14:03:29 <m-relay> <p​yxmr2025:mozilla.org> Applying: Translate 63-120 lines and fix known errors
14:03:31 <m-relay> <p​yxmr2025:mozilla.org> Applying: Translate lines 122 to 143 in en.yml to zh-cn.yml
14:03:33 <m-relay> <p​yxmr2025:mozilla.org> Applying: Fix known details issues
14:03:35 <m-relay> <p​yxmr2025:mozilla.org> Applying: 128 line fix (IRC) for Chinese bracket issue
14:03:37 <m-relay> <p​yxmr2025:mozilla.org> Applying: Translated lines 145-245 (corresponding to en.yml) and fixed the issue with Chinese quotation marks.
14:03:39 <m-relay> <p​yxmr2025:mozilla.org> Applying: Translated lines 227-302 of en.yml and fixed quotation mark and colon issues
14:03:41 <m-relay> <p​yxmr2025:mozilla.org> Applying: Translated lines 384-589 of en.yml and improved the translation of 'Chat' to make it more colloquial
14:03:43 <m-relay> <p​yxmr2025:mozilla.org> Applying: Fixed 476 lines @mnemonic-seed
14:03:55 <m-relay> <p​yxmr2025:mozilla.org> git push -f origin <>?
14:04:50 <m-relay> <p​yxmr2025:mozilla.org> What does the branch write
14:05:17 <m-relay> <p​yxmr2025:mozilla.org> master?or
14:06:20 <m-relay> <p​yxmr2025:mozilla.org> https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/9c98d8075feef55508be30fa46177d00b83ee5261938599777201553408
14:08:18 <m-relay> <p​yxmr2025:mozilla.org> Thanks!
14:16:40 <m-relay> <o​frnxmr:xmr.mx> Np
14:16:56 <m-relay> <o​frnxmr:xmr.mx> You still need to edit the keys in the cn file
14:17:21 <m-relay> <o​frnxmr:xmr.mx> want me to get nahuhh to send diff?
14:29:01 <m-relay> <p​yxmr2025:mozilla.org> No need, thank you. I will
14:36:22 <m-relay> <p​yxmr2025:mozilla.org> https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/0f100cf4d89c98139c3715117953645cad5dbf3b1938607311161393152
14:37:00 <m-relay> <p​yxmr2025:mozilla.org> I also changed the translation of the previous video_ring, which I think is more appropriate
14:37:13 <m-relay> <p​yxmr2025:mozilla.org> Thank you very much.