From 655e5aa5d4a7df849078fb3e0f2344d2f040110b Mon Sep 17 00:00:00 2001
From: Phil Wareham <phil@designhive.com>
Date: Thu, 2 Aug 2018 14:55:23 +0100
Subject: [PATCH 01/29] Initial structure for localised content

Liable to change. Setup will be broken in this branch until we hook this all up.
---
 .../en-gb}/articles/articles.welcome.xml      |  1 -
 .../en-gb}/data/core.prefs                    |  0
 .../en-gb}/data/txp_category.xml              |  8 ++--
 .../en-gb}/data/txp_link.xml                  | 16 ++++----
 .../en-gb}/data/txp_section.xml               |  2 +-
 .../en-us/articles/articles.welcome.xml       | 41 +++++++++++++++++++
 .../initial-content/en-us/data/core.prefs     | 23 +++++++++++
 .../en-us/data/txp_category.xml               | 33 +++++++++++++++
 .../initial-content/en-us/data/txp_link.xml   | 41 +++++++++++++++++++
 .../en-us/data/txp_section.xml                | 15 +++++++
 .../en/articles/articles.welcome.xml          | 41 +++++++++++++++++++
 .../setup/initial-content/en/data/core.prefs  | 23 +++++++++++
 .../initial-content/en/data/txp_category.xml  | 33 +++++++++++++++
 .../initial-content/en/data/txp_link.xml      | 41 +++++++++++++++++++
 .../initial-content/en/data/txp_section.xml   | 15 +++++++
 .../fi/articles/articles.welcome.xml          | 41 +++++++++++++++++++
 .../setup/initial-content/fi/data/core.prefs  | 23 +++++++++++
 .../initial-content/fi/data/txp_category.xml  | 33 +++++++++++++++
 .../initial-content/fi/data/txp_link.xml      | 41 +++++++++++++++++++
 .../initial-content/fi/data/txp_section.xml   | 15 +++++++
 .../sv/articles/articles.welcome.xml          | 41 +++++++++++++++++++
 .../setup/initial-content/sv/data/core.prefs  | 23 +++++++++++
 .../initial-content/sv/data/txp_category.xml  | 33 +++++++++++++++
 .../initial-content/sv/data/txp_link.xml      | 41 +++++++++++++++++++
 .../initial-content/sv/data/txp_section.xml   | 15 +++++++
 .../Textpattern/DB/Data/txp_category.xml      |  8 ++--
 .../Textpattern/DB/Data/txp_section.xml       |  2 +-
 27 files changed, 630 insertions(+), 19 deletions(-)
 rename textpattern/setup/{ => initial-content/en-gb}/articles/articles.welcome.xml (99%)
 rename textpattern/setup/{ => initial-content/en-gb}/data/core.prefs (100%)
 rename textpattern/setup/{ => initial-content/en-gb}/data/txp_category.xml (84%)
 rename textpattern/setup/{ => initial-content/en-gb}/data/txp_link.xml (79%)
 rename textpattern/setup/{ => initial-content/en-gb}/data/txp_section.xml (90%)
 create mode 100644 textpattern/setup/initial-content/en-us/articles/articles.welcome.xml
 create mode 100644 textpattern/setup/initial-content/en-us/data/core.prefs
 create mode 100644 textpattern/setup/initial-content/en-us/data/txp_category.xml
 create mode 100644 textpattern/setup/initial-content/en-us/data/txp_link.xml
 create mode 100644 textpattern/setup/initial-content/en-us/data/txp_section.xml
 create mode 100644 textpattern/setup/initial-content/en/articles/articles.welcome.xml
 create mode 100644 textpattern/setup/initial-content/en/data/core.prefs
 create mode 100644 textpattern/setup/initial-content/en/data/txp_category.xml
 create mode 100644 textpattern/setup/initial-content/en/data/txp_link.xml
 create mode 100644 textpattern/setup/initial-content/en/data/txp_section.xml
 create mode 100644 textpattern/setup/initial-content/fi/articles/articles.welcome.xml
 create mode 100644 textpattern/setup/initial-content/fi/data/core.prefs
 create mode 100644 textpattern/setup/initial-content/fi/data/txp_category.xml
 create mode 100644 textpattern/setup/initial-content/fi/data/txp_link.xml
 create mode 100644 textpattern/setup/initial-content/fi/data/txp_section.xml
 create mode 100644 textpattern/setup/initial-content/sv/articles/articles.welcome.xml
 create mode 100644 textpattern/setup/initial-content/sv/data/core.prefs
 create mode 100644 textpattern/setup/initial-content/sv/data/txp_category.xml
 create mode 100644 textpattern/setup/initial-content/sv/data/txp_link.xml
 create mode 100644 textpattern/setup/initial-content/sv/data/txp_section.xml

diff --git a/textpattern/setup/articles/articles.welcome.xml b/textpattern/setup/initial-content/en-gb/articles/articles.welcome.xml
similarity index 99%
rename from textpattern/setup/articles/articles.welcome.xml
rename to textpattern/setup/initial-content/en-gb/articles/articles.welcome.xml
index 2f204c2d61..f620a24d85 100644
--- a/textpattern/setup/articles/articles.welcome.xml
+++ b/textpattern/setup/initial-content/en-gb/articles/articles.welcome.xml
@@ -38,5 +38,4 @@ This is a Textpattern article excerpt. Article excerpts are optional but can be
     </comment>
 </article>
 </articles>
-
 </resources>
diff --git a/textpattern/setup/data/core.prefs b/textpattern/setup/initial-content/en-gb/data/core.prefs
similarity index 100%
rename from textpattern/setup/data/core.prefs
rename to textpattern/setup/initial-content/en-gb/data/core.prefs
diff --git a/textpattern/setup/data/txp_category.xml b/textpattern/setup/initial-content/en-gb/data/txp_category.xml
similarity index 84%
rename from textpattern/setup/data/txp_category.xml
rename to textpattern/setup/initial-content/en-gb/data/txp_category.xml
index 31d8b4f7cf..2df24dc8d2 100644
--- a/textpattern/setup/data/txp_category.xml
+++ b/textpattern/setup/initial-content/en-gb/data/txp_category.xml
@@ -6,28 +6,28 @@
             <type>article</type>
             <parent>root</parent>
             <title>Everything is going to be alright</title>
-            <description></description>
+            <description/>
         </item>
         <item>
             <name>hope-for-the-future</name>
             <type>article</type>
             <parent>root</parent>
             <title>Hope for the future</title>
-            <description></description>
+            <description/>
         </item>
         <item>
             <name>meaningful-labor</name>
             <type>article</type>
             <parent>root</parent>
             <title>Meaningful labor</title>
-            <description></description>
+            <description/>
         </item>
         <item>
             <name>textpattern</name>
             <type>link</type>
             <parent>root</parent>
             <title>Textpattern</title>
-            <description></description>
+            <description/>
         </item>
     </category>
 </resources>
diff --git a/textpattern/setup/data/txp_link.xml b/textpattern/setup/initial-content/en-gb/data/txp_link.xml
similarity index 79%
rename from textpattern/setup/data/txp_link.xml
rename to textpattern/setup/initial-content/en-gb/data/txp_link.xml
index 0e035af0c7..ca6e58c077 100644
--- a/textpattern/setup/data/txp_link.xml
+++ b/textpattern/setup/initial-content/en-gb/data/txp_link.xml
@@ -7,8 +7,8 @@
             <url>https://textpattern.com/</url>
             <linkname>Textpattern website</linkname>
             <linksort>10</linksort>
-            <description></description>
-            <author></author>
+            <description/>
+            <author/>
         </item>
         <item>
             <date>NOW()</date>
@@ -16,8 +16,8 @@
             <url>https://docs.textpattern.io/</url>
             <linkname>Textpattern user documentation</linkname>
             <linksort>20</linksort>
-            <description></description>
-            <author></author>
+            <description/>
+            <author/>
         </item>
         <item>
             <date>NOW()</date>
@@ -25,8 +25,8 @@
             <url>https://textpattern.com/github</url>
             <linkname>Textpattern on GitHub</linkname>
             <linksort>30</linksort>
-            <description></description>
-            <author></author>
+            <description/>
+            <author/>
         </item>
         <item>
             <date>NOW()</date>
@@ -34,8 +34,8 @@
             <url>https://textpattern.com/@textpattern</url>
             <linkname>Textpattern on Twitter</linkname>
             <linksort>40</linksort>
-            <description></description>
-            <author></author>
+            <description/>
+            <author/>
         </item>
     </link>
 </resources>
diff --git a/textpattern/setup/data/txp_section.xml b/textpattern/setup/initial-content/en-gb/data/txp_section.xml
similarity index 90%
rename from textpattern/setup/data/txp_section.xml
rename to textpattern/setup/initial-content/en-gb/data/txp_section.xml
index 60f3cfb843..c37d02b4e3 100644
--- a/textpattern/setup/data/txp_section.xml
+++ b/textpattern/setup/initial-content/en-gb/data/txp_section.xml
@@ -5,7 +5,7 @@
             <name>articles</name>
             <page>archive</page>
             <css>default</css>
-            <description></description>
+            <description/>
             <in_rss>1</in_rss>
             <on_frontpage>1</on_frontpage>
             <searchable>1</searchable>
