Resolved conflict in view/it/hstrings.php

1 files changed, 3 insertions, 13 deletions

diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 8a007232e..9fcdf1735 100755
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -1,34 +1,24 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="{{$baseurl}}/" />
 <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1, user-scalable={{$user_scalable}}" />
-<meta name="generator" content="{{$generator}}" />
-
+{{$metas}}
 <!--[if IE]>
 <script src="{{$baseurl}}/library/html5.js"></script>
 <![endif]-->
 
 {{$head_css}}
-
 {{$js_strings}}
-
 {{$head_js}}
-
 <link rel="shortcut icon" href="{{$icon}}" />
-<link rel="search"
-         href="{{$baseurl}}/opensearch" 
-         type="application/opensearchdescription+xml" 
-         title="Search in the Hubzilla" />
-
-
+<link rel="search" href="{{$baseurl}}/opensearch" type="application/opensearchdescription+xml" title="{{$osearch}}" />
 <script>
-
 	var updateInterval = {{$update_interval}};
 	var localUser = {{if $local_channel}}{{$local_channel}}{{else}}false{{/if}};
 	var zid = {{if $zid}}'{{$zid}}'{{else}}null{{/if}};
 	var justifiedGalleryActive = false;
 	{{if $channel_hash}}var channelHash = '{{$channel_hash}}';{{/if}}
 	{{if $channel_id}}var channelId = '{{$channel_id}}';{{/if}}{{* Used in e.g. autocomplete *}}
-
+	var preloadImages = {{$preload_images}};
 </script>