Navigation Menu

Skip to content

Commit

Permalink
Multi Bug - Multiple String Updates
Browse files Browse the repository at this point in the history 
This pull request addresses the following bugs: (#3080)

* Bug 1392672 - Update the FxAPush_DeviceDisconnected_body string

* Bug 1392691 - Use apostrophe instead of single quote in Intro.Slides.Private.Title

* Bug 1392695 - Remove double quotes from Settings.DNT.Title

* Bug 1392697 - Add a better description to Settings.OfferClipboardBar.Status

* Bug 1392665 - Add missing permissions string NSPhotoLibraryAddUsageDescription
  • Loading branch information
@st3fan
st3fan committed Aug 22, 2017
1 parent 2d04517 commit 794dcda
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion Client/Frontend/Intro/IntroViewController.swift
View file
Expand Up @@ -27,7 +27,7 @@ struct IntroViewControllerUX {

static let CardTitleWelcome = NSLocalizedString("Intro.Slides.Welcome.Title", tableName: "Intro", value: "Thanks for choosing Firefox!", comment: "Title for the first panel 'Welcome' in the First Run tour.")
static let CardTitleSearch = NSLocalizedString("Intro.Slides.Search.Title", tableName: "Intro", value: "Your search, your way", comment: "Title for the second panel 'Search' in the First Run tour.")
static let CardTitlePrivate = NSLocalizedString("Intro.Slides.Private.Title", tableName: "Intro", value: "Browse like no one's watching", comment: "Title for the third panel 'Private Browsing' in the First Run tour.")
static let CardTitlePrivate = NSLocalizedString("Intro.Slides.Private.Title", tableName: "Intro", value: "Browse like no one’s watching", comment: "Title for the third panel 'Private Browsing' in the First Run tour.")
static let CardTitleMail = NSLocalizedString("Intro.Slides.Mail.Title", tableName: "Intro", value: "You've got mail… options", comment: "Title for the fourth panel 'Mail' in the First Run tour.")
static let CardTitleSync = NSLocalizedString("Intro.Slides.Sync.Title", tableName: "Intro", value: "Pick up where you left off", comment: "Title for the fifth panel 'Sync' in the First Run tour.")

Expand Down
8 changes: 4 additions & 4 deletions Client/Frontend/Strings.swift
View file
Expand Up @@ -243,8 +243,8 @@ extension Strings {
public static let GoToCopiedLink = NSLocalizedString("ClipboardToast.GoToCopiedLink.Title", value: "Go to copied link?", comment: "Message displayed when the user has a copied link on the clipboard")
public static let GoButtonTittle = NSLocalizedString("ClipboardToast.GoToCopiedLink.Button", value: "Go", comment: "The button to open a new tab with the copied link")

public static let SettingsOfferClipboardBarTitle = NSLocalizedString("Settings.OfferClipboardBar.Title", value: "Offer to Open Copied Links", comment: "Title of setting to enable the Go to Copied URL feature - https://bug1223660.bmoattachments.org/attachment.cgi?id=8898349")
public static let SettingsOfferClipboardBarStatus = NSLocalizedString("Settings.OfferClipboardBar.Status", value: "When Opening Firefox", comment: "Status text of setting to enable the Go to Copied URL feature - https://bug1223660.bmoattachments.org/attachment.cgi?id=8898349")
public static let SettingsOfferClipboardBarTitle = NSLocalizedString("Settings.OfferClipboardBar.Title", value: "Offer to Open Copied Links", comment: "Title of setting to enable the Go to Copied URL feature. See https://bug1223660.bmoattachments.org/attachment.cgi?id=8898349")
public static let SettingsOfferClipboardBarStatus = NSLocalizedString("Settings.OfferClipboardBar.Status", value: "When Opening Firefox", comment: "Description displayed under the ”Offer to Open Copied Link” option. See https://bug1223660.bmoattachments.org/attachment.cgi?id=8898349")
}

// errors
Expand Down Expand Up @@ -310,7 +310,7 @@ extension Strings {
public static let FxAPush_DeviceDisconnected_ThisDevice_title = NSLocalizedString("FxAPush_DeviceDisconnected_ThisDevice_title", value: "Sync Disconnected", comment: "Title of a notification displayed when this device has been disconnected by another device.")
public static let FxAPush_DeviceDisconnected_ThisDevice_body = NSLocalizedString("FxAPush_DeviceDisconnected_ThisDevice_body", value: "This device has been successfully disconnected from Firefox Sync.", comment: "Body of a notification displayed when this device has been disconnected from FxA by another device.")
public static let FxAPush_DeviceDisconnected_title = NSLocalizedString("FxAPush_DeviceDisconnected_title", value: "Sync Disconnected", comment: "Title of a notification displayed when named device has been disconnected from FxA.")
public static let FxAPush_DeviceDisconnected_body = NSLocalizedString("FxAPush_DeviceDisconnected_body", value: "Firefox Sync has disconnected %@", comment: "Body of a notification displayed when named device has been disconnected from FxA. %@ refers to the name of the disconnected device.")
public static let FxAPush_DeviceDisconnected_body = NSLocalizedString("FxAPush_DeviceDisconnected_body", value: "%@ has been successfully disconnected.", comment: "Body of a notification displayed when named device has been disconnected from FxA. %@ refers to the name of the disconnected device.")

public static let FxAPush_DeviceDisconnected_UnknownDevice_body = NSLocalizedString("FxAPush_DeviceDisconnected_UnknownDevice_body", value: "A device has disconnected from Firefox Sync", comment: "Body of a notification displayed when unnamed device has been disconnected from FxA.")

Expand Down Expand Up @@ -384,7 +384,7 @@ extension Strings {

// Do not track
extension Strings {
public static let SettingsDoNotTrackTitle = NSLocalizedString("Settings.DNT.Title", value: "Send websites a “Do Not Track” signal that you don’t want to be tracked", comment: "DNT Settings title")
public static let SettingsDoNotTrackTitle = NSLocalizedString("Settings.DNT.Title", value: "Send websites a Do Not Track signal that you don’t want to be tracked", comment: "DNT Settings title")
public static let SettingsDoNotTrackOptionOnWithTP = NSLocalizedString("Settings.DNT.OptionOnWithTP", value: "Only when using Tracking Protection", comment: "DNT Settings option for only turning on when Tracking Protection is also on")
public static let SettingsDoNotTrackOptionAlwaysOn = NSLocalizedString("Settings.DNT.OptionAlwaysOn", value: "Always", comment: "DNT Settings option for always on")
}
Expand Down
2 changes: 2 additions & 0 deletions Client/Info.plist
View file
Expand Up @@ -84,6 +84,8 @@
<string>This lets you take and upload photos.</string>
<key>NSMicrophoneUsageDescription</key>
<string>This lets you take and upload videos.</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>This lets you save photos.</string>
<key>NSUserActivityTypes</key>
<array>
<string>org.mozilla.ios.firefox.browsing</string>
Expand Down
1 change: 1 addition & 0 deletions Client/en.lproj/InfoPlist.strings
View file
Expand Up @@ -4,6 +4,7 @@

NSLocationWhenInUseUsageDescription = "Websites you visit may request your location.";
NSPhotoLibraryUsageDescription = "This lets you save and upload photos.";
NSPhotoLibraryAddUsageDescription = "This lets you save photos.";
NSCameraUsageDescription = "This lets you take and upload photos.";
NSMicrophoneUsageDescription = "This lets you take and upload videos.";
ShortcutItemTitleNewTab = "New Tab";
Expand Down

0 comments on commit 794dcda

Please sign in to comment.