diff --git a/textpattern/setup/initial-content/en-us/articles/articles.welcome.xml b/textpattern/setup/initial-content/en-us/articles/articles.welcome.xml
new file mode 100644
index 0000000000..f620a24d85
--- /dev/null
+++ b/textpattern/setup/initial-content/en-us/articles/articles.welcome.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<articles>
+<article>
+    <title>Welcome to your site</title>
+    <section>articles</section>
+    <category>hope-for-the-future</category>
+    <category>meaningful-labor</category>
+    <body format="textile"><![CDATA[
+h3. What do you want to do next?
+
+* Modify or delete this article? The "article list":adminurl/index.php?event=list is the place to start.
+* Change this site's name, or modify the style of the URLs? It's all up to your "preferences":adminurl/index.php?event=prefs.
+* Get yourself acquainted with Textile, the humane markup generator which comes with Textpattern? The basics are "simple":https://textpattern.com/textile-sandbox. If you want to learn more, you can dig into an "extensive manual":https://textpattern.com/textile-reference-manual later.
+* Be guided through your "Textpattern first steps":https://textpattern.com/textpattern-first-steps by completing some basic tasks?
+* Study the "Textpattern Semantic Model?":https://textpattern.com/textpattern-semantic-model
+* Add "another user":adminurl/index.php?event=admin, or extend the capabilities with "third party plugins":adminurl/index.php?event=plugin you discovered from the "Textpattern plugin directory?":https://textpattern.com/plugins
+* Dive in and learn by trial and error? Then please note:
+** When you "write":adminurl/index.php?event=article an article you assign it to a section of your site.
+** Sections use a "page template":adminurl/index.php?event=page and a "style":adminurl/index.php?event=css as an output scaffold.
+** Page templates use HTML(HyperText Markup Language) and Textpattern tags (like this: @<txp:article />@) to build the markup.
+** Some Textpattern tags use "forms":adminurl/index.php?event=form, which are building blocks for reusable snippets of code and markup you may build and use at your discretion.
+
+"Textpattern tags":https://docs.textpattern.io/tags/, their attributes and values are explained and sampled within the "Textpattern User Documentation":https://docs.textpattern.io/, where you will also find valuable tips and tutorials.
+
+There's also a crowd of friendly, helpful people over at the "Textpattern support forum":https://forum.textpattern.io/. Come and pay a visit!
+
+We welcome additional language translations (and corrections to current translations). Please visit "Textpattern language translations":https://textpattern.com/languages for further details.
+]]></body>
+    <excerpt format="textile"><![CDATA[
+This is a Textpattern article excerpt. Article excerpts are optional but can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication and with the @<txp:excerpt />@ tag.
+]]></excerpt>
+    <comment>
+        <name>Donald Swain</name>
+        <email>donald-swain@example.com</email>
+        <web>https://docs.textpattern.io/brand/donald-swain</web>
+        <message><![CDATA[<p>I enjoy your site very much.</p>]]></message>
+    </comment>
+</article>
+</articles>
+</resources>
diff --git a/textpattern/setup/initial-content/en-us/data/core.prefs b/textpattern/setup/initial-content/en-us/data/core.prefs
new file mode 100644
index 0000000000..0fce2b23a9
--- /dev/null
+++ b/textpattern/setup/initial-content/en-us/data/core.prefs
@@ -0,0 +1,23 @@
+{
+  "default_section": {
+    "val": "articles",
+    "type": "2",
+    "event": "section",
+    "html": "text_input",
+    "position": "0"
+  },
+  "custom_1_set": {
+    "val": "custom1",
+    "type": "0",
+    "event": "custom",
+    "html": "custom_set",
+    "position": "1"
+  },
+  "custom_2_set": {
+    "val": "custom2",
+    "type": "0",
+    "event": "custom",
+    "html": "custom_set",
+    "position": "2"
+  }
+}
diff --git a/textpattern/setup/initial-content/en-us/data/txp_category.xml b/textpattern/setup/initial-content/en-us/data/txp_category.xml
new file mode 100644
index 0000000000..2df24dc8d2
--- /dev/null
+++ b/textpattern/setup/initial-content/en-us/data/txp_category.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <category>
+        <item>
+            <name>everything-is-going-to-be-alright</name>
+            <type>article</type>
+            <parent>root</parent>
+            <title>Everything is going to be alright</title>
+            <description/>
+        </item>
+        <item>
+            <name>hope-for-the-future</name>
+            <type>article</type>
+            <parent>root</parent>
+            <title>Hope for the future</title>
+            <description/>
+        </item>
+        <item>
+            <name>meaningful-labor</name>
+            <type>article</type>
+            <parent>root</parent>
+            <title>Meaningful labor</title>
+            <description/>
+        </item>
+        <item>
+            <name>textpattern</name>
+            <type>link</type>
+            <parent>root</parent>
+            <title>Textpattern</title>
+            <description/>
+        </item>
+    </category>
+</resources>
diff --git a/textpattern/setup/initial-content/en-us/data/txp_link.xml b/textpattern/setup/initial-content/en-us/data/txp_link.xml
new file mode 100644
index 0000000000..ca6e58c077
--- /dev/null
+++ b/textpattern/setup/initial-content/en-us/data/txp_link.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <link>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://textpattern.com/</url>
+            <linkname>Textpattern website</linkname>
+            <linksort>10</linksort>
+            <description/>
+            <author/>
+        </item>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://docs.textpattern.io/</url>
+            <linkname>Textpattern user documentation</linkname>
+            <linksort>20</linksort>
+            <description/>
+            <author/>
+        </item>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://textpattern.com/github</url>
+            <linkname>Textpattern on GitHub</linkname>
+            <linksort>30</linksort>
+            <description/>
+            <author/>
+        </item>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://textpattern.com/@textpattern</url>
+            <linkname>Textpattern on Twitter</linkname>
+            <linksort>40</linksort>
+            <description/>
+            <author/>
+        </item>
+    </link>
+</resources>
diff --git a/textpattern/setup/initial-content/en-us/data/txp_section.xml b/textpattern/setup/initial-content/en-us/data/txp_section.xml
new file mode 100644
index 0000000000..c37d02b4e3
--- /dev/null
+++ b/textpattern/setup/initial-content/en-us/data/txp_section.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <section>
+        <item>
+            <name>articles</name>
+            <page>archive</page>
+            <css>default</css>
+            <description/>
+            <in_rss>1</in_rss>
+            <on_frontpage>1</on_frontpage>
+            <searchable>1</searchable>
+            <title>Articles</title>
+        </item>
+    </section>
+</resources>
diff --git a/textpattern/setup/initial-content/en/articles/articles.welcome.xml b/textpattern/setup/initial-content/en/articles/articles.welcome.xml
new file mode 100644
index 0000000000..f620a24d85
--- /dev/null
+++ b/textpattern/setup/initial-content/en/articles/articles.welcome.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<articles>
+<article>
+    <title>Welcome to your site</title>
+    <section>articles</section>
+    <category>hope-for-the-future</category>
+    <category>meaningful-labor</category>
+    <body format="textile"><![CDATA[
+h3. What do you want to do next?
+
+* Modify or delete this article? The "article list":adminurl/index.php?event=list is the place to start.
+* Change this site's name, or modify the style of the URLs? It's all up to your "preferences":adminurl/index.php?event=prefs.
+* Get yourself acquainted with Textile, the humane markup generator which comes with Textpattern? The basics are "simple":https://textpattern.com/textile-sandbox. If you want to learn more, you can dig into an "extensive manual":https://textpattern.com/textile-reference-manual later.
+* Be guided through your "Textpattern first steps":https://textpattern.com/textpattern-first-steps by completing some basic tasks?
+* Study the "Textpattern Semantic Model?":https://textpattern.com/textpattern-semantic-model
+* Add "another user":adminurl/index.php?event=admin, or extend the capabilities with "third party plugins":adminurl/index.php?event=plugin you discovered from the "Textpattern plugin directory?":https://textpattern.com/plugins
+* Dive in and learn by trial and error? Then please note:
+** When you "write":adminurl/index.php?event=article an article you assign it to a section of your site.
+** Sections use a "page template":adminurl/index.php?event=page and a "style":adminurl/index.php?event=css as an output scaffold.
+** Page templates use HTML(HyperText Markup Language) and Textpattern tags (like this: @<txp:article />@) to build the markup.
+** Some Textpattern tags use "forms":adminurl/index.php?event=form, which are building blocks for reusable snippets of code and markup you may build and use at your discretion.
+
+"Textpattern tags":https://docs.textpattern.io/tags/, their attributes and values are explained and sampled within the "Textpattern User Documentation":https://docs.textpattern.io/, where you will also find valuable tips and tutorials.
+
+There's also a crowd of friendly, helpful people over at the "Textpattern support forum":https://forum.textpattern.io/. Come and pay a visit!
+
+We welcome additional language translations (and corrections to current translations). Please visit "Textpattern language translations":https://textpattern.com/languages for further details.
+]]></body>
+    <excerpt format="textile"><![CDATA[
+This is a Textpattern article excerpt. Article excerpts are optional but can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication and with the @<txp:excerpt />@ tag.
+]]></excerpt>
+    <comment>
+        <name>Donald Swain</name>
+        <email>donald-swain@example.com</email>
+        <web>https://docs.textpattern.io/brand/donald-swain</web>
+        <message><![CDATA[<p>I enjoy your site very much.</p>]]></message>
+    </comment>
+</article>
+</articles>
+</resources>
diff --git a/textpattern/setup/initial-content/en/data/core.prefs b/textpattern/setup/initial-content/en/data/core.prefs
new file mode 100644
index 0000000000..0fce2b23a9
--- /dev/null
+++ b/textpattern/setup/initial-content/en/data/core.prefs
@@ -0,0 +1,23 @@
+{
+  "default_section": {
+    "val": "articles",
+    "type": "2",
+    "event": "section",
+    "html": "text_input",
+    "position": "0"
+  },
+  "custom_1_set": {
+    "val": "custom1",
+    "type": "0",
+    "event": "custom",
+    "html": "custom_set",
+    "position": "1"
+  },
+  "custom_2_set": {
+    "val": "custom2",
+    "type": "0",
+    "event": "custom",
+    "html": "custom_set",
+    "position": "2"
+  }
+}
diff --git a/textpattern/setup/initial-content/en/data/txp_category.xml b/textpattern/setup/initial-content/en/data/txp_category.xml
new file mode 100644
index 0000000000..2df24dc8d2
--- /dev/null
+++ b/textpattern/setup/initial-content/en/data/txp_category.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <category>
+        <item>
+            <name>everything-is-going-to-be-alright</name>
+            <type>article</type>
+            <parent>root</parent>
+            <title>Everything is going to be alright</title>
+            <description/>
+        </item>
+        <item>
+            <name>hope-for-the-future</name>
+            <type>article</type>
+            <parent>root</parent>
+            <title>Hope for the future</title>
+            <description/>
+        </item>
+        <item>
+            <name>meaningful-labor</name>
+            <type>article</type>
+            <parent>root</parent>
+            <title>Meaningful labor</title>
+            <description/>
+        </item>
+        <item>
+            <name>textpattern</name>
+            <type>link</type>
+            <parent>root</parent>
+            <title>Textpattern</title>
+            <description/>
+        </item>
+    </category>
+</resources>
diff --git a/textpattern/setup/initial-content/en/data/txp_link.xml b/textpattern/setup/initial-content/en/data/txp_link.xml
new file mode 100644
index 0000000000..ca6e58c077
--- /dev/null
+++ b/textpattern/setup/initial-content/en/data/txp_link.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <link>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://textpattern.com/</url>
+            <linkname>Textpattern website</linkname>
+            <linksort>10</linksort>
+            <description/>
+            <author/>
+        </item>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://docs.textpattern.io/</url>
+            <linkname>Textpattern user documentation</linkname>
+            <linksort>20</linksort>
+            <description/>
+            <author/>
+        </item>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://textpattern.com/github</url>
+            <linkname>Textpattern on GitHub</linkname>
+            <linksort>30</linksort>
+            <description/>
+            <author/>
+        </item>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://textpattern.com/@textpattern</url>
+            <linkname>Textpattern on Twitter</linkname>
+            <linksort>40</linksort>
+            <description/>
+            <author/>
+        </item>
+    </link>
+</resources>
diff --git a/textpattern/setup/initial-content/en/data/txp_section.xml b/textpattern/setup/initial-content/en/data/txp_section.xml
new file mode 100644
index 0000000000..c37d02b4e3
--- /dev/null
+++ b/textpattern/setup/initial-content/en/data/txp_section.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <section>
+        <item>
+            <name>articles</name>
+            <page>archive</page>
+            <css>default</css>
+            <description/>
+            <in_rss>1</in_rss>
+            <on_frontpage>1</on_frontpage>
+            <searchable>1</searchable>
+            <title>Articles</title>
+        </item>
+    </section>
+</resources>
diff --git a/textpattern/setup/initial-content/fi/articles/articles.welcome.xml b/textpattern/setup/initial-content/fi/articles/articles.welcome.xml
new file mode 100644
index 0000000000..2cc63d54de
--- /dev/null
+++ b/textpattern/setup/initial-content/fi/articles/articles.welcome.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<articles>
+<article>
+    <title>Tervetuloa sivustollesi</title>
+    <section>articles</section>
+    <category>hope-for-the-future</category>
+    <category>meaningful-labor</category>
+    <body format="textile"><![CDATA[
+h3. Mitä haluat tehdä seuraavaksi?
+
+* Muokata tai poistaa tämän artikkelin? Silloin "artikkelien luettelo":adminurl/index.php?event=list on aloituspaikka.
+* Vaihtaa sivuston nimen, tai vaihtaa URL-osoitteiden muodon? Sellaiset asiat riippuvat "asetuksista":adminurl/index.php?event=prefs.
+* Tutustua Textileen, meille ihmisille suunnattuun merkkaustyökaluun, joka tulee Textpatternin mukana? Sen perusteet ovat "yksinkertaisia":https://textpattern.com/textile-sandbox. Mikäli haluat oppia siitä enemmän, voit pureutua "kattavaan käsikirjaan":https://textpattern.com/textile-reference-manual myöhemmin.
+* Saada ohjeistusta ottaessasi "ensi askeleita Textpatternin kanssa":https://textpattern.com/textpattern-first-steps tekemällä yksinkertaisia tehtäviä?
+* Opiskella "Textpatternin semanttista mallia?":https://textpattern.com/textpattern-semantic-model
+* Lisätä "toisen käyttäjän":adminurl/index.php?event=admin, tai laajentaa ominaisuuksia "kolmannen osapuolen lisäosien":adminurl/index.php?event=plugin avulla, joita löysit "Textpatternin lisäosien hakemistosta?":https://textpattern.com/plugins
+* Kokeilla asioita omin päin yrityksen ja erehdyksen kautta? Silloin ole hyvä ja huomaa:
+** Kun "kirjoitat":adminurl/index.php?event=article artikkelin, määrittelet mihin sivustosi osioon se kuuluu.
+** Osiot käyttävät "sivupohjia":adminurl/index.php?event=page ja "tyylejä":adminurl/index.php?event=css kun ne näytetään maailmalle.
+** Sivupohjat käyttävät HTML(HyperText Markup Language):ää ja Textpatternin tageja (kuten tätä: @<txp:article />@) rakentaakseen "lopputuotteen".
+** Jotkut Textpatternin tageista käyttävät "lomakkeita":adminurl/index.php?event=form. Ne ovat rakennuspalikoita, jotka sisältävät tekemääsi koodia ja merkkausta, ja joita voi käyttää uudelleen ja haluamissasi yhteyksissä.
+
+"Textpatternin tagit":https://docs.textpattern.io/tags/, niiden attribuutit ja arvot selitetään, ja niistä näytetään esimerkkejä, "Textpatternin käsikirjassa":https://docs.textpattern.io/. Löydät sieltä myös arvokkaita niksejä ja ohjeita.
+
+Lisäksi ryhmä ystävällisiä, avuliaita ihmisiä on "Textpatternin tukifoorumilla":https://forum.textpattern.io/. Tule vierailulle!
+
+Toivotamme tervetulleeksi uudet kielikäännökset (ja korjaukset nykyisiin käännöksiin). Ole hyvä ja vieraile "Textpatternin käännössivulla":https://textpattern.com/languages saadaksesi lisätietoja.
+]]></body>
+    <excerpt format="textile"><![CDATA[
+Tämä on Textpatternin artikkelin johdanto. Artikkelien johdannot ovat vapaaehtoisia, mutta niillä voidaan näpsäkästi luoda yhteenveto artikkelin sisällöstä käyttämällä esimerkiksi Textpatternin sisäänrakennettua artikkelien syndikointia ja @<txp:excerpt />@ -tagia.
+]]></excerpt>
+    <comment>
+        <name>Donald Swain</name>
+        <email>donald-swain@example.com</email>
+        <web>https://docs.textpattern.io/brand/donald-swain</web>
+        <message><![CDATA[<p>Pidän kovasti sivustostasi.</p>]]></message>
+    </comment>
+</article>
+</articles>
+</resources>
diff --git a/textpattern/setup/initial-content/fi/data/core.prefs b/textpattern/setup/initial-content/fi/data/core.prefs
new file mode 100644
index 0000000000..0fce2b23a9
--- /dev/null
+++ b/textpattern/setup/initial-content/fi/data/core.prefs
@@ -0,0 +1,23 @@
+{
+  "default_section": {
+    "val": "articles",
+    "type": "2",
+    "event": "section",
+    "html": "text_input",
+    "position": "0"
+  },
+  "custom_1_set": {
+    "val": "custom1",
+    "type": "0",
+    "event": "custom",
+    "html": "custom_set",
+    "position": "1"
+  },
+  "custom_2_set": {
+    "val": "custom2",
+    "type": "0",
+    "event": "custom",
+    "html": "custom_set",
+    "position": "2"
+  }
+}
diff --git a/textpattern/setup/initial-content/fi/data/txp_category.xml b/textpattern/setup/initial-content/fi/data/txp_category.xml
new file mode 100644
index 0000000000..1715ff3cc4
--- /dev/null
+++ b/textpattern/setup/initial-content/fi/data/txp_category.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <category>
+        <item>
+            <name>everything-is-going-to-be-alright</name>
+            <type>article</type>
+            <parent>root</parent>
+            <title>Kaikki tulee olemaan hyvin</title>
+            <description/>
+        </item>
+        <item>
+            <name>hope-for-the-future</name>
+            <type>article</type>
+            <parent>root</parent>
+            <title>Toivoa tulevaan</title>
+            <description/>
+        </item>
+        <item>
+            <name>meaningful-labor</name>
+            <type>article</type>
+            <parent>root</parent>
+            <title>Merkityksellistä työtä</title>
+            <description/>
+        </item>
+        <item>
+            <name>textpattern</name>
+            <type>link</type>
+            <parent>root</parent>
+            <title>Textpattern</title>
+            <description/>
+        </item>
+    </category>
+</resources>
diff --git a/textpattern/setup/initial-content/fi/data/txp_link.xml b/textpattern/setup/initial-content/fi/data/txp_link.xml
new file mode 100644
index 0000000000..7f47149d76
--- /dev/null
+++ b/textpattern/setup/initial-content/fi/data/txp_link.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <link>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://textpattern.com/</url>
+            <linkname>Textpatternin sivusto</linkname>
+            <linksort>10</linksort>
+            <description/>
+            <author/>
+        </item>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://docs.textpattern.io/</url>
+            <linkname>Textpatternin käyttöohjeet</linkname>
+            <linksort>20</linksort>
+            <description/>
+            <author/>
+        </item>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://textpattern.com/github</url>
+            <linkname>Textpattern GitHubissa</linkname>
+            <linksort>30</linksort>
+            <description/>
+            <author/>
+        </item>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://textpattern.com/@textpattern</url>
+            <linkname>Textpattern Twitterissä</linkname>
+            <linksort>40</linksort>
+            <description/>
+            <author/>
+        </item>
+    </link>
+</resources>
diff --git a/textpattern/setup/initial-content/fi/data/txp_section.xml b/textpattern/setup/initial-content/fi/data/txp_section.xml
new file mode 100644
index 0000000000..d2203c802d
--- /dev/null
+++ b/textpattern/setup/initial-content/fi/data/txp_section.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <section>
+        <item>
+            <name>articles</name>
+            <page>archive</page>
+            <css>default</css>
+            <description/>
+            <in_rss>1</in_rss>
+            <on_frontpage>1</on_frontpage>
+            <searchable>1</searchable>
+            <title>Artikkelit</title>
+        </item>
+    </section>
+</resources>
diff --git a/textpattern/setup/initial-content/sv/articles/articles.welcome.xml b/textpattern/setup/initial-content/sv/articles/articles.welcome.xml
new file mode 100644
index 0000000000..a7764d73b0
--- /dev/null
+++ b/textpattern/setup/initial-content/sv/articles/articles.welcome.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<articles>
+<article>
+    <title>Välkommen till din webbplats</title>
+    <section>articles</section>
+    <category>hope-for-the-future</category>
+    <category>meaningful-labor</category>
+    <body format="textile"><![CDATA[
+h3. Vad vill du göra härnäst?
+
+* Ändra eller ta bort den här artikeln? "artikellista":adminurl/index.php?event=list är stället att börja på.
+* Ändra webbplatsens namn eller ändra stilen på webbadresserna? It's all up to your "inställningar":adminurl/index.php?event=prefs.
+* Get yourself acquainted with Textile, the humane markup generator which comes with Textpattern? Grunderna är "enkelt":https://textpattern.com/textile-sandbox. Om du vill lära dig mer kan du fördjupa dig i den "omfattande manualen":https://textpattern.com/textile-reference-manual senare.
+* Bli guidad genom dina "Textpattern första steg":https://textpattern.com/textpattern-first-steps genom att fylla i några grundläggande uppgifter?
+* Studera "Textpattern semantisk modell?":https://textpattern.com/textpattern-semantic-model
+* Lägg till "fler användare":adminurl/index.php?event=admin, eller utöka kapaciteten med "tredjepartsplugins":adminurl/index.php?event=plugin du upptäckte i "Textpattern pluginkatalog?":https://textpattern.com/plugins
+* Eller lär dig av dina misstag? Men kom då ihåg:
+** När du "skriver":adminurl/index.php?event=article en artikel du tilldelar den till en del av din webbplats.
+** Sektioner använder en "sidmall":adminurl/index.php?event=page och en "style":adminurl/index.php?event=css som utmatningsställ.
+** Sidmallar använder HTML(HyperText Markup Language) och Textpattern-taggar (som denna: @<txp:article />@) att bygga upp markeringen.
+** Några Textpattern-taggar använder "formen":adminurl/index.php?event=form, vilka är byggstenar för återanvändbara utdrag av kod och markeringar du kan bygga och använda efter eget gottfinnande.
+
+"Textpattern taggar":https://docs.textpattern.io/tags/, deras attribut och värden förklaras och ges exempel på i "Textpattern användardokumentation":https://docs.textpattern.io/, där du också hittar värdefulla tips och handledningar.
+
+Det finns också en massa vänliga och hjälpsamma människor på "Textpattern supportforum":https://forum.textpattern.io/. Du är välkommen in!
+
+Vi välkomnar ytterligare språköversättningar (och korrigeringar till befintliga översättningar). Besök "Textpattern språköversättningar":https://textpattern.com/languages för mer information.
+]]></body>
+    <excerpt format="textile"><![CDATA[
+Detta är ett textpattern-artikelutdrag. Artikelutdrag är frivilliga, men kan användas effektivt för att sammanfatta en artikels innehåll. Till exempel med Textpatterns inbyggda artikelsyndikering. och med taggen @<txp:excerpt />@.
+]]></excerpt>
+    <comment>
+        <name>Donald Swain</name>
+        <email>donald-swain@example.com</email>
+        <web>https://docs.textpattern.io/brand/donald-swain</web>
+        <message><![CDATA[<p>Jag gillar din webbplats väldigt mycket.</p>]]></message>
+    </comment>
+</article>
+</articles>
+</resources>
diff --git a/textpattern/setup/initial-content/sv/data/core.prefs b/textpattern/setup/initial-content/sv/data/core.prefs
new file mode 100644
index 0000000000..0fce2b23a9
--- /dev/null
+++ b/textpattern/setup/initial-content/sv/data/core.prefs
@@ -0,0 +1,23 @@
+{
+  "default_section": {
+    "val": "articles",
+    "type": "2",
+    "event": "section",
+    "html": "text_input",
+    "position": "0"
+  },
+  "custom_1_set": {
+    "val": "custom1",
+    "type": "0",
+    "event": "custom",
+    "html": "custom_set",
+    "position": "1"
+  },
+  "custom_2_set": {
+    "val": "custom2",
+    "type": "0",
+    "event": "custom",
+    "html": "custom_set",
+    "position": "2"
+  }
+}
diff --git a/textpattern/setup/initial-content/sv/data/txp_category.xml b/textpattern/setup/initial-content/sv/data/txp_category.xml
new file mode 100644
index 0000000000..e480e6aa2e
--- /dev/null
+++ b/textpattern/setup/initial-content/sv/data/txp_category.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <category>
+        <item>
+            <name>everything-is-going-to-be-alright</name>
+            <type>article</type>
+            <parent>root</parent>
+            <title>Allt kommer att bli bra</title>
+            <description/>
+        </item>
+        <item>
+            <name>hope-for-the-future</name>
+            <type>article</type>
+            <parent>root</parent>
+            <title>Framtidshopp</title>
+            <description/>
+        </item>
+        <item>
+            <name>meaningful-labor</name>
+            <type>article</type>
+            <parent>root</parent>
+            <title>Meningsfullt arbete</title>
+            <description/>
+        </item>
+        <item>
+            <name>textpattern</name>
+            <type>link</type>
+            <parent>root</parent>
+            <title>Textpattern</title>
+            <description/>
+        </item>
+    </category>
+</resources>
diff --git a/textpattern/setup/initial-content/sv/data/txp_link.xml b/textpattern/setup/initial-content/sv/data/txp_link.xml
new file mode 100644
index 0000000000..e5321a310a
--- /dev/null
+++ b/textpattern/setup/initial-content/sv/data/txp_link.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <link>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://textpattern.com/</url>
+            <linkname>Textpattern webbplats</linkname>
+            <linksort>10</linksort>
+            <description/>
+            <author/>
+        </item>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://docs.textpattern.io/</url>
+            <linkname>Textpattern användarmanual</linkname>
+            <linksort>20</linksort>
+            <description/>
+            <author/>
+        </item>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://textpattern.com/github</url>
+            <linkname>Textpattern på GitHub</linkname>
+            <linksort>30</linksort>
+            <description/>
+            <author/>
+        </item>
+        <item>
+            <date>NOW()</date>
+            <category>textpattern</category>
+            <url>https://textpattern.com/@textpattern</url>
+            <linkname>Textpattern på Twitter</linkname>
+            <linksort>40</linksort>
+            <description/>
+            <author/>
+        </item>
+    </link>
+</resources>
diff --git a/textpattern/setup/initial-content/sv/data/txp_section.xml b/textpattern/setup/initial-content/sv/data/txp_section.xml
new file mode 100644
index 0000000000..d8d620cdd6
--- /dev/null
+++ b/textpattern/setup/initial-content/sv/data/txp_section.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <section>
+        <item>
+            <name>articles</name>
+            <page>archive</page>
+            <css>default</css>
+            <description/>
+            <in_rss>1</in_rss>
+            <on_frontpage>1</on_frontpage>
+            <searchable>1</searchable>
+            <title>Artiklar</title>
+        </item>
+    </section>
+</resources>
diff --git a/textpattern/vendors/Textpattern/DB/Data/txp_category.xml b/textpattern/vendors/Textpattern/DB/Data/txp_category.xml
index d616846cde..241ed42183 100644
--- a/textpattern/vendors/Textpattern/DB/Data/txp_category.xml
+++ b/textpattern/vendors/Textpattern/DB/Data/txp_category.xml
@@ -6,28 +6,28 @@
             <type>article</type>
             <parent></parent>
             <title>root</title>
-            <description></description>
+            <description/>
         </item>
         <item>
             <name>root</name>
             <type>link</type>
             <parent></parent>
             <title>root</title>
-            <description></description>
+            <description/>
         </item>
         <item>
             <name>root</name>
             <type>image</type>
             <parent></parent>
             <title>root</title>
