diff --git a/app/extensions/brave/img/sync/add_device_titleicon.svg b/app/extensions/brave/img/sync/add_device_titleicon.svg new file mode 100644 index 0000000000..ba342e3434 --- /dev/null +++ b/app/extensions/brave/img/sync/add_device_titleicon.svg @@ -0,0 +1,28 @@ + + + + Group 2 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/extensions/brave/img/sync/circle_of_sync_landing_graphic.svg b/app/extensions/brave/img/sync/circle_of_sync_landing_graphic.svg new file mode 100644 index 0000000000..30cff69ede --- /dev/null +++ b/app/extensions/brave/img/sync/circle_of_sync_landing_graphic.svg @@ -0,0 +1,82 @@ + + + + Graphic + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/extensions/brave/img/sync/device_type_computer.svg b/app/extensions/brave/img/sync/device_type_computer.svg new file mode 100644 index 0000000000..346f41bb3b --- /dev/null +++ b/app/extensions/brave/img/sync/device_type_computer.svg @@ -0,0 +1,38 @@ + + + + Laptop Graphic + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/extensions/brave/img/sync/device_type_phone-tablet.svg b/app/extensions/brave/img/sync/device_type_phone-tablet.svg new file mode 100644 index 0000000000..4c45cddda6 --- /dev/null +++ b/app/extensions/brave/img/sync/device_type_phone-tablet.svg @@ -0,0 +1,49 @@ + + + + Mobile Graphic + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/extensions/brave/img/sync/hand_image.png b/app/extensions/brave/img/sync/hand_image.png new file mode 100644 index 0000000000..c4b3abb647 Binary files /dev/null and b/app/extensions/brave/img/sync/hand_image.png differ diff --git a/app/extensions/brave/img/sync/remove_device_titleicon.svg b/app/extensions/brave/img/sync/remove_device_titleicon.svg new file mode 100644 index 0000000000..878058d05e --- /dev/null +++ b/app/extensions/brave/img/sync/remove_device_titleicon.svg @@ -0,0 +1,30 @@ + + + + Group 4 + Created with Sketch. + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/extensions/brave/img/sync/synccode_titleicon.svg b/app/extensions/brave/img/sync/synccode_titleicon.svg new file mode 100644 index 0000000000..e1e0f9dd08 --- /dev/null +++ b/app/extensions/brave/img/sync/synccode_titleicon.svg @@ -0,0 +1,24 @@ + + + + Page 1 + Created with Sketch. + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/extensions/brave/locales/en-US/app.properties b/app/extensions/brave/locales/en-US/app.properties index 1c372fca4e..467c74e707 100644 --- a/app/extensions/brave/locales/en-US/app.properties +++ b/app/extensions/brave/locales/en-US/app.properties @@ -271,3 +271,5 @@ dappDismiss=No thanks dappEnableExtension=Install MetaMask windowCaptionButtonMinimize=Minimize yes=Yes +thisDevice=this device +invalidCode=Invalid sync code. Please try again. diff --git a/app/extensions/brave/locales/en-US/preferences.properties b/app/extensions/brave/locales/en-US/preferences.properties index 8d512f503a..8f9cf922f8 100644 --- a/app/extensions/brave/locales/en-US/preferences.properties +++ b/app/extensions/brave/locales/en-US/preferences.properties @@ -76,6 +76,7 @@ clearAll=Clear all clearBrowsingDataNow=Clear Browsing Data Now… comingSoon=Coming soon! compactBraveryPanel=Use compact panel +computer=Computer contentSettings=Content Settings contributionAmount=Contribution Amount contributionDate=Contribution Date @@ -325,41 +326,69 @@ submitFeedback=Help Center swipeNavigationDistance=Swipe Navigation Distance switchToNewTabs=Switch to new tabs immediately sync=Sync -syncAdd=I have an existing Sync code -syncBetaMessage=Note: Sync for iOS and Android is still being completed and will be released soon. +syncAddCode=Enter a sync code +syncAddButton=Add +syncAddDevice=Add device syncBookmarks=Bookmarks -syncClearData=Clear Data +syncChainCodeComputer=Now, using Brave on your computer, enter this code: +syncChainCodeMobile=Now, using Brave on your mobile device, enter this code: +syncChainCodeDescription=Go to: Brave Settings > Sync and click "Enter a Sync Chain Code" +syncChooseDevice=Choose a device type: syncClearProfile=Sync a new device… +syncConfirm=Confirm Sync Code syncCreate=Set up Sync -syncData=Sync Data +syncData=Data to Sync from {{device}} syncDataMessage=Sync the following data from this device: +syncDeviceAddedOn=Added On syncDeviceLastActive=Last active -syncDeviceName=Device name +syncDeviceLoading=Loading devices. Please wait... +syncDeviceListLoaded=Great! Your devices are now in sync +syncDeviceListLoading=Updating devices list +syncDeviceName=Device Name syncDeviceNameInput=Enter an optional name for this device: syncDevices=Devices -syncEnable=Sync this device -syncEnterPassphrase=Enter your Sync code words: +syncDevicesDescription=Your synced devices are listed below. You can add additional devices now or at any time in the future. +thisDevice=(this device) +syncDevicesInSyncChain=Devices in your sync chain +syncEnterPassphrase=Go to: Brave Settings > Sync > Display sync code syncHidePassphrase=Hide code words syncHideQR=Hide QR code syncHistory=Browsing history +syncLeaveChainButton=Leave Sync Chain +syncLookingForDevice=Looking for device +syncNewDeviceTitle=Let's sync a new device with "{{device}}" syncNewDevice1=Open Brave on your new device and go to Preferences > Sync > 'I have an existing synced device'. syncNewDevice2=If it asks you to scan a QR code, click the button below and point your camera at the QR code. syncNewDevice3=If asks you to enter code words, type in the words below. -syncNewDevice=Sync a new device… +syncNewDeviceButton=Sync a new device… +syncPrivateKeyWarning1=This is a private key. +syncPrivateKeyWarning2=If you share it, your private data may be compromised. +syncPhoneOrTablet=Phone/Tablet +syncQRCode=QR Code syncQRImg.title=Brave sync QR code +syncRemove=Remove +syncRemoveDeviceModal=Remove "{{device}}" from this sync chain? +syncRemoveDevice.title=Remove this device +syncRemoveActiveDeviceWarning1=Local device data will remain intact on all devices. Other devices in this sync chain will remain synced. +syncRemoveActiveDeviceWarning2=To join a sync chain again, choose "Enter a sync chain code". +syncRemoveOtherDeviceWarning= Note: Removing this device from this sync chain does not clear previously synced data from the device. syncReset=Reset Sync -syncResetButton=Reset Sync… syncResetDataDisabled=This feature is only available when Sync is enabled. -syncResetMessageOtherDevices=If you've synced other devices, they will continue to sync their future browsing data. If you don't want that, you should reset Sync on those devices as well. -syncResetMessageWhat=Resetting Sync clears data stored on the Sync server and resets this device's Sync settings. -syncResetMessageWhatNot=You will keep any bookmarks, history and other browsing data currently on this device. syncRetryButton=Try again +syncScanMobile=Now, using Brave on your mobile device, scan this code +syncScanComputer=Now, using Brave on your computer device, scan this code +syncScanDescription=Go to: Brave Settings > Sync > Scan Sync Code syncShowPassphrase=Show secret code words. (Do not share!) syncShowQR=Show secret QR code. (Do not share!) syncSiteSettings=Saved site settings -syncStart=I am new to Sync +syncStart=Start a new sync chain syncTitle=Brave Sync -syncTitleMessage=Sync encrypted browser data between your devices securely and privately using Brave Sync. +syncTypeSecurityCode=Enter code words instead... +syncScanQRCode=Use my camera instead... +syncViewCode=View sync code +syncWelcome1=Brave Sync allows you to sync bookmarks data privately between your Brave Browsers on your various devices. +syncWelcome2=When you start a new sync chain, a new sync code is created. You will use this same code across your devices to link them together. +syncWordCode=Word Code tabCloseAction=When closing an active tab: tabCloseActionLastActive=Select the last viewed tab tabCloseActionNext=Select the next tab @@ -393,3 +422,4 @@ visits=Visits wideURLbar=Use wide URL bar widevine=Run Google Widevine widevineSection=Google Widevine Support +wordCount=word count: diff --git a/app/locale.js b/app/locale.js index 14d3340bbc..c9a12fe2f8 100644 --- a/app/locale.js +++ b/app/locale.js @@ -256,6 +256,9 @@ var rendererIdentifiers = function () { 'noDownloads', 'torrentDesc', 'multiSelectionBookmarks', + // global sync + 'thisDevice', + 'invalidCode', // Caption buttons in titlebar (min/max/close - Windows only) 'windowCaptionButtonMinimize', 'windowCaptionButtonMaximize', diff --git a/app/renderer/components/common/clipboardButton.js b/app/renderer/components/common/clipboardButton.js index baa2796d29..db90e8fd79 100644 --- a/app/renderer/components/common/clipboardButton.js +++ b/app/renderer/components/common/clipboardButton.js @@ -50,6 +50,7 @@ class ClipboardButton extends React.Component { data-l10n-id='copied' /> : null) + titleImage = (this.props.titleImage + ? : null) title = (this.props.title ?
: null) subTitle = (this.props.subTitle ?