Merge branch 'main' into ryonakano/appearance-add-latte

Author: danirabbit

.github/workflows/gettext.yml

@@ -17,7 +17,7 @@ jobs:
         apt-get install git -y
 
     - name: Clone repository
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         token: ${{ secrets.GIT_USER_TOKEN }}
 

.github/workflows/main.yml

@@ -19,7 +19,7 @@ jobs:
       image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install Dependencies
         run: |
           apt update
@@ -39,6 +39,6 @@ jobs:
       image: valalang/lint
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Lint
         run: io.elementary.vala-lint -d .

.github/workflows/release.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - uses: elementary/actions/release@main
         env:
           GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"

README.md

@@ -11,7 +11,7 @@ You'll need the following dependencies:
 * libgee-0.8-dev
 * libgexiv2-dev
 * libgtk-4-dev (>=4.10)
-* libgranite-7-dev (>=7.5.0)
+* libgranite-7-dev (>=7.7.0)
 * meson
 * valac
 

data/desktop.metainfo.xml.in

@@ -12,19 +12,19 @@
 
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/elementary/settings-desktop/8.0.0/data/screenshot-wallpaper.png</image>
+      <image>https://raw.githubusercontent.com/elementary/settings-desktop/8.2.1/data/screenshot-wallpaper.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/settings-desktop/8.0.0/data/screenshot-appearance.png</image>
+      <image>https://raw.githubusercontent.com/elementary/settings-desktop/8.2.1/data/screenshot-appearance.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/settings-desktop/8.0.0/data/screenshot-text.png</image>
+      <image>https://raw.githubusercontent.com/elementary/settings-desktop/8.2.1/data/screenshot-text.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/settings-desktop/8.0.0/data/screenshot-dock-panel.png</image>
+      <image>https://raw.githubusercontent.com/elementary/settings-desktop/8.2.1/data/screenshot-dock-panel.png</image>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/elementary/settings-desktop/8.0.0/data/screenshot-multitasking.png</image>
+      <image>https://raw.githubusercontent.com/elementary/settings-desktop/8.2.1/data/screenshot-multitasking.png</image>
     </screenshot>
   </screenshots>
 
@@ -43,6 +43,16 @@
   <update_contact>contact_at_elementary.io</update_contact>
 
   <releases>
+    <release version="8.2.1" date="2025-11-17" urgency="medium">
+      <description>
+        <p>Other updates:</p>
+        <ul>
+          <li>Update dock style</li>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
+
     <release version="8.2.0" date="2025-05-16" urgency="medium">
       <description>
         <p>Other updates:</p>

meson.build

@@ -1,7 +1,7 @@
 project(
     'desktop',
     'vala', 'c',
-    version: '8.2.0'
+    version: '8.2.1'
 )
 gettext_name = 'io.elementary.settings.' + meson.project_name()
 gnome = import('gnome')
