From 4434a300cfd656f50c9dca16467cb1c0238a0f5a Mon Sep 17 00:00:00 2001
From: Bastian <mephisto@mephis.to>
Date: Sun, 14 Jan 2018 19:14:37 +0100
Subject: [PATCH] Added Translations, added GW Keys

---
 Makefile          |  2 +-
 extra/groups.conf | 12 ++++++------
 i18n/de.po        |  6 ++++++
 i18n/en.po        |  6 ++++++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 9004580..6c7b0ff 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
 GLUON_GIT_URL := https://github.com/ffrgb/gluon
-GLUON_GIT_REF := v2016.2.6
+GLUON_GIT_REF := v2016.2.7
 
 #https://github.com/freifunk-gluon/gluon/commit/6b8888fe5aebd941c5e7a83a97ceb0678bee4c43
 
diff --git a/extra/groups.conf b/extra/groups.conf
index ff377d1..dafa40f 100644
--- a/extra/groups.conf
+++ b/extra/groups.conf
@@ -5,13 +5,13 @@
       ['%%V4'] = '10.90.32.0/19',
       ['%%V6'] = '10',
       ['%%N4'] = '10.90.32.1',
-      ['%%MT'] = '1426',
+      ['%%MT'] = '1280',
       ['%%BS'] = '02:0E:8E:1E:61:01',
       ['%%NN'] = '16:41:95:40:f7:01',
       ['%%IB'] = 'mesh.ffrgb_cty',
       ['%%PRI'] = '185.53.218.131',
       ['%%SEC'] = '',
-      ['%%PRIKEY'] = '',
+      ['%%PRIKEY'] = '86a4dcdbaba87fe30da03cc398a083d7a0725c44dac733b583515b188fdc63dd',
       ['%%SECKEY'] = '',
     },
   },
@@ -21,13 +21,13 @@
       ['%%V4'] = '10.90.64.0/19',
       ['%%V6'] = '20',
       ['%%N4'] = '10.90.64.1',
-      ['%%MT'] = '1426',
+      ['%%MT'] = '1280',
       ['%%BS'] = '02:0E:8E:1E:61:02',
       ['%%NN'] = '16:41:95:40:f7:02',
       ['%%IB'] = 'mesh.ffrgb_uml',
       ['%%PRI'] = '185.53.218.132',
       ['%%SEC'] = '',
-      ['%%PRIKEY'] = '',
+      ['%%PRIKEY'] = '0dd861f1725bb5562f96fec8a906440c1965d1b1f8a88663dea834e523d788ea',
       ['%%SECKEY'] = '',
     },
   },
@@ -37,13 +37,13 @@
       ['%%V4'] = '10.90.96.0/19',
       ['%%V6'] = '30',
       ['%%N4'] = '10.90.96.1',
-      ['%%MT'] = '1426',
+      ['%%MT'] = '1280',
       ['%%BS'] = '02:0E:8E:1E:61:03',
       ['%%NN'] = '16:41:95:40:f7:03',
       ['%%IB'] = 'mesh.ffrgb_test',
       ['%%PRI'] = '185.53.218.133',
       ['%%SEC'] = '',
-      ['%%PRIKEY'] = '',
+      ['%%PRIKEY'] = '377e0246271bfbf4c99c2d156ee0eb77c16bb5629841fde507cfab6760162b61',
       ['%%SECKEY'] = '',
     },
   },
diff --git a/i18n/de.po b/i18n/de.po
index c5bb317..66ea116 100644
--- a/i18n/de.po
+++ b/i18n/de.po
@@ -18,6 +18,12 @@ msgstr ""
 "ist optional, ist jedoch nicht öffentlich einsehbar. Daher wäre es gut, "
 "wenn wir eine Möglichkeit haben, euch zu kontaktieren. "
 
+msgid "gluon-config-mode:site-select"
+msgstr ""
+"Hier hast du die Möglichkeit, die Region, in der sich dein "
+"Knoten befindet, auszuwählen. Bitte denke daran, dass dein Router "
+"sich nur mit dem Netz der ausgewählten Region verbindet."
+
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 " "
diff --git a/i18n/en.po b/i18n/en.po
index 33bb5a4..0a63bb5 100644
--- a/i18n/en.po
+++ b/i18n/en.po
@@ -15,6 +15,12 @@ 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"
+
 msgid "gluon-config-mode:pubkey"
 msgstr ""
 " "