Skip to content

Commit

Permalink
Merge branch 'master' into danirabbit/gtkapplication
Browse files Browse the repository at this point in the history
  • Loading branch information
zeebok authored Oct 5, 2024
2 parents c89c45f + 0ce8fce commit b351ff3
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 40 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
version: [stable, unstable, development-target]
include:
- version: stable
mutter_pkg: libmutter-10-dev
mutter_pkg: libmutter-14-dev
- version: unstable
mutter_pkg: libmutter-10-dev
mutter_pkg: libmutter-14-dev
- version: development-target
mutter_pkg: libmutter-14-dev
container:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ jobs:
GIT_USER_NAME: "elementaryBot"
GIT_USER_EMAIL: "[email protected]"
with:
release_branch: 'odin'
release_branch: 'noble'
4 changes: 2 additions & 2 deletions compositor/PantheonShell.vala
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace GreeterCompositor {
public Wl.Display wayland_display;

[CCode (cname = "meta_context_get_wayland_compositor")]
public extern static unowned Gala.FakeMetaWaylandCompositor from_context (Meta.Context context);
public extern static unowned GreeterCompositor.FakeMetaWaylandCompositor from_context (Meta.Context context);
}
#endif
public static inline unowned Wl.Display? get_display_from_context (Meta.Context context) {
Expand All @@ -24,7 +24,7 @@ namespace GreeterCompositor {

return (Wl.Display) compositor.get_wayland_display ();
#else
unowned FakeMetaWaylandCompositor compositor = Gala.FakeMetaWaylandCompositor.from_context (context);
unowned FakeMetaWaylandCompositor compositor = GreeterCompositor.FakeMetaWaylandCompositor.from_context (context);
if (compositor == null) {
return null;
}
Expand Down
4 changes: 2 additions & 2 deletions data/greeter.metainfo.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

<screenshots>
<screenshot type="default">
<image>https://raw.githubusercontent.com/elementary/greeter/7.0.0/data/screenshot.png</image>
<image>https://raw.githubusercontent.com/elementary/greeter/8.0.0/data/screenshot.png</image>
</screenshot>
</screenshots>

Expand All @@ -37,7 +37,7 @@
<update_contact>contact_at_elementary.io</update_contact>

<releases>
<release version="8.0.0" date="2024-05-21" urgency="medium">
<release version="8.0.0" date="2024-09-16" urgency="medium">
<description>
<p>New Features:</p>
<ul>
Expand Down
Binary file modified data/screenshot.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'io.elementary.greeter',
'vala', 'c',
version: '7.0.0',
version: '8.0.0',
meson_version: '>= 0.58.0'
)

Expand Down
7 changes: 3 additions & 4 deletions po/extra/nb.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: 2024-09-13 20:19+0000\n"
"PO-Revision-Date: 2023-07-08 01:09+0000\n"
"Last-Translator: Allan Nordhøy <[email protected]>\n"
"PO-Revision-Date: 2024-09-14 21:16+0000\n"
"Last-Translator: anonymous <[email protected]>\n"
"Language-Team: Norwegian Bokmål <https://l10n.elementary.io/projects/desktop/"
"greeter-extra/nb/>\n"
"Language: nb\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.17\n"
"X-Generator: Weblate 5.6.2\n"

#: data/greeter.metainfo.xml.in:9
msgid "Login &amp; Lock Screen"
Expand All @@ -28,7 +28,6 @@ msgid "Unlock or log in to your device"
msgstr "Lås opp eller logg inn på enheten din"

#: data/greeter.metainfo.xml.in:34
#, fuzzy
msgid "elementary, Inc."
msgstr "elementary, Inc."

Expand Down
14 changes: 8 additions & 6 deletions po/extra/nl.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ msgstr ""
"Project-Id-Version: extra\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-13 20:19+0000\n"
"PO-Revision-Date: 2024-08-17 17:19+0000\n"
"PO-Revision-Date: 2024-09-22 01:32+0000\n"
"Last-Translator: DutchVipperloid <[email protected]>\n"
"Language-Team: Dutch <https://l10n.elementary.io/projects/desktop/greeter-"
"extra/nl/>\n"
"Language-Team: Dutch <https://l10n.elementary.io/projects/desktop/"
"greeter-extra/nl/>\n"
"Language: nl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -37,11 +37,11 @@ msgstr "Nieuwe functies:"

#: data/greeter.metainfo.xml.in:44
msgid "Add blurred wallpaper as background"
msgstr ""
msgstr "Voeg vervaagde afbeelding toe als achtergrond"

#: data/greeter.metainfo.xml.in:45
msgid "Make Date and Time larger and bolder with softer shadows"
msgstr ""
msgstr "Maak datum en tijd groter en meer uitgesproken met zachtere schaduwen"

#: data/greeter.metainfo.xml.in:47 data/greeter.metainfo.xml.in:65
#: data/greeter.metainfo.xml.in:86 data/greeter.metainfo.xml.in:102
Expand All @@ -57,11 +57,13 @@ msgstr "Bijgewerkte vertalingen"

#: data/greeter.metainfo.xml.in:67
msgid "Prevent a potential issue with dialogs that use portals"
msgstr ""
msgstr "Voorkom een potentieel probleem met dialogen die portalen gebruiken"

#: data/greeter.metainfo.xml.in:68
msgid "Fix potential issues with incorrect keyboard layout being set"
msgstr ""
"Voorkom potentiële problemen wanneer een incorrecte toetsenbordindeling "
"wordt ingesteld"

#: data/greeter.metainfo.xml.in:100
msgid "Provide panel background color interface"
Expand Down
8 changes: 4 additions & 4 deletions po/extra/szl.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-13 20:19+0000\n"
"PO-Revision-Date: 2024-08-07 17:16+0000\n"
"PO-Revision-Date: 2024-09-14 21:16+0000\n"
"Last-Translator: anonymous <[email protected]>\n"
"Language-Team: Silesian <https://l10n.elementary.io/projects/desktop/greeter-"
"extra/szl/>\n"
"Language-Team: Silesian <https://l10n.elementary.io/projects/desktop/"
"greeter-extra/szl/>\n"
"Language: szl\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
Expand All @@ -24,7 +24,7 @@ msgstr ""

#: data/greeter.metainfo.xml.in:34
msgid "elementary, Inc."
msgstr ""
msgstr "elementary, Inc."

#: data/greeter.metainfo.xml.in:42 data/greeter.metainfo.xml.in:98
msgid "New Features:"
Expand Down
22 changes: 12 additions & 10 deletions po/extra/tr.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: 2024-09-13 20:19+0000\n"
"PO-Revision-Date: 2022-05-18 22:50+0000\n"
"Last-Translator: Özgür Baskin <queeup@zoho.com>\n"
"Language-Team: Turkish <https://l10n.elementary.io/projects/desktop/greeter-"
"extra/tr/>\n"
"PO-Revision-Date: 2024-09-21 10:16+0000\n"
"Last-Translator: Sinan Decron <sinanveyasinan@gmail.com>\n"
"Language-Team: Turkish <https://l10n.elementary.io/projects/desktop/"
"greeter-extra/tr/>\n"
"Language: tr\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 5.6.2\n"

#: data/greeter.metainfo.xml.in:9
msgid "Login &amp; Lock Screen"
Expand All @@ -37,11 +37,11 @@ msgstr "Yeni Özellikler:"

#: data/greeter.metainfo.xml.in:44
msgid "Add blurred wallpaper as background"
msgstr ""
msgstr "Arkaplan olarak bulanık duvar kağıdı ekle"

#: data/greeter.metainfo.xml.in:45
msgid "Make Date and Time larger and bolder with softer shadows"
msgstr ""
msgstr "Tarih ve Saati daha yumuşak gölgelerle daha büyük ve daha kalın yap"

#: data/greeter.metainfo.xml.in:47 data/greeter.metainfo.xml.in:65
#: data/greeter.metainfo.xml.in:86 data/greeter.metainfo.xml.in:102
Expand All @@ -57,15 +57,15 @@ msgstr "Çeviriler güncellendi"

#: data/greeter.metainfo.xml.in:67
msgid "Prevent a potential issue with dialogs that use portals"
msgstr ""
msgstr "Portalları kullanan iletişim kutularında olası bir sorunu önle"

#: data/greeter.metainfo.xml.in:68
msgid "Fix potential issues with incorrect keyboard layout being set"
msgstr ""
msgstr "Yanlış klavye düzeninin ayarlanmasıyla ilgili olası sorunları düzelt"

#: data/greeter.metainfo.xml.in:100
msgid "Provide panel background color interface"
msgstr ""
msgstr "Panel arka plan rengi arayüzü sağla"

#: data/greeter.metainfo.xml.in:111
msgid "Improvements:"
Expand All @@ -74,6 +74,8 @@ msgstr "İyileştirmeler:"
#: data/greeter.metainfo.xml.in:113
msgid "Fix a random issue where Greeter does not load correctly on boot"
msgstr ""
"Greeter'ın önyükleme sırasında düzgün yüklenmemesine neden olan rastgele bir "
"sorunu düzelt"

#~ msgid "Fix an issue with media keys"
#~ msgstr "Ortam anahtarlarıyla ilgili bir sorun giderildi"
Expand Down
13 changes: 8 additions & 5 deletions po/extra/uz.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@ msgstr ""
"Project-Id-Version: extra\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-09-13 20:19+0000\n"
"PO-Revision-Date: 2019-06-24 15:03-0700\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
"PO-Revision-Date: 2024-09-14 21:16+0000\n"
"Last-Translator: anonymous <[email protected]>\n"
"Language-Team: Uzbek <https://l10n.elementary.io/projects/desktop/"
"greeter-extra/uz/>\n"
"Language: uz\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=ASCII\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 5.6.2\n"

#: data/greeter.metainfo.xml.in:9
msgid "Login &amp; Lock Screen"
Expand All @@ -26,7 +29,7 @@ msgstr ""

#: data/greeter.metainfo.xml.in:34
msgid "elementary, Inc."
msgstr ""
msgstr "elementary Inc."

#: data/greeter.metainfo.xml.in:42 data/greeter.metainfo.xml.in:98
msgid "New Features:"
Expand Down
6 changes: 3 additions & 3 deletions po/extra/zh_TW.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: 2024-09-13 20:19+0000\n"
"PO-Revision-Date: 2024-09-06 10:13+0000\n"
"PO-Revision-Date: 2024-09-19 10:09+0000\n"
"Last-Translator: Kisaragi Hiu <[email protected]>\n"
"Language-Team: Chinese (Traditional) <https://l10n.elementary.io/projects/"
"desktop/greeter-extra/zh_Hant/>\n"
Expand Down Expand Up @@ -57,7 +57,7 @@ msgstr "更新翻譯"

#: data/greeter.metainfo.xml.in:67
msgid "Prevent a potential issue with dialogs that use portals"
msgstr "防止一個使用 portal 的對話框可能會遇到的問題"
msgstr "防止使用桌面入口的對話框可能會遇到的某個問題"

#: data/greeter.metainfo.xml.in:68
msgid "Fix potential issues with incorrect keyboard layout being set"
Expand All @@ -73,7 +73,7 @@ msgstr "改善項目:"

#: data/greeter.metainfo.xml.in:113
msgid "Fix a random issue where Greeter does not load correctly on boot"
msgstr "修正一個 greeter 在開機時會隨機無法正確載入的問題"
msgstr "修正 greeter 在開機時會隨機無法正確載入的問題"

#~ msgid "Greeter"
#~ msgstr "歡迎程式"

0 comments on commit b351ff3

Please sign in to comment.