Skip to content

Commit

Permalink
update hangouts/workgroups
Browse files Browse the repository at this point in the history
* update twitter.com to x.com
* move github and gitlab to workgroup from hangouts page
* remove duplicate channels (that exist in both workgroup and hangouts)
* mention matrix+IRC (instead just IRC)
* add monero-docs github icon/link
* replace taiga with a link to the workgroups page
* add new rooms;
  * #monero-turkce
  * #monero-support
  * #monero-research-lounge
* remove #monero-hardware

Co-authored-by: nahuhh <[email protected]>
  • Loading branch information
HardenedSteel and nahuhh committed Nov 20, 2024
2 parents 351cf45 + 27a827f commit 664657e
Show file tree
Hide file tree
Showing 75 changed files with 1,140 additions and 526 deletions.
12 changes: 7 additions & 5 deletions .github/workflows/hashes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,18 @@ jobs:
filename="${the_line[$length]}"
echo "${filename}"
}
# expects cli files between lines 2-13 and gui 14-18 (comments do not count, 1st line = 0)
# to add a new file to the cli, $num must be -gt 1 and -lt 15.
# gui $num is now -gt 14 and -lt 20 (new line has been added above)
# expects cli files between lines 2-14 and gui 15-19 (comments do not count, 1st line = 0)
# to add a new file to the cli, $num must be -gt 1 and -lt 16.
# gui $num is now -gt 15 and -lt 21 (new line has been added above)
# a new gui file will only increase the -lt number by 1
# changes to extensions / new files must be reflected in the cli_files / gui_files lists below
num=0
for line in "${lines[@]}"; do
if [ $num -gt 1 ] && [ $num -lt 14 ] ; then
if [ $num -gt 1 ] && [ $num -lt 15 ] ; then
#CLI
filename=$(get_filename "${line}")
filenames_cli+=("${filename}")
elif [ $num -gt 13 ] && [ $num -lt 20 ] ; then
elif [ $num -gt 14 ] && [ $num -lt 21 ] ; then
#GUI
filename=$(get_filename "${line}")
filenames_gui+=("${filename}")
Expand All @@ -71,6 +71,7 @@ jobs:
"monero-freebsd-x64-${version_cli}.tar.bz2" \
"monero-linux-armv7-${version_cli}.tar.bz2" \
"monero-linux-armv8-${version_cli}.tar.bz2" \
"monero-linux-riscv64-${version_cli}.tar.bz2" \
"monero-linux-x64-${version_cli}.tar.bz2" \
"monero-linux-x86-${version_cli}.tar.bz2" \
"monero-mac-armv8-${version_cli}.tar.bz2" \
Expand Down Expand Up @@ -140,6 +141,7 @@ jobs:
*cli/linux32) filename=monero-linux-x86 ;;
*cli/linuxarm8) filename=monero-linux-armv8 ;;
*cli/linuxarm7) filename=monero-linux-armv7 ;;
*cli/linuxriscv64) filename=monero-linux-riscv64 ;;
*cli/androidarm8) filename=monero-android-armv8 ;;
*cli/androidarm7) filename=monero-android-armv7 ;;
*cli/freebsd64) filename=monero-freebsd-x64 ;;
Expand Down
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

