Skip to content

Commit

Permalink
Merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
danirabbit committed Oct 9, 2023
2 parents 725a551 + d1f3f83 commit 8634643
Show file tree
Hide file tree
Showing 186 changed files with 4,163 additions and 3,582 deletions.
10 changes: 7 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,30 @@ jobs:
run: |
apt update
apt install -y gettext libadwaita-1-dev libappstream-dev libflatpak-dev libgee-0.8-dev libgranite-7-dev libgtk-4-dev libjson-glib-dev libpackagekit-glib2-dev libsoup2.4-dev libxml2-dev libxml2-utils libpolkit-gobject-1-dev meson valac
- name: Build
- name: Build and Test
env:
DESTDIR: out
run: |
meson build
ninja -C build install
ninja -C build test
- name: Build (Fedora)
- name: Build and Test (Fedora)
env:
DESTDIR: out
run: |
meson configure -Dcurated=false -Dpayments=false build
ninja -C build install
ninja -C build test
- name: Build (Pop!_Shop)
- name: Build and Test (Pop!_Shop)
env:
DESTDIR: out
run: |
meson configure -Dcurated=false -Dpayments=false -Dsharing=false -Dname=Pop\!_Shop build
ninja -C build install
ninja -C build test
- name: Build (Flatpak-only)
env:
Expand Down
9 changes: 5 additions & 4 deletions data/appcenter.metainfo.xml.in
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@
<screenshots>
<screenshot type="default">
<caption>Discover new apps</caption>
<image>https://raw.githubusercontent.com/elementary/appcenter/7.3.0/data/screenshot.png</image>
<image>https://raw.githubusercontent.com/elementary/appcenter/7.4.0/data/screenshot.png</image>
</screenshot>
<screenshot>
<caption>Stay up to date</caption>
<image>https://raw.githubusercontent.com/elementary/appcenter/7.3.0/data/screenshot-updates.png</image>
<image>https://raw.githubusercontent.com/elementary/appcenter/7.4.0/data/screenshot-updates.png</image>
</screenshot>
<screenshot>
<caption>Pay what you can to support developers</caption>
<image>https://raw.githubusercontent.com/elementary/appcenter/7.3.0/data/screenshot-payment.png</image>
<image>https://raw.githubusercontent.com/elementary/appcenter/7.4.0/data/screenshot-payment.png</image>
</screenshot>
</screenshots>

Expand Down Expand Up @@ -63,7 +63,7 @@
<update_contact>contact_at_elementary.io</update_contact>

<releases>
<release version="7.4.0" date="2023-09-14">
<release version="7.4.0" date="2023-09-18">
<description>
<p>New features:</p>
<ul>
Expand All @@ -77,6 +77,7 @@
</description>
<issues>
<issue url="https://github.com/elementary/appcenter/issues/2059">Search bar refreshes when typing over existing text</issue>
<issue url="https://github.com/elementary/appcenter/issues/2047">Warn if apps can send notifications directly</issue>
<issue url="https://github.com/elementary/appcenter/issues/1987">AppCenter search box dropping chatacters</issue>
<issue url="https://github.com/elementary/appcenter/issues/1947">Changing install source adds to navigation stack</issue>
</issues>
Expand Down
10 changes: 8 additions & 2 deletions meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'io.elementary.appcenter',
'vala', 'c',
version: '7.3.0',
version: '7.4.0',
meson_version: '>=0.57.0'
)

Expand All @@ -19,6 +19,7 @@ vapi_dir = join_paths(meson.current_source_dir(), 'vapi')
add_project_arguments(['--vapidir', vapi_dir], language: 'vala')

glib = dependency ('glib-2.0')
gobject = dependency ('gobject-2.0')
gee = dependency ('gee-0.8')
gtk = dependency ('gtk4')
granite = dependency ('granite-7', version: '>=7.3.0')
Expand All @@ -33,8 +34,12 @@ posix = meson.get_compiler('vala').find_library('posix')

dbus = dependency ('dbus-1')

