diff --git a/Wikipedia/Code/TalkPageReplyComposeController.swift b/Wikipedia/Code/TalkPageReplyComposeController.swift index 98cecc9866b..25b6a2a803e 100644 --- a/Wikipedia/Code/TalkPageReplyComposeController.swift +++ b/Wikipedia/Code/TalkPageReplyComposeController.swift @@ -12,7 +12,7 @@ class TalkPageReplyComposeController { enum ActionSheetStrings { static let closeConfirmationTitle = WMFLocalizedString("talk-pages-reply-compose-close-confirmation-title", value: "Are you sure you want to discard this new reply?", comment: "Title of confirmation alert displayed to user when they attempt to close the new reply view after entering text. Please prioritize for de, ar and zh wikis.") - static let closeConfirmationDiscard = WMFLocalizedString("talk-pages-topic-compose-close-confirmation-discard", value: "Discard Reply", comment: "Title of discard action, displayed within a confirmation alert to user when they attempt to close the new topic view after entering title or body text. Please prioritize for de, ar and zh wikis.") + static let closeConfirmationDiscard = WMFLocalizedString("talk-pages-topic-compose-close-confirmation-discard-reply", value: "Discard Reply", comment: "Title of discard action, displayed within a confirmation alert to user when they attempt to close the reply view after entering reply text.") } // viewController - the view controller that triggered the reply compose screen diff --git a/Wikipedia/Code/TalkPageTopicComposeViewController.swift b/Wikipedia/Code/TalkPageTopicComposeViewController.swift index d3e961dadee..a3df130233d 100644 --- a/Wikipedia/Code/TalkPageTopicComposeViewController.swift +++ b/Wikipedia/Code/TalkPageTopicComposeViewController.swift @@ -20,7 +20,7 @@ class TalkPageTopicComposeViewController: ViewController { static let bodyPlaceholderAccessibility = WMFLocalizedString("talk-pages-topic-compose-body-placeholder-accessibility", value: "Topic description", comment: "Accessibility label for the placeholder element of the topic body text view on the topic compose screen.") static let finePrintFormat = WMFLocalizedString("talk-page-topic-compose-terms-and-licenses-ccsa4", value: "By publishing changes, you agree to the %1$@Terms of Use%2$@, and you irrevocably agree to release your contribution under the %3$@CC BY-SA 4.0 License%4$@ and the %5$@GFDL%6$@.", comment: "Text for information about the Terms of Use and edit licenses on talk pages when composing a new topic. Parameters:\n* %1$@ - app-specific non-text formatting, %2$@ - app-specific non-text formatting, %3$@ - app-specific non-text formatting, %4$@ - app-specific non-text formatting, %5$@ - app-specific non-text formatting, %6$@ - app-specific non-text formatting. Please prioritize for de, ar and zh wikis.") static let closeConfirmationTitle = WMFLocalizedString("talk-pages-topic-compose-close-confirmation-title", value: "Are you sure you want to discard this new topic?", comment: "Title of confirmation alert displayed to user when they attempt to close the new topic view after entering title or body text.") - static let closeConfirmationDiscard = WMFLocalizedString("talk-pages-topic-compose-close-confirmation-discard", value: "Discard Topic", comment: "Title of discard action, displayed within a confirmation alert to user when they attempt to close the new topic view after entering title or body text. Please prioritize for de, ar and zh wikis.") + static let closeConfirmationDiscard = WMFLocalizedString("talk-pages-topic-compose-close-confirmation-discard-topic", value: "Discard Topic", comment: "Title of discard action, displayed within a confirmation alert to user when they attempt to close the new topic view after entering title or body text. Please prioritize for de, ar and zh wikis.") } let viewModel: TalkPageTopicComposeViewModel diff --git a/Wikipedia/Localizations/en.lproj/Localizable.strings b/Wikipedia/Localizations/en.lproj/Localizable.strings index 11fefd54a9e..b3a83fbcc24 100644 --- a/Wikipedia/Localizations/en.lproj/Localizable.strings +++ b/Wikipedia/Localizations/en.lproj/Localizable.strings @@ -1168,7 +1168,8 @@ "talk-pages-topic-added-alert-title" = "Your topic was added"; "talk-pages-topic-compose-body-placeholder" = "Description"; "talk-pages-topic-compose-body-placeholder-accessibility" = "Topic description"; -"talk-pages-topic-compose-close-confirmation-discard" = "Discard Reply"; +"talk-pages-topic-compose-close-confirmation-discard-reply" = "Discard Reply"; +"talk-pages-topic-compose-close-confirmation-discard-topic" = "Discard Topic"; "talk-pages-topic-compose-close-confirmation-title" = "Are you sure you want to discard this new topic?"; "talk-pages-topic-compose-navbar-title" = "Topic"; "talk-pages-topic-compose-title-placeholder" = "Topic title"; diff --git a/Wikipedia/Localizations/qqq.lproj/Localizable.strings b/Wikipedia/Localizations/qqq.lproj/Localizable.strings index 81fb7507a08..ab2e50eac9a 100644 --- a/Wikipedia/Localizations/qqq.lproj/Localizable.strings +++ b/Wikipedia/Localizations/qqq.lproj/Localizable.strings @@ -1168,7 +1168,8 @@ "talk-pages-topic-added-alert-title" = "Title for alert informing that the user's new topic was successfully published. Please prioritize for de, ar and zh wikis."; "talk-pages-topic-compose-body-placeholder" = "Placeholder text in topic body field of the talk page topic compose screen. Please prioritize for de, ar and zh wikis."; "talk-pages-topic-compose-body-placeholder-accessibility" = "Accessibility label for the placeholder element of the topic body text view on the topic compose screen."; -"talk-pages-topic-compose-close-confirmation-discard" = "Title of discard action, displayed within a confirmation alert to user when they attempt to close the new topic view after entering title or body text. Please prioritize for de, ar and zh wikis."; +"talk-pages-topic-compose-close-confirmation-discard-reply" = "Title of discard action, displayed within a confirmation alert to user when they attempt to close the reply view after entering reply text."; +"talk-pages-topic-compose-close-confirmation-discard-topic" = "Title of discard action, displayed within a confirmation alert to user when they attempt to close the new topic view after entering title or body text. Please prioritize for de, ar and zh wikis."; "talk-pages-topic-compose-close-confirmation-title" = "Title of confirmation alert displayed to user when they attempt to close the new topic view after entering title or body text."; "talk-pages-topic-compose-navbar-title" = "Top navigation bar title of talk page topic compose screen. Please prioritize for de, ar and zh wikis."; "talk-pages-topic-compose-title-placeholder" = "Placeholder text in topic title field of the talk page topic compose screen. Please prioritize for de, ar and zh wikis."; diff --git a/Wikipedia/iOS Native Localizations/ar.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/ar.lproj/Localizable.strings index ba312634265..81aac4798cc 100644 Binary files a/Wikipedia/iOS Native Localizations/ar.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/ar.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/ca.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/ca.lproj/Localizable.strings index 92fea866ebf..6c868c0554c 100644 Binary files a/Wikipedia/iOS Native Localizations/ca.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/ca.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/cy.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/cy.lproj/Localizable.strings index 0d07dd1686a..21ee305a480 100644 Binary files a/Wikipedia/iOS Native Localizations/cy.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/cy.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/de.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/de.lproj/Localizable.strings index 515933b7f84..30911f46d64 100644 Binary files a/Wikipedia/iOS Native Localizations/de.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/de.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/en.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/en.lproj/Localizable.strings index 92eacab5dcb..f54f1d70b90 100644 Binary files a/Wikipedia/iOS Native Localizations/en.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/en.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/fa.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/fa.lproj/Localizable.strings index 3302f87be43..1ce61181794 100644 Binary files a/Wikipedia/iOS Native Localizations/fa.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/fa.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/fi.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/fi.lproj/Localizable.strings index 4c18de18ed6..b9899e0353c 100644 Binary files a/Wikipedia/iOS Native Localizations/fi.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/fi.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/fr.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/fr.lproj/Localizable.strings index b5856b74b46..49ea722be01 100644 Binary files a/Wikipedia/iOS Native Localizations/fr.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/fr.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/he.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/he.lproj/Localizable.strings index 72076078717..39e0ab25834 100644 Binary files a/Wikipedia/iOS Native Localizations/he.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/he.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/ia.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/ia.lproj/Localizable.strings index 7cacc4bf277..e80e0cfcd69 100644 Binary files a/Wikipedia/iOS Native Localizations/ia.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/ia.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/id.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/id.lproj/Localizable.strings index 82b01c744b4..08457041abc 100644 Binary files a/Wikipedia/iOS Native Localizations/id.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/id.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/is.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/is.lproj/Localizable.strings index ceb079042cd..ba656456590 100644 Binary files a/Wikipedia/iOS Native Localizations/is.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/is.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/it.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/it.lproj/Localizable.strings index b16fdcee63e..2758abe04b4 100644 Binary files a/Wikipedia/iOS Native Localizations/it.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/it.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/ja.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/ja.lproj/Localizable.strings index b842f8870e4..df9192c3acc 100644 Binary files a/Wikipedia/iOS Native Localizations/ja.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/ja.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/ko.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/ko.lproj/Localizable.strings index 9ebd1bd8169..12ab098301a 100644 Binary files a/Wikipedia/iOS Native Localizations/ko.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/ko.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/lb.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/lb.lproj/Localizable.strings index 3a3619a9c36..2c5eec4a7a2 100644 Binary files a/Wikipedia/iOS Native Localizations/lb.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/lb.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/lt.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/lt.lproj/Localizable.strings index 3ec5bfe931c..0f2822e25c4 100644 Binary files a/Wikipedia/iOS Native Localizations/lt.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/lt.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/mk.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/mk.lproj/Localizable.strings index 694c8230c3a..f64dcd2d5f5 100644 Binary files a/Wikipedia/iOS Native Localizations/mk.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/mk.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/nb.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/nb.lproj/Localizable.strings index 5a8d8dedc1b..1ca3365438e 100644 Binary files a/Wikipedia/iOS Native Localizations/nb.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/nb.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/ne.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/ne.lproj/Localizable.strings index 23eb7983265..709735a2308 100644 Binary files a/Wikipedia/iOS Native Localizations/ne.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/ne.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/nl.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/nl.lproj/Localizable.strings index 1b60e08f238..4edcd28754b 100644 Binary files a/Wikipedia/iOS Native Localizations/nl.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/nl.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/pt-br.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/pt-br.lproj/Localizable.strings index 2cb1d1b606d..c63bcb50e7f 100644 Binary files a/Wikipedia/iOS Native Localizations/pt-br.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/pt-br.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/pt.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/pt.lproj/Localizable.strings index 6eb366fd000..a92739d98cd 100644 Binary files a/Wikipedia/iOS Native Localizations/pt.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/pt.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/ru.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/ru.lproj/Localizable.strings index 9ccf9b73921..d2847d643bb 100644 Binary files a/Wikipedia/iOS Native Localizations/ru.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/ru.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/sd.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/sd.lproj/Localizable.strings index 2aa5a724579..fdb4ba49079 100644 Binary files a/Wikipedia/iOS Native Localizations/sd.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/sd.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/sl.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/sl.lproj/Localizable.strings index 1b6763b6000..7976bf5b68f 100644 Binary files a/Wikipedia/iOS Native Localizations/sl.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/sl.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/sr-EC.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/sr-EC.lproj/Localizable.strings index 14c92d420c4..1e55bd62b58 100644 Binary files a/Wikipedia/iOS Native Localizations/sr-EC.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/sr-EC.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/sr-el.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/sr-el.lproj/Localizable.strings index f86a8e7516f..55a76e6228a 100644 Binary files a/Wikipedia/iOS Native Localizations/sr-el.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/sr-el.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/sv.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/sv.lproj/Localizable.strings index e1f7f589596..295333c095f 100644 Binary files a/Wikipedia/iOS Native Localizations/sv.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/sv.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/th.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/th.lproj/Localizable.strings index a41e031d339..0912febe593 100644 Binary files a/Wikipedia/iOS Native Localizations/th.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/th.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/tr.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/tr.lproj/Localizable.strings index a6cedd1047a..30eec4a3121 100644 Binary files a/Wikipedia/iOS Native Localizations/tr.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/tr.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/uk.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/uk.lproj/Localizable.strings index 2f2d9b623f9..e6bebbf51da 100644 Binary files a/Wikipedia/iOS Native Localizations/uk.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/uk.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/zh-hans.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/zh-hans.lproj/Localizable.strings index 9d6803a9fd7..7fe00a76c1b 100644 Binary files a/Wikipedia/iOS Native Localizations/zh-hans.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/zh-hans.lproj/Localizable.strings differ diff --git a/Wikipedia/iOS Native Localizations/zh-hant.lproj/Localizable.strings b/Wikipedia/iOS Native Localizations/zh-hant.lproj/Localizable.strings index 2a4339948f0..08e9d6f36db 100644 Binary files a/Wikipedia/iOS Native Localizations/zh-hant.lproj/Localizable.strings and b/Wikipedia/iOS Native Localizations/zh-hant.lproj/Localizable.strings differ