diff --git a/lib/l10nUtil.js b/lib/l10nUtil.js index 0c5366ffab60..5402df3f587a 100644 --- a/lib/l10nUtil.js +++ b/lib/l10nUtil.js @@ -200,64 +200,8 @@ module.exports.rebaseBraveStringFilesOnChromiumL10nFiles = async function (path) const removedMap = getRemovedGRDParts(grdsWithAutoAddedGrdps) const ops = Object.entries(chromiumToAutoGeneratedBraveMapping).map(async ([sourcePath, destPath]) => { let contents = await new Promise(resolve => fs.readFile(sourcePath, 'utf8', (err, data) => resolve(data))) - for (const replacement of defaultReplacements) { - contents = contents.replace(replacement[0], replacement[1]) - } - for (const replacement of fixupReplacements) { - contents = contents.replace(replacement[0], replacement[1]) - } await new Promise(resolve => fs.writeFile(destPath, contents, 'utf8', resolve)) }) await Promise.all(ops) return removedMap } - -// Straight-forward string replacement list. -// Consider mapping chromium resource ID to a new brave resource ID -// for whole-message replacements, instead of adding to this list. -// TODO(petemill): Get affected message IDs and clear out the translations in transifex for re-translation. -// This could be achieved with a regex like: -// (?]*>[^<]*)The Chromium Authors(?[^<]*<\/message>) -// Until that is implemented, when adding to or modifying this list, you must manually find the -// affected source strings in transifex, and delete every language's translation via the script -// 'npm run delete_string_translations -- ...'. -// Otherwise, languages apart from US English will not get updated. -const defaultReplacements = [ - [/Automatically send usage statistics and crash reports to Google/g, 'Automatically send crash reports to Google'], - [/Automatically sends usage statistics and crash reports to Google/g, 'Automatically sends crash reports to Google'], - [/Chrome Web Store/g, 'Web Store'], - [/The Chromium Authors\n/g, 'Brave Software Inc\n'], - [/The Chromium Authors. All rights reserved./g, 'The Brave Authors. All rights reserved.'], - [/Google Chrome/g, 'Brave'], - [/Chromium/g, 'Brave'], - [/Chrome/g, 'Brave'], - [/Google LLC. All rights reserved./g, 'The Brave Authors. All rights reserved.'], - [/(Google)(?! Play)/g, 'Brave'], - [/You're incognito/g, 'This is a private window'], - [/an incognito/g, 'a private'], - [/an Incognito/g, 'a Private'], - [/incognito/g, 'private'], - [/Incognito/g, 'Private'], - [/inco\&\;gnito/g, '&private'], - [/Inco\&\;gnito/g, '&Private'], - [/People/g, 'Profiles'], - // 'people' but only in the context of profiles, not humans. - [/(?/g, 'Copyright © '], -] - -// Fix up some strings after aggressive first round replacement. -const fixupReplacements = [ - [/Brave Cloud Print/g, 'Google Cloud Print'], - [/Brave Docs/g, 'Google Docs'], - [/Brave Drive/g, 'Google Drive'], - [/Brave OS/g, 'Chrome OS'], - [/Brave Safe Browsing/g, 'Google Safe Browsing'], - [/Safe Browsing \(protects you and your device from dangerous sites\)/g, 'Google Safe Browsing \(protects you and your device from dangerous sites\)'], - [/Sends URLs of some pages you visit to Brave/g, 'Sends URLs of some pages you visit to Google'] -] diff --git a/package.json b/package.json index c1bb81db81d4..fa4278050cf1 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "projects": { "chrome": { "dir": "src", - "tag": "83.0.4103.116", + "tag": "84.0.4147.68", "repository": { "url": "https://github.com/chromium/chromium" },