From 9ff7f9eadff9a311f791a41633ad11dce0b1d476 Mon Sep 17 00:00:00 2001 From: dasilvarosa Date: Tue, 17 Jul 2018 17:25:50 +0200 Subject: [PATCH 1/2] resolved conflict --- static/i18n/en/app.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/static/i18n/en/app.json b/static/i18n/en/app.json index 9fe25041..4300c847 100644 --- a/static/i18n/en/app.json +++ b/static/i18n/en/app.json @@ -375,8 +375,8 @@ "analyticsDesc": "Enable analytics of anonymous data to help Ledger improve the user experience. This includes the operating system, language, firmware versions and the number of added accounts.", "reportErrors": "Report bugs", "reportErrorsDesc": "Share anonymous usage and diagnostics data to help improve Ledger products, services and security features.", - "launchOnboarding": "Onboarding", - "launchOnboardingDesc": "Launch again the onboarding to add a new device to the Ledger Live application" + "launchOnboarding": "Set up a device", + "launchOnboardingDesc": "Launch the onboarding process to initialize or restore a Ledger device. Your accounts and settings are saved." }, "about": { "desc": "Information about Ledger Live, terms and conditions, and privacy policy." @@ -407,9 +407,9 @@ "desc": "The account will no longer be included in your portfolio. This operation does not affect your assets. Accounts can always be re-added." }, "openUserDataDirectory": { - "title": "Open user data directory", - "desc": "Open the user data directory", - "btn": "Open" + "title": "View user data", + "desc": "View the user data that is stored on your computer, including your accounts, caches and settings.", + "btn": "View" }, "exportLogs": { "title": "Export logs", @@ -462,4 +462,4 @@ "desc_2": "Please beware that Ledger does not provide financial, tax, or legal advice. You should take such decisions on your own or consult with reliable experts.", "cta": "Got it" } -} \ No newline at end of file +} From 4c8c2706a4f4006d5acb3023def129d15d61e69e Mon Sep 17 00:00:00 2001 From: dasilvarosa Date: Tue, 17 Jul 2018 17:52:08 +0200 Subject: [PATCH 2/2] Review wordings for added settings 2 --- static/i18n/en/app.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/static/i18n/en/app.json b/static/i18n/en/app.json index 4300c847..7502d81f 100644 --- a/static/i18n/en/app.json +++ b/static/i18n/en/app.json @@ -375,8 +375,8 @@ "analyticsDesc": "Enable analytics of anonymous data to help Ledger improve the user experience. This includes the operating system, language, firmware versions and the number of added accounts.", "reportErrors": "Report bugs", "reportErrorsDesc": "Share anonymous usage and diagnostics data to help improve Ledger products, services and security features.", - "launchOnboarding": "Set up a device", - "launchOnboardingDesc": "Launch the onboarding process to initialize or restore a Ledger device. Your accounts and settings are saved." + "launchOnboarding": "Configure device", + "launchOnboardingDesc": "Securely initialize or restore a Ledger device to use with Ledger Live. Your accounts and settings are kept." }, "about": { "desc": "Information about Ledger Live, terms and conditions, and privacy policy."