diff --git a/public/locales/cy/send.ftl b/public/locales/cy/send.ftl
index 90adf3c4..8fc7d397 100644
--- a/public/locales/cy/send.ftl
+++ b/public/locales/cy/send.ftl
@@ -1,31 +1,9 @@
 # Firefox Send is a brand name and should not be localized.
 title = Firefox Send
-siteSubtitle = arbrawf gwe
 siteFeedback = Adborth
-uploadPageHeader = Rhannu Ffeiliau wedi eu Hamgryptio yn Breifat
-uploadPageExplainer = Anfon ffeiliau drwy ddolen diogel, breifat ac wedi ei amgryptio sy'n dod i ben yn awtomatig er mwyn sicrhau nad yw eich pethau'n bodoli ar lein am byth.
-uploadPageLearnMore = Dysgu rhagor
-uploadPageDropMessage = Gollyngwch eich ffeiliau yma i gychwyn llwytho i fyny
-uploadPageSizeMessage = Mae'n well cadw maint y ffeiliau o dan 1GB er mwyn iddo weithio ar ei orau.
-uploadPageBrowseButton = Dewiswch ffeil ar eich cyfrifiadur
-uploadPageBrowseButton1 = Dewiswch ffeil i'w llwytho i fyny
-uploadPageMultipleFilesAlert = Nid yw llwytho nifer lluosog o ffeiliau neu ffolder yn cael ei gynnal ar hyn o bryd.
-uploadPageBrowseButtonTitle = Llwytho ffeil i fyny
-uploadingPageProgress = Llwytho { $filename } ({ $maint }) i fyny
 importingFile = Mewnforio…
-verifyingFile = Wrthi'n gwirio…
 encryptingFile = Wrthi'n amgryptio…
 decryptingFile = Wrthi'n dadgryptio…
-notifyUploadDone = Mae eich llwytho wedi gorffen.
-uploadingPageMessage = Unwaith y bydd eich ffeil wedi llwytho bydd modd gosod y manylion dod i ben.
-uploadingPageCancel = Diddymu'r llwytho
-uploadCancelNotification = Cafodd eich llwytho ei ddiddymu.
-uploadingPageLargeFileMessage = Mae'r ffeil yn fawr a gall gymryd peth amser i'w llwytho. Amynedd!
-uploadingFileNotification = Dweud pan fydd y llwytho wedi gorffen.
-uploadSuccessConfirmHeader = Yn Barod i Anfon
-uploadSvgAlt = Llwytho i Fyny
-uploadSuccessTimingHeader = Bydd y ddolen i'ch ffeil y dod i ben ar ôl 1 llwytho neu o fewn 24 awr.
-expireInfo = Bydd y ddolen i'ch ffeil yn dod i ben ym mhen { $downloadCount } neu { $timespan }.
 downloadCount =
     { $num ->
         [zero] Llwythi i lawr
@@ -44,76 +22,26 @@ timespanHours =
         [many] awr
        *[other] awr
     }
-copyUrlFormLabelWithName = Copïo a rhannu'r ddolen i anfon eich ffeil: { $filename }
-copyUrlFormButton = Copïo i'r clipfwrdd
 copiedUrl = Wedi eu copïo!
-deleteFileButton = Dileu ffeil
-sendAnotherFileLink = Anfon ffeil arall
-# Alternative text used on the download link/button (indicates an action).
-downloadAltText = Llwytho i lawr
-downloadsFileList = Llwythi
-# Used as header in a column indicating the amount of time left before a
-# download link expires (e.g. "10h 5m")
-timeFileList = Amser
-# Used as header in a column indicating the number of times a file has been
-# downloaded
-downloadFileName = Llwytho i lawr { $filename }
-downloadFileSize = ({ $size })
-unlockInputLabel = Rhowch Gyfrinair
 unlockInputPlaceholder = Cyfrinair
 unlockButtonLabel = Datgloi
-downloadFileTitle = Llwythwch Ffeil wedi ei Hamgryptio i Lawr
-# Firefox Send is a brand name and should not be localized.
-downloadMessage = Mae ffrind i chi yn anfon ffeil atoch drwy Firefox Send, gwasanaeth sy'n caniatáu i chi rannu ffeiliau drwy ddolen ddiogel, breifat ac wedi ei amgryptio sy'n dod i ben yn awtomatig er mwyn sicrhau nad yw eich deunydd yn aros ar-lein am byth.
-# Text and title used on the download link/button (indicates an action).
 downloadButtonLabel = Llwytho i Lawr
-downloadNotification = Mae eich llwytho wedi gorffen
 downloadFinish = Llwytho wedi Gorffen
-# This message is displayed when uploading or downloading a file, e.g. "(1,3 MB of 10 MB)".
 fileSizeProgress = ({ $partialSize } o { $totalSize })
-# Firefox Send is a brand name and should not be localized.
 sendYourFilesLink = Rhowch gynnig ar Firefox Send
-downloadingPageProgress = Llwytho i lawr { $filename } ({ $size })
-downloadingPageMessage = Gadewch y tab yma ar agor tra fyddwn yn estyn eich ffeil a'i dad-amgryptio.
-errorAltText = Gwall llwytho
 errorPageHeader = Aeth rhywbeth o'i le!
-errorPageMessage = Bu gwall wrth lwytho'r ffeil.
-errorPageLink = Anfon ffeil arall
 fileTooBig = Mae'r ffeil yn rhy fawr i'w llwytho. Dylai fod yn llai na { $size }.
 linkExpiredAlt = Mae'r ddolen wedi dod i ben
-expiredPageHeader = Mae'r ddolen wedi dod i ben neu nad yw wedi bodoli erioed!
 notSupportedHeader = Nid yw eich porwr yn cael ei gynnal.
-# Firefox Send is a brand name and should not be localized.
-notSupportedDetail = Yn anffodus, nid yw'r porwr hwn yn cynnal y technoleg gwe sy'n cynnal Firefox Send. Bydd angen i chi ddefnyddio porwr arall. Rydym ni'n argymell Firefox!
 notSupportedLink = Pam nad yw fy mhorwr yn cael ei gynnal?
 notSupportedOutdatedDetail = Yn anffodus, nid yw'r fersiwn yma o Firefox yn cynnal y technoleg gwe sy'n gyrru Firefox Send. Bydd angen i chi ddiweddaru eich porwr.
 updateFirefox = Diweddaru Firefox
-downloadFirefoxButtonSub = Llwytho i Lawr am Ddim
-uploadedFile = Ffeil
-copyFileList = Copïo URL
-# expiryFileList is used as a column header
-expiryFileList = Daw i ben ymhen
-deleteFileList = Dileu
-nevermindButton = Dim ots
-legalHeader = Amodau a Phreifatrwydd
-legalNoticeTestPilot = Ar hyn o mae Firefox Send yn arbrawf  o fewn rhaglen Test Pilot ac yn destun <a>Amodau Gwasanaeth</a> a <a>Hysbysiad Preifatrwydd</a> Test Pilot . Gallwch ddysgu rhagor am yr arbrawf a'r data mae'n ei gasglu <a>yma</a>.
-legalNoticeMozilla = Mae'r defnydd o wefan Firefox Send hefyd yn destun <a>Hysbysiad Preifatrwydd Gwefannau</a> ac <a>Amodau Defnydd Gwefannau</a> Mozilla.
-deletePopupText = Dileu'r ffeil?
-deletePopupYes = Iawn
 deletePopupCancel = Diddymu
 deleteButtonHover = Dileu
-copyUrlHover = Copïo'r URL
 footerLinkLegal = Cyfreithiol
-# Test Pilot is a proper name and should not be localized.
-footerLinkAbout = Ynghylch Test Pilot
 footerLinkPrivacy = Preifatrwydd
-footerLinkTerms = Amodau
 footerLinkCookies = Cwcis
-requirePasswordCheckbox = Gosod angen cyfrinair i lwytho'r ffeil hon i lawr
-addPasswordButton = Ychwanegu Cyfrinair
-changePasswordButton = Newid
 passwordTryAgain = Cyfrinair anghywir. Ceisiwch eto.
-reportIPInfringement = Adrodd ar Gamddefnydd o'r IP
 javascriptRequired = Mae Firefox Send angen JavaScript
 whyJavascript = Pam fod Firefox Send angen JavaScript?
 enableJavascript = Galluogwch JavaScript a cheisio eto.
@@ -121,14 +49,12 @@ enableJavascript = Galluogwch JavaScript a cheisio eto.
 expiresHoursMinutes = { $hours }a { $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 = Wedi gosod y cyfrinair
 # A short status message shown when the user enters a long password
 maxPasswordLength = Hyd mwyaf cyfrinair: { $length }
 # A short status message shown when there was an error setting the password
 passwordSetError = Nid oedd modd gosod y cyfrinair hwn
 
-## 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
@@ -176,7 +102,17 @@ fileCount =
         [many] { $num } ffeil
        *[other] { $num } ffeil
     }
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# byte abbreviation
+bytes = B
+# kibibyte abbreviation
+kb = KB
+# mebibyte abbreviation
+mb = MB
+# gibibyte abbreviation
+gb = GB
+# localized number and byte abbreviation. example "2.5MB"
+fileSize = { $num }{ $units }
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 totalSize = Cyfanswm maint: { $size }
 # the next line after the colon contains a file name
 copyLinkDescription = Copïwch y ddolen i rannu eich ffeil:
@@ -216,15 +152,15 @@ uploadButton = Llwytho i fyny
 # the first part of the string 'Drag and drop files or click to send up to 1GB'
 dragAndDropFiles = Llusgo a gollwng ffeiliau
 # 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
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 orClickWithSize = neu glicio i anfon hyd at { $size }
 addPassword = Diogelu gyda chyfrinair
 emailPlaceholder = Rhowch eich e-bost
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 signInSizeBump = Mewngofnodi i anfon hyd at { $size }
 signInButton = Mewngofnodi/Cofrestru
 accountBenefitTitle = Creu Cyfrif { -firefox } neu fewngofnodi
-# size is a localized number followed by a unit of bytes, ex. 2.5GB
+# $size is the size of the file, displayed using the fileSize message as format (e.g. "2.5MB")
 accountBenefitLargeFiles = Rhannu ffeiliau hyd at { $size }
 accountBenefitDownloadCount = Rhannu ffeiliau gyda mwy o bobl
 accountBenefitTimeLimit =