dependencies = [
core_deps = [
glib,
gobject,
]

dependencies = core_deps + [
gee,
gtk,
granite,
Expand Down Expand Up @@ -68,5 +73,6 @@ conf_data.set('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedi
subdir('data')
subdir('src')
subdir('po')
subdir('test')

gnome.post_install(glib_compile_schemas: true)
28 changes: 14 additions & 14 deletions po/af.po
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-15 01:27+0000\n"
"POT-Creation-Date: 2023-09-17 10:45+0000\n"
"PO-Revision-Date: 2022-04-20 09:08+0000\n"
"Last-Translator: David Hewitt <[email protected]>\n"
"Language-Team: Afrikaans <https://l10n.elementary.io/projects/appcenter/appcenter/af/>\n"
Expand Down Expand Up @@ -957,50 +957,50 @@ msgstr ""
msgid "Fund the development of this app"
msgstr ""

#: src/Views/AppListUpdateView.vala:47
#: src/Views/AppListUpdateView.vala:50
msgid "Checking for Updates"
msgstr ""

#: src/Views/AppListUpdateView.vala:48
#: src/Views/AppListUpdateView.vala:51
msgid "Downloading a list of available updates to the OS and installed apps"
msgstr ""

#: src/Views/AppListUpdateView.vala:74
#: src/Views/AppListUpdateView.vala:77
msgid "Update All"
msgstr ""

#: src/Views/AppListUpdateView.vala:105
#: src/Views/AppListUpdateView.vala:101
msgid "Up to Date"
msgstr ""

#: src/Views/AppListUpdateView.vala:127
msgid "A restart is required to finish installing updates"
msgstr ""

#: src/Views/AppListUpdateView.vala:113
#: src/Views/AppListUpdateView.vala:135
msgid "Restart Now"
msgstr ""

#: src/Views/AppListUpdateView.vala:125
#: src/Views/AppListUpdateView.vala:147
msgid "Requesting a restart failed. Restart manually to finish installing updates"
msgstr ""

#: src/Views/AppListUpdateView.vala:200
#: src/Views/AppListUpdateView.vala:245
#, c-format
msgid "%u Update Available"
msgid_plural "%u Updates Available"
msgstr[0] ""
msgstr[1] ""

#: src/Views/AppListUpdateView.vala:211
#: src/Views/AppListUpdateView.vala:256
#, c-format
msgid "Everything is up to date. Last checked %s."
msgstr ""

#: src/Views/AppListUpdateView.vala:363
#: src/Views/AppListUpdateView.vala:382
msgid "Drivers"
msgstr ""

#: src/Views/AppListUpdateView.vala:376
msgid "Up to Date"
msgstr ""

#: src/Views/AuthorView.vala:31
#, c-format
msgid "Other Apps by %s"
Expand Down
28 changes: 14 additions & 14 deletions po/ak.po
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Akan (AppCenter)\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-15 01:27+0000\n"
"POT-Creation-Date: 2023-09-17 10:45+0000\n"
"PO-Revision-Date: 2023-02-14 14:20+0000\n"
"Last-Translator: David Hewitt <[email protected]>\n"
"Language-Team: Akan <https://l10n.elementary.io/projects/appcenter/appcenter/ak/>\n"
Expand Down Expand Up @@ -969,54 +969,54 @@ msgstr ""
msgid "Fund the development of this app"
msgstr ""

#: src/Views/AppListUpdateView.vala:47
#: src/Views/AppListUpdateView.vala:50
#, fuzzy
#| msgid "Searching for updates…"
msgid "Checking for Updates"
msgstr "Ɛrehwɛ sɛ biribi foforɔ aba anaa…"

#: src/Views/AppListUpdateView.vala:48
#: src/Views/AppListUpdateView.vala:51
msgid "Downloading a list of available updates to the OS and installed apps"
msgstr ""

#: src/Views/AppListUpdateView.vala:74
#: src/Views/AppListUpdateView.vala:77
msgid "Update All"
msgstr "Twɛ Foforɔ No Nyinaa"

#: src/Views/AppListUpdateView.vala:105
#: src/Views/AppListUpdateView.vala:101
msgid "Up to Date"
msgstr "Nea Ɛyɛ Foforɔ a Ɛtwa Toɔ"

#: src/Views/AppListUpdateView.vala:127
#, fuzzy
#| msgid "A restart is required to complete the installation of updates"
msgid "A restart is required to finish installing updates"
msgstr "Ɛhia sɛ wodum sɔ ansa atumi de dwumadie ahoroɔ no agu so awie"

#: src/Views/AppListUpdateView.vala:113
#: src/Views/AppListUpdateView.vala:135
msgid "Restart Now"
msgstr "Dum Sɔ Siesie Ara"

#: src/Views/AppListUpdateView.vala:125
#: src/Views/AppListUpdateView.vala:147
msgid "Requesting a restart failed. Restart manually to finish installing updates"
msgstr ""

#: src/Views/AppListUpdateView.vala:200
#: src/Views/AppListUpdateView.vala:245
#, c-format
msgid "%u Update Available"
msgid_plural "%u Updates Available"
msgstr[0] "Foforɔ %u Na Aba"
msgstr[1] "Afoforɔ %u Na Aba"

#: src/Views/AppListUpdateView.vala:211
#: src/Views/AppListUpdateView.vala:256
#, c-format
msgid "Everything is up to date. Last checked %s."
msgstr ""

#: src/Views/AppListUpdateView.vala:363
#: src/Views/AppListUpdateView.vala:382
msgid "Drivers"
msgstr "Drivers"

#: src/Views/AppListUpdateView.vala:376
msgid "Up to Date"
msgstr "Nea Ɛyɛ Foforɔ a Ɛtwa Toɔ"

#: src/Views/AuthorView.vala:31
#, c-format
msgid "Other Apps by %s"
Expand Down
28 changes: 14 additions & 14 deletions po/ar.po
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-09-15 01:27+0000\n"
"POT-Creation-Date: 2023-09-17 10:45+0000\n"
"PO-Revision-Date: 2023-02-16 09:45+0000\n"
"Last-Translator: David Hewitt <[email protected]>\n"
"Language-Team: Arabic <https://l10n.elementary.io/projects/appcenter/appcenter/ar/>\n"
Expand Down Expand Up @@ -991,31 +991,35 @@ msgstr "قم بالتمويل"
msgid "Fund the development of this app"
msgstr "ادعم عملية تطوير هذا التطبيق"

#: src/Views/AppListUpdateView.vala:47
#: src/Views/AppListUpdateView.vala:50
msgid "Checking for Updates"
msgstr "جاري البحث عن تحديثات"

#: src/Views/AppListUpdateView.vala:48
#: src/Views/AppListUpdateView.vala:51
msgid "Downloading a list of available updates to the OS and installed apps"
msgstr "قيد تحميل قائمة من التحديثات المتوفرة لنظام التشغيل والتطبيقات المثبتة"

#: src/Views/AppListUpdateView.vala:74
#: src/Views/AppListUpdateView.vala:77
msgid "Update All"
msgstr "حدث الكل"

#: src/Views/AppListUpdateView.vala:105
#: src/Views/AppListUpdateView.vala:101
msgid "Up to Date"
msgstr "محدث بالكامل"

#: src/Views/AppListUpdateView.vala:127
msgid "A restart is required to finish installing updates"
msgstr "إعادة التشغيل مطلوبة لإنهاء تثبيت التحديثات"

#: src/Views/AppListUpdateView.vala:113
#: src/Views/AppListUpdateView.vala:135
msgid "Restart Now"
msgstr "أعد التشغيل الآن"

#: src/Views/AppListUpdateView.vala:125
#: src/Views/AppListUpdateView.vala:147
msgid "Requesting a restart failed. Restart manually to finish installing updates"
msgstr "لم تتم إعادة التشغيل. قم بإعادة التشغيل يدوياً لإنهاء تثبيت التحديثات"

#: src/Views/AppListUpdateView.vala:200
#: src/Views/AppListUpdateView.vala:245
#, c-format
msgid "%u Update Available"
msgid_plural "%u Updates Available"
Expand All @@ -1026,19 +1030,15 @@ msgstr[3] "تتوفر %u تحديثات"
msgstr[4] "يتوفر %u تحديثاً"
msgstr[5] "يتوفر %u تحديث"

#: src/Views/AppListUpdateView.vala:211
#: src/Views/AppListUpdateView.vala:256
#, c-format
msgid "Everything is up to date. Last checked %s."
msgstr ""

#: src/Views/AppListUpdateView.vala:363
#: src/Views/AppListUpdateView.vala:382
msgid "Drivers"
msgstr "التعريفات"

#: src/Views/AppListUpdateView.vala:376
msgid "Up to Date"
msgstr "محدث بالكامل"

#: src/Views/AuthorView.vala:31
#, c-format
msgid "Other Apps by %s"
Expand Down
Loading

0 comments on commit 8634643

Please sign in to comment.