diff --git a/README.md b/README.md
index ec6ef955..62621fe0 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ If you need support about something related to the website, plese join `#monero-
* Install Bundler: `gem install bundler`
* Install Jekyll with all dependencies (run from the project directory): `bundle`
-* GitHub/GitLab: Pretty much everything in Monero is hosted on [GitHub](https://github.com/monero-project) or [getmonero GitLab](https://repo.getmonero.org/users/monero-project/projects) and uses Git as the primary version control system. If you're not familiar with how to use Git, you can check out [this tutorial](https://guides.github.com/activities/hello-world/) for a good overview. It will take you through pretty much everything you'll need to know to edit the website. If you haven't already, register on GitLab and fork the [Monero Website repository](https://repo.getmonero.org/monero-project/monero-site). Please note that GitLab accounts logged in using the "Log in with GitHub" option require manual intervention in order to be able to fork repositories. Either register your account using email/password or contact the Website Workgroup via GitLab or `#monero-site` to have your GitHub OAuth profile unlocked.
+* GitHub/GitLab: Pretty much everything in Monero is hosted on [GitHub](https://github.com/monero-project) or [getmonero GitLab](https://repo.getmonero.org/users/monero-project/projects) and uses Git as the primary version control system. If you're not familiar with how to use Git, you can check out [this tutorial](https://guides.github.com/activities/hello-world/) for a good overview. It will take you through pretty much everything you'll need to know to edit the website. If you haven't already, register on GitLab and fork the [Monero Website repository](https://github.com/monero-project/monero-site). Please note that GitLab accounts logged in using the "Log in with GitHub" option require manual intervention in order to be able to fork repositories. Either register your account using email/password or contact the Website Workgroup via GitLab or `#monero-site` to have your GitHub OAuth profile unlocked.
*Note: If you're confused, feel free to click other files in the same directory (folder) that you are in for the step that you are on to see some working examples. Compare them to the instructions and you should understand better.*
@@ -41,7 +41,7 @@ Once you have the above list of things, it's typically a good idea to build the
4. If all went well, you should see the Monero website and you're ready to make changes.
## General change recommendations
-The average Monero user that will want to contribute to the website should probably start looking for issues labelled [⛑️ help needed](https://repo.getmonero.org/monero-project/monero-site/issues?label_name%5B%5D=%E2%9B%91%EF%B8%8F++help+needed) or making blog posts, user guides or Moneropedia entries; all of which are covered in this document. If this is all you want to do, don't worry, it's actually not a daunting task at all.
+The average Monero user that will want to contribute to the website should probably start looking for issues labelled [⛑️ contributor needed](https://github.com/monero-project/monero-site/issues?q=is%3Aissue+is%3Aopen+label%3A%22%E2%9B%91%EF%B8%8F+contributor+needed%22) or making blog posts, user guides or Moneropedia entries; all of which are covered in this document. If this is all you want to do, don't worry, it's actually not a daunting task at all.
If you are a web developer and would like to make large macro-level changes, it would be best to open an issue first or to get in contact with the developers on `#monero-site` (IRC/Freenode, MatterMost, Matrix).
@@ -131,11 +131,11 @@ Navigate to the \_i18n folder and duplicate the en.yml file. Rename the duplicat
**The original folder and yml file themselves should still be there. They should not be renamed. There should be a new folder and yml file in addition to the ones that were already there.**
### 4. Open an issue on the repo where the website is hosted
-After you've done all the above, you'll need to [open an issue on the repository](https://repo.getmonero.org/monero-project/monero-site/issues/new?issue%5Bassignee_id%5D=&issue%5Bmilestone_id%5D=) asking to add the language you are working on to Weblate, where the core of the website is translated.
+After you've done all the above, you'll need to [open an issue on the repository](https://github.com/monero-project/monero-site/issues) asking to add the language you are working on to Weblate, where the core of the website is translated.
## Housekeeping
-### GitLab Issues
+### GitHub Issues
We ask that if you open an issue on the site that you remain available for clarifying questions or corrections. We do our best to close issues that are resolved when we make changes to the site, but If your issue is resolved by a contributor and the issue is not closed we ask that you close it in a timely manner. A contributor may ask you to close an issue after it's confirmed fixed. Please review the changes to the site and close your issue if you can verify that it's fixed.
## Updates on User Guides
diff --git a/_data/lang/ar/footer-2.yml b/_data/lang/ar/footer-2.yml
index 577cfd17..9b3fe274 100644
--- a/_data/lang/ar/footer-2.yml
+++ b/_data/lang/ar/footer-2.yml
@@ -1,4 +1,4 @@
- name: قانوني
url: legal
- name: شفره المصدر
- url: https://repo.getmonero.org
+ url: https://github.com/monero-project/monero-site
diff --git a/_data/lang/de/footer-2.yml b/_data/lang/de/footer-2.yml
index 34aea41e..9c000e37 100644
--- a/_data/lang/de/footer-2.yml
+++ b/_data/lang/de/footer-2.yml
@@ -1,4 +1,4 @@
- name: Rechtliches
url: legal
- name: Quellcode
- url: https://repo.getmonero.org
+ url: https://github.com/monero-project/monero-site
diff --git a/_data/lang/en/footer-2.yml b/_data/lang/en/footer-2.yml
index 1ebb9a83..3090758c 100644
--- a/_data/lang/en/footer-2.yml
+++ b/_data/lang/en/footer-2.yml
@@ -1,4 +1,4 @@
- name: Legal
url: legal
- name: Source Code
- url: https://repo.getmonero.org
+ url: https://github.com/monero-project/monero-site
diff --git a/_data/lang/es/footer-2.yml b/_data/lang/es/footer-2.yml
index ed71895e..a230fad6 100644
--- a/_data/lang/es/footer-2.yml
+++ b/_data/lang/es/footer-2.yml
@@ -1,4 +1,4 @@
- name: Aviso Legal
url: legal
- name: Código Fuente
- url: https://repo.getmonero.org
+ url: https://github.com/monero-project/monero-site
diff --git a/_data/lang/fr/footer-2.yml b/_data/lang/fr/footer-2.yml
index c4152229..3d335d7f 100644
--- a/_data/lang/fr/footer-2.yml
+++ b/_data/lang/fr/footer-2.yml
@@ -1,4 +1,4 @@
- name: Juridique
url: legal
- name: Code Source
- url: https://repo.getmonero.org
+ url: https://github.com/monero-project/monero-site
diff --git a/_data/lang/it/footer-2.yml b/_data/lang/it/footer-2.yml
index 8dd4b592..2e81a8bb 100644
--- a/_data/lang/it/footer-2.yml
+++ b/_data/lang/it/footer-2.yml
@@ -1,4 +1,4 @@
- name: Legale
url: legal
- name: Codice Sorgente
- url: https://repo.getmonero.org
+ url: https://github.com/monero-project/monero-site
diff --git a/_data/lang/nl/footer-2.yml b/_data/lang/nl/footer-2.yml
index 167fd7e6..0bea08bc 100644
--- a/_data/lang/nl/footer-2.yml
+++ b/_data/lang/nl/footer-2.yml
@@ -1,4 +1,4 @@
- name: Juridisch
url: legal
- name: Broncode
- url: https://repo.getmonero.org
+ url: https://github.com/monero-project/monero-site
diff --git a/_data/lang/pl/footer-2.yml b/_data/lang/pl/footer-2.yml
index 5db0c06a..a7d1bcd1 100644
--- a/_data/lang/pl/footer-2.yml
+++ b/_data/lang/pl/footer-2.yml
@@ -1,4 +1,4 @@
- name: Informacje prawne
url: legal
- name: Kod źródłowy
- url: https://repo.getmonero.org
+ url: https://github.com/monero-project/monero-site
diff --git a/_data/lang/pt-br/footer-2.yml b/_data/lang/pt-br/footer-2.yml
index fa243d92..e8dd967f 100644
--- a/_data/lang/pt-br/footer-2.yml
+++ b/_data/lang/pt-br/footer-2.yml
@@ -1,4 +1,4 @@
- name: Legal
url: legal
- name: Código Fonte
- url: https://repo.getmonero.org
+ url: https://github.com/monero-project/monero-site
diff --git a/_data/lang/ru/footer-2.yml b/_data/lang/ru/footer-2.yml
index f144ba90..f98132cc 100644
--- a/_data/lang/ru/footer-2.yml
+++ b/_data/lang/ru/footer-2.yml
@@ -1,4 +1,4 @@
- name: Юридическая информация
url: legal
- name: Исходный код
- url: https://repo.getmonero.org
\ No newline at end of file
+ url: https://github.com/monero-project/monero-site
\ No newline at end of file
diff --git a/_data/lang/tr/footer-2.yml b/_data/lang/tr/footer-2.yml
index f9d77168..11b64a8b 100644
--- a/_data/lang/tr/footer-2.yml
+++ b/_data/lang/tr/footer-2.yml
@@ -1,4 +1,4 @@
- name: Yasal
url: legal
- name: Kaynak Kodu
- url: https://repo.getmonero.org
+ url: https://github.com/monero-project/monero-site
diff --git a/_data/lang/zh-cn/footer-2.yml b/_data/lang/zh-cn/footer-2.yml
index 1ebb9a83..3090758c 100644
--- a/_data/lang/zh-cn/footer-2.yml
+++ b/_data/lang/zh-cn/footer-2.yml
@@ -1,4 +1,4 @@
- name: Legal
url: legal
- name: Source Code
- url: https://repo.getmonero.org
+ url: https://github.com/monero-project/monero-site
diff --git a/_data/lang/zh-tw/footer-2.yml b/_data/lang/zh-tw/footer-2.yml
index a183c14a..b5b43618 100644
--- a/_data/lang/zh-tw/footer-2.yml
+++ b/_data/lang/zh-tw/footer-2.yml
@@ -1,4 +1,4 @@
- name: 使用規定
url: legal
- name: 原始碼
- url: https://repo.getmonero.org
+ url: https://github.com/monero-project/monero-site
diff --git a/_includes/disclaimer.html b/_includes/disclaimer.html
index a97bce92..ba13361c 100644
--- a/_includes/disclaimer.html
+++ b/_includes/disclaimer.html
@@ -16,7 +16,7 @@
{% if disclaimer != "" %}
{% capture disclaimer %}
{{ disclaimer }}{% endcapture %}
{% endif %}
- {% capture disclaimer %}{% t global.untranslated %} README.{{ disclaimer }}{% endcapture %}
+ {% capture disclaimer %}{% t global.untranslated %} README.{{ disclaimer }}{% endcapture %}
{% else %}
{% endif %}
diff --git a/_includes/untranslated.html b/_includes/untranslated.html
index f99cbeab..3a45414c 100644
--- a/_includes/untranslated.html
+++ b/_includes/untranslated.html
@@ -1,3 +1,3 @@
{% t merchants.intro1 %} {% t merchants.intro2 %} {% t merchants.intro3 %}
+{% t merchants.intro1 %} {% t merchants.intro2 %} {% t merchants.intro3 %}