From ed663513372385754b37c57f0a7bee41b1c79a08 Mon Sep 17 00:00:00 2001 From: Christian Pierre MOMON Date: Wed, 14 Apr 2021 03:11:58 +0200 Subject: [PATCH 1/9] Added download feature (#5318). --- css/privatebin.css | 4 ++++ js/privatebin.js | 41 +++++++++++++++++++++++++++++++++++++++++ tpl/bootstrap.php | 5 ++++- tpl/page.php | 2 +- 4 files changed, 50 insertions(+), 2 deletions(-) diff --git a/css/privatebin.css b/css/privatebin.css index 8b4e6a0..f852d39 100644 --- a/css/privatebin.css +++ b/css/privatebin.css @@ -249,6 +249,10 @@ button img { padding: 1px 0 1px 0; } +#downloadtextbutton img { + padding: 1px 0 1px 0; +} + #remainingtime, #password { color: #94a3b4; display: inline; diff --git a/js/privatebin.js b/js/privatebin.js index e549dd6..5090885 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -3525,6 +3525,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { $password, $passwordInput, $rawTextButton, + $downloadTextButton, $qrCodeLink, $emailLink, $sendButton, @@ -3666,6 +3667,30 @@ jQuery.PrivateBin = (function($, RawDeflate) { newDoc.close(); } + /** + * download text + * + * @name TopNav.downloadText + * @private + * @function + */ + function downloadText() + { + var filename='paste.txt'; + var text = PasteViewer.getText(); + + var element = document.createElement('a'); + element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text)); + element.setAttribute('download', filename); + + element.style.display = 'none'; + document.body.appendChild(element); + + element.click(); + + document.body.removeChild(element); + } + /** * saves the language in a cookie and reloads the page * @@ -3892,6 +3917,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { $newButton.removeClass('hidden'); $cloneButton.removeClass('hidden'); $rawTextButton.removeClass('hidden'); + $downloadTextButton.removeClass('hidden'); $qrCodeLink.removeClass('hidden'); viewButtonsDisplayed = true; @@ -3912,6 +3938,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { $cloneButton.addClass('hidden'); $newButton.addClass('hidden'); $rawTextButton.addClass('hidden'); + $downloadTextButton.addClass('hidden'); $qrCodeLink.addClass('hidden'); me.hideEmailButton(); @@ -4073,6 +4100,17 @@ jQuery.PrivateBin = (function($, RawDeflate) { $rawTextButton.addClass('hidden'); }; + /** + * only hides the download text button + * + * @name TopNav.hideRawButton + * @function + */ + me.hideDownloadButton = function() + { + $downloadTextButton.addClass('hidden'); + }; + /** * only hides the qr code button * @@ -4334,6 +4372,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { $password = $('#password'); $passwordInput = $('#passwordinput'); $rawTextButton = $('#rawtextbutton'); + $downloadTextButton = $('#downloadtextbutton'); $retryButton = $('#retrybutton'); $sendButton = $('#sendbutton'); $qrCodeLink = $('#qrcodelink'); @@ -4351,6 +4390,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { $sendButton.click(PasteEncrypter.sendPaste); $cloneButton.click(Controller.clonePaste); $rawTextButton.click(rawText); + $downloadTextButton.click(downloadText); $retryButton.click(clickRetryButton); $fileRemoveButton.click(removeAttachment); $qrCodeLink.click(displayQrCode); @@ -4689,6 +4729,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { TopNav.showEmailButton(); TopNav.hideRawButton(); + TopNav.hideDownloadButton(); Editor.hide(); // parse and show text diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index ffea872..c43ddbf 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -72,7 +72,7 @@ endif; ?> - + @@ -212,6 +212,9 @@ endif; + diff --git a/tpl/page.php b/tpl/page.php index e58617d..096a9e6 100644 --- a/tpl/page.php +++ b/tpl/page.php @@ -50,7 +50,7 @@ endif; ?> - + From 9683c591bb77f57444ea6425cc37da09950a8662 Mon Sep 17 00:00:00 2001 From: El RIDO Date: Sat, 17 Apr 2021 08:48:12 +0200 Subject: [PATCH 2/9] document change --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b327893..8e416b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ * **1.4 (not yet released)** * ADDED: Translation for Estonian * ADDED: new HTTP headers improving security (#765) + * ADDED: Download button for paste text (#774) * ADDED: Opt-out of federated learning of cohorts (FLoC) (#776) * CHANGED: Language selection cookie only transmitted over HTTPS (#472) * **1.3.5 (2021-04-05)** From 853a4f386fa9a870cb2aa3616d43b61d0f10ec5f Mon Sep 17 00:00:00 2001 From: El RIDO Date: Sat, 17 Apr 2021 08:51:25 +0200 Subject: [PATCH 3/9] fix indentation --- js/privatebin.js | 24 ++++++++++++------------ tpl/bootstrap.php | 2 +- tpl/page.php | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/js/privatebin.js b/js/privatebin.js index 0fe0e1d..9cf569f 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -3525,7 +3525,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { $password, $passwordInput, $rawTextButton, - $downloadTextButton, + $downloadTextButton, $qrCodeLink, $emailLink, $sendButton, @@ -3676,20 +3676,20 @@ jQuery.PrivateBin = (function($, RawDeflate) { */ function downloadText() { - var filename='paste.txt'; - var text = PasteViewer.getText(); + var filename='paste.txt'; + var text = PasteViewer.getText(); - var element = document.createElement('a'); - element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text)); - element.setAttribute('download', filename); + var element = document.createElement('a'); + element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(text)); + element.setAttribute('download', filename); - element.style.display = 'none'; - document.body.appendChild(element); + element.style.display = 'none'; + document.body.appendChild(element); - element.click(); + element.click(); - document.body.removeChild(element); - } + document.body.removeChild(element); + } /** * saves the language in a cookie and reloads the page @@ -4729,7 +4729,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { TopNav.showEmailButton(); TopNav.hideRawButton(); - TopNav.hideDownloadButton(); + TopNav.hideDownloadButton(); Editor.hide(); // parse and show text diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index 38cedc1..ae4d1e7 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -72,7 +72,7 @@ endif; ?> - + diff --git a/tpl/page.php b/tpl/page.php index 832e6da..724c272 100644 --- a/tpl/page.php +++ b/tpl/page.php @@ -50,7 +50,7 @@ endif; ?> - + From bc114522592f0c3ed2d366363ad264437cf904aa Mon Sep 17 00:00:00 2001 From: El RIDO Date: Sat, 17 Apr 2021 09:08:11 +0200 Subject: [PATCH 4/9] make filename unique per paste ID --- js/privatebin.js | 2 +- tpl/bootstrap.php | 2 +- tpl/page.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/privatebin.js b/js/privatebin.js index 9cf569f..6218700 100644 --- a/js/privatebin.js +++ b/js/privatebin.js @@ -3676,7 +3676,7 @@ jQuery.PrivateBin = (function($, RawDeflate) { */ function downloadText() { - var filename='paste.txt'; + var filename='paste-' + Model.getPasteId() + '.txt'; var text = PasteViewer.getText(); var element = document.createElement('a'); diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index ae4d1e7..fd715c4 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -72,7 +72,7 @@ endif; ?> - + diff --git a/tpl/page.php b/tpl/page.php index 724c272..53a8171 100644 --- a/tpl/page.php +++ b/tpl/page.php @@ -50,7 +50,7 @@ endif; ?> - + From 3181cfe58add27674e9e893f01b2a0fbaf2e6d4e Mon Sep 17 00:00:00 2001 From: El RIDO Date: Sat, 17 Apr 2021 09:15:00 +0200 Subject: [PATCH 5/9] translate download button, add it to page template --- i18n/ar.json | 3 ++- i18n/bg.json | 3 ++- i18n/ca.json | 3 ++- i18n/cs.json | 3 ++- i18n/de.json | 3 ++- i18n/el.json | 3 ++- i18n/en.json | 3 ++- i18n/es.json | 3 ++- i18n/et.json | 3 ++- i18n/fr.json | 3 ++- i18n/he.json | 3 ++- i18n/hi.json | 3 ++- i18n/hu.json | 3 ++- i18n/id.json | 3 ++- i18n/it.json | 3 ++- i18n/ja.json | 3 ++- i18n/ku.json | 3 ++- i18n/la.json | 3 ++- i18n/lt.json | 3 ++- i18n/nl.json | 3 ++- i18n/no.json | 3 ++- i18n/oc.json | 3 ++- i18n/pl.json | 3 ++- i18n/pt.json | 3 ++- i18n/ru.json | 3 ++- i18n/sl.json | 3 ++- i18n/sv.json | 3 ++- i18n/tr.json | 3 ++- i18n/uk.json | 3 ++- i18n/zh.json | 3 ++- tpl/bootstrap.php | 2 +- tpl/page.php | 1 + 32 files changed, 62 insertions(+), 31 deletions(-) diff --git a/i18n/ar.json b/i18n/ar.json index 8b8e1ae..894b87b 100644 --- a/i18n/ar.json +++ b/i18n/ar.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/bg.json b/i18n/bg.json index 8ddd1f5..1385ab1 100644 --- a/i18n/bg.json +++ b/i18n/bg.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/ca.json b/i18n/ca.json index a4e6d3f..d81499c 100644 --- a/i18n/ca.json +++ b/i18n/ca.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/cs.json b/i18n/cs.json index 1a6249a..956d1db 100644 --- a/i18n/cs.json +++ b/i18n/cs.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/de.json b/i18n/de.json index dd8a48a..7cecba7 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -184,5 +184,6 @@ "Close": "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 diese Verknüpfung um das Dokument zu sehen. Wird die URL an eine andere Person gegeben, so kann diese Person ebenfalls auf dieses Dokument zugreifen.", - "URL shortener may expose your decrypt key in URL.": "Der URL-Verkürzer kann den Schlüssel in der URL enthüllen." + "URL shortener may expose your decrypt key in URL.": "Der URL-Verkürzer kann den Schlüssel in der URL enthüllen.", + "Download": "Download" } diff --git a/i18n/el.json b/i18n/el.json index 6fd45e4..54f21a2 100644 --- a/i18n/el.json +++ b/i18n/el.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/en.json b/i18n/en.json index 295f512..e38b40e 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/es.json b/i18n/es.json index 4e93e66..307a855 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -184,5 +184,6 @@ "Close": "Cerrar", "Encrypted note on PrivateBin": "Nota cifrada en PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visite este enlace para ver la nota. Dar la URL a cualquier persona también les permite acceder a la nota.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/et.json b/i18n/et.json index 877c732..0b4d5cf 100644 --- a/i18n/et.json +++ b/i18n/et.json @@ -184,5 +184,6 @@ "Close": "Sulge", "Encrypted note on PrivateBin": "Krüpteeritud kiri PrivateBin-is", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Kirja nägemiseks külasta seda linki. Teistele URL-i andmine lubab ka neil ligi pääseda kirjale.", - "URL shortener may expose your decrypt key in URL.": "URL-i lühendaja võib paljastada sinu dekrüpteerimisvõtme URL-is." + "URL shortener may expose your decrypt key in URL.": "URL-i lühendaja võib paljastada sinu dekrüpteerimisvõtme URL-is.", + "Download": "Download" } diff --git a/i18n/fr.json b/i18n/fr.json index 409d449..bc53fe1 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -184,5 +184,6 @@ "Close": "Fermer", "Encrypted note on PrivateBin": "Message chiffré sur PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visiter ce lien pour voir la note. Donner l'URL à une autre personne lui permet également d'accéder à la note.", - "URL shortener may expose your decrypt key in URL.": "Raccourcir l'URL peut exposer votre clé de déchiffrement dans l'URL." + "URL shortener may expose your decrypt key in URL.": "Raccourcir l'URL peut exposer votre clé de déchiffrement dans l'URL.", + "Download": "Download" } diff --git a/i18n/he.json b/i18n/he.json index 206587b..eb2d512 100644 --- a/i18n/he.json +++ b/i18n/he.json @@ -184,5 +184,6 @@ "Close": "סגירה", "Encrypted note on PrivateBin": "הערה מוצפנת ב־PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "נא לבקר בקישור כדי לצפות בהערה. מסירת הקישור לאנשים כלשהם תאפשר גם להם לגשת להערה.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/hi.json b/i18n/hi.json index a248e82..4df9ce0 100644 --- a/i18n/hi.json +++ b/i18n/hi.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/hu.json b/i18n/hu.json index b870836..a619b3f 100644 --- a/i18n/hu.json +++ b/i18n/hu.json @@ -184,5 +184,6 @@ "Close": "Bezárás", "Encrypted note on PrivateBin": "Titkosított jegyzet a PrivateBinen", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Látogasd meg ezt a hivatkozást a bejegyzés megtekintéséhez. Ha mások számára is megadod ezt a linket, azzal hozzáférnek ők is.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/id.json b/i18n/id.json index 248121d..1547ace 100644 --- a/i18n/id.json +++ b/i18n/id.json @@ -184,5 +184,6 @@ "Close": "Tutup", "Encrypted note on PrivateBin": "Catatan ter-ekrip di PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Kunjungi tautan ini untuk melihat catatan. Memberikan alamat URL pada siapapun juga, akan mengizinkan mereka untuk mengakses catatan, so pasti gitu loh Kaka.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/it.json b/i18n/it.json index 81b11a8..2613579 100644 --- a/i18n/it.json +++ b/i18n/it.json @@ -184,5 +184,6 @@ "Close": "Chiudi", "Encrypted note on PrivateBin": "Nota crittografata su PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visita questo collegamento per vedere la nota. Dare l'URL a chiunque consente anche a loro di accedere alla nota.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/ja.json b/i18n/ja.json index bf4f7ca..ed6971d 100644 --- a/i18n/ja.json +++ b/i18n/ja.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/ku.json b/i18n/ku.json index 0ff29ac..0e8c299 100644 --- a/i18n/ku.json +++ b/i18n/ku.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/la.json b/i18n/la.json index 4d648cb..11d062b 100644 --- a/i18n/la.json +++ b/i18n/la.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/lt.json b/i18n/lt.json index 7ef45bf..31f7906 100644 --- a/i18n/lt.json +++ b/i18n/lt.json @@ -184,5 +184,6 @@ "Close": "Užverti", "Encrypted note on PrivateBin": "Šifruoti užrašai ties PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Norėdami matyti užrašus, aplankykite šį tinklalapį. Pasidalinus šiuo URL adresu su kitais žmonėmis, jiems taip pat bus leidžiama prieiga prie šių užrašų.", - "URL shortener may expose your decrypt key in URL.": "URL trumpinimo įrankis gali atskleisti URL adrese jūsų iššifravimo raktą." + "URL shortener may expose your decrypt key in URL.": "URL trumpinimo įrankis gali atskleisti URL adrese jūsų iššifravimo raktą.", + "Download": "Download" } diff --git a/i18n/nl.json b/i18n/nl.json index 54586ff..8e51dfc 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/no.json b/i18n/no.json index ac6e369..e8d9536 100644 --- a/i18n/no.json +++ b/i18n/no.json @@ -184,5 +184,6 @@ "Close": "Steng", "Encrypted note on PrivateBin": "Kryptert notat på PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Besøk denne lenken for å se notatet. Hvis lenken deles med andre, vil de også kunne se notatet.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/oc.json b/i18n/oc.json index 49e3dde..1d445b1 100644 --- a/i18n/oc.json +++ b/i18n/oc.json @@ -184,5 +184,6 @@ "Close": "Tampar", "Encrypted note on PrivateBin": "Nòtas chifradas sus PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visitatz aqueste ligam per veire la nòta. Fornir lo ligam a qualqu’un mai li permet tanben d’accedir a la nòta.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/pl.json b/i18n/pl.json index c18ad22..8fde350 100644 --- a/i18n/pl.json +++ b/i18n/pl.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/pt.json b/i18n/pt.json index 6049207..f83f778 100644 --- a/i18n/pt.json +++ b/i18n/pt.json @@ -184,5 +184,6 @@ "Close": "Fechar", "Encrypted note on PrivateBin": "Nota criptografada no PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visite esse link para ver a nota. Dar a URL para qualquer um permite que eles também acessem a nota.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/ru.json b/i18n/ru.json index b697f70..03c4945 100644 --- a/i18n/ru.json +++ b/i18n/ru.json @@ -184,5 +184,6 @@ "Close": "Закрыть", "Encrypted note on PrivateBin": "Зашифрованная запись на PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Посетите эту ссылку чтобы просмотреть запись. Передача ссылки кому либо позволит им получить доступ к записи тоже.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/sl.json b/i18n/sl.json index 51b9caa..bac6f98 100644 --- a/i18n/sl.json +++ b/i18n/sl.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/sv.json b/i18n/sv.json index e085949..a586a4f 100644 --- a/i18n/sv.json +++ b/i18n/sv.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/tr.json b/i18n/tr.json index daedf8f..1156275 100644 --- a/i18n/tr.json +++ b/i18n/tr.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/uk.json b/i18n/uk.json index 2808c71..3afa64d 100644 --- a/i18n/uk.json +++ b/i18n/uk.json @@ -184,5 +184,6 @@ "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.", - "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL." + "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", + "Download": "Download" } diff --git a/i18n/zh.json b/i18n/zh.json index 2e1dc12..65d795e 100644 --- a/i18n/zh.json +++ b/i18n/zh.json @@ -184,5 +184,6 @@ "Close": "关闭", "Encrypted note on PrivateBin": "PrivateBin上的加密笔记", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "访问这个链接来查看该笔记。 将这个URL发送给任何人即可允许其访问该笔记。", - "URL shortener may expose your decrypt key in URL.": "URL 缩短可能会暴露您在 URL 中的解密密钥。" + "URL shortener may expose your decrypt key in URL.": "URL 缩短可能会暴露您在 URL 中的解密密钥。", + "Download": "Download" } diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index fd715c4..6575789 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -213,7 +213,7 @@ endif; + Date: Sun, 18 Apr 2021 09:07:57 +0200 Subject: [PATCH 6/9] re-label "Download" button to "Save paste" --- i18n/ar.json | 2 +- i18n/bg.json | 2 +- i18n/ca.json | 2 +- i18n/cs.json | 2 +- i18n/de.json | 2 +- i18n/el.json | 2 +- i18n/en.json | 2 +- i18n/es.json | 2 +- i18n/et.json | 2 +- i18n/fr.json | 2 +- i18n/he.json | 2 +- i18n/hi.json | 2 +- i18n/hu.json | 2 +- i18n/id.json | 2 +- i18n/it.json | 2 +- i18n/ja.json | 2 +- i18n/ku.json | 2 +- i18n/la.json | 2 +- i18n/lt.json | 2 +- i18n/nl.json | 2 +- i18n/no.json | 2 +- i18n/oc.json | 2 +- i18n/pl.json | 2 +- i18n/pt.json | 2 +- i18n/ru.json | 2 +- i18n/sl.json | 2 +- i18n/sv.json | 2 +- i18n/tr.json | 2 +- i18n/uk.json | 2 +- i18n/zh.json | 2 +- tpl/bootstrap.php | 2 +- tpl/page.php | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/i18n/ar.json b/i18n/ar.json index 894b87b..ddca0d6 100644 --- a/i18n/ar.json +++ b/i18n/ar.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/bg.json b/i18n/bg.json index 1385ab1..4a02538 100644 --- a/i18n/bg.json +++ b/i18n/bg.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/ca.json b/i18n/ca.json index d81499c..a6936be 100644 --- a/i18n/ca.json +++ b/i18n/ca.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/cs.json b/i18n/cs.json index 956d1db..34ef19a 100644 --- a/i18n/cs.json +++ b/i18n/cs.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/de.json b/i18n/de.json index 7cecba7..b0991d8 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -185,5 +185,5 @@ "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 diese Verknüpfung um das Dokument zu sehen. Wird die URL an eine andere Person gegeben, so kann diese Person ebenfalls auf dieses Dokument zugreifen.", "URL shortener may expose your decrypt key in URL.": "Der URL-Verkürzer kann den Schlüssel in der URL enthüllen.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/el.json b/i18n/el.json index 54f21a2..6e33978 100644 --- a/i18n/el.json +++ b/i18n/el.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/en.json b/i18n/en.json index e38b40e..a96bab5 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/es.json b/i18n/es.json index 307a855..73f6055 100644 --- a/i18n/es.json +++ b/i18n/es.json @@ -185,5 +185,5 @@ "Encrypted note on PrivateBin": "Nota cifrada en PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visite este enlace para ver la nota. Dar la URL a cualquier persona también les permite acceder a la nota.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/et.json b/i18n/et.json index 0b4d5cf..b364df2 100644 --- a/i18n/et.json +++ b/i18n/et.json @@ -185,5 +185,5 @@ "Encrypted note on PrivateBin": "Krüpteeritud kiri PrivateBin-is", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Kirja nägemiseks külasta seda linki. Teistele URL-i andmine lubab ka neil ligi pääseda kirjale.", "URL shortener may expose your decrypt key in URL.": "URL-i lühendaja võib paljastada sinu dekrüpteerimisvõtme URL-is.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/fr.json b/i18n/fr.json index bc53fe1..03d6085 100644 --- a/i18n/fr.json +++ b/i18n/fr.json @@ -185,5 +185,5 @@ "Encrypted note on PrivateBin": "Message chiffré sur PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visiter ce lien pour voir la note. Donner l'URL à une autre personne lui permet également d'accéder à la note.", "URL shortener may expose your decrypt key in URL.": "Raccourcir l'URL peut exposer votre clé de déchiffrement dans l'URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/he.json b/i18n/he.json index eb2d512..046874e 100644 --- a/i18n/he.json +++ b/i18n/he.json @@ -185,5 +185,5 @@ "Encrypted note on PrivateBin": "הערה מוצפנת ב־PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "נא לבקר בקישור כדי לצפות בהערה. מסירת הקישור לאנשים כלשהם תאפשר גם להם לגשת להערה.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/hi.json b/i18n/hi.json index 4df9ce0..0cd2787 100644 --- a/i18n/hi.json +++ b/i18n/hi.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/hu.json b/i18n/hu.json index a619b3f..1cff1a6 100644 --- a/i18n/hu.json +++ b/i18n/hu.json @@ -185,5 +185,5 @@ "Encrypted note on PrivateBin": "Titkosított jegyzet a PrivateBinen", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Látogasd meg ezt a hivatkozást a bejegyzés megtekintéséhez. Ha mások számára is megadod ezt a linket, azzal hozzáférnek ők is.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/id.json b/i18n/id.json index 1547ace..1924f81 100644 --- a/i18n/id.json +++ b/i18n/id.json @@ -185,5 +185,5 @@ "Encrypted note on PrivateBin": "Catatan ter-ekrip di PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Kunjungi tautan ini untuk melihat catatan. Memberikan alamat URL pada siapapun juga, akan mengizinkan mereka untuk mengakses catatan, so pasti gitu loh Kaka.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/it.json b/i18n/it.json index 2613579..bda7a1d 100644 --- a/i18n/it.json +++ b/i18n/it.json @@ -185,5 +185,5 @@ "Encrypted note on PrivateBin": "Nota crittografata su PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visita questo collegamento per vedere la nota. Dare l'URL a chiunque consente anche a loro di accedere alla nota.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/ja.json b/i18n/ja.json index ed6971d..807a38c 100644 --- a/i18n/ja.json +++ b/i18n/ja.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/ku.json b/i18n/ku.json index 0e8c299..ae72ebd 100644 --- a/i18n/ku.json +++ b/i18n/ku.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/la.json b/i18n/la.json index 11d062b..2098982 100644 --- a/i18n/la.json +++ b/i18n/la.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/lt.json b/i18n/lt.json index 31f7906..bc287bc 100644 --- a/i18n/lt.json +++ b/i18n/lt.json @@ -185,5 +185,5 @@ "Encrypted note on PrivateBin": "Šifruoti užrašai ties PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Norėdami matyti užrašus, aplankykite šį tinklalapį. Pasidalinus šiuo URL adresu su kitais žmonėmis, jiems taip pat bus leidžiama prieiga prie šių užrašų.", "URL shortener may expose your decrypt key in URL.": "URL trumpinimo įrankis gali atskleisti URL adrese jūsų iššifravimo raktą.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/nl.json b/i18n/nl.json index 8e51dfc..65c4e37 100644 --- a/i18n/nl.json +++ b/i18n/nl.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/no.json b/i18n/no.json index e8d9536..62764bf 100644 --- a/i18n/no.json +++ b/i18n/no.json @@ -185,5 +185,5 @@ "Encrypted note on PrivateBin": "Kryptert notat på PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Besøk denne lenken for å se notatet. Hvis lenken deles med andre, vil de også kunne se notatet.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/oc.json b/i18n/oc.json index 1d445b1..a310686 100644 --- a/i18n/oc.json +++ b/i18n/oc.json @@ -185,5 +185,5 @@ "Encrypted note on PrivateBin": "Nòtas chifradas sus PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visitatz aqueste ligam per veire la nòta. Fornir lo ligam a qualqu’un mai li permet tanben d’accedir a la nòta.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/pl.json b/i18n/pl.json index 8fde350..4b4a67b 100644 --- a/i18n/pl.json +++ b/i18n/pl.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/pt.json b/i18n/pt.json index f83f778..0f6c133 100644 --- a/i18n/pt.json +++ b/i18n/pt.json @@ -185,5 +185,5 @@ "Encrypted note on PrivateBin": "Nota criptografada no PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Visite esse link para ver a nota. Dar a URL para qualquer um permite que eles também acessem a nota.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/ru.json b/i18n/ru.json index 03c4945..1c99043 100644 --- a/i18n/ru.json +++ b/i18n/ru.json @@ -185,5 +185,5 @@ "Encrypted note on PrivateBin": "Зашифрованная запись на PrivateBin", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "Посетите эту ссылку чтобы просмотреть запись. Передача ссылки кому либо позволит им получить доступ к записи тоже.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/sl.json b/i18n/sl.json index bac6f98..c4bb0cb 100644 --- a/i18n/sl.json +++ b/i18n/sl.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/sv.json b/i18n/sv.json index a586a4f..f2286e0 100644 --- a/i18n/sv.json +++ b/i18n/sv.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/tr.json b/i18n/tr.json index 1156275..edb89db 100644 --- a/i18n/tr.json +++ b/i18n/tr.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/uk.json b/i18n/uk.json index 3afa64d..1916a24 100644 --- a/i18n/uk.json +++ b/i18n/uk.json @@ -185,5 +185,5 @@ "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.", "URL shortener may expose your decrypt key in URL.": "URL shortener may expose your decrypt key in URL.", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/i18n/zh.json b/i18n/zh.json index 65d795e..417dc52 100644 --- a/i18n/zh.json +++ b/i18n/zh.json @@ -185,5 +185,5 @@ "Encrypted note on PrivateBin": "PrivateBin上的加密笔记", "Visit this link to see the note. Giving the URL to anyone allows them to access the note, too.": "访问这个链接来查看该笔记。 将这个URL发送给任何人即可允许其访问该笔记。", "URL shortener may expose your decrypt key in URL.": "URL 缩短可能会暴露您在 URL 中的解密密钥。", - "Download": "Download" + "Save paste": "Save paste" } diff --git a/tpl/bootstrap.php b/tpl/bootstrap.php index 6575789..1e4eae0 100644 --- a/tpl/bootstrap.php +++ b/tpl/bootstrap.php @@ -213,7 +213,7 @@ endif; - + Date: Sun, 18 Apr 2021 14:14:46 +0200 Subject: [PATCH 7/9] feat: add form-action CSP restriction This follows a suggestion from HTTP Observatory: > Restricts where
contents may be submitted by using form-action 'none', form-action 'self', or specific URIs Fixes #778 --- cfg/conf.sample.php | 2 +- lib/Configuration.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg/conf.sample.php b/cfg/conf.sample.php index 570503c..5f8fef1 100644 --- a/cfg/conf.sample.php +++ b/cfg/conf.sample.php @@ -87,7 +87,7 @@ languageselection = false ; async functions and display an error if not and for Chrome to enable ; webassembly support (used for zlib compression). You can remove it if Chrome ; doesn't need to be supported and old browsers don't need to be warned. -; cspheader = "default-src 'none'; base-uri 'self'; manifest-src 'self'; connect-src * blob:; script-src 'self' 'unsafe-eval' resource:; style-src 'self'; font-src 'self'; img-src 'self' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads" +; cspheader = "default-src 'none'; base-uri 'self'; form-action 'self'; manifest-src 'self'; connect-src * blob:; script-src 'self' 'unsafe-eval' resource:; style-src 'self'; font-src 'self'; img-src 'self' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads" ; stay compatible with PrivateBin Alpha 0.19, less secure ; if enabled will use base64.js version 1.7 instead of 2.1.9 and sha1 instead of diff --git a/lib/Configuration.php b/lib/Configuration.php index 426cd15..113f6bd 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -55,7 +55,7 @@ class Configuration 'urlshortener' => '', 'qrcode' => true, 'icon' => 'identicon', - 'cspheader' => 'default-src \'none\'; base-uri \'self\'; manifest-src \'self\'; connect-src * blob:; script-src \'self\' \'unsafe-eval\' resource:; style-src \'self\'; font-src \'self\'; img-src \'self\' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads', + 'cspheader' => 'default-src \'none\'; base-uri \'self\'; form-action \'self\'; manifest-src \'self\'; connect-src * blob:; script-src \'self\' \'unsafe-eval\' resource:; style-src \'self\'; font-src \'self\'; img-src \'self\' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads', 'zerobincompatibility' => false, 'httpwarning' => true, 'compression' => 'zlib', From 3ca01024fd63512daea82110fa5db4c7379a2f27 Mon Sep 17 00:00:00 2001 From: rugk Date: Sun, 18 Apr 2021 14:16:39 +0200 Subject: [PATCH 8/9] feat: disallow form submission alltogether Following the tests and HTTP Observatory, I think we can disable forms altogether. Fixes https://github.com/PrivateBin/PrivateBin/issues/778 --- cfg/conf.sample.php | 2 +- lib/Configuration.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg/conf.sample.php b/cfg/conf.sample.php index 5f8fef1..a7b76a1 100644 --- a/cfg/conf.sample.php +++ b/cfg/conf.sample.php @@ -87,7 +87,7 @@ languageselection = false ; async functions and display an error if not and for Chrome to enable ; webassembly support (used for zlib compression). You can remove it if Chrome ; doesn't need to be supported and old browsers don't need to be warned. -; cspheader = "default-src 'none'; base-uri 'self'; form-action 'self'; manifest-src 'self'; connect-src * blob:; script-src 'self' 'unsafe-eval' resource:; style-src 'self'; font-src 'self'; img-src 'self' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads" +; cspheader = "default-src 'none'; base-uri 'self'; form-action 'none'; manifest-src 'self'; connect-src * blob:; script-src 'self' 'unsafe-eval' resource:; style-src 'self'; font-src 'self'; img-src 'self' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-popups allow-modals allow-downloads" ; stay compatible with PrivateBin Alpha 0.19, less secure ; if enabled will use base64.js version 1.7 instead of 2.1.9 and sha1 instead of diff --git a/lib/Configuration.php b/lib/Configuration.php index 113f6bd..a99c3f9 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -55,7 +55,7 @@ class Configuration 'urlshortener' => '', 'qrcode' => true, 'icon' => 'identicon', - 'cspheader' => 'default-src \'none\'; base-uri \'self\'; form-action \'self\'; manifest-src \'self\'; connect-src * blob:; script-src \'self\' \'unsafe-eval\' resource:; style-src \'self\'; font-src \'self\'; img-src \'self\' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads', + 'cspheader' => 'default-src \'none\'; base-uri \'self\'; form-action \'none\'; manifest-src \'self\'; connect-src * blob:; script-src \'self\' \'unsafe-eval\' resource:; style-src \'self\'; font-src \'self\'; img-src \'self\' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-popups allow-modals allow-downloads', 'zerobincompatibility' => false, 'httpwarning' => true, 'compression' => 'zlib', From fcb6422663954797d7344f045c30a45002b0d98a Mon Sep 17 00:00:00 2001 From: El RIDO Date: Sun, 18 Apr 2021 21:05:32 +0200 Subject: [PATCH 9/9] re-adding CSP directive sandbox allow-forms, it is needed for the password input form to work on the JS side --- cfg/conf.sample.php | 2 +- lib/Configuration.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg/conf.sample.php b/cfg/conf.sample.php index a7b76a1..ceddad6 100644 --- a/cfg/conf.sample.php +++ b/cfg/conf.sample.php @@ -87,7 +87,7 @@ languageselection = false ; async functions and display an error if not and for Chrome to enable ; webassembly support (used for zlib compression). You can remove it if Chrome ; doesn't need to be supported and old browsers don't need to be warned. -; cspheader = "default-src 'none'; base-uri 'self'; form-action 'none'; manifest-src 'self'; connect-src * blob:; script-src 'self' 'unsafe-eval' resource:; style-src 'self'; font-src 'self'; img-src 'self' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-popups allow-modals allow-downloads" +; cspheader = "default-src 'none'; base-uri 'self'; form-action 'none'; manifest-src 'self'; connect-src * blob:; script-src 'self' 'unsafe-eval' resource:; style-src 'self'; font-src 'self'; img-src 'self' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads" ; stay compatible with PrivateBin Alpha 0.19, less secure ; if enabled will use base64.js version 1.7 instead of 2.1.9 and sha1 instead of diff --git a/lib/Configuration.php b/lib/Configuration.php index a99c3f9..e509d98 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php @@ -55,7 +55,7 @@ class Configuration 'urlshortener' => '', 'qrcode' => true, 'icon' => 'identicon', - 'cspheader' => 'default-src \'none\'; base-uri \'self\'; form-action \'none\'; manifest-src \'self\'; connect-src * blob:; script-src \'self\' \'unsafe-eval\' resource:; style-src \'self\'; font-src \'self\'; img-src \'self\' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-popups allow-modals allow-downloads', + 'cspheader' => 'default-src \'none\'; base-uri \'self\'; form-action \'none\'; manifest-src \'self\'; connect-src * blob:; script-src \'self\' \'unsafe-eval\' resource:; style-src \'self\'; font-src \'self\'; img-src \'self\' data: blob:; media-src blob:; object-src blob:; sandbox allow-same-origin allow-scripts allow-forms allow-popups allow-modals allow-downloads', 'zerobincompatibility' => false, 'httpwarning' => true, 'compression' => 'zlib',