From 65ec4eeb9156d0f7014805f3c8b8ba33c6fbddb3 Mon Sep 17 00:00:00 2001
From: Little Big T <lbt@i2pmail.org>
Date: Sun, 15 Jan 2023 19:05:20 +0000
Subject: [PATCH] No more monotone and trac
---
i2p2www/pages/site/docs/how/intro.html | 2 +-
i2p2www/pages/site/docs/plugins.html | 2 +-
i2p2www/pages/site/faq.html | 6 ++--
.../site/get-involved/develop/licenses.html | 2 +-
.../get-involved/guides/new-developers.html | 8 ++---
.../get-involved/guides/new-translators.html | 36 ++++++++++---------
6 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/i2p2www/pages/site/docs/how/intro.html b/i2p2www/pages/site/docs/how/intro.html
index aabaf0a2b..c163c67bf 100644
--- a/i2p2www/pages/site/docs/how/intro.html
+++ b/i2p2www/pages/site/docs/how/intro.html
@@ -178,7 +178,7 @@ scheduled development meetings, however <a href="{{ meetings }}">archives are av
{%- endtrans %}</p>
<p>{% trans monotone=site_url('get-involved/guides/monotone') -%}
-The current source is available in <a href="{{ monotone }}">monotone</a>.
+The current source is available in <a href="{{ monotone }}">git</a>.
{%- endtrans %}</p>
<h2>{% trans %}Additional Information{% endtrans %}</h2>
diff --git a/i2p2www/pages/site/docs/plugins.html b/i2p2www/pages/site/docs/plugins.html
index ed732cd7e..d2519f98d 100644
--- a/i2p2www/pages/site/docs/plugins.html
+++ b/i2p2www/pages/site/docs/plugins.html
@@ -149,7 +149,7 @@ or easily add some feature.
<h3>{% trans %}Getting Started{% endtrans %}</h3>
<p>{% 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 <a href="{{ url }}">the i2p.scripts branch in monotone</a>.
+makeplugin.sh from <a href="{{ url }}">the i2p.scripts repository in git</a>.
{%- endtrans %}</p>
diff --git a/i2p2www/pages/site/faq.html b/i2p2www/pages/site/faq.html
index 4f3cc88b9..566e277c4 100644
--- a/i2p2www/pages/site/faq.html
+++ b/i2p2www/pages/site/faq.html
@@ -473,13 +473,13 @@ These are described in detail below.
</tr>
<tr>
<td>
- 8998
+ 7670 (8998)
</td>
<td>
- mtn.i2p-projekt.i2p (Monotone)
+ gitssh.idk.i2p git over ssh
</td>
<td>
- {% trans -%}May be disabled or changed on the i2ptunnel page in the router console.
+ {% trans -%}This used to be port 8998 for monotone. Elder installations may still have that and not this one. May be disabled or changed on the i2ptunnel page in the router console.
May also be configured to be bound to a specific interface or all interfaces.{%- endtrans %}
</td>
</tr>
diff --git a/i2p2www/pages/site/get-involved/develop/licenses.html b/i2p2www/pages/site/get-involved/develop/licenses.html
index a6252c324..0d2768933 100644
--- a/i2p2www/pages/site/get-involved/develop/licenses.html
+++ b/i2p2www/pages/site/get-involved/develop/licenses.html
@@ -309,7 +309,7 @@ Except where otherwise noted, content on this site is licensed under a
<p>{% 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 <a href="{{ git }}">Monotone Page</a> for details.
+See the <a href="{{ git }}">Git Page</a> for details.
{%- endtrans %}</p>
<p>{% trans -%}
diff --git a/i2p2www/pages/site/get-involved/guides/new-developers.html b/i2p2www/pages/site/get-involved/guides/new-developers.html
index 72e4a83ba..ffd6d8994 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
<p>{% 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 %}</p>
-<h3 id="git">{% trans %}The new way: Git{% endtrans %}</h3>
+<h3 id="git">{% trans %}Our current way: Git{% endtrans %}</h3>
-<p>{% 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 <a href="{{ trac }}">gitlab</a> and the old Trac is not available anymore by now. Two-way syncing of
+<p>{% trans trac="https://i2pgit.org" -%}I2P has official Git services and accepts contributions via Git at <a href="{{ trac }}">our own gitlab</a>.
+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 %}</p>
<li>{% trans git_url='https://git-scm.com/' -%}
diff --git a/i2p2www/pages/site/get-involved/guides/new-translators.html b/i2p2www/pages/site/get-involved/guides/new-translators.html
index 0e8baf449..9469d0896 100644
--- a/i2p2www/pages/site/get-involved/guides/new-translators.html
+++ b/i2p2www/pages/site/get-involved/guides/new-translators.html
@@ -1,7 +1,11 @@
{% extends "global/layout.html" %}
{% block title %}{% trans %}New Translator's Guide{% endtrans %}{% endblock %}
{% block content %}
-{% trans %}Here's a very quick guide to getting started.{% endtrans %}
+{% trans %}Here's a very quick guide to getting started.
+Note that for both (website/console) there is an <b>easy way</b> using a
+translation web-site (and requiring nothing else than to use that) and
+the <b>other way</b> which requires you to set up a build-environment
+(installing software etc.).{% endtrans %}
<h2>{% trans %}How to Translate the Website{% endtrans %}</h2>
@@ -24,8 +28,8 @@ please update the translation status on <a href="{{ url }}">this wiki page</a>.
{%- endtrans %}</li>
<li>{% trans newdevs=site_url('get-involved/guides/new-developers') -%}
Follow the <a href="{{ newdevs }}">new developer's guide</a>,
-Including the installation of monotone,
-checking out i2p.www branch, and generate your own monotone keys.
+including the installation of git and the gettext tools. You will need
+the i2p.www repository.
It is not required that you sign a dev agreement.
{%- endtrans %}</li>
</ol>
@@ -56,10 +60,9 @@ To work with .po files efficiently, you may wish to use <a href="http://www.poed
{%- endtrans %}</li>
<li>{% trans -%}
-<b>Check in:</b>
-"<code>mtn pull</code>", "<code>mtn update</code>". Then check in by "<code>mtn ci -k yourname@mail.i2p file1 file2 ...</code>"
-This collects the diff info of your changed file into your local repo. Then "<code>mtn sync mtn.i2p2.de -k yourname-transport@mail.i2p i2p.i2p</code>".
-This synchronizes your local repo with the repo on the target machine.
+<b>Git Workflow:</b>
+You can then add all new and changed files to your next commit using <code>git add .</code> (or specify which files instead of the dot).
+Please note the suggested workflow for git on our git-page.
{%- endtrans %}</li>
<li>{% trans -%}
@@ -89,8 +92,8 @@ please update the translation status on <a href="{{ url }}">this wiki page</a>.
{%- endtrans %}</li>
<li>{% trans newdevs=site_url('get-involved/guides/new-developers') -%}
Follow the <a href="{{ newdevs }}">new developer's guide</a>,
-including the installation of monotone and the gettext tools,
-checking out i2p.i2p branch, and generate your own monotone keys.
+including the installation of git and the gettext tools. You will need
+the i2p.i2p repository.
{%- endtrans %}</li>
<li>{% trans -%}
Generate your own gpg key and sign the dev agreement.
@@ -149,10 +152,9 @@ To work with .po files efficiently, you may wish to use <a href="http://www.poed
{%- endtrans %}</li>
<li>{% trans -%}
-<b>Check in:</b>
-"<code>mtn pull</code>", "<code>mtn update</code>". Then check in by "<code>mtn ci -k yourname@mail.i2p file1 file2 ...</code>"
-This collects the diff info of your changed file into your local repo. Then "<code>mtn sync mtn.i2p2.de -k yourname-transport@mail.i2p i2p.i2p</code>".
-This synchronizes your local repo with the repo on the target machine.
+<b>Git Workflow:</b>
+You can then add all new and changed files to your next commit using <code>git add .</code> (or specify which files instead of the dot).
+Please note the suggested workflow for git on our git-page.
{%- endtrans %}</li>
<li>{% trans -%}
@@ -169,14 +171,14 @@ If you have questions about the meaning of the terms in the console, ask in <cod
<h2>{% trans %}FAQ{% endtrans %}</h2>
<p><b>{% 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 %}</b></p>
-<p><b>{% trans %}A: Several reasons:{% endtrans %}</b></p>
+<p><b>{% trans %}A: You do not / Several reasons:{% endtrans %}</b></p>
<ul>
<li>{% trans transifex='https://www.transifex.com/projects/p/I2P/' -%}
-You might be interested in translating via Transifex. Request to join a translation team <a href="{{ transifex }}">here</a>.
+First of all: you don't have to, you can translate via Transifex (aka "using a web-site to translate"). Request to join a translation team <a href="{{ transifex }}">here</a>. Aside from that ...
{%- endtrans %}</li>
<li>{% trans -%}
@@ -200,7 +202,7 @@ HTML files are not difficult. Just ignore the html stuff and translate the text.
{%- endtrans %}</li>
<li>{% trans -%}
-Installing and using monotone is not that difficult. Several of the translators and other contributors to I2P are non-programmers, and they use monotone regularly. Monotone is simply a source control system, it is not about "coding".
+Installing and using git is not that difficult. Several of the translators and other contributors to I2P are non-programmers, and they use git regularly. Git is simply a source control system, it is not about "coding".
{%- endtrans %}</li>
<li>{% trans -%}
--
GitLab