merge master

.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/gettext.yml

@@ -2,13 +2,13 @@ name: Gettext Updates
 
 on:
   push:
-    branches: master
+    branches: [master]
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     container:
-      image: elementary/docker:next-unstable
+      image: ghcr.io/elementary/docker:next-unstable
 
     steps:
     - name: Install git
@@ -17,7 +17,7 @@ jobs:
         apt-get install git -y
 
     - name: Clone repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         token: ${{ secrets.GIT_USER_TOKEN }}
 

.github/workflows/main.yml

@@ -1,16 +1,27 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [master]
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
 
 jobs:
   build:
     runs-on: ubuntu-latest
 
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [stable, unstable, development-target]
     container:
-      image: elementary/docker:unstable
+      image: ghcr.io/elementary/docker:${{ matrix.version }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Install Dependencies
         run: |
           apt update
@@ -30,6 +41,6 @@ jobs:
       image: valalang/lint
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Lint
         run: io.elementary.vala-lint -d .

.github/workflows/release.yml

@@ -2,14 +2,14 @@ name: Release
 
 on:
   pull_request:
-    branches: master
-    types: closed
+    branches: [master]
+    types: [closed]
 jobs:
   release:
     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@v3
+      - uses: actions/checkout@v4
       - uses: elementary/actions/release@master
         env:
           GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"

data/io.elementary.switchboard.network.appdata.xml.in

@@ -7,6 +7,19 @@
   <icon type="stock">preferences-system-network</icon>
   <translation type="gettext">networking-plug</translation>
   <releases>
+    <release version="2.5.0" date="2024-01-04" urgency="medium">
+      <description>
+        <p>New features</p>
+        <ul>
+          <li>WireGuard support</li>
+          <li>OWE support</li>
+        </ul>
+        <p>Minor updates</p>
+        <ul>
+          <li>Updated translations</li>
+        </ul>
+      </description>
+    </release>
     <release version="2.4.4" date="2022-10-20" urgency="medium">
       <description>
         <p>Minor updates</p>
@@ -15,7 +28,6 @@
         </ul>
       </description>
     </release>
-
     <release version="2.4.3" date="2022-07-02" urgency="medium">
       <description>
         <p>Fixes:</p>
@@ -107,7 +119,7 @@
   </releases>
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/elementary/switchboard-plug-network/master/data/screenshot.png</image>
+      <image>https://raw.githubusercontent.com/elementary/switchboard-plug-network/2.5.0/data/screenshot.png</image>
     </screenshot>
   </screenshots>
   <url type="homepage">https://elementary.io</url>

meson.build

@@ -1,7 +1,7 @@
 project(
     'networking',
     'vala', 'c',
-    version: '2.4.4'
+    version: '2.5.0'
 )
 
 gettext_name = meson.project_name() + '-plug'

po/LINGUAS

@@ -193,3 +193,5 @@ zh_TW
 zu
 gn
 an
+aa
+ab

po/en_GB.po

@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: switchboard-plug-networking\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-10-20 17:42+0000\n"
-"PO-Revision-Date: 2021-11-30 10:04+0000\n"
-"Last-Translator: Ciarán Ainsworth <ciaranainsworth@outlook.com>\n"
+"PO-Revision-Date: 2023-02-17 14:25+0000\n"
+"Last-Translator: David Hewitt <davidmhewitt@gmail.com>\n"
 "Language-Team: English (United Kingdom) <https://l10n.elementary.io/projects/"
 "switchboard/switchboard-plug-networking/en_GB/>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.4.2\n"
+"X-Generator: Weblate 4.14.2\n"
 "X-Launchpad-Export-Date: 2016-12-24 05:04+0000\n"
 
 #: src/Utils.vala:21
@@ -466,10 +466,8 @@ msgid "104/128-bit WEP encrypted"
 msgstr "104/128-bit WEP encrypted"
 
 #: src/Widgets/WifiMenuItem.vala:145
-#, fuzzy
-#| msgid "WPA encrypted"
 msgid "WPA3 encrypted"
-msgstr "WPA encrypted"
+msgstr "WPA3 encrypted"
 
 #: src/Widgets/WifiMenuItem.vala:148
 msgid "WPA encrypted"

po/extra/LINGUAS

@@ -193,3 +193,5 @@ zh_TW
 zu
 gn
 an
+aa
+ab

po/extra/en_GB.po

@@ -8,16 +8,16 @@ msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2022-10-20 17:42+0000\n"
-"PO-Revision-Date: 2021-09-22 22:06+0000\n"
-"Last-Translator: Ciarán Ainsworth <ciaranainsworth@outlook.com>\n"
+"PO-Revision-Date: 2023-02-17 14:25+0000\n"
+"Last-Translator: David Hewitt <davidmhewitt@gmail.com>\n"
 "Language-Team: English (United Kingdom) <https://l10n.elementary.io/projects/"
 "switchboard/networking-plug-extra/en_GB/>\n"
 "Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.4.2\n"
+"X-Generator: Weblate 4.14.2\n"
 
 #: data/io.elementary.switchboard.network.appdata.xml.in:5
 msgid "Network Settings"
@@ -53,15 +53,15 @@ msgstr "Updated translations"
 
 #: data/io.elementary.switchboard.network.appdata.xml.in:21
 msgid "Fixes:"
-msgstr ""
+msgstr "Fixes:"
 
 #: data/io.elementary.switchboard.network.appdata.xml.in:23
 msgid "Show correct info for WPA3 networks"
-msgstr ""
+msgstr "Show correct info for WPA3 networks"
 
 #: data/io.elementary.switchboard.network.appdata.xml.in:35
 msgid "Fix an issue with wired connections repeatedly reconnecting"
-msgstr ""
+msgstr "Fix an issue with wired connections repeatedly reconnecting"
 
 #: data/io.elementary.switchboard.network.appdata.xml.in:44
 msgid "Fix a crash on startup for some devices"

po/extra/extra.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: extra\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-10-20 17:42+0000\n"
+"POT-Creation-Date: 2024-01-04 16:05+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -26,81 +26,95 @@ msgid "Manage network devices and connectivity"
 msgstr ""
 
 #: data/io.elementary.switchboard.network.appdata.xml.in:12
+msgid "New features"
+msgstr ""
+
+#: data/io.elementary.switchboard.network.appdata.xml.in:14
+msgid "WireGuard support"
+msgstr ""
+
+#: data/io.elementary.switchboard.network.appdata.xml.in:15
+msgid "OWE support"
+msgstr ""
+
+#: data/io.elementary.switchboard.network.appdata.xml.in:17
 #: data/io.elementary.switchboard.network.appdata.xml.in:25
-#: data/io.elementary.switchboard.network.appdata.xml.in:33
-#: data/io.elementary.switchboard.network.appdata.xml.in:42
-#: data/io.elementary.switchboard.network.appdata.xml.in:51
-#: data/io.elementary.switchboard.network.appdata.xml.in:61
-#: data/io.elementary.switchboard.network.appdata.xml.in:70
-#: data/io.elementary.switchboard.network.appdata.xml.in:83
+#: data/io.elementary.switchboard.network.appdata.xml.in:37
+#: data/io.elementary.switchboard.network.appdata.xml.in:45
+#: data/io.elementary.switchboard.network.appdata.xml.in:54
+#: data/io.elementary.switchboard.network.appdata.xml.in:63
+#: data/io.elementary.switchboard.network.appdata.xml.in:73
+#: data/io.elementary.switchboard.network.appdata.xml.in:82
+#: data/io.elementary.switchboard.network.appdata.xml.in:95
 msgid "Minor updates"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:14
+#: data/io.elementary.switchboard.network.appdata.xml.in:19
 #: data/io.elementary.switchboard.network.appdata.xml.in:27
-#: data/io.elementary.switchboard.network.appdata.xml.in:36
-#: data/io.elementary.switchboard.network.appdata.xml.in:45
-#: data/io.elementary.switchboard.network.appdata.xml.in:55
-#: data/io.elementary.switchboard.network.appdata.xml.in:64
-#: data/io.elementary.switchboard.network.appdata.xml.in:72
-#: data/io.elementary.switchboard.network.appdata.xml.in:85
-#: data/io.elementary.switchboard.network.appdata.xml.in:93
-#: data/io.elementary.switchboard.network.appdata.xml.in:103
+#: data/io.elementary.switchboard.network.appdata.xml.in:39
+#: data/io.elementary.switchboard.network.appdata.xml.in:48
+#: data/io.elementary.switchboard.network.appdata.xml.in:57
+#: data/io.elementary.switchboard.network.appdata.xml.in:67
+#: data/io.elementary.switchboard.network.appdata.xml.in:76
+#: data/io.elementary.switchboard.network.appdata.xml.in:84
+#: data/io.elementary.switchboard.network.appdata.xml.in:97
+#: data/io.elementary.switchboard.network.appdata.xml.in:105
+#: data/io.elementary.switchboard.network.appdata.xml.in:115
 msgid "Updated translations"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:21
+#: data/io.elementary.switchboard.network.appdata.xml.in:33
 msgid "Fixes:"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:23
+#: data/io.elementary.switchboard.network.appdata.xml.in:35
 msgid "Show correct info for WPA3 networks"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:35
+#: data/io.elementary.switchboard.network.appdata.xml.in:47
 msgid "Fix an issue with wired connections repeatedly reconnecting"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:44
+#: data/io.elementary.switchboard.network.appdata.xml.in:56
 msgid "Fix a crash on startup for some devices"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:53
+#: data/io.elementary.switchboard.network.appdata.xml.in:65
 msgid "Show message when Ethernet is unplugged"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:54
+#: data/io.elementary.switchboard.network.appdata.xml.in:66
 msgid "Show DNS info"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:63
+#: data/io.elementary.switchboard.network.appdata.xml.in:75
 msgid "Better status when wireless network is disabled"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:78
+#: data/io.elementary.switchboard.network.appdata.xml.in:90
 msgid "Improvements"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:80
+#: data/io.elementary.switchboard.network.appdata.xml.in:92
 msgid "Better support for various network encryption types"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:81
+#: data/io.elementary.switchboard.network.appdata.xml.in:93
 msgid "More accurately report encryption type"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:92
+#: data/io.elementary.switchboard.network.appdata.xml.in:104
 msgid "Redesigned Wireless page"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:100
+#: data/io.elementary.switchboard.network.appdata.xml.in:112
 msgid "Redesigned Hotspot and VPN pages"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:101
+#: data/io.elementary.switchboard.network.appdata.xml.in:113
 msgid "Fix subnet mask calculation"
 msgstr ""
 
-#: data/io.elementary.switchboard.network.appdata.xml.in:102
+#: data/io.elementary.switchboard.network.appdata.xml.in:114
 msgid "Show an error dialog if we fail to disconnect from a network"
 msgstr ""