Use settings label in settings page instead of dedicated text

app/lib/l10n/app_en.arb

@@ -330,10 +330,6 @@
 		"description": "Memory albums contain photos taken in a specific time range in the past"
 	},
 	"settingsAccountTitle": "Account",
-	"settingsAccountPageTitle": "Account settings",
-	"@settingsAccountPageTitle": {
-		"description": "Dedicated page for account settings"
-	},
 	"settingsAccountLabelTitle": "Label",
 	"@settingsAccountLabelTitle": {
 		"description": "An account label is used to replace the server URL in the app bar, could be useful for privacy reason"
@@ -367,10 +363,6 @@
 	"@settingsPhotosDescription": {
 		"description": "The 'Photos' here means the tab called 'Photos', not literally a photo. The title of this setting will also reuse the label of that tab"
 	},
-	"settingsPhotosPageTitle": "Photos settings",
-	"@settingsPhotosPageTitle": {
-		"description": "Dedicated page for settings related to the Photos tab"
-	},
 	"settingsMemoriesRangeTitle": "Memories range",
 	"@settingsMemoriesRangeTitle": {
 		"description": "How many adjacent days to be inclded in memories for a particular year"
@@ -386,10 +378,6 @@
 	},
 	"settingsViewerTitle": "Viewer",
 	"settingsViewerDescription": "Customize the image/video viewer",
-	"settingsViewerPageTitle": "Viewer settings",
-	"@settingsViewerPageTitle": {
-		"description": "Dedicated page for viewer settings"
-	},
 	"settingsScreenBrightnessTitle": "Screen brightness",
 	"settingsScreenBrightnessDescription": "Override system brightness level",
 	"settingsForceRotationTitle": "Ignore rotation lock",
@@ -397,10 +385,6 @@
 	"settingsMapProviderTitle": "Map provider",
 	"settingsAlbumTitle": "Album",
 	"settingsAlbumDescription": "Customize albums",
-	"settingsAlbumPageTitle": "Album settings",
-	"@settingsAlbumPageTitle": {
-		"description": "Dedicated page for album settings"
-	},
 	"settingsShowDateInAlbumTitle": "Group photos by date",
 	"settingsShowDateInAlbumDescription": "Apply only when the album is sorted by time",
 	"settingsImageEditTitle": "Editor",
@@ -418,10 +402,6 @@
 	"settingsImageEditSaveResultsToServerFalseDescription": "Results are saved to this device",
 	"settingsThemeTitle": "Theme",
 	"settingsThemeDescription": "Customize the appearance of the app",
-	"settingsThemePageTitle": "Theme settings",
-	"@settingsThemePageTitle": {
-		"description": "Dedicated page for theme settings"
-	},
 	"settingsFollowSystemThemeTitle": "Follow system theme",
 	"@settingsFollowSystemThemeTitle": {
 		"description": "Respect the system dark mode settings introduced on Android 10"
@@ -439,7 +419,6 @@
 		"description": "When black in dark theme is set to false"
 	},
 	"settingsMiscellaneousTitle": "Miscellaneous",
-	"settingsMiscellaneousPageTitle": "Miscellaneous settings",
 	"settingsDoubleTapExitTitle": "Double tap to exit",
 	"@settingsDoubleTapExitTitle": {
 		"description": "If enabled, users need to tap the back button twice to exit app"
@@ -450,7 +429,6 @@
 	},
 	"settingsExperimentalTitle": "Experimental",
 	"settingsExperimentalDescription": "Features that are not ready for everyday use",
-	"settingsExperimentalPageTitle": "Experimental settings",
 	"settingsAboutSectionTitle": "About",
 	"@settingsAboutSectionTitle": {
 		"description": "Title of the about section in settings widget"

app/lib/l10n/untranslated-messages.txt

@@ -6,7 +6,6 @@
     "settingsMemoriesTitle",
     "settingsMemoriesSubtitle",
     "settingsAccountTitle",
-    "settingsAccountPageTitle",
     "settingsAccountLabelTitle",
     "settingsAccountLabelDescription",
     "settingsIncludedFoldersTitle",
@@ -16,13 +15,11 @@
     "settingsShareFolderPickerDescription",
     "settingsServerAppSectionTitle",
     "settingsPhotosDescription",
-    "settingsPhotosPageTitle",
     "settingsMemoriesRangeTitle",
     "settingsMemoriesRangeValueText",
     "settingsMapProviderTitle",
     "settingsAlbumTitle",
     "settingsAlbumDescription",
-    "settingsAlbumPageTitle",
     "settingsShowDateInAlbumTitle",
     "settingsShowDateInAlbumDescription",
     "settingsImageEditTitle",
@@ -33,12 +30,10 @@
     "settingsImageEditSaveResultsToServerTrueDescription",
     "settingsImageEditSaveResultsToServerFalseDescription",
     "settingsMiscellaneousTitle",
-    "settingsMiscellaneousPageTitle",
     "settingsDoubleTapExitTitle",
     "settingsPhotosTabSortByNameTitle",
     "settingsExperimentalTitle",
     "settingsExperimentalDescription",
-    "settingsExperimentalPageTitle",
     "rootPickerSkipConfirmationDialogContent2",
     "sortOptionFilenameAscendingLabel",
     "sortOptionFilenameDescendingLabel",
@@ -174,7 +169,6 @@
     "settingsMemoriesTitle",
     "settingsMemoriesSubtitle",
     "settingsAccountTitle",
-    "settingsAccountPageTitle",
     "settingsAccountLabelTitle",
     "settingsAccountLabelDescription",
     "settingsIncludedFoldersTitle",
@@ -184,13 +178,11 @@
     "settingsShareFolderPickerDescription",
     "settingsServerAppSectionTitle",
     "settingsPhotosDescription",
-    "settingsPhotosPageTitle",
     "settingsMemoriesRangeTitle",
     "settingsMemoriesRangeValueText",
     "settingsMapProviderTitle",
     "settingsAlbumTitle",
     "settingsAlbumDescription",
-    "settingsAlbumPageTitle",
     "settingsShowDateInAlbumTitle",
     "settingsShowDateInAlbumDescription",
     "settingsImageEditTitle",
@@ -201,12 +193,10 @@
     "settingsImageEditSaveResultsToServerTrueDescription",
     "settingsImageEditSaveResultsToServerFalseDescription",
     "settingsMiscellaneousTitle",
-    "settingsMiscellaneousPageTitle",
     "settingsDoubleTapExitTitle",
     "settingsPhotosTabSortByNameTitle",
     "settingsExperimentalTitle",
     "settingsExperimentalDescription",
-    "settingsExperimentalPageTitle",
     "rootPickerSkipConfirmationDialogContent2",
     "timeSecondInputHint",
     "sortOptionFilenameAscendingLabel",
@@ -354,7 +344,6 @@
     "settingsAccountLabelTitle",
     "settingsAccountLabelDescription",
     "settingsPhotosDescription",
-    "settingsPhotosPageTitle",
     "settingsMemoriesRangeTitle",
     "settingsMemoriesRangeValueText",
     "settingsImageEditTitle",
@@ -415,7 +404,6 @@
   "es": [
     "settingsLanguageOptionSystemDefaultLabel",
     "settingsPhotosDescription",
-    "settingsPhotosPageTitle",
     "settingsMemoriesRangeTitle",
     "settingsMemoriesRangeValueText",
     "settingsImageEditTitle",
@@ -444,7 +432,6 @@
 
   "fi": [
     "settingsPhotosDescription",
-    "settingsPhotosPageTitle",
     "settingsMemoriesRangeTitle",
     "settingsMemoriesRangeValueText",
     "settingsImageEditTitle",
@@ -477,7 +464,6 @@
     "settingsAccountLabelTitle",
     "settingsAccountLabelDescription",
     "settingsPhotosDescription",
-    "settingsPhotosPageTitle",
     "settingsMemoriesRangeTitle",
     "settingsMemoriesRangeValueText",
     "settingsImageEditTitle",
@@ -488,7 +474,6 @@
     "settingsImageEditSaveResultsToServerTrueDescription",
     "settingsImageEditSaveResultsToServerFalseDescription",
     "settingsMiscellaneousTitle",
-    "settingsMiscellaneousPageTitle",
     "settingsDoubleTapExitTitle",
     "settingsPhotosTabSortByNameTitle",
     "sortOptionFilenameAscendingLabel",
@@ -563,7 +548,6 @@
     "settingsAccountLabelTitle",
     "settingsAccountLabelDescription",
     "settingsPhotosDescription",
-    "settingsPhotosPageTitle",
     "settingsMemoriesRangeTitle",
     "settingsMemoriesRangeValueText",
     "settingsImageEditTitle",
@@ -574,7 +558,6 @@
     "settingsImageEditSaveResultsToServerTrueDescription",
     "settingsImageEditSaveResultsToServerFalseDescription",
     "settingsMiscellaneousTitle",
-    "settingsMiscellaneousPageTitle",
     "settingsDoubleTapExitTitle",
     "settingsPhotosTabSortByNameTitle",
     "sortOptionFilenameAscendingLabel",
@@ -667,7 +650,6 @@
     "settingsAccountLabelTitle",
     "settingsAccountLabelDescription",
     "settingsPhotosDescription",
-    "settingsPhotosPageTitle",
     "settingsMemoriesRangeTitle",
     "settingsMemoriesRangeValueText",
     "settingsImageEditTitle",
@@ -678,7 +660,6 @@
     "settingsImageEditSaveResultsToServerTrueDescription",
     "settingsImageEditSaveResultsToServerFalseDescription",
     "settingsMiscellaneousTitle",
-    "settingsMiscellaneousPageTitle",
     "settingsDoubleTapExitTitle",
     "settingsPhotosTabSortByNameTitle",
     "sortOptionFilenameAscendingLabel",
@@ -750,7 +731,6 @@
     "settingsAccountLabelTitle",
     "settingsAccountLabelDescription",
     "settingsPhotosDescription",
-    "settingsPhotosPageTitle",
     "settingsMemoriesRangeTitle",
     "settingsMemoriesRangeValueText",
     "settingsImageEditTitle",
@@ -761,7 +741,6 @@
     "settingsImageEditSaveResultsToServerTrueDescription",
     "settingsImageEditSaveResultsToServerFalseDescription",
     "settingsMiscellaneousTitle",
-    "settingsMiscellaneousPageTitle",
     "settingsDoubleTapExitTitle",
     "settingsPhotosTabSortByNameTitle",
     "sortOptionFilenameAscendingLabel",
@@ -833,7 +812,6 @@
     "settingsAccountLabelTitle",
     "settingsAccountLabelDescription",
     "settingsPhotosDescription",
-    "settingsPhotosPageTitle",
     "settingsMemoriesRangeTitle",
     "settingsMemoriesRangeValueText",
     "settingsImageEditTitle",
@@ -844,7 +822,6 @@
     "settingsImageEditSaveResultsToServerTrueDescription",
     "settingsImageEditSaveResultsToServerFalseDescription",
     "settingsMiscellaneousTitle",
-    "settingsMiscellaneousPageTitle",
     "settingsDoubleTapExitTitle",
     "settingsPhotosTabSortByNameTitle",
     "sortOptionFilenameAscendingLabel",
@@ -916,7 +893,6 @@
     "settingsAccountLabelTitle",
     "settingsAccountLabelDescription",
     "settingsPhotosDescription",
-    "settingsPhotosPageTitle",
     "settingsMemoriesRangeTitle",
     "settingsMemoriesRangeValueText",
     "settingsImageEditTitle",
@@ -927,7 +903,6 @@
     "settingsImageEditSaveResultsToServerTrueDescription",
     "settingsImageEditSaveResultsToServerFalseDescription",
     "settingsMiscellaneousTitle",
-    "settingsMiscellaneousPageTitle",
     "settingsDoubleTapExitTitle",
     "settingsPhotosTabSortByNameTitle",
     "sortOptionFilenameAscendingLabel",

app/lib/widget/account_picker_dialog.dart

@@ -98,7 +98,7 @@ class _AccountPickerDialogState extends State<AccountPickerDialog> {
               Icons.settings_outlined,
               color: AppTheme.getUnfocusedIconColor(context),
             ),
-            tooltip: L10n.global().settingsAccountPageTitle,
+            tooltip: L10n.global().settingsMenuLabel,
             onPressed: _onEditPressed,
           ),
         ),

app/lib/widget/settings.dart

@@ -530,7 +530,7 @@ class _AccountSettingsState extends State<AccountSettingsWidget> {
         slivers: [
           SliverAppBar(
             pinned: true,
-            title: Text(L10n.global().settingsAccountPageTitle),
+            title: Text(L10n.global().settingsAccountTitle),
             leading: _shouldReload
                 ? IconButton(
                     icon: const Icon(Icons.check),
@@ -837,7 +837,7 @@ class _PhotosSettingsState extends State<_PhotosSettings> {
       slivers: [
         SliverAppBar(
           pinned: true,
-          title: Text(L10n.global().settingsPhotosPageTitle),
+          title: Text(L10n.global().photosTabLabel),
         ),
         SliverList(
           delegate: SliverChildListDelegate(
@@ -1018,7 +1018,7 @@ class _ViewerSettingsState extends State<_ViewerSettings> {
       slivers: [
         SliverAppBar(
           pinned: true,
-          title: Text(L10n.global().settingsViewerPageTitle),
+          title: Text(L10n.global().settingsViewerTitle),
         ),
         SliverList(
           delegate: SliverChildListDelegate(
@@ -1232,7 +1232,7 @@ class _AlbumSettingsState extends State<_AlbumSettings> {
       slivers: [
         SliverAppBar(
           pinned: true,
-          title: Text(L10n.global().settingsAlbumPageTitle),
+          title: Text(L10n.global().settingsAlbumTitle),
         ),
         SliverList(
           delegate: SliverChildListDelegate(
@@ -1552,7 +1552,7 @@ class _ThemeSettingsState extends State<_ThemeSettings> {
       slivers: [
         SliverAppBar(
           pinned: true,
-          title: Text(L10n.global().settingsThemePageTitle),
+          title: Text(L10n.global().settingsThemeTitle),
         ),
         SliverList(
           delegate: SliverChildListDelegate(
@@ -1659,7 +1659,7 @@ class _MiscSettingsState extends State<_MiscSettings> {
       slivers: [
         SliverAppBar(
           pinned: true,
-          title: Text(L10n.global().settingsMiscellaneousPageTitle),
+          title: Text(L10n.global().settingsMiscellaneousTitle),
         ),
         SliverList(
           delegate: SliverChildListDelegate(
@@ -1749,7 +1749,7 @@ class _ExperimentalSettingsState extends State<_ExperimentalSettings> {
       slivers: [
         SliverAppBar(
           pinned: true,
-          title: Text(L10n.global().settingsExperimentalPageTitle),
+          title: Text(L10n.global().settingsExperimentalTitle),
         ),
         SliverList(
           delegate: SliverChildListDelegate(