Resolved conflict in view/it/hstrings.php

1 files changed, 23 insertions, 11 deletions

diff --git a/view/nb-no/htconfig.tpl b/view/nb-no/htconfig.tpl
index cc4087f96..d0a799cf6 100644
--- a/view/nb-no/htconfig.tpl
+++ b/view/nb-no/htconfig.tpl
@@ -8,6 +8,9 @@ $db_port = '{{$dbport}}';
 $db_user = '{{$dbuser}}';
 $db_pass = '{{$dbpass}}';
 $db_data = '{{$dbdata}}';
+$db_type = '{{$dbtype}}'; // an integer. 0 or unset for mysql, 1 for postgres
+
+define( 'UNO', {{$uno}} );
 
 /*
  * Notice: Many of the following settings will be available in the admin panel 
@@ -29,9 +32,18 @@ $default_timezone = '{{$timezone}}';
 
 // What is your site name?
 
-$a->config['system']['baseurl'] = '{{$siteurl}}';
-$a->config['system']['sitename'] = "Hubzilla";
-$a->config['system']['location_hash'] = '{{$site_id}}';
+App::$config['system']['baseurl'] = '{{$siteurl}}';
+App::$config['system']['sitename'] = "Hubzilla";
+App::$config['system']['location_hash'] = '{{$site_id}}';
+
+// These lines set additional security headers to be sent with all responses
+// You may wish to set transport_security_header to 0 if your server already sends
+// this header. content_security_policy may need to be disabled if you wish to
+// run the piwik analytics plugin or include other offsite resources on a page
+
+App::$config['system']['transport_security_header'] = 1;
+App::$config['system']['content_security_policy'] = 1;
+
 
 // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED.
 // Be certain to create your own personal account before setting 
@@ -40,21 +52,21 @@ $a->config['system']['location_hash'] = '{{$site_id}}';
 // to the email address of an already registered person who can authorise
 // and/or approve/deny the request.
 
-$a->config['system']['register_policy'] = REGISTER_OPEN;
-$a->config['system']['register_text'] = '';
-$a->config['system']['admin_email'] = '{{$adminmail}}';
+App::$config['system']['register_policy'] = REGISTER_OPEN;
+App::$config['system']['register_text'] = '';
+App::$config['system']['admin_email'] = '{{$adminmail}}';
 
 // Maximum size of an imported message, 0 is unlimited
 
-$a->config['system']['max_import_size'] = 200000;
+App::$config['system']['max_import_size'] = 200000;
 
 // maximum size of uploaded photos
 
-$a->config['system']['maximagesize'] = 8000000;
+App::$config['system']['maximagesize'] = 8000000;
 
 // Location of PHP command line processor
 
-$a->config['system']['php_path'] = '{{$phpath}}';
+App::$config['system']['php_path'] = '{{$phpath}}';
 
 // Configure how we communicate with directory servers.
 // DIRECTORY_MODE_NORMAL     = directory client, we will find a directory
@@ -62,9 +74,9 @@ $a->config['system']['php_path'] = '{{$phpath}}';
 // DIRECTORY_MODE_PRIMARY    = main directory server
 // DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services
 
-$a->config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
+App::$config['system']['directory_mode']  = DIRECTORY_MODE_NORMAL;
 
 // default system theme
 
-$a->config['system']['theme'] = 'redbasic';
+App::$config['system']['theme'] = 'redbasic';