-            <description></description>
+            <description/>
         </item>
         <item>
             <name>root</name>
             <type>file</type>
             <parent></parent>
             <title>root</title>
-            <description></description>
+            <description/>
         </item>
     </category>
 </resources>
diff --git a/textpattern/vendors/Textpattern/DB/Data/txp_section.xml b/textpattern/vendors/Textpattern/DB/Data/txp_section.xml
index b54355692b..ab5a2d9195 100644
--- a/textpattern/vendors/Textpattern/DB/Data/txp_section.xml
+++ b/textpattern/vendors/Textpattern/DB/Data/txp_section.xml
@@ -5,7 +5,7 @@
             <name>default</name>
             <page>default</page>
             <css>default</css>
-            <description></description>
+            <description/>
             <in_rss>1</in_rss>
             <on_frontpage>1</on_frontpage>
             <searchable>1</searchable>

From 0144e46791782d271d6a13cff7d81e639755d4e1 Mon Sep 17 00:00:00 2001
From: Phil Wareham <phil@designhive.com>
Date: Thu, 2 Aug 2018 15:12:20 +0100
Subject: [PATCH 02/29] Match how Crowdin outputs XML files

---
 .../en-gb/articles/articles.welcome.xml                | 10 +++-------
 .../en-us/articles/articles.welcome.xml                | 10 +++-------
 .../initial-content/en/articles/articles.welcome.xml   | 10 +++-------
 .../initial-content/fi/articles/articles.welcome.xml   | 10 +++-------
 .../initial-content/sv/articles/articles.welcome.xml   | 10 +++-------
 5 files changed, 15 insertions(+), 35 deletions(-)

diff --git a/textpattern/setup/initial-content/en-gb/articles/articles.welcome.xml b/textpattern/setup/initial-content/en-gb/articles/articles.welcome.xml
index f620a24d85..b0c5149c80 100644
--- a/textpattern/setup/initial-content/en-gb/articles/articles.welcome.xml
+++ b/textpattern/setup/initial-content/en-gb/articles/articles.welcome.xml
@@ -6,8 +6,7 @@
     <section>articles</section>
     <category>hope-for-the-future</category>
     <category>meaningful-labor</category>
-    <body format="textile"><![CDATA[
-h3. What do you want to do next?
+    <body format="textile"><![CDATA[h3. What do you want to do next?
 
 * Modify or delete this article? The "article list":adminurl/index.php?event=list is the place to start.
 * Change this site's name, or modify the style of the URLs? It's all up to your "preferences":adminurl/index.php?event=prefs.
@@ -25,11 +24,8 @@ h3. What do you want to do next?
 
 There's also a crowd of friendly, helpful people over at the "Textpattern support forum":https://forum.textpattern.io/. Come and pay a visit!
 
-We welcome additional language translations (and corrections to current translations). Please visit "Textpattern language translations":https://textpattern.com/languages for further details.
-]]></body>
-    <excerpt format="textile"><![CDATA[
-This is a Textpattern article excerpt. Article excerpts are optional but can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication and with the @<txp:excerpt />@ tag.
-]]></excerpt>
+We welcome additional language translations (and corrections to current translations). Please visit "Textpattern language translations":https://textpattern.com/languages for further details.]]></body>
+    <excerpt format="textile"><![CDATA[This is a Textpattern article excerpt. Article excerpts are optional but can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication and with the @<txp:excerpt />@ tag.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald-swain@example.com</email>
diff --git a/textpattern/setup/initial-content/en-us/articles/articles.welcome.xml b/textpattern/setup/initial-content/en-us/articles/articles.welcome.xml
index f620a24d85..b0c5149c80 100644
--- a/textpattern/setup/initial-content/en-us/articles/articles.welcome.xml
+++ b/textpattern/setup/initial-content/en-us/articles/articles.welcome.xml
@@ -6,8 +6,7 @@
     <section>articles</section>
     <category>hope-for-the-future</category>
     <category>meaningful-labor</category>
-    <body format="textile"><![CDATA[
-h3. What do you want to do next?
+    <body format="textile"><![CDATA[h3. What do you want to do next?
 
 * Modify or delete this article? The "article list":adminurl/index.php?event=list is the place to start.
 * Change this site's name, or modify the style of the URLs? It's all up to your "preferences":adminurl/index.php?event=prefs.
@@ -25,11 +24,8 @@ h3. What do you want to do next?
 
 There's also a crowd of friendly, helpful people over at the "Textpattern support forum":https://forum.textpattern.io/. Come and pay a visit!
 
-We welcome additional language translations (and corrections to current translations). Please visit "Textpattern language translations":https://textpattern.com/languages for further details.
-]]></body>
-    <excerpt format="textile"><![CDATA[
-This is a Textpattern article excerpt. Article excerpts are optional but can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication and with the @<txp:excerpt />@ tag.
-]]></excerpt>
+We welcome additional language translations (and corrections to current translations). Please visit "Textpattern language translations":https://textpattern.com/languages for further details.]]></body>
+    <excerpt format="textile"><![CDATA[This is a Textpattern article excerpt. Article excerpts are optional but can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication and with the @<txp:excerpt />@ tag.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald-swain@example.com</email>
diff --git a/textpattern/setup/initial-content/en/articles/articles.welcome.xml b/textpattern/setup/initial-content/en/articles/articles.welcome.xml
index f620a24d85..b0c5149c80 100644
--- a/textpattern/setup/initial-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/initial-content/en/articles/articles.welcome.xml
@@ -6,8 +6,7 @@
     <section>articles</section>
     <category>hope-for-the-future</category>
     <category>meaningful-labor</category>
-    <body format="textile"><![CDATA[
-h3. What do you want to do next?
+    <body format="textile"><![CDATA[h3. What do you want to do next?
 
 * Modify or delete this article? The "article list":adminurl/index.php?event=list is the place to start.
 * Change this site's name, or modify the style of the URLs? It's all up to your "preferences":adminurl/index.php?event=prefs.
@@ -25,11 +24,8 @@ h3. What do you want to do next?
 
 There's also a crowd of friendly, helpful people over at the "Textpattern support forum":https://forum.textpattern.io/. Come and pay a visit!
 
-We welcome additional language translations (and corrections to current translations). Please visit "Textpattern language translations":https://textpattern.com/languages for further details.
-]]></body>
-    <excerpt format="textile"><![CDATA[
-This is a Textpattern article excerpt. Article excerpts are optional but can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication and with the @<txp:excerpt />@ tag.
-]]></excerpt>
+We welcome additional language translations (and corrections to current translations). Please visit "Textpattern language translations":https://textpattern.com/languages for further details.]]></body>
+    <excerpt format="textile"><![CDATA[This is a Textpattern article excerpt. Article excerpts are optional but can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication and with the @<txp:excerpt />@ tag.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald-swain@example.com</email>
diff --git a/textpattern/setup/initial-content/fi/articles/articles.welcome.xml b/textpattern/setup/initial-content/fi/articles/articles.welcome.xml
index 2cc63d54de..4a55c349cf 100644
--- a/textpattern/setup/initial-content/fi/articles/articles.welcome.xml
+++ b/textpattern/setup/initial-content/fi/articles/articles.welcome.xml
@@ -6,8 +6,7 @@
     <section>articles</section>
     <category>hope-for-the-future</category>
     <category>meaningful-labor</category>
-    <body format="textile"><![CDATA[
-h3. Mitä haluat tehdä seuraavaksi?
+    <body format="textile"><![CDATA[h3. Mitä haluat tehdä seuraavaksi?
 
 * Muokata tai poistaa tämän artikkelin? Silloin "artikkelien luettelo":adminurl/index.php?event=list on aloituspaikka.
 * Vaihtaa sivuston nimen, tai vaihtaa URL-osoitteiden muodon? Sellaiset asiat riippuvat "asetuksista":adminurl/index.php?event=prefs.
@@ -25,11 +24,8 @@ h3. Mitä haluat tehdä seuraavaksi?
 
 Lisäksi ryhmä ystävällisiä, avuliaita ihmisiä on "Textpatternin tukifoorumilla":https://forum.textpattern.io/. Tule vierailulle!
 
-Toivotamme tervetulleeksi uudet kielikäännökset (ja korjaukset nykyisiin käännöksiin). Ole hyvä ja vieraile "Textpatternin käännössivulla":https://textpattern.com/languages saadaksesi lisätietoja.
-]]></body>
-    <excerpt format="textile"><![CDATA[
-Tämä on Textpatternin artikkelin johdanto. Artikkelien johdannot ovat vapaaehtoisia, mutta niillä voidaan näpsäkästi luoda yhteenveto artikkelin sisällöstä käyttämällä esimerkiksi Textpatternin sisäänrakennettua artikkelien syndikointia ja @<txp:excerpt />@ -tagia.
-]]></excerpt>
+Toivotamme tervetulleeksi uudet kielikäännökset (ja korjaukset nykyisiin käännöksiin). Ole hyvä ja vieraile "Textpatternin käännössivulla":https://textpattern.com/languages saadaksesi lisätietoja.]]></body>
+    <excerpt format="textile"><![CDATA[Tämä on Textpatternin artikkelin johdanto. Artikkelien johdannot ovat vapaaehtoisia, mutta niillä voidaan näpsäkästi luoda yhteenveto artikkelin sisällöstä käyttämällä esimerkiksi Textpatternin sisäänrakennettua artikkelien syndikointia ja @<txp:excerpt />@ -tagia.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald-swain@example.com</email>
diff --git a/textpattern/setup/initial-content/sv/articles/articles.welcome.xml b/textpattern/setup/initial-content/sv/articles/articles.welcome.xml
index a7764d73b0..8b5121134a 100644
--- a/textpattern/setup/initial-content/sv/articles/articles.welcome.xml
+++ b/textpattern/setup/initial-content/sv/articles/articles.welcome.xml
@@ -6,8 +6,7 @@
     <section>articles</section>
     <category>hope-for-the-future</category>
     <category>meaningful-labor</category>
-    <body format="textile"><![CDATA[
-h3. Vad vill du göra härnäst?
+    <body format="textile"><![CDATA[h3. Vad vill du göra härnäst?
 
 * Ändra eller ta bort den här artikeln? "artikellista":adminurl/index.php?event=list är stället att börja på.
 * Ändra webbplatsens namn eller ändra stilen på webbadresserna? It's all up to your "inställningar":adminurl/index.php?event=prefs.
@@ -25,11 +24,8 @@ h3. Vad vill du göra härnäst?
 
 Det finns också en massa vänliga och hjälpsamma människor på "Textpattern supportforum":https://forum.textpattern.io/. Du är välkommen in!
 
-Vi välkomnar ytterligare språköversättningar (och korrigeringar till befintliga översättningar). Besök "Textpattern språköversättningar":https://textpattern.com/languages för mer information.
-]]></body>
-    <excerpt format="textile"><![CDATA[
-Detta är ett textpattern-artikelutdrag. Artikelutdrag är frivilliga, men kan användas effektivt för att sammanfatta en artikels innehåll. Till exempel med Textpatterns inbyggda artikelsyndikering. och med taggen @<txp:excerpt />@.
-]]></excerpt>
+Vi välkomnar ytterligare språköversättningar (och korrigeringar till befintliga översättningar). Besök "Textpattern språköversättningar":https://textpattern.com/languages för mer information.]]></body>
+    <excerpt format="textile"><![CDATA[Detta är ett textpattern-artikelutdrag. Artikelutdrag är frivilliga, men kan användas effektivt för att sammanfatta en artikels innehåll. Till exempel med Textpatterns inbyggda artikelsyndikering. och med taggen @<txp:excerpt />@.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald-swain@example.com</email>

From 69532a7987b25441af751c572bc97783fe4d4d80 Mon Sep 17 00:00:00 2001
From: Phil Wareham <phil@designhive.com>
Date: Tue, 7 Aug 2018 09:43:49 +0100
Subject: [PATCH 03/29] initial-content -> default-content

---
 .../en-gb/articles/articles.welcome.xml                           | 0
 .../{initial-content => default-content}/en-gb/data/core.prefs    | 0
 .../en-gb/data/txp_category.xml                                   | 0
 .../{initial-content => default-content}/en-gb/data/txp_link.xml  | 0
 .../en-gb/data/txp_section.xml                                    | 0
 .../en-us/articles/articles.welcome.xml                           | 0
 .../{initial-content => default-content}/en-us/data/core.prefs    | 0
 .../en-us/data/txp_category.xml                                   | 0
 .../{initial-content => default-content}/en-us/data/txp_link.xml  | 0
 .../en-us/data/txp_section.xml                                    | 0
 .../en/articles/articles.welcome.xml                              | 0
 .../setup/{initial-content => default-content}/en/data/core.prefs | 0
 .../{initial-content => default-content}/en/data/txp_category.xml | 0
 .../{initial-content => default-content}/en/data/txp_link.xml     | 0
 .../{initial-content => default-content}/en/data/txp_section.xml  | 0
 .../fi/articles/articles.welcome.xml                              | 0
 .../setup/{initial-content => default-content}/fi/data/core.prefs | 0
 .../{initial-content => default-content}/fi/data/txp_category.xml | 0
 .../{initial-content => default-content}/fi/data/txp_link.xml     | 0
 .../{initial-content => default-content}/fi/data/txp_section.xml  | 0
 .../sv/articles/articles.welcome.xml                              | 0
 .../setup/{initial-content => default-content}/sv/data/core.prefs | 0
 .../{initial-content => default-content}/sv/data/txp_category.xml | 0
 .../{initial-content => default-content}/sv/data/txp_link.xml     | 0
 .../{initial-content => default-content}/sv/data/txp_section.xml  | 0
 25 files changed, 0 insertions(+), 0 deletions(-)
 rename textpattern/setup/{initial-content => default-content}/en-gb/articles/articles.welcome.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/en-gb/data/core.prefs (100%)
 rename textpattern/setup/{initial-content => default-content}/en-gb/data/txp_category.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/en-gb/data/txp_link.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/en-gb/data/txp_section.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/en-us/articles/articles.welcome.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/en-us/data/core.prefs (100%)
 rename textpattern/setup/{initial-content => default-content}/en-us/data/txp_category.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/en-us/data/txp_link.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/en-us/data/txp_section.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/en/articles/articles.welcome.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/en/data/core.prefs (100%)
 rename textpattern/setup/{initial-content => default-content}/en/data/txp_category.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/en/data/txp_link.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/en/data/txp_section.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/fi/articles/articles.welcome.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/fi/data/core.prefs (100%)
 rename textpattern/setup/{initial-content => default-content}/fi/data/txp_category.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/fi/data/txp_link.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/fi/data/txp_section.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/sv/articles/articles.welcome.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/sv/data/core.prefs (100%)
 rename textpattern/setup/{initial-content => default-content}/sv/data/txp_category.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/sv/data/txp_link.xml (100%)
 rename textpattern/setup/{initial-content => default-content}/sv/data/txp_section.xml (100%)

diff --git a/textpattern/setup/initial-content/en-gb/articles/articles.welcome.xml b/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml
similarity index 100%
rename from textpattern/setup/initial-content/en-gb/articles/articles.welcome.xml
rename to textpattern/setup/default-content/en-gb/articles/articles.welcome.xml
diff --git a/textpattern/setup/initial-content/en-gb/data/core.prefs b/textpattern/setup/default-content/en-gb/data/core.prefs
similarity index 100%
rename from textpattern/setup/initial-content/en-gb/data/core.prefs
rename to textpattern/setup/default-content/en-gb/data/core.prefs
diff --git a/textpattern/setup/initial-content/en-gb/data/txp_category.xml b/textpattern/setup/default-content/en-gb/data/txp_category.xml
similarity index 100%
rename from textpattern/setup/initial-content/en-gb/data/txp_category.xml
rename to textpattern/setup/default-content/en-gb/data/txp_category.xml
diff --git a/textpattern/setup/initial-content/en-gb/data/txp_link.xml b/textpattern/setup/default-content/en-gb/data/txp_link.xml
similarity index 100%
rename from textpattern/setup/initial-content/en-gb/data/txp_link.xml
rename to textpattern/setup/default-content/en-gb/data/txp_link.xml
diff --git a/textpattern/setup/initial-content/en-gb/data/txp_section.xml b/textpattern/setup/default-content/en-gb/data/txp_section.xml
similarity index 100%
rename from textpattern/setup/initial-content/en-gb/data/txp_section.xml
rename to textpattern/setup/default-content/en-gb/data/txp_section.xml
diff --git a/textpattern/setup/initial-content/en-us/articles/articles.welcome.xml b/textpattern/setup/default-content/en-us/articles/articles.welcome.xml
similarity index 100%
rename from textpattern/setup/initial-content/en-us/articles/articles.welcome.xml
rename to textpattern/setup/default-content/en-us/articles/articles.welcome.xml
diff --git a/textpattern/setup/initial-content/en-us/data/core.prefs b/textpattern/setup/default-content/en-us/data/core.prefs
similarity index 100%
rename from textpattern/setup/initial-content/en-us/data/core.prefs
rename to textpattern/setup/default-content/en-us/data/core.prefs
diff --git a/textpattern/setup/initial-content/en-us/data/txp_category.xml b/textpattern/setup/default-content/en-us/data/txp_category.xml
similarity index 100%
rename from textpattern/setup/initial-content/en-us/data/txp_category.xml
rename to textpattern/setup/default-content/en-us/data/txp_category.xml
diff --git a/textpattern/setup/initial-content/en-us/data/txp_link.xml b/textpattern/setup/default-content/en-us/data/txp_link.xml
similarity index 100%
rename from textpattern/setup/initial-content/en-us/data/txp_link.xml
rename to textpattern/setup/default-content/en-us/data/txp_link.xml
diff --git a/textpattern/setup/initial-content/en-us/data/txp_section.xml b/textpattern/setup/default-content/en-us/data/txp_section.xml
similarity index 100%
rename from textpattern/setup/initial-content/en-us/data/txp_section.xml
rename to textpattern/setup/default-content/en-us/data/txp_section.xml
diff --git a/textpattern/setup/initial-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
similarity index 100%
rename from textpattern/setup/initial-content/en/articles/articles.welcome.xml
rename to textpattern/setup/default-content/en/articles/articles.welcome.xml
diff --git a/textpattern/setup/initial-content/en/data/core.prefs b/textpattern/setup/default-content/en/data/core.prefs
similarity index 100%
rename from textpattern/setup/initial-content/en/data/core.prefs
rename to textpattern/setup/default-content/en/data/core.prefs
diff --git a/textpattern/setup/initial-content/en/data/txp_category.xml b/textpattern/setup/default-content/en/data/txp_category.xml
similarity index 100%
rename from textpattern/setup/initial-content/en/data/txp_category.xml
rename to textpattern/setup/default-content/en/data/txp_category.xml
diff --git a/textpattern/setup/initial-content/en/data/txp_link.xml b/textpattern/setup/default-content/en/data/txp_link.xml
similarity index 100%
rename from textpattern/setup/initial-content/en/data/txp_link.xml
rename to textpattern/setup/default-content/en/data/txp_link.xml
diff --git a/textpattern/setup/initial-content/en/data/txp_section.xml b/textpattern/setup/default-content/en/data/txp_section.xml
similarity index 100%
rename from textpattern/setup/initial-content/en/data/txp_section.xml
rename to textpattern/setup/default-content/en/data/txp_section.xml
diff --git a/textpattern/setup/initial-content/fi/articles/articles.welcome.xml b/textpattern/setup/default-content/fi/articles/articles.welcome.xml
similarity index 100%
rename from textpattern/setup/initial-content/fi/articles/articles.welcome.xml
rename to textpattern/setup/default-content/fi/articles/articles.welcome.xml
diff --git a/textpattern/setup/initial-content/fi/data/core.prefs b/textpattern/setup/default-content/fi/data/core.prefs
similarity index 100%
rename from textpattern/setup/initial-content/fi/data/core.prefs
rename to textpattern/setup/default-content/fi/data/core.prefs
diff --git a/textpattern/setup/initial-content/fi/data/txp_category.xml b/textpattern/setup/default-content/fi/data/txp_category.xml
similarity index 100%
rename from textpattern/setup/initial-content/fi/data/txp_category.xml
rename to textpattern/setup/default-content/fi/data/txp_category.xml
diff --git a/textpattern/setup/initial-content/fi/data/txp_link.xml b/textpattern/setup/default-content/fi/data/txp_link.xml
similarity index 100%
rename from textpattern/setup/initial-content/fi/data/txp_link.xml
rename to textpattern/setup/default-content/fi/data/txp_link.xml
diff --git a/textpattern/setup/initial-content/fi/data/txp_section.xml b/textpattern/setup/default-content/fi/data/txp_section.xml
similarity index 100%
rename from textpattern/setup/initial-content/fi/data/txp_section.xml
rename to textpattern/setup/default-content/fi/data/txp_section.xml
diff --git a/textpattern/setup/initial-content/sv/articles/articles.welcome.xml b/textpattern/setup/default-content/sv/articles/articles.welcome.xml
similarity index 100%
rename from textpattern/setup/initial-content/sv/articles/articles.welcome.xml
rename to textpattern/setup/default-content/sv/articles/articles.welcome.xml
diff --git a/textpattern/setup/initial-content/sv/data/core.prefs b/textpattern/setup/default-content/sv/data/core.prefs
similarity index 100%
rename from textpattern/setup/initial-content/sv/data/core.prefs
rename to textpattern/setup/default-content/sv/data/core.prefs
diff --git a/textpattern/setup/initial-content/sv/data/txp_category.xml b/textpattern/setup/default-content/sv/data/txp_category.xml
similarity index 100%
rename from textpattern/setup/initial-content/sv/data/txp_category.xml
rename to textpattern/setup/default-content/sv/data/txp_category.xml
diff --git a/textpattern/setup/initial-content/sv/data/txp_link.xml b/textpattern/setup/default-content/sv/data/txp_link.xml
similarity index 100%
rename from textpattern/setup/initial-content/sv/data/txp_link.xml
rename to textpattern/setup/default-content/sv/data/txp_link.xml
diff --git a/textpattern/setup/initial-content/sv/data/txp_section.xml b/textpattern/setup/default-content/sv/data/txp_section.xml
similarity index 100%
rename from textpattern/setup/initial-content/sv/data/txp_section.xml
rename to textpattern/setup/default-content/sv/data/txp_section.xml

From 153c67e386b5da581b03cc9f49c178477503b5c0 Mon Sep 17 00:00:00 2001
From: Phil Wareham <phil@designhive.com>
Date: Tue, 7 Aug 2018 10:02:48 +0100
Subject: [PATCH 04/29] International English

---
 textpattern/setup/default-content/en-gb/data/txp_category.xml | 4 ++--
 textpattern/setup/default-content/en/data/txp_category.xml    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/textpattern/setup/default-content/en-gb/data/txp_category.xml b/textpattern/setup/default-content/en-gb/data/txp_category.xml
index 2df24dc8d2..12d7f50589 100644
--- a/textpattern/setup/default-content/en-gb/data/txp_category.xml
+++ b/textpattern/setup/default-content/en-gb/data/txp_category.xml
@@ -16,10 +16,10 @@
             <description/>
         </item>
         <item>
-            <name>meaningful-labor</name>
+            <name>meaningful-labour</name>
             <type>article</type>
             <parent>root</parent>
-            <title>Meaningful labor</title>
+            <title>Meaningful labour</title>
             <description/>
         </item>
         <item>
diff --git a/textpattern/setup/default-content/en/data/txp_category.xml b/textpattern/setup/default-content/en/data/txp_category.xml
index 2df24dc8d2..12d7f50589 100644
--- a/textpattern/setup/default-content/en/data/txp_category.xml
+++ b/textpattern/setup/default-content/en/data/txp_category.xml
@@ -16,10 +16,10 @@
             <description/>
         </item>
         <item>
-            <name>meaningful-labor</name>
+            <name>meaningful-labour</name>
             <type>article</type>
             <parent>root</parent>
-            <title>Meaningful labor</title>
+            <title>Meaningful labour</title>
             <description/>
         </item>
         <item>

From c1f6801c12b3dae3d62816d37866cc62582ce934 Mon Sep 17 00:00:00 2001
From: Phil Wareham <phil@designhive.com>
Date: Tue, 7 Aug 2018 10:03:47 +0100
Subject: [PATCH 05/29] International English too

---
 .../setup/default-content/en-gb/articles/articles.welcome.xml   | 2 +-
 .../setup/default-content/en/articles/articles.welcome.xml      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml b/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml
index b0c5149c80..3322f3be2f 100644
--- a/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml
@@ -5,7 +5,7 @@
     <title>Welcome to your site</title>
     <section>articles</section>
     <category>hope-for-the-future</category>
-    <category>meaningful-labor</category>
+    <category>meaningful-labour</category>
     <body format="textile"><![CDATA[h3. What do you want to do next?
 
 * Modify or delete this article? The "article list":adminurl/index.php?event=list is the place to start.
diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index b0c5149c80..3322f3be2f 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -5,7 +5,7 @@
     <title>Welcome to your site</title>
     <section>articles</section>
     <category>hope-for-the-future</category>
-    <category>meaningful-labor</category>
+    <category>meaningful-labour</category>
     <body format="textile"><![CDATA[h3. What do you want to do next?
 
 * Modify or delete this article? The "article list":adminurl/index.php?event=list is the place to start.

From 5b2a83ceb27f1104c5ff41374f1bca4636161b0d Mon Sep 17 00:00:00 2001
From: Phil Wareham <phil@designhive.com>
Date: Fri, 10 Aug 2018 14:20:16 +0100
Subject: [PATCH 06/29] Update welcome article text from Pete Cooper

---
 .../en-gb/articles/articles.welcome.xml       | 34 ++++++++++--------
 .../en-us/articles/articles.welcome.xml       | 35 +++++++++++--------
 .../en/articles/articles.welcome.xml          | 34 ++++++++++--------
 3 files changed, 60 insertions(+), 43 deletions(-)

diff --git a/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml b/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml
index 3322f3be2f..75753e6d38 100644
--- a/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml
@@ -8,24 +8,30 @@
     <category>meaningful-labour</category>
     <body format="textile"><![CDATA[h3. What do you want to do next?
 
-* Modify or delete this article? The "article list":adminurl/index.php?event=list is the place to start.
-* Change this site's name, or modify the style of the URLs? It's all up to your "preferences":adminurl/index.php?event=prefs.
-* Get yourself acquainted with Textile, the humane markup generator which comes with Textpattern? The basics are "simple":https://textpattern.com/textile-sandbox. If you want to learn more, you can dig into an "extensive manual":https://textpattern.com/textile-reference-manual later.
-* Be guided through your "Textpattern first steps":https://textpattern.com/textpattern-first-steps by completing some basic tasks?
+* Write a "new article":adminurl/index.php?event=article? Let your creativity flow!
+* Change this site's name, slogan or select a different URL style? It's all up to your "preferences":adminurl/index.php?event=prefs.
+* Edit or delete this article? The "article list":adminurl/index.php?event=list is the place to start.
+* Upload "images":adminurl/index.php?event=image or "files":adminurl/index.php?event=file to accompany your articles?
+* Learn Textile, the markup generator included with Textpattern? You can try it in the "Textile sandbox":https://textpattern.com/textile-sandbox.
+** If you want to learn more, you can refer to an extensive "Textile manual":https://textpattern.com/textile-reference-manual.
+* Be guided through your "Textpattern first steps":https://textpattern.com/textpattern-first-steps by completing some tasks?
 * Study the "Textpattern Semantic Model?":https://textpattern.com/textpattern-semantic-model
-* Add "another user":adminurl/index.php?event=admin, or extend the capabilities with "third party plugins":adminurl/index.php?event=plugin you discovered from the "Textpattern plugin directory?":https://textpattern.com/plugins
-* Dive in and learn by trial and error? Then please note:
-** When you "write":adminurl/index.php?event=article an article you assign it to a section of your site.
-** Sections use a "page template":adminurl/index.php?event=page and a "style":adminurl/index.php?event=css as an output scaffold.
-** Page templates use HTML(HyperText Markup Language) and Textpattern tags (like this: @<txp:article />@) to build the markup.
-** Some Textpattern tags use "forms":adminurl/index.php?event=form, which are building blocks for reusable snippets of code and markup you may build and use at your discretion.
+* Add one or more "additional users":adminurl/index.php?event=admin, or extend Textpattern's capabilities with "plugins":adminurl/index.php?event=plugin from the "Textpattern plugin directory?":https://textpattern.com/plugins
+* Dive in and learn by doing? Please note:
+** When you write an article you assign it to a "section":adminurl/index.php?event=section of your site.
+** Sections use a "page template":adminurl/index.php?event=page and a "style":adminurl/index.php?event=css to define how site content appears in a browser.
+** Page templates use HTML(HyperText Markup Language) and "Textpattern tags":https://docs.textpattern.io/tags/ (like this: @<txp:article />@) to build the output code.
+** Some Textpattern tags use "forms":adminurl/index.php?event=form, which are building blocks for reusable code and markup.
+** Pages, styles and forms can be packaged into "themes":adminurl/index.php?event=skin and assigned to one or more sections.
 
-"Textpattern tags":https://docs.textpattern.io/tags/, their attributes and values are explained and sampled within the "Textpattern User Documentation":https://docs.textpattern.io/, where you will also find valuable tips and tutorials.
+Textpattern tags, their attributes and values are explained within the "Textpattern User Documentation":https://docs.textpattern.io/, where you will also find valuable examples, advice and tutorials.
 
-There's also a crowd of friendly, helpful people over at the "Textpattern support forum":https://forum.textpattern.io/. Come and pay a visit!
+There's also a group of friendly, helpful Textpattern users and administrators at the "Textpattern support forum":https://forum.textpattern.io/.
 
-We welcome additional language translations (and corrections to current translations). Please visit "Textpattern language translations":https://textpattern.com/languages for further details.]]></body>
-    <excerpt format="textile"><![CDATA[This is a Textpattern article excerpt. Article excerpts are optional but can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication and with the @<txp:excerpt />@ tag.]]></excerpt>
+Additional language translations and corrections are welcomed. Please visit "Textpattern language translations":https://textpattern.com/languages for further details.
+
+This is an example article included with Textpattern CMS to demonstrate some of the first steps you can undertake. It can be safely deleted.]]></body>
+    <excerpt format="textile"><![CDATA[This is a Textpattern article excerpt. Article excerpts are optional and can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald-swain@example.com</email>
diff --git a/textpattern/setup/default-content/en-us/articles/articles.welcome.xml b/textpattern/setup/default-content/en-us/articles/articles.welcome.xml
index 1e7dde4b6c..23f441a356 100644
--- a/textpattern/setup/default-content/en-us/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en-us/articles/articles.welcome.xml
@@ -8,25 +8,30 @@
     <category>meaningful-labor</category>
     <body format="textile"><![CDATA[h3. What do you want to do next?
 
-* Modify or delete this article? The "article list":adminurl/index.php?event=list is the place to start.
-* Change this site's name, or select a different URL style of the URLs? It's all up to your "preferences":adminurl/index.php?event=prefs.
-* Get yourself acquainted with Textile, the humane markup generator which comes with Textpattern? The basics are "simple":https://textpattern.com/textile-sandbox. If you want to learn more, you can dig into an "extensive manual":https://textpattern.com/textile-reference-manual later.
-* Be guided through your "Textpattern first steps":https://textpattern.com/textpattern-first-steps by completing some basic tasks?
+* Write a "new article":adminurl/index.php?event=article? Let your creativity flow!
+* Change this site's name, slogan or select a different URL style? It's all up to your "preferences":adminurl/index.php?event=prefs.
+* Edit or delete this article? The "article list":adminurl/index.php?event=list is the place to start.
+* Upload "images":adminurl/index.php?event=image or "files":adminurl/index.php?event=file to accompany your articles?
+* Learn Textile, the markup generator included with Textpattern? You can try it in the "Textile sandbox":https://textpattern.com/textile-sandbox.
+** If you want to learn more, you can refer to an extensive "Textile manual":https://textpattern.com/textile-reference-manual.
+* Be guided through your "Textpattern first steps":https://textpattern.com/textpattern-first-steps by completing some tasks?
 * Study the "Textpattern Semantic Model?":https://textpattern.com/textpattern-semantic-model
-* Add one or more "additional users":adminurl/index.php?event=admin, or extend Textpattern's capabilities with "plugins":adminurl/index.php?event=plugin you discovered from the "Textpattern plugin directory?":https://textpattern.com/plugins
-* Dive in and learn by doing? Then please note:
-** When you "write an article":adminurl/index.php?event=article you assign it to a section of your site.
-** Sections use a "page template":adminurl/index.php?event=page and a "style":adminurl/index.php?event=css as an output scaffold.
-** Page templates use HTML(HyperText Markup Language) and "Textpattern tags":https://docs.textpattern.io/tags/ (like this: @<txp:article />@) to build the markup.
-** Some Textpattern tags use "forms":adminurl/index.php?event=form, which are building blocks for reusable snippets of code and markup you may build and use at your discretion.
-** Pages, forms and styles can be combined into "themes":adminurl/index.php?event=skin that can be assigned to one or more sections.
+* Add one or more "additional users":adminurl/index.php?event=admin, or extend Textpattern's capabilities with "plugins":adminurl/index.php?event=plugin from the "Textpattern plugin directory?":https://textpattern.com/plugins
+* Dive in and learn by doing? Please note:
+** When you write an article you assign it to a "section":adminurl/index.php?event=section of your site.
+** Sections use a "page template":adminurl/index.php?event=page and a "style":adminurl/index.php?event=css to define how site content appears in a browser.
+** Page templates use HTML(HyperText Markup Language) and "Textpattern tags":https://docs.textpattern.io/tags/ (like this: @<txp:article />@) to build the output code.
+** Some Textpattern tags use "forms":adminurl/index.php?event=form, which are building blocks for reusable code and markup.
+** Pages, styles and forms can be packaged into "themes":adminurl/index.php?event=skin and assigned to one or more sections.
 
-Textpattern tags, their attributes and values are explained and sampled within the "Textpattern User Documentation":https://docs.textpattern.io/, where you will also find valuable tips and tutorials.
+Textpattern tags, their attributes and values are explained within the "Textpattern User Documentation":https://docs.textpattern.io/, where you will also find valuable examples, advice and tutorials.
 
-There's also a crowd of friendly, helpful people over at the "Textpattern support forum":https://forum.textpattern.io/. Come and pay a visit!
+There's also a group of friendly, helpful Textpattern users and administrators at the "Textpattern support forum":https://forum.textpattern.io/.
 
-We welcome additional language translations (and corrections to current translations). Please visit "Textpattern language translations":https://textpattern.com/languages for further details.]]></body>
-    <excerpt format="textile"><![CDATA[This is a Textpattern article excerpt. Article excerpts are optional but can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication and with the @<txp:excerpt />@ tag.]]></excerpt>
+Additional language translations and corrections are welcomed. Please visit "Textpattern language translations":https://textpattern.com/languages for further details.
+
+This is an example article included with Textpattern CMS to demonstrate some of the first steps you can undertake. It can be safely deleted.]]></body>
+    <excerpt format="textile"><![CDATA[This is a Textpattern article excerpt. Article excerpts are optional and can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald-swain@example.com</email>
diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index 3322f3be2f..75753e6d38 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -8,24 +8,30 @@
     <category>meaningful-labour</category>
     <body format="textile"><![CDATA[h3. What do you want to do next?
 
-* Modify or delete this article? The "article list":adminurl/index.php?event=list is the place to start.
-* Change this site's name, or modify the style of the URLs? It's all up to your "preferences":adminurl/index.php?event=prefs.
-* Get yourself acquainted with Textile, the humane markup generator which comes with Textpattern? The basics are "simple":https://textpattern.com/textile-sandbox. If you want to learn more, you can dig into an "extensive manual":https://textpattern.com/textile-reference-manual later.
-* Be guided through your "Textpattern first steps":https://textpattern.com/textpattern-first-steps by completing some basic tasks?
+* Write a "new article":adminurl/index.php?event=article? Let your creativity flow!
+* Change this site's name, slogan or select a different URL style? It's all up to your "preferences":adminurl/index.php?event=prefs.
+* Edit or delete this article? The "article list":adminurl/index.php?event=list is the place to start.
+* Upload "images":adminurl/index.php?event=image or "files":adminurl/index.php?event=file to accompany your articles?
+* Learn Textile, the markup generator included with Textpattern? You can try it in the "Textile sandbox":https://textpattern.com/textile-sandbox.
+** If you want to learn more, you can refer to an extensive "Textile manual":https://textpattern.com/textile-reference-manual.
+* Be guided through your "Textpattern first steps":https://textpattern.com/textpattern-first-steps by completing some tasks?
 * Study the "Textpattern Semantic Model?":https://textpattern.com/textpattern-semantic-model
-* Add "another user":adminurl/index.php?event=admin, or extend the capabilities with "third party plugins":adminurl/index.php?event=plugin you discovered from the "Textpattern plugin directory?":https://textpattern.com/plugins
-* Dive in and learn by trial and error? Then please note:
-** When you "write":adminurl/index.php?event=article an article you assign it to a section of your site.
-** Sections use a "page template":adminurl/index.php?event=page and a "style":adminurl/index.php?event=css as an output scaffold.
-** Page templates use HTML(HyperText Markup Language) and Textpattern tags (like this: @<txp:article />@) to build the markup.
-** Some Textpattern tags use "forms":adminurl/index.php?event=form, which are building blocks for reusable snippets of code and markup you may build and use at your discretion.
+* Add one or more "additional users":adminurl/index.php?event=admin, or extend Textpattern's capabilities with "plugins":adminurl/index.php?event=plugin from the "Textpattern plugin directory?":https://textpattern.com/plugins
+* Dive in and learn by doing? Please note:
+** When you write an article you assign it to a "section":adminurl/index.php?event=section of your site.
+** Sections use a "page template":adminurl/index.php?event=page and a "style":adminurl/index.php?event=css to define how site content appears in a browser.
+** Page templates use HTML(HyperText Markup Language) and "Textpattern tags":https://docs.textpattern.io/tags/ (like this: @<txp:article />@) to build the output code.
+** Some Textpattern tags use "forms":adminurl/index.php?event=form, which are building blocks for reusable code and markup.
+** Pages, styles and forms can be packaged into "themes":adminurl/index.php?event=skin and assigned to one or more sections.
 
-"Textpattern tags":https://docs.textpattern.io/tags/, their attributes and values are explained and sampled within the "Textpattern User Documentation":https://docs.textpattern.io/, where you will also find valuable tips and tutorials.
+Textpattern tags, their attributes and values are explained within the "Textpattern User Documentation":https://docs.textpattern.io/, where you will also find valuable examples, advice and tutorials.
 
-There's also a crowd of friendly, helpful people over at the "Textpattern support forum":https://forum.textpattern.io/. Come and pay a visit!
+There's also a group of friendly, helpful Textpattern users and administrators at the "Textpattern support forum":https://forum.textpattern.io/.
 
-We welcome additional language translations (and corrections to current translations). Please visit "Textpattern language translations":https://textpattern.com/languages for further details.]]></body>
-    <excerpt format="textile"><![CDATA[This is a Textpattern article excerpt. Article excerpts are optional but can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication and with the @<txp:excerpt />@ tag.]]></excerpt>
+Additional language translations and corrections are welcomed. Please visit "Textpattern language translations":https://textpattern.com/languages for further details.
+
+This is an example article included with Textpattern CMS to demonstrate some of the first steps you can undertake. It can be safely deleted.]]></body>
+    <excerpt format="textile"><![CDATA[This is a Textpattern article excerpt. Article excerpts are optional and can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald-swain@example.com</email>

From dea1f521067375cbfa3906776a2d6030d71cc00b Mon Sep 17 00:00:00 2001
From: Phil Wareham <phil@designhive.com>
Date: Fri, 2 Nov 2018 11:09:33 +0000
Subject: [PATCH 07/29] Latest version of English Welcome article

---
 .../en-gb/articles/articles.welcome.xml       | 22 +++++++++----------
 .../en/articles/articles.welcome.xml          | 22 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml b/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml
index 75753e6d38..0b65f23d6c 100644
--- a/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml
@@ -9,33 +9,33 @@
     <body format="textile"><![CDATA[h3. What do you want to do next?
 
 * Write a "new article":adminurl/index.php?event=article? Let your creativity flow!
-* Change this site's name, slogan or select a different URL style? It's all up to your "preferences":adminurl/index.php?event=prefs.
-* Edit or delete this article? The "article list":adminurl/index.php?event=list is the place to start.
+* Change this site's name, slogan or select a different article URL style? Check and modify your "preferences":adminurl/index.php?event=prefs.
+* Edit or delete this article? Your "articles list":adminurl/index.php?event=list is the place to start.
 * Upload "images":adminurl/index.php?event=image or "files":adminurl/index.php?event=file to accompany your articles?
 * Learn Textile, the markup generator included with Textpattern? You can try it in the "Textile sandbox":https://textpattern.com/textile-sandbox.
 ** If you want to learn more, you can refer to an extensive "Textile manual":https://textpattern.com/textile-reference-manual.
 * Be guided through your "Textpattern first steps":https://textpattern.com/textpattern-first-steps by completing some tasks?
-* Study the "Textpattern Semantic Model?":https://textpattern.com/textpattern-semantic-model
-* Add one or more "additional users":adminurl/index.php?event=admin, or extend Textpattern's capabilities with "plugins":adminurl/index.php?event=plugin from the "Textpattern plugin directory?":https://textpattern.com/plugins
+* Study the "Textpattern Semantic Model":https://textpattern.com/textpattern-semantic-model?
+* Add one or more additional "users":adminurl/index.php?event=admin, or extend Textpattern's capabilities with "plugins":adminurl/index.php?event=plugin from the "Textpattern plugin directory":https://textpattern.com/plugins?
 * Dive in and learn by doing? Please note:
 ** When you write an article you assign it to a "section":adminurl/index.php?event=section of your site.
-** Sections use a "page template":adminurl/index.php?event=page and a "style":adminurl/index.php?event=css to define how site content appears in a browser.
-** Page templates use HTML(HyperText Markup Language) and "Textpattern tags":https://docs.textpattern.io/tags/ (like this: @<txp:article />@) to build the output code.
-** Some Textpattern tags use "forms":adminurl/index.php?event=form, which are building blocks for reusable code and markup.
+** Sections use a "page":adminurl/index.php?event=page template and a "style":adminurl/index.php?event=css to define how site content appears in a browser.
+** Page templates typically use HTML(HyperText Markup Language) and "Textpattern tags":https://docs.textpattern.com/tags/ (like this: @<txp:article />@) to build the output code.
+** Some Textpattern tags use "forms":adminurl/index.php?event=form, reusable building blocks that provide extensive control and customization over your site construction.
 ** Pages, styles and forms can be packaged into "themes":adminurl/index.php?event=skin and assigned to one or more sections.
 
-Textpattern tags, their attributes and values are explained within the "Textpattern User Documentation":https://docs.textpattern.io/, where you will also find valuable examples, advice and tutorials.
+Textpattern tags, their attributes and values are explained within the "Textpattern User Documentation":https://docs.textpattern.com/, where you will also find valuable examples, advice and tutorials.
 
-There's also a group of friendly, helpful Textpattern users and administrators at the "Textpattern support forum":https://forum.textpattern.io/.
+There's also a group of friendly, helpful Textpattern users and administrators at the "Textpattern support forum":https://forum.textpattern.com/.
 
 Additional language translations and corrections are welcomed. Please visit "Textpattern language translations":https://textpattern.com/languages for further details.
 
-This is an example article included with Textpattern CMS to demonstrate some of the first steps you can undertake. It can be safely deleted.]]></body>
+This is an <txp:permlink id="1">example article</txp:permlink> included with Textpattern to demonstrate some of the first steps you can undertake. An example comment is associated with this article. The article and comment can be safely deleted using the "articles":adminurl/index.php?event=list and "comments":adminurl/index.php?event=discuss lists.]]></body>
     <excerpt format="textile"><![CDATA[This is a Textpattern article excerpt. Article excerpts are optional and can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald-swain@example.com</email>
-        <web>https://docs.textpattern.io/brand/donald-swain</web>
+        <web>https://docs.textpattern.com/brand/donald-swain</web>
         <message><![CDATA[<p>I enjoy your site very much.</p>]]></message>
     </comment>
 </article>
diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index 75753e6d38..0b65f23d6c 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -9,33 +9,33 @@
     <body format="textile"><![CDATA[h3. What do you want to do next?
 
 * Write a "new article":adminurl/index.php?event=article? Let your creativity flow!
-* Change this site's name, slogan or select a different URL style? It's all up to your "preferences":adminurl/index.php?event=prefs.
-* Edit or delete this article? The "article list":adminurl/index.php?event=list is the place to start.
+* Change this site's name, slogan or select a different article URL style? Check and modify your "preferences":adminurl/index.php?event=prefs.
+* Edit or delete this article? Your "articles list":adminurl/index.php?event=list is the place to start.
 * Upload "images":adminurl/index.php?event=image or "files":adminurl/index.php?event=file to accompany your articles?
 * Learn Textile, the markup generator included with Textpattern? You can try it in the "Textile sandbox":https://textpattern.com/textile-sandbox.
 ** If you want to learn more, you can refer to an extensive "Textile manual":https://textpattern.com/textile-reference-manual.
 * Be guided through your "Textpattern first steps":https://textpattern.com/textpattern-first-steps by completing some tasks?
-* Study the "Textpattern Semantic Model?":https://textpattern.com/textpattern-semantic-model
-* Add one or more "additional users":adminurl/index.php?event=admin, or extend Textpattern's capabilities with "plugins":adminurl/index.php?event=plugin from the "Textpattern plugin directory?":https://textpattern.com/plugins
+* Study the "Textpattern Semantic Model":https://textpattern.com/textpattern-semantic-model?
+* Add one or more additional "users":adminurl/index.php?event=admin, or extend Textpattern's capabilities with "plugins":adminurl/index.php?event=plugin from the "Textpattern plugin directory":https://textpattern.com/plugins?
 * Dive in and learn by doing? Please note:
 ** When you write an article you assign it to a "section":adminurl/index.php?event=section of your site.
-** Sections use a "page template":adminurl/index.php?event=page and a "style":adminurl/index.php?event=css to define how site content appears in a browser.
-** Page templates use HTML(HyperText Markup Language) and "Textpattern tags":https://docs.textpattern.io/tags/ (like this: @<txp:article />@) to build the output code.
-** Some Textpattern tags use "forms":adminurl/index.php?event=form, which are building blocks for reusable code and markup.
+** Sections use a "page":adminurl/index.php?event=page template and a "style":adminurl/index.php?event=css to define how site content appears in a browser.
+** Page templates typically use HTML(HyperText Markup Language) and "Textpattern tags":https://docs.textpattern.com/tags/ (like this: @<txp:article />@) to build the output code.
+** Some Textpattern tags use "forms":adminurl/index.php?event=form, reusable building blocks that provide extensive control and customization over your site construction.
 ** Pages, styles and forms can be packaged into "themes":adminurl/index.php?event=skin and assigned to one or more sections.
 
-Textpattern tags, their attributes and values are explained within the "Textpattern User Documentation":https://docs.textpattern.io/, where you will also find valuable examples, advice and tutorials.
+Textpattern tags, their attributes and values are explained within the "Textpattern User Documentation":https://docs.textpattern.com/, where you will also find valuable examples, advice and tutorials.
 
-There's also a group of friendly, helpful Textpattern users and administrators at the "Textpattern support forum":https://forum.textpattern.io/.
+There's also a group of friendly, helpful Textpattern users and administrators at the "Textpattern support forum":https://forum.textpattern.com/.
 
 Additional language translations and corrections are welcomed. Please visit "Textpattern language translations":https://textpattern.com/languages for further details.
 
-This is an example article included with Textpattern CMS to demonstrate some of the first steps you can undertake. It can be safely deleted.]]></body>
+This is an <txp:permlink id="1">example article</txp:permlink> included with Textpattern to demonstrate some of the first steps you can undertake. An example comment is associated with this article. The article and comment can be safely deleted using the "articles":adminurl/index.php?event=list and "comments":adminurl/index.php?event=discuss lists.]]></body>
     <excerpt format="textile"><![CDATA[This is a Textpattern article excerpt. Article excerpts are optional and can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald-swain@example.com</email>
-        <web>https://docs.textpattern.io/brand/donald-swain</web>
+        <web>https://docs.textpattern.com/brand/donald-swain</web>
         <message><![CDATA[<p>I enjoy your site very much.</p>]]></message>
     </comment>
 </article>

From 36942cd6ceef42213e4f82d2da8a32fd287b3d3c Mon Sep 17 00:00:00 2001
From: Phil Wareham <phil@designhive.com>
Date: Mon, 5 Nov 2018 11:25:45 +0000
Subject: [PATCH 08/29] Latest exmaple of localised default content (French)

---
 .../fi/articles/articles.welcome.xml          | 37 ----------------
 .../setup/default-content/fi/data/core.prefs  | 23 ----------
 .../default-content/fi/data/txp_category.xml  | 33 --------------
 .../default-content/fi/data/txp_link.xml      | 41 ------------------
 .../default-content/fi/data/txp_section.xml   | 15 -------
 .../fr/articles/articles.welcome.xml          | 43 +++++++++++++++++++
 .../{sv => fr}/data/core.prefs                |  4 +-
 .../{sv => fr}/data/txp_category.xml          | 12 +++---
 .../{sv => fr}/data/txp_link.xml              |  8 ++--
 .../{sv => fr}/data/txp_section.xml           |  2 +-
 .../sv/articles/articles.welcome.xml          | 37 ----------------
 11 files changed, 56 insertions(+), 199 deletions(-)
 delete mode 100644 textpattern/setup/default-content/fi/articles/articles.welcome.xml
 delete mode 100644 textpattern/setup/default-content/fi/data/core.prefs
 delete mode 100644 textpattern/setup/default-content/fi/data/txp_category.xml
 delete mode 100644 textpattern/setup/default-content/fi/data/txp_link.xml
 delete mode 100644 textpattern/setup/default-content/fi/data/txp_section.xml
 create mode 100644 textpattern/setup/default-content/fr/articles/articles.welcome.xml
 rename textpattern/setup/default-content/{sv => fr}/data/core.prefs (86%)
 rename textpattern/setup/default-content/{sv => fr}/data/txp_category.xml (70%)
 rename textpattern/setup/default-content/{sv => fr}/data/txp_link.xml (81%)
 rename textpattern/setup/default-content/{sv => fr}/data/txp_section.xml (90%)
 delete mode 100644 textpattern/setup/default-content/sv/articles/articles.welcome.xml

diff --git a/textpattern/setup/default-content/fi/articles/articles.welcome.xml b/textpattern/setup/default-content/fi/articles/articles.welcome.xml
deleted file mode 100644
index 4a55c349cf..0000000000
--- a/textpattern/setup/default-content/fi/articles/articles.welcome.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-<articles>
-<article>
-    <title>Tervetuloa sivustollesi</title>
-    <section>articles</section>
-    <category>hope-for-the-future</category>
-    <category>meaningful-labor</category>
-    <body format="textile"><![CDATA[h3. Mitä haluat tehdä seuraavaksi?
-
-* Muokata tai poistaa tämän artikkelin? Silloin "artikkelien luettelo":adminurl/index.php?event=list on aloituspaikka.
-* Vaihtaa sivuston nimen, tai vaihtaa URL-osoitteiden muodon? Sellaiset asiat riippuvat "asetuksista":adminurl/index.php?event=prefs.
-* Tutustua Textileen, meille ihmisille suunnattuun merkkaustyökaluun, joka tulee Textpatternin mukana? Sen perusteet ovat "yksinkertaisia":https://textpattern.com/textile-sandbox. Mikäli haluat oppia siitä enemmän, voit pureutua "kattavaan käsikirjaan":https://textpattern.com/textile-reference-manual myöhemmin.
-* Saada ohjeistusta ottaessasi "ensi askeleita Textpatternin kanssa":https://textpattern.com/textpattern-first-steps tekemällä yksinkertaisia tehtäviä?
-* Opiskella "Textpatternin semanttista mallia?":https://textpattern.com/textpattern-semantic-model
-* Lisätä "toisen käyttäjän":adminurl/index.php?event=admin, tai laajentaa ominaisuuksia "kolmannen osapuolen lisäosien":adminurl/index.php?event=plugin avulla, joita löysit "Textpatternin lisäosien hakemistosta?":https://textpattern.com/plugins
-* Kokeilla asioita omin päin yrityksen ja erehdyksen kautta? Silloin ole hyvä ja huomaa:
-** Kun "kirjoitat":adminurl/index.php?event=article artikkelin, määrittelet mihin sivustosi osioon se kuuluu.
-** Osiot käyttävät "sivupohjia":adminurl/index.php?event=page ja "tyylejä":adminurl/index.php?event=css kun ne näytetään maailmalle.
-** Sivupohjat käyttävät HTML(HyperText Markup Language):ää ja Textpatternin tageja (kuten tätä: @<txp:article />@) rakentaakseen "lopputuotteen".
-** Jotkut Textpatternin tageista käyttävät "lomakkeita":adminurl/index.php?event=form. Ne ovat rakennuspalikoita, jotka sisältävät tekemääsi koodia ja merkkausta, ja joita voi käyttää uudelleen ja haluamissasi yhteyksissä.
-
-"Textpatternin tagit":https://docs.textpattern.io/tags/, niiden attribuutit ja arvot selitetään, ja niistä näytetään esimerkkejä, "Textpatternin käsikirjassa":https://docs.textpattern.io/. Löydät sieltä myös arvokkaita niksejä ja ohjeita.
-
-Lisäksi ryhmä ystävällisiä, avuliaita ihmisiä on "Textpatternin tukifoorumilla":https://forum.textpattern.io/. Tule vierailulle!
-
-Toivotamme tervetulleeksi uudet kielikäännökset (ja korjaukset nykyisiin käännöksiin). Ole hyvä ja vieraile "Textpatternin käännössivulla":https://textpattern.com/languages saadaksesi lisätietoja.]]></body>
-    <excerpt format="textile"><![CDATA[Tämä on Textpatternin artikkelin johdanto. Artikkelien johdannot ovat vapaaehtoisia, mutta niillä voidaan näpsäkästi luoda yhteenveto artikkelin sisällöstä käyttämällä esimerkiksi Textpatternin sisäänrakennettua artikkelien syndikointia ja @<txp:excerpt />@ -tagia.]]></excerpt>
-    <comment>
-        <name>Donald Swain</name>
-        <email>donald-swain@example.com</email>
-        <web>https://docs.textpattern.io/brand/donald-swain</web>
-        <message><![CDATA[<p>Pidän kovasti sivustostasi.</p>]]></message>
-    </comment>
-</article>
-</articles>
-</resources>
diff --git a/textpattern/setup/default-content/fi/data/core.prefs b/textpattern/setup/default-content/fi/data/core.prefs
deleted file mode 100644
index 0fce2b23a9..0000000000
--- a/textpattern/setup/default-content/fi/data/core.prefs
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "default_section": {
-    "val": "articles",
-    "type": "2",
-    "event": "section",
-    "html": "text_input",
-    "position": "0"
-  },
-  "custom_1_set": {
-    "val": "custom1",
-    "type": "0",
-    "event": "custom",
-    "html": "custom_set",
-    "position": "1"
-  },
-  "custom_2_set": {
-    "val": "custom2",
-    "type": "0",
-    "event": "custom",
-    "html": "custom_set",
-    "position": "2"
-  }
-}
diff --git a/textpattern/setup/default-content/fi/data/txp_category.xml b/textpattern/setup/default-content/fi/data/txp_category.xml
deleted file mode 100644
index 1715ff3cc4..0000000000
--- a/textpattern/setup/default-content/fi/data/txp_category.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <category>
-        <item>
-            <name>everything-is-going-to-be-alright</name>
-            <type>article</type>
-            <parent>root</parent>
-            <title>Kaikki tulee olemaan hyvin</title>
-            <description/>
-        </item>
-        <item>
-            <name>hope-for-the-future</name>
-            <type>article</type>
-            <parent>root</parent>
-            <title>Toivoa tulevaan</title>
-            <description/>
-        </item>
-        <item>
-            <name>meaningful-labor</name>
-            <type>article</type>
-            <parent>root</parent>
-            <title>Merkityksellistä työtä</title>
-            <description/>
-        </item>
-        <item>
-            <name>textpattern</name>
-            <type>link</type>
-            <parent>root</parent>
-            <title>Textpattern</title>
-            <description/>
-        </item>
-    </category>
-</resources>
diff --git a/textpattern/setup/default-content/fi/data/txp_link.xml b/textpattern/setup/default-content/fi/data/txp_link.xml
deleted file mode 100644
index 7f47149d76..0000000000
--- a/textpattern/setup/default-content/fi/data/txp_link.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <link>
-        <item>
-            <date>NOW()</date>
-            <category>textpattern</category>
-            <url>https://textpattern.com/</url>
-            <linkname>Textpatternin sivusto</linkname>
-            <linksort>10</linksort>
-            <description/>
-            <author/>
-        </item>
-        <item>
-            <date>NOW()</date>
-            <category>textpattern</category>
-            <url>https://docs.textpattern.io/</url>
-            <linkname>Textpatternin käyttöohjeet</linkname>
-            <linksort>20</linksort>
-            <description/>
-            <author/>
-        </item>
-        <item>
-            <date>NOW()</date>
-            <category>textpattern</category>
-            <url>https://textpattern.com/github</url>
-            <linkname>Textpattern GitHubissa</linkname>
-            <linksort>30</linksort>
-            <description/>
-            <author/>
-        </item>
-        <item>
-            <date>NOW()</date>
-            <category>textpattern</category>
-            <url>https://textpattern.com/@textpattern</url>
-            <linkname>Textpattern Twitterissä</linkname>
-            <linksort>40</linksort>
-            <description/>
-            <author/>
-        </item>
-    </link>
-</resources>
diff --git a/textpattern/setup/default-content/fi/data/txp_section.xml b/textpattern/setup/default-content/fi/data/txp_section.xml
deleted file mode 100644
index d2203c802d..0000000000
--- a/textpattern/setup/default-content/fi/data/txp_section.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <section>
-        <item>
-            <name>articles</name>
-            <page>archive</page>
-            <css>default</css>
-            <description/>
-            <in_rss>1</in_rss>
-            <on_frontpage>1</on_frontpage>
-            <searchable>1</searchable>
-            <title>Artikkelit</title>
-        </item>
-    </section>
-</resources>
diff --git a/textpattern/setup/default-content/fr/articles/articles.welcome.xml b/textpattern/setup/default-content/fr/articles/articles.welcome.xml
new file mode 100644
index 0000000000..a9f47d6ee7
--- /dev/null
+++ b/textpattern/setup/default-content/fr/articles/articles.welcome.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+<articles>
+<article>
+    <title>Bienvenue sur votre site</title>
+    <section>articles</section>
+    <category>espoir-pour-le-futur</category>
+    <category>travail-significatif</category>
+    <body format="textile"><![CDATA[h3. Que souhaitez-vous faire, maintenant ?
+
+* Rédiger un "nouvel article":adminurl/index.php?event=article ? Laissez votre créativité s’exprimer !
+* Modifier le nom de ce site, son slogan ou choisir un autre type d’URL ? Vérifiez et modifiez vous "préférences de site":adminurl/index.php?event=prefs.
+* Éditer ou supprimer cet article ? La "liste de vos articles":adminurl/index.php?event=list c’est là où cela se passe.
+* Ajouter des "images":adminurl/index.php?event=image ou des "fichiers":adminurl/index.php?event=file pour accompagner vos articles ?
+* Apprendre Textile, la convention d’écriture HTML simplifiée incluse avec Textpattern ? Amusez-vous dans le "bac à sable Textile":https://textpattern.com/textile-sandbox.
+** Si vous voulez vous perfectionner, consultez le manuel exhaustif "Textile manual":https://textpattern.com/textile-reference-manual.
+* Trouver de l’aide pour appréhender les "premières étapes avec Textpattern":https://textpattern.com/textpattern-first-steps en complétant quelques réglages ?
+* Étudier le "modèle interne de Textpattern":https://textpattern.com/textpattern-semantic-model ?
+* Ajouter un•e ou plusieurs "utilisat•rice•eur•s":adminurl/index.php?event=admin, ou étendre les possibilités de Textpattern avec des "plugins":adminurl/index.php?event=plugin depuis l’offre du "catalogue":https://textpattern.com/plugins ?
+* Approfondir et apprendre par la pratique ? Veuillez noter :
+** Lorsque vous rédigez un article, vous l’associez à "une «section»":adminurl/index.php?event=section (Page) de votre site ;
+** Les sections utilisent des "gabarits":adminurl/index.php?event=page de pages, ainsi que des "styles":adminurl/index.php?event=css en charge de l’apparence du site dans les navigateurs ;
+** Les modèles de pages comportent habituellement du HTML(HyperText Markup Language) ainsi que des "balises spécifiques Textpattern":https://docs.textpattern.com/tags/ (comme celle-ci : @<txp:article />@) pour générer le code ;
+** Certaines balises Textpattern utilisent des "modules":adminurl/index.php?event=form, réutilisables sous forme de blocs autorisant un contrôle étendu et la personnalisation nécessaire pour la construction de votre site ;
+** Les gabarits, les styles ainsi que les modules peuvent être incorporés dans des "thèmes":adminurl/index.php?event=skin et associés à une, voire plusieurs sections.
+
+Le balisage spécifique Textpattern, leurs attributs ainsi que leurs valeurs d’attribut sont expliqués dans le document "Textpattern User Documentation":https://docs.textpattern.com/ où vous découvrirez, également, des exemples efficaces, des conseils ainsi que des tutoriels.
+
+Il existe aussi une communauté d’entraide particulièrement amicale d’utilisateurs et d’administrateurs sur le "Textpattern support forum":https://forum.textpattern.com/.
+
+Les traductions de langues supplémentaires et leur correction sont toutes les bienvenues. Veuillez consulter la page "Textpattern language translations":https://textpattern.com/languages pour de plus amples détails.
+
+Ce texte est un <txp:permlink id="1">article d’exemple</txp:permlink> inclus avec Textpattern pour illustrer certaines des premières étapes que vous pouvez entreprendre. Un exemple de commentaire est associé à cet article. L’article et le commentaire peuvent être supprimés en toute sécurité depuis la page des "articles":adminurl/index.php?event=list et la liste des "commentaires":adminurl/index.php?event=discuss.]]></body>
+    <excerpt format="textile"><![CDATA[Ceci est un extrait d’article dans Textpattern. Les extraits d’article sont facultatifs et peuvent être utilisés efficacement pour résumer le contenu d’un article comme, par exemple, avec la syndication d’articles intégrée de Textpattern.]]></excerpt>
+    <comment>
+        <name>Donald Swain</name>
+        <email>donald-swain@example.com</email>
+        <web>https://docs.textpattern.com/brand/donald-swain</web>
+        <message><![CDATA[<p>J’aime beaucoup votre site.</p>]]></message>
+    </comment>
+</article>
+</articles>
+</resources>
diff --git a/textpattern/setup/default-content/sv/data/core.prefs b/textpattern/setup/default-content/fr/data/core.prefs
similarity index 86%
rename from textpattern/setup/default-content/sv/data/core.prefs
rename to textpattern/setup/default-content/fr/data/core.prefs
index 0fce2b23a9..1d94b76e6a 100644
--- a/textpattern/setup/default-content/sv/data/core.prefs
+++ b/textpattern/setup/default-content/fr/data/core.prefs
@@ -7,14 +7,14 @@
     "position": "0"
   },
   "custom_1_set": {
-    "val": "custom1",
+    "val": "personnalisé1",
     "type": "0",
     "event": "custom",
     "html": "custom_set",
     "position": "1"
   },
   "custom_2_set": {
-    "val": "custom2",
+    "val": "personnalisé2",
     "type": "0",
     "event": "custom",
     "html": "custom_set",
diff --git a/textpattern/setup/default-content/sv/data/txp_category.xml b/textpattern/setup/default-content/fr/data/txp_category.xml
similarity index 70%
rename from textpattern/setup/default-content/sv/data/txp_category.xml
rename to textpattern/setup/default-content/fr/data/txp_category.xml
index e480e6aa2e..26d11ef2d2 100644
--- a/textpattern/setup/default-content/sv/data/txp_category.xml
+++ b/textpattern/setup/default-content/fr/data/txp_category.xml
@@ -2,24 +2,24 @@
 <resources>
     <category>
         <item>
-            <name>everything-is-going-to-be-alright</name>
+            <name>tout-ira-bien</name>
             <type>article</type>
             <parent>root</parent>
-            <title>Allt kommer att bli bra</title>
+            <title>Tout ira bien</title>
             <description/>
         </item>
         <item>
-            <name>hope-for-the-future</name>
+            <name>espoir-pour-le-futur</name>
             <type>article</type>
             <parent>root</parent>
-            <title>Framtidshopp</title>
+            <title>Espoir pour le futur</title>
             <description/>
         </item>
         <item>
-            <name>meaningful-labor</name>
+            <name>travail-significatif</name>
             <type>article</type>
             <parent>root</parent>
-            <title>Meningsfullt arbete</title>
+            <title>Travail significatif</title>
             <description/>
         </item>
         <item>
diff --git a/textpattern/setup/default-content/sv/data/txp_link.xml b/textpattern/setup/default-content/fr/data/txp_link.xml
similarity index 81%
rename from textpattern/setup/default-content/sv/data/txp_link.xml
rename to textpattern/setup/default-content/fr/data/txp_link.xml
index e5321a310a..42087169a5 100644
--- a/textpattern/setup/default-content/sv/data/txp_link.xml
+++ b/textpattern/setup/default-content/fr/data/txp_link.xml
@@ -5,7 +5,7 @@
             <date>NOW()</date>
             <category>textpattern</category>
             <url>https://textpattern.com/</url>
-            <linkname>Textpattern webbplats</linkname>
+            <linkname>Site officiel de Textpattern</linkname>
             <linksort>10</linksort>
             <description/>
             <author/>
@@ -14,7 +14,7 @@
             <date>NOW()</date>
             <category>textpattern</category>
             <url>https://docs.textpattern.io/</url>
-            <linkname>Textpattern användarmanual</linkname>
+            <linkname>Documentation utilisateur de Textpattern</linkname>
             <linksort>20</linksort>
             <description/>
             <author/>
@@ -23,7 +23,7 @@
             <date>NOW()</date>
             <category>textpattern</category>
             <url>https://textpattern.com/github</url>
-            <linkname>Textpattern på GitHub</linkname>
+            <linkname>Textpattern sur GitHub</linkname>
             <linksort>30</linksort>
             <description/>
             <author/>
@@ -32,7 +32,7 @@
             <date>NOW()</date>
             <category>textpattern</category>
             <url>https://textpattern.com/@textpattern</url>
-            <linkname>Textpattern på Twitter</linkname>
+            <linkname>Textpattern sur Twitter</linkname>
             <linksort>40</linksort>
             <description/>
             <author/>
diff --git a/textpattern/setup/default-content/sv/data/txp_section.xml b/textpattern/setup/default-content/fr/data/txp_section.xml
similarity index 90%
rename from textpattern/setup/default-content/sv/data/txp_section.xml
rename to textpattern/setup/default-content/fr/data/txp_section.xml
index d8d620cdd6..c37d02b4e3 100644
--- a/textpattern/setup/default-content/sv/data/txp_section.xml
+++ b/textpattern/setup/default-content/fr/data/txp_section.xml
@@ -9,7 +9,7 @@
             <in_rss>1</in_rss>
             <on_frontpage>1</on_frontpage>
             <searchable>1</searchable>
-            <title>Artiklar</title>
+            <title>Articles</title>
         </item>
     </section>
 </resources>
diff --git a/textpattern/setup/default-content/sv/articles/articles.welcome.xml b/textpattern/setup/default-content/sv/articles/articles.welcome.xml
deleted file mode 100644
index 8b5121134a..0000000000
--- a/textpattern/setup/default-content/sv/articles/articles.welcome.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-<articles>
-<article>
-    <title>Välkommen till din webbplats</title>
-    <section>articles</section>
-    <category>hope-for-the-future</category>
-    <category>meaningful-labor</category>
-    <body format="textile"><![CDATA[h3. Vad vill du göra härnäst?
-
-* Ändra eller ta bort den här artikeln? "artikellista":adminurl/index.php?event=list är stället att börja på.
-* Ändra webbplatsens namn eller ändra stilen på webbadresserna? It's all up to your "inställningar":adminurl/index.php?event=prefs.
-* Get yourself acquainted with Textile, the humane markup generator which comes with Textpattern? Grunderna är "enkelt":https://textpattern.com/textile-sandbox. Om du vill lära dig mer kan du fördjupa dig i den "omfattande manualen":https://textpattern.com/textile-reference-manual senare.
-* Bli guidad genom dina "Textpattern första steg":https://textpattern.com/textpattern-first-steps genom att fylla i några grundläggande uppgifter?
-* Studera "Textpattern semantisk modell?":https://textpattern.com/textpattern-semantic-model
-* Lägg till "fler användare":adminurl/index.php?event=admin, eller utöka kapaciteten med "tredjepartsplugins":adminurl/index.php?event=plugin du upptäckte i "Textpattern pluginkatalog?":https://textpattern.com/plugins
-* Eller lär dig av dina misstag? Men kom då ihåg:
-** När du "skriver":adminurl/index.php?event=article en artikel du tilldelar den till en del av din webbplats.
-** Sektioner använder en "sidmall":adminurl/index.php?event=page och en "style":adminurl/index.php?event=css som utmatningsställ.
-** Sidmallar använder HTML(HyperText Markup Language) och Textpattern-taggar (som denna: @<txp:article />@) att bygga upp markeringen.
-** Några Textpattern-taggar använder "formen":adminurl/index.php?event=form, vilka är byggstenar för återanvändbara utdrag av kod och markeringar du kan bygga och använda efter eget gottfinnande.
-
-"Textpattern taggar":https://docs.textpattern.io/tags/, deras attribut och värden förklaras och ges exempel på i "Textpattern användardokumentation":https://docs.textpattern.io/, där du också hittar värdefulla tips och handledningar.
-
-Det finns också en massa vänliga och hjälpsamma människor på "Textpattern supportforum":https://forum.textpattern.io/. Du är välkommen in!
-
-Vi välkomnar ytterligare språköversättningar (och korrigeringar till befintliga översättningar). Besök "Textpattern språköversättningar":https://textpattern.com/languages för mer information.]]></body>
-    <excerpt format="textile"><![CDATA[Detta är ett textpattern-artikelutdrag. Artikelutdrag är frivilliga, men kan användas effektivt för att sammanfatta en artikels innehåll. Till exempel med Textpatterns inbyggda artikelsyndikering. och med taggen @<txp:excerpt />@.]]></excerpt>
-    <comment>
-        <name>Donald Swain</name>
-        <email>donald-swain@example.com</email>
-        <web>https://docs.textpattern.io/brand/donald-swain</web>
-        <message><![CDATA[<p>Jag gillar din webbplats väldigt mycket.</p>]]></message>
-    </comment>
-</article>
-</articles>
-</resources>

From c165b79dc73868958a8affc78d00aa25d19a1145 Mon Sep 17 00:00:00 2001
From: Stef Dawson <Bloke@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:12:14 +0000
Subject: [PATCH 09/29] Simplify welcome article text

---
 .../en/articles/articles.welcome.xml          | 30 ++++---------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index 0b65f23d6c..9333af5e6d 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -2,36 +2,18 @@
 <resources>
 <articles>
 <article>
-    <title>Welcome to your site</title>
+    <title>Welcome to Textpattern</title>
     <section>articles</section>
     <category>hope-for-the-future</category>
     <category>meaningful-labour</category>
-    <body format="textile"><![CDATA[h3. What do you want to do next?
+    <body format="textile"><![CDATA[This is your first post, which you can edit or delete and then start writing your own content.
 
-* Write a "new article":adminurl/index.php?event=article? Let your creativity flow!
-* Change this site's name, slogan or select a different article URL style? Check and modify your "preferences":adminurl/index.php?event=prefs.
-* Edit or delete this article? Your "articles list":adminurl/index.php?event=list is the place to start.
-* Upload "images":adminurl/index.php?event=image or "files":adminurl/index.php?event=file to accompany your articles?
-* Learn Textile, the markup generator included with Textpattern? You can try it in the "Textile sandbox":https://textpattern.com/textile-sandbox.
-** If you want to learn more, you can refer to an extensive "Textile manual":https://textpattern.com/textile-reference-manual.
-* Be guided through your "Textpattern first steps":https://textpattern.com/textpattern-first-steps by completing some tasks?
-* Study the "Textpattern Semantic Model":https://textpattern.com/textpattern-semantic-model?
-* Add one or more additional "users":adminurl/index.php?event=admin, or extend Textpattern's capabilities with "plugins":adminurl/index.php?event=plugin from the "Textpattern plugin directory":https://textpattern.com/plugins?
-* Dive in and learn by doing? Please note:
-** When you write an article you assign it to a "section":adminurl/index.php?event=section of your site.
-** Sections use a "page":adminurl/index.php?event=page template and a "style":adminurl/index.php?event=css to define how site content appears in a browser.
-** Page templates typically use HTML(HyperText Markup Language) and "Textpattern tags":https://docs.textpattern.com/tags/ (like this: @<txp:article />@) to build the output code.
-** Some Textpattern tags use "forms":adminurl/index.php?event=form, reusable building blocks that provide extensive control and customization over your site construction.
-** Pages, styles and forms can be packaged into "themes":adminurl/index.php?event=skin and assigned to one or more sections.
+If you're new here and would like a quick tour then please see "Textpattern in Two Minutes":https://textpattern.com/about/425/textpattern-in-two-minutes or "head over to the docs":https://docs.textpattern.com/ for more detailed information.
 
-Textpattern tags, their attributes and values are explained within the "Textpattern User Documentation":https://docs.textpattern.com/, where you will also find valuable examples, advice and tutorials.
+Have fun!]]></body>
+    <excerpt format="textile"><![CDATA[This is a an excerpt for the welcome article.
 
-There's also a group of friendly, helpful Textpattern users and administrators at the "Textpattern support forum":https://forum.textpattern.com/.
-
-Additional language translations and corrections are welcomed. Please visit "Textpattern language translations":https://textpattern.com/languages for further details.
-
-This is an <txp:permlink id="1">example article</txp:permlink> included with Textpattern to demonstrate some of the first steps you can undertake. An example comment is associated with this article. The article and comment can be safely deleted using the "articles":adminurl/index.php?event=list and "comments":adminurl/index.php?event=discuss lists.]]></body>
-    <excerpt format="textile"><![CDATA[This is a Textpattern article excerpt. Article excerpts are optional and can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication.]]></excerpt>
+Article excerpts are optional and can be used to summarize an article's content for display on article list pages or as opening teaser paragraphs.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald-swain@example.com</email>

From 61ba146a7d17a856282f4b0be28c028be45e067f Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:26:19 +0000
Subject: [PATCH 10/29] Update articles.welcome.xml

Cleaner URL for two minutes article, and tighten up works a little.

See https://github.com/textpattern/textpattern/issues/1574
---
 .../setup/default-content/en/articles/articles.welcome.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index 9333af5e6d..c4f83271ee 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -8,7 +8,7 @@
     <category>meaningful-labour</category>
     <body format="textile"><![CDATA[This is your first post, which you can edit or delete and then start writing your own content.
 
-If you're new here and would like a quick tour then please see "Textpattern in Two Minutes":https://textpattern.com/about/425/textpattern-in-two-minutes or "head over to the docs":https://docs.textpattern.com/ for more detailed information.
+If you would like a quick tour then please see "Textpattern in Two Minutes":https://textpattern.com/two-minutes or "head over to the docs":https://docs.textpattern.com/ for more detailed information.
 
 Have fun!]]></body>
     <excerpt format="textile"><![CDATA[This is a an excerpt for the welcome article.

From 79230e8d87c0da4c135890bfa71ab15a7b59fa18 Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:28:56 +0000
Subject: [PATCH 11/29] Update articles.welcome.xml

See https://github.com/textpattern/textpattern/issues/1574
---
 .../setup/default-content/en/articles/articles.welcome.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index c4f83271ee..87b5ddacc4 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -6,7 +6,7 @@
     <section>articles</section>
     <category>hope-for-the-future</category>
     <category>meaningful-labour</category>
-    <body format="textile"><![CDATA[This is your first post, which you can edit or delete and then start writing your own content.
+    <body format="textile"><![CDATA[This is a default welcome article. You can delete or edit it and then start creating your own content.
 
 If you would like a quick tour then please see "Textpattern in Two Minutes":https://textpattern.com/two-minutes or "head over to the docs":https://docs.textpattern.com/ for more detailed information.
 

From 0a7b4d97695d3de8c789487b70725ac4c30d0ddc Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:30:42 +0000
Subject: [PATCH 12/29] Update articles.welcome.xml

See https://github.com/textpattern/textpattern/issues/1574
---
 .../setup/default-content/en/articles/articles.welcome.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index 87b5ddacc4..bdfe4b1389 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -8,7 +8,7 @@
     <category>meaningful-labour</category>
     <body format="textile"><![CDATA[This is a default welcome article. You can delete or edit it and then start creating your own content.
 
-If you would like a quick tour then please see "Textpattern in Two Minutes":https://textpattern.com/two-minutes or "head over to the docs":https://docs.textpattern.com/ for more detailed information.
+"Textpattern in Two Minutes":https://textpattern.com/two-minutes provides an overview of Textpattern. "Textpattern docs":https://docs.textpattern.com/ provides more detailed information.
 
 Have fun!]]></body>
     <excerpt format="textile"><![CDATA[This is a an excerpt for the welcome article.

From 19bde9714fe795eece15732437d166074e1320dc Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:32:04 +0000
Subject: [PATCH 13/29] Update articles.welcome.xml

See https://github.com/textpattern/textpattern/issues/1574
---
 .../setup/default-content/en/articles/articles.welcome.xml    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index bdfe4b1389..b7656c481e 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -11,9 +11,9 @@
 "Textpattern in Two Minutes":https://textpattern.com/two-minutes provides an overview of Textpattern. "Textpattern docs":https://docs.textpattern.com/ provides more detailed information.
 
 Have fun!]]></body>
-    <excerpt format="textile"><![CDATA[This is a an excerpt for the welcome article.
+    <excerpt format="textile"><![CDATA[This is an excerpt for the welcome article.
 
-Article excerpts are optional and can be used to summarize an article's content for display on article list pages or as opening teaser paragraphs.]]></excerpt>
+Article excerpts are optional and can be used to summarize an article's content.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald-swain@example.com</email>

From ceb749edd1efb07ea0cd9fe5454df3032788d2c7 Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:32:33 +0000
Subject: [PATCH 14/29] Nearly there

See https://github.com/textpattern/textpattern/issues/1574
---
 .../setup/default-content/en/articles/articles.welcome.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index b7656c481e..dbbb6ede0e 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -6,7 +6,7 @@
     <section>articles</section>
     <category>hope-for-the-future</category>
     <category>meaningful-labour</category>
-    <body format="textile"><![CDATA[This is a default welcome article. You can delete or edit it and then start creating your own content.
+    <body format="textile"><![CDATA[This is the Textpattern welcome article. You can delete or edit it and then start creating your own content.
 
 "Textpattern in Two Minutes":https://textpattern.com/two-minutes provides an overview of Textpattern. "Textpattern docs":https://docs.textpattern.com/ provides more detailed information.
 

From a1aa5ee68a4c308e95b7f3f305e6d37855c7d6c3 Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:33:40 +0000
Subject: [PATCH 15/29] Update articles.welcome.xml

See https://github.com/textpattern/textpattern/issues/1574
---
 .../setup/default-content/en/articles/articles.welcome.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index dbbb6ede0e..3ff87e6bce 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -13,7 +13,7 @@
 Have fun!]]></body>
     <excerpt format="textile"><![CDATA[This is an excerpt for the welcome article.
 
-Article excerpts are optional and can be used to summarize an article's content.]]></excerpt>
+Article excerpts can be used to summarize an article's content.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald-swain@example.com</email>

From 4e47507fb56c34c8eccc381b024760ca761506dc Mon Sep 17 00:00:00 2001
From: philwareham <phil@designhive.com>
Date: Fri, 6 Nov 2020 11:34:29 +0000
Subject: [PATCH 16/29] Update articles.welcome.xml

---
 .../setup/default-content/en/articles/articles.welcome.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index 3ff87e6bce..6774edb787 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -8,7 +8,7 @@
     <category>meaningful-labour</category>
     <body format="textile"><![CDATA[This is the Textpattern welcome article. You can delete or edit it and then start creating your own content.
 
-"Textpattern in Two Minutes":https://textpattern.com/two-minutes provides an overview of Textpattern. "Textpattern docs":https://docs.textpattern.com/ provides more detailed information.
+"Textpattern in two minutes":https://textpattern.com/two-minutes provides an overview of Textpattern. "Textpattern user documentation":https://docs.textpattern.com/ provides more detailed information.
 
 Have fun!]]></body>
     <excerpt format="textile"><![CDATA[This is an excerpt for the welcome article.

From 7fa174ed00d72d5ec67533c2e0445a44d89dff15 Mon Sep 17 00:00:00 2001
From: philwareham <phil@designhive.com>
Date: Fri, 6 Nov 2020 11:36:14 +0000
Subject: [PATCH 17/29] No need for new para

---
 .../setup/default-content/en/articles/articles.welcome.xml    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index 6774edb787..16ce35bd81 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -11,9 +11,7 @@
 "Textpattern in two minutes":https://textpattern.com/two-minutes provides an overview of Textpattern. "Textpattern user documentation":https://docs.textpattern.com/ provides more detailed information.
 
 Have fun!]]></body>
-    <excerpt format="textile"><![CDATA[This is an excerpt for the welcome article.
-
-Article excerpts can be used to summarize an article's content.]]></excerpt>
+    <excerpt format="textile"><![CDATA[This is an excerpt for the welcome article. Article excerpts can be used to summarize an article's content.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald-swain@example.com</email>

From 723aaa634d63f58cd6d8ccc10aa6226c31404ee0 Mon Sep 17 00:00:00 2001
From: philwareham <phil@designhive.com>
Date: Fri, 6 Nov 2020 11:37:30 +0000
Subject: [PATCH 18/29] Bold sign-off?

Kind of shows Textile usage a bit
---
 .../setup/default-content/en/articles/articles.welcome.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index 16ce35bd81..c5c87c8146 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -10,7 +10,7 @@
 
 "Textpattern in two minutes":https://textpattern.com/two-minutes provides an overview of Textpattern. "Textpattern user documentation":https://docs.textpattern.com/ provides more detailed information.
 
-Have fun!]]></body>
+*Have fun!*]]></body>
     <excerpt format="textile"><![CDATA[This is an excerpt for the welcome article. Article excerpts can be used to summarize an article's content.]]></excerpt>
     <comment>
         <name>Donald Swain</name>

From 9d0c32eb4d9b8ce80c15783cb251a0b3837d9cf5 Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:38:36 +0000
Subject: [PATCH 19/29] Update articles.welcome.xml

---
 .../setup/default-content/en/articles/articles.welcome.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index c5c87c8146..ea0a078d8d 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -14,7 +14,7 @@
     <excerpt format="textile"><![CDATA[This is an excerpt for the welcome article. Article excerpts can be used to summarize an article's content.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
-        <email>donald-swain@example.com</email>
+        <email>donald.swain@example.com</email>
         <web>https://docs.textpattern.com/brand/donald-swain</web>
         <message><![CDATA[<p>I enjoy your site very much.</p>]]></message>
     </comment>

From 3a9b1965f3211e67286358e608817c4f339a24de Mon Sep 17 00:00:00 2001
From: philwareham <phil@designhive.com>
Date: Fri, 6 Nov 2020 11:52:45 +0000
Subject: [PATCH 20/29] Too jolly! Get rid :)

---
 .../setup/default-content/en/articles/articles.welcome.xml    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index ea0a078d8d..f56891e267 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -8,9 +8,7 @@
     <category>meaningful-labour</category>
     <body format="textile"><![CDATA[This is the Textpattern welcome article. You can delete or edit it and then start creating your own content.
 
-"Textpattern in two minutes":https://textpattern.com/two-minutes provides an overview of Textpattern. "Textpattern user documentation":https://docs.textpattern.com/ provides more detailed information.
-
-*Have fun!*]]></body>
+"Textpattern in two minutes":https://textpattern.com/two-minutes provides an overview of Textpattern. "Textpattern user documentation":https://docs.textpattern.com/ provides more detailed information.]]></body>
     <excerpt format="textile"><![CDATA[This is an excerpt for the welcome article. Article excerpts can be used to summarize an article's content.]]></excerpt>
     <comment>
         <name>Donald Swain</name>

From f1a4a206255a79d2e65b5a36bd1d64876759f26f Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Fri, 6 Nov 2020 11:54:57 +0000
Subject: [PATCH 21/29] Update articles.welcome.xml

The body doesn't have supplementary explanations, so the excerpt can go swivel.
---
 .../setup/default-content/en/articles/articles.welcome.xml      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/textpattern/setup/default-content/en/articles/articles.welcome.xml b/textpattern/setup/default-content/en/articles/articles.welcome.xml
index f56891e267..d8a4f9c3cf 100644
--- a/textpattern/setup/default-content/en/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en/articles/articles.welcome.xml
@@ -9,7 +9,7 @@
     <body format="textile"><![CDATA[This is the Textpattern welcome article. You can delete or edit it and then start creating your own content.
 
 "Textpattern in two minutes":https://textpattern.com/two-minutes provides an overview of Textpattern. "Textpattern user documentation":https://docs.textpattern.com/ provides more detailed information.]]></body>
-    <excerpt format="textile"><![CDATA[This is an excerpt for the welcome article. Article excerpts can be used to summarize an article's content.]]></excerpt>
+    <excerpt format="textile"><![CDATA[This is an excerpt for the welcome article.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
         <email>donald.swain@example.com</email>

From b5c79250be9198abbc74cc2079fb3587bfcdc68c Mon Sep 17 00:00:00 2001
From: philwareham <phil@designhive.com>
Date: Fri, 6 Nov 2020 16:30:23 +0000
Subject: [PATCH 22/29] Updated default content

---
 .../en-gb/articles/articles.welcome.xml       | 32 +++----------------
 .../en-us/articles/articles.welcome.xml       |  2 +-
 .../default-content/en-us/data/txp_link.xml   |  2 +-
 .../default-content/en/data/txp_link.xml      |  2 +-
 .../fr/articles/articles.welcome.xml          | 32 +++----------------
 .../default-content/fr/data/txp_link.xml      |  2 +-
 6 files changed, 14 insertions(+), 58 deletions(-)

diff --git a/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml b/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml
index 0b65f23d6c..d8a4f9c3cf 100644
--- a/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en-gb/articles/articles.welcome.xml
@@ -2,39 +2,17 @@
 <resources>
 <articles>
 <article>
-    <title>Welcome to your site</title>
+    <title>Welcome to Textpattern</title>
     <section>articles</section>
     <category>hope-for-the-future</category>
     <category>meaningful-labour</category>
-    <body format="textile"><![CDATA[h3. What do you want to do next?
+    <body format="textile"><![CDATA[This is the Textpattern welcome article. You can delete or edit it and then start creating your own content.
 
-* Write a "new article":adminurl/index.php?event=article? Let your creativity flow!
-* Change this site's name, slogan or select a different article URL style? Check and modify your "preferences":adminurl/index.php?event=prefs.
-* Edit or delete this article? Your "articles list":adminurl/index.php?event=list is the place to start.
-* Upload "images":adminurl/index.php?event=image or "files":adminurl/index.php?event=file to accompany your articles?
-* Learn Textile, the markup generator included with Textpattern? You can try it in the "Textile sandbox":https://textpattern.com/textile-sandbox.
-** If you want to learn more, you can refer to an extensive "Textile manual":https://textpattern.com/textile-reference-manual.
-* Be guided through your "Textpattern first steps":https://textpattern.com/textpattern-first-steps by completing some tasks?
-* Study the "Textpattern Semantic Model":https://textpattern.com/textpattern-semantic-model?
-* Add one or more additional "users":adminurl/index.php?event=admin, or extend Textpattern's capabilities with "plugins":adminurl/index.php?event=plugin from the "Textpattern plugin directory":https://textpattern.com/plugins?
-* Dive in and learn by doing? Please note:
-** When you write an article you assign it to a "section":adminurl/index.php?event=section of your site.
-** Sections use a "page":adminurl/index.php?event=page template and a "style":adminurl/index.php?event=css to define how site content appears in a browser.
-** Page templates typically use HTML(HyperText Markup Language) and "Textpattern tags":https://docs.textpattern.com/tags/ (like this: @<txp:article />@) to build the output code.
-** Some Textpattern tags use "forms":adminurl/index.php?event=form, reusable building blocks that provide extensive control and customization over your site construction.
-** Pages, styles and forms can be packaged into "themes":adminurl/index.php?event=skin and assigned to one or more sections.
-
-Textpattern tags, their attributes and values are explained within the "Textpattern User Documentation":https://docs.textpattern.com/, where you will also find valuable examples, advice and tutorials.
-
-There's also a group of friendly, helpful Textpattern users and administrators at the "Textpattern support forum":https://forum.textpattern.com/.
-
-Additional language translations and corrections are welcomed. Please visit "Textpattern language translations":https://textpattern.com/languages for further details.
-
-This is an <txp:permlink id="1">example article</txp:permlink> included with Textpattern to demonstrate some of the first steps you can undertake. An example comment is associated with this article. The article and comment can be safely deleted using the "articles":adminurl/index.php?event=list and "comments":adminurl/index.php?event=discuss lists.]]></body>
-    <excerpt format="textile"><![CDATA[This is a Textpattern article excerpt. Article excerpts are optional and can be used effectively to summarize an article's content, for example with Textpattern's built-in article syndication.]]></excerpt>
+"Textpattern in two minutes":https://textpattern.com/two-minutes provides an overview of Textpattern. "Textpattern user documentation":https://docs.textpattern.com/ provides more detailed information.]]></body>
+    <excerpt format="textile"><![CDATA[This is an excerpt for the welcome article.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
-        <email>donald-swain@example.com</email>
+        <email>donald.swain@example.com</email>
         <web>https://docs.textpattern.com/brand/donald-swain</web>
         <message><![CDATA[<p>I enjoy your site very much.</p>]]></message>
     </comment>
diff --git a/textpattern/setup/default-content/en-us/articles/articles.welcome.xml b/textpattern/setup/default-content/en-us/articles/articles.welcome.xml
index d8a4f9c3cf..db0dd4c1fc 100644
--- a/textpattern/setup/default-content/en-us/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/en-us/articles/articles.welcome.xml
@@ -5,7 +5,7 @@
     <title>Welcome to Textpattern</title>
     <section>articles</section>
     <category>hope-for-the-future</category>
-    <category>meaningful-labour</category>
+    <category>meaningful-labor</category>
     <body format="textile"><![CDATA[This is the Textpattern welcome article. You can delete or edit it and then start creating your own content.
 
 "Textpattern in two minutes":https://textpattern.com/two-minutes provides an overview of Textpattern. "Textpattern user documentation":https://docs.textpattern.com/ provides more detailed information.]]></body>
diff --git a/textpattern/setup/default-content/en-us/data/txp_link.xml b/textpattern/setup/default-content/en-us/data/txp_link.xml
index ca6e58c077..9f8a81c4cc 100644
--- a/textpattern/setup/default-content/en-us/data/txp_link.xml
+++ b/textpattern/setup/default-content/en-us/data/txp_link.xml
@@ -13,7 +13,7 @@
         <item>
             <date>NOW()</date>
             <category>textpattern</category>
-            <url>https://docs.textpattern.io/</url>
+            <url>https://docs.textpattern.com/</url>
             <linkname>Textpattern user documentation</linkname>
             <linksort>20</linksort>
             <description/>
diff --git a/textpattern/setup/default-content/en/data/txp_link.xml b/textpattern/setup/default-content/en/data/txp_link.xml
index ca6e58c077..9f8a81c4cc 100644
--- a/textpattern/setup/default-content/en/data/txp_link.xml
+++ b/textpattern/setup/default-content/en/data/txp_link.xml
@@ -13,7 +13,7 @@
         <item>
             <date>NOW()</date>
             <category>textpattern</category>
-            <url>https://docs.textpattern.io/</url>
+            <url>https://docs.textpattern.com/</url>
             <linkname>Textpattern user documentation</linkname>
             <linksort>20</linksort>
             <description/>
diff --git a/textpattern/setup/default-content/fr/articles/articles.welcome.xml b/textpattern/setup/default-content/fr/articles/articles.welcome.xml
index a9f47d6ee7..5cafc7b9b5 100644
--- a/textpattern/setup/default-content/fr/articles/articles.welcome.xml
+++ b/textpattern/setup/default-content/fr/articles/articles.welcome.xml
@@ -2,39 +2,17 @@
 <resources>
 <articles>
 <article>
-    <title>Bienvenue sur votre site</title>
+    <title>Bienvenue sur Textpattern</title>
     <section>articles</section>
     <category>espoir-pour-le-futur</category>
     <category>travail-significatif</category>
-    <body format="textile"><![CDATA[h3. Que souhaitez-vous faire, maintenant ?
+    <body format="textile"><![CDATA[Ceci est l’article de bienvenue de Textpattern. Vous pouvez le supprimer, le modifier voire commencer à créer vos propres contenus.
 
-* Rédiger un "nouvel article":adminurl/index.php?event=article ? Laissez votre créativité s’exprimer !
-* Modifier le nom de ce site, son slogan ou choisir un autre type d’URL ? Vérifiez et modifiez vous "préférences de site":adminurl/index.php?event=prefs.
-* Éditer ou supprimer cet article ? La "liste de vos articles":adminurl/index.php?event=list c’est là où cela se passe.
-* Ajouter des "images":adminurl/index.php?event=image ou des "fichiers":adminurl/index.php?event=file pour accompagner vos articles ?
-* Apprendre Textile, la convention d’écriture HTML simplifiée incluse avec Textpattern ? Amusez-vous dans le "bac à sable Textile":https://textpattern.com/textile-sandbox.
-** Si vous voulez vous perfectionner, consultez le manuel exhaustif "Textile manual":https://textpattern.com/textile-reference-manual.
-* Trouver de l’aide pour appréhender les "premières étapes avec Textpattern":https://textpattern.com/textpattern-first-steps en complétant quelques réglages ?
-* Étudier le "modèle interne de Textpattern":https://textpattern.com/textpattern-semantic-model ?
-* Ajouter un•e ou plusieurs "utilisat•rice•eur•s":adminurl/index.php?event=admin, ou étendre les possibilités de Textpattern avec des "plugins":adminurl/index.php?event=plugin depuis l’offre du "catalogue":https://textpattern.com/plugins ?
-* Approfondir et apprendre par la pratique ? Veuillez noter :
-** Lorsque vous rédigez un article, vous l’associez à "une «section»":adminurl/index.php?event=section (Page) de votre site ;
-** Les sections utilisent des "gabarits":adminurl/index.php?event=page de pages, ainsi que des "styles":adminurl/index.php?event=css en charge de l’apparence du site dans les navigateurs ;
-** Les modèles de pages comportent habituellement du HTML(HyperText Markup Language) ainsi que des "balises spécifiques Textpattern":https://docs.textpattern.com/tags/ (comme celle-ci : @<txp:article />@) pour générer le code ;
-** Certaines balises Textpattern utilisent des "modules":adminurl/index.php?event=form, réutilisables sous forme de blocs autorisant un contrôle étendu et la personnalisation nécessaire pour la construction de votre site ;
-** Les gabarits, les styles ainsi que les modules peuvent être incorporés dans des "thèmes":adminurl/index.php?event=skin et associés à une, voire plusieurs sections.
-
-Le balisage spécifique Textpattern, leurs attributs ainsi que leurs valeurs d’attribut sont expliqués dans le document "Textpattern User Documentation":https://docs.textpattern.com/ où vous découvrirez, également, des exemples efficaces, des conseils ainsi que des tutoriels.
-
-Il existe aussi une communauté d’entraide particulièrement amicale d’utilisateurs et d’administrateurs sur le "Textpattern support forum":https://forum.textpattern.com/.
-
-Les traductions de langues supplémentaires et leur correction sont toutes les bienvenues. Veuillez consulter la page "Textpattern language translations":https://textpattern.com/languages pour de plus amples détails.
-
-Ce texte est un <txp:permlink id="1">article d’exemple</txp:permlink> inclus avec Textpattern pour illustrer certaines des premières étapes que vous pouvez entreprendre. Un exemple de commentaire est associé à cet article. L’article et le commentaire peuvent être supprimés en toute sécurité depuis la page des "articles":adminurl/index.php?event=list et la liste des "commentaires":adminurl/index.php?event=discuss.]]></body>
-    <excerpt format="textile"><![CDATA[Ceci est un extrait d’article dans Textpattern. Les extraits d’article sont facultatifs et peuvent être utilisés efficacement pour résumer le contenu d’un article comme, par exemple, avec la syndication d’articles intégrée de Textpattern.]]></excerpt>
+"Textpattern in two minutes":https://textpattern.com/two-minutes présente un aperçu de Textpattern. "Textpattern user documentation":https://docs.textpattern.com/ propose des informations plus détaillées.]]></body>
+    <excerpt format="textile"><![CDATA[Ceci est un résumé de l’article de bienvenue.]]></excerpt>
     <comment>
         <name>Donald Swain</name>
-        <email>donald-swain@example.com</email>
+        <email>donald.swain@example.com</email>
         <web>https://docs.textpattern.com/brand/donald-swain</web>
         <message><![CDATA[<p>J’aime beaucoup votre site.</p>]]></message>
     </comment>
diff --git a/textpattern/setup/default-content/fr/data/txp_link.xml b/textpattern/setup/default-content/fr/data/txp_link.xml
index 42087169a5..621999be19 100644
--- a/textpattern/setup/default-content/fr/data/txp_link.xml
+++ b/textpattern/setup/default-content/fr/data/txp_link.xml
@@ -13,7 +13,7 @@
         <item>
             <date>NOW()</date>
             <category>textpattern</category>
-            <url>https://docs.textpattern.io/</url>
+            <url>https://docs.textpattern.com/</url>
             <linkname>Documentation utilisateur de Textpattern</linkname>
             <linksort>20</linksort>
             <description/>

From 50895ad4f93045b3e12363ec890e948c4410d773 Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Sat, 18 Sep 2021 08:50:44 +0100
Subject: [PATCH 23/29] Update README.md

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index fa91113192..235ac7ecb8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # Textpattern CMS
 
 [![Crowdin](https://badges.crowdin.net/textpattern-cms-textpacks/localized.svg)](https://crowdin.com/project/textpattern-cms-textpacks)
+[![Known Vulnerabilities](https://snyk.io/test/github/textpattern/textpattern/badge.svg)](https://snyk.io/test/github/textpattern/textpattern/)
 [![GitHub Sponsors](https://img.shields.io/github/sponsors/textpattern)](https://github.com/sponsors/textpattern)
 
 <img src="https://textpattern.com/assets/img/branding/carver/carver.svg" alt="Textpattern Logo" width="128" height="128">

From bc9169c52e62db193f7d188a990214a45a60bd25 Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Sun, 5 Dec 2021 23:45:35 +0000
Subject: [PATCH 24/29] Update README.md

readme parity
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 235ac7ecb8..9128d64af5 100644
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ We are targeting Textpattern 4.9 as the next minor release. Refer to the followi
 
 |        |  Minimum  | Recommended |
 |--------|:-------:|:-----:|
-| PHP    | 5.6 | [vendor supported](https://php.net/supported-versions.php)<br />(7.4 or 8.0) |
+| PHP    | 5.6 | [vendor supported](https://php.net/supported-versions.php)<br />(7.4, 8.0 or 8.1) |
 | MySQL  | 5.5 | [vendor supported](https://www.mysql.com/support/supportedplatforms/database.html)<br />(5.7 or 8.0) |
 | Apache | &mdash; | vendor supported<br />(2.4) |
 | Nginx  | &mdash; | mainline (1.21) or stable (1.20) |

From 41b8eabed90f025ac94390d31f0ab88e7dbf89d5 Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Sat, 11 Dec 2021 17:27:36 +0000
Subject: [PATCH 25/29] Update UPGRADE.txt

parity with `v4.8.8`
---
 UPGRADE.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/UPGRADE.txt b/UPGRADE.txt
index a53438673e..d1e5af003a 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -1,4 +1,4 @@
-Textpattern CMS 4.8.8
+Textpattern CMS 4.8.8 (upcoming)
 
 == Upgrade ==
 
@@ -68,7 +68,8 @@ Table of Contents
   confirm the Textpattern version and note any warnings or errors.
   Note: refer to the resources at the end of this file for further details.
 * Verify all preference settings (Admin -> Preferences).
-
+* Optionally set website Production status (Admin -> Preferences) to
+  "Testing" and check for any warning or error messages on the front-side.
 
 == Resources ==
 

From 9e592c32734ce725d530c8c2e07842c933991e01 Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Mon, 12 Aug 2024 12:34:34 +0100
Subject: [PATCH 26/29] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 87a25827b0..396327ef78 100644
--- a/README.md
+++ b/README.md
@@ -69,9 +69,9 @@ We are targeting Textpattern 4.9 as the next minor release. Refer to the followi
 |        |  Minimum  | Recommended |
 |--------|:-------:|:-----:|
 | PHP    | 5.6 | [vendor supported](https://php.net/supported-versions.php)<br />(8.1, 8.2 or 8.3) |
-| MySQL  | 5.5 | [vendor supported LTS](https://www.mysql.com/support/supportedplatforms/database.html)<br />(8.0) |
+| MySQL  | 5.5 | [vendor supported LTS](https://www.mysql.com/support/supportedplatforms/database.html)<br />(8.0 or 8.4) |
 | Apache | &mdash; | vendor supported<br />(2.4) |
-| Nginx  | &mdash; | mainline (1.25) or stable (1.24) |
+| Nginx  | &mdash; | mainline (1.27) or stable (1.26) |
 
 ## Contributing
 

From 2656424c654eb00e11ab3f2b714d7f7247d5a4b3 Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Mon, 5 Jan 2026 16:19:34 +0000
Subject: [PATCH 27/29] Update README for Textpattern version 4.9.0

---
 README.md | 73 ++++++++++++-------------------------------------------
 1 file changed, 16 insertions(+), 57 deletions(-)

diff --git a/README.md b/README.md
index 396327ef78..9b381ff208 100644
--- a/README.md
+++ b/README.md
@@ -28,14 +28,15 @@ Ensure the server meets or exceeds the [system requirements](https://textpattern
 
 ## Download Textpattern
 
-The current production release is version 4.8.8. It can be downloaded from the Textpattern website or GitHub in .zip and .tar.gz varieties.
+The current production release is version 4.9.0. It can be downloaded from the Textpattern website or GitHub in .zip, .tar.gz, and .tar.xz varieties.
 
-If you want to use the multi-site functionality in Textpattern, get the .tar.gz archive.
+If you want to use the multi-site functionality in Textpattern, get the .tar.gz or .tar.xz archive.
 
 |        |  textpattern.com  | GitHub |
 |--------|:-------:|:-----:|
-| .zip   | [Download](https://textpattern.com/file_download/118/textpattern-4.8.8.zip) | [Download](https://github.com/textpattern/textpattern/releases/download/4.8.8/textpattern-4.8.8.zip) |
-| .tar.gz | [Download](https://textpattern.com/file_download/117/textpattern-4.8.8.tar.gz) | [Download](https://github.com/textpattern/textpattern/releases/download/4.8.8/textpattern-4.8.8.tar.gz) |
+| .zip   | [Download](https://textpattern.com/file_download/124/textpattern-4.9.0.zip) | [Download](https://github.com/textpattern/textpattern/releases/download/4.9.0/textpattern-4.9.0.zip) |
+| .tar.gz | [Download](https://textpattern.com/file_download/125/textpattern-4.9.0.tar.gz) | [Download](https://github.com/textpattern/textpattern/releases/download/4.9.0/textpattern-4.9.0.tar.gz) |
+| .tar.xz | [Download](https://textpattern.com/file_download/126/textpattern-4.9.0.tar.xz) | [Download](https://github.com/textpattern/textpattern/releases/download/4.9.0/textpattern-4.9.0.tar.xz) |
 
 
 ## Install Textpattern
@@ -44,11 +45,11 @@ Please see [README.txt](https://github.com/textpattern/textpattern/blob/main/REA
 
 ## Upgrade Textpattern
 
-Please see [README.txt](https://github.com/textpattern/textpattern/blob/main/README.txt) for details on upgrading Textpattern.
+Please see [UPGRADE.txt](https://github.com/textpattern/textpattern/blob/main/UPGRADE.txt) for details on upgrading Textpattern.
 
 ## Help and Support
 
-The [Textpattern support forum](https://forum.textpattern.com) is home to a friendly and helpful community of Textpattern users and experts. Textpattern also has a social network presence on [Mastodon](https://textpattern.com/mastodon) and [Twitter](https://textpattern.com/twitter).
+The [Textpattern support forum](https://forum.textpattern.com) is home to a friendly and helpful community of Textpattern users and experts. Textpattern also has a social network presence on [Mastodon](https://textpattern.com/mastodon) and [X](https://textpattern.com/x).
 
 ## Development
 
@@ -62,20 +63,22 @@ The following table outlines anticipated forthcoming changes to system requireme
 
 #### Textpattern development versions
 
-Note that targeted versions listed may change multiple times during the development process.
+We are targeting Textpattern 5 as the next major release. Refer to the following table for anticipated changes to system requirements for Textpattern 5.
 
-We are targeting Textpattern 4.9 as the next minor release. Refer to the following table for anticipated changes to system requirements.
+We generally recommend running Textpattern on platforms with active vendor support where possible, though we also maintain a minimum system requirements list for situations where that isn't viable.
+
+Note that versions listed may change multiple times during the development process.
 
 |        |  Minimum  | Recommended |
 |--------|:-------:|:-----:|
-| PHP    | 5.6 | [vendor supported](https://php.net/supported-versions.php)<br />(8.1, 8.2 or 8.3) |
-| MySQL  | 5.5 | [vendor supported LTS](https://www.mysql.com/support/supportedplatforms/database.html)<br />(8.0 or 8.4) |
-| Apache | &mdash; | vendor supported<br />(2.4) |
-| Nginx  | &mdash; | mainline (1.27) or stable (1.26) |
+| PHP    | &mdash; | [vendor supported](https://php.net/supported-versions.php) |
+| MySQL  | &mdash; | [vendor supported LTS](https://www.mysql.com/support/supportedplatforms/database.html) |
+| Apache | &mdash; | vendor supported |
+| Nginx  | &mdash; | mainline or stable |
 
 ## Contributing
 
-Do you want to help with the development of Textpattern? Please refer to the [contributing documentation](https://github.com/textpattern/textpattern/blob/dev/CONTRIBUTING.md) for full details.
+Please refer to the [contributing documentation](https://github.com/textpattern/textpattern/blob/dev/CONTRIBUTING.md) for more details of Textpattern development. 
 
 ## GitHub topic tags
 
@@ -87,50 +90,6 @@ If you use GitHub for Textpattern-related development please consider adding som
 * [`textpattern-website`](https://github.com/topics/textpattern-website) (for websites built with Textpattern)
 * [`textpattern-development`](https://github.com/topics/textpattern-development) (for development resources)
 
-## Additional development tools
-
-Various components used within Textpattern (such as the bundled themes and language translations) are maintained in standalone repositories. Textpattern has a simple development toolset built on [Node.js](https://nodejs.org/) to pull the distribution files of those repositories into the core as required.
-
-You can install Node.js using the [installer](https://nodejs.org/en/download/) or [package manager](https://nodejs.org/en/download/package-manager/).
-
-Install required dev tools:
-
-```ShellSession
-npm install
-```
-
-You can then pull the following components from the CLI, like so:
-
-```ShellSession
-npm run get-default-theme
-npm run get-classic-admin-theme
-npm run get-hive-admin-theme
-npm run get-pophelp
-npm run get-textpacks
-npm run get-dependencies
-```
-
-To request a specific tag or branch:
-
-```ShellSession
-npm run get-default-theme 4.8.8
-npm run get-classic-admin-theme 4.8.8
-npm run get-classic-admin-theme 4.8.x
-npm run get-hive-admin-theme 4.8.x
-npm run get-textpacks 4.8.x
-```
-
-Release tools:
-
-Usage: `npm run txp-gitdist <version> [dest-dir]` (`dest-dir` defaults to a
-temporary location).
-
-```ShellSession
-npm run txp-index
-npm run txp-checksums
-npm run txp-gitdist 1.2.3 ../my-dest-dir
-```
-
 ## Thank You
 
 Thank you to our [GitHub sponsors](https://github.com/sponsors/textpattern). Your continued support is greatly appreciated!

From de16b07be9e25a9186e40a5ad5a4c33e6985a41d Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Mon, 5 Jan 2026 16:23:30 +0000
Subject: [PATCH 28/29] Add section for additional development tools

Added a section for additional development tools with a link to the documentation.
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 9b381ff208..6e123d4094 100644
--- a/README.md
+++ b/README.md
@@ -80,6 +80,10 @@ Note that versions listed may change multiple times during the development proce
 
 Please refer to the [contributing documentation](https://github.com/textpattern/textpattern/blob/dev/CONTRIBUTING.md) for more details of Textpattern development. 
 
+## Additional development tools
+
+Please refer to the [additional devevelopment tools](https://github.com/textpattern/textpattern/blob/dev/DEVTOOLS.md) document.
+
 ## GitHub topic tags
 
 If you use GitHub for Textpattern-related development please consider adding some of the following [topic](https://help.github.com/articles/about-topics/) keywords to your public project repositories, so we can expand the network of discoverable resources:

From 6bd6ee05cea53a108212fd3ca0ac384fb6249bfa Mon Sep 17 00:00:00 2001
From: Pete Cooper <petecooper@users.noreply.github.com>
Date: Mon, 5 Jan 2026 16:31:11 +0000
Subject: [PATCH 29/29] Add DEVTOOLS.md for development toolset guidance

Document additional development tools and installation instructions for Textpattern.
---
 DEVTOOLS.md | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 DEVTOOLS.md

diff --git a/DEVTOOLS.md b/DEVTOOLS.md
new file mode 100644
index 0000000000..dfc3231b84
--- /dev/null
+++ b/DEVTOOLS.md
@@ -0,0 +1,42 @@
+# Additional development tools
+
+Various components used within Textpattern (such as the bundled themes and language translations) are maintained in other repositories. Textpattern has a simple development toolset built on [Node.js](https://nodejs.org/) to pull the distribution files of those repositories into the core as required.
+
+You can install Node.js using the [installer](https://nodejs.org/en/download/) or [package manager](https://nodejs.org/en/download/package-manager/).
+
+Install required dev tools:
+
+```ShellSession
+npm install
+```
+
+Pull the following components from the CLI:
+
+```ShellSession
+npm run get-default-theme
+npm run get-classic-admin-theme
+npm run get-hive-admin-theme
+npm run get-pophelp
+npm run get-textpacks
+npm run get-dependencies
+```
+
+To request a specific tag or branch:
+
+```ShellSession
+npm run get-default-theme 4.9.0
+npm run get-classic-admin-theme 4.9.0
+npm run get-classic-admin-theme 4.9.x
+npm run get-hive-admin-theme 4.9.x
+npm run get-textpacks 4.9.x
+```
+
+Release tools:
+
+Usage: `npm run txp-gitdist <version> [dest-dir]` (`dest-dir` defaults to a temporary location).
+
+```ShellSession
+npm run txp-index
+npm run txp-checksums ./textpattern
+npm run txp-gitdist 1.2.3 ../my-dest-dir
+```