Internationalisation and Localisation Fixes

Account/Sources/Account/Resources/en-GB.lproj/Localizable.strings

@@ -1,16 +1,120 @@
-/* 
-  Localizable.strings
-
+/* Feedly – Could not move a feed between folders/collections. */
+"“%@” may be in both “%@” and “%@”." = "“%1$@” may be in both “%2$@” and “%3$@”.";
+
+/* Status bar progress */
+"%@ of %@" = "%1$@ of %2$@";
+
+/* Unknown error */
+"A Reddit Feed Provider error has occurred." = "A Reddit Feed Provider error has occurred.";
+
+/* Account name */
+"account.name.ipad" = "On My iPad";
+
+/* Account name */
+"account.name.iphone" = "On My iPhone";
+
+/* Account name */
+"account.name.mac" = "On My Mac";
+
+/* All */
+"All" = "All";
+
+/* Reddit Access */
+"An attempt to access your Reddit feed(s) failed.\n\nIf this problem persists, please deactivate and reactivate the Reddit extension to fix this problem.\n\n(error.localizedDescription)" = "An attempt to access your Reddit feed(s) failed.\n\nIf this problem persists, please deactivate and reactivate the Reddit extension to fix this problem.";
+
+/* Unknown error */
+"An error occurred while processing the “%@” account: %@" = "An error occurred while processing the “%1$@” account: %2$@";
+
+/* An invalid parameter was passed. */
+"An invalid parameter was passed." = "An invalid parameter was passed.";
+
+/* An unexpected CloudKit error occurred. */
+"An unexpected CloudKit error occurred." = "An unexpected CloudKit error occurred.";
+
+/* An unexpected error occurred. */
+"An unexpected error occurred." = "An unexpected error occurred.";
+
+/* Best */
+"Best" = "Best";
+
+/* OAuth - recovery suggestion - ensure browser selected supports web authentication. */
+"Check your default web browser in System Preferences or change it to Safari and try again." = "Check your default web browser in System Preferences or change it to Safari and try again.";
+
+/* Feedly – Could not create a folder/collection. */
+"Could not create a folder named “%@”." = "Could not create a folder named “%@”.";
+
+/* Feedly – Could not encode resource id to send to Feedly. */
+"Could not encode the identifier “%@”." = "Could not encode the identifier “%@”.";
+
+/* Feedly – Could not move a feed between folders/collections. */
+"Could not move “%@” to “%@”." = "Could not move “%1$@” to “%2$@”.";
+
+/* Feedly – Could not remove a feed. */
+"Could not remove “%@”." = "Could not remove “%@”.";
+
+/* Feedly – Could not remove a folder/collection. */
+"Could not remove the folder named “%@”." = "Could not remove the folder named “%@”.";
+
+/* Feedly – Could not rename a feed.
+   Feedly – Could not rename a folder/collection. */
+"Could not rename “%@” to “%@”." = "Could not rename “%1$@” to “%2$@”.";
+
+/* (No Comment) */
+"error.message.already-subscribed" = "You are already subscribed to this feed and can’t add it again.";
+
+/* Your ”%@” credentials have expired. */
+"error.message.credentials-expired.%@" = "Your ”%@” credentials have expired.";
+
+/* You are already subscribed to this feed and can’t add it again. */
+"error.message.feed-already-subscribed" = "You are already subscribed to this feed and can’t add it again.";
 
-  Created by Stuart Breckenridge on 11/03/2023.
+/* Can’t add a feed because no feed was found. */
+"error.message.feed-not-found" = "Can’t add a feed because no feed was found.";
+
+/* An OPML import for this account is already running. */
+"error.message.opml-import-in-progress" = "An OPML import for this account is already running.";
+
+/* Already Subscribed */
+"error.title.already-subscribed" = "Already Subscribed";
+
+/* Error */
+"error.title.error" = "Error";
+
+/* Localizable.strings
 
-*/
 
+  Created by Stuart Breckenridge on 11/03/2023. */
 "error.title.feed-not-found" = "Unable to Add Feed";
