v3.0.2

This reverts commit 2f50c29152.

app/pasteManager.js

@@ -7,7 +7,7 @@ function getString(item) {
 export default function(state, emitter) {
   window.addEventListener('paste', async event => {
     if (state.route !== '/' || state.uploading) return;
-    if (['password', 'text'].includes(event.target.type)) return;
+    if (['password', 'text', 'email'].includes(event.target.type)) return;
 
     const items = Array.from(event.clipboardData.items);
     const transferFiles = items.filter(item => item.kind === 'file');

app/ui/legal.js

@@ -12,67 +12,93 @@ module.exports = function(state, emit) {
         <p class="mt-2">${state.translate('legalDateStamp')}</p>
         <div class="overflow-scroll py-8 px-12">
           <p class="leading-normal">
-            <span
-              >Send is a service from Mozilla that allows you to send electronic
-              files through a safe, private, and encrypted link that
-              automatically expires to ensure your stuff does not remain online
-              forever. Send is also subject to our</span
-            ><a
-              href="https://www.mozilla.org/privacy/websites"
+            <span>When Mozilla receives information from you, our</span>
+            <a
+              href="https://www.mozilla.org/privacy/"
               target="__blank"
               rel="noopener noreferrer"
               class="text-blue-dark hover:underline"
-              > Websites Privacy Policy</a
-            ><span
-              >. When you visit the Send website, information such as your IP
-              address is temporarily retained as part of a standard server
-              log.</span
+              >Mozilla Privacy Policy</a
             >
+            <span
+              >describes how we handle that information. Below are the top
+              things you should know about Firefox Send. You can also view the
+              code</span
+            >
+            <a
+              href="https://github.com/mozilla/send/blob/master/docs/metrics.md"
+              target="__blank"
+              rel="noopener noreferrer"
+              class="text-blue-dark hover:underline"
+              >here</a
+            >.
           </p>
-          <br>
-          <p>
-            Here are the other key things you should know about what is
-            happening when you use Send:
           <ul class="mt-6 leading-normal">
             <li class="mb-4">
-              Mozilla receives an encrypted copy of the file you upload, and
-              basic information about the file, such as filename, file hash, and
-              file size. Mozilla does not have the ability to access the content
-              of your encrypted file, and only keeps it for the time or number
-              of downloads indicated.
+              <b>Content</b>: Mozilla receives an encrypted copy of the file you
+              upload but we cannot access the content or name of your encrypted
+              file. By default, files are stored for a maximum of either 24
+              hours or 7 days. If you choose a download cap, the file can be
+              deleted from our server sooner.
             </li>
             <li class="mb-4">
-              To allow you to see the status of your previously uploaded files,
-              or delete them, basic information about your uploaded files are
-              stored on your local device, such as Send’s identifier for the
-              file, the filename, and the file’s unique download link. This is
-              cleared if you delete your uploaded file or upon visiting Send
-              after the file expires.
+              <b>Data on your device</b>: So that you can check status or delete
+              files, basic information about your uploaded files is stored on
+              your local device. This includes our identifier for the file, the
+              filename, and the file’s unique download URL. This is cleared if
+              you delete your uploaded file or upon visiting Send after the file
+              expires. Note, however, that the URL will persist in your browsing
+              history (and with whomever you shared it) until manually deleted.
             </li>
             <li class="mb-4">
-              Anyone you provide with the unique link (including the encryption
-              key) to your encrypted file will be able to download and access
-              that file. You should not provide the link to anyone you do not
-              want to have access to your encrypted file.
+              <b>Personal data</b>: The following is necessary to provide the
+              service:
+              <ul class="mt-6 leading-normal">
+                <li class="mb-4">
+                  <u>IP addresses</u>: We receive IP addresses of downloaders
+                  and uploaders as part of our standard server logs. These are
+                  retained for 90 days, and for that period, may be connected to
+                  activity of a file’s download URL. Although we develop our
+                  services in ways that minimize identification, you should know
+                  that it may be possible to correlate the IP address of a Send
+                  user to the IP address of other Mozilla services with
+                  accounts; and if there is a match, this could identify the
+                  account email address.
+                </li>
+                <li class="mb-4">
+                  <u>Firefox Account</u>: This is required for authentication
+                  only if you wish to upload larger file sizes. Your Firefox
+                  Account record will retain aggregate data on your usage of
+                  Send: for example, if you created a Firefox Account in
+                  connection with Send, number of files sent and approximate
+                  file sizes, and how many times you’ve used the service.
+                </li>
+              </ul>
             </li>
             <li class="mb-4">
-              Send will also collect information about the performance and your
-              use of the service, such as how often you upload files, how long
-              your files remain with Mozilla before they expire, any errors
-              related to file transfers, and what cryptographic protocols your
-              browser supports.
+              <b>Non-personal data</b>: We receive the following to improve our
+              service and performance:
+              <ul class="mt-6 leading-normal">
+                <li class="mb-4">
+                  <u>Interaction data</u>: This includes information such as
+                  number of people sending and receiving files, number of files
+                  uploaded and approximate file sizes, percentage of file
+                  downloaders who become uploaders, how people engage with the
+                  website (time spent, clicks, referrer information, site exit
+                  path, use of passwords).
+                </li>
+                <li class="mb-4">
+                  <u>Technical data</u>: This includes information such as
+                  operating system, browser, language preference, country,
+                  timestamps, duration for file transfer, reasons for errors,
+                  reasons for file expiration.
+                </li>
+              </ul>
             </li>
             <li class="mb-4">
-              You can learn more about the data Send collects<a
-                href="https://github.com/mozilla/send/blob/master/docs/metrics.md"
-                target="__blank"
-                rel="noopener noreferrer"
-                class="text-blue-dark hover:underline"
-                > here</a
-              >.
+              <b>Third Party Services</b>: We use Google Cloud Platform.
             </li>
           </ul>
-          </p>
         </div>
       </div>
     </main>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "firefox-send",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "firefox-send",
   "description": "File Sharing Experiment",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "author": "Mozilla (https://mozilla.org)",
   "repository": "mozilla/send",
   "homepage": "https://github.com/mozilla/send/",
@@ -157,6 +157,7 @@
   },
   "availableLanguages": [
     "en-US",
+    "bn-BD",
     "cak",
     "cs",
     "cy",

public/locales/bn-BD/send.ftl

@@ -53,3 +53,85 @@ passwordSetError = এই পাসওয়ার্ড সেট করা য
 -send-short-brand = প্রেরণ
 -firefox = Firefox
 -mozilla = Mozilla
+introTitle = সহজ, ব্যক্তিগত ফাইল শেয়ার
+introDescription = { -send-brand } ফাইল এনক্রিপশন ও স্বয়ংক্রিয়ভাবে মেয়াদ শেষ হবে এমন একটি লিঙ্কের মাধ্যমে শুরু-থেকে-শেষ পর্যন্ত শেয়ার করতে দেয়। একারণে আপনি যা শেয়ার করেন তা গোপন রাখতে এবং আপনার জিনিস চিরদিনের জন্য অনলাইনে থাকবে না তা নিশ্চিত করতে পারেন।
+notifyUploadEncryptDone = আপনার ফাইল এনক্রিপ্ট করা হয়েছে এবং প্রেরণ করতে প্রস্তুত
+# downloadCount is from the downloadCount string and timespan is a timespanMinutes string. ex. 'Expires after 2 downloads or 25 minutes'
+archiveExpiryInfo = { $downloadCount } বা { $timespan } পরে মেয়াদ শেষ হবে
+timespanMinutes =
+    { $num ->
+        [one] ১ মিনিট
+       *[other] { $num } মিনিট
+    }
+timespanDays =
+    { $num ->
+        [one] ১ দিন
+       *[other] { $num } দিন
+    }
+timespanWeeks =
+    { $num ->
+        [one] ১ সপ্তাহ
+       *[other] { $num } সপ্তাহ
+    }
+fileCount =
+    { $num ->
+        [one] ১টি ফাইল
+       *[other] { $num }টি ফাইল
+    }
+# size is a localized number followed by a unit of bytes, ex. 2.5GB
+totalSize = মোট আকার: { $size }
+# the next line after the colon contains a file name
+copyLinkDescription = আপনার ফাইল শেয়ার করতে লিঙ্ক অনুলিপি করুন:
+copyLinkButton = লিঙ্ক অনুলিপি
+downloadTitle = ফাইল ডাউনলোড
+downloadDescription = ফাইলটি { -send-brand } এর মাধ্যমে এনক্রিপশন ও স্বয়ংক্রিয় মেয়াদ শেষ হবে এমন একটি লিঙ্কের মাধ্যমে শুরু-থেকে-শেষ পর্যন্ত শেয়ার করা হয়েছে।
+trySendDescription = সহজ ও নিরাপদ ফাইল শেয়ারের জন্য { -send-brand } ব্যবহার করুন।
+# count will always be > 10
+tooManyFiles =
+    { $count ->
+        [one] একবারে কেবল ১টি ফাইল আপলোড করা যাবে।
+       *[other] একবারে কেবল { $count }টি ফাইল আপলোড করা যাবে।
+    }
+# count will always be > 10
+tooManyArchives =
+    { $count ->
+        [one] কেবল ১টি আর্কাইভ অনুমোদিত।
+       *[other] কেবল { $count } আর্কাইভ অনুমোদিত।
+    }
+expiredTitle = এই লিঙ্কের মেয়াদ শেষ হয়ে গেছে।
+notSupportedDescription = { -send-brand } এই ব্রাউজারের সাথে কাজ করবে না। { -firefox } এর সাম্প্রতিকতম সংস্করণে { -send-short-brand } সর্বোত্তমভাবে কাজ করবে, এবং এটি বেশিরভাগ ব্রাউজারের বর্তমান সংস্করণে কাজ করবে।
+downloadFirefox = { -firefox } ডাউনলোড করুন
+legalTitle = { -send-short-brand } গোপনীয়তা নোটিশ
+legalDateStamp = সংস্করণ ১.০, ১২ মার্চ, ২০১৯ তারিখ
+# A short representation of a countdown timer containing the number of days, hours, and minutes remaining as digits, example "2d 11h 56m"
+expiresDaysHoursMinutes = { $days }দি { $hours }ঘ { $minutes }মি
+addFilesButton = আপলোডের জন্য ফাইল নির্বাচন করুন
+uploadButton = আপলোড
+# the first part of the string 'Drag and drop files or click to send up to 1GB'
+dragAndDropFiles = ফাইল টেনে এনে ছাড়ুন
+# the second part of the string 'Drag and drop files or click to send up to 1GB'
+# size is a localized number followed by a unit of bytes, ex. 2.5GB
+orClickWithSize = বা সর্বোচ্চ { $size } আকারের ফাইল পাঠাতে ক্লিক করুন
+addPassword = পাসওয়ার্ড দ্বারা সুরক্ষিত রাখুন
+emailPlaceholder = আপনার ইমেইল দিন
+# size is a localized number followed by a unit of bytes, ex. 2.5GB
+signInSizeBump = সর্বোচ্চ { $size } আকারের ফাইল প্রেরণ করতে সাইন ইন করুন
+signInButton = সাইন ইন/আপ
+accountBenefitTitle = { -firefox } অ্যাকাউন্ট তৈরি অথবা সাইন ইন করুন
+# size is a localized number followed by a unit of bytes, ex. 2.5GB
+accountBenefitLargeFiles = সর্বোচ্চ { $size } আকারের ফাইল শেয়ার করুন
+accountBenefitDownloadCount = আরও মানুষের সাথে ফাইল শেয়ার করুন
+accountBenefitTimeLimit =
+    { $count ->
+        [one] ১ দিন পর্যন্ত লিঙ্ক সক্রিয় রাখুন
+       *[other] { $count } দিন পর্যন্ত লিঙ্ক সক্রিয় রাখুন
+    }
+accountBenefitSync = যেকোন ডিভাইস থেকে শেয়ার করা ফাইল পরিচালনা করুন
+accountBenefitMoz = অন্যান্য { -mozilla } সেবা সম্পর্কে জানুন
+signOut = সাইন আউট
+okButton = ঠিক আছে
+downloadingTitle = ডাউনলোড হচ্ছে
+noStreamsWarning = এই ব্রাউজার এতো বড় একটি ফাইল ডিক্রিপ্ট করতে সক্ষম নয়।
+noStreamsOptionCopy = অন্য ব্রাউজারে খুলতে লিঙ্ক অনুলিপি করুন
+noStreamsOptionFirefox = আমাদের জনপ্রিয় ব্রাউজার ব্যবহার করুন
+noStreamsOptionDownload = এই ব্রাউজার ব্যবহার অব্যহত রাখুন

public/locales/pt-BR/send.ftl

@@ -1,31 +1,9 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = experimento web
 siteFeedback = Opinião
-uploadPageHeader = Compartilhamento de arquivos com criptografia e privacidade
-uploadPageExplainer = Envie arquivos por meio de um link seguro, privado e criptografado que expira automaticamente para garantir que as suas coisas não permaneçam on-line para sempre.
-uploadPageLearnMore = Saiba mais
-uploadPageDropMessage = Arraste o arquivo para cá para iniciar o envio
-uploadPageSizeMessage = Para uma operação mais confiável, é melhor manter seu arquivo menor que 1GB
-uploadPageBrowseButton = Selecione um arquivo em seu computador
-uploadPageBrowseButton1 = Selecione um arquivo para enviar
-uploadPageMultipleFilesAlert = Enviar múltiplos arquivos ou uma pasta ainda não é suportado.
-uploadPageBrowseButtonTitle = Enviar arquivo
-uploadingPageProgress = Enviando { $filename } ({ $size })
 importingFile = Importando…
-verifyingFile = Verificando…
 encryptingFile = Criptografando…
 decryptingFile = Descriptografando…
-notifyUploadDone = Arquivo enviado.
-uploadingPageMessage = Uma vez que seu arquivo seja enviado você poderá definir opções de expiração.
-uploadingPageCancel = Cancelar envio
-uploadCancelNotification = Você cancelou o envio.
-uploadingPageLargeFileMessage = Esse arquivo é grande e pode demorar para ser enviado. Aguarde!
-uploadingFileNotification = Me avise quando completar o envio.
-uploadSuccessConfirmHeader = Pronto para enviar
-uploadSvgAlt = Enviar
-uploadSuccessTimingHeader = O link para o seu arquivo expirará após 1 download ou em 24 horas.
-expireInfo = O link para o seu arquivo expirará após { $downloadCount } ou { $timepan }.
 downloadCount =
     { $num ->
         [one] 1 download
@@ -36,76 +14,26 @@ timespanHours =
         [one] 1 hora
        *[other] { $num } horas
     }
-copyUrlFormLabelWithName = Copie e compartilhe o link para enviar o seu arquivo: { $filename }
-copyUrlFormButton = Copiar para área de transferência
 copiedUrl = Copiado!
-deleteFileButton = Excluir arquivo
-sendAnotherFileLink = Enviar outro arquivo
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = Baixar
-downloadsFileList = Downloads
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = Tempo
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = Baixar { $filename }
-downloadFileSize = ({ $size })
-unlockInputLabel = Insira a senha
 unlockInputPlaceholder = Senha
 unlockButtonLabel = Desbloquear
-downloadFileTitle = Baixar arquivo criptografado
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = Seu amigo está te enviando um arquivo através do Firefox Send, um serviço que permite compartilhar arquivos com um link seguro, privado e criptografado que automaticamente expira para garantir que suas coisas não permaneçam on-line eternamente.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = Baixar
-downloadNotification = Seu download terminou.
 downloadFinish = Download concluído
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize } de { $totalSize })
-# Firefox Send is a brand name and should not be localized.
 sendYourFilesLink = Experimente o Firefox Send
-downloadingPageProgress = Baixando { $filename } ({ $size })
-downloadingPageMessage = Deixe esta aba aberta enquanto seu arquivo é baixado e descriptografado.
-errorAltText = Erro no envio
 errorPageHeader = Oops, ocorreu um erro!
-errorPageMessage = Houve um erro ao enviar o arquivo.
-errorPageLink = Enviar outro arquivo
 fileTooBig = Esse arquivo é grande demais para ser enviado. Deve ser menor que { $size }.
 linkExpiredAlt = Link expirou
-expiredPageHeader = Esse link expirou, ou talvez nunca tenha existido!
 notSupportedHeader = Seu navegador não é suportado.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = Infelizmente esse navegador não suporta a tecnologia usada pelo Firefox Send. Tente com outro navegador. Recomendamos o Firefox!
 notSupportedLink = Por que meu navegador não é suportado?
 notSupportedOutdatedDetail = Infelizmente essa versão do Firefox não suporta a tecnologia web que faz o Firefox Send funcionar. Você precisa atualizar o seu navegador.
 updateFirefox = Atualizar o Firefox
-downloadFirefoxButtonSub = Download gratuito
-uploadedFile = Arquivo
-copyFileList = Copiar URL
-# expiryFileList is used as a column header
-expiryFileList = Expira em
-deleteFileList = Excluir
-nevermindButton = Esqueça
-legalHeader = Termos e privacidade
-legalNoticeTestPilot = Firefox Send é um experimento do Test Pilot, sujeito aos <a>Termos de Serviço</a> e ao <a>Aviso de Privacidade</a> do Test Pilot. Você pode aprender mais sobre esse experimento e a coleta de dados <a>aqui</a>.
-legalNoticeMozilla = O uso do site do Firefox Send também está sujeito ao <a>Aviso de privacidade de sites</a> e aos <a>Termos de uso de sites</a> da Mozilla.
-deletePopupText = Excluir este arquivo?
-deletePopupYes = Sim
 deletePopupCancel = Cancelar
 deleteButtonHover = Excluir
-copyUrlHover = Copiar URL
 footerLinkLegal = Jurídico
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Sobre o Test Pilot
 footerLinkPrivacy = Privacidade
-footerLinkTerms = Termos
 footerLinkCookies = Cookies
-requirePasswordCheckbox = Exigir uma senha para baixar este arquivo
-addPasswordButton = Adicionar senha
-changePasswordButton = Alterar
 passwordTryAgain = Senha incorreta. Tente novamente.
-reportIPInfringement = Reportar violação de IP
 javascriptRequired = O Firefox Send requer JavaScript
 whyJavascript = Por que o Firefox Send precisa do JavaScript?
 enableJavascript = Habilite o JavaScript e tente novamente.
@@ -113,14 +41,12 @@ enableJavascript = Habilite o JavaScript e tente novamente.
 expiresHoursMinutes = { $hours }h { $minutes }m
 # A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
 expiresMinutes = { $minutes }m
-# A short status message shown when a password is successfully set
-passwordIsSet = Senha definida
 # A short status message shown when the user enters a long password
 maxPasswordLength = Tamanho máximo da senha: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = Essa senha não pôde ser definida
 
-## New strings for the vNext version of Firefox Send
+## Send version 2 strings
 
 # Firefox Send, Send, Firefox, Mozilla are proper names and should not be localized
 -send-brand = Firefox Send
@@ -197,8 +123,8 @@ accountBenefitLargeFiles = Compartilhe arquivos até { $size }
 accountBenefitDownloadCount = Compartilhe arquivos com mais pessoas
 accountBenefitTimeLimit =
     { $count ->
-        [one] Manter links ativos por até 1 dia
-       *[other] Manter links ativos por até { $count } dias
+        [one] Mantenha links ativos por até 1 dia
+       *[other] Mantenha links ativos por até { $count } dias
     }
 accountBenefitSync = Gerencie arquivos compartilhados a partir de qualquer dispositivo
 accountBenefitMoz = Conheça outros serviços da { -mozilla }

server/layout.js

@@ -21,11 +21,11 @@ module.exports = function(state, body = '') {
         <meta name="twitter:card" content="summary" />
         <meta
           property="og:image"
-          content="${state.baseUrl}${assets.get('send-fb.jpg')}"
+          content="${state.baseUrl}/${assets.get('send-fb.jpg')}"
         />
         <meta
           name="twitter:image"
-          content="${state.baseUrl}${assets.get('send-twitter.jpg')}"
+          content="${state.baseUrl}/${assets.get('send-twitter.jpg')}"
         />
         <meta property="og:url" content="${state.baseUrl}" />
         <meta name="theme-color" content="#220033" />