renun/NetNewsWire
1
0
Fork 0
mirror of https://github.com/Ranchero-Software/NetNewsWire synced 2025-08-12 06:26:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into localize_strings

Browse Source 
# Conflicts:
#	Mac/MainWindow/AddFeed/AddTwitterFeedWindowController.swift
#	Mac/MainWindow/MainWindowController.swift
#	NetNewsWire.xcodeproj/project.pbxproj
#	Shared/ArticleStyles/ArticleTheme.swift
#	iOS/Add/AddFeedViewController.swift
#	iOS/Add/Twitter/TwitterEnterDetailTableViewController.swift
#	iOS/Article/ArticleViewController.swift
#	iOS/MasterFeed/MasterFeedViewController.swift
This commit is contained in:
Stuart Breckenridge
2023-02-10 09:26:05 +08:00
parent c45fd40eb5 9bb09b8ec8
commit 6efed337db
95 changed files with 348 additions and 2416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iOS/Article/ArticleViewController.swift
View File

@@ -267,7 +267,7 @@ class ArticleViewController: UIViewController, MainControllerIdentifiable, Loggi
themeActions.append(action)
}
let defaultThemeAction = UIAction(title: NSLocalizedString("button.title.default", comment: "Button title: Default"),
let defaultThemeAction = UIAction(title: "NetNewsWire",
image: nil,
identifier: nil,
discoverabilityTitle: nil,