-"error.title.already-subscribed" = "Already Subscribed";
+
+/* OPML Import in Progress */
 "error.title.ompl-import-in-progress" = "OPML Import in Progress";
-"error.title.error" = "Error";
 
-"error.message.feed-not-found" = "Can’t add a feed because no feed was found.";
-"error.message.already-subscribed" = "You are already subscribed to this feed and can’t add it again.";
-"error.message.opml-import-in-progress" = "An OPML import for this account is already running.";
+/* Feedbin */
+"Feedbin" = "Feedbin";
+
+/* Feedly */
+"Feedly" = "Feedly";
+
+/* Feedly – Feed can only be added to folders. */
+"Feeds cannot be added to the “%@” folder." = "Feedly – Feed can only be added to folders.";
+
+/* FreshRSS */
+"FreshRSS" = "FreshRSS";
+
+/* Notify about new articles
+   Show notifications for new articles */
+"label.text.show-notifications-for-new-articles" = "Notify about new articles";
+
+/* Notify about new posts
+   Show notifications for new posts */
+"label.text.show-notifications-for-new-posts" = "Notify about new posts";
+
+/* New */
+"New" = "New";
+
+/* NewsBlur */
+"NewsBlur" = "NewsBlur";
+
+/* Feedly – Credentials not found. */
+"Please add the Feedly account again. If this problem persists, open Keychain Access and delete all feedly.com entries, then try again." = "Please add the Feedly account again. If this problem persists, open Keychain Access and delete all feedly.com entries, then try again.";
+

Account/Sources/Account/Resources/en.lproj/Localizable.strings

@@ -1,16 +1,27 @@
-/* 
-  Localizable.strings
-
+/* Reddit Access */
+"An attempt to access your Reddit feed(s) failed.\n\nIf this problem persists, please deactivate and reactivate the Reddit extension to fix this problem.\n\n(error.localizedDescription)" = "An attempt to access your Reddit feed(s) failed.\n\nIf this problem persists, please deactivate and reactivate the Reddit extension to fix this problem.";
+
+/* (No Comment) */
+"error.message.already-subscribed" = "You are already subscribed to this feed and can’t add it again.";
+
+/* Can’t add a feed because no feed was found. */
+"error.message.feed-not-found" = "Can’t add a feed because no feed was found.";
+
+/* An OPML import for this account is already running. */
+"error.message.opml-import-in-progress" = "An OPML import for this account is already running.";
+
+/* Already Subscribed */
+"error.title.already-subscribed" = "Already Subscribed";
 
-  Created by Stuart Breckenridge on 11/03/2023.
+/* Error */
+"error.title.error" = "Error";
+
+/* Localizable.strings
 
-*/
 
+  Created by Stuart Breckenridge on 11/03/2023. */
 "error.title.feed-not-found" = "Unable to Add Feed";
-"error.title.already-subscribed" = "Already Subscribed";
+
+/* OPML Import in Progress */
 "error.title.ompl-import-in-progress" = "OPML Import in Progress";
-"error.title.error" = "Error";
 
-"error.message.feed-not-found" = "Can’t add a feed because no feed was found.";
-"error.message.already-subscribed" = "You are already subscribed to this feed and can’t add it again.";
-"error.message.opml-import-in-progress" = "An OPML import for this account is already running.";

Mac/AppDelegate.swift

