Stuart Breckenridge ed6ff090be Merge branch 'ios-ui-settings-localised' into localize_strings ...

# Conflicts:
#	Mac/AppDelegate.swift
#	Mac/Base.lproj/Preferences.storyboard
#	NetNewsWire.xcodeproj/project.pbxproj
#	Shared/Localizations/LocalizedNetNewsWireError.swift
#	iOS/MasterFeed/MasterFeedViewController.swift
#	iOS/Settings/Appearance/ArticleThemeManagerView.swift
#	iOS/Settings/Appearance/DisplayAndBehaviorsView.swift
#	iOS/Settings/General/SettingsView.swift

2023-05-27 17:00:42 +08:00

..

Account

Fix typos

2022-12-31 18:52:42 +02:00

Add

Merge branch 'main' into localize_strings

2023-02-10 09:26:05 +08:00

Article

Merge branch 'ios-ui-settings-localised' into localize_strings

2023-05-27 17:00:42 +08:00

Base.lproj

Interim commit wth .based localisations

2022-12-24 15:01:33 +08:00

en-GB.lproj

Adds en-gb localisation

2023-01-04 12:42:23 +08:00

en.lproj

Localization work

2022-12-30 21:53:07 +08:00

Inspector

Localized mac app

2023-01-04 12:33:38 +08:00

Intents

Adds missing translations

2023-01-04 19:17:48 +08:00

IntentsExtension

Adds missing translations

2023-01-04 19:17:48 +08:00

MasterFeed

Merge branch 'ios-ui-settings-localised' into localize_strings

2023-05-27 17:00:42 +08:00

MasterTimeline

Merge branch 'ios-ui-settings-localised' into localize_strings

2023-05-27 17:00:42 +08:00

Resources

Merge branch 'ios-ui-settings-localised' into localize_strings

2023-05-27 17:00:42 +08:00

Settings

Merge branch 'ios-ui-settings-localised' into localize_strings

2023-05-27 17:00:42 +08:00

ShareExtension

Adds missing translations

2023-01-04 19:17:48 +08:00

SwiftUI Extensions

Localization files updated

2023-02-10 09:51:12 +08:00

UIKit Extensions

Unifies account error localizations

2023-03-11 17:14:05 +08:00

AppAssets.swift

Merge branch 'ios-release'

2023-02-04 13:43:55 -07:00

AppDefaults.swift

Merge branch 'ios-ui-settings-localised' into localize_strings

2023-05-27 17:00:42 +08:00

AppDelegate.swift

Merge branch 'ios-ui-settings-localised' into localize_strings

2023-05-27 17:00:42 +08:00

ArticleActivityItemSource.swift

Provide dedicated TitleActivityItemSource when sharing to Omnifocus and Things

2020-01-11 09:12:41 +01:00

ErrorHandler.swift

Logging changes

2022-09-04 21:31:03 +08:00

IconView.swift

Simplify iconImage:didSet. Move background color update to a private helper function.

2021-04-24 17:55:48 -07:00

KeyboardManager.swift

Merge branch 'ios-ui-settings-localised' into localize_strings

2023-05-27 17:00:42 +08:00

NavigationStateController.swift

Rename AccountsDidChangeNotification to AccountsDidChange to match other notification names

2019-05-19 16:36:33 -05:00

RootSplitViewController.swift

Continue adopting @MainActor.

2023-04-05 19:27:51 -07:00

SceneCoordinator.swift

Merge branch 'main' into ios-ui-settings-localised

2023-05-27 15:26:03 +08:00

SceneDelegate.swift

Merge branch 'main' into ios-ui-settings-localised

2023-04-07 18:56:02 +04:00

TitleActivityItemSource.swift

Remove references to Tweetbot.

2023-04-01 22:13:40 -07:00