-
m-relay
<pyxmr2025:mozilla.org> ofrnxmr: Should I translate video_fcmp as full chain user proof algorithm or full chain user proof system?
-
m-relay
<ofrnxmr:xmr.mx> It should not be translated
-
m-relay
<pyxmr2025:mozilla.org> Should I write Full Chain Membership Proofs directly?
-
m-relay
-
m-relay
<pyxmr2025:mozilla.org> I think we should put a parenthesis next to it, write the original text inside the parenthesis, and translate outside the parenthesis.
-
m-relay
<ofrnxmr:xmr.mx> if you have to translate the words "full chain membership proof" if translate it as "membership proof of the entire blockchain"
-
m-relay
<ofrnxmr:xmr.mx> Agreed.
-
m-relay
<pyxmr2025:mozilla.org> It means trying to be as similar as possible to Moneropedia's technical terminology.
-
m-relay
<pyxmr2025:mozilla.org> I used to translate like this before
-
m-relay
<ofrnxmr:xmr.mx> Ring Signatures, Ring Confidential Transactions as well
-
m-relay
<pyxmr2025:mozilla.org> Well, thank you.
-
m-relay
<ofrnxmr:xmr.mx> (Ring) (C)onfidential (T)ransactions is explaining what RingCT is, like (F)ull (C)hain (M)embership (P)roofs is the expanded form of FCMP
-
m-relay
<pyxmr2025:mozilla.org> Uh,yes.
-
m-relay
<ofrnxmr:xmr.mx> (Ring) (C)onfidential (T)ransactions is the expanded form of RingCT, like (F)ull (C)hain (M)embership (P)roofs is the expanded form of FCMP
-
m-relay
<pyxmr2025:mozilla.org> Full-Chain Membership Proofs
-
m-relay
-
m-relay
-
m-relay
<pyxmr2025:mozilla.org> Translate the FAQ again to make it complete.There are still some issues that need to be fixed, probably in the next submission.
-
m-relay
<pyxmr2025:mozilla.org> exist
MAGICGrants/Monero-Fund #45 Thumb up to support me, thank you.
-
m-relay
<pyxmr2025:mozilla.org> In
MAGICGrants/Monero-Fund #45 Thumb up to support me, thank you.
-
m-relay
<ofrnxmr:xmr.mx> Dont add ++
-
m-relay
<ofrnxmr:xmr.mx> FCMP and FCMP++ are different things
-
m-relay
<pyxmr2025:mozilla.org> oh,sorry
-
m-relay
<ofrnxmr:xmr.mx> Also dont add the `-` if its not normally used
-
m-relay
<pyxmr2025:mozilla.org> I'm too confused。
-
m-relay
<pyxmr2025:mozilla.org> I'm too confused.
-
m-relay
<pyxmr2025:mozilla.org> ?means?
-
m-relay
<ofrnxmr:xmr.mx> The original didnt have a hyphen in full-chain. Dont add one
-
m-relay
<ofrnxmr:xmr.mx> It was `full chain` not `full-chain`
-
m-relay
<ofrnxmr:xmr.mx> Also `ring signature` should be `ring signatures`
-
m-relay
<pyxmr2025:mozilla.org> I saw it on the blog of getmonero.org. sorry
-
m-relay
<pyxmr2025:mozilla.org> okay.
-
m-relay
<ofrnxmr:xmr.mx> The blog written by kayaba?
-
m-relay
-
m-relay
-
m-relay
<ofrnxmr:xmr.mx> well then, it should have a hyphen
-
m-relay
<ofrnxmr:xmr.mx> Jberman and kayaba both have a hyphen in theirs. The en.yml is incorrect
-
m-relay
<ofrnxmr:xmr.mx> so... sorry. include the hyphen
-
m-relay
<pyxmr2025:mozilla.org> Full-Chain Membership Proofs?
-
m-relay
<pyxmr2025:mozilla.org> Ah,don't worry.
-
m-relay
-
m-relay
<ofrnxmr:xmr.mx> Relaxx, we see the PR as soon as it goes up
-
m-relay
<ofrnxmr:xmr.mx> Don't have to post it in 2 different room. It's not an emergency
-
m-relay
<pyxmr2025:mozilla.org> Oh, okay, I got it. I'm sorry.
-
m-relay
<ofrnxmr:xmr.mx> np
-
m-relay
<ofrnxmr:xmr.mx> Stupidly, we have the same thing translated twice
-
m-relay
<ofrnxmr:xmr.mx> keys `video_fcmp` and `fcmp_plus` are both the same thing
-
m-relay
<pyxmr2025:mozilla.org> wait
-
m-relay
-
m-relay
<pyxmr2025:mozilla.org> they are same.
-
m-relay
<ofrnxmr:xmr.mx> Yeah. No need to have them duplicated
-
m-relay
<pyxmr2025:mozilla.org> Should we fix this error
-
m-relay
<ofrnxmr:xmr.mx> i renamed faq.video_fcmp to faq.fcmp, and replaced roadmap.fcmp-plus with faq.fcmp
-
m-relay
-
m-relay
<pyxmr2025:mozilla.org> What if the translator did not translate these two sentences into the same content?
-
m-relay
<pyxmr2025:mozilla.org> waiy
-
m-relay
<pyxmr2025:mozilla.org> wait
-
m-relay
<pyxmr2025:mozilla.org> I will choose to clean up duplicate content
-
m-relay
-
m-relay
-
m-relay
<ofrnxmr:xmr.mx> Can you squash plz
-
m-relay
<pyxmr2025:mozilla.org> ?what mean/
-
m-relay
<ofrnxmr:xmr.mx> `git rebase -i HEAD~5`
-
m-relay
<ofrnxmr:xmr.mx> Leave the first line alone, and for the following 4 lines change the word `pick` to `squash`
-
m-relay
<pyxmr2025:mozilla.org> wait
-
m-relay
<pyxmr2025:mozilla.org> Deploying Git, please wait a moment
-
m-relay
<ofrnxmr:xmr.mx> oh you're not using git? 😅
-
m-relay
<pyxmr2025:mozilla.org> Not used on this computer
-
m-relay
<pyxmr2025:mozilla.org> I'm not at home, this is a temporary computer
-
m-relay
-
m-relay
<ofrnxmr:xmr.mx> I have no idea how to squash from an ide
-
m-relay
<17lifers:matrix.org> delete changes
-
m-relay
<17lifers:matrix.org> commit changes in one commit
-
m-relay
<17lifers:matrix.org> done
-
m-relay
-
m-relay
-
m-relay
-
m-relay
<pyxmr2025:mozilla.org> Believe me, even in IDE.
-
m-relay
<pyxmr2025:mozilla.org> ofrnxmr: Okay.
-
m-relay
<pyxmr2025:mozilla.org> I will change the translation version after it is merged(zh-cn.yml)
-
m-relay
<plowsof:matrix.org> `s` also works instead of `squash` 💪
-
m-relay
-
m-relay
-
m-relay
-
m-relay
<ofrnxmr:xmr.mx> Looks good
-
m-relay
<pyxmr2025:mozilla.org> There shouldn't be any problem, I don't know what happened today (Git keeps getting errors). In order to save time, I used force pushed to crush them. No changes have been made (more...)
monero-project/monero-site #2486/commits/7ff5eda29da93ec6e394909ba1afb3c346e19e99 Same)
-
m-relay
-
m-relay
<ofrnxmr:xmr.mx> You have to force-push after a squash / rebase. Its normal
-
m-relay
<pyxmr2025:mozilla.org> Thanks,I have to go rest now.
-
m-relay
<ofrnxmr:xmr.mx> Goodnight
-
m-relay
<ofrnxmr:xmr.mx> :P plowsof lol, i forgot abt the commit & pr title. Definitely needs to be changed 😁. Else looks ok
-
m-relay
<ofrnxmr:xmr.mx> Jackie, `git commit --amend`
-
plowsof
its ok, feeling of success before sleeping was thoroughly deserved
-
plowsof
did community get AT room'd about it?
-
m-relay
<ofrnxmr:xmr.mx> Change title to smthn like `i18n: add hyphen to fcmp & remove duplicate keys` ccplowsof
-
m-relay
<ofrnxmr:xmr.mx> and delete the extra lines like `Update en.yml`
-
m-relay
<pyxmr2025:mozilla.org> git commit --amend -m "i18n: add hyphen to fcmp & remove duplicate keys cc @plowsof" ?
-
plowsof
if we ignore the other files being edited then this is fine
-
plowsof
checks notes : there are no faw/roadmap changes in the queue
-
plowsof
faq
-
plowsof
(i did not check notes, i hope my memory is ok)
-
m-relay
<pyxmr2025:mozilla.org> Changed it
-
m-relay
<pyxmr2025:mozilla.org> i18n: Added hyphens and removed duplicate keys in fcmp, and corrected the corresponding FAQ and roadmap cc@plowsof?
-
m-relay
<pyxmr2025:mozilla.org> plowsof
-
plowsof
.merges
-
xmr-pr
2422 2475
-
m-relay
<pyxmr2025:mozilla.org> wait
-
m-relay
<pyxmr2025:mozilla.org> I haven't made any changes yet
-
m-relay
<pyxmr2025:mozilla.org> git commit --amend -m "i18n: Fix fcmp keys and update documentation" -m "- Added hyphens to fcmp keys
-
m-relay
<pyxmr2025:mozilla.org> - Removed duplicate translation keys
-
m-relay
<pyxmr2025:mozilla.org> - Corrected FAQ and roadmap entries
-
plowsof
.merge+ 2486
-
xmr-pr
Added
-
m-relay
<pyxmr2025:mozilla.org> - Credit: @plowsof"
-
m-relay
<pyxmr2025:mozilla.org> wait
-
plowsof
credit all for jackie , i did nothing, it would be nahuhhh who helped with duplicate key removal
-
plowsof
we can fix this tomorrow Jackie, you can go to bed and get some rest. there is no rush now
-
m-relay
<pyxmr2025:mozilla.org> It's okay, a few minutes
-
m-relay
-
m-relay
<pyxmr2025:mozilla.org> Okay.
-
m-relay
<plowsof:matrix.org> s/@plowsof/@nahuhh i think? otherwise i will gladly accept this stolen valour NP
-
m-relay
<pyxmr2025:mozilla.org> wait
-
m-relay
<pyxmr2025:mozilla.org> can?
-
m-relay
<pyxmr2025:mozilla.org> git commit --amend -m "i18n: Fix fcmp keys and update documentation" -m "- Added hyphens to fcmp keys
-
m-relay
<pyxmr2025:mozilla.org> - Removed duplicate translation keys
-
m-relay
<pyxmr2025:mozilla.org> - Corrected FAQ and roadmap entries
-
m-relay
<pyxmr2025:mozilla.org> - Credit: @plowsof
-
m-relay
<pyxmr2025:mozilla.org> - Credit: @nahuhh
-
m-relay
<pyxmr2025:mozilla.org> - Participant: @PyXMR2025 (Jackie)"
-
m-relay
<pyxmr2025:mozilla.org> plowsof
-
m-relay
-
m-relay
<pyxmr2025:mozilla.org> or change me to Credit?
-
m-relay
<pyxmr2025:mozilla.org> or remove
-
m-relay
<pyxmr2025:mozilla.org> ?
-
m-relay
<plowsof:matrix.org> the problem is now you need to learn about adding co-authors
-
m-relay
<plowsof:matrix.org> if you wanted to do it correctly. you mentioned sleeping though
-
m-relay
<plowsof:matrix.org> these are skills not just for this PR but to improve your git knowledge. no point doing this while tired as you will likely forget whats going on
-
m-relay
<pyxmr2025:mozilla.org> No problem. Wait a little longer (originally planned to play for a while)
-
m-relay
<pyxmr2025:mozilla.org> okay, thank you
-
m-relay
<pyxmr2025:mozilla.org> Tomorrow morning.
-
m-relay
<pyxmr2025:mozilla.org> bye
-
m-relay
<ofrnxmr:xmr.mx> Should probably just remove all of the `credit`s
-
m-relay
<pyxmr2025:mozilla.org> What are your and plowsof's email addresses (which can be Noreply)
-
m-relay
<pyxmr2025:mozilla.org> I replaced it
-
m-relay
<ofrnxmr:xmr.mx> ```
-
m-relay
<ofrnxmr:xmr.mx> git commit --amend -m "i18n: Fix fcmp keys and update documentation" -m "- Added hyphens to fcmp keys
-
m-relay
<ofrnxmr:xmr.mx> - Removed duplicate translation keys
-
m-relay
<ofrnxmr:xmr.mx> - Corrected FAQ and roadmap entries"
-
m-relay
<ofrnxmr:xmr.mx> ```
-
m-relay
<basses:matrix.org> you can squah PRs from merge drop down menu on Github
-
m-relay
<basses:matrix.org> no need to force people that are clearly not devs to use git etc
-
m-relay
<basses:matrix.org> squash*
-
m-relay
<17lifers:matrix.org> plz dont look at my monero gui pull req... so embarrassing >.<
-
m-relay
<17lifers:matrix.org> i did by deleting changes and making single commit
-
m-relay
<17lifers:matrix.org> lmao
-
m-relay
<basses:matrix.org> idk how good FOSS git clients are there
-
m-relay
<basses:matrix.org> you can use them, there's also a popular TUI one
-
m-relay
<basses:matrix.org> Lazygit
-
m-relay
<plowsof:matrix.org> just delete the source branch and tell people it was an accident, then remake the PR correctly all within the web ui first try and make a new PR
-
m-relay
<plowsof:matrix.org> seen this excuse once or twice
-
m-relay
<ofrnxmr:xmr.mx> Nah boss, we don't touch ppls commits
-
m-relay
<ofrnxmr:xmr.mx> Contributors should know how to use git, or learn, or send and issue or diff if they cant manage
-
m-relay
<ofrnxmr:xmr.mx> The only git client i use, is `git`
-
m-relay
<17lifers:matrix.org> kde plasma's konsole is my fav git client
-
m-relay
<ofrnxmr:xmr.mx> I use termux
-
m-relay
<17lifers:matrix.org> that exists too obvs, on my 31337 h4x0r phone
-
m-relay
<ofrnxmr:xmr.mx> Twas my first and still my favorite git client. I dont use vi though. I'm a nano noob
-
m-relay
<17lifers:matrix.org> vi is easy
-
m-relay
<17lifers:matrix.org> i for insertion mode, esc for command mode
-
m-relay
<17lifers:matrix.org> commands:
-
m-relay
<17lifers:matrix.org> save: :w
-
m-relay
<17lifers:matrix.org> quit: :q
-
m-relay
<17lifers:matrix.org> save n quit: :wq
-
m-relay
<17lifers:matrix.org> save n quit w o saving: :wq!
-
m-relay
<17lifers:matrix.org> help: :h
-
m-relay
<ofrnxmr:xmr.mx> Not that its difficult (i just never took the time to remember it). I like using nano because it shows code in pretty colors and i can open to a specific line. Maybe vi can too, i dont remember
-
m-relay
<17lifers:matrix.org> vim has syntaxhighlight (not vi)
-
m-relay
<basses:matrix.org> creative
-
m-relay
<basses:matrix.org> not for translators, Weblate should've existed
-
m-relay
<basses:matrix.org> wot?
-
m-relay
<ofrnxmr:xmr.mx> bitcoin uses smthn else
-
m-relay
<ofrnxmr:xmr.mx> Transifex or smthn
-
m-relay
<basses:matrix.org> all are shit, Weblate is king
-
m-relay
<ofrnxmr:xmr.mx> They can edit the file and send it via paste
-
m-relay
<ofrnxmr:xmr.mx> Using git isnt requires for even monero repo. We accept patches in all forms
-
m-relay
<basses:matrix.org> I expect Monero to have an instance working 😉
-
m-relay
<basses:matrix.org> of Weblate
-
m-relay
<ofrnxmr:xmr.mx> I don't
-
m-relay
<ofrnxmr:xmr.mx> Lists.getmonero runs ubuntu 16.04
-
m-relay
<ofrnxmr:xmr.mx> netlify for -site is a mystery to me
-
m-relay
<ofrnxmr:xmr.mx> Maybe it runs itself and will die one day
-
m-relay
<basses:matrix.org> working on prayers
-
m-relay
<plowsof:matrix.org> everything was made during the 16.04 cambrian explosion. we now dockerise everything in 16.04
-
m-relay
<ofrnxmr:xmr.mx> we'll replace netlify with coolify if it ever dies
-
m-relay
<ofrnxmr:xmr.mx> Netlify costs money for deployments too, so you can't have too many commits
-
m-relay
<basses:matrix.org> very optimistic
-
m-relay
<ofrnxmr:xmr.mx> How?
-
m-relay
<ofrnxmr:xmr.mx> We could do it today
-
m-relay
<basses:matrix.org> it is running for docs?
-
m-relay
<ofrnxmr:xmr.mx> Yeah
-
m-relay
<ofrnxmr:xmr.mx> Comments working now too
-
m-relay
<basses:matrix.org> who set it up?
-
m-relay
<ofrnxmr:xmr.mx> Coolify was dan's baby
-
m-relay
<basses:matrix.org> oh dan the man
-
m-relay
<basses:matrix.org> based
-
m-relay
<plowsof:matrix.org> featherwallet was used to copy+paste from for all those html headers
-
m-relay
<ofrnxmr:xmr.mx> Yeah, plowsof setup the coolify dockerfile and included privacy headers
-
m-relay
<ofrnxmr:xmr.mx>
transifex.com
-
m-relay
<ofrnxmr:xmr.mx> Yeah this is what bitcoin uses for translations
-
m-relay
<basses:matrix.org> I used all, nothing beats how UI-friendly and fast weblate is
-
m-relay
<basses:matrix.org> how its UI is user friendly*
-
m-relay
<ofrnxmr:xmr.mx> You used transifex?
-
m-relay
<basses:matrix.org> yes, all, Crowdin too
-
m-relay
<pyxmr2025:mozilla.org> hello,now it's morning
-
m-relay
-
m-relay
<pyxmr2025:mozilla.org> git commit -m "i18n: Fix fcmp keys and update documentation" -m "- Added hyphens to fcmp keys
-
m-relay
<pyxmr2025:mozilla.org> - Removed duplicate translation keys
-
m-relay
<pyxmr2025:mozilla.org> - Corrected FAQ and roadmap entries
-
m-relay
<pyxmr2025:mozilla.org> > Co-authored-by: plowsof <NAME⊙EC>
-
m-relay
<pyxmr2025:mozilla.org> > Co-authored-by: nahuhh <NAME⊙EC>
-
m-relay
<pyxmr2025:mozilla.org> > Co-authored-by: PyXMR2025 <pyxmr2025⊙oc>"
-
m-relay
<ofrnxmr:xmr.mx> Get rid of the co-authors
-
m-relay
<ofrnxmr:xmr.mx> And you never need to co-author yourself unless you changed the author
-
plowsof
simpler that way. for future reference `git log` helps you find emails of git accounts
-
m-relay
<pyxmr2025:mozilla.org> OK
-
m-relay
<pyxmr2025:mozilla.org> Okay, wait for me for a moment (to freshen up)
-
m-relay
<pyxmr2025:mozilla.org> I just thought of that too
-
m-relay
<ofrnxmr:xmr.mx> dont add co-authors to this
-
m-relay
<pyxmr2025:mozilla.org> this PR?
-
m-relay
<ofrnxmr:xmr.mx> Yes
-
m-relay
<pyxmr2025:mozilla.org> OK,That can merger.
-
m-relay
<pyxmr2025:mozilla.org> but I find email.Really?
-
m-relay
<pyxmr2025:mozilla.org> 5063+*,7765+*