@@ -610,8 +610,8 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSUserInterfaceValidations,
 		if keyboardShortcutsWindowController == nil {
 
 			keyboardShortcutsWindowController = WebViewWindowController(title: NSLocalizedString("window.title.keyboard-shortcuts", comment: "Keyboard Shortcuts"))
-			let htmlFile = Bundle(for: type(of: self)).path(forResource: "KeyboardShortcuts", ofType: "html")!
-			keyboardShortcutsWindowController?.displayContents(of: htmlFile)
+			keyboardShortcutsWindowController?.displayContents(of: KeyboardHTML().htmlFile())
+
 
 			if let window = keyboardShortcutsWindowController?.window {
 				let point = NSPoint(x: 128, y: 64)

Mac/Base.lproj/Main.storyboard

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21701"/>
     </dependencies>
     <scenes>
         <!--Application-->

Mac/CrashReporter/en-GB.lproj/CrashReporterWindow.strings

@@ -1,13 +1,6 @@
-
 /* Class = "NSButtonCell"; title = "Send Crash Log"; ObjectID = "7ot-Ev-JTY"; */
 "7ot-Ev-JTY.title" = "Send Crash Log";
 
-/* Class = "NSTextFieldCell"; title = "To help us fix crashing bugs, click Send Crash Log. Below is the text that will be sent to Brent. No other information will be sent."; ObjectID = "O6E-xl-G55"; */
-"O6E-xl-G55.title" = "To help us fix crashing bugs, click Send Crash Log. Below is the text that will be sent to Brent. No other information will be sent.";
-
-/* Class = "NSWindow"; title = "Crash Log Reporter"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Crash Log Reporter";
-
 /* Class = "NSTextFieldCell"; title = "Privacy Policy"; ObjectID = "a10-hs-ajA"; */
 "a10-hs-ajA.title" = "Privacy Policy";
 
@@ -22,3 +15,10 @@
 
 /* Class = "NSTextFieldCell"; title = "You can skip this window in the future by telling NetNewsWire to automatically send crash logs. You can also turn this setting on and off in the Preferences window, in the Advanced section."; ObjectID = "nou-5k-c1U"; */
 "nou-5k-c1U.title" = "You can skip this window in the future by telling NetNewsWire to automatically send crash logs. You can also turn this setting on and off in the Preferences window, in the Advanced section.";
+
+/* Class = "NSTextFieldCell"; title = "To help us fix crashing bugs, click Send Crash Log. Below is the text that will be sent to Brent. No other information will be sent."; ObjectID = "O6E-xl-G55"; */
+"O6E-xl-G55.title" = "To help us fix crashing bugs, click Send Crash Log. Below is the text that will be sent to Brent. No other information will be sent.";
+
+/* Class = "NSWindow"; title = "Crash Log Reporter"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Crash Log Reporter";
+

Mac/Inspector/en-GB.lproj/Inspector.strings

@@ -1,10 +1,15 @@
-
 /* Class = "NSTextFieldCell"; title = "Label"; ObjectID = "3v9-Z7-d7l"; */
 "3v9-Z7-d7l.title" = "Label";
 
 /* Class = "NSTextFieldCell"; title = "Multiple selection"; ObjectID = "5oG-0x-T8O"; */
 "5oG-0x-T8O.title" = "Multiple selection";
 
+/* Class = "NSButtonCell"; title = "Always use Reader view"; ObjectID = "aRe-yV-R0h"; */
+"aRe-yV-R0h.title" = "Always use Reader view";
+
+/* Class = "NSWindow"; title = "Inspector"; ObjectID = "bma-LM-jVu"; */
+"bma-LM-jVu.title" = "Inspector";
+
 /* Class = "NSButtonCell"; title = "Show notifications for new articles"; ObjectID = "Bw5-c7-yDX"; */
 "Bw5-c7-yDX.title" = "Show notifications for new articles";
 
@@ -17,27 +22,21 @@
 /* Class = "NSTextFieldCell"; title = "http://example.com/feed"; ObjectID = "HpC-rK-YGK"; */
 "HpC-rK-YGK.title" = "http://example.com/feed";
 
-/* Class = "NSTextFieldCell"; title = "http://example.com/"; ObjectID = "L2p-ur-j7a"; */
-"L2p-ur-j7a.title" = "http://example.com/";
-
-/* Class = "NSTextFieldCell"; title = "Folder\nName\nField"; ObjectID = "Xl3-7D-9Mw"; */
-"Xl3-7D-9Mw.title" = "Folder\nName\nField";
-
-/* Class = "NSButtonCell"; title = "Always use Reader view"; ObjectID = "aRe-yV-R0h"; */
-"aRe-yV-R0h.title" = "Always use Reader view";
-
-/* Class = "NSWindow"; title = "Inspector"; ObjectID = "bma-LM-jVu"; */
-"bma-LM-jVu.title" = "Inspector";
-
 /* Class = "NSTextFieldCell"; title = "Nothing to inspect"; ObjectID = "iLD-8q-EAJ"; */
 "iLD-8q-EAJ.title" = "Nothing to inspect";
 
+/* Class = "NSTextFieldCell"; title = "http://example.com/"; ObjectID = "L2p-ur-j7a"; */
+"L2p-ur-j7a.title" = "http://example.com/";
+
 /* Class = "NSViewController"; title = "Feed"; ObjectID = "sfH-oR-GXm"; */
 "sfH-oR-GXm.title" = "Feed";
 
 /* Class = "NSTextFieldCell"; title = "Feed\nName\nField"; ObjectID = "tAO-GI-MT1"; */
 "tAO-GI-MT1.title" = "Feed\nName\nField";
 
+/* Class = "NSTextFieldCell"; title = "Folder\nName\nField"; ObjectID = "Xl3-7D-9Mw"; */
+"Xl3-7D-9Mw.title" = "Folder\nName\nField";
+
 /* Class = "NSViewController"; title = "Builtin Smart Feed"; ObjectID = "ye3-co-8lc"; */
 "ye3-co-8lc.title" = "Builtin Smart Feed";
 
@@ -46,3 +45,4 @@
 
 /* Class = "NSTextFieldCell"; title = "Feed"; ObjectID = "zzB-rX-1dK"; */
 "zzB-rX-1dK.title" = "Feed";
+

Mac/MainWindow/NNW3/en-GB.lproj/NNW3OpenPanelAccessoryView.strings

@@ -0,0 +1,15 @@
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "hAU-Zh-UCo"; */
+"hAU-Zh-UCo.title" = "Item 3";
+
+/* Class = "NSTextFieldCell"; title = "Choose a NetNewsWire 3 “Subscriptions.plist” file.\n\nThen choose the account to receive your imported subscriptions."; ObjectID = "IFj-4w-B03"; */
+"IFj-4w-B03.title" = "Choose a NetNewsWire 3 “Subscriptions.plist” file.\n\nThen choose the account to receive your imported subscriptions.";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "OAk-KA-y5i"; */
+"OAk-KA-y5i.title" = "Item 1";
+
+/* Class = "NSTextFieldCell"; title = "Account:"; ObjectID = "uoh-QY-7LX"; */
+"uoh-QY-7LX.title" = "Account:";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "zkS-Dx-uCM"; */
+"zkS-Dx-uCM.title" = "Item 2";
+

Mac/MainWindow/OPML/en-GB.lproj/ExportOPMLSheet.strings

@@ -0,0 +1,24 @@
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "6lK-bV-Vwd"; */
+"6lK-bV-Vwd.title" = "Cancel";
+
+/* Class = "NSTextFieldCell"; title = "Choose the account with the subscriptions you’d like to export. Subscriptions are exported in the standard OPML format, which most RSS readers can import."; ObjectID = "7Ap-KG-Lc7"; */
+"7Ap-KG-Lc7.title" = "Choose the account with the subscriptions you’d like to export. Subscriptions are exported in the standard OPML format, which most RSS readers can import.";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "7U3-Y5-qeM"; */
+"7U3-Y5-qeM.title" = "Item 2";
+
+/* Class = "NSButtonCell"; title = "Export as OPML…"; ObjectID = "bRz-cx-bmm"; */
+"bRz-cx-bmm.title" = "Export as OPML...";
+
+/* Class = "NSTextFieldCell"; title = "Account:"; ObjectID = "Dao-jI-G6i"; */
+"Dao-jI-G6i.title" = "Account:";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "MJb-Bf-UJG"; */
+"MJb-Bf-UJG.title" = "Item 1";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Window";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "Uii-dd-siy"; */
+"Uii-dd-siy.title" = "Item 3";
+

Mac/MainWindow/OPML/en-GB.lproj/ImportOPMLSheet.strings

@@ -0,0 +1,24 @@
+/* Class = "NSTextFieldCell"; title = "Choose the account to get the imported subscriptions. This requires an OPML file, which most RSS readers can create."; ObjectID = "1Vu-Te-PGl"; */
+"1Vu-Te-PGl.title" = "Choose the account to get the imported subscriptions. This requires an OPML file, which most RSS readers can create.";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "9ab-cB-hex"; */
+"9ab-cB-hex.title" = "Cancel";
+
+/* Class = "NSMenuItem"; title = "Item 3"; ObjectID = "92e-hX-kYj"; */
+"92e-hX-kYj.title" = "Item 3";
+
+/* Class = "NSButtonCell"; title = "Import from OPML…"; ObjectID = "dhV-on-ayM"; */
+"dhV-on-ayM.title" = "Import from OPML...";
+
+/* Class = "NSTextFieldCell"; title = "Account:"; ObjectID = "e9g-7H-VWa"; */
+"e9g-7H-VWa.title" = "Account:";
+
+/* Class = "NSMenuItem"; title = "Item 2"; ObjectID = "JGa-5R-SV5"; */
+"JGa-5R-SV5.title" = "Item 2";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Window";
+
+/* Class = "NSMenuItem"; title = "Item 1"; ObjectID = "xsd-12-2yb"; */
+"xsd-12-2yb.title" = "Item 1";
+

Mac/Preferences/Accounts/en-GB.lproj/AccountsAddCloudKit.strings

@@ -1,18 +1,18 @@
-
 /* Class = "NSTextFieldCell"; title = "Use your iCloud account."; ObjectID = "1d2-Mx-TKe"; */
 "1d2-Mx-TKe.title" = "Use your iCloud account.";
 
-/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Window";
-
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "iVd-bO-4LN"; */
 "iVd-bO-4LN.title" = "Cancel";
 
 /* Class = "NSButtonCell"; title = "Use iCloud"; ObjectID = "oih-6c-KbS"; */
 "oih-6c-KbS.title" = "Use iCloud";
 
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Window";
+
 /* Class = "NSTextFieldCell"; title = "iCloud Syncing Limitations & Solutions"; ObjectID = "rON-0r-jBU"; */
 "rON-0r-jBU.title" = "iCloud Syncing Limitations & Solutions";
 
 /* Class = "NSTextFieldCell"; title = "NetNewsWire will use your iCloud account to sync your feeds across your Mac and iOS devices."; ObjectID = "wfr-Dv-UIF"; */
 "wfr-Dv-UIF.title" = "NetNewsWire will use your iCloud account to sync your feeds across your Mac and iOS devices.";
+

Mac/Preferences/Accounts/en-GB.lproj/AccountsAddLocal.strings

@@ -1,18 +1,18 @@
-
 /* Class = "NSTextFieldCell"; title = "Create a local account on your Mac."; ObjectID = "1d2-Mx-TKe"; */
 "1d2-Mx-TKe.title" = "Create a local account on your Mac.";
 
 /* Class = "NSTextFieldCell"; title = "Name:"; ObjectID = "AVh-ns-LEN"; */
 "AVh-ns-LEN.title" = "Name:";
 
-/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
-"QvC-M9-y7g.title" = "Window";
-
 /* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "iVd-bO-4LN"; */
 "iVd-bO-4LN.title" = "Cancel";
 
 /* Class = "NSButtonCell"; title = "Create"; ObjectID = "oih-6c-KbS"; */
 "oih-6c-KbS.title" = "Create";
 
+/* Class = "NSWindow"; title = "Window"; ObjectID = "QvC-M9-y7g"; */
+"QvC-M9-y7g.title" = "Window";
+
 /* Class = "NSTextFieldCell"; title = "Local accounts store their data on your Mac. They do not sync across your devices."; ObjectID = "wfr-Dv-UIF"; */
 "wfr-Dv-UIF.title" = "Local accounts store their data on your Mac. They do not sync across your devices.";
+