Skip to content

Commit

Permalink
Merge branch 'main' into david_diskbar_fixups
Browse files Browse the repository at this point in the history
  • Loading branch information
davidmhewitt authored Dec 11, 2024
2 parents 80e7414 + 1b0bd1c commit b5ad17a
Show file tree
Hide file tree
Showing 199 changed files with 4,970 additions and 5,312 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 libadwaita-1-dev libdistinst-dev libgee-0.8-dev libgranite-7-dev libgtk-4-dev libxkbregistry-dev libjson-glib-dev libpwquality-dev meson valac
apt install -y desktop-file-utils gettext libadwaita-1-dev libdistinst-dev libgee-0.8-dev libgranite-7-dev libgtk-4-dev libxkbregistry-dev libjson-glib-dev libpantheon-wayland-1-dev libpwquality-dev meson valac
- name: Build and Test
env:
DESTDIR: out
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ You'll need the following dependencies:
- libgee-0.8-dev
- libadwaita-1-dev >=1.4.0
- libjson-glib-dev
- libpantheon-wayland-1-dev
- libpwquality-dev
- libxkbregistry-dev
- [distinst](https://github.com/pop-os/distinst/)
Expand Down
12 changes: 12 additions & 0 deletions data/installer.metainfo.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,18 @@
<update_contact>contact_at_elementary.io</update_contact>

<releases>
<release version="8.1.1" date="2024-10-23" urgency="medium">
<description>
<p>Improvements:</p>
<ul>
<li>Updated translations</li>
</ul>
</description>
<issues>
<issue url="https://github.com/elementary/installer/issues/758">Installer UI is not centered</issue>
</issues>
</release>

<release version="8.1.0" date="2024-10-21" urgency="medium">
<description>
<p>Improvements:</p>
Expand Down
1 change: 1 addition & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ adw_dep = dependency('libadwaita-1', version: '>=1.4.0')
json_glib_dep = dependency('json-glib-1.0')
xkbregistry_dep = dependency('xkbregistry')
pwquality_dep = dependency('pwquality')
pantheon_wayland_dep = dependency('pantheon-wayland-1')
systemd_dep = dependency('systemd')

installer_backend = get_option('installer_backend')
Expand Down
47 changes: 17 additions & 30 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-10-23 21:47+0000\n"
"POT-Creation-Date: 2024-11-22 18:11+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 @@ -163,72 +163,59 @@ msgid ""
"respective licenses and terms of use."
msgstr ""

#: src/Views/DriversView.vala:75 src/Views/EncryptView.vala:143
#: src/Views/KeyboardLayoutView.vala:54 src/Views/PartitioningView.vala:141
#: src/Views/TryInstallView.vala:79
#: src/Views/DriversView.vala:75 src/Views/KeyboardLayoutView.vala:54
#: src/Views/PartitioningView.vala:141 src/Views/TryInstallView.vala:79
msgid "Back"
msgstr ""

#: src/Views/DriversView.vala:79
msgid "Erase and Install"
msgstr ""

#: src/Views/EncryptView.vala:26
#: src/Views/EncryptView.vala:27
msgid "Don’t Encrypt"
msgstr ""

#: src/Views/EncryptView.vala:50
#: src/Views/EncryptView.vala:51
msgid "Enable Drive Encryption"
msgstr ""

#: src/Views/EncryptView.vala:54
msgid ""
"Encrypt this device's drive if required for added protection, but be sure "
"you understand:"
msgstr ""

#: src/Views/EncryptView.vala:61
#: src/Views/EncryptView.vala:56
msgid ""
"Data will only be protected from others with physical access to this device "
"when it is shut down."
msgstr ""

#: src/Views/EncryptView.vala:67
#: src/Views/EncryptView.vala:62
msgid ""
"The encryption password will be required each time this device is turned on. "
"Store it somewhere safe."
"If you forget it, <b>you will not be able to recover data.</b>"
msgstr ""

#: src/Views/EncryptView.vala:73
#: src/Views/EncryptView.vala:68
msgid ""
"A built-in or USB keyboard will be required to type the encryption password "
"each time this device is turned on."
msgstr ""

#: src/Views/EncryptView.vala:87
msgid ""
"If you forget the encryption password, <b>you will not be able to recover "
"data.</b> This is a unique password for this device, not the password for "
"your user account."
#: src/Views/EncryptView.vala:73
msgid "Encryption Password"
msgstr ""

#: src/Views/EncryptView.vala:95
msgid "Choose Encryption Password"
#: src/Views/EncryptView.vala:74
msgid ""
"A unique password for this device; not the password for your user account."
msgstr ""

#: src/Views/EncryptView.vala:109
#: src/Views/EncryptView.vala:88
msgid "Confirm Password"
msgstr ""

#: src/Views/EncryptView.vala:145
msgid "Choose Password"
msgstr ""

#: src/Views/EncryptView.vala:168
#: src/Views/EncryptView.vala:116
msgid "Set Encryption Password"
msgstr ""

#: src/Views/EncryptView.vala:236
#: src/Views/EncryptView.vala:191
msgid "Passwords do not match"
msgstr ""

Expand Down
47 changes: 17 additions & 30 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-10-23 21:47+0000\n"
"POT-Creation-Date: 2024-11-22 18:11+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 @@ -165,72 +165,59 @@ msgid ""
"respective licenses and terms of use."
msgstr ""

#: src/Views/DriversView.vala:75 src/Views/EncryptView.vala:143
#: src/Views/KeyboardLayoutView.vala:54 src/Views/PartitioningView.vala:141
#: src/Views/TryInstallView.vala:79
#: src/Views/DriversView.vala:75 src/Views/KeyboardLayoutView.vala:54
#: src/Views/PartitioningView.vala:141 src/Views/TryInstallView.vala:79
msgid "Back"
msgstr ""

#: src/Views/DriversView.vala:79
msgid "Erase and Install"
msgstr ""

#: src/Views/EncryptView.vala:26
#: src/Views/EncryptView.vala:27
msgid "Don’t Encrypt"
msgstr ""

#: src/Views/EncryptView.vala:50
#: src/Views/EncryptView.vala:51
msgid "Enable Drive Encryption"
msgstr ""

#: src/Views/EncryptView.vala:54
msgid ""
"Encrypt this device's drive if required for added protection, but be sure "
"you understand:"
msgstr ""

#: src/Views/EncryptView.vala:61
#: src/Views/EncryptView.vala:56
msgid ""
"Data will only be protected from others with physical access to this device "
"when it is shut down."
msgstr ""

#: src/Views/EncryptView.vala:67
#: src/Views/EncryptView.vala:62
msgid ""
"The encryption password will be required each time this device is turned on. "
"Store it somewhere safe."
"If you forget it, <b>you will not be able to recover data.</b>"
msgstr ""

#: src/Views/EncryptView.vala:73
#: src/Views/EncryptView.vala:68
msgid ""
"A built-in or USB keyboard will be required to type the encryption password "
"each time this device is turned on."
msgstr ""

#: src/Views/EncryptView.vala:87
msgid ""
"If you forget the encryption password, <b>you will not be able to recover "
"data.</b> This is a unique password for this device, not the password for "
"your user account."
#: src/Views/EncryptView.vala:73
msgid "Encryption Password"
msgstr ""

#: src/Views/EncryptView.vala:95
msgid "Choose Encryption Password"
#: src/Views/EncryptView.vala:74
msgid ""
"A unique password for this device; not the password for your user account."
msgstr ""

#: src/Views/EncryptView.vala:109
#: src/Views/EncryptView.vala:88
msgid "Confirm Password"
msgstr ""

#: src/Views/EncryptView.vala:145
msgid "Choose Password"
msgstr ""

#: src/Views/EncryptView.vala:168
#: src/Views/EncryptView.vala:116
msgid "Set Encryption Password"
msgstr ""

#: src/Views/EncryptView.vala:236
#: src/Views/EncryptView.vala:191
msgid "Passwords do not match"
msgstr ""

Expand Down
75 changes: 42 additions & 33 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-10-23 21:47+0000\n"
"POT-Creation-Date: 2024-11-22 18:11+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 @@ -176,82 +176,78 @@ msgid ""
"respective licenses and terms of use."
msgstr ""

#: src/Views/DriversView.vala:75 src/Views/EncryptView.vala:143
#: src/Views/KeyboardLayoutView.vala:54 src/Views/PartitioningView.vala:141
#: src/Views/TryInstallView.vala:79
#: src/Views/DriversView.vala:75 src/Views/KeyboardLayoutView.vala:54
#: src/Views/PartitioningView.vala:141 src/Views/TryInstallView.vala:79
msgid "Back"
msgstr "ارجع"

#: src/Views/DriversView.vala:79
msgid "Erase and Install"
msgstr "امسح وثبت"

#: src/Views/EncryptView.vala:26
#: src/Views/EncryptView.vala:27
msgid "Don’t Encrypt"
msgstr "لا تشفر"

#: src/Views/EncryptView.vala:50
#: src/Views/EncryptView.vala:51
msgid "Enable Drive Encryption"
msgstr "قم بتشفير وسيط التخزين"

#: src/Views/EncryptView.vala:54
msgid ""
"Encrypt this device's drive if required for added protection, but be sure "
"you understand:"
msgstr ""
"قم بتشفير وسيط تخزين هذا الجهاز إذا كان مطلوباً لحماية إضافية، ولكن تأكد من "
"فهمك للتالي:"

#: src/Views/EncryptView.vala:61
#: src/Views/EncryptView.vala:56
msgid ""
"Data will only be protected from others with physical access to this device "
"when it is shut down."
msgstr ""
"البيانات ستكون محمية فقط من الآخرين الذين لديهم وصول مادي للجهاز عندما يكون "
"مطفئاً."

#: src/Views/EncryptView.vala:67
#: src/Views/EncryptView.vala:62
#, fuzzy
#| msgid ""
#| "The encryption password will be required each time this device is turned "
#| "on. Store it somewhere safe."
msgid ""
"The encryption password will be required each time this device is turned on. "
"Store it somewhere safe."
"If you forget it, <b>you will not be able to recover data.</b>"
msgstr ""
"كلمة مرور التشفير ستكون مطلوبة في كل مرة تقوم بفتح الجهاز. احفظها في مكان "
"آمن."

#: src/Views/EncryptView.vala:73
#: src/Views/EncryptView.vala:68
msgid ""
"A built-in or USB keyboard will be required to type the encryption password "
"each time this device is turned on."
msgstr ""
"سيكون من المطلوب وجود لوحة مفاتيح مدمجة أو موصولة بواسطة USB للتمكن من كتابة "
"كلمة مرور التشفير في كل مرة يتم تشغيل هذا الجهاز."

#: src/Views/EncryptView.vala:87
#: src/Views/EncryptView.vala:73
#, fuzzy
#| msgid "Set Encryption Password"
msgid "Encryption Password"
msgstr "اضبط كلمة مرور التشفير"

#: src/Views/EncryptView.vala:74
#, fuzzy
#| msgid ""
#| "If you forget the encryption password, <b>you will not be able to recover "
#| "data.</b> This is a unique password for this device, not the password for "
#| "your user account."
msgid ""
"If you forget the encryption password, <b>you will not be able to recover "
"data.</b> This is a unique password for this device, not the password for "
"your user account."
"A unique password for this device; not the password for your user account."
msgstr ""
"إذا نسيت كلمة مرور التشفير، <b>لن تكون قادراً على استعادة البيانات.</b> هذه "
"كلمة مرور مميزة لوسيط التخزين الخاص بك، وليست كلمة المرور الخاصة بحسابك."

#: src/Views/EncryptView.vala:95
msgid "Choose Encryption Password"
msgstr "اختر كلمة مرور للتشفير"

#: src/Views/EncryptView.vala:109
#: src/Views/EncryptView.vala:88
msgid "Confirm Password"
msgstr "قم بتأكيد كلمة المرور"

#: src/Views/EncryptView.vala:145
msgid "Choose Password"
msgstr "اختر كلمة مرور"

#: src/Views/EncryptView.vala:168
#: src/Views/EncryptView.vala:116
msgid "Set Encryption Password"
msgstr "اضبط كلمة مرور التشفير"

#: src/Views/EncryptView.vala:236
#: src/Views/EncryptView.vala:191
msgid "Passwords do not match"
msgstr "كلمتا المرور غير متطابقتين"

Expand Down Expand Up @@ -582,6 +578,19 @@ msgstr "الافتراضي (ext4)"
msgid "Custom value must begin with /"
msgstr ""

#~ msgid ""
#~ "Encrypt this device's drive if required for added protection, but be sure "
#~ "you understand:"
#~ msgstr ""
#~ "قم بتشفير وسيط تخزين هذا الجهاز إذا كان مطلوباً لحماية إضافية، ولكن تأكد "
#~ "من فهمك للتالي:"

#~ msgid "Choose Encryption Password"
#~ msgstr "اختر كلمة مرور للتشفير"

#~ msgid "Choose Password"
#~ msgstr "اختر كلمة مرور"

#~ msgid ""
#~ "Your device is running on battery power. It's recommended to be plugged "
#~ "in while installing."
Expand Down
Loading

0 comments on commit b5ad17a

Please sign in to comment.