Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --git a/config/rootfiles/core/94/filelists/setup b/config/rootfiles/core/94/filelists/setup
new file mode 120000 (symlink)
index 0000000..209374b
--- /dev/null
+++ b/config/rootfiles/core/94/filelists/setup
@@ -0,0 +1 @@
+../../../common/setup
\ No newline at end of file

diff --git a/src/setup/networking.c b/src/setup/networking.c
index 0791764ebddaab149397557ccaf090edbc65a0d9..b840ec127a119ea9ac885a71a6979af5f59111d4 100644 (file)
--- a/src/setup/networking.c
+++ b/src/setup/networking.c
@@ -213,7 +213,7 @@ int oktoleave(void)
                strcpy(temp, ""); findkey(kv, "DNS1", temp);
                if (!(strlen(temp)))
                {
-                       errorbox(_("Misssing DNS."));
+                       errorbox(_("Missing DNS."));
                        freekeyvalues(kv);
                        return 0;
                }