Skip to content

Commit 26bcac8

Browse files
authored
Merge branch 'main' into introduce-layout-manager
2 parents 756c165 + 7eaeec1 commit 26bcac8

File tree

15 files changed

+127
-518
lines changed

15 files changed

+127
-518
lines changed

.github/workflows/gettext.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
apt-get install git -y
1818
1919
- name: Clone repository
20-
uses: actions/checkout@v4
20+
uses: actions/checkout@v6
2121
with:
2222
token: ${{ secrets.GIT_USER_TOKEN }}
2323

.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
image: ghcr.io/elementary/docker:${{ matrix.version }}
2020

2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323
- name: Install Dependencies
2424
run: |
2525
apt update
@@ -37,5 +37,5 @@ jobs:
3737
runs-on: ubuntu-latest
3838

3939
steps:
40-
- uses: actions/checkout@v4
41-
- uses: elementary/actions/vala-lint@master
40+
- uses: actions/checkout@v6
41+
- uses: elementary/actions/vala-lint@main

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
runs-on: ubuntu-latest
1010
if: github.event.pull_request.merged == true && true == contains(join(github.event.pull_request.labels.*.name), 'Release')
1111
steps:
12-
- uses: actions/checkout@v4
13-
- uses: elementary/actions/release@master
12+
- uses: actions/checkout@v6
13+
- uses: elementary/actions/release@main
1414
env:
1515
GIT_USER_TOKEN: "${{ secrets.GIT_USER_TOKEN }}"
1616
GIT_USER_NAME: "elementaryBot"

po/LINGUAS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ yo
188188
za
189189
zh
190190
zh_CN
191-
zh_HK
192191
zh_TW
193192
zu
194193
aa

po/extra/LINGUAS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,6 @@ yo
188188
za
189189
zh
190190
zh_CN
191-
zh_HK
192191
zh_TW
193192
zu
194193
aa

po/extra/be.po

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,17 @@ msgstr ""
88
"Project-Id-Version: extra\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2024-11-19 21:42+0000\n"
11-
"PO-Revision-Date: 2018-12-10 10:41-0800\n"
12-
"Last-Translator: Automatically generated\n"
13-
"Language-Team: none\n"
11+
"PO-Revision-Date: 2025-07-28 04:55+0000\n"
12+
"Last-Translator: lenify <[email protected]>\n"
13+
"Language-Team: Belarusian <https://l10n.elementaryos.org/projects/settings/"
14+
"display-plug-extra/be/>\n"
1415
"Language: be\n"
1516
"MIME-Version: 1.0\n"
1617
"Content-Type: text/plain; charset=UTF-8\n"
1718
"Content-Transfer-Encoding: 8bit\n"
18-
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
19-
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
19+
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
20+
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
21+
"X-Generator: Weblate 5.11.4\n"
2022

2123
#: data/display.metainfo.xml.in:11
2224
msgid "Display Settings"
@@ -35,7 +37,7 @@ msgstr ""
3537
#: data/display.metainfo.xml.in:96 data/display.metainfo.xml.in:109
3638
#: data/display.metainfo.xml.in:126
3739
msgid "Minor updates:"
38-
msgstr ""
40+
msgstr "Нязначныя абнаўленні:"
3941

4042
#: data/display.metainfo.xml.in:37 data/display.metainfo.xml.in:52
4143
#: data/display.metainfo.xml.in:66 data/display.metainfo.xml.in:80

po/extra/he.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ msgstr ""
88
"Project-Id-Version: extra\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2024-11-19 21:42+0000\n"
11-
"PO-Revision-Date: 2024-08-18 17:16+0000\n"
11+
"PO-Revision-Date: 2025-10-30 09:55+0000\n"
1212
"Last-Translator: Yaron Shahrabani <[email protected]>\n"
13-
"Language-Team: Hebrew <https://l10n.elementary.io/projects/switchboard/"
13+
"Language-Team: Hebrew <https://l10n.elementaryos.org/projects/settings/"
1414
"display-plug-extra/he/>\n"
1515
"Language: he\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
20-
"X-Generator: Weblate 5.6.2\n"
20+
"X-Generator: Weblate 5.11.4\n"
2121

2222
#: data/display.metainfo.xml.in:11
2323
msgid "Display Settings"
@@ -29,7 +29,7 @@ msgstr "הגדרת הרזולוציה ומיקומם של מסכים ומקרנ
2929

3030
#: data/display.metainfo.xml.in:27
3131
msgid "elementary, Inc."
32-
msgstr "elementary בע״מ"
32+
msgstr "elementary בע״מ."
3333

3434
#: data/display.metainfo.xml.in:35 data/display.metainfo.xml.in:47
3535
#: data/display.metainfo.xml.in:63 data/display.metainfo.xml.in:78

po/extra/ja.po

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ msgstr ""
88
"Project-Id-Version: extra\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2024-11-19 21:42+0000\n"
11-
"PO-Revision-Date: 2024-12-12 05:36+0000\n"
11+
"PO-Revision-Date: 2025-08-30 22:55+0000\n"
1212
"Last-Translator: Ryo Nakano <[email protected]>\n"
13-
"Language-Team: Japanese <https://l10n.elementary.io/projects/switchboard/"
13+
"Language-Team: Japanese <https://l10n.elementaryos.org/projects/settings/"
1414
"display-plug-extra/ja/>\n"
1515
"Language: ja\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=1; plural=0;\n"
20-
"X-Generator: Weblate 5.8.4\n"
20+
"X-Generator: Weblate 5.11.4\n"
2121

2222
#: data/display.metainfo.xml.in:11
2323
msgid "Display Settings"
24-
msgstr "ディスプレイの設定"
24+
msgstr "ディスプレイ設定"
2525

2626
#: data/display.metainfo.xml.in:12
2727
msgid "Configure resolution and position of monitors and projectors"

po/extra/pt_BR.po

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ msgstr ""
88
"Project-Id-Version: extra\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2024-11-19 21:42+0000\n"
11-
"PO-Revision-Date: 2024-08-07 18:16+0000\n"
12-
"Last-Translator: anonymous <[email protected]>\n"
13-
"Language-Team: Portuguese (Brazil) <https://l10n.elementary.io/projects/"
14-
"switchboard/display-plug-extra/pt_BR/>\n"
11+
"PO-Revision-Date: 2025-07-28 04:55+0000\n"
12+
"Last-Translator: Guilherme Faura <[email protected]>\n"
13+
"Language-Team: Portuguese (Brazil) <https://l10n.elementaryos.org/projects/"
14+
"settings/display-plug-extra/pt_BR/>\n"
1515
"Language: pt_BR\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=2; plural=n > 1;\n"
20-
"X-Generator: Weblate 5.6.2\n"
20+
"X-Generator: Weblate 5.11.4\n"
2121

2222
#: data/display.metainfo.xml.in:11
2323
msgid "Display Settings"
@@ -63,7 +63,7 @@ msgstr ""
6363

6464
#: data/display.metainfo.xml.in:87
6565
msgid "Improvements:"
66-
msgstr ""
66+
msgstr "Melhorias:"
6767

6868
#: data/display.metainfo.xml.in:89
6969
msgid "Move resolutions with a different aspect ratio to a submenu"
@@ -76,7 +76,7 @@ msgstr ""
7676
#: data/display.metainfo.xml.in:92 data/display.metainfo.xml.in:105
7777
#: data/display.metainfo.xml.in:122
7878
msgid "Fixes:"
79-
msgstr ""
79+
msgstr "Correções:"
8080

8181
#: data/display.metainfo.xml.in:94
8282
msgid "Show display name on all workspaces"

po/extra/sv.po

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,92 +8,93 @@ msgstr ""
88
"Project-Id-Version: extra\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2024-11-19 21:42+0000\n"
11-
"PO-Revision-Date: 2024-08-07 18:16+0000\n"
12-
"Last-Translator: anonymous <[email protected]>\n"
13-
"Language-Team: Swedish <https://l10n.elementary.io/projects/switchboard/"
11+
"PO-Revision-Date: 2025-10-30 09:55+0000\n"
12+
"Last-Translator: Daniel Nylander <[email protected]>\n"
13+
"Language-Team: Swedish <https://l10n.elementaryos.org/projects/settings/"
1414
"display-plug-extra/sv/>\n"
1515
"Language: sv\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=2; plural=n != 1;\n"
20-
"X-Generator: Weblate 5.6.2\n"
20+
"X-Generator: Weblate 5.11.4\n"
2121

2222
#: data/display.metainfo.xml.in:11
2323
msgid "Display Settings"
24-
msgstr ""
24+
msgstr "Skärminställningar"
2525

2626
#: data/display.metainfo.xml.in:12
2727
msgid "Configure resolution and position of monitors and projectors"
2828
msgstr "Ställ in upplösning och placering av bildskärmar och projektorer"
2929

3030
#: data/display.metainfo.xml.in:27
3131
msgid "elementary, Inc."
32-
msgstr ""
32+
msgstr "elementary, Inc."
3333

3434
#: data/display.metainfo.xml.in:35 data/display.metainfo.xml.in:47
3535
#: data/display.metainfo.xml.in:63 data/display.metainfo.xml.in:78
3636
#: data/display.metainfo.xml.in:96 data/display.metainfo.xml.in:109
3737
#: data/display.metainfo.xml.in:126
3838
msgid "Minor updates:"
39-
msgstr ""
39+
msgstr "Mindre uppdateringar:"
4040

4141
#: data/display.metainfo.xml.in:37 data/display.metainfo.xml.in:52
4242
#: data/display.metainfo.xml.in:66 data/display.metainfo.xml.in:80
4343
#: data/display.metainfo.xml.in:98 data/display.metainfo.xml.in:111
4444
#: data/display.metainfo.xml.in:128
4545
msgid "Updated translations"
46-
msgstr ""
46+
msgstr "Uppdaterade översättningar"
4747

4848
#: data/display.metainfo.xml.in:49
4949
msgid "Fix missing settings URI handlers"
50-
msgstr ""
50+
msgstr "Fixa saknade URI-hanterare för inställningar"
5151

5252
#: data/display.metainfo.xml.in:50
5353
msgid "Dragging displays is now smoother"
54-
msgstr ""
54+
msgstr "Det går nu smidigare att dra skärmar"
5555

5656
#: data/display.metainfo.xml.in:51
5757
msgid "Show an error dialog if errors occur"
58-
msgstr ""
58+
msgstr "Visa en feldialog om fel uppstår"
5959

6060
#: data/display.metainfo.xml.in:65
6161
msgid "Redesign Night Light View"
62-
msgstr ""
62+
msgstr "Ny design av nattljusvy"
6363

6464
#: data/display.metainfo.xml.in:87
6565
msgid "Improvements:"
66-
msgstr ""
66+
msgstr "Förbättringar:"
6767

6868
#: data/display.metainfo.xml.in:89
6969
msgid "Move resolutions with a different aspect ratio to a submenu"
70-
msgstr ""
70+
msgstr "Flytta upplösningar med ett annat bildförhållande till en undermeny"
7171

7272
#: data/display.metainfo.xml.in:90
7373
msgid "Improve brightness in the dark style"
74-
msgstr ""
74+
msgstr "Förbättra ljusstyrkan i den mörka stilen"
7575

7676
#: data/display.metainfo.xml.in:92 data/display.metainfo.xml.in:105
7777
#: data/display.metainfo.xml.in:122
7878
msgid "Fixes:"
79-
msgstr ""
79+
msgstr "Åtgärdar:"
8080

8181
#: data/display.metainfo.xml.in:94
8282
msgid "Show display name on all workspaces"
83-
msgstr ""
83+
msgstr "Visa skärmnamn på alla arbetsytor"
8484

8585
#: data/display.metainfo.xml.in:107
8686
msgid "Ensure the \"Use this display\" switch works in more circumstances"
8787
msgstr ""
88+
"Säkerställa att \"Använd denna skärm\"-knappen fungerar i fler situationer"
8889

8990
#: data/display.metainfo.xml.in:118
9091
msgid "New features:"
91-
msgstr ""
92+
msgstr "Nya funktioner:"
9293

9394
#: data/display.metainfo.xml.in:120
9495
msgid "Support 3× scaling"
95-
msgstr ""
96+
msgstr "Stöd för 3×-skalning"
9697

9798
#: data/display.metainfo.xml.in:124
9899
msgid "Reliably detect accelerometers"
99-
msgstr ""
100+
msgstr "Tillförlitlig upptäckt av accelerometrar"

0 commit comments

Comments
 (0)