14:14:50 ofrnxmr: Should I translate video_fcmp as full chain user proof algorithm or full chain user proof system? 14:15:24 It should not be translated 14:16:02 Should I write Full Chain Membership Proofs directly? 14:16:22 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/987a83097096e840ffe5bdd6ee91749233d333c81938239912780234752 14:18:01 I think we should put a parenthesis next to it, write the original text inside the parenthesis, and translate outside the parenthesis. 14:18:20 if you have to translate the words "full chain membership proof" if translate it as "membership proof of the entire blockchain" 14:19:37 Agreed. 14:19:50 It means trying to be as similar as possible to Moneropedia's technical terminology. 14:20:10 I used to translate like this before 14:20:11 Ring Signatures, Ring Confidential Transactions as well 14:20:30 Well, thank you. 14:22:41 (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 14:23:14 Uh,yes. 14:23:24 (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 14:25:02 Full-Chain Membership Proofs 14:25:20 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/cdebb451db52fd9f4a4c1e86add8d3d271332a4f1938242171467464704 14:33:44 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/abf93cf4243204a40a2cab7a36bea18b1939b8981938244285837082624 14:34:39 Translate the FAQ again to make it complete.There are still some issues that need to be fixed, probably in the next submission. 14:35:13 exist https://github.com/MAGICGrants/Monero-Fund/issues/45 Thumb up to support me, thank you. 14:35:27 In https://github.com/MAGICGrants/Monero-Fund/issues/45 Thumb up to support me, thank you. 14:39:23 Dont add ++ 14:39:35 FCMP and FCMP++ are different things 14:39:47 oh,sorry 14:40:17 Also dont add the `-` if its not normally used 14:40:40 I'm too confused。 14:40:42 I'm too confused. 14:41:46 ?means? 14:41:53 The original didnt have a hyphen in full-chain. Dont add one 14:42:07 It was `full chain` not `full-chain` 14:42:24 Also `ring signature` should be `ring signatures` 14:42:41 I saw it on the blog of getmonero.org. sorry 14:43:04 okay. 14:43:16 The blog written by kayaba? 14:43:19 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/eefd4743257655d0231ba456bb4f5da1132889901938246698870505472 14:43:49 https://www.getmonero.org/2024/04/27/fcmps.html 14:43:54 well then, it should have a hyphen 14:44:16 Jberman and kayaba both have a hyphen in theirs. The en.yml is incorrect 14:44:35 so... sorry. include the hyphen 14:44:37 Full-Chain Membership Proofs? 14:45:11 Ah,don't worry. 14:53:09 https://github.com/monero-project/monero-site/pull/2486 15:11:47 Relaxx, we see the PR as soon as it goes up 15:12:21 Don't have to post it in 2 different room. It's not an emergency 15:13:06 Oh, okay, I got it. I'm sorry. 15:13:16 np 15:20:54 Stupidly, we have the same thing translated twice 15:21:37 keys `video_fcmp` and `fcmp_plus` are both the same thing 15:24:19 wait 15:25:59 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/8d0d7508402428055939e85ce12dd051571e0e3e1938257434850099200 15:26:27 they are same. 15:51:36 Yeah. No need to have them duplicated 15:52:21 Should we fix this error 15:52:36 i renamed faq.video_fcmp to faq.fcmp, and replaced roadmap.fcmp-plus with faq.fcmp 15:52:45 https://github.com/monero-project/monero-site/pull/2486#issuecomment-3008933696 15:52:53 What if the translator did not translate these two sentences into the same content? 15:53:58 waiy 15:54:04 wait 15:54:45 I will choose to clean up duplicate content 16:04:14 https://github.com/monero-project/monero-site/pull/2486/files#diff-3e424964c5149fa996c9a6ed638056cf78241992c137a1c2c6a1c290cc3a2fd4 16:06:36 https://deploy-preview-2486--barolo-time-757cf9.netlify.app/ 16:06:43 Can you squash plz 16:07:11 ?what mean/ 16:07:34 `git rebase -i HEAD~5` 16:07:35 Leave the first line alone, and for the following 4 lines change the word `pick` to `squash` 16:08:46 wait 16:11:39 Deploying Git, please wait a moment 16:12:28 oh you're not using git? 😅 16:12:52 Not used on this computer 16:13:07 I'm not at home, this is a temporary computer 16:18:16 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/97bc622370a297ba84bf1381745d5a4aa8f8d0ff1938270588934029312 16:22:48 I have no idea how to squash from an ide 16:24:14 <17lifers:matrix.org> delete changes 16:24:15 <17lifers:matrix.org> commit changes in one commit 16:24:17 <17lifers:matrix.org> done 16:24:22 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/4678c3b596a8c7bbd53f934974ddf9966a2cac111938272126649761792 16:36:40 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/2a8d612b731b168068c3c36e359e4b684214c8631938275217172332544 16:36:50 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/d2581e61072f0c20d494b8f091eafdf456bf80171938275252932968448 16:37:11 Believe me, even in IDE. 16:37:19 ofrnxmr: Okay. 16:38:42 I will change the translation version after it is merged(zh-cn.yml) 16:42:33 `s` also works instead of `squash` 💪 17:09:15 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/228922d9e99cf107b5a222a3c5f1dcb4df1cb4f31938283421369368576 17:10:00 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/585a077f4931b1f4f30f7c8826615499c07c204b1938283605885190144 17:13:08 https://github.com/monero-project/monero-site/pull/2486 17:16:26 Looks good 17:17:22 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...) https://github.com/monero-project/monero-site/pull/2486/commits/7ff5eda29da93ec6e394909ba1afb3c346e19e99 Same) 17:19:14 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/99fe0f2f7d38c15522d9ece07c62e9bc9bf7d7a11938285918716690432 17:21:46 You have to force-push after a squash / rebase. Its normal 17:22:50 Thanks,I have to go rest now. 17:28:41 Goodnight 17:36:20 :P plowsof lol, i forgot abt the commit & pr title. Definitely needs to be changed 😁. Else looks ok 17:36:59 Jackie, `git commit --amend` 17:37:14 its ok, feeling of success before sleeping was thoroughly deserved 17:37:39 did community get AT room'd about it? 17:38:38 Change title to smthn like `i18n: add hyphen to fcmp & remove duplicate keys` ccplowsof 17:40:07 and delete the extra lines like `Update en.yml` 17:44:27 git commit --amend -m "i18n: add hyphen to fcmp & remove duplicate keys cc @plowsof" ? 17:46:08 if we ignore the other files being edited then this is fine 17:46:31 checks notes : there are no faw/roadmap changes in the queue 17:46:35 faq 17:46:52 (i did not check notes, i hope my memory is ok) 17:47:24 Changed it 17:51:48 i18n: Added hyphens and removed duplicate keys in fcmp, and corrected the corresponding FAQ and roadmap cc@plowsof? 17:52:17 plowsof 17:52:46 .merges 17:52:46 -xmr-pr- 2422 2475 17:52:55 wait 17:53:10 I haven't made any changes yet 17:53:35 git commit --amend -m "i18n: Fix fcmp keys and update documentation" -m "- Added hyphens to fcmp keys 17:53:37 - Removed duplicate translation keys 17:53:39 - Corrected FAQ and roadmap entries 17:53:40 .merge+ 2486 17:53:40 Added 17:53:41 - Credit: @plowsof" 17:54:22 wait 17:54:57 credit all for jackie , i did nothing, it would be nahuhhh who helped with duplicate key removal 17:56:35 we can fix this tomorrow Jackie, you can go to bed and get some rest. there is no rush now 17:57:29 It's okay, a few minutes 17:59:06 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/e141d4787ce0a78cd947fd8f0c8a4c48aabc91741938295963718254592 17:59:19 Okay. 18:07:02 s/@plowsof/@nahuhh i think? otherwise i will gladly accept this stolen valour NP 18:08:10 wait 18:11:21 can? 18:11:23 git commit --amend -m "i18n: Fix fcmp keys and update documentation" -m "- Added hyphens to fcmp keys 18:11:25 - Removed duplicate translation keys 18:11:27 - Corrected FAQ and roadmap entries 18:11:29 - Credit: @plowsof 18:11:31 - Credit: @nahuhh 18:11:33 - Participant: @PyXMR2025 (Jackie)" 18:12:31 plowsof 18:16:46 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/1fae4b9bd631ebd144d67dd1159daf47fabbede71938300411513405440 18:18:22 or change me to Credit? 18:19:22 or remove 18:21:07 ? 18:22:08 the problem is now you need to learn about adding co-authors 18:22:30 if you wanted to do it correctly. you mentioned sleeping though 18:23:15 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 18:23:19 No problem. Wait a little longer (originally planned to play for a while) 18:23:45 okay, thank you 18:25:09 Tomorrow morning. 18:25:11 bye 18:29:36 Should probably just remove all of the `credit`s 18:33:41 What are your and plowsof's email addresses (which can be Noreply) 18:34:07 I replaced it 18:40:44 ``` 18:40:45 git commit --amend -m "i18n: Fix fcmp keys and update documentation" -m "- Added hyphens to fcmp keys 18:40:47 - Removed duplicate translation keys 18:40:49 - Corrected FAQ and roadmap entries" 18:40:51 ``` 20:17:15 you can squah PRs from merge drop down menu on Github 20:17:34 no need to force people that are clearly not devs to use git etc 20:18:23 squash* 20:20:02 <17lifers:matrix.org> plz dont look at my monero gui pull req... so embarrassing >.< 20:20:25 <17lifers:matrix.org> i did by deleting changes and making single commit 20:20:28 <17lifers:matrix.org> lmao 20:20:54 idk how good FOSS git clients are there 20:21:07 you can use them, there's also a popular TUI one 20:23:57 Lazygit 20:37:41 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 20:37:48 seen this excuse once or twice 20:43:27 Nah boss, we don't touch ppls commits 20:44:18 Contributors should know how to use git, or learn, or send and issue or diff if they cant manage 20:46:19 The only git client i use, is `git` 20:47:31 <17lifers:matrix.org> kde plasma's konsole is my fav git client 20:47:54 I use termux 20:49:57 <17lifers:matrix.org> that exists too obvs, on my 31337 h4x0r phone 20:50:44 Twas my first and still my favorite git client. I dont use vi though. I'm a nano noob 20:52:23 <17lifers:matrix.org> vi is easy 20:52:25 <17lifers:matrix.org> i for insertion mode, esc for command mode 20:52:27 <17lifers:matrix.org> commands: 20:52:29 <17lifers:matrix.org> save: :w 20:52:31 <17lifers:matrix.org> quit: :q 20:52:33 <17lifers:matrix.org> save n quit: :wq 20:52:35 <17lifers:matrix.org> save n quit w o saving: :wq! 20:52:37 <17lifers:matrix.org> help: :h 20:53:56 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 20:55:58 <17lifers:matrix.org> vim has syntaxhighlight (not vi) 21:33:03 creative 21:33:27 not for translators, Weblate should've existed 21:33:38 wot? 21:34:16 bitcoin uses smthn else 21:34:21 Transifex or smthn 21:34:39 all are shit, Weblate is king 21:34:44 They can edit the file and send it via paste 21:35:11 Using git isnt requires for even monero repo. We accept patches in all forms 21:35:17 I expect Monero to have an instance working 😉 21:35:23 of Weblate 21:35:56 I don't 21:36:05 Lists.getmonero runs ubuntu 16.04 21:37:20 netlify for -site is a mystery to me 21:37:21 Maybe it runs itself and will die one day 21:37:36 working on prayers 21:37:39 everything was made during the 16.04 cambrian explosion. we now dockerise everything in 16.04 21:38:02 we'll replace netlify with coolify if it ever dies 21:38:25 Netlify costs money for deployments too, so you can't have too many commits 21:39:22 very optimistic 21:39:33 How? 21:39:38 We could do it today 21:39:46 it is running for docs? 21:39:59 Yeah 21:40:01 Comments working now too 21:40:10 who set it up? 21:40:24 Coolify was dan's baby 21:40:34 oh dan the man 21:40:39 based 21:42:41 featherwallet was used to copy+paste from for all those html headers 21:43:35 Yeah, plowsof setup the coolify dockerfile and included privacy headers 21:45:54 https://www.transifex.com 21:46:05 Yeah this is what bitcoin uses for translations 21:58:22 I used all, nothing beats how UI-friendly and fast weblate is 21:58:51 how its UI is user friendly* 22:03:35 You used transifex? 22:04:37 yes, all, Crowdin too 22:40:41 hello,now it's morning 22:40:54 https://matrix.monero.social/_matrix/media/v1/download/mozilla.org/91d8601f95b0aa0965f23c52b79c389fdc5f42e01938366884722245632 22:49:06