Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix conflicts for #2203 #2276

Merged
merged 1 commit into from
Mar 18, 2024
Merged

Conversation

plowsof
Copy link
Collaborator

@plowsof plowsof commented Mar 13, 2024

replaces / closes #2203

small conflict fixed

master has "/_i18n/en/resources/moneropedia" and #2203 had "/_i18n/en/resources/moneropedia"

Copy link

netlify bot commented Mar 13, 2024

Deploy Preview for barolo-time-757cf9 ready!

Built without sensitive environment variables

Name Link
🔨 Latest commit 9791597
🔍 Latest deploy log https://app.netlify.com/sites/barolo-time-757cf9/deploys/65f1f653bcc4e80008131525
😎 Deploy Preview https://deploy-preview-2276--barolo-time-757cf9.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Copy link
Contributor

@jermanuts jermanuts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

give it the same

Give it the same....

Copy link
Contributor

@jermanuts jermanuts left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#monero-translations

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

direct anchor link would be convenient

Make the localized File

Change all instances of "Make" to Create.


## 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)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
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)
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](https://matrix.to/#/%23monero-translations:monero.social) or IRC (Libera.chat)

@nahuhh
Copy link
Contributor

nahuhh commented Mar 13, 2024

direct anchor link would be convenient

made my suggested edit before i saw your updated comment

@luigi1111 luigi1111 merged commit 937eca5 into monero-project:master Mar 18, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants