Skip to content

Commit

Permalink
Merge branch 'master' into gtk4
Browse files Browse the repository at this point in the history
  • Loading branch information
treppenwitz03 authored Jan 11, 2023
2 parents d99c2bf + 39a30fb commit 5758b7e
Show file tree
Hide file tree
Showing 399 changed files with 6,701 additions and 6,278 deletions.
27 changes: 21 additions & 6 deletions .github/workflows/gettext.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,29 @@
name: Gettext updates
name: Gettext Updates

on:
push:
branches: master

jobs:
gettext_template:
runs-on: ubuntu-latest
build:
runs-on: ubuntu-22.04
container:
image: elementary/docker:next-unstable

steps:
- uses: actions/checkout@v1
- uses: elementary/actions/gettext-template@master
- name: Install git
run: |
apt-get update
apt-get install git -y
- name: Clone repository
uses: actions/checkout@v3
with:
token: ${{ secrets.GIT_USER_TOKEN }}

- name: Update Translation Files
uses: elementary/actions/gettext-template@next
env:
GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
GIT_USER_TOKEN: ${{ secrets.GIT_USER_TOKEN }}
GIT_USER_NAME: "elementaryBot"
GIT_USER_EMAIL: "builds@elementary.io"
40 changes: 19 additions & 21 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,34 +4,32 @@ on: [push, pull_request]

jobs:
build:

runs-on: ubuntu-latest

container:
image: elementary/docker:unstable

steps:
- uses: actions/checkout@v1
- name: Install Dependencies
run: |
apt update
apt install -y libgranite-dev libnm-dev libnma-dev libswitchboard-2.0-dev meson valac
- name: Build
env:
DESTDIR: out
run: |
meson build
ninja -C build
ninja -C build install
- uses: actions/checkout@v3
- name: Install Dependencies
run: |
apt update
apt install -y libgranite-dev libnm-dev libnma-dev libswitchboard-2.0-dev meson valac
- name: Build
env:
DESTDIR: out
run: |
meson build
ninja -C build
ninja -C build install
lint:

runs-on: ubuntu-latest

container:
image: valalang/lint

steps:
- uses: actions/checkout@v1
- name: Lint
run: io.elementary.vala-lint -d .
- uses: actions/checkout@v3
- name: Lint
run: io.elementary.vala-lint -d .
22 changes: 11 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ on:
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@v1
- uses: elementary/actions/release@master
env:
GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
GIT_USER_NAME: "elementaryBot"
GIT_USER_EMAIL: "builds@elementary.io"
with:
release_branch: 'odin'
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: elementary/actions/release@master
env:
GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
GIT_USER_NAME: "elementaryBot"
GIT_USER_EMAIL: "builds@elementary.io"
with:
release_branch: "odin"
9 changes: 9 additions & 0 deletions data/io.elementary.switchboard.network.appdata.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@
<icon type="stock">preferences-system-network</icon>
<translation type="gettext">networking-plug</translation>
<releases>
<release version="2.4.4" date="2022-10-20" urgency="medium">
<description>
<p>Minor updates</p>
<ul>
<li>Updated translations</li>
</ul>
</description>
</release>

<release version="2.4.3" date="2022-07-02" urgency="medium">
<description>
<p>Fixes:</p>
Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'networking',
'vala', 'c',
version: '2.4.3'
version: '2.4.4'
)

gettext_name = meson.project_name() + '-plug'
Expand Down
6 changes: 2 additions & 4 deletions po/LINGUAS
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
aa
ab
ae
af
ak
am
an
ar
as
ast
Expand Down Expand Up @@ -55,7 +52,6 @@ fy
ga
gd
gl
gn
gu
gv
ha
Expand Down Expand Up @@ -195,3 +191,5 @@ zh_CN
zh_HK
zh_TW
zu
gn
an
2 changes: 1 addition & 1 deletion po/aa.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/ab.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/ae.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/af.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"PO-Revision-Date: 2020-10-01 18:14+0000\n"
"Last-Translator: anonymous <noreply@weblate.org>\n"
"Language-Team: Afrikaans <https://l10n.elementary.io/projects/switchboard/"
Expand Down
2 changes: 1 addition & 1 deletion po/ak.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"PO-Revision-Date: 2020-10-01 18:14+0000\n"
"Last-Translator: anonymous <noreply@weblate.org>\n"
"Language-Team: Akan <https://l10n.elementary.io/projects/switchboard/"
Expand Down
2 changes: 1 addition & 1 deletion po/am.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"PO-Revision-Date: 2020-10-01 18:14+0000\n"
"Last-Translator: anonymous <noreply@weblate.org>\n"
"Language-Team: Amharic <https://l10n.elementary.io/projects/switchboard/"
Expand Down
2 changes: 1 addition & 1 deletion po/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: switchboard-plug-networking\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"PO-Revision-Date: 2021-04-26 17:51+0000\n"
"Last-Translator: nasserbinlaboun <nasser1990com@gmail.com>\n"
"Language-Team: Arabic <https://l10n.elementary.io/projects/switchboard/"
Expand Down
2 changes: 1 addition & 1 deletion po/as.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/ast.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/av.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/ay.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/az.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/ba.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/be.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"PO-Revision-Date: 2020-10-01 18:14+0000\n"
"Last-Translator: anonymous <noreply@weblate.org>\n"
"Language-Team: Belarusian <https://l10n.elementary.io/projects/switchboard/"
Expand Down
2 changes: 1 addition & 1 deletion po/bg.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: switchboard-plug-networking\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"PO-Revision-Date: 2020-10-01 18:14+0000\n"
"Last-Translator: anonymous <noreply@weblate.org>\n"
"Language-Team: Bulgarian <https://l10n.elementary.io/projects/switchboard/"
Expand Down
2 changes: 1 addition & 1 deletion po/bh.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/bi.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/bm.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/bn.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"PO-Revision-Date: 2020-10-01 18:14+0000\n"
"Last-Translator: anonymous <noreply@weblate.org>\n"
"Language-Team: Bengali <https://l10n.elementary.io/projects/switchboard/"
Expand Down
2 changes: 1 addition & 1 deletion po/bo.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/br.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/bs.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"PO-Revision-Date: 2020-10-01 18:14+0000\n"
"Last-Translator: anonymous <noreply@weblate.org>\n"
"Language-Team: Bosnian <https://l10n.elementary.io/projects/switchboard/"
Expand Down
2 changes: 1 addition & 1 deletion po/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: switchboard-plug-networking\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"PO-Revision-Date: 2022-05-22 14:28+0000\n"
"Last-Translator: David M <rbndavid@gmail.com>\n"
"Language-Team: Catalan <https://l10n.elementary.io/projects/switchboard/"
Expand Down
2 changes: 1 addition & 1 deletion po/ce.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
2 changes: 1 addition & 1 deletion po/ch.po
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-02 19:11+0000\n"
"POT-Creation-Date: 2022-10-20 17:42+0000\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"

Expand Down
Loading

0 comments on commit 5758b7e

Please sign in to comment.