Skip to content

Commit

Permalink
Merge branch 'master' into danirabbit/installer-actionarea
Browse files Browse the repository at this point in the history
  • Loading branch information
danirabbit authored May 20, 2024
2 parents a465d90 + dbb5b35 commit f4912dc
Show file tree
Hide file tree
Showing 203 changed files with 763 additions and 774 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Install Dependencies
run: |
apt update
apt install -y desktop-file-utils gettext libdistinst-dev libgtk-3-dev libgee-0.8-dev libgranite-dev libhandy-1-dev libxml2-dev libjson-glib-dev libgnomekbd-dev libpwquality-dev libxml2-utils meson valac
apt install -y desktop-file-utils gettext libdistinst-dev libgtk-3-dev libgee-0.8-dev libgranite-dev libhandy-1-dev libxml2-dev libjson-glib-dev libpwquality-dev libxml2-utils meson valac
- name: Build
run: |
meson build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gettext.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
token: ${{ secrets.GIT_USER_TOKEN }}

- name: Update Translation Files
uses: elementary/actions/gettext-template@next
uses: elementary/actions/gettext-template@main
env:
GIT_USER_TOKEN: ${{ secrets.GIT_USER_TOKEN }}
GIT_USER_NAME: "elementaryBot"
Expand Down
8 changes: 8 additions & 0 deletions data/disk-bar-fallback.css
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ levelbar block:not(:last-child) {
levelbar block.legend {
border-radius: 50%;
border-style: solid;
min-height: 14px;
min-width: 14px;
}

levelbar block.swap {
Expand Down Expand Up @@ -84,9 +86,15 @@ levelbar block.unused {
}

levelbar block image {
min-height: 16px; /* Preserve height when empty */
padding: 0.5em;
-gtk-icon-palette: error #fff, success #fff, warning #fff;
-gtk-icon-shadow:
0 1px 1px alpha(#000, 0.2),
0 1px 3px alpha(#000, 0.1);
}

levelbar .h4 {
opacity: 1;
padding: 0;
}
Binary file modified data/wallpaper.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ granite_dep = dependency('granite', version: '>=0.5')
handy_dep = dependency('libhandy-1', version: '>=0.90.0')
json_glib_dep = dependency('json-glib-1.0')
xml2_dep = dependency('libxml-2.0')
gnome_keyboard_dep = dependency('libgnomekbd')
gnome_keyboard_ui_dep = meson.get_compiler('c').find_library('gnomekbdui')
pwquality_dep = dependency('pwquality')
systemd_dep = dependency('systemd')

Expand Down
1 change: 0 additions & 1 deletion po/POTFILES
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ src/Widgets/DecryptMenu.vala
src/Widgets/DiskBar.vala
src/Widgets/DiskGrid.vala
src/Widgets/InstallTypeGrid.vala
src/Widgets/LayoutWidget.vala
src/Widgets/PartitionBar.vala
src/Widgets/PartitionMenu.vala
src/Widgets/VariantWidget.vala
4 changes: 2 additions & 2 deletions po/af.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2016-10-12 01:29+0200\n"
"Last-Translator: Maxwell Barvian <Unknown>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -44,7 +44,7 @@ msgstr ""
msgid "Test mode switch user"
msgstr ""

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr ""
Expand Down
4 changes: 2 additions & 2 deletions po/ak.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2017-04-01 19:21+0000\n"
"Last-Translator: Lawrence Aberba <[email protected]>\n"
"Language-Team: ak (generated) <http://weblate.elementary.io/projects/desktop/"
Expand Down Expand Up @@ -46,7 +46,7 @@ msgstr ""
msgid "Test mode switch user"
msgstr ""

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr ""
Expand Down
4 changes: 2 additions & 2 deletions po/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2021-09-04 16:04+0000\n"
"Last-Translator: Muhammad Al-Jayyousi <[email protected]>\n"
"Language-Team: Arabic <https://l10n.elementary.io/projects/installer/"
Expand Down Expand Up @@ -50,7 +50,7 @@ msgstr "أعد تشغيل الجهاز في الوضع التجريبي"
msgid "Test mode switch user"
msgstr "قم بتبديل الحسابات في الوضع التجريبي"

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr "%s…"
Expand Down
4 changes: 2 additions & 2 deletions po/az.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2016-10-11 19:49+0200\n"
"Last-Translator: Maxwell Barvian <Unknown>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -44,7 +44,7 @@ msgstr ""
msgid "Test mode switch user"
msgstr ""

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr ""
Expand Down
4 changes: 2 additions & 2 deletions po/be.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2016-10-11 19:51+0200\n"
"Last-Translator: Maxwell Barvian <Unknown>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -44,7 +44,7 @@ msgstr ""
msgid "Test mode switch user"
msgstr ""

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr ""
Expand Down
4 changes: 2 additions & 2 deletions po/bg.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2022-04-20 09:24+0000\n"
"Last-Translator: David Hewitt <[email protected]>\n"
"Language-Team: Bulgarian <https://l10n.elementary.io/projects/installer/"
Expand Down Expand Up @@ -48,7 +48,7 @@ msgstr "Рестарт на тестов режим"
msgid "Test mode switch user"
msgstr "Смяна на потребител в тестов режим"

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr "%s …"
Expand Down
4 changes: 2 additions & 2 deletions po/bn.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2022-04-20 09:20+0000\n"
"Last-Translator: David Hewitt <[email protected]>\n"
"Language-Team: Bengali <https://l10n.elementary.io/projects/installer/"
Expand Down Expand Up @@ -48,7 +48,7 @@ msgstr ""
msgid "Test mode switch user"
msgstr ""

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr ""
Expand Down
4 changes: 2 additions & 2 deletions po/bs.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2022-04-20 09:20+0000\n"
"Last-Translator: David Hewitt <[email protected]>\n"
"Language-Team: Bosnian <https://l10n.elementary.io/projects/installer/"
Expand Down Expand Up @@ -49,7 +49,7 @@ msgstr "Ponovno pokretanje u testnom načinu rada"
msgid "Test mode switch user"
msgstr "Promjena korisnika u testnom načinu rada"

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr "%s…"
Expand Down
4 changes: 2 additions & 2 deletions po/ca.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2024-05-04 07:13+0000\n"
"Last-Translator: David M <[email protected]>\n"
"Language-Team: Catalan <https://l10n.elementary.io/projects/installer/"
Expand Down Expand Up @@ -48,7 +48,7 @@ msgstr "Reinici del mode de prova"
msgid "Test mode switch user"
msgstr "Canvi d'usuari del mode de prova"

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr "%s…"
Expand Down
4 changes: 2 additions & 2 deletions po/ckb.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2022-09-10 12:23+0000\n"
"Last-Translator: Aga Ismael <[email protected]>\n"
"Language-Team: Kurdish (Central) <https://l10n.elementary.io/projects/"
Expand Down Expand Up @@ -50,7 +50,7 @@ msgstr "پێکردنەوەی دۆخی تاقیکردنەوە"
msgid "Test mode switch user"
msgstr "گۆڕینی بەکارهێنەر لە دۆخی تاقیکردنەوەدا"

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr "%s…"
Expand Down
4 changes: 2 additions & 2 deletions po/cs.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2023-08-30 12:08+0000\n"
"Last-Translator: hnklp <[email protected]>\n"
"Language-Team: Czech <https://l10n.elementary.io/projects/installer/"
Expand Down Expand Up @@ -48,7 +48,7 @@ msgstr "Restartovat v rámci testovacího režimu"
msgid "Test mode switch user"
msgstr "Přepnout uživatele v rámci testovacího režimu"

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr "%s…"
Expand Down
4 changes: 2 additions & 2 deletions po/cv.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2016-05-27 15:29+0000\n"
"Last-Translator: Maxwell Barvian <Unknown>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
Expand Down Expand Up @@ -44,7 +44,7 @@ msgstr ""
msgid "Test mode switch user"
msgstr ""

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr ""
Expand Down
4 changes: 2 additions & 2 deletions po/da.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2021-06-05 23:54+0000\n"
"Last-Translator: Rantyrant <[email protected]>\n"
"Language-Team: Danish <https://l10n.elementary.io/projects/installer/"
Expand Down Expand Up @@ -50,7 +50,7 @@ msgstr "Demo tilstand genstart"
msgid "Test mode switch user"
msgstr "Test tilstand skift bruger"

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr "%s…"
Expand Down
14 changes: 5 additions & 9 deletions po/de.po
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: pantheon-calculator\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"PO-Revision-Date: 2023-10-05 22:08+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2024-05-10 22:13+0000\n"
"Last-Translator: Uwe S <[email protected]>\n"
"Language-Team: German <https://l10n.elementary.io/projects/installer/"
"installer/de/>\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.17\n"
"X-Generator: Weblate 5.5\n"
"X-Launchpad-Export-Date: 2016-09-27 06:40+0000\n"

#: src/Application.vala:42
Expand Down Expand Up @@ -53,7 +53,7 @@ msgstr "Testbetrieb neu starten"
msgid "Test mode switch user"
msgstr "Testmodus: Benutzer wechseln"

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr "%s …"
Expand Down Expand Up @@ -363,15 +363,11 @@ msgstr "Sie müssen zumindest eine <b>Wurzelpartition (/)</b> wählen."

#. Device is in EFI mode, so we also require a boot partition
#: src/Views/PartitioningView.vala:62
#, fuzzy
#| msgid ""
#| "You must at least select a <b>Root (/)</b> partition and a <b>Boot (/boot/"
#| "efi)</b> partition."
msgid ""
"You must at least select a <b>Root (/)</b> partition and an optional <b>Boot "
"(/boot/efi)</b> partition."
msgstr ""
"Sie müssen zumindest eine <b>Wurzelpartition (/)</b> und eine "
"Sie müssen zumindest eine <b>Wurzelpartition (/)</b> und eine optionale "
"<b>Startpartition (/boot/efi)</b> wählen."

#: src/Views/PartitioningView.vala:66
Expand Down
4 changes: 2 additions & 2 deletions po/el.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2016-10-12 01:34+0200\n"
"Last-Translator: Maxwell Barvian <Unknown>\n"
"Language-Team: \n"
Expand Down Expand Up @@ -44,7 +44,7 @@ msgstr ""
msgid "Test mode switch user"
msgstr ""

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr ""
Expand Down
4 changes: 2 additions & 2 deletions po/en_AU.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2017-07-11 12:01+0000\n"
"Last-Translator: Mattias Ezequiel Mignone <[email protected]>\n"
"Language-Team: English (Australia) <https://l10n.elementary.io/projects/"
Expand Down Expand Up @@ -46,7 +46,7 @@ msgstr ""
msgid "Test mode switch user"
msgstr ""

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr ""
Expand Down
4 changes: 2 additions & 2 deletions po/en_CA.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-05-02 03:15+0000\n"
"POT-Creation-Date: 2024-05-11 02:29+0000\n"
"PO-Revision-Date: 2022-04-20 09:20+0000\n"
"Last-Translator: David Hewitt <[email protected]>\n"
"Language-Team: English (Canada) <https://l10n.elementary.io/projects/"
Expand Down Expand Up @@ -48,7 +48,7 @@ msgstr "Test mode reboot"
msgid "Test mode switch user"
msgstr "Test mode switch user"

#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:218
#: src/Helpers/LocaleHelper.vala:121 src/Views/KeyboardLayoutView.vala:217
#, c-format
msgid "%s…"
msgstr "%s…"
Expand Down
Loading

0 comments on commit f4912dc

Please sign in to comment.