@@ -21,7 +21,7 @@ add_project_arguments(
 gio_dep = dependency('gio-2.0')
 glib_dep = dependency('glib-2.0')
 gobject_dep = dependency('gobject-2.0')
-granite_dep = dependency('granite-7', version: '>=7.5.0')
+granite_dep = dependency('granite-7', version: '>=7.7.0')
 gtk_dep = dependency('gtk4', version: '>=4.10')
 hdy_dep = dependency ('libadwaita-1')
 posix_dep = meson.get_compiler('vala').find_library('posix')

po/aa.po

@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-03 00:56+0000\n"
+"POT-Creation-Date: 2025-11-04 18:05+0000\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 
@@ -19,7 +19,7 @@ msgstr ""
 
 #: src/Plug.vala:66 src/Plug.vala:133 src/Plug.vala:134 src/Plug.vala:135
 #: src/Plug.vala:136 src/Plug.vala:137 src/Plug.vala:138 src/Plug.vala:139
-#: src/Views/Appearance.vala:69
+#: src/Views/Appearance.vala:65
 msgid "Appearance"
 msgstr ""
 
@@ -67,19 +67,19 @@ msgstr ""
 msgid "Dark style"
 msgstr ""
 
-#: src/Plug.vala:135 src/Views/Appearance.vala:107
+#: src/Plug.vala:135 src/Views/Appearance.vala:108
 msgid "Dim Wallpaper With Dark Style"
 msgstr ""
 
-#: src/Plug.vala:136 src/Views/Appearance.vala:375
+#: src/Plug.vala:136 src/Views/Appearance.vala:267
 msgid "Accent Color"
 msgstr ""
 
-#: src/Plug.vala:137 src/Views/Appearance.vala:405
+#: src/Plug.vala:137 src/Views/Appearance.vala:296
 msgid "Always Show Scrollbars"
 msgstr ""
 
-#: src/Plug.vala:138 src/Views/Appearance.vala:390
+#: src/Plug.vala:138 src/Views/Appearance.vala:281
 msgid "Reduce Motion"
 msgstr ""
 
@@ -107,89 +107,89 @@ msgstr ""
 msgid "Move windows to a new workspace"
 msgstr ""
 
-#: src/Views/Appearance.vala:70
+#: src/Views/Appearance.vala:66
 msgid ""
 "Apps may follow these preferences, but can choose their own accents or style."
 msgstr ""
 
-#: src/Views/Appearance.vala:84 src/Views/Dock.vala:37
+#: src/Views/Appearance.vala:83 src/Views/Dock.vala:37
 msgid "Default"
 msgstr ""
 
-#: src/Views/Appearance.vala:96
+#: src/Views/Appearance.vala:97
 msgid "Dark"
 msgstr ""
 
-#: src/Views/Appearance.vala:118
+#: src/Views/Appearance.vala:119
 msgid "Disabled"
 msgstr ""
 
-#: src/Views/Appearance.vala:123
+#: src/Views/Appearance.vala:126
 msgid "Sunset to Sunrise"
 msgstr ""
 
-#: src/Views/Appearance.vala:128
+#: src/Views/Appearance.vala:133
 msgid "From:"
 msgstr ""
 
-#: src/Views/Appearance.vala:135
+#: src/Views/Appearance.vala:140
 msgid "To:"
 msgstr ""
 
-#: src/Views/Appearance.vala:159
+#: src/Views/Appearance.vala:166
 msgid "Schedule"
 msgstr ""
 
-#: src/Views/Appearance.vala:328
+#: src/Views/Appearance.vala:220
 msgid "Blueberry"
 msgstr ""
 
-#: src/Views/Appearance.vala:331
+#: src/Views/Appearance.vala:223
 msgid "Mint"
 msgstr ""
 
-#: src/Views/Appearance.vala:334
+#: src/Views/Appearance.vala:226
 msgid "Lime"
 msgstr ""
 
-#: src/Views/Appearance.vala:337
+#: src/Views/Appearance.vala:229
 msgid "Banana"
 msgstr ""
 
-#: src/Views/Appearance.vala:340
+#: src/Views/Appearance.vala:232
 msgid "Orange"
 msgstr ""
 
-#: src/Views/Appearance.vala:343
+#: src/Views/Appearance.vala:235
 msgid "Strawberry"
 msgstr ""
 
-#: src/Views/Appearance.vala:346
+#: src/Views/Appearance.vala:238
 msgid "Bubblegum"
 msgstr ""
 
-#: src/Views/Appearance.vala:349
+#: src/Views/Appearance.vala:241
 msgid "Grape"
 msgstr ""
 
-#: src/Views/Appearance.vala:352
+#: src/Views/Appearance.vala:244
 msgid "Cocoa"
 msgstr ""
 
-#: src/Views/Appearance.vala:355
+#: src/Views/Appearance.vala:247
 msgid "Slate"
 msgstr ""
 
-#: src/Views/Appearance.vala:358
+#: src/Views/Appearance.vala:250
 msgid "Automatic based on wallpaper"
 msgstr ""
 
-#: src/Views/Appearance.vala:392
+#: src/Views/Appearance.vala:283
 msgid ""
 "Disable animations in the window manager and some other interface elements."
 msgstr ""
 
-#: src/Views/Appearance.vala:408
+#: src/Views/Appearance.vala:299
 msgid "Scrollbars will take up space, even when not in use."
 msgstr ""
 
@@ -289,39 +289,39 @@ msgstr ""
 msgid "When maximizing"
 msgstr ""
 
-#: src/Views/Multitasking.vala:125
+#: src/Views/Multitasking.vala:127
 msgid "Do nothing"
 msgstr ""
 
-#: src/Views/Multitasking.vala:126
+#: src/Views/Multitasking.vala:128
 msgid "Multitasking View"
 msgstr ""
 
-#: src/Views/Multitasking.vala:127
+#: src/Views/Multitasking.vala:129
 msgid "Maximize current window"
 msgstr ""
 
-#: src/Views/Multitasking.vala:128
+#: src/Views/Multitasking.vala:135
 msgid "Show Applications Menu"
 msgstr ""
 
-#: src/Views/Multitasking.vala:129
+#: src/Views/Multitasking.vala:137
 msgid "Show all windows"
 msgstr ""
 
-#: src/Views/Multitasking.vala:130
+#: src/Views/Multitasking.vala:138
 msgid "Switch to previous workspace"
 msgstr ""
 
-#: src/Views/Multitasking.vala:131
+#: src/Views/Multitasking.vala:139
 msgid "Switch to next workspace"
 msgstr ""
 
-#: src/Views/Multitasking.vala:132
+#: src/Views/Multitasking.vala:140
 msgid "Switch to new workspace"
 msgstr ""
 
-#: src/Views/Multitasking.vala:133
+#: src/Views/Multitasking.vala:141
 msgid "Execute custom command"
 msgstr ""