This README will walk you through everything you need to know to make changes, edits, or even completely new pages for the [getmonero.org website](https://getmonero.org/). It'll definitely be a bit of a ride, so strap yourself in. Feel free to skip down to a relevant section if you already know what you need.

If you need support about something related to the website, please join `#monero-site` [Libera/IRC](irc://irc.libera.chat/#monero-site) or [Matrix](https://matrix.to/#/!txpwSzQzkuUaVbtsIx:matrix.org). For general info about Monero join `#monero`. We'll do whatever we can to help you.
If you need support about something related to the website, please join `#monero-site` [Libera/IRC](irc://irc.libera.chat/#monero-site) or [Matrix](https://matrix.to/#/%23monero-site:monero.social). For general info about Monero join `#monero`. We'll do whatever we can to help you.

## What you'll need

Expand Down Expand Up @@ -38,18 +38,18 @@ A few random points of note:

### Tor

This website is available natively on Tor. The onion address is in `_includes/onion.html` and a signed document containing the same address is in `/onion.txt`. The address in these 2 files must *always* match. The `onion.txt` files also includes the onion address of the 'downloads' subdomain.
This website is available natively on Tor. The onion address is in `_includes/onion.html` and a signed document containing the same address is in `/onion.txt`. The address in these 2 files must *always* match. The `onion.txt` file also includes the onion address of the 'downloads' subdomain.

If you want to post getmonero's onion address somewhere on the website, don't simply write it, instead include it using `{% include onion.html %}`. This avoids problems with typos and allow us top change the address only in one file if necessary.
If you want to post getmonero's onion address somewhere on the website, don't simply write it, instead include it using `{% include onion.html %}`. This avoids problems with typos and allows us to change the address only in one file if necessary.

## PR workflow

To simplify the process of drafting, reviewing and merging pull requests, we use a GitHub Project board. This Kanban board makes easier for people to see and participate to the pull request workflow: [monero-site: PR workflow](https://github.com/orgs/monero-project/projects/1).

## Translation

In this section you'll find the info you need to translate a page and add a new translation, but keep in mind that Monero has a [Localization Workgroup](https://github.com/monero-ecosystem/monero-translations) who coordinate and give support to translators-volunteers. For live support/request of information, come chat on `#monero-translations` on Matrix or IRC (Libera.chat)
The entire website is translatable on Weblate, an easy to use localization platform that provide contributors with a user friendly interface: [translate.getmonero.org](https://translate.getmonero.org). Before translating, please read [the guide for translators](https://github.com/monero-ecosystem/monero-translations/blob/master/weblate.md), which contains all the info and workflows you need to know before starting.
In this section you'll find the info you need to translate a page and add a new translation, but keep in mind that Monero has a [Localization Workgroup](https://github.com/monero-ecosystem/monero-translations) who coordinates and gives support to translators-volunteers. For live support/request of information, come chat on `#monero-translations` on Matrix or IRC (Libera.chat)
The entire website is translatable on Weblate, an easy to use localization platform that provides contributors with a user friendly interface: [translate.getmonero.org](https://translate.getmonero.org). Before translating, please read [the guide for translators](https://github.com/monero-ecosystem/monero-translations/blob/master/weblate.md), which contains all the info and workflows you need to know before starting.

Translators are required to have:

Expand Down Expand Up @@ -247,7 +247,7 @@ Where `ENTRY` is a one word identifier for the title/name of your Moneropedia en

### 2. Make the localized File

Navigate to the `/_i18n/en/resources/moneropedia` folder and make a new file. give it the same <name>.md than in previous step.
Navigate to the `/_i18n/en/resources/moneropedia` folder and make a new file. Give it the same <name>.md as in the previous step.
Start the file with the front Matter:

```
Expand All @@ -272,7 +272,7 @@ Now you need to add the title of the page to the `_18n/en.yml` file. It *must* b

## How to update the Workgroups page

The page is composed by boxes, each containing a workgroup. Just make sure to copy the structure from the preceding box and paste it right after it.
The page is composed of boxes, each containing a workgroup. Just make sure to copy the structure from the preceding box and paste it right after it.

Note that the class of the `div` which forms the box is `right/left half col-lg-6 col-md-6 col-sm-12 col-xs-12`. Make sure to choose `left` or `right` according to the position you want the box to appear in.

Expand All @@ -293,6 +293,7 @@ Where `STATUS` can be:
- `completed` for completed milestones
- `ongoing` for milestones currently being worked on
- `upcoming` for milestones not yet completed or in progress
- `proposed` for milestones open to research and consideration

If an entry is `completed`, a green tick symbol will be displayed on its left. if it's `ongoing` a roadwork sign and `upcoming` a compass.

Expand Down
27 changes: 9 additions & 18 deletions _data/chats.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,21 @@
chats:
- monero:
matrix: https://matrix.to/#/#monero:monero.social
matrix: https://matrix.to/#/%23monero:monero.social

- monero-community:
matrix: https://matrix.to/#/#monero-community:monero.social

- monero-dev:
matrix: https://matrix.to/#/#monero-dev:monero.social
matrix: https://matrix.to/#/%23monero-community:monero.social

- monero-markets:
matrix: https://matrix.to/#/#monero-markets:monero.social
matrix: https://matrix.to/#/%23monero-markets:monero.social

- monero-offtopic:
matrix: https://matrix.to/#/#monero-offtopic:monero.social
matrix: https://matrix.to/#/%23monero-offtopic:monero.social

- monero-pools:
matrix: https://matrix.to/#/#monero-pools:monero.social

- monero-research-lab:
matrix: https://matrix.to/#/#monero-research-lab:monero.social

- monero-translations:
matrix: https://matrix.to/#/#monero-translations:monero.social
matrix: https://matrix.to/#/%23monero-pools:monero.social

- monero-hardware:
matrix: https://matrix.to/#/#monero-hardware:matrix.org
- monero-support:
matrix: https://matrix.to/#/#monero-support:monero.social

- monero-site:
matrix: https://matrix.to/#/#monero-site:monero.social
- monero-turkce:
matrix: https://matrix.to/#/#monero-turkce:monero.social
45 changes: 25 additions & 20 deletions _data/downloads.yml
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
# 'vers' is meant to be used in case of a platform-specific release (e.g. vers: "0.18.2.0 - Mumbling Potato")

gui:
- version: "0.18.3.1 - Fluorine Fermi"
- version: "0.18.3.4 - Fluorine Fermi"
downloads:
- platform: Windows 64-bit (Installer)
hash: 792271147ad71a2eaa02fc37d61d72cd92f2f9857dcc09ea032f48481f87e279
hash: 63349d5a7637cd0c5d1693a1a2e910a92cbb123903d57667077a36454845d7bf
link: https://downloads.getmonero.org/gui/win64install
icon: icon-windows
vers:
- platform: Windows 64-bit (Zip)
hash: f263ce5863fd87ea959f79420e28ef0002649fa02bd57ae34efda926bdcf1a70
hash: b5d42dddd722e728e480337f89038c8ea606c6507bf0c88ddf2af25050c9b751
link: https://downloads.getmonero.org/gui/win64
icon: icon-windows
vers:
- platform: macOS Intel
hash: 8ae53f0908f9bc03452f23d5092bf1eb1d2ad9f1224580486b486cf0a2020401
hash: 54eb151d7511a9f26130864e2c02f258344803b2b68311c8be29850d7faef359
link: https://downloads.getmonero.org/gui/mac64
icon: icon-apple
vers:
- platform: macOS ARM
hash: b0c8d07f8d8ade49d08419b196ddb9f691717ef05cae066e220db707e4dfedc4
hash: eedbf827513607a3ef579077dacd573e65892b199102effef97dff9d73138ca6
link: https://downloads.getmonero.org/gui/macarm8
icon: icon-apple
vers:
- platform: Linux 64-bit
hash: 06f6e600db51205116d52522964cf9b96337d7b5cb1e101730ccb0039b30e15b
hash: 2866f3a2be30e4c4113e6274cad1d6698f81c37ceebc6e8f084c57230a0f70a6
link: https://downloads.getmonero.org/gui/linux64
icon: icon-linux
vers:
- platform: Source Code (archive)
hash: 045a84e343423a62ed617f200465b290267ff0a071375fdfc49ea02dcdb1a785
hash: 2f1d643bb2cc08e5eb334a6bfd649b0aa95ceb6178ff2f90448d5ef8d2a752a6
link: https://downloads.getmonero.org/gui/source
icon: icon-github
- platform: Source Code
Expand All @@ -38,65 +38,70 @@ gui:


cli:
- version: "0.18.3.1 - Fluorine Fermi"
- version: "0.18.3.4 - Fluorine Fermi"
downloads:
- platform: Windows 64-bit
hash: 35dcc4bee4caad3442659d37837e0119e4649a77f2e3b5e80dd6d9b8fc4fb6ad
hash: 54a66db6c892b2a0999754841f4ca68511741b88ea3ab20c7cd504a027f465f5
link: https://downloads.getmonero.org/cli/win64
icon: icon-windows
vers:
- platform: Windows 32-bit
hash: 5bcbeddce32b50ebe18289d0560ebf779441526ec84d73b6a83094f092365271
hash: 1a9824742aa1587023c3bddea788c115940cfd49371c78a8dd62c40113132d01
link: https://downloads.getmonero.org/cli/win32
icon: icon-windows
vers:
- platform: macOS Intel
hash: 7f8bd9364ef16482b418aa802a65be0e4cc660c794bb5d77b2d17bc84427883a
hash: 32c449f562216d3d83154e708471236d07db7477d6b67f1936a0a85a5005f2b8
link: https://downloads.getmonero.org/cli/mac64
icon: icon-apple
vers:
- platform: macOS ARM
hash: 915288b023cb5811e626e10052adc6ac5323dd283c5a25b91059b0fb86a21fb6
hash: 44520cb3a05c2518ca9aeae1b2e3080fe2bba1e3596d014ceff1090dfcba8ab4
link: https://downloads.getmonero.org/cli/macarm8
icon: icon-apple
vers:
- platform: Linux 64-bit
hash: 23af572fdfe3459b9ab97e2e9aa7e3c11021c955d6064b801a27d7e8c21ae09d
hash: 51ba03928d189c1c11b5379cab17dd9ae8d2230056dc05c872d0f8dba4a87f1d
link: https://downloads.getmonero.org/cli/linux64
icon: icon-linux
vers:
- platform: Linux 32-bit
hash: c8553558dece79a4c23e1114fdf638b15e46899d7cf0af41457f18bbbee83986
hash: d7ca0878abff2919a0104d7ed29d9c35df9ca0ea1b6fb4ebf6c8f7607ffb9e41
link: https://downloads.getmonero.org/cli/linux32
icon: icon-linux
vers:
- platform: Linux ARMv8
hash: 445032e88dc07e51ac5fff7034752be530d1c4117d8d605100017bcd87c7b21f
hash: 33ca2f0055529d225b61314c56370e35606b40edad61c91c859f873ed67a1ea7
link: https://downloads.getmonero.org/cli/linuxarm8
icon: icon-linux
vers:
- platform: Linux ARMv7
hash: 2ea2c8898cbab88f49423f4f6c15f2a94046cb4bbe827493dd061edc0fd5f1ca
hash: 354603c56446fb0551cdd6933bce5a13590b7881e05979b7ec25d89e7e59a0e2
link: https://downloads.getmonero.org/cli/linuxarm7
icon: icon-linux
vers:
- platform: Linux RISC-V 64-bit
hash: 88739a1521b9fda3154540268e416c7af016ed7857041c76ab8ed7d7674c71ca
link: https://downloads.getmonero.org/cli/linuxriscv64
icon: icon-linux
vers:
- platform: Android ARMv8
hash: 6d9c7d31942dde86ce39757fd55027448ceb260b60b3c8d32ed018211eb4f1e4
hash: d9c9249d1408822ce36b346c6b9fb6b896cda16714d62117fb1c588a5201763c
link: https://downloads.getmonero.org/cli/androidarm8
icon: icon-android
vers:
- platform: Android ARMv7
hash: fc6a93eabc3fd524ff1ceedbf502b8d43c61a7805728b7ed5f9e7204e26b91f5
hash: 15e4d7dfc2f9261a0a452b0f8fd157c33cdbc8a896e23d883ddd13e2480a3800
link: https://downloads.getmonero.org/cli/androidarm7
icon: icon-android
vers:
- platform: FreeBSD 64-bit
hash: 3e2d9964a9e52c146b4d26b5eb53e691b3ba88e2468dc4fbfee4c318a367a90e
hash: 360a551388922c8991a9ba4abaa88676b0fc7ec1fa4d0f4b5c0500847e0b946c
link: https://downloads.getmonero.org/cli/freebsd64
icon: icon-freebsd
vers:
- platform: Source Code (archive)
hash: 4d217e2aa61a6f105054dddbab52c0301f52766e88783de2480316c5a8661e0c
hash: 7d4845ec0a3b52404d41785da348ec33509f0a5981e8a27c5fa55b18d696e139
link: https://downloads.getmonero.org/cli/source
icon: icon-github
- platform: Source Code
Expand Down
4 changes: 0 additions & 4 deletions _i18n/ar/resources/moneropedia/unlocktime.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ and may be removed in a future Monero release, so the Monero developers
advise against building critical infrastructure that depends on this
feature.

Decoy outputs may be selected from these locked outputs, thus identifying
them as provable decoy outputs. At the moment, this has little impact on
wider network privacy since this unlock time feature is so rarely used.

Further, true spends after a reasonably long lock time (more than several
days) may be heuristically identified as the true spend, since there will be
fewer other transactions using those outputs as decoys around that time
Expand Down
21 changes: 8 additions & 13 deletions _i18n/ar/resources/moneropedia/weblate/unlocktime.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2022-12-12 10:09+0000\n"
"POT-Creation-Date: 2023-10-26 10:42+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand All @@ -16,13 +16,13 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#. type: YAML Front Matter: summary
#. type: Yaml Front Matter Hash Value: summary
#: ../_i18n/en/resources/moneropedia/unlocktime.md:1
#, no-wrap
msgid "a special transaction where the recipient(s) can only spend the funds after a future date, as set by the sender"
msgstr ""

#. type: YAML Front Matter: terms
#. type: Yaml Front Matter Hash Value: terms
#: ../_i18n/en/resources/moneropedia/unlocktime.md:1
#, no-wrap
msgid "[\"unlock-time\"]"
Expand Down Expand Up @@ -61,36 +61,31 @@ msgstr ""

#. type: Plain text
#: ../_i18n/en/resources/moneropedia/unlocktime.md:19
msgid "Decoy outputs may be selected from these locked outputs, thus identifying them as provable decoy outputs. At the moment, this has little impact on wider network privacy since this unlock time feature is so rarely used."
msgstr ""

#. type: Plain text
#: ../_i18n/en/resources/moneropedia/unlocktime.md:21
msgid "Further, true spends after a reasonably long lock time (more than several days) may be heuristically identified as the true spend, since there will be fewer other transactions using those outputs as decoys around that time period."
msgstr ""

#. type: Plain text
#: ../_i18n/en/resources/moneropedia/unlocktime.md:23
#: ../_i18n/en/resources/moneropedia/unlocktime.md:21
msgid "Users should verify that the outputs they receive from others are not encumbered by an unexpected unlock time. Users may want to hold off acting upon such a transaction until the unlock time lapses. The `show_transfers` command includes the unlock time."
msgstr ""

#. type: Title ###
#: ../_i18n/en/resources/moneropedia/unlocktime.md:24
#: ../_i18n/en/resources/moneropedia/unlocktime.md:22
#, no-wrap
msgid "Technical Use"
msgstr ""

#. type: Plain text
#: ../_i18n/en/resources/moneropedia/unlocktime.md:27
#: ../_i18n/en/resources/moneropedia/unlocktime.md:25
msgid "Usage when using the `transfer` command: `unlock_time` + unsigned int"
msgstr ""

#. type: Plain text
#: ../_i18n/en/resources/moneropedia/unlocktime.md:29
#: ../_i18n/en/resources/moneropedia/unlocktime.md:27
msgid "Integer values less than 500,000,000 are interpreted as absolute block height. Values greater than or equal to 500,000,000 are interpreted as an absolute Unix epoch timestamp. The Monero CLI wallet only supports values less than 500,000,000; Unix timestamps must be submitted via RPC or another custom software."
msgstr ""

#. type: Plain text
#: ../_i18n/en/resources/moneropedia/unlocktime.md:30
#: ../_i18n/en/resources/moneropedia/unlocktime.md:28
msgid "The integer value will be interpreted by the protocol as an ***absolute*** block height value or Unix epoch timestamp, not a relative value. Using an integer value less than the current block height or a Unix epoch timestamp less than the current Unix epoch timestamp makes no sense. For example, if you want the Monero transaction to unlock 100 blocks from now, add 100 to the current block height."
msgstr ""
4 changes: 0 additions & 4 deletions _i18n/de/resources/moneropedia/unlocktime.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ and may be removed in a future Monero release, so the Monero developers
advise against building critical infrastructure that depends on this
feature.

Decoy outputs may be selected from these locked outputs, thus identifying
them as provable decoy outputs. At the moment, this has little impact on
wider network privacy since this unlock time feature is so rarely used.

Further, true spends after a reasonably long lock time (more than several
days) may be heuristically identified as the true spend, since there will be
fewer other transactions using those outputs as decoys around that time
Expand Down
Loading

0 comments on commit 664657e

Please sign in to comment.