fixed a couple weird merge issues in en-US/send.ftl

This commit is contained in:
Danny Coates 2019-03-06 14:16:15 -08:00
parent fb0f0f0b5d
commit 796b98680c
No known key found for this signature in database
GPG key ID: 4C442633C62E00CB

View file

@ -1,5 +1,3 @@
## strings inherited from Send version 1
# Firefox Send is a brand name and should not be localized. # Firefox Send is a brand name and should not be localized.
title = Firefox Send title = Firefox Send
siteFeedback = Feedback siteFeedback = Feedback
@ -26,7 +24,7 @@ fileTooBig = That file is too big to upload. It should be less than { $size }
linkExpiredAlt = Link expired linkExpiredAlt = Link expired
notSupportedHeader = Your browser is not supported. notSupportedHeader = Your browser is not supported.
notSupportedLink = Why is my browser not supported? notSupportedLink = Why is my browser not supported?
notSupportedOutdatedDetail = Unfortunately this version of Firefox does not port the web technology that powers Firefox Send. Youll need to update your wser. notSupportedOutdatedDetail = Unfortunately this version of Firefox does not support the web technology that powers Firefox Send. Youll need to update your browser.
updateFirefox = Update Firefox updateFirefox = Update Firefox
deletePopupCancel = Cancel deletePopupCancel = Cancel
deleteButtonHover = Delete deleteButtonHover = Delete
@ -37,9 +35,9 @@ passwordTryAgain = Incorrect password. Try again.
javascriptRequired = Firefox Send requires JavaScript javascriptRequired = Firefox Send requires JavaScript
whyJavascript = Why does Firefox Send require JavaScript? whyJavascript = Why does Firefox Send require JavaScript?
enableJavascript = Please enable JavaScript and try again. enableJavascript = Please enable JavaScript and try again.
# A short representation of a countdown timer containing the number of hours minutes remaining as digits, example "13h 47m" # A short representation of a countdown timer containing the number of hours and minutes remaining as digits, example "13h 47m"
expiresHoursMinutes = { $hours }h { $minutes }m expiresHoursMinutes = { $hours }h { $minutes }m
# A short representation of a countdown timer containing the number of utes remaining as digits, example "56m" # A short representation of a countdown timer containing the number of minutes remaining as digits, example "56m"
expiresMinutes = { $minutes }m expiresMinutes = { $minutes }m
# A short status message shown when the user enters a long password # A short status message shown when the user enters a long password
maxPasswordLength = Maximum password length: { $length } maxPasswordLength = Maximum password length: { $length }