Merge branch 'metadatafix'

i18n/bg.json

@@ -184,5 +184,9 @@
     "Convert To UTC":
         "Convert To UTC",
     "Close":
-        "Close"
+        "Close",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/cs.json

@@ -184,5 +184,9 @@
     "Convert To UTC":
         "Convert To UTC",
     "Close":
-        "Close"
+        "Close",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/de.json

@@ -184,5 +184,9 @@
     "Convert To UTC":
         "In UTC Umwandeln",
     "Close":
-        "Schliessen"
+        "Schliessen",
+    "Encrypted note on PrivateBin":
+        "Verschlüsselte Notiz auf PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Besuche diesen Link um das Dokument zu sehen. Wird die URL an eine andere Person gegeben, so kann diese Person ebenfalls auf diese Notiz zugreifen."
 }

i18n/es.json

@@ -184,5 +184,9 @@
     "Convert To UTC":
         "Convert To UTC",
     "Close":
-        "Close"
+        "Close",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/fr.json

@@ -193,5 +193,9 @@
     "Convert To UTC":
         "Convertir en UTC",
     "Close":
-        "Fermer"
+        "Fermer",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/hu.json

@@ -184,5 +184,9 @@
     "Convert To UTC":
         "Convert To UTC",
     "Close":
-        "Close"
+        "Close",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/it.json

@@ -184,5 +184,9 @@
     "Convert To UTC":
         "Convert To UTC",
     "Close":
-        "Close"
+        "Close",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/nl.json

@@ -129,7 +129,7 @@
     "The cloned file '%s' was attached to this paste.": "Het gekloonde bestand '%s' is bijgevoegd aan de geplakte tekst.",
     "Attach a file": "Een bestand toevoegen",
     "alternatively drag & drop a file or paste an image from the clipboard": "U kunt ook een bestand slepen en neerzetten of een afbeelding plakken van het klembord",
-    "File too large, to display a preview. Please download the attachment.": "Het bestand is te groot om voorbeeld weer te geven. Aub de bijlage downloaden",   
+    "File too large, to display a preview. Please download the attachment.": "Het bestand is te groot om voorbeeld weer te geven. Aub de bijlage downloaden",
 	"Remove attachment": "Bijlage verwijderen",
     "Your browser does not support uploading encrypted files. Please use a newer browser.":
 		"Uw browser biedt geen ondersteuning voor het uploaden van gecodeerde bestanden. Gebruik alstublieft een nieuwere browser",
@@ -184,5 +184,9 @@
     "Convert To UTC":
         "Convert To UTC",
     "Close":
-        "Close"
+        "Close",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/no.json

@@ -184,5 +184,9 @@
     "Convert To UTC":
         "Convert To UTC",
     "Close":
-        "Close"
+        "Close",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/oc.json

@@ -193,5 +193,9 @@
     "Convert To UTC":
         "Convertir en UTC",
     "Close":
-        "Tampar"
+        "Tampar",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/pl.json

@@ -184,5 +184,9 @@
     "Convert To UTC":
         "Convert To UTC",
     "Close":
-        "Close"
+        "Close",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/pt.json

@@ -184,5 +184,9 @@
     "Convert To UTC":
         "Converter para UTC",
     "Close":
-        "Fechar"
+        "Fechar",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/ru.json

@@ -194,5 +194,9 @@
     "Convert To UTC":
         "Convert To UTC",
     "Close":
-        "Close"
+        "Close",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/sl.json

@@ -193,5 +193,9 @@
     "Convert To UTC":
         "Convert To UTC",
     "Close":
-        "Close"
+        "Close",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/uk.json

@@ -194,5 +194,9 @@
     "Convert To UTC":
         "Convert To UTC",
     "Close":
-        "Close"
+        "Close",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

i18n/zh.json

@@ -184,5 +184,9 @@
     "Convert To UTC":
         "转换为UTC",
     "Close":
-        "关闭"
+        "关闭",
+    "Encrypted note on PrivateBin":
+        "Encrypted note on PrivateBin",
+    "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.":
+        "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too."
 }

tpl/bootstrap.php

@@ -73,6 +73,7 @@ endif;
 		<script type="text/javascript" data-cfasync="false" src="js/purify-2.0.8.js" integrity="sha512-QwcEKGuEmKtMguCO9pqNtUtZqq9b/tJ8gNr5qhY8hykq3zKTlDOvpZAmf6Rs8yH35Bz1ZdctUjj2qEWxT5aXCg==" crossorigin="anonymous"></script>
 		<script type="text/javascript" data-cfasync="false" src="js/legacy.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-LYos+qXHIRqFf5ZPNphvtTB0cgzHUizu2wwcOwcwz/VIpRv9lpcBgPYz4uq6jx0INwCAj6Fbnl5HoKiLufS2jg==" crossorigin="anonymous"></script>
 		<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-+4ay2Dw/9w/DOTutdpoiHvF6RxqV0V8ABSXHlebjGbQ7Td+3If7mOZ5OIu/lWCifcgP6vyhJuiB8+jl8FGtuwg==" crossorigin="anonymous"></script>
+		<!-- icon -->
 		<link rel="apple-touch-icon" href="img/apple-touch-icon.png?<?php echo rawurlencode($VERSION); ?>" sizes="180x180" />
 		<link rel="icon" type="image/png" href="img/favicon-32x32.png?<?php echo rawurlencode($VERSION); ?>" sizes="32x32" />
 		<link rel="icon" type="image/png" href="img/favicon-16x16.png?<?php echo rawurlencode($VERSION); ?>" sizes="16x16" />
@@ -81,6 +82,18 @@ endif;
 		<link rel="shortcut icon" href="img/favicon.ico">
 		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
+		<!-- Twitter/social media cards -->
+		<meta name="twitter:card" content="summary" />
+		<meta name="twitter:title" content="<?php echo I18n::_('Encrypted note on PrivateBin') ?>" />
+		<meta name="twitter:description" content="<?php echo I18n::_('Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.') ?>" />
+		<meta name="twitter:image" content="img/apple-touch-icon.png?<?php echo rawurlencode($VERSION); ?>" />
+		<meta property="og:title" content="<?php echo I18n::_($NAME); ?>" />
+		<meta property="og:site_name" content="<?php echo I18n::_($NAME); ?>" />
+		<meta property="og:description" content="<?php echo I18n::_('Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.') ?>" />
+		<meta property="og:image" content="img/apple-touch-icon.png?<?php echo rawurlencode($VERSION); ?>" />
+		<meta property="og:image:type" content="image/png" />
+		<meta property="og:image:width" content="180" />
+		<meta property="og:image:height" content="180" />
 	</head>
 	<body role="document" data-compression="<?php echo rawurlencode($COMPRESSION); ?>"<?php
 $class = array();

tpl/page.php

@@ -51,6 +51,7 @@ endif;
 		<script type="text/javascript" data-cfasync="false" src="js/purify-2.0.8.js" integrity="sha512-QwcEKGuEmKtMguCO9pqNtUtZqq9b/tJ8gNr5qhY8hykq3zKTlDOvpZAmf6Rs8yH35Bz1ZdctUjj2qEWxT5aXCg==" crossorigin="anonymous"></script>
 		<script type="text/javascript" data-cfasync="false" src="js/legacy.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-LYos+qXHIRqFf5ZPNphvtTB0cgzHUizu2wwcOwcwz/VIpRv9lpcBgPYz4uq6jx0INwCAj6Fbnl5HoKiLufS2jg==" crossorigin="anonymous"></script>
 		<script type="text/javascript" data-cfasync="false" src="js/privatebin.js?<?php echo rawurlencode($VERSION); ?>" integrity="sha512-+4ay2Dw/9w/DOTutdpoiHvF6RxqV0V8ABSXHlebjGbQ7Td+3If7mOZ5OIu/lWCifcgP6vyhJuiB8+jl8FGtuwg==" crossorigin="anonymous"></script>
+		<!-- icon -->
 		<link rel="apple-touch-icon" href="img/apple-touch-icon.png?<?php echo rawurlencode($VERSION); ?>" sizes="180x180" />
 		<link rel="icon" type="image/png" href="img/favicon-32x32.png?<?php echo rawurlencode($VERSION); ?>" sizes="32x32" />
 		<link rel="icon" type="image/png" href="img/favicon-16x16.png?<?php echo rawurlencode($VERSION); ?>" sizes="16x16" />
@@ -59,6 +60,18 @@ endif;
 		<link rel="shortcut icon" href="img/favicon.ico">
 		<meta name="msapplication-config" content="browserconfig.xml">
 		<meta name="theme-color" content="#ffe57e" />
+		<!-- Twitter/social media cards -->
+		<meta name="twitter:card" content="summary" />
+		<meta name="twitter:title" content="<?php echo I18n::_('Encrypted note on PrivateBin') ?>" />
+		<meta name="twitter:description" content="<?php echo I18n::_('Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.') ?>" />
+		<meta name="twitter:image" content="img/apple-touch-icon.png?<?php echo rawurlencode($VERSION); ?>" />
+		<meta property="og:title" content="<?php echo I18n::_($NAME); ?>" />
+		<meta property="og:site_name" content="<?php echo I18n::_($NAME); ?>" />
+		<meta property="og:description" content="<?php echo I18n::_('Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.') ?>" />
+		<meta property="og:image" content="img/apple-touch-icon.png?<?php echo rawurlencode($VERSION); ?>" />
+		<meta property="og:image:type" content="image/png" />
+		<meta property="og:image:width" content="180" />
+		<meta property="og:image:height" content="180" />
 	</head>
 	<body data-compression="<?php echo rawurlencode($COMPRESSION); ?>">
 		<header>