{% trans monotone=site_url('get-involved/guides/monotone') -%} -The current source is available in monotone. +The current source is available in git. {%- endtrans %}
{% trans url='https://github.com/i2p/i2p.scripts/tree/master/plugin/makeplugin.sh' -%} To create a plugin from an existing binary package you will need to get -makeplugin.sh from the i2p.scripts branch in monotone. +makeplugin.sh from the i2p.scripts repository in git. {%- endtrans %}
diff --git a/i2p2www/pages/site/faq.html b/i2p2www/pages/site/faq.html index 4f3cc88b..566e277c 100644 --- a/i2p2www/pages/site/faq.html +++ b/i2p2www/pages/site/faq.html @@ -473,13 +473,13 @@ These are described in detail below.{% trans git=site_url('docs/applications/git') -%} Developers may push changes to a distributed git repository if you receive permission from the person running that repository. -See the Monotone Page for details. +See the Git Page for details. {%- endtrans %}
{% trans -%} diff --git a/i2p2www/pages/site/get-involved/guides/new-developers.html b/i2p2www/pages/site/get-involved/guides/new-developers.html index 72e4a83b..ffd6d899 100644 --- a/i2p2www/pages/site/get-involved/guides/new-developers.html +++ b/i2p2www/pages/site/get-involved/guides/new-developers.html @@ -46,13 +46,13 @@ These will give you a good overview of how I2P is structured and what different
{% trans -%} For development on the I2P router or the embedded applications, -there are two ways to get the source code: +you need to get the source code: {%- endtrans %}
-{% trans trac="https://i2pgit.org" -%}I2P now has official Git services and accepts contributions via Git at our own gitlab. -Trac issues have also been migrated to gitlab and the old Trac is not available anymore by now. Two-way syncing of +
{% trans trac="https://i2pgit.org" -%}I2P has official Git services and accepts contributions via Git at our own gitlab. +Trac issues have also been migrated there and the former Trac is not available anymore by now. Two-way syncing of issues between Gitlab and Github is a work-in-progress.{%- endtrans %}
mtn update". Then check in by "mtn ci -k yourname@mail.i2p file1 file2 ..."
-This collects the diff info of your changed file into your local repo. Then "mtn sync mtn.i2p2.de -k yourname-transport@mail.i2p i2p.i2p".
-This synchronizes your local repo with the repo on the target machine.
+Git Workflow:
+You can then add all new and changed files to your next commit using git add . (or specify which files instead of the dot).
+Please note the suggested workflow for git on our git-page.
{%- endtrans %}
mtn update". Then check in by "mtn ci -k yourname@mail.i2p file1 file2 ..."
-This collects the diff info of your changed file into your local repo. Then "mtn sync mtn.i2p2.de -k yourname-transport@mail.i2p i2p.i2p".
-This synchronizes your local repo with the repo on the target machine.
+Git Workflow:
+You can then add all new and changed files to your next commit using git add . (or specify which files instead of the dot).
+Please note the suggested workflow for git on our git-page.
{%- endtrans %}{% trans -%} -Q: Why do I have to install monotone, Java, jsp, learn about .po files and html, etc.? Why can't I just do a translation and email it to you? +Q: Why do I have to install git, Java, jsp, learn about .po files and html, etc.? Why can't I just do a translation and email it to you? {%- endtrans %}
-{% trans %}A: Several reasons:{% endtrans %}
+{% trans %}A: You do not / Several reasons:{% endtrans %}