diff --git a/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift b/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift index 35975c32a..9d57bfceb 100644 --- a/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift +++ b/Mac/MainWindow/Sidebar/SidebarViewController+ContextualMenus.swift @@ -395,15 +395,15 @@ private extension SidebarViewController { } func catchUpSubMenu(_ objects: [Any]) -> NSMenu { - let menu = NSMenu(title: "Catch up to articles older than...") + let menu = NSMenu(title: NSLocalizedString("menu.title.catch-up-to-articles", comment: "Catch up to articles older than...")) - menu.addItem(menuItem(NSLocalizedString("1 day", comment: "Command"), #selector(markObjectsReadOlderThanOneDayFromContextualMenu(_:)), objects)) - menu.addItem(menuItem(NSLocalizedString("2 days", comment: "Command"), #selector(markObjectsReadOlderThanTwoDaysFromContextualMenu(_:)), objects)) - menu.addItem(menuItem(NSLocalizedString("3 days", comment: "Command"), #selector(markObjectsReadOlderThanThreeDaysFromContextualMenu(_:)), objects)) - menu.addItem(menuItem(NSLocalizedString("1 week", comment: "Command"), #selector(markObjectsReadOlderThanOneWeekFromContextualMenu(_:)), objects)) - menu.addItem(menuItem(NSLocalizedString("2 weeks", comment: "Command"), #selector(markObjectsReadOlderThanTwoWeeksFromContextualMenu(_:)), objects)) - menu.addItem(menuItem(NSLocalizedString("1 month", comment: "Command"), #selector(markObjectsReadOlderThanOneMonthFromContextualMenu(_:)), objects)) - menu.addItem(menuItem(NSLocalizedString("1 year", comment: "Command"), #selector(markObjectsReadOlderThanOneYearFromContextualMenu(_:)), objects)) + menu.addItem(menuItem(NSLocalizedString("button.title.1-day", comment: "1 day"), #selector(markObjectsReadOlderThanOneDayFromContextualMenu(_:)), objects)) + menu.addItem(menuItem(NSLocalizedString("button.title.2-days", comment: "2 days"), #selector(markObjectsReadOlderThanTwoDaysFromContextualMenu(_:)), objects)) + menu.addItem(menuItem(NSLocalizedString("button.title.3-days", comment: "3 days"), #selector(markObjectsReadOlderThanThreeDaysFromContextualMenu(_:)), objects)) + menu.addItem(menuItem(NSLocalizedString("button.title.1-week", comment: "1 week"), #selector(markObjectsReadOlderThanOneWeekFromContextualMenu(_:)), objects)) + menu.addItem(menuItem(NSLocalizedString("button.title.2-weeks", comment: "2 weeks"), #selector(markObjectsReadOlderThanTwoWeeksFromContextualMenu(_:)), objects)) + menu.addItem(menuItem(NSLocalizedString("button.title.1-month", comment: "1 month"), #selector(markObjectsReadOlderThanOneMonthFromContextualMenu(_:)), objects)) + menu.addItem(menuItem(NSLocalizedString("button.title.1-year", comment: "1 year"), #selector(markObjectsReadOlderThanOneYearFromContextualMenu(_:)), objects)) return menu } diff --git a/Mac/Resources/en-GB.lproj/Localizable.strings b/Mac/Resources/en-GB.lproj/Localizable.strings index ce87116b0..367e8ed90 100644 --- a/Mac/Resources/en-GB.lproj/Localizable.strings +++ b/Mac/Resources/en-GB.lproj/Localizable.strings @@ -1,3 +1,6 @@ +/* No comment provided by engineer. */ +"%@ (%@)" = "%1$@ (%2$@)"; + /* On My iPad */ "account.name.ipad" = "On My iPad"; @@ -164,9 +167,30 @@ /* Mark Below as Read */ "button.title-mark-below-as-read.titlecase" = "Mark Below as Read"; +/* 1 day */ +"button.title.1-day" = "1 day"; + +/* 1 month */ +"button.title.1-month" = "1 month"; + +/* 1 week */ +"button.title.1-week" = "1 week"; + +/* 1 year */ +"button.title.1-year" = "1 year"; + +/* 2 days */ +"button.title.2-days" = "2 days"; + /* Every 2 Hours */ "button.title.2-hours" = "Every 2 Hours"; +/* 2 weeks */ +"button.title.2-weeks" = "2 weeks"; + +/* 3 days */ +"button.title.3-days" = "3 days"; + /* Every 4 Hours */ "button.title.4-hours" = "Every 4 Hours"; @@ -582,6 +606,9 @@ /* Web accounts sync your feeds across all your devices */ "label.text.web-account-explainer" = "Web accounts sync your feeds across all your devices"; +/* Catch up to articles older than... */ +"menu.title.catch-up-to-articles" = "Catch up to articles older than..."; + /* Choose a location for the exported OPML file. */ "panel.message.export-opml" = "Choose a location for the exported OPML file."; diff --git a/Mac/Resources/en.lproj/Localizable.strings b/Mac/Resources/en.lproj/Localizable.strings index bdf931502..ae72182a2 100644 --- a/Mac/Resources/en.lproj/Localizable.strings +++ b/Mac/Resources/en.lproj/Localizable.strings @@ -164,9 +164,30 @@ /* Mark Below as Read */ "button.title-mark-below-as-read.titlecase" = "Mark Below as Read"; +/* 1 day */ +"button.title.1-day" = "1 day"; + +/* 1 month */ +"button.title.1-month" = "1 month"; + +/* 1 week */ +"button.title.1-week" = "1 week"; + +/* 1 year */ +"button.title.1-year" = "1 year"; + +/* 2 days */ +"button.title.2-days" = "2 days"; + /* Every 2 Hours */ "button.title.2-hours" = "Every 2 Hours"; +/* 2 weeks */ +"button.title.2-weeks" = "2 weeks"; + +/* 3 days */ +"button.title.3-days" = "3 days"; + /* Every 4 Hours */ "button.title.4-hours" = "Every 4 Hours"; @@ -582,6 +603,9 @@ /* Web accounts sync your feeds across all your devices */ "label.text.web-account-explainer" = "Web accounts sync your feeds across all your devices"; +/* Catch up to articles older than... */ +"menu.title.catch-up-to-articles" = "Catch up to articles older than..."; + /* Choose a location for the exported OPML file. */ "panel.message.export-opml" = "Choose a location for the exported OPML file."; diff --git a/Mac/en-GB.lproj/Main.strings b/Mac/en-GB.lproj/Main.strings index a896c1355..80b790d52 100644 --- a/Mac/en-GB.lproj/Main.strings +++ b/Mac/en-GB.lproj/Main.strings @@ -19,9 +19,6 @@ /* Class = "NSMenu"; title = "Speech"; ObjectID = "3rS-ZA-NoH"; */ "3rS-ZA-NoH.title" = "Speech"; -/* Class = "NSMenuItem"; title = "Slack Group"; ObjectID = "4eb-qF-n9S"; */ -"4eb-qF-n9S.title" = "Slack Group"; - /* Class = "NSMenuItem"; title = "Find"; ObjectID = "4EN-yA-p0u"; */ "4EN-yA-p0u.title" = "Find"; @@ -73,9 +70,6 @@ /* Class = "NSMenu"; title = "Main Menu"; ObjectID = "AYu-sK-qS6"; */ "AYu-sK-qS6.title" = "Main Menu"; -/* Class = "NSMenuItem"; title = "Release Notes"; ObjectID = "b5s-xg-B1w"; */ -"b5s-xg-B1w.title" = "Release Notes"; - /* Class = "NSMenuItem"; title = "Hide Read Articles"; ObjectID = "b10-sA-Yzi"; */ "b10-sA-Yzi.title" = "Hide Read Articles"; @@ -196,9 +190,6 @@ /* Class = "NSMenuItem"; title = "Show All"; ObjectID = "Kd2-mp-pUS"; */ "Kd2-mp-pUS.title" = "Show All"; -/* Class = "NSMenuItem"; title = "How To Support NetNewsWire"; ObjectID = "kfC-NQ-g3E"; */ -"kfC-NQ-g3E.title" = "How To Support NetNewsWire"; - /* Class = "NSMenuItem"; title = "New Twitter Feed…"; ObjectID = "ki4-7l-tM6"; */ "ki4-7l-tM6.title" = "New Twitter Feed…"; @@ -214,9 +205,6 @@ /* Class = "NSMenuItem"; title = "Main Window"; ObjectID = "LSZ-ci-Jb5"; */ "LSZ-ci-Jb5.title" = "Main Window"; -/* Class = "NSMenuItem"; title = "Bug Tracker"; ObjectID = "mE2-pM-rQF"; */ -"mE2-pM-rQF.title" = "Bug Tracker"; - /* Class = "NSMenuItem"; title = "Check Grammar With Spelling"; ObjectID = "mK6-2p-4JG"; */ "mK6-2p-4JG.title" = "Check Grammar With Spelling"; @@ -247,9 +235,6 @@ /* Class = "NSMenuItem"; title = "Hide NetNewsWire"; ObjectID = "Olw-nP-bQN"; */ "Olw-nP-bQN.title" = "Hide NetNewsWire"; -/* Class = "NSMenuItem"; title = "Technotes"; ObjectID = "Ou5-Cc-iCb"; */ -"Ou5-Cc-iCb.title" = "Technotes"; - /* Class = "NSMenuItem"; title = "Find Previous"; ObjectID = "OwM-mh-QMV"; */ "OwM-mh-QMV.title" = "Find Previous"; @@ -274,7 +259,7 @@ /* Class = "NSMenuItem"; title = "Refresh"; ObjectID = "Ppm-uh-K5n"; */ "Ppm-uh-K5n.title" = "Refresh"; -/* Class = "NSMenuItem"; title = "Website"; ObjectID = "q2Z-9K-GBd"; */ +/* Class = "NSMenuItem"; title = "NetNewsWire Website"; ObjectID = "q2Z-9K-GBd"; */ "q2Z-9K-GBd.title" = "Website"; /* Class = "NSMenuItem"; title = "Next Unread"; ObjectID = "q3p-nE-m2k"; */ @@ -283,9 +268,6 @@ /* Class = "NSMenuItem"; title = "Find Next"; ObjectID = "q09-fT-Sye"; */ "q09-fT-Sye.title" = "Find Next"; -/* Class = "NSMenuItem"; title = "GitHub Repository"; ObjectID = "QfD-Xw-sdF"; */ -"QfD-Xw-sdF.title" = "GitHub Repository"; - /* Class = "NSMenuItem"; title = "Copy Article URL"; ObjectID = "qNk-By-jKp"; */ "qNk-By-jKp.title" = "Copy Article URL"; diff --git a/iOS/Intents/en-GB.lproj/Intents.strings b/iOS/Intents/en-GB.lproj/Intents.strings index c8b03bf79..0d147131e 100644 --- a/iOS/Intents/en-GB.lproj/Intents.strings +++ b/iOS/Intents/en-GB.lproj/Intents.strings @@ -19,12 +19,6 @@ /* (No Comment) */ "ExjqcE" = "Unable to communicate with NetNewsWire."; -/* (No Comment) */ -"fWs3li" = "Which one?"; - -/* (No Comment) */ -"gEzXaM" = "Which one?"; - /* (No Comment) */ "HHiZUh" = "Just to confirm, you wanted ‘${accountName}’?";