From ca284e80e6e1835ef938c553c56899a38874974d Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Tue, 30 Aug 2016 16:03:57 -0400 Subject: [PATCH 01/48] Change localization IDs for basic auth I think transifex is not picking up the change because of the placeholder only change Fix #3578 --- app/extensions/brave/locales/en-US/app.properties | 4 ++-- js/components/loginRequired.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/extensions/brave/locales/en-US/app.properties b/app/extensions/brave/locales/en-US/app.properties index e2934411ab9..4345bcc4c57 100644 --- a/app/extensions/brave/locales/en-US/app.properties +++ b/app/extensions/brave/locales/en-US/app.properties @@ -69,8 +69,8 @@ moreBookmarks=More bookmarks... fullScreenModeWarning={{host}} entered full screen mode, press ESC to exit. braveMenuTotalReplacements=Total Replacements: {{count}} basicAuthRequired=Authentication Required -basicAuthUsername=Username: -basicAuthPassword=Password: +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{host}} requires a username and password. crashScreenHeader=Something went wrong =( crashScreenText=An error occurred while displaying this webpage. To continue, reload or navigate to another page. diff --git a/js/components/loginRequired.js b/js/components/loginRequired.js index 04ee7328055..ab28b8b711b 100644 --- a/js/components/loginRequired.js +++ b/js/components/loginRequired.js @@ -78,13 +78,13 @@ class LoginRequired extends React.Component {
-
{ !this.isFolder ?
-
: null From c60d31fcee14607ef89f5cfc5f6b59a29aba7130 Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Tue, 30 Aug 2016 17:35:25 -0400 Subject: [PATCH 02/48] Update l10n Auditors: @aekeus Test plan: n/a Since I changed the string ID and its not present in other langs it should just grab from the english one --- .../brave/locales/bn-BD/preferences.properties | 4 +++- .../brave/locales/bn-IN/preferences.properties | 4 +++- .../brave/locales/cs/preferences.properties | 4 +++- .../brave/locales/de-DE/preferences.properties | 4 +++- .../brave/locales/es/preferences.properties | 4 +++- .../brave/locales/fr-FR/preferences.properties | 14 ++++++++------ .../brave/locales/hi-IN/preferences.properties | 4 +++- .../brave/locales/id-ID/preferences.properties | 4 +++- .../brave/locales/ja-JP/preferences.properties | 4 +++- .../brave/locales/nl-NL/preferences.properties | 4 +++- .../brave/locales/pt-BR/preferences.properties | 4 +++- .../brave/locales/sl/preferences.properties | 4 +++- .../brave/locales/ta/preferences.properties | 4 +++- .../brave/locales/te/preferences.properties | 4 +++- .../brave/locales/tr-TR/preferences.properties | 4 +++- .../brave/locales/uk/preferences.properties | 4 +++- 16 files changed, 53 insertions(+), 21 deletions(-) diff --git a/app/extensions/brave/locales/bn-BD/preferences.properties b/app/extensions/brave/locales/bn-BD/preferences.properties index 1776358c58b..ab5319d05c7 100644 --- a/app/extensions/brave/locales/bn-BD/preferences.properties +++ b/app/extensions/brave/locales/bn-BD/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Brave Payments এখনো Beta পর্যায়ে আ paymentsWelcomeText5=আরো জানতে চান? paymentsWelcomeText6=Brave Payment এর জন্য... paymentsWelcomeLink=প্রায়ই যেসব প্রশ্ন করা হয় +publisherPaymentsTitle=Brave Payments +publisherPaymentsTitleBeta=beta paymentsSidebarText1=আমাদের সহযোগী paymentsSidebarText2=সকল অর্থ আদান-প্রদানের সাথে জড়িত IP ঠিকানাগুলোর গোপনীয়তা যাদের প্রযুক্তিতে করা হয়েছে: paymentsSidebarText3=যাদের সহযোগীতায় Brave Bitcoin Wallets এর সুবিধা পাচ্ছেন: @@ -56,7 +58,7 @@ usd=$ done=সম্পন্ন off=বন্ধ on=চালু -notifications=বিজ্ঞপ্তি +notifications=notifications moneyAdd=আপনার ডেবিট বা ক্রেডিট কার্ড ব্যবহার করুন add= Coinbase দিয়ে কিনুন addFundsTitle=ফান্ড যোগ করুন... diff --git a/app/extensions/brave/locales/bn-IN/preferences.properties b/app/extensions/brave/locales/bn-IN/preferences.properties index 195f6fcb0e1..a572a898e2c 100644 --- a/app/extensions/brave/locales/bn-IN/preferences.properties +++ b/app/extensions/brave/locales/bn-IN/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ +publisherPaymentsTitle=Brave Payments +publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -56,7 +58,7 @@ usd=$ done=Done off=off on=on -notifications=Notifications +notifications=notifications moneyAdd=Use your debit or credit card add=Buy with Coinbase addFundsTitle=Add funds... diff --git a/app/extensions/brave/locales/cs/preferences.properties b/app/extensions/brave/locales/cs/preferences.properties index e8c6fac25ba..91424d34c19 100644 --- a/app/extensions/brave/locales/cs/preferences.properties +++ b/app/extensions/brave/locales/cs/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Potřebujete více informací? paymentsWelcomeText6=Pro platby Brave... paymentsWelcomeLink=Zobrazit často kladené otázky +publisherPaymentsTitle=Platby Brave +publisherPaymentsTitleBeta=beta paymentsSidebarText1=Naši partneři paymentsSidebarText2=Všechny adresy IP transakcí anonymizovány pomocí technologie od: paymentsSidebarText3=Peněženky Brave s bitcoiny jsou poskytovány pomocí partnerství: @@ -56,7 +58,7 @@ usd=$ done=Hotovo off=vypnuto on=zapnuto -notifications=Oznámení +notifications=notifications moneyAdd=Použít vaši debetní nebo kreditní kartu add=Koupit s Coinbase addFundsTitle=Add funds... diff --git a/app/extensions/brave/locales/de-DE/preferences.properties b/app/extensions/brave/locales/de-DE/preferences.properties index ba289888dad..232ceffc11e 100644 --- a/app/extensions/brave/locales/de-DE/preferences.properties +++ b/app/extensions/brave/locales/de-DE/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ +publisherPaymentsTitle=Brave Payments +publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -56,7 +58,7 @@ usd=$ done=Done off=off on=on -notifications=Notifications +notifications=notifications moneyAdd=Use your debit or credit card add=Buy with Coinbase addFundsTitle=Add funds... diff --git a/app/extensions/brave/locales/es/preferences.properties b/app/extensions/brave/locales/es/preferences.properties index fc39815f52b..7421cd19583 100644 --- a/app/extensions/brave/locales/es/preferences.properties +++ b/app/extensions/brave/locales/es/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ +publisherPaymentsTitle=Brave Payments +publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -56,7 +58,7 @@ usd=$ done=Done off=off on=on -notifications=Notifications +notifications=notifications moneyAdd=Use your debit or credit card add=Buy with Coinbase addFundsTitle=Add funds... diff --git a/app/extensions/brave/locales/fr-FR/preferences.properties b/app/extensions/brave/locales/fr-FR/preferences.properties index 0059c623e91..140dfe42926 100644 --- a/app/extensions/brave/locales/fr-FR/preferences.properties +++ b/app/extensions/brave/locales/fr-FR/preferences.properties @@ -19,10 +19,12 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Besoin de plus d'informations ? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=Voir la FAQ +publisherPaymentsTitle=Brave Payments +publisherPaymentsTitleBeta=bêta paymentsSidebarText1=Nos partenaires -paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: +paymentsSidebarText2=Toutes les adresses IP sont anonymisées avec la technologie de : paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: -paymentsSidebarText4=Your contributions in the form of credit cards and bank cards are handled by: +paymentsSidebarText4=Vos contributions par cartes de crédit et bancaires sont gérées par : accountBalance=solde du compte monthlyBudget=budget mensuel status=statut @@ -31,8 +33,8 @@ createWalletStatus=Pour commencer, cliquez sur "créer un porte-monnaie" creatingWallet=création... creatingWalletStatus=Création du porte-monnaie... createdWalletStatus=Votre porte-monnaie est prêt ! -pendingFundsStatus=Pending funds: {{funds}}. Newly-added funds may take 30+ minutes to appear. -insufficientFundsStatus=Your account balance is under your budget for this month. Please add funds. +pendingFundsStatus=Fonds en attente : {{funds}}. Les fonds récemment ajoutés peuvent prendre plus de 30 minutes avant d'apparaître. +insufficientFundsStatus=Le solde de votre compte est inférieur à votre budget pour ce mois. Veuillez ajouter des fonds. defaultWalletStatus=Merci d'aider à supporter vos sites préférés ! tableEmptyText=No table data. notificationEmptyText=Top publisher visits @@ -49,14 +51,14 @@ bitcoinPaymentURL=Scannez le QR code ou copier ce lien : bitcoinQR=QR code du porte-monnaie Brave : paymentHistoryTitle=Votre historique de paiement bitcoinCopyAddress=Copier l'adresse Bitcoin dans le presse-papier -bitcoinVisitAccount=Transfer BTC +bitcoinVisitAccount=Transférer des BTC bitcoinBalance=Merci de transférer :  bitcoinWalletNotAvailable=Les informations du porte-monnaie ne sont pas disponibles. :( usd=$ done=Fait off=désactivé on=activé -notifications=Notifications +notifications=notifications moneyAdd=Utilisez votre carte de débit ou de crédit add=Acheter avec Coinbase addFundsTitle=Ajouter des fonds... diff --git a/app/extensions/brave/locales/hi-IN/preferences.properties b/app/extensions/brave/locales/hi-IN/preferences.properties index fd72ffcbf8d..4fb9174dcf6 100644 --- a/app/extensions/brave/locales/hi-IN/preferences.properties +++ b/app/extensions/brave/locales/hi-IN/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ +publisherPaymentsTitle=Brave Payments +publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -56,7 +58,7 @@ usd=$ done=Done off=off on=on -notifications=Notifications +notifications=notifications moneyAdd=Use your debit or credit card add=Buy with Coinbase addFundsTitle=Add funds... diff --git a/app/extensions/brave/locales/id-ID/preferences.properties b/app/extensions/brave/locales/id-ID/preferences.properties index 90acf0c6384..823e829f572 100644 --- a/app/extensions/brave/locales/id-ID/preferences.properties +++ b/app/extensions/brave/locales/id-ID/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Saat ini Pembayaran Brave masih dalam versi Beta. Dengan ba paymentsWelcomeText5=Butuh informasi lebih lanjut? paymentsWelcomeText6=untuk Pembayaran Brave... paymentsWelcomeLink=Lihat FAQ +publisherPaymentsTitle=Pembayaran Brave +publisherPaymentsTitleBeta=beta paymentsSidebarText1=Mitra kami paymentsSidebarText2=Semua alamat IP transaksi dianonimkan menggunakan teknologi dari: paymentsSidebarText3=Dompet Bitcoin Brave tersedia melalui kerja sama dengan: @@ -56,7 +58,7 @@ usd=$ done=Selesai off=mati on=nyala -notifications=Notifikasi +notifications=notifikasi moneyAdd=Gunakan kartu debit atau kartu kredit Anda add=Beli dengan Coinbase addFundsTitle=Tambahkan dana... diff --git a/app/extensions/brave/locales/ja-JP/preferences.properties b/app/extensions/brave/locales/ja-JP/preferences.properties index 242cba78c89..5d82b41a6d3 100644 --- a/app/extensions/brave/locales/ja-JP/preferences.properties +++ b/app/extensions/brave/locales/ja-JP/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Braveペイメントは現在ベータ版です。ユーザ paymentsWelcomeText5=詳細はこちら paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=よくある質問を表示 +publisherPaymentsTitle=Braveペイメント +publisherPaymentsTitleBeta=ベータ paymentsSidebarText1=パートナー paymentsSidebarText2=取引に用いられるIPアドレスは以下のサービスの技術で匿名化されます paymentsSidebarText3=Braveのビットコインウォレットは以下のパートナーシップにより提供されます @@ -56,7 +58,7 @@ usd=$ done=完了しました off=オフ on=オン -notifications=通知する +notifications=notifications moneyAdd=デビットカードかクレジットカードを使う add=Coinbaseで買う addFundsTitle=送金する diff --git a/app/extensions/brave/locales/nl-NL/preferences.properties b/app/extensions/brave/locales/nl-NL/preferences.properties index d042715605d..7c2ab097e02 100644 --- a/app/extensions/brave/locales/nl-NL/preferences.properties +++ b/app/extensions/brave/locales/nl-NL/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ +publisherPaymentsTitle=Brave Payments +publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -56,7 +58,7 @@ usd=$ done=Done off=off on=on -notifications=Notifications +notifications=notifications moneyAdd=Use your debit or credit card add=Buy with Coinbase addFundsTitle=Add funds... diff --git a/app/extensions/brave/locales/pt-BR/preferences.properties b/app/extensions/brave/locales/pt-BR/preferences.properties index ba1b91cab5a..81bd47ef92d 100644 --- a/app/extensions/brave/locales/pt-BR/preferences.properties +++ b/app/extensions/brave/locales/pt-BR/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Precisa de mais informações? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ +publisherPaymentsTitle=Brave Payments +publisherPaymentsTitleBeta=beta paymentsSidebarText1=Nossos Parceiros paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -56,7 +58,7 @@ usd=$ done=Feito off=off on=on -notifications=Notificações +notifications=notifications moneyAdd=Usar cartão de débito ou crédito add=Buy with Coinbase addFundsTitle=Add funds... diff --git a/app/extensions/brave/locales/sl/preferences.properties b/app/extensions/brave/locales/sl/preferences.properties index 4ce349b4757..32f706ba60e 100644 --- a/app/extensions/brave/locales/sl/preferences.properties +++ b/app/extensions/brave/locales/sl/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Plačila Brave so trenutno v fazi beta. Z vašo pomočjo in paymentsWelcomeText5=Želite več informacij? paymentsWelcomeText6=za Plačila Brave ... paymentsWelcomeLink=Pokaži pogosto zastavljena vprašanja +publisherPaymentsTitle=Plačila Brave +publisherPaymentsTitleBeta=beta paymentsSidebarText1=Naši partnerji paymentsSidebarText2=Vsi naslovi IP transakcij se anonimizirajo s tehnologijo, ki jo zagotavlja: paymentsSidebarText3=Denarnice Bitcoin Brave zagotavlja partnerstvo z: @@ -56,7 +58,7 @@ usd=$ done=Opravljeno off=izključeno on=vključeno -notifications=Obvestila +notifications=notifications moneyAdd=Uporabite svojo debetno ali kreditno kartico add=Kupi s Coinbase addFundsTitle=Dodaj sredstva ... diff --git a/app/extensions/brave/locales/ta/preferences.properties b/app/extensions/brave/locales/ta/preferences.properties index b37f2b70f3c..2212fd67b32 100644 --- a/app/extensions/brave/locales/ta/preferences.properties +++ b/app/extensions/brave/locales/ta/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ +publisherPaymentsTitle=Brave Payments +publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -56,7 +58,7 @@ usd=$ done=முடிந்தது off=off on=on -notifications=Notifications +notifications=notifications moneyAdd=Use your debit or credit card add=Buy with Coinbase addFundsTitle=Add funds... diff --git a/app/extensions/brave/locales/te/preferences.properties b/app/extensions/brave/locales/te/preferences.properties index d2b204ac208..208b881c975 100644 --- a/app/extensions/brave/locales/te/preferences.properties +++ b/app/extensions/brave/locales/te/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ +publisherPaymentsTitle=Brave Payments +publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -56,7 +58,7 @@ usd=$ done=Done off=off on=on -notifications=Notifications +notifications=notifications moneyAdd=Use your debit or credit card add=Buy with Coinbase addFundsTitle=Add funds... diff --git a/app/extensions/brave/locales/tr-TR/preferences.properties b/app/extensions/brave/locales/tr-TR/preferences.properties index 13d2a905387..4c7e956ee11 100644 --- a/app/extensions/brave/locales/tr-TR/preferences.properties +++ b/app/extensions/brave/locales/tr-TR/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ +publisherPaymentsTitle=Brave Payments +publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -56,7 +58,7 @@ usd=$ done=Done off=off on=on -notifications=Notifications +notifications=notifications moneyAdd=Use your debit or credit card add=Buy with Coinbase addFundsTitle=Add funds... diff --git a/app/extensions/brave/locales/uk/preferences.properties b/app/extensions/brave/locales/uk/preferences.properties index cc61d85c5df..5560045d36a 100644 --- a/app/extensions/brave/locales/uk/preferences.properties +++ b/app/extensions/brave/locales/uk/preferences.properties @@ -19,6 +19,8 @@ paymentsWelcomeText4=Brave платежі наразі працюють в те paymentsWelcomeText5=Потрібно більше інформації? paymentsWelcomeText6=для Brave платежів... paymentsWelcomeLink=Переглянути ЧаП +publisherPaymentsTitle=Brave платежі +publisherPaymentsTitleBeta=бета paymentsSidebarText1=Наші партнери paymentsSidebarText2=Всі IP-адреси транзакцій анонімізовані з використанням технології від: paymentsSidebarText3=Гаманці Brave Bitcoin надаються через партнерство з: @@ -56,7 +58,7 @@ usd=$ done=Готово off=із on=на -notifications=Сповіщення +notifications=notifications moneyAdd=Використати вашу платіжну чи кредитну картку add=Купити з Coinbase addFundsTitle=Додати кошти... From 4389fb3ba7e764d2eb98321092f00af9623924a1 Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Tue, 30 Aug 2016 18:11:47 -0400 Subject: [PATCH 03/48] Use better labels for cibuild script Auditors: @aekeus Test Plan: n/a --- tools/cibuild.py | 1 - tools/upload.py | 26 +++++++++++++++++++++----- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/tools/cibuild.py b/tools/cibuild.py index 80a200e93e0..c953aaf56fb 100755 --- a/tools/cibuild.py +++ b/tools/cibuild.py @@ -63,7 +63,6 @@ def run_script(script, args=[]): execute(['git', 'pull']) execute(['rm', '-Rf', 'node_modules']) -execute(['rm', '-Rf', os.path.join(os.path.expanduser("~"), '.electron')]) write_npmrc() diff --git a/tools/upload.py b/tools/upload.py index cff823a41d7..33d17caf7f8 100755 --- a/tools/upload.py +++ b/tools/upload.py @@ -7,20 +7,21 @@ from requests.packages.urllib3.exceptions import InsecureRequestWarning requests.packages.urllib3.disable_warnings(InsecureRequestWarning) -version = json.load(open('package.json'))['version'] BROWSER_LAPTOP_REPO = 'brave/browser-laptop' -RELEASE_NAME = 'PRE (DO NOT DOWNLOAD UNLESS YOU ARE TESTING ' \ - 'THIS RELEASE CANDIDATE) Dev Channel Beta' +RELEASE_NAME = ('PRE (DO NOT DOWNLOAD UNLESS YOU ARE TESTING ' + 'THIS RELEASE CANDIDATE) Dev Channel Beta') def main(): github = GitHub(auth_token()) releases = github.repos(BROWSER_LAPTOP_REPO).releases.get() + tag = (json.load(open('package.json'))['version'] + + release_channel() + '-' + build_label()) tag_exists = False for release in releases: - if not release['draft'] and release['tag_name'] == version: + if not release['draft'] and release['tag_name'] == tag: tag_exists = True break - release = create_or_get_release_draft(github, releases, version, + release = create_or_get_release_draft(github, releases, tag, tag_exists) for f in get_files_to_upload(): upload_browser_laptop(github,release, f) @@ -85,6 +86,21 @@ def auth_token(): assert token, message return token +def build_label(): + channel = os.environ['CHANNEL'] + message = ('Error: Please set the $CHANNEL ' + 'environment variable, which is your release channel') + assert channel, message + return channel + +def release_channel(): + build = os.environ['BUILD'] + message = ('Error: Please set the $BUILD ' + 'environment variable, which is your build label ' + 'Examples: beta5, or RC1') + assert build, message + return build + if __name__ == '__main__': import sys From 9b8fc6be215b4f655a657d28e231e965dcac5445 Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Tue, 30 Aug 2016 17:41:08 -0400 Subject: [PATCH 04/48] Don't disable insecure check Also fixes a small bug with formatting of tag Auditors: @Aekeus Test Plan: n/a --- tools/upload.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/upload.py b/tools/upload.py index 33d17caf7f8..2e004724f19 100755 --- a/tools/upload.py +++ b/tools/upload.py @@ -4,8 +4,6 @@ import os from lib.github import GitHub import requests -from requests.packages.urllib3.exceptions import InsecureRequestWarning -requests.packages.urllib3.disable_warnings(InsecureRequestWarning) BROWSER_LAPTOP_REPO = 'brave/browser-laptop' RELEASE_NAME = ('PRE (DO NOT DOWNLOAD UNLESS YOU ARE TESTING ' @@ -86,14 +84,14 @@ def auth_token(): assert token, message return token -def build_label(): +def release_channel(): channel = os.environ['CHANNEL'] message = ('Error: Please set the $CHANNEL ' 'environment variable, which is your release channel') assert channel, message return channel -def release_channel(): +def build_label(): build = os.environ['BUILD'] message = ('Error: Please set the $BUILD ' 'environment variable, which is your build label ' From 48d917c9322429f33d033453025f9b0e6b9b6bf9 Mon Sep 17 00:00:00 2001 From: Alex Wykoff Date: Sun, 28 Aug 2016 22:49:48 -0500 Subject: [PATCH 05/48] updated testplan to include latest fixes updated changelog and testplan with the latest fixes removed some unneeded listings --- CHANGELOG.md | 10 ++++++++++ TESTPLAN.md | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2962a077979..c8788b096cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,6 +40,16 @@ - Fixed Bookmarks flow for sites without titles. ([#3442](https://github.com/brave/browser-laptop/issues/3442)) - Fixed opening files instead of searching for them. ([#3296](https://github.com/brave/browser-laptop/issues/3296)) - Fixed Pressing backspace while typing makes the browser go to the previous page ([#3496](https://github.com/brave/browser-laptop/issues/3496)) + - Fixed autocomplete db initialization failing on fresh profile ([#3577](https://github.com/brave/browser-laptop/issues/3577)) + - Fixed username and password field for basic auth dialog not showing up ([#3578](https://github.com/brave/browser-laptop/issues/3578)) + - Fixed Modals being clipped when the window is narrow. ([#3575](https://github.com/brave/browser-laptop/issues/3575)) + - Fixed a lot of things for ledger: ([#3573](https://github.com/brave/browser-laptop/issues/3573))([#3567](https://github.com/brave/browser-laptop/issues/3567))([#3565](https://github.com/brave/browser-laptop/issues/3565))([#3539](https://github.com/brave/browser-laptop/issues/3539))([#3551](https://github.com/brave/browser-laptop/issues/3551))([#3554](https://github.com/brave/browser-laptop/issues/3554))([#3553](https://github.com/brave/browser-laptop/issues/3553))([#3545](https://github.com/brave/browser-laptop/issues/3545))([#3523](https://github.com/brave/browser-laptop/issues/3523)) + - Fixed cropped/narrow buttons in prefs panels via CSS ([#3507](https://github.com/brave/browser-laptop/issues/3563)) + - Fixed after upgrade, context menu for password manager was not showing ([#3549](https://github.com/brave/browser-laptop/issues/3549)) + - Fixed check for valid data before upgrading and assign defaults after cleaning ([#3537](https://github.com/brave/browser-laptop/issues/3537)) + - Fixed tab close causing fullscreen to be exited ([#3519](https://github.com/brave/browser-laptop/issues/3519)) + - Fixed passwords are not saved using default settings ([#3516](https://github.com/brave/browser-laptop/issues/3516)) + - Fixed flash on http://www.y8.com/games/superfighters does not work ([#3082](https://github.com/brave/browser-laptop/issues/3082)) - Update to HTTPS Everywhere 5.2.0. ([#2581](https://github.com/brave/browser-laptop/issues/2581)) ## [0.11.5](https://github.com/brave/browser-laptop/releases/v0.11.5dev) diff --git a/TESTPLAN.md b/TESTPLAN.md index 572aa758c72..7e0817630b6 100644 --- a/TESTPLAN.md +++ b/TESTPLAN.md @@ -13,6 +13,8 @@ - [ ] Editing Autofill entries are not saved. Creates a blank entry([#3368](https://github.com/brave/browser-laptop/issues/3368)) - [ ] Brave crashes with segmentation fault when submitting a form ([#3398](https://github.com/brave/browser-laptop/issues/3398)) - [ ] Autofill - Add new entry buttons are not functional ([#3455](https://github.com/brave/browser-laptop/issues/3455)) + - [ ] Autofill - Values are vacated ([#3491](https://github.com/brave/browser-laptop/issues/3491)) + ### Bookmarks - [ ] Bookmark title is not updated unbookmarking/rebookmarking bug verified ([#3284](https://github.com/brave/browser-laptop/issues/3284)) @@ -43,6 +45,8 @@ - [ ] Bookmarked about pages appear in the history ([#3366](https://github.com/brave/browser-laptop/issues/3366)) - [ ] Bookmark folders are appearing in browser history ([#3453](https://github.com/brave/browser-laptop/issues/3453)) - [ ] Fixes extra separator in about:history context menu ([#3444](https://github.com/brave/browser-laptop/issues/3444)) + - [ ] Clearing history using modal now clears bookmark timestamps ([#3501](https://github.com/brave/browser-laptop/issues/3501)) + - [ ] Clear browser history should work regardless of whether or not the page is bookmarked. bug ([#3346](https://github.com/brave/browser-laptop/issues/3346)) ### Ledger - [ ] Ledger beta integration ([#3195](https://github.com/brave/browser-laptop/issues/3195)) @@ -63,6 +67,17 @@ - [ ] Preferences : Payments : Create wallet control text and status flickers when disabling then enabling brave payments. ([#3376](https://github.com/brave/browser-laptop/issues/3376)) - [ ] Browser crashes when trying to signup on Coinbase bug ([#3382](https://github.com/brave/browser-laptop/issues/3382)) - [ ] Windows size grew ~26MB with ledger ([#3475](https://github.com/brave/browser-laptop/issues/3475)) + - [ ] Ledger unconfirmed balance fix ([#3495](https://github.com/brave/browser-laptop/issues/3495)) + - [ ] Ledger unconfirmed balance takes a long time to show up ([#3480](https://github.com/brave/browser-laptop/issues/3480)) + - [ ] a few minor things ([#3554](https://github.com/brave/browser-laptop/issues/3554)) + - [ ] support new Set(...) in ledger publisher ruleset ([#3553](https://github.com/brave/browser-laptop/issues/3553)) + - [ ] support new Set(...) in ledger publisher ruleset ([#3545](https://github.com/brave/browser-laptop/issues/3545)) + - [ ] Ledger settings box alignment and style corrections ([#3523](https://github.com/brave/browser-laptop/issues/3523)) + - [ ] increase back-off when recovering from ledger-client errors ([#3573](https://github.com/brave/browser-laptop/issues/3573)) + - [ ] set ledger columns to right-align if appropriate ([#3567](https://github.com/brave/browser-laptop/issues/3567)) + - [ ] Preferences : Payments : Text clipping for localized strings. ([#3539](https://github.com/brave/browser-laptop/issues/3539)) + - [ ] Stop partner logos from floating below brave payments text ([#3551](https://github.com/brave/browser-laptop/issues/3551)) + - [ ] set flags to hide CB button in Add funds… dialog when users chooses 10, 15,or 20 monthly value ([#3565](https://github.com/brave/browser-laptop/issues/3565)) ### Fixes - [ ] Escaping from fullscreen video leaves the browser in fullscreen mode instead of returning to windowed mode. ([#3338](https://github.com/brave/browser-laptop/issues/3338)) @@ -112,3 +127,21 @@ - [ ] Open file action tries to search for the file in the default search engine ([#3296](https://github.com/brave/browser-laptop/issues/3296)) - [ ] Esc handler changes windowed / fullscreen mode depending on permissions ([#3464](https://github.com/brave/browser-laptop/issues/3464)) - [ ] Cannot delete saved passwords on about:passwords ([#3481](https://github.com/brave/browser-laptop/issues/3481)) + - [ ] Chrome.ipc.on is not working ([#3487](https://github.com/brave/browser-laptop/issues/3487)) + - [ ] Fix deleting text going back fixes #3496 ([#3497](https://github.com/brave/browser-laptop/issues/3497)) + - [ ] Remove placeholder ads by default ([#3506](https://github.com/brave/browser-laptop/issues/3506)) + - [ ] Add cibuild script ([#3507](https://github.com/brave/browser-laptop/issues/3507)) + - [ ] autocomplete db initialization fails on fresh profile ([#3577](https://github.com/brave/browser-laptop/issues/3577)) + - [ ] username and password field for basic auth dialog are not showing up ([#3578](https://github.com/brave/browser-laptop/issues/3578)) + - [ ] Modals are uncentered which leads to clipping when the window is narrow. ([#3575](https://github.com/brave/browser-laptop/issues/3575)) + - [ ] overflowIndicator not appearing on bookmark toolbar if show only favicon option is enabled ([#3525](https://github.com/brave/browser-laptop/issues/3525)) + - [ ] "Show only favicon" option should include folders on bookmark bar ([#3529](https://github.com/brave/browser-laptop/issues/3529)) + - [ ] Fix cropped/narrow buttons in prefs panels via CSS ([#3507](https://github.com/brave/browser-laptop/issues/3563)) + - [ ] After upgrade, context menu for password manager does not show ([#3549](https://github.com/brave/browser-laptop/issues/3549)) + - [ ] check for valid data before upgrading and assign defaults after cleaning ([#3537](https://github.com/brave/browser-laptop/issues/3537)) + - [ ] upgrade to 0.11.6 fails ([#3550](https://github.com/brave/browser-laptop/issues/3550)) + - [ ] Tab close is causing fullscreen to be exited ([#3519](https://github.com/brave/browser-laptop/issues/3519)) + - [ ] Building on Windows requires tedious work-arounds ([#3548](https://github.com/brave/browser-laptop/issues/3548)) + - [ ] Passwords are not saved using default settings ([#3516](https://github.com/brave/browser-laptop/issues/3516)) + - [ ] Flash on http://www.y8.com/games/superfighters does not work ([#3082](https://github.com/brave/browser-laptop/issues/3082)) + - [ ] Update test fails ([#3337](https://github.com/brave/browser-laptop/issues/3337)) From 27e40c200d856c681b065154e8b4f5e7e674377d Mon Sep 17 00:00:00 2001 From: Jon Kuperman Date: Tue, 30 Aug 2016 18:44:51 -0700 Subject: [PATCH 06/48] stop favicon in ledger from being cropped --- less/about/preferences.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/less/about/preferences.less b/less/about/preferences.less index 8041f625f70..611b0d9621e 100644 --- a/less/about/preferences.less +++ b/less/about/preferences.less @@ -673,7 +673,7 @@ div.nextPaymentSubmission { img { width: 1.5em; height: 1.5em; - margin: -0.375em 0.375em 0 0; + margin-right: 6px; vertical-align: middle; } } From d98c24d7100666c01f4175d4cbf08c30edf62b7b Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Tue, 30 Aug 2016 23:30:26 -0400 Subject: [PATCH 07/48] Dedupe separator on download context menu Fix #3591 Test Plan: Linux and I think Windows show duped separors but macOS does not, so this doesn't need to be tested on macOS. STR in the issue. Auditors: @aekeus --- js/contextMenus.js | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/js/contextMenus.js b/js/contextMenus.js index 73a962a0e7f..3fffad6a286 100644 --- a/js/contextMenus.js +++ b/js/contextMenus.js @@ -200,14 +200,15 @@ function downloadsToolbarTemplateInit (downloadId, downloadItem) { } }) } - - menu.push(CommonMenu.separatorMenuItem, - { - label: locale.translation('downloadItemClearCompleted'), - click: () => { - appActions.clearCompletedDownloads() - } - }) + if (menu.length) { + menu.push(CommonMenu.separatorMenuItem) + } + menu.push({ + label: locale.translation('downloadItemClearCompleted'), + click: () => { + appActions.clearCompletedDownloads() + } + }) return menu } From ede85297cab8a691ac45f2c6342a8e0c165a43d8 Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Tue, 30 Aug 2016 23:42:06 -0400 Subject: [PATCH 08/48] Add download script for release files While coding this I realized there are some dupe files that aren't being uploaded differently for x64 and ia32 (nupkg and REALEASES) I'll do a different commit to get that fixed for upload / download Auditors: @aekeus Test Plan: ./tools/download.py 0.11.6dev-RC1 should create dist/ia32, and dist/x64 directories --- tools/download.py | 66 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100755 tools/download.py diff --git a/tools/download.py b/tools/download.py new file mode 100755 index 00000000000..3e6ddfe0658 --- /dev/null +++ b/tools/download.py @@ -0,0 +1,66 @@ +#!/usr/bin/env python + +import sys +import os +import urllib2 + +url_base = 'https://github.com/brave/browser-laptop/releases/download/%s/%s' +files = [ + ['Brave.dmg', 'dist/Brave.dmg'], + ['Brave-0.11.6.zip', 'dist/Brave-0.11.6.zip'], + ['Brave.tar.bz2', 'dist/Brave.tar.bz2'], + ['brave_0.11.6_amd64.deb', 'dist/brave_0.11.6_amd64.deb'], + ['brave-0.11.6.amd64.rpm', 'dist/brave-0.11.6.amd64.rpm'], + ['BraveSetup-ia32.exe', 'dist/ia32/BraveSetup-ia32.exe'], + ['BraveSetup-ia32.msi', 'dist/ia32/BraveSetup-ia32.msi'], + ['BraveSetup-x64.exe', 'dist/x64/BraveSetup-x64.exe'], + ['BraveSetup-x64.msi', 'dist/x64/BraveSetup-x64.msi'] +] + +def main(): + if len(sys.argv) != 2: + print 'usage: ./tools/download.py [release-tag]' + sys.exit(1) + + # Create dirs + for path in ['dist/x64', 'dist/ia32']: + if not os.path.exists(path): + os.makedirs(path) + + for f in files: + url = url_base % (sys.argv[1], f[0]) + download_file(url, f[1]) + + +# Mostly copied from: http://stackoverflow.com/a/990378/3153 +def download_file(remote, local): + u = urllib2.urlopen(remote) + h = u.info() + totalSize = int(h['Content-Length']) + print 'Downloading %s to %s (%s bytes)' % (remote, local, totalSize) + fp = open(local, 'wb') + blockSize = 10000 + count = 0 + while True: + chunk = u.read(blockSize) + if not chunk: + break + fp.write(chunk) + count += 1 + if totalSize > 0: + percent = int(count * blockSize * 100 / totalSize) + #if percent > 100: + # percent = 100 + print '%2d%%' % percent, + if percent < 100: + print '\b\b\b\b\b', # Erase "NN% " + else: + print 'Done.' + fp.flush() + fp.close() + if not totalSize: + print + +if __name__ == '__main__': + import sys + sys.exit(main()) From 54693290c2d97dcc44b311888cedc6ff58780526 Mon Sep 17 00:00:00 2001 From: Anthony Tseng Date: Wed, 31 Aug 2016 12:58:31 +0800 Subject: [PATCH 09/48] Automatically delete invalid entry from appStore Fix #3491 Auditors: @bbondy, @bridiver --- js/components/frame.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/js/components/frame.js b/js/components/frame.js index aebd63170e0..cedcece7c9a 100644 --- a/js/components/frame.js +++ b/js/components/frame.js @@ -114,6 +114,7 @@ class Frame extends ImmutableComponent { addresses.forEach((entry) => { const guid = entry.get(partition) const address = currentWindow.webContents.session.autofill.getProfile(guid) + const valid = Object.getOwnPropertyNames(address).length > 0 let addressDetail = { name: address.full_name, organization: address.company_name, @@ -126,7 +127,11 @@ class Frame extends ImmutableComponent { email: address.email, guid: entry.toJS() } - list.push(addressDetail) + if (valid) { + list.push(addressDetail) + } else { + appActions.removeAutofillAddress(addressDetail) + } }) this.webview.send(messages.AUTOFILL_ADDRESSES_UPDATED, list) } @@ -136,6 +141,7 @@ class Frame extends ImmutableComponent { creditCards.forEach((entry) => { const guid = entry.get(partition) const creditCard = currentWindow.webContents.session.autofill.getCreditCard(guid) + const valid = Object.getOwnPropertyNames(creditCard).length > 0 let creditCardDetail = { name: creditCard.name, card: creditCard.card_number, @@ -143,7 +149,11 @@ class Frame extends ImmutableComponent { year: creditCard.expiration_year, guid: entry.toJS() } - list.push(creditCardDetail) + if (valid) { + list.push(creditCardDetail) + } else { + appActions.removeAutofillCreditCard(creditCardDetail) + } }) this.webview.send(messages.AUTOFILL_CREDIT_CARDS_UPDATED, list) } From 05266413ea7849552f10e7e2ec2b2c270b7443ec Mon Sep 17 00:00:00 2001 From: Marshall Rose Date: Tue, 30 Aug 2016 23:22:02 -0700 Subject: [PATCH 10/48] handle empty-window synopsis state fixes https://github.com/brave/browser-laptop/issues/3599 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 18e23722730..16f136302a4 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "l20n": "^3.5.1", "ledger-balance": "^0.8.46", "ledger-client": "^0.8.54", - "ledger-publisher": "^0.8.54", + "ledger-publisher": "^0.8.55", "lru_cache": "^1.0.0", "random-lib": "2.1.0", "qr-image": "^3.1.0", From a4aca7ed0da1d98fad54340a25729f2cd48d86ac Mon Sep 17 00:00:00 2001 From: Marshall Rose Date: Tue, 30 Aug 2016 23:37:54 -0700 Subject: [PATCH 11/48] do not allow run(0) events to cascade in ledger-client MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit fixes https://github.com/brave/browser-laptop/issues/3600 also, moves a if (…) { /* … */ } to /* if (…) { … } */ and gets ledger-client@0.8.55 which fixes the reconciliation time calculation. auditor: @diracdeltas --- app/ledger.js | 10 ++++++++-- package.json | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/ledger.js b/app/ledger.js index cb6f866bad6..7ad79b79e87 100644 --- a/app/ledger.js +++ b/app/ledger.js @@ -468,16 +468,16 @@ var updatePublisherInfo = () => { syncWriter(pathName(synopsisPath), synopsis, () => {}) publisherInfo.synopsis = synopsisNormalizer() - if (publisherInfo._internal.debugP) { /* + if (publisherInfo._internal.debugP) { data = [] publisherInfo.synopsis.forEach((entry) => { data.push(underscore.extend(underscore.omit(entry, [ 'faviconURL' ]), { faviconURL: entry.faviconURL && '...' })) }) console.log('\nupdatePublisherInfo: ' + JSON.stringify(data, null, 2)) - */ } + */ appActions.updatePublisherInfo(underscore.omit(publisherInfo, [ '_internal' ])) } @@ -882,6 +882,8 @@ var roundtrip = (params, options, callback) => { if (options.payload) console.log('<<< ' + JSON.stringify(params.payload, null, 2).split('\n').join('\n<<< ')) } +var run0P = false + var run = (delayTime) => { if (clientOptions.verboseP) console.log('\nledger client run: clientP=' + (!!client) + ' delayTime=' + delayTime) @@ -917,7 +919,11 @@ var run = (delayTime) => { } if (delayTime > 0) { active = client + if (run0P) return console.log('suppress run0') + + run0P = true return setTimeout(() => { + run0P = false if (active !== client) return if (!client) return console.log('\n\n*** MTR says this can\'t happen(1)... please tell him that he\'s wrong!\n\n') diff --git a/package.json b/package.json index 16f136302a4..a1320829187 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,7 @@ "keytar": "^3.0.0", "l20n": "^3.5.1", "ledger-balance": "^0.8.46", - "ledger-client": "^0.8.54", + "ledger-client": "^0.8.55", "ledger-publisher": "^0.8.55", "lru_cache": "^1.0.0", "random-lib": "2.1.0", From 9e02263ed5c5c0646429ccf885560f319c14f17e Mon Sep 17 00:00:00 2001 From: Anthony Tseng Date: Wed, 31 Aug 2016 15:31:59 +0800 Subject: [PATCH 12/48] Consider offset of downloadsBar when popup suggestions Fix #3597 Auditors: @bsclifton --- js/contextMenus.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/js/contextMenus.js b/js/contextMenus.js index 3fffad6a286..01415effc16 100644 --- a/js/contextMenus.js +++ b/js/contextMenus.js @@ -1082,23 +1082,27 @@ function onShowBookmarkFolderMenu (bookmarks, bookmark, activeFrame, e) { */ function onShowUsernameMenu (usernames, origin, action, boundingRect, topOffset) { + // TODO: magic number + const downloadsBarOffset = windowStore.getState().getIn(['ui', 'downloadsToolbar', 'isVisible']) ? 50 : 0 const menuTemplate = usernameTemplateInit(usernames, origin, action) windowActions.setContextMenuDetail(Immutable.fromJS({ left: boundingRect.left, - top: boundingRect.bottom + topOffset, + top: boundingRect.bottom + topOffset - downloadsBarOffset, template: menuTemplate })) } function onShowAutofillMenu (suggestions, boundingRect, frame) { const menuTemplate = autofillTemplateInit(suggestions, frame) + // TODO: magic number + const downloadsBarOffset = windowStore.getState().getIn(['ui', 'downloadsToolbar', 'isVisible']) ? 50 : 0 const offset = { x: (window.innerWidth - boundingRect.clientWidth), y: (window.innerHeight - boundingRect.clientHeight) } windowActions.setContextMenuDetail(Immutable.fromJS({ left: offset.x + boundingRect.x, - top: offset.y + (boundingRect.y + boundingRect.height), + top: offset.y + (boundingRect.y + boundingRect.height) - downloadsBarOffset, template: menuTemplate })) } From 1ba88ad2821ca25d21f5a2fc4032c014793c7398 Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Wed, 31 Aug 2016 10:07:45 -0400 Subject: [PATCH 13/48] Don't count window border for bookmark toolbar width Auditors: @aekeus Fix #3525 Test Plan: In addition to the other test plan in the other commit for this issue, also test the downloads toolbar properly works without cutting off download items --- js/components/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/js/components/main.js b/js/components/main.js index 39884611dcb..e7a7b9d23d1 100644 --- a/js/components/main.js +++ b/js/components/main.js @@ -883,7 +883,7 @@ class Main extends ImmutableComponent { showOnlyFavicon={showOnlyFavicon} shouldAllowWindowDrag={shouldAllowWindowDrag} activeFrameKey={activeFrame && activeFrame.get('key') || undefined} - windowWidth={this.props.appState.get('defaultWindowWidth')} + windowWidth={window.innerWidth} contextMenuDetail={this.props.windowState.get('contextMenuDetail')} sites={this.props.appState.get('sites')} /> : null @@ -1008,7 +1008,7 @@ class Main extends ImmutableComponent { { this.props.windowState.getIn(['ui', 'downloadsToolbar', 'isVisible']) && this.props.appState.get('downloads') && this.props.appState.get('downloads').size > 0 ? : null } From 2049bd71d365362de67abb30992d08fa274948eb Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Wed, 31 Aug 2016 10:31:29 -0400 Subject: [PATCH 14/48] Update l10n Auditors: @aekeus We may have to an API method that uploads in addition to the automatic, support from transifex suggested that, but I pushed back since we pay a lot for our plan. I asked them to add a button to force update now. --- .../brave/locales/bn-BD/app.properties | 4 ++-- .../locales/bn-BD/preferences.properties | 5 ++--- .../brave/locales/bn-IN/app.properties | 4 ++-- .../locales/bn-IN/preferences.properties | 3 +-- .../brave/locales/cs/app.properties | 4 ++-- .../brave/locales/cs/preferences.properties | 3 +-- .../brave/locales/de-DE/app.properties | 4 ++-- .../locales/de-DE/preferences.properties | 3 +-- .../brave/locales/es/app.properties | 4 ++-- .../brave/locales/es/preferences.properties | 3 +-- .../brave/locales/fr-FR/app.properties | 4 ++-- .../locales/fr-FR/preferences.properties | 19 +++++++++---------- .../brave/locales/hi-IN/app.properties | 4 ++-- .../locales/hi-IN/preferences.properties | 3 +-- .../brave/locales/id-ID/app.properties | 4 ++-- .../locales/id-ID/preferences.properties | 3 +-- .../brave/locales/ja-JP/app.properties | 4 ++-- .../locales/ja-JP/preferences.properties | 3 +-- .../brave/locales/nl-NL/app.properties | 4 ++-- .../locales/nl-NL/preferences.properties | 3 +-- .../brave/locales/pt-BR/app.properties | 4 ++-- .../locales/pt-BR/preferences.properties | 3 +-- .../brave/locales/sl/app.properties | 4 ++-- .../brave/locales/sl/preferences.properties | 3 +-- .../brave/locales/ta/app.properties | 4 ++-- .../brave/locales/ta/preferences.properties | 3 +-- .../brave/locales/te/app.properties | 4 ++-- .../brave/locales/te/preferences.properties | 3 +-- .../brave/locales/tr-TR/app.properties | 4 ++-- .../locales/tr-TR/preferences.properties | 3 +-- .../brave/locales/uk/app.properties | 4 ++-- .../brave/locales/uk/preferences.properties | 5 ++--- 32 files changed, 58 insertions(+), 74 deletions(-) diff --git a/app/extensions/brave/locales/bn-BD/app.properties b/app/extensions/brave/locales/bn-BD/app.properties index 63317c36307..6041a19e1be 100644 --- a/app/extensions/brave/locales/bn-BD/app.properties +++ b/app/extensions/brave/locales/bn-BD/app.properties @@ -69,8 +69,8 @@ moreBookmarks=আরও বুকমার্ক... fullScreenModeWarning={{host}} ফুলস্ক্রীনে মোডে আছে, বের হতে ESC চাপুন braveMenuTotalReplacements=মোট প্রতিস্থাপিত হয়েছে: {{count}} basicAuthRequired=অনুমোদন প্রয়োজন -basicAuthUsername.placeholder=ইউজারনেম: -basicAuthPassword.placeholder=পাসওয়ার্ড: +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{host}} এ আপনার পাসওয়ার্ড ও ইউজারনেম প্রয়োজন crashScreenHeader=কোন কিছু ভুল হয়েছে =( crashScreenText=ওয়েবপেজ প্রদর্শনের সময় কোন সমস্যা হয়েছে, পুনরায় লোড করুন বা অন্য পাতায় যান diff --git a/app/extensions/brave/locales/bn-BD/preferences.properties b/app/extensions/brave/locales/bn-BD/preferences.properties index ab5319d05c7..a0df1cfac89 100644 --- a/app/extensions/brave/locales/bn-BD/preferences.properties +++ b/app/extensions/brave/locales/bn-BD/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Brave Payments এখনো Beta পর্যায়ে আ paymentsWelcomeText5=আরো জানতে চান? paymentsWelcomeText6=Brave Payment এর জন্য... paymentsWelcomeLink=প্রায়ই যেসব প্রশ্ন করা হয় -publisherPaymentsTitle=Brave Payments -publisherPaymentsTitleBeta=beta paymentsSidebarText1=আমাদের সহযোগী paymentsSidebarText2=সকল অর্থ আদান-প্রদানের সাথে জড়িত IP ঠিকানাগুলোর গোপনীয়তা যাদের প্রযুক্তিতে করা হয়েছে: paymentsSidebarText3=যাদের সহযোগীতায় Brave Bitcoin Wallets এর সুবিধা পাচ্ছেন: @@ -58,8 +56,9 @@ usd=$ done=সম্পন্ন off=বন্ধ on=চালু -notifications=notifications +notifications=বার্তা moneyAdd=আপনার ডেবিট বা ক্রেডিট কার্ড ব্যবহার করুন +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add= Coinbase দিয়ে কিনুন addFundsTitle=ফান্ড যোগ করুন... addFunds=আপনার Brave Payments Account এ ফান্ড যোগ করুন diff --git a/app/extensions/brave/locales/bn-IN/app.properties b/app/extensions/brave/locales/bn-IN/app.properties index 02d7f8028e7..5ac8b6dac7f 100644 --- a/app/extensions/brave/locales/bn-IN/app.properties +++ b/app/extensions/brave/locales/bn-IN/app.properties @@ -69,8 +69,8 @@ moreBookmarks=আরো বুকমার্ক fullScreenModeWarning={{ নিমন্ত্রণকর্তা }} প্রবিষ্ট করেচে পূর্ণ স্ক্রীন প্রণালী তে, ESC দাবিয়ে বাইরে আসূন braveMenuTotalReplacements=সম্পূর্ণ প্রতিস্থাপন: {{ গণনা}} basicAuthRequired=প্রমাণিত অবশ্যক -basicAuthUsername.placeholder=ব্যাবহ্রিতনাম: -basicAuthPassword.placeholder=পাসওয়ার্ড +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{নিমন্ত্রণকর্তার}} ব্যবহারকারিনাম আর গুপ্তপদ অবশ্যক crashScreenHeader=কিছু ত্রুটি হয়েছে =( crashScreenText=এই সঞ্চারপাতার প্রদর্শনী সমায় কিছু একটি ভুল হয়েছে. আগে চালানো জন্য, পুনরায় য়া পরিক্রমণ অন্নো পাতা করুন. diff --git a/app/extensions/brave/locales/bn-IN/preferences.properties b/app/extensions/brave/locales/bn-IN/preferences.properties index a572a898e2c..5c722be5ae8 100644 --- a/app/extensions/brave/locales/bn-IN/preferences.properties +++ b/app/extensions/brave/locales/bn-IN/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ -publisherPaymentsTitle=Brave Payments -publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -60,6 +58,7 @@ off=off on=on notifications=notifications moneyAdd=Use your debit or credit card +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Buy with Coinbase addFundsTitle=Add funds... addFunds=Add funds to your Brave Payments Account diff --git a/app/extensions/brave/locales/cs/app.properties b/app/extensions/brave/locales/cs/app.properties index 5944926ce25..43dae705398 100644 --- a/app/extensions/brave/locales/cs/app.properties +++ b/app/extensions/brave/locales/cs/app.properties @@ -69,8 +69,8 @@ moreBookmarks=Více záložek... fullScreenModeWarning={{host}} vstoupil do režimu na celou obrazovku. Stiskněte ESC pro ukončení. braveMenuTotalReplacements=Celkem nahrazení: {{count}} basicAuthRequired=Požadována autentizace -basicAuthUsername.placeholder=Uživatelské jméno: -basicAuthPassword.placeholder=Heslo: +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{host}} vyžaduje uživatelské jméno nebo heslo. crashScreenHeader=Něco se podělalo crashScreenText=Při zobrazování této stránky došlo k chybě. Pro pokračování stránku nahrajte znovu, nebo jděte na jinou stránku. diff --git a/app/extensions/brave/locales/cs/preferences.properties b/app/extensions/brave/locales/cs/preferences.properties index 91424d34c19..678136cd900 100644 --- a/app/extensions/brave/locales/cs/preferences.properties +++ b/app/extensions/brave/locales/cs/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Potřebujete více informací? paymentsWelcomeText6=Pro platby Brave... paymentsWelcomeLink=Zobrazit často kladené otázky -publisherPaymentsTitle=Platby Brave -publisherPaymentsTitleBeta=beta paymentsSidebarText1=Naši partneři paymentsSidebarText2=Všechny adresy IP transakcí anonymizovány pomocí technologie od: paymentsSidebarText3=Peněženky Brave s bitcoiny jsou poskytovány pomocí partnerství: @@ -60,6 +58,7 @@ off=vypnuto on=zapnuto notifications=notifications moneyAdd=Použít vaši debetní nebo kreditní kartu +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Koupit s Coinbase addFundsTitle=Add funds... addFunds=Přidat peníze vašemu účtu pro platby Brave diff --git a/app/extensions/brave/locales/de-DE/app.properties b/app/extensions/brave/locales/de-DE/app.properties index 1142ed5af30..546446f4c90 100644 --- a/app/extensions/brave/locales/de-DE/app.properties +++ b/app/extensions/brave/locales/de-DE/app.properties @@ -69,8 +69,8 @@ moreBookmarks=Mehr Lesezeichen... fullScreenModeWarning={{host}} ist im Vollbildmodus, drücke ESC zum Verlassen. braveMenuTotalReplacements=Insgesamt ausgetauschte Elemente: {{count}} basicAuthRequired=Authenfizierung erforderlich -basicAuthUsername.placeholder=Benutzername: -basicAuthPassword.placeholder=Passwort: +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{host}} benötigt einen Nutzernamen und ein Passwort. crashScreenHeader=Irgendetwas ist schiefgelaufen =( crashScreenText=Beim Anzeigen dieser Seite ist ein Fehler aufgetreten. Um fortzufahren, laden Sie die Seite neu oder rufen Sie eine Andere auf. diff --git a/app/extensions/brave/locales/de-DE/preferences.properties b/app/extensions/brave/locales/de-DE/preferences.properties index 232ceffc11e..15c59c16691 100644 --- a/app/extensions/brave/locales/de-DE/preferences.properties +++ b/app/extensions/brave/locales/de-DE/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ -publisherPaymentsTitle=Brave Payments -publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -60,6 +58,7 @@ off=off on=on notifications=notifications moneyAdd=Use your debit or credit card +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Buy with Coinbase addFundsTitle=Add funds... addFunds=Add funds to your Brave Payments Account diff --git a/app/extensions/brave/locales/es/app.properties b/app/extensions/brave/locales/es/app.properties index a244c4dbe23..5a327e519cb 100644 --- a/app/extensions/brave/locales/es/app.properties +++ b/app/extensions/brave/locales/es/app.properties @@ -69,8 +69,8 @@ moreBookmarks=Más marcadores... fullScreenModeWarning={{host}} entró al modo de pantalla completa, apreta ESC para salir braveMenuTotalReplacements=Total de los reemplazos: {{count}} basicAuthRequired=Autenticación requerida -basicAuthUsername.placeholder=Nombre de usuario: -basicAuthPassword.placeholder=Contraseña: +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{host}} requiere un nombre de usuario y contraseña. crashScreenHeader=Algo salió mal =( crashScreenText=Un error ocurrió mientras se mostraba esta página. Para continuar, recarga o navega a otra página diff --git a/app/extensions/brave/locales/es/preferences.properties b/app/extensions/brave/locales/es/preferences.properties index 7421cd19583..82e6806b0c9 100644 --- a/app/extensions/brave/locales/es/preferences.properties +++ b/app/extensions/brave/locales/es/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ -publisherPaymentsTitle=Brave Payments -publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -60,6 +58,7 @@ off=off on=on notifications=notifications moneyAdd=Use your debit or credit card +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Buy with Coinbase addFundsTitle=Add funds... addFunds=Add funds to your Brave Payments Account diff --git a/app/extensions/brave/locales/fr-FR/app.properties b/app/extensions/brave/locales/fr-FR/app.properties index 987d5afed64..c7518e824fa 100644 --- a/app/extensions/brave/locales/fr-FR/app.properties +++ b/app/extensions/brave/locales/fr-FR/app.properties @@ -69,8 +69,8 @@ moreBookmarks=Plus de favoris... fullScreenModeWarning={{host}} est passé en mode plein écran, appuyez ESC pour en sortir. braveMenuTotalReplacements=Nombre de remplacements : {{count}} basicAuthRequired=Authentification requise -basicAuthUsername.placeholder=Nom d'utilisateur : -basicAuthPassword.placeholder=Mot de passe : +basicAuthUsernameLabel=Nom d'utilisateur : +basicAuthPasswordLabel=Mot de passe : basicAuthMessage={{host}} requiert un nom d'utilisateur et un mot de passe crashScreenHeader=Quelque chose s'est mal passé =( crashScreenText=Une erreur est survenue lors de l'affichage de cette page. Pour continuer, actualisez ou naviguez sur une autre page. diff --git a/app/extensions/brave/locales/fr-FR/preferences.properties b/app/extensions/brave/locales/fr-FR/preferences.properties index 140dfe42926..3e965814b43 100644 --- a/app/extensions/brave/locales/fr-FR/preferences.properties +++ b/app/extensions/brave/locales/fr-FR/preferences.properties @@ -11,19 +11,17 @@ visits=Visites publisher=Site publishers=Éditeurs payments=Paiements -paymentsWelcomeTitle=Welcome to Brave Payments! +paymentsWelcomeTitle=Bienvenue aux paiements Brave ! paymentsWelcomeText1=Brave a créé un moyen simple pour vous de contribuer aux sites que vous utilisez le plus. -paymentsWelcomeText2=To begin using Brave Payments, simply flip the switch at the top of this window. The rest is easy. -paymentsWelcomeText3=Brave Payments allows publishers to stay in business even though you may have blocked their advertisements with Brave. All of this works while keeping your browsing history private. Your funds are transferred to the site owner through an anonymous ledger sytem, which makes it impossible for you ever to be identified based on the sites you visit and support. -paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and feedback, we can fine tune the system through the beta period. +paymentsWelcomeText2=Pour commencer à utiliser les paiements Brave, basculez simplement le commutateur situé en haut de cette fenêtre. Le reste est facile. +paymentsWelcomeText3=Les paiements Brave permettent aux éditeurs de rester en activité même si vous avez bloqué leurs publicités avec Brave. Tout cela fonctionne en gardant votre historique de navigation privé. Vos fonds sont transférés au propriétaire du site à travers un grand livre de compte anonyme, ce qui rend impossible votre identification sur la base des sites que vous visitez et que vous soutenez. +paymentsWelcomeText4=Les paiements Brave sont actuellement en Bêta. Avec votre aide et vos retours, nous pouvons améliorer le système pendant la période de bêta. paymentsWelcomeText5=Besoin de plus d'informations ? -paymentsWelcomeText6=for Brave Payments... +paymentsWelcomeText6=pour les paiements Brave... paymentsWelcomeLink=Voir la FAQ -publisherPaymentsTitle=Brave Payments -publisherPaymentsTitleBeta=bêta paymentsSidebarText1=Nos partenaires paymentsSidebarText2=Toutes les adresses IP sont anonymisées avec la technologie de : -paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: +paymentsSidebarText3=Les porte-monnaie Brave sont fournis grâce à un partenariat avec : paymentsSidebarText4=Vos contributions par cartes de crédit et bancaires sont gérées par : accountBalance=solde du compte monthlyBudget=budget mensuel @@ -47,7 +45,7 @@ paymentHistoryTitle=Votre historique de paiement paymentHistoryFooterText=Your next payment submission is {{reconcileDate}}. paymentHistoryOKText=OK bitcoinAddress=L'adresse de votre porte-monnaie Brave est : -bitcoinPaymentURL=Scannez le QR code ou copier ce lien : +bitcoinPaymentURL=Scannez le QR code ou copiez ce lien : bitcoinQR=QR code du porte-monnaie Brave : paymentHistoryTitle=Votre historique de paiement bitcoinCopyAddress=Copier l'adresse Bitcoin dans le presse-papier @@ -59,7 +57,8 @@ done=Fait off=désactivé on=activé notifications=notifications -moneyAdd=Utilisez votre carte de débit ou de crédit +moneyAdd=Utilisez votre carte bancaire +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Acheter avec Coinbase addFundsTitle=Ajouter des fonds... addFunds=Ajouter des fonds à votre compte de paiements Brave diff --git a/app/extensions/brave/locales/hi-IN/app.properties b/app/extensions/brave/locales/hi-IN/app.properties index 5de8fb2842d..b8c2b642fb4 100644 --- a/app/extensions/brave/locales/hi-IN/app.properties +++ b/app/extensions/brave/locales/hi-IN/app.properties @@ -69,8 +69,8 @@ moreBookmarks=और पुस्तचिह्ननित... fullScreenModeWarning= {{आतिथेय}} पूर्ण चित्रपट प्रणाली में प्रविष्ट हुआ, निर्गमन के लिए ई.एस.सी. दबाएँ. braveMenuTotalReplacements=सारे प्रतिस्थापन: {{गणना}} basicAuthRequired=प्रमाणीकरण आवश्यक -basicAuthUsername.placeholder=उपयोगकर्ता नाम: -basicAuthPassword.placeholder=पारण शब्द: +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{host}} प्रयोक्ता के नाम और पासवर्ड की आवश्यकता है. crashScreenHeader=कुछ ग़लत हो गया =( crashScreenText=इस वेबपृष्ठ को प्रदर्शित करने के दौरान एक त्रुटि हुई. जारी रखने के लिए, पुनः लोड करें या अन्य पृष्ठ का मार्गनिर्देशन करें. diff --git a/app/extensions/brave/locales/hi-IN/preferences.properties b/app/extensions/brave/locales/hi-IN/preferences.properties index 4fb9174dcf6..47fc53d0abf 100644 --- a/app/extensions/brave/locales/hi-IN/preferences.properties +++ b/app/extensions/brave/locales/hi-IN/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ -publisherPaymentsTitle=Brave Payments -publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -60,6 +58,7 @@ off=off on=on notifications=notifications moneyAdd=Use your debit or credit card +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Buy with Coinbase addFundsTitle=Add funds... addFunds=Add funds to your Brave Payments Account diff --git a/app/extensions/brave/locales/id-ID/app.properties b/app/extensions/brave/locales/id-ID/app.properties index 96c2afe6af5..ff649898cc0 100644 --- a/app/extensions/brave/locales/id-ID/app.properties +++ b/app/extensions/brave/locales/id-ID/app.properties @@ -69,8 +69,8 @@ moreBookmarks=Markah yang lainnya... fullScreenModeWarning={{host}} memasuki mode layar penuh, tekan ESC untuk keluar. braveMenuTotalReplacements=Total Penggantian: {{count}} basicAuthRequired=DIbutuhkan Autentikasi -basicAuthUsername.placeholder=Nama Pengguna: -basicAuthPassword.placeholder=Sandi: +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{host}} membutuhkan nama pengguna dan sandi. crashScreenHeader=Telah terjadi kesalahan =( crashScreenText=Terjadi kesalahan saat mencoba menampilkan laman web. Untuk melanjutkan, muat ulang atau navigasikan ke laman lain. diff --git a/app/extensions/brave/locales/id-ID/preferences.properties b/app/extensions/brave/locales/id-ID/preferences.properties index 823e829f572..93321f098d2 100644 --- a/app/extensions/brave/locales/id-ID/preferences.properties +++ b/app/extensions/brave/locales/id-ID/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Saat ini Pembayaran Brave masih dalam versi Beta. Dengan ba paymentsWelcomeText5=Butuh informasi lebih lanjut? paymentsWelcomeText6=untuk Pembayaran Brave... paymentsWelcomeLink=Lihat FAQ -publisherPaymentsTitle=Pembayaran Brave -publisherPaymentsTitleBeta=beta paymentsSidebarText1=Mitra kami paymentsSidebarText2=Semua alamat IP transaksi dianonimkan menggunakan teknologi dari: paymentsSidebarText3=Dompet Bitcoin Brave tersedia melalui kerja sama dengan: @@ -60,6 +58,7 @@ off=mati on=nyala notifications=notifikasi moneyAdd=Gunakan kartu debit atau kartu kredit Anda +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Beli dengan Coinbase addFundsTitle=Tambahkan dana... addFunds=Tambahkan dana ke Brave Payments Account diff --git a/app/extensions/brave/locales/ja-JP/app.properties b/app/extensions/brave/locales/ja-JP/app.properties index 28e155b02ff..4ba6a90ead1 100644 --- a/app/extensions/brave/locales/ja-JP/app.properties +++ b/app/extensions/brave/locales/ja-JP/app.properties @@ -69,8 +69,8 @@ moreBookmarks=他のブックマーク fullScreenModeWarning={{host}}は全画面表示モードです。終了するにはESCを押してください。 braveMenuTotalReplacements={{count}}個置き換えました basicAuthRequired=認証が必要です -basicAuthUsername.placeholder=ユーザー名： -basicAuthPassword.placeholder=パスワード： +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{host}}はユーザー名とパスワードが必要です。 crashScreenHeader=不具合が発生しました =( crashScreenText=ページを表示する際にエラーが発生しました。続けるにはこのページを再読み込みするか、別のページを表示してください。 diff --git a/app/extensions/brave/locales/ja-JP/preferences.properties b/app/extensions/brave/locales/ja-JP/preferences.properties index 5d82b41a6d3..ebaec595eab 100644 --- a/app/extensions/brave/locales/ja-JP/preferences.properties +++ b/app/extensions/brave/locales/ja-JP/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Braveペイメントは現在ベータ版です。ユーザ paymentsWelcomeText5=詳細はこちら paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=よくある質問を表示 -publisherPaymentsTitle=Braveペイメント -publisherPaymentsTitleBeta=ベータ paymentsSidebarText1=パートナー paymentsSidebarText2=取引に用いられるIPアドレスは以下のサービスの技術で匿名化されます paymentsSidebarText3=Braveのビットコインウォレットは以下のパートナーシップにより提供されます @@ -60,6 +58,7 @@ off=オフ on=オン notifications=notifications moneyAdd=デビットカードかクレジットカードを使う +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Coinbaseで買う addFundsTitle=送金する addFunds=Braveの払い込みアカウントに送金する diff --git a/app/extensions/brave/locales/nl-NL/app.properties b/app/extensions/brave/locales/nl-NL/app.properties index b29d621aba6..df46cc3ba29 100644 --- a/app/extensions/brave/locales/nl-NL/app.properties +++ b/app/extensions/brave/locales/nl-NL/app.properties @@ -69,8 +69,8 @@ moreBookmarks=Meer bladwijzers... fullScreenModeWarning={{host}} is in volledige scherm modus, druk op ESC om te sluiten. braveMenuTotalReplacements=Totaal vervangen: {{count}} basicAuthRequired=Inloggen -basicAuthUsername.placeholder=Gebruikersnaam: -basicAuthPassword.placeholder=Wachtwoord: +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{host}} heeft een gebruikersnaam en wachtwoord nodig. crashScreenHeader=Er ging iets fout =( crashScreenText=Er doet zich een probleem voor. Om door te gaan, herlaad de pagina of ga naar een andere pagina. diff --git a/app/extensions/brave/locales/nl-NL/preferences.properties b/app/extensions/brave/locales/nl-NL/preferences.properties index 7c2ab097e02..f8151efec0e 100644 --- a/app/extensions/brave/locales/nl-NL/preferences.properties +++ b/app/extensions/brave/locales/nl-NL/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ -publisherPaymentsTitle=Brave Payments -publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -60,6 +58,7 @@ off=off on=on notifications=notifications moneyAdd=Use your debit or credit card +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Buy with Coinbase addFundsTitle=Add funds... addFunds=Add funds to your Brave Payments Account diff --git a/app/extensions/brave/locales/pt-BR/app.properties b/app/extensions/brave/locales/pt-BR/app.properties index 74a9913a64f..9a236df7880 100644 --- a/app/extensions/brave/locales/pt-BR/app.properties +++ b/app/extensions/brave/locales/pt-BR/app.properties @@ -69,8 +69,8 @@ moreBookmarks=Mais favoritos... fullScreenModeWarning={{host}} entrou em modo de tela cheia, pressione ESC para sair. braveMenuTotalReplacements=Total de Substituições: {{count}} basicAuthRequired=Autenticação Necessária -basicAuthUsername.placeholder=Nome de Usuário: -basicAuthPassword.placeholder=Senha: +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{host}} requer um nome de usuário e uma senha. crashScreenHeader=Algo deu errado =( crashScreenText=Um erro ocorreu ao exibir esta página. Para continuar, recarregue ou navegue para outra página. diff --git a/app/extensions/brave/locales/pt-BR/preferences.properties b/app/extensions/brave/locales/pt-BR/preferences.properties index 81bd47ef92d..cc3a3144a2c 100644 --- a/app/extensions/brave/locales/pt-BR/preferences.properties +++ b/app/extensions/brave/locales/pt-BR/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Precisa de mais informações? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ -publisherPaymentsTitle=Brave Payments -publisherPaymentsTitleBeta=beta paymentsSidebarText1=Nossos Parceiros paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -60,6 +58,7 @@ off=off on=on notifications=notifications moneyAdd=Usar cartão de débito ou crédito +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Buy with Coinbase addFundsTitle=Add funds... addFunds=Add funds to your Brave Payments Account diff --git a/app/extensions/brave/locales/sl/app.properties b/app/extensions/brave/locales/sl/app.properties index ac63a111770..4e91771fa77 100644 --- a/app/extensions/brave/locales/sl/app.properties +++ b/app/extensions/brave/locales/sl/app.properties @@ -69,8 +69,8 @@ moreBookmarks=Več zaznamkov ... fullScreenModeWarning={{host}} je vstopil v celozaslonski način, pritisnite ubežnico za izhod. braveMenuTotalReplacements=Skupaj zamenjav: {{count}} basicAuthRequired=Potrebna je overitev -basicAuthUsername.placeholder=Uporabniško ime: -basicAuthPassword.placeholder=Geslo: +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{host}} zahteva uporabniško ime in geslo. crashScreenHeader=Nekaj je šlo narobe =( crashScreenText=Ob prikazu te spletne strani je prišlo do napake. Če želite nadaljevati, jo ponovno naložite ali obiščite drugo stran. diff --git a/app/extensions/brave/locales/sl/preferences.properties b/app/extensions/brave/locales/sl/preferences.properties index 32f706ba60e..e0ac906524b 100644 --- a/app/extensions/brave/locales/sl/preferences.properties +++ b/app/extensions/brave/locales/sl/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Plačila Brave so trenutno v fazi beta. Z vašo pomočjo in paymentsWelcomeText5=Želite več informacij? paymentsWelcomeText6=za Plačila Brave ... paymentsWelcomeLink=Pokaži pogosto zastavljena vprašanja -publisherPaymentsTitle=Plačila Brave -publisherPaymentsTitleBeta=beta paymentsSidebarText1=Naši partnerji paymentsSidebarText2=Vsi naslovi IP transakcij se anonimizirajo s tehnologijo, ki jo zagotavlja: paymentsSidebarText3=Denarnice Bitcoin Brave zagotavlja partnerstvo z: @@ -60,6 +58,7 @@ off=izključeno on=vključeno notifications=notifications moneyAdd=Uporabite svojo debetno ali kreditno kartico +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Kupi s Coinbase addFundsTitle=Dodaj sredstva ... addFunds=Dodajte sredstva svojemu plačilnemu računu Brave diff --git a/app/extensions/brave/locales/ta/app.properties b/app/extensions/brave/locales/ta/app.properties index 4a7fc05d500..427cdbc6d53 100644 --- a/app/extensions/brave/locales/ta/app.properties +++ b/app/extensions/brave/locales/ta/app.properties @@ -69,8 +69,8 @@ moreBookmarks=மேலும் புத்தகக்குறிகள்.. fullScreenModeWarning={{host}} முழுத்திரை முறைமையில் நுழைந்தது, வெளியேற ESC ஐ அழுத்து. braveMenuTotalReplacements=மொத்த மாற்றுகள்: {{count}} basicAuthRequired=உறுதிப்படுத்தல் தேவை -basicAuthUsername.placeholder=பயனர்பெயர்: -basicAuthPassword.placeholder=கடவுச்சொல்: +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{host}} க்கு ஒரு பயனர்பெயர் மற்றும் கடவுச்சொல் தேவை. crashScreenHeader=ஏதோ தவறானது =( crashScreenText=வலைப்பக்கத்தை காட்டும் போது ஒரு பிழை ஏற்பட்டது. தொடர, மறுஏற்று அல்லது வேறொரு பக்கத்திற்கு செல். diff --git a/app/extensions/brave/locales/ta/preferences.properties b/app/extensions/brave/locales/ta/preferences.properties index 2212fd67b32..aa95d9cc2e4 100644 --- a/app/extensions/brave/locales/ta/preferences.properties +++ b/app/extensions/brave/locales/ta/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ -publisherPaymentsTitle=Brave Payments -publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -60,6 +58,7 @@ off=off on=on notifications=notifications moneyAdd=Use your debit or credit card +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Buy with Coinbase addFundsTitle=Add funds... addFunds=Add funds to your Brave Payments Account diff --git a/app/extensions/brave/locales/te/app.properties b/app/extensions/brave/locales/te/app.properties index 036b879b34c..f187a66c725 100644 --- a/app/extensions/brave/locales/te/app.properties +++ b/app/extensions/brave/locales/te/app.properties @@ -69,8 +69,8 @@ moreBookmarks=మరిన్ని బూక్మర్కులు fullScreenModeWarning=ఫుల్ స్క్రీన్ మోడ్ లో ఉన్నారు , బయటకి వచ్చేందుకు ESC కొట్టండి braveMenuTotalReplacements=మొత్తం భర్థీలు {{ సంఖ్యా }} basicAuthRequired=ప్రామాణీకరణ అవసరము -basicAuthUsername.placeholder=Username: -basicAuthPassword.placeholder=Password: +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{ హాస్ట }} కి ఉసెర్ పేరు మరియు పాస్వర్డ్ కావలెను crashScreenHeader=ఏదో తప్పు జరిగినది =( crashScreenText=ఈ వెబ్పేజీని ప్రదర్శించేటప్పుడు ఒక లోపం ఏర్పడింది. కొనసాగించడానికి రీలోడ్ చెయ్యండి లేదా మరో పేజీకి వెళ్ళండి. diff --git a/app/extensions/brave/locales/te/preferences.properties b/app/extensions/brave/locales/te/preferences.properties index 208b881c975..9885393bf4d 100644 --- a/app/extensions/brave/locales/te/preferences.properties +++ b/app/extensions/brave/locales/te/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ -publisherPaymentsTitle=Brave Payments -publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -60,6 +58,7 @@ off=off on=on notifications=notifications moneyAdd=Use your debit or credit card +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Buy with Coinbase addFundsTitle=Add funds... addFunds=Add funds to your Brave Payments Account diff --git a/app/extensions/brave/locales/tr-TR/app.properties b/app/extensions/brave/locales/tr-TR/app.properties index 1b4272ca7bd..ec1a4b584c9 100644 --- a/app/extensions/brave/locales/tr-TR/app.properties +++ b/app/extensions/brave/locales/tr-TR/app.properties @@ -69,8 +69,8 @@ moreBookmarks=Daha fazla yerimi fullScreenModeWarning={{host}} Tam ekran modunda. Çıkış için ESC kullanın. braveMenuTotalReplacements=Toplam Değişiklikler: {{count}} basicAuthRequired=Onaylama Gerekli -basicAuthUsername.placeholder=Kullanıcı adı: -basicAuthPassword.placeholder=Şifre: +basicAuthUsernameLabel=Username: +basicAuthPasswordLabel=Password: basicAuthMessage={{host}} kullanıcı ve şifrenize ihtiyaç duyuyor. crashScreenHeader=Bir şey yanlış gitti =( crashScreenText=An error occurred while displaying this webpage. To continue, reload or navigate to another page. diff --git a/app/extensions/brave/locales/tr-TR/preferences.properties b/app/extensions/brave/locales/tr-TR/preferences.properties index 4c7e956ee11..2dda81ceda5 100644 --- a/app/extensions/brave/locales/tr-TR/preferences.properties +++ b/app/extensions/brave/locales/tr-TR/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Brave Payments is currently in Beta. With your help and fee paymentsWelcomeText5=Need more info? paymentsWelcomeText6=for Brave Payments... paymentsWelcomeLink=View the FAQ -publisherPaymentsTitle=Brave Payments -publisherPaymentsTitleBeta=beta paymentsSidebarText1=Our Partners paymentsSidebarText2=All transaction IP addresses are anonymized with technology from: paymentsSidebarText3=Brave Bitcoin Wallets are provided through a partnership with: @@ -60,6 +58,7 @@ off=off on=on notifications=notifications moneyAdd=Use your debit or credit card +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Buy with Coinbase addFundsTitle=Add funds... addFunds=Add funds to your Brave Payments Account diff --git a/app/extensions/brave/locales/uk/app.properties b/app/extensions/brave/locales/uk/app.properties index 445e3056c14..4f9d82e8464 100644 --- a/app/extensions/brave/locales/uk/app.properties +++ b/app/extensions/brave/locales/uk/app.properties @@ -69,8 +69,8 @@ moreBookmarks=Ще закладки... fullScreenModeWarning={{host}} використовує повноекранний режим, натисніть ESC для виходу. braveMenuTotalReplacements=Всього замінено: {{count}} basicAuthRequired=Засвідчення обов'язкове -basicAuthUsername.placeholder=Ім'я користувача: -basicAuthPassword.placeholder=Пароль: +basicAuthUsernameLabel=Ім'я користувача: +basicAuthPasswordLabel=Пароль: basicAuthMessage={{host}} потребує ім'я користувача і пароль. crashScreenHeader=Щось пішло не так =( crashScreenText=Сталася помилка при відображенні цієї сторінки. Для продовження перезавантажте її, або перейдіть на іншу сторінку. diff --git a/app/extensions/brave/locales/uk/preferences.properties b/app/extensions/brave/locales/uk/preferences.properties index 5560045d36a..2ba15477e45 100644 --- a/app/extensions/brave/locales/uk/preferences.properties +++ b/app/extensions/brave/locales/uk/preferences.properties @@ -19,8 +19,6 @@ paymentsWelcomeText4=Brave платежі наразі працюють в те paymentsWelcomeText5=Потрібно більше інформації? paymentsWelcomeText6=для Brave платежів... paymentsWelcomeLink=Переглянути ЧаП -publisherPaymentsTitle=Brave платежі -publisherPaymentsTitleBeta=бета paymentsSidebarText1=Наші партнери paymentsSidebarText2=Всі IP-адреси транзакцій анонімізовані з використанням технології від: paymentsSidebarText3=Гаманці Brave Bitcoin надаються через партнерство з: @@ -58,8 +56,9 @@ usd=$ done=Готово off=із on=на -notifications=notifications +notifications=сповіщення moneyAdd=Використати вашу платіжну чи кредитну картку +coinbaseNotAvailable=Sorry! Adding funds with a credit/debit card is only available for contributions of $5/month at the moment. add=Купити з Coinbase addFundsTitle=Додати кошти... addFunds=Додати кошти на свій рахунок платежів Brave From 30e199355b11ea169ff2ad7a5253b29ea832f6ee Mon Sep 17 00:00:00 2001 From: bridiver Date: Wed, 31 Aug 2016 11:19:24 -0700 Subject: [PATCH 15/48] clear the lastAccessedTime for all tags when clearing history fixes #3616 --- app/sessionStore.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/sessionStore.js b/app/sessionStore.js index 9c45103b723..848d126ae74 100644 --- a/app/sessionStore.js +++ b/app/sessionStore.js @@ -252,7 +252,12 @@ module.exports.cleanAppData = (data, isShutdown) => { if (data.sites) { const clearHistory = isShutdown && getSetting(settings.SHUTDOWN_CLEAR_HISTORY) === true if (clearHistory) { + // TODO - this should the history methods from siteUtils data.sites = data.sites.filter((site) => site && site.tags && site.tags.length) + data.sites = data.sites.map((site) => { + delete site.lastAccessedTime + return site + }) } } if (data.downloads) { From 04fa4a63030eecf072eae9b8e3d7f0f8af9593a3 Mon Sep 17 00:00:00 2001 From: Marshall Rose Date: Wed, 31 Aug 2016 11:24:30 -0700 Subject: [PATCH 16/48] use ledger-publisher@0.8.57 fixes https://github.com/brave/browser-laptop/issues/3613 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a1320829187..e1b73f26a10 100644 --- a/package.json +++ b/package.json @@ -90,7 +90,7 @@ "l20n": "^3.5.1", "ledger-balance": "^0.8.46", "ledger-client": "^0.8.55", - "ledger-publisher": "^0.8.55", + "ledger-publisher": "^0.8.57", "lru_cache": "^1.0.0", "random-lib": "2.1.0", "qr-image": "^3.1.0", From 83088187d968b23d6f10b0583b6b0d3a23b4b1ba Mon Sep 17 00:00:00 2001 From: "Brian R. Bondy" Date: Wed, 31 Aug 2016 15:10:33 -0400 Subject: [PATCH 17/48] Changelog tweaks MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Auditors: @alexwykoff Test Plan: n/a General feedback for future release notes: Major new features at the top: Autofill is a major feature highlight but wasn’t listed, so should be at the top. A sub-fix of it was listed under fixes. Sub-fixes for a new feature: about:history is a new feature so sub-fixes related to that aren’t needed in release notes. Ditto ledger stuff. Exclude Tests: Anything that mentions fixing automated tests or tests shouldn’t be included. In general anything dev relatd doesn't need to be included. Some reformatting of titles needed so that a casual reader can understand it, remove sub-references to other issues inside titles. Duplicate bugs: “Fixed new tab button too high” and “Fixed new tab button position fixes #3208” are too similar so just mention one of them Simplify some titles: “Fixed Make targets.host UNIQUE, which auto-creates index” -> “Optimize HTTPS Everywhere” Remove text like “Like other browsers do” from titles Consistent naming of main features “non script” “noScript” -> “NoScript” Always end lines in a period. Thanks! --- CHANGELOG.md | 110 +++++++++++++++++++++------------------------------ 1 file changed, 46 insertions(+), 64 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c8788b096cf..42ee3300263 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,55 +2,37 @@ ## [0.11.6](https://github.com/brave/browser-laptop/releases/v0.11.6dev) - Added Ledger beta integration. ([#3195](https://github.com/brave/browser-laptop/issues/3195)) - - Added about:history, sets back/forward nav limit, more efficient dynamic menus. ([#3206](https://github.com/brave/browser-laptop/issues/3206)) - - Added history and Ctrl +Y to bring it up suggestion. ([#444](https://github.com/brave/browser-laptop/issues/444)) - - Changed Hamburger Menu with layout mentioned in #1893. ([#3003](https://github.com/brave/browser-laptop/issues/3003)) - - Changed new tab button too high. ([#3208](https://github.com/brave/browser-laptop/issues/3208)) + - Added Autofill support. ([#860](https://github.com/brave/browser-laptop/issues/860)) + - Added about:history and Ctrl +Y to bring it up. ([#444](https://github.com/brave/browser-laptop/issues/444)) + - Added new look for find bar UI. ([#3159](https://github.com/brave/browser-laptop/issues/3159)) + - Added bookmarks into the bookmarks menu. ([#1993](https://github.com/brave/browser-laptop/issues/1993)) + - Optimized HTTPS Everywhere. ([#3215](https://github.com/brave/browser-laptop/issues/3215)) + - Changed Hamburger Menu with layout. ([#3003](https://github.com/brave/browser-laptop/issues/3003)) - Changed Back button history does not hint at options beyond a certain point. ([#2889](https://github.com/brave/browser-laptop/issues/2889)) - - Changed Temporarily remove insertions. ([#3211](https://github.com/brave/browser-laptop/issues/3211)) - - Fixed Address bar input ignored if no default search engine set. ([#3254](https://github.com/brave/browser-laptop/issues/3254)) - Fixed default engine display problem for fresh profile. ([#3275](https://github.com/brave/browser-laptop/issues/3275)) - - Fixed Payments Add Funds modal is misaligned. ([#3267](https://github.com/brave/browser-laptop/issues/3267)) - - Fixed Payments monthly budget dropdown is missing units. ([#3266](https://github.com/brave/browser-laptop/issues/3266)) - - Fixed many things in History. ([#3253](https://github.com/brave/browser-laptop/issues/3253)) - - Fixed URL bar autocomplete mouseover does not interfere with typed URL (fixes #3012) (take 2). ([#3225](https://github.com/brave/browser-laptop/issues/3225)) - - Fixed Autofill on URL bar. ([#3012](https://github.com/brave/browser-laptop/issues/3012)) - - Fixed new tab button position fixes #3208. ([#3213](https://github.com/brave/browser-laptop/issues/3213)) - - Fixed Back/Forward navigation, tab shows page URL instead of page title. ([#3200](https://github.com/brave/browser-laptop/issues/3200)) - - Fixed tab title on back/forward fixes #3200. ([#3202](https://github.com/brave/browser-laptop/issues/3202)) - - Fixed Bookmarks Menu should list the bookmarks like other browsers do enhancement. ([#1993](https://github.com/brave/browser-laptop/issues/1993)) - - Fixed "auto open bookmarks toolbar for the first bookmark" test needs to be updated. ([#2941](https://github.com/brave/browser-laptop/issues/2941)) - - Fixed "Pinning with partitions" test is failing but the functionality works. ([#2942](https://github.com/brave/browser-laptop/issues/2942)) + - Fixed Address bar input ignored if no default search engine set. ([#3254](https://github.com/brave/browser-laptop/issues/3254)) + - Fixed URL bar autocomplete mouseover does not interfere with typed URL. ([#3225](https://github.com/brave/browser-laptop/issues/3225)) + - Fixed ETags for data file downloading haven't been working. ([#3222](https://github.com/brave/browser-laptop/issues/3222)) + - Fixed Modals being clipped when the window is narrow. ([#3575](https://github.com/brave/browser-laptop/issues/3575)) - Fixed Application icon is with poor resolution on Linux. ([#3229](https://github.com/brave/browser-laptop/issues/3229)) - - Fixed Change the size of the Linux icon fixes #3229. ([#3230](https://github.com/brave/browser-laptop/issues/3230)) + - Fixed new tab button too high. ([#3208](https://github.com/brave/browser-laptop/issues/3208)) + - Fixed new tab button position fixes #3208. ([#3213](https://github.com/brave/browser-laptop/issues/3213)) + - Fixed flash on http://www.y8.com/games/superfighters does not work. ([#3082](https://github.com/brave/browser-laptop/issues/3082)) - Fixed Users can create bookmark folders with no name. ([#3188](https://github.com/brave/browser-laptop/issues/3188)) - - Fixed Validate bookmark name before creation Fixes #3188. ([#3190](https://github.com/brave/browser-laptop/issues/3190)) - - Fixed ETags for data file downloading haven't been working. ([#3222](https://github.com/brave/browser-laptop/issues/3222)) - - Fixed Make targets.host UNIQUE, which auto-creates index. ([#3215](https://github.com/brave/browser-laptop/issues/3215)) - - Fixed Use noScript state per site instead of blocking scripts. ([#3205](https://github.com/brave/browser-laptop/issues/3205)) - - Fixed Non-script version of DuckDuckGo when blocking scripts is not loaded from location bar at first instance. ([#3189](https://github.com/brave/browser-laptop/issues/3189)) + - Fixed Back/Forward navigation, tab shows page URL instead of page title. ([#3200](https://github.com/brave/browser-laptop/issues/3200)) + - Fixed NoScript version of DuckDuckGo should be used when NoScript is on. ([#3189](https://github.com/brave/browser-laptop/issues/3189)) + - Fixed Use NoScript state per site instead of blocking scripts. ([#3205](https://github.com/brave/browser-laptop/issues/3205)) - Fixed Market graph on wsj.com. ([#2102](https://github.com/brave/browser-laptop/issues/2102)) - Fixed tab-specific notifications should be closed when tab is closed. ([#3169](https://github.com/brave/browser-laptop/issues/3169)) - Fixed Brave can't handle URLs with whitespace in it. ([#3167](https://github.com/brave/browser-laptop/issues/3167)) - - Fixed Whitespace in url fixes #3167. ([#3168](https://github.com/brave/browser-laptop/issues/3168)) - - Fixed Flash on http://www.y8.com/games/superfighters. ([#3082](https://github.com/brave/browser-laptop/issues/3082)) - - Fixed Bookmarks now show under Bookmarks menu. ([#3055](https://github.com/brave/browser-laptop/issues/3055)) - - Fixed Menu should only be built once. ([#3022](https://github.com/brave/browser-laptop/issues/3022)) - - Fixed the ability to delete saved passwords. ([#3481](https://github.com/brave/browser-laptop/issues/3481)) + - Fixed Regenerating menu too often. ([#3022](https://github.com/brave/browser-laptop/issues/3022)) - Fixed Bookmarks flow for sites without titles. ([#3442](https://github.com/brave/browser-laptop/issues/3442)) - Fixed opening files instead of searching for them. ([#3296](https://github.com/brave/browser-laptop/issues/3296)) - - Fixed Pressing backspace while typing makes the browser go to the previous page ([#3496](https://github.com/brave/browser-laptop/issues/3496)) - - Fixed autocomplete db initialization failing on fresh profile ([#3577](https://github.com/brave/browser-laptop/issues/3577)) - - Fixed username and password field for basic auth dialog not showing up ([#3578](https://github.com/brave/browser-laptop/issues/3578)) - - Fixed Modals being clipped when the window is narrow. ([#3575](https://github.com/brave/browser-laptop/issues/3575)) - - Fixed a lot of things for ledger: ([#3573](https://github.com/brave/browser-laptop/issues/3573))([#3567](https://github.com/brave/browser-laptop/issues/3567))([#3565](https://github.com/brave/browser-laptop/issues/3565))([#3539](https://github.com/brave/browser-laptop/issues/3539))([#3551](https://github.com/brave/browser-laptop/issues/3551))([#3554](https://github.com/brave/browser-laptop/issues/3554))([#3553](https://github.com/brave/browser-laptop/issues/3553))([#3545](https://github.com/brave/browser-laptop/issues/3545))([#3523](https://github.com/brave/browser-laptop/issues/3523)) - - Fixed cropped/narrow buttons in prefs panels via CSS ([#3507](https://github.com/brave/browser-laptop/issues/3563)) - - Fixed after upgrade, context menu for password manager was not showing ([#3549](https://github.com/brave/browser-laptop/issues/3549)) - - Fixed check for valid data before upgrading and assign defaults after cleaning ([#3537](https://github.com/brave/browser-laptop/issues/3537)) - - Fixed tab close causing fullscreen to be exited ([#3519](https://github.com/brave/browser-laptop/issues/3519)) - - Fixed passwords are not saved using default settings ([#3516](https://github.com/brave/browser-laptop/issues/3516)) - - Fixed flash on http://www.y8.com/games/superfighters does not work ([#3082](https://github.com/brave/browser-laptop/issues/3082)) - - Update to HTTPS Everywhere 5.2.0. ([#2581](https://github.com/brave/browser-laptop/issues/2581)) + - Fixed Pressing backspace while typing makes the browser go to the previous page on some pages. ([#3496](https://github.com/brave/browser-laptop/issues/3496)) + - Fixed username and password field for basic auth dialog not showing up. ([#3578](https://github.com/brave/browser-laptop/issues/3578)) + - Fixed after upgrade, context menu for password manager was not showing. ([#3549](https://github.com/brave/browser-laptop/issues/3549)) + - Fixed passwords are not saved using default settings. ([#3516](https://github.com/brave/browser-laptop/issues/3516)) + - Upgraded to HTTPS Everywhere 5.2.0. ([#2581](https://github.com/brave/browser-laptop/issues/2581)) ## [0.11.5](https://github.com/brave/browser-laptop/releases/v0.11.5dev) - Fixed a top crasher. ([#3054](https://github.com/brave/browser-laptop/issues/3054)) @@ -80,7 +62,7 @@ - Fix PDF downloading with File > Save Page as. ([#2954](https://github.com/brave/browser-laptop/issues/2954)) - Fix NoScript should not take effect when shields are down. ([#2950](https://github.com/brave/browser-laptop/issues/2950)) - Fix undefined error popup caused by zoomed page upgrading. ([#2989](https://github.com/brave/browser-laptop/issues/2989)) -- Upgrade to libchromiumcontent 52.0.2743.116. ([#2964](https://github.com/brave/browser-laptop/issues/2964)) +- Upgraded to libchromiumcontent 52.0.2743.116. ([#2964](https://github.com/brave/browser-laptop/issues/2964)) ## [0.11.2](https://github.com/brave/browser-laptop/releases/v0.11.2dev) - Added history on long click over back and forward buttons. ([#1622](https://github.com/brave/browser-laptop/issues/1622)) @@ -114,8 +96,8 @@ - Fixed "Open Image In New Tab" respecting private / session info. ([#2746](https://github.com/brave/browser-laptop/issues/2746)) - Fixed pressing down on URL bar now shows autosuggest. ([#2444](https://github.com/brave/browser-laptop/issues/2444)) - Fixed showing scrollbars in tabs bar in Arch linux. ([#2599](https://github.com/brave/browser-laptop/issues/2599)) -- Upgrade to libchromiumcontent 52.0.2743.82. ([#1592](https://github.com/brave/browser-laptop/issues/1592)) -- Upgrade to Electron 1.3.0. ([#2635](https://github.com/brave/browser-laptop/issues/2635)) +- Upgraded to libchromiumcontent 52.0.2743.82. ([#1592](https://github.com/brave/browser-laptop/issues/1592)) +- Upgraded to Electron 1.3.0. ([#2635](https://github.com/brave/browser-laptop/issues/2635)) ## [0.11.1](https://github.com/brave/browser-laptop/releases/v0.11.1dev) - Added built-in PDF reader with PDF.js. Can be disabled in preferences. ([#1084](https://github.com/brave/browser-laptop/issues/1084)) @@ -134,7 +116,7 @@ - Fixed webRTC fingerprinting blocking. ([#2412](https://github.com/brave/browser-laptop/issues/2412)) - Fixed find in page highlighting not clearing when find bar is closed. ([#2476](https://github.com/brave/browser-laptop/issues/2476)) - Fixed two finger swipe gesture on macOS conflicting with scrolling. ([#2577](https://github.com/brave/browser-laptop/issues/2577)) -- Upgrade to Electron 1.2.7. ([#2470](https://github.com/brave/browser-laptop/issues/2470)) +- Upgraded to Electron 1.2.7. ([#2470](https://github.com/brave/browser-laptop/issues/2470)) ## [0.11.0](https://github.com/brave/browser-laptop/releases/v0.11.0dev) - Added LastPass support. ([#2316](https://github.com/brave/browser-laptop/issues/2316)) @@ -169,11 +151,11 @@ - Fixed window titles not showing up in the Window menu in macOS. ([#2192](https://github.com/brave/browser-laptop/issues/2192)) - Fixed navigation controller sometimes making back button not function correctly. ([#2144](https://github.com/brave/browser-laptop/issues/2144)) - Fixed Fullscreen mode on Windows so it hides menu bar. ([#2053](https://github.com/brave/browser-laptop/issues/2053)) -- Upgrade to libchromiumcontent 51.0.2704.103. ([#2211](https://github.com/brave/browser-laptop/issues/2211)) -- Upgrade to Electron 1.2.3. ([#2294](https://github.com/brave/browser-laptop/issues/2294)) +- Upgraded to libchromiumcontent 51.0.2704.103. ([#2211](https://github.com/brave/browser-laptop/issues/2211)) +- Upgraded to Electron 1.2.3. ([#2294](https://github.com/brave/browser-laptop/issues/2294)) ## [0.10.3](https://github.com/brave/browser-laptop/releases/v0.10.3dev) -- Upgrade to libchromiumcontent 51.0.2704.84. ([#2122](https://github.com/brave/browser-laptop/issues/2122)) +- Upgraded to libchromiumcontent 51.0.2704.84. ([#2122](https://github.com/brave/browser-laptop/issues/2122)) ## [0.10.2](https://github.com/brave/browser-laptop/releases/v0.10.2dev) - Fixed crash on Windows when clicking on certain link types. ([#2064](https://github.com/brave/browser-laptop/issues/2064)) @@ -198,10 +180,10 @@ - Fixed contractions showing up as misspelled for spell check. ([#2015](https://github.com/brave/browser-laptop/issues/2015)) - Fixed non-English spell checking dictionaries. ([#1788](https://github.com/brave/browser-laptop/issues/1788)) - Possibly fixed intermittent problem with copy on macOS. ([#1060](https://github.com/brave/browser-laptop/issues/1060)) -- Upgrade to HTTPS Everywhere definitions for 5.1.9. ([#1692](https://github.com/brave/browser-laptop/issues/1692)) -- Upgrade to libchromiumcontent 51.0.2704.63. ([#1405](https://github.com/brave/browser-laptop/issues/1405)) -- Upgrade to Electron 1.2.0. ([#1968](https://github.com/brave/browser-laptop/issues/1968)) -- Upgrade to Node 6.1. ([#1969](https://github.com/brave/browser-laptop/issues/1969)) +- Upgraded to HTTPS Everywhere definitions for 5.1.9. ([#1692](https://github.com/brave/browser-laptop/issues/1692)) +- Upgraded to libchromiumcontent 51.0.2704.63. ([#1405](https://github.com/brave/browser-laptop/issues/1405)) +- Upgraded to Electron 1.2.0. ([#1968](https://github.com/brave/browser-laptop/issues/1968)) +- Upgraded to Node 6.1. ([#1969](https://github.com/brave/browser-laptop/issues/1969)) - [Various other fixes.](https://github.com/brave/browser-laptop/milestones/0.10.1dev) ## [0.10.0](https://github.com/brave/browser-laptop/releases/v0.10.0dev) @@ -217,7 +199,7 @@ - [Various other fixes.](https://github.com/brave/browser-laptop/issues?q=milestone%3A0.10.0dev+is%3Aclosed) ## [0.9.6](https://github.com/brave/browser-laptop/releases/v0.9.6dev) -- Upgrade to libchromiumcontent 50.0.2661.102. ([#1708](https://github.com/brave/browser-laptop/issues/1708)) +- Upgraded to libchromiumcontent 50.0.2661.102. ([#1708](https://github.com/brave/browser-laptop/issues/1708)) - Fix application sometimes not quitting fully. ([#1540](https://github.com/brave/browser-laptop/issues/1540)) - Fix for URL bar context menu selection detection. ([#1709](https://github.com/brave/browser-laptop/issues/1709)) - Fix for disabling extensions without a browser restart. ([#1707](https://github.com/brave/browser-laptop/issues/1707)) @@ -254,8 +236,8 @@ - More locales added. - Added optional Home button. - Fixed various bugs. -- Upgrade to libchromiumcontent 50.0.2661.94. -- Upgrade to Electron 0.37.7. +- Upgraded to libchromiumcontent 50.0.2661.94. +- Upgraded to Electron 0.37.7. ## [0.9.2](https://github.com/brave/browser-laptop/releases/v0.9.2dev) - Added the ability to set Brave as the default browser within Control Panel on Windows. @@ -268,12 +250,12 @@ - Block 'javascript:' URLs from being loaded when entered in URL bar. - Printing fixed. - Fixed various bugs. -- Upgrade to libchromiumcontent 49.0.2623.112. -- Upgrade to Electron 0.37.6. +- Upgraded to libchromiumcontent 49.0.2623.112. +- Upgraded to Electron 0.37.6. ## [0.9.1](https://github.com/brave/browser-laptop/releases/v0.9.1dev) - Undo closed tab now focuses the webview. -- Upgrade to React v15 for cleaner DOM and faster performance. +- Upgraded to React v15 for cleaner DOM and faster performance. - Fix for about: pages font size. - Fix for clicking on some JavaScript links not working. - Fix startup error relating to session storage and passwords saved from forms without actions. @@ -290,7 +272,7 @@ - Removed Brave from the User Agent HTTP header to reduce fingerprinting. - Windows shortcuts added F12 for developer tools and F11 for fullscreen. - Partial extensions support added internally for running some Chrome extensions unmodified. -- Upgrade to Node 5.10.0. +- Upgraded to Node 5.10.0. ## [0.8.3](https://github.com/brave/browser-laptop/releases/v0.8.3dev) - Add ability to enable/disable password manager in Preferences @@ -302,9 +284,9 @@ - Close other tabs context menu items added. - Password saving fixes. - Bookmark fixes. -- Upgrade to libchromiumcontent 49.0.2623.108. -- Upgrade to Electron 0.37.3. -- Upgrade to Node 5.9.1. +- Upgraded to libchromiumcontent 49.0.2623.108. +- Upgraded to Electron 0.37.3. +- Upgraded to Node 5.9.1. - Fixed various bugs. - .deb and .rpm [Linux packages available](https://github.com/brave/browser-laptop/blob/master/docs/linuxInstall.md) for various distros. @@ -322,9 +304,9 @@ - Various other bug fixes. ## [0.8.1](https://github.com/brave/browser-laptop/releases/v0.8.1dev) -- Upgrade to libchromiumcontent 49.0.2623.75. -- Upgrade to Electron 0.37.2. -- Upgrade to Node 5.8. +- Upgraded to libchromiumcontent 49.0.2623.75. +- Upgraded to Electron 0.37.2. +- Upgraded to Node 5.8. - Basic HTTP authentication now supported. - Support for Twitch.tv - Fix bookmarks not working after navigating within a page using push state api. From cc7bb8261671b07d551efd3fd957808407b78a84 Mon Sep 17 00:00:00 2001 From: yan Date: Wed, 31 Aug 2016 14:37:39 -0700 Subject: [PATCH 18/48] Don't show long payments URL when bitcoin: handler is missing Fix #3623 Auditors: @bbondy --- .../locales/en-US/preferences.properties | 2 +- app/ledger.js | 1 + js/about/preferences.js | 22 +++++++++++-------- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties index dc934e774c3..40c74a6594e 100644 --- a/app/extensions/brave/locales/en-US/preferences.properties +++ b/app/extensions/brave/locales/en-US/preferences.properties @@ -45,7 +45,7 @@ paymentHistoryTitle=Your Payment History paymentHistoryFooterText=Your next payment submission is {{reconcileDate}}. paymentHistoryOKText=OK bitcoinAddress=Your Brave wallet address is: -bitcoinPaymentURL=Scan the QR code or copy this link: +bitcoinPaymentURL=Scan the QR code or transfer {{amount}} to: bitcoinQR=Brave wallet QR code: paymentHistoryTitle=Your Payment History bitcoinCopyAddress=Copy Bitcoin address to clipboard diff --git a/app/ledger.js b/app/ledger.js index 7ad79b79e87..82c21a64fa3 100644 --- a/app/ledger.js +++ b/app/ledger.js @@ -160,6 +160,7 @@ var boot = () => { if (ipc) { ipc.on(messages.CHECK_BITCOIN_HANDLER, () => { + // TODO: https://github.com/brave/browser-laptop/issues/3625 if (typeof protocolHandler.isNavigatorProtocolHandled === 'function') { ledgerInfo.hasBitcoinHandler = protocolHandler.isNavigatorProtocolHandled('', 'bitcoin') appActions.updateLedgerInfo(underscore.omit(ledgerInfo, [ '_internal' ])) diff --git a/js/about/preferences.js b/js/about/preferences.js index a9eb70ccf0d..9045b0a7ccf 100644 --- a/js/about/preferences.js +++ b/js/about/preferences.js @@ -263,10 +263,14 @@ class BitcoinDashboard extends ImmutableComponent { get overlayContent () { return