From edebb222c59f102df2d3edfeca97e578665589e9 Mon Sep 17 00:00:00 2001 From: Francesco Lodolo Date: Fri, 1 Sep 2017 09:02:01 +0200 Subject: [PATCH] Fix strings for v3.6 (#398) * Add export-locales-env to .gitignore This folder is created by the string extraction script * Improve comments and context menu string * Remove obsolete strings, fix "Open in Focus" --- .gitignore | 2 +- Blockzilla/UIConstants.swift | 9 ++++----- Blockzilla/en.lproj/Localizable.strings | 9 +-------- 3 files changed, 6 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 99efb2d2af..3b02bc050c 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,4 @@ screenshots-derived-data # l10n clone for scripts focusios-l10n - +export-locales-env diff --git a/Blockzilla/UIConstants.swift b/Blockzilla/UIConstants.swift index 19193c7f50..1c7e469c4f 100644 --- a/Blockzilla/UIConstants.swift +++ b/Blockzilla/UIConstants.swift @@ -144,7 +144,7 @@ struct UIConstants { static let labelBlockOther = NSLocalizedString("Settings.toggleBlockOther", value: "Block other content trackers", comment: "Label for toggle on main screen") static let labelBlockFonts = NSLocalizedString("Settings.toggleBlockFonts", value: "Block Web fonts", comment: "Label for toggle on main screen") static let labelSendAnonymousUsageData = NSLocalizedString("Settings.toggleSendUsageData", value: "Send usage data", comment: "Label for Send Usage Data toggle on main screen") - static let detailTextSendUsageData = NSLocalizedString("Settings.detailTextSendUsageData", value: "Mozilla strives to collect only what we need to provide and improve Focus for everyone. ", comment: "Detail Label for Send Usage Data toggle on main screen") + static let detailTextSendUsageData = NSLocalizedString("Settings.detailTextSendUsageData", value: "Mozilla strives to collect only what we need to provide and improve Focus for everyone.", comment: "Description associated to the Send Usage Data toggle on main screen") static let openCancel = NSLocalizedString("Open.Cancel", value: "Cancel", comment: "Label in share alert to cancel the alert") static let openFirefox = NSLocalizedString("Open.Firefox", value: "Firefox (Private Browsing)", comment: "Label in share alert to open the URL in Firefox") static let openMore = NSLocalizedString("Open.More", value: "More", comment: "Label in share alert to open the full system share menu") @@ -185,9 +185,8 @@ struct UIConstants { static let photosPermissionDescription = NSLocalizedString("photosPermission.description", value: "This lets you save images to your Camera Roll", comment: "Description for dialog used for requesting a user to enable access to Photos.") static let openSettingsButtonTitle = NSLocalizedString("photosPermission.openSettings", value: "Open Settings", comment: "Title for button that takes the user to system settings") static let openIn = NSLocalizedString("actionSheet.openIn", value: "Open in %@", comment: "Title for action sheet item to open the current page in another application. Placeholder is the name of the application to open the current page.") - static let handoffSyncing = NSLocalizedString("Focus.handoffSyncing", value: "Apple Handoff is syncing", comment: "Title for the loading screen when the handoff of clipboard delays Focus launch.") - static let linkYouCopied = NSLocalizedString("contextMenu.clipboardLink", value: "Link you copied:", comment: "Text for the context menu when a user has a link on their clipboard.") - static let aboutRowPrivacy = NSLocalizedString("About.rowPrivacy", value: "Privacy Notice", comment: "Label for row in About screen") - + static let handoffSyncing = NSLocalizedString("Focus.handoffSyncing", value: "Apple Handoff is syncing", comment: "Title for the loading screen when the handoff of clipboard delays Focus launch. “Handoff” should not be localized, see https://support.apple.com/HT204681") + static let linkYouCopied = NSLocalizedString("contextMenu.clipboardLink", value: "Link you copied: %@", comment: "Text for the context menu when a user has a link on their clipboard.") + static let aboutRowPrivacy = NSLocalizedString("About.rowPrivacy", value: "Privacy Notice", comment: "Link to Privacy Notice in the About screen") } } diff --git a/Blockzilla/en.lproj/Localizable.strings b/Blockzilla/en.lproj/Localizable.strings index a521e9c34a..f9322383f6 100644 --- a/Blockzilla/en.lproj/Localizable.strings +++ b/Blockzilla/en.lproj/Localizable.strings @@ -178,17 +178,11 @@ /* Safari toggle label on settings screen */ "Settings.toggleSafari" = "Safari"; -/* Label for Send Anonymous Usage Data toggle on main screen */ -"Settings.toggleSendAnonymousUsageData" = "Send anonymous usage data"; - -/* Subtitle for Send Anonymous Usage Data toggle on main screen */ -"Settings.toggleSendAnonymousUsageDataSubtitle" = "Learn more"; - /* Text for the share menu option when a user wants to open a page in Firefox but doesn’t have it installed. This string will not wrap in the interface. Instead, it will truncate. To prevent this, please keep the localized string to 18 or fewer characters. If your string runs longer than 18 characters, you can use 'Get Firefox' as the basis for your string. However, if at all possible, we’d like to signal to the user that they will be going to the App Store and installing the application from there. That is why we are using Get and App in the en-US string. */ "ShareMenu.GetFirefox" = "Get the Firefox App"; /* Text for the share menu option when a user wants to open a page in Focus. */ -"ShareMenu.OpenInFocus" = "Open in Focus"; +"ShareMenu.OpenInFocus" = "Open in %@"; /* Label for cancel button shown when entering a URL or search */ "URL.cancelLabel" = "Cancel"; @@ -237,4 +231,3 @@ /* Dialog title used for requesting a user to enable access to Photos. Placeholder is either Firefox Focus or Firefox Klar */ "photosPermission.title" = "“%@” Would Like to Access Your Photos"; -