Skip to content

Commit

Permalink
Merge branch 'master' into gtk4
Browse files Browse the repository at this point in the history
  • Loading branch information
danirabbit authored Oct 17, 2023
2 parents 812721a + fc22a65 commit d5391a4
Show file tree
Hide file tree
Showing 10 changed files with 61 additions and 30 deletions.
15 changes: 15 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# EditorConfig <http://EditorConfig.org>
root = true

# elementary defaults
[*]
charset = utf-8
end_of_line = lf
indent_size = tab
indent_style = space
insert_final_newline = true
max_line_length = 80
tab_width = 4

[{*.xml,*.xml.in,*.yml}]
tab_width = 2
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
6 changes: 3 additions & 3 deletions .github/workflows/gettext.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ name: Gettext Updates

on:
push:
branches: master
branches: [master]

jobs:
build:
runs-on: ubuntu-22.04
container:
image: elementary/docker:next-unstable
image: ghcr.io/elementary/docker:next-unstable

steps:
- name: Install git
Expand All @@ -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 }}

Expand Down
17 changes: 13 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
name: CI

on: [push, pull_request]
on:
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
Expand All @@ -30,6 +39,6 @@ jobs:
image: valalang/lint

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Lint
run: io.elementary.vala-lint -d .
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}"
Expand Down
6 changes: 3 additions & 3 deletions po/extra/mr.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: extra\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-23 05:08+0000\n"
"PO-Revision-Date: 2020-10-29 18:15+0000\n"
"PO-Revision-Date: 2023-03-21 18:59+0000\n"
"Last-Translator: Prachi Joshi <[email protected]>\n"
"Language-Team: Marathi <https://l10n.elementary.io/projects/switchboard/"
"printers-plug-extra/mr/>\n"
Expand All @@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 3.9.1\n"
"X-Generator: Weblate 4.16.4\n"

#: data/printers.appdata.xml.in:5
msgid "Printer Settings"
Expand Down Expand Up @@ -73,7 +73,7 @@ msgstr ""

#: data/printers.appdata.xml.in:33
msgid "Fixes:"
msgstr ""
msgstr "निराकारणे:"

#: data/printers.appdata.xml.in:35
msgid "Update sidebar after adding or removing printer"
Expand Down
6 changes: 3 additions & 3 deletions po/extra/nb.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: extra\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-23 05:08+0000\n"
"PO-Revision-Date: 2021-05-06 14:05+0000\n"
"PO-Revision-Date: 2023-07-08 21:07+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"Language-Team: Norwegian Bokmål <https://l10n.elementary.io/projects/"
"switchboard/printers-plug-extra/nb/>\n"
Expand All @@ -17,7 +17,7 @@ msgstr ""
"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.17\n"

#: data/printers.appdata.xml.in:5
msgid "Printer Settings"
Expand Down Expand Up @@ -73,7 +73,7 @@ msgstr ""

#: data/printers.appdata.xml.in:33
msgid "Fixes:"
msgstr ""
msgstr "Fikser:"

#: data/printers.appdata.xml.in:35
msgid "Update sidebar after adding or removing printer"
Expand Down
10 changes: 5 additions & 5 deletions po/extra/nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ msgstr ""
"Project-Id-Version: extra\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-23 05:08+0000\n"
"PO-Revision-Date: 2020-06-09 10:11+0000\n"
"Last-Translator: Jaimie85 <[email protected]>\n"
"PO-Revision-Date: 2023-06-23 10:07+0000\n"
"Last-Translator: DutchVipperloid <[email protected]>\n"
"Language-Team: Dutch <https://l10n.elementary.io/projects/switchboard/"
"printers-plug-extra/nl/>\n"
"Language: nl\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 3.9.1\n"
"X-Generator: Weblate 4.17\n"

#: data/printers.appdata.xml.in:5
msgid "Printer Settings"
Expand Down Expand Up @@ -49,7 +49,7 @@ msgstr ""

#: data/printers.appdata.xml.in:25
msgid "Improvements:"
msgstr ""
msgstr "Verbeteringen:"

#: data/printers.appdata.xml.in:27
msgid "Improved job row layout"
Expand All @@ -73,7 +73,7 @@ msgstr ""

#: data/printers.appdata.xml.in:33
msgid "Fixes:"
msgstr ""
msgstr "Oplossingen:"

#: data/printers.appdata.xml.in:35
msgid "Update sidebar after adding or removing printer"
Expand Down
13 changes: 7 additions & 6 deletions po/id.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,17 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-23 05:08+0000\n"
"PO-Revision-Date: 2018-06-14 00:09+0000\n"
"Last-Translator: Eri Hidayat <[email protected]>\n"
"Language-Team: Indonesian <https://weblate.elementary.io/projects/"
"switchboard/switchboard-plug-printers/id/>\n"
"PO-Revision-Date: 2023-05-23 19:07+0000\n"
"Last-Translator: Faisal Rachmadin <[email protected]."
"io>\n"
"Language-Team: Indonesian <https://l10n.elementary.io/projects/switchboard/"
"switchboard-plug-printers/id/>\n"
"Language: id\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: Weblate 2.18\n"
"X-Generator: Weblate 4.17\n"
"X-Launchpad-Export-Date: 2017-03-07 06:09+0000\n"

#: src/Plug.vala:38
Expand Down Expand Up @@ -648,7 +649,7 @@ msgstr ""

#: src/Widgets/PrinterRow.vala:124
msgid "Disabled"
msgstr "Dinonaktifkan"
msgstr "Nonaktifkan"

#~ msgid "Add"
#~ msgstr "Tambah"
Expand Down
6 changes: 3 additions & 3 deletions po/nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-11-23 05:08+0000\n"
"PO-Revision-Date: 2023-02-10 14:25+0000\n"
"PO-Revision-Date: 2023-05-07 01:06+0000\n"
"Last-Translator: Dennis ten Hoove <[email protected]>\n"
"Language-Team: Dutch <https://l10n.elementary.io/projects/switchboard/"
"switchboard-plug-printers/nl/>\n"
Expand All @@ -12,7 +12,7 @@ msgstr ""
"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.14.2\n"
"X-Generator: Weblate 4.17\n"
"X-Launchpad-Export-Date: 2017-03-07 06:09+0000\n"

#: src/Plug.vala:38
Expand All @@ -30,7 +30,7 @@ msgstr "Geen printers beschikbaar"
#: src/Plug.vala:53
msgid "Connect to a printer by clicking the icon in the toolbar below."
msgstr ""
"Maak verbinding met een printer door op het icoon op de taakbalk beneden te "
"Maak verbinding met een printer door op het icoon onderaan de zijbalk te "
"klikken."

#: src/PrinterList.vala:50
Expand Down

0 comments on commit d5391a4

Please sign in to comment.