aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-10-06 16:51:29 -0700
committerfriendica <info@friendica.com>2012-10-06 16:51:29 -0700
commit021e95be119d37db714a995c0ab65ded921daef6 (patch)
tree5c2892b890c53760aa1c38c78183846f633993f2
parent6cc8457fd89f18765db27ada521497e5634c4f31 (diff)
parent059a14fefc414215b676bf5f14f4627a7867b7cb (diff)
downloadvolse-hubzilla-021e95be119d37db714a995c0ab65ded921daef6.tar.gz
volse-hubzilla-021e95be119d37db714a995c0ab65ded921daef6.tar.bz2
volse-hubzilla-021e95be119d37db714a995c0ab65ded921daef6.zip
Merge https://github.com/friendica/red into zpull
-rw-r--r--view/ca/htconfig.tpl4
-rw-r--r--view/cs/htconfig.tpl4
-rw-r--r--view/de/htconfig.tpl4
-rw-r--r--view/en/htconfig.tpl2
-rw-r--r--view/es/htconfig.tpl4
-rw-r--r--view/fr/htconfig.tpl4
-rw-r--r--view/it/htconfig.tpl4
-rw-r--r--view/sv/htconfig.tpl4
8 files changed, 15 insertions, 15 deletions
diff --git a/view/ca/htconfig.tpl b/view/ca/htconfig.tpl
index 28446f3df..0cb665f1f 100644
--- a/view/ca/htconfig.tpl
+++ b/view/ca/htconfig.tpl
@@ -31,9 +31,9 @@ $a->config['sitename'] = "La Meva Xarxa d'Amics";
// to the email address of an already registered person who can authorise
// and/or approve/deny the request.
-$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_policy'] = REGISTER_OPEN;
$a->config['register_text'] = '';
-$a->config['admin_email'] = '$adminmail';
+$a->config['system']['admin_email'] = '$adminmail';
// Maximum size of an imported message, 0 is unlimited
diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl
index 5d116dd99..345f85683 100644
--- a/view/cs/htconfig.tpl
+++ b/view/cs/htconfig.tpl
@@ -35,9 +35,9 @@ $a->config['system']['language'] = 'cs';
// na e-mailovou adresu již existující registrované osoby, která může autorizovat
// a/nebo schvalovat/odmítat žádosti o registraci.
-$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_policy'] = REGISTER_OPEN;
$a->config['register_text'] = '';
-$a->config['admin_email'] = '$adminmail';
+$a->config['system']['admin_email'] = '$adminmail';
// Maximální velikost importované zprávy, 0 je neomezeno
diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl
index 76709ea75..2624695d1 100644
--- a/view/de/htconfig.tpl
+++ b/view/de/htconfig.tpl
@@ -31,9 +31,9 @@ $a->config['sitename'] = "My Friend Network";
// to the email address of an already registered person who can authorise
// and/or approve/deny the request.
-$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_policy'] = REGISTER_OPEN;
$a->config['register_text'] = '';
-$a->config['admin_email'] = '$adminmail';
+$a->config['system']['admin_email'] = '$adminmail';
// Maximum size of an imported message, 0 is unlimited
diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index de699a5f1..6b42f08a6 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -31,7 +31,7 @@ $a->config['sitename'] = "My Friend Network";
// to the email address of an already registered person who can authorise
// and/or approve/deny the request.
-$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_policy'] = REGISTER_OPEN;
$a->config['register_text'] = '';
$a->config['system']['admin_email'] = '$adminmail';
diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl
index 6158f6a33..52b6233ec 100644
--- a/view/es/htconfig.tpl
+++ b/view/es/htconfig.tpl
@@ -31,9 +31,9 @@ $a->config['sitename'] = "La Mia Rete di Amici";
// to the email address of an already registered person who can authorise
// and/or approve/deny the request.
-$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_policy'] = REGISTER_OPEN;
$a->config['register_text'] = '';
-$a->config['admin_email'] = '$adminmail';
+$a->config['system']['admin_email'] = '$adminmail';
// Maximum size of an imported message, 0 is unlimited
diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl
index 76709ea75..2624695d1 100644
--- a/view/fr/htconfig.tpl
+++ b/view/fr/htconfig.tpl
@@ -31,9 +31,9 @@ $a->config['sitename'] = "My Friend Network";
// to the email address of an already registered person who can authorise
// and/or approve/deny the request.
-$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_policy'] = REGISTER_OPEN;
$a->config['register_text'] = '';
-$a->config['admin_email'] = '$adminmail';
+$a->config['system']['admin_email'] = '$adminmail';
// Maximum size of an imported message, 0 is unlimited
diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl
index 6158f6a33..52b6233ec 100644
--- a/view/it/htconfig.tpl
+++ b/view/it/htconfig.tpl
@@ -31,9 +31,9 @@ $a->config['sitename'] = "La Mia Rete di Amici";
// to the email address of an already registered person who can authorise
// and/or approve/deny the request.
-$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_policy'] = REGISTER_OPEN;
$a->config['register_text'] = '';
-$a->config['admin_email'] = '$adminmail';
+$a->config['system']['admin_email'] = '$adminmail';
// Maximum size of an imported message, 0 is unlimited
diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl
index 76709ea75..2624695d1 100644
--- a/view/sv/htconfig.tpl
+++ b/view/sv/htconfig.tpl
@@ -31,9 +31,9 @@ $a->config['sitename'] = "My Friend Network";
// to the email address of an already registered person who can authorise
// and/or approve/deny the request.
-$a->config['register_policy'] = REGISTER_OPEN;
+$a->config['system']['register_policy'] = REGISTER_OPEN;
$a->config['register_text'] = '';
-$a->config['admin_email'] = '$adminmail';
+$a->config['system']['admin_email'] = '$adminmail';
// Maximum size of an imported message, 0 is unlimited