From 6e576122ed9b4bf8bdb1e2e1bd01ad6ae0ec10e5 Mon Sep 17 00:00:00 2001
From: Bastian <mephisto@mephis.to>
Date: Thu, 18 Jan 2018 00:14:47 +0100
Subject: [PATCH] Translation Bug finally fixed, segment mover included, legacy
 and test segment hidden

---
 domains/ffrgb.conf     |  1 +
 domains/ffrgb_tst.conf |  1 +
 i18n/de.po             |  6 +++---
 i18n/en.po             | 24 ++++++++++++------------
 modules                |  2 +-
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/domains/ffrgb.conf b/domains/ffrgb.conf
index b2ed2e1..bc963d7 100644
--- a/domains/ffrgb.conf
+++ b/domains/ffrgb.conf
@@ -2,6 +2,7 @@
   domain_name = 'Legacy',
   domain_code = 'ffrgb',
   domain_seed = 'c8951e3a104d55543da98ee732468ea121878e77c6d18cbcbefb5409c292601a',
+  hide_domain = true,
 
   opkg = {
     --[[ old
diff --git a/domains/ffrgb_tst.conf b/domains/ffrgb_tst.conf
index dd65e4e..a326dce 100644
--- a/domains/ffrgb_tst.conf
+++ b/domains/ffrgb_tst.conf
@@ -2,6 +2,7 @@
   domain_name = 'Regensburg Testumgebung',
   domain_code = 'ffrgb_tst',
   domain_seed = 'bcd0ceca2c68b5b9a5975156a0ec0a04aebe3300d9928a04dc57001cc96db252',
+  hide_domain = true,
 
   opkg = {
     --[[ old
diff --git a/i18n/de.po b/i18n/de.po
index 17f067d..f5f9641 100644
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -19,7 +19,7 @@ msgstr ""
 "wenn wir eine Möglichkeit haben, euch zu kontaktieren. "
 
 msgid "gluon-config-mode:domain"
-msgstr "Domäne"
+msgstr "Domain"
 
 msgid "gluon-config-mode:domain-select"
 msgstr ""
@@ -33,7 +33,7 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-"FastD enabled"
+"<!-- empty -->"
 
 msgid "gluon-config-mode:novpn"
 msgstr ""
@@ -64,6 +64,6 @@ msgstr ""
 "Mode neustarten.</p>"
 "<p>Wenn Du mehr über Freifunk in Regensburg erfahren möchtest, dann besuche "
 "uns doch einfach Montag in der <a href=\"http://www.binary-kitchen.de\">Binary Kitchen</a> "
-"wo meistens jemand von uns jemand zugegen ist, oder im </p> "
+"wo meistens jemand von uns jemand zugegen ist, oder im "
 "<a href=\"https://webirc.hackint.org/#irc://irc.hackint.org/#freifunkRGB\">IRC Netz</a> "
 "<p>Viel Spaß mit deinem Knoten und der Erkundung von Freifunk!</p> "
diff --git a/i18n/en.po b/i18n/en.po
index a2a074c..7e6a4e4 100644
--- a/i18n/en.po
+++ b/i18n/en.po
@@ -12,14 +12,10 @@ msgstr ""
 
 msgid "gluon-config-mode:welcome"
 msgstr ""
-"Welcome the the setup wizard of your new Freifunk Regensburg node. "
-"Please fill out the following form and transmit it."
-
-msgid "gluon-config-mode:site-select"
-msgstr ""
-"Here you have the possibility of selecting the region in which "
-"your node is placed. Please keep in mind that your router "
-"connects only with the mesh of the selected region"
+"Welcome the the setup wizard of your brandnew Freifunk Regensburg node. "
+"Please fill out the following form and transmit it. The Contact field is "
+"not mandatory, but we highly recommend to leave any Information how to "
+"contact you. The Contact Information won't be published."
 
 msgid "gluon-config-mode:domain"
 msgstr "Domain"
@@ -32,13 +28,13 @@ msgstr ""
 
 msgid "gluon-config-mode:pubkey"
 msgstr ""
-"FastD enabled"
+"<!-- empty -->"
 
 msgid "gluon-config-mode:novpn"
 msgstr ""
 "<p>You have selected <strong>not</strong> to use the mesh VPN. "
 "Your node will only be able to connect to the Freifunk network if other nodes in reach "
-"already have a connection.</p>"
+"already have a connection.</p> "
 
 msgid "gluon-config-mode:altitude-label"
 msgstr "Altitude"
@@ -46,7 +42,7 @@ msgstr "Altitude"
 msgid "gluon-config-mode:altitude-help"
 msgstr ""
 "Specifying the altitude is optional and should only be done if a proper "
-"value is known."
+"value is known. "
 
 msgid "gluon-config-mode:reboot"
 msgstr ""
@@ -56,5 +52,9 @@ msgstr ""
 "in a few minutes.</p> "
 "<p>To get back to this configuration interface, press the reset button for "
 "3 seconds during normal operation. The device will then reboot into config "
-"mode.</p>"
+"mode.</p> "
+"<p>If you want to get in contact with us you are invited to visit us "
+"at our local Hackspace in the <a href=\"http://www.binary-kitchen.de\">Binary Kitchen</a> "
+"where usually Freifunk People are around, or in the "
+"<a href=\"https://webirc.hackint.org/#irc://irc.hackint.org/#freifunkRGB\">IRC</a> "
 "<p>Have fun with your node and exploring the Freifunk network!</p>"
diff --git a/modules b/modules
index 12dab9d..ebde4d1 100644
--- a/modules
+++ b/modules
@@ -1,7 +1,7 @@
 GLUON_SITE_FEEDS='ffrgb ffhb ffho'
 PACKAGES_FFRGB_REPO=https://github.com/ffrgb/gluon-packages.git
 PACKAGES_FFRGB_BRANCH=master
-PACKAGES_FFRGB_COMMIT=ff77571f065d89ebd44ed2d6e96f745fb4eecac9
+PACKAGES_FFRGB_COMMIT=504e37d15984230cc52482ea5d3d5d435a10866c
 
 #respondd-module-airtime
 PACKAGES_FFHB_REPO=git://github.com/FreifunkBremen/ffhb-packages.git