fix: match navbar item order to designs

cosmic-settings/src/app.rs

@@ -139,12 +139,12 @@ impl cosmic::Application for SettingsApp {
         };
 
         let desktop_id = app.insert_page::<desktop::Page>().id();
-        app.insert_page::<input::Page>();
         app.insert_page::<display::Page>();
         //app.insert_page::<sound::Page>();
-        app.insert_page::<system::Page>();
-        app.insert_page::<time::Page>();
         app.insert_page::<power::Page>();
+        app.insert_page::<input::Page>();
+        app.insert_page::<time::Page>();
+        app.insert_page::<system::Page>();
 
         let active_id = match flags.subcommand {
             Some(p) => app.subcommand_to_page(&p),

cosmic-settings/src/pages/input/mod.rs

@@ -180,7 +180,7 @@ impl Page {
 impl page::Page<crate::pages::Message> for Page {
     fn info(&self) -> page::Info {
         // XXX icon?
-        page::Info::new("input-devices", "input-keyboard-symbolic")
+        page::Info::new("input-devices", "preferences-input-devices-symbolic")
             .title(fl!("input-devices"))
             .description(fl!("input-devices", "desc"))
     }

cosmic-settings/src/pages/power/mod.rs

@@ -13,7 +13,7 @@ pub struct Page;
 
 impl page::Page<crate::pages::Message> for Page {
     fn info(&self) -> page::Info {
-        page::Info::new("power", "battery-symbolic")
+        page::Info::new("power", "preferences-power-and-battery-symbolic")
             .title(fl!("power"))
             .description(fl!("power", "desc"))
     }

cosmic-settings/src/pages/time/mod.rs

@@ -11,7 +11,7 @@ pub struct Page;
 
 impl page::Page<crate::pages::Message> for Page {
     fn info(&self) -> page::Info {
-        page::Info::new("time", "preferences-system-time-symbolic")
+        page::Info::new("time", "preferences-time-and-language-symbolic")
             .title(fl!("time"))
             .description(fl!("time", "desc"))
     }

i18n/en/cosmic_settings.ftl

@@ -4,6 +4,16 @@ unknown = Unknown
 
 number = { $number }
 
+## Networking: Wired
+
+wired = Wired
+    .desc = Wired connections and connection profiles
+
+## Networking: Online Accounts
+
+online-accounts = Online Accounts
+    .desc = Add accounts, IMAP and SMTP, enterprise logins
+
 ## Desktop
 
 desktop = Desktop
@@ -252,41 +262,6 @@ dialog = Dialog
     .change-prompt = Settings changes will automatically revert in { $time } seconds.
     .revert-settings = Revert Settings
 
-## Networking: Wired
-
-wired = Wired
-    .desc = Wired connections and connection profiles
-
-## Networking: Online Accounts
-
-online-accounts = Online Accounts
-    .desc = Add accounts, IMAP and SMTP, enterprise logins
-
-## Time & Language
-
-time = Time & Language
-    .desc = N/A
-
-time-date = Date & Time
-    .desc = Time zone, automatic clock settings, and some time formatting.
-    .auto = Set automatically
-
-time-zone = Time Zone
-    .auto = Automatic time zone
-    .auto-info = Requires location services and internet access
-
-time-format = Date & Time Format
-    .twenty-four = 24-hour time
-    .first = First day of week
-    .show-date = Show Date on Top Panel
-    .friday = Friday
-    .saturday = Saturday
-    .sunday = Sunday
-    .monday = Monday
-
-time-region = Region & Language
-    .desc = Format dates, times, and numbers based on your region
-
 ## Sound
 
 sound = Sound
@@ -311,43 +286,19 @@ sound-alerts = Alerts
 sound-applications = Applications
     .desc = Application volumes and settings
 
-## System
+## Power
 
-system = System & Accounts
+power = Power & Battery
+    .desc = Manage power settings
 
-## System: About
+power-mode = Power Mode
-
+    .battery = Extended battery life
-about = About
+    .battery-desc = Reduced power usage and silent performance.
-    .desc = Device name, hardware information, operating system defaults.
+    .balanced = Balanced
-
+    .balanced-desc = Quiet performance and moderate power usage.
-about-device = Device name
+    .performance = High performance
-    .desc = This name appears to other network or bluetooth devices.
+    .performance-desc = Peak performance and power usage.
-
+    .nobackend = Backend not found. Install system76-power or power-profiles-daemon.
-about-hardware = Hardware
-    .model = Hardware model
-    .memory = Memory
-    .processor = Processor
-    .graphics = Graphics
-    .disk-capacity = Disk Capacity
-
-about-os = Operating System
-    .os = Operating system
-    .os-architecture = Operating system architecture
-    .desktop-environment = Desktop environment
-    .windowing-system = Windowing system
-
-about-related = Related settings
-    .support = Get support
-
-## System: Firmware
-
-firmware = Firmware
-    .desc = Firmware details.
-
-## System: Users
-
-users = Users
-    .desc = Authentication and user accounts.
 
 ## Input
 
@@ -561,16 +512,65 @@ switch-to-prev-workspace = Switch to prev workspace
 open-application-library = Open Application Library
 open-workspaces-view = Open Workspaces Overview
 
-## Power
+## Time & Language
 
-power = Power
+time = Time & Language
-    .desc = Manage power settings
+    .desc = N/A
 
-power-mode = Power Mode
+time-date = Date & Time
-    .performance = High performance
+    .desc = Time zone, automatic clock settings, and some time formatting.
-    .balanced = Balanced
+    .auto = Set automatically
-    .battery = Extended battery life
+
-    .performance-desc = Peak performance and power usage.
+time-zone = Time Zone
-    .balanced-desc = Quiet performance and moderate power usage.
+    .auto = Automatic time zone
-    .battery-desc = Reduced power usage and silent performance.
+    .auto-info = Requires location services and internet access
-    .nobackend = Backend not found. Install system76-power or power-profiles-daemon.
+
+time-format = Date & Time Format
+    .twenty-four = 24-hour time
+    .first = First day of week
+    .show-date = Show Date on Top Panel
+    .friday = Friday
+    .saturday = Saturday
+    .sunday = Sunday
+    .monday = Monday
+
+time-region = Region & Language
+    .desc = Format dates, times, and numbers based on your region
+
+## System
+
+system = System & Accounts
+
+## System: About
+
+about = About
+    .desc = Device name, hardware information, operating system defaults.
+
+about-device = Device name
+    .desc = This name appears to other network or bluetooth devices.
+
+about-hardware = Hardware
+    .model = Hardware model
+    .memory = Memory
+    .processor = Processor
+    .graphics = Graphics
+    .disk-capacity = Disk Capacity
+
+about-os = Operating System
+    .os = Operating system
+    .os-architecture = Operating system architecture
+    .desktop-environment = Desktop environment
+    .windowing-system = Windowing system
+
+about-related = Related settings
+    .support = Get support
+
+## System: Firmware
+
+firmware = Firmware
+    .desc = Firmware details.
+
+## System: Users
+
+users = Users
+    .desc = Authentication and user accounts.