From d21a6b199d455cd524802d5b3d3bf3ed1559710b Mon Sep 17 00:00:00 2001 From: Mimolet Date: Sun, 16 Aug 2026 21:58:34 +0200 Subject: [PATCH 1/4] chore: refined strings + renamed icons + adwaita category change --- src/bazaar.gresource.xml | 12 ++--- src/bz-addon-tile.blp | 2 +- src/bz-addons-dialog.blp | 2 +- src/bz-application.c | 15 ++++--- src/bz-flathub-category.c | 2 +- src/bz-full-view.blp | 2 +- src/bz-full-view.c | 13 +++--- src/bz-installed-tile.blp | 2 +- src/bz-login-page.c | 2 +- src/bz-rich-app-tile.blp | 2 +- src/icons/io.github.kolumni.Bazaar.Gnome.svg | 45 +++++++++++++++++++ ...io.github.kolunmi.Bazaar.login-github.svg} | 0 ...io.github.kolunmi.Bazaar.login-gitlab.svg} | 0 ... io.github.kolunmi.Bazaar.login-gnome.svg} | 0 ...io.github.kolunmi.Bazaar.login-google.svg} | 0 ...=> io.github.kolunmi.Bazaar.login-kde.svg} | 0 16 files changed, 73 insertions(+), 26 deletions(-) create mode 100644 src/icons/io.github.kolumni.Bazaar.Gnome.svg rename src/icons/{io.github.kolunmi.Bazaar.github.svg => io.github.kolunmi.Bazaar.login-github.svg} (100%) rename src/icons/{io.github.kolunmi.Bazaar.gitlab.svg => io.github.kolunmi.Bazaar.login-gitlab.svg} (100%) rename src/icons/{io.github.kolunmi.Bazaar.gnome.svg => io.github.kolunmi.Bazaar.login-gnome.svg} (100%) rename src/icons/{io.github.kolunmi.Bazaar.google.svg => io.github.kolunmi.Bazaar.login-google.svg} (100%) rename src/icons/{io.github.kolunmi.Bazaar.kde.svg => io.github.kolunmi.Bazaar.login-kde.svg} (100%) diff --git a/src/bazaar.gresource.xml b/src/bazaar.gresource.xml index 4e39687da..9273eca86 100644 --- a/src/bazaar.gresource.xml +++ b/src/bazaar.gresource.xml @@ -209,14 +209,14 @@ icons/io.github.kolumni.Bazaar.Popular.svg icons/io.github.kolumni.Bazaar.New.svg icons/io.github.kolumni.Bazaar.Updated.svg - icons/io.github.kolumni.Bazaar.Adwaita.svg + icons/io.github.kolumni.Bazaar.Gnome.svg icons/io.github.kolumni.Bazaar.Kde.svg - icons/io.github.kolunmi.Bazaar.github.svg - icons/io.github.kolunmi.Bazaar.gitlab.svg - icons/io.github.kolunmi.Bazaar.gnome.svg - icons/io.github.kolunmi.Bazaar.kde.svg - icons/io.github.kolunmi.Bazaar.google.svg + icons/io.github.kolunmi.Bazaar.login-github.svg + icons/io.github.kolunmi.Bazaar.login-gitlab.svg + icons/io.github.kolunmi.Bazaar.login-gnome.svg + icons/io.github.kolunmi.Bazaar.login-kde.svg + icons/io.github.kolunmi.Bazaar.login-google.svg bz-install-controls.wdgt bz-transact-icon.wdgt diff --git a/src/bz-addon-tile.blp b/src/bz-addon-tile.blp index 4bee63eb8..4ebb085df 100644 --- a/src/bz-addon-tile.blp +++ b/src/bz-addon-tile.blp @@ -61,7 +61,7 @@ template $BzAddonTile: $BzListTile { single-line-mode: true; halign: start; hexpand: true; - label: _("Stopped Receiving Updates"); + label: _("Uses an End-of-Life runtime"); styles [ "warning", diff --git a/src/bz-addons-dialog.blp b/src/bz-addons-dialog.blp index f1aef3d49..31827377c 100644 --- a/src/bz-addons-dialog.blp +++ b/src/bz-addons-dialog.blp @@ -229,7 +229,7 @@ template $BzAddonsDialog: Adw.Dialog { ] Label { - label: _("Stopped Receiving Core Updates"); + label: _("Uses an End-of-Life runtime"); margin-top: 8; margin-start: 8; margin-end: 8; diff --git a/src/bz-application.c b/src/bz-application.c index b6c0545d2..1a11b4d54 100644 --- a/src/bz-application.c +++ b/src/bz-application.c @@ -1025,12 +1025,14 @@ init_fiber (BzWeakRef *wr) window = new_window (self); alert = adw_alert_dialog_new (NULL, NULL); - adw_alert_dialog_format_heading (ADW_ALERT_DIALOG (alert), _ ("Ubuntu Troubles!")); + adw_alert_dialog_format_heading (ADW_ALERT_DIALOG (alert), _ ("Notice for Ubuntu Users")); adw_alert_dialog_format_body_markup ( ADW_ALERT_DIALOG (alert), - _ ("Ubuntu 25.10 and newer have messed up default security rules, " - "making it impossible to install apps from the Flatpak version " - "of Bazaar, please just use the normal package for now by using\n\n" + _ ("Ubuntu 25.10 and newer have changed default security rules in " + "a way that makes it impossible to install apps from " + "the Flatpak version of Bazaar. " + "For the time being, please use the apt package instead. " + "Install it with\n\n" "sudo apt install bazaar\n\n" "You can then remove this Flatpak version with\n\n" "flatpak uninstall io.github.kolunmi.Bazaar")); @@ -3950,8 +3952,9 @@ open_generic_id (BzApplication *self, if (case_fixed) bz_show_error_for_widget ( GTK_WIDGET (window), - _ ("Malformed Link"), - _ ("The link used to open this app has incorrect capitalization and may stop working in the future.\n\n" + _ ("Corrected Link"), + _ ("The link used to open this app has incorrect capitalization and " + "has been corrected by Bazaar.\n\n" "This is most likely caused by KRunner sending incorrect app IDs")); } else diff --git a/src/bz-flathub-category.c b/src/bz-flathub-category.c index 8fa534546..f8b395a0a 100644 --- a/src/bz-flathub-category.c +++ b/src/bz-flathub-category.c @@ -146,7 +146,7 @@ static const CategoryInfo category_info[] = { { "recently-added", N_ ("Recently Added"), N_ ("New"), N_ ("More New"), FALSE, TRUE, "io.github.kolumni.Bazaar.New", "", NULL }, { "recently-updated", N_ ("Recently Updated"), N_ ("Updated"), N_ ("More Updated"), FALSE, TRUE, "io.github.kolumni.Bazaar.Updated", "", NULL }, { "mobile", N_ ("Mobile"), N_ ("Mobile"), N_ ("More Mobile"), FALSE, TRUE, "io.github.kolumni.Bazaar.Mobile", "", NULL }, - { "adwaita", N_ ("Adwaita"), N_ ("Adwaita"), N_ ("More Adwaita"), FALSE, TRUE, "io.github.kolumni.Bazaar.Adwaita", "", NULL }, + { "adwaita", N_ ("GNOME Apps"), N_ ("GNOME Apps"), N_ ("More GNOME Apps"), FALSE, TRUE, "io.github.kolumni.Bazaar.Gnome", "", NULL }, { "kde", N_ ("KDE Apps"), N_ ("KDE Apps"), N_ ("More KDE Apps"), FALSE, TRUE, "io.github.kolumni.Bazaar.Kde", "", NULL }, { "game-only", N_ ("Games"), N_ ("Games"), N_ ("More Games"), FALSE, FALSE, "", "", NULL }, { "emulators", N_ ("Emulators"), N_ ("Emulators"), N_ ("More Emulators"), FALSE, FALSE, "", "", NULL }, diff --git a/src/bz-full-view.blp b/src/bz-full-view.blp index 6529efa70..3a104f55b 100644 --- a/src/bz-full-view.blp +++ b/src/bz-full-view.blp @@ -441,7 +441,7 @@ template $BzFullView: Adw.Bin { ] Label { - label: _("Stopped Receiving Core Updates"); + label: _("Uses an End-of-Life runtime"); margin-top: 8; margin-start: 8; margin-end: 8; diff --git a/src/bz-full-view.c b/src/bz-full-view.c index 96a70e876..3ea2c0be9 100644 --- a/src/bz-full-view.c +++ b/src/bz-full-view.c @@ -204,17 +204,16 @@ static char * format_other_apps_label (gpointer object, const char *developer) { if (!developer || *developer == '\0') - return g_strdup (_ ("More Apps")); - return g_strdup_printf (_ ("More Apps by %s"), developer); + return g_strdup (_ ("Other Apps from this Developer")); + return g_strdup_printf (_ ("Other Apps from %s"), developer); } static char * format_more_other_apps_label (gpointer object, const char *developer) { if (!developer || *developer == '\0') - return g_strdup (_ ("Other Apps by this Developer")); - - return g_strdup_printf (_ ("Other Apps by %s"), developer); + return g_strdup (_ ("Show All Apps")); + return g_strdup_printf (_ ("Show All Apps from %s"), developer); } static char * @@ -306,9 +305,9 @@ more_apps_button_clicked_cb (BzFullView *self, developer = bz_entry_get_developer (entry); if (developer != NULL && *developer != '\0') - title = g_strdup_printf (_ ("Other Apps by %s"), developer); + title = g_strdup_printf (_ ("All Apps by %s"), developer); else - title = g_strdup (_ ("Other Apps")); + title = g_strdup (_ ("All Apps from this developer")); subtitle = g_strdup_printf (ngettext ("%d Application", "%d Applications", n_items), n_items); diff --git a/src/bz-installed-tile.blp b/src/bz-installed-tile.blp index b37a9ad06..45038d280 100644 --- a/src/bz-installed-tile.blp +++ b/src/bz-installed-tile.blp @@ -52,7 +52,7 @@ template $BzInstalledTile: $BzListTile { ellipsize: end; single-line-mode: true; visible: bind $invert_boolean($is_null(template.group as <$BzEntryGroup>.eol) as ) as ; - label: _("Stopped Receiving Updates"); + label: _("Uses an End-of-Life runtime"); styles ["warning", "caption"] } } diff --git a/src/bz-login-page.c b/src/bz-login-page.c index fd1b90883..3bd2a069a 100644 --- a/src/bz-login-page.c +++ b/src/bz-login-page.c @@ -543,7 +543,7 @@ on_providers_loaded (GObject *source_object, method = json_object_get_string_member (provider_obj, "method"); name = json_object_get_string_member (provider_obj, "name"); row = adw_action_row_new (); - icon_name = g_strdup_printf ("io.github.kolunmi.Bazaar.%s", method); + icon_name = g_strdup_printf ("io.github.kolunmi.Bazaar.login-%s", method); bz_flathub_auth_provider_set_name (provider, name); bz_flathub_auth_provider_set_method (provider, method); diff --git a/src/bz-rich-app-tile.blp b/src/bz-rich-app-tile.blp index ee3b65a74..f61ac7097 100644 --- a/src/bz-rich-app-tile.blp +++ b/src/bz-rich-app-tile.blp @@ -139,7 +139,7 @@ template $BzRichAppTile: $BzListTile { lines: 2; max-width-chars: 15; single-line-mode: true; - label: _("Stopped Receiving Updates"); + label: _("Uses an End-of-Life runtime"); styles [ "warning", diff --git a/src/icons/io.github.kolumni.Bazaar.Gnome.svg b/src/icons/io.github.kolumni.Bazaar.Gnome.svg new file mode 100644 index 000000000..3e675a86d --- /dev/null +++ b/src/icons/io.github.kolumni.Bazaar.Gnome.svg @@ -0,0 +1,45 @@ + +image/svg+xml diff --git a/src/icons/io.github.kolunmi.Bazaar.github.svg b/src/icons/io.github.kolunmi.Bazaar.login-github.svg similarity index 100% rename from src/icons/io.github.kolunmi.Bazaar.github.svg rename to src/icons/io.github.kolunmi.Bazaar.login-github.svg diff --git a/src/icons/io.github.kolunmi.Bazaar.gitlab.svg b/src/icons/io.github.kolunmi.Bazaar.login-gitlab.svg similarity index 100% rename from src/icons/io.github.kolunmi.Bazaar.gitlab.svg rename to src/icons/io.github.kolunmi.Bazaar.login-gitlab.svg diff --git a/src/icons/io.github.kolunmi.Bazaar.gnome.svg b/src/icons/io.github.kolunmi.Bazaar.login-gnome.svg similarity index 100% rename from src/icons/io.github.kolunmi.Bazaar.gnome.svg rename to src/icons/io.github.kolunmi.Bazaar.login-gnome.svg diff --git a/src/icons/io.github.kolunmi.Bazaar.google.svg b/src/icons/io.github.kolunmi.Bazaar.login-google.svg similarity index 100% rename from src/icons/io.github.kolunmi.Bazaar.google.svg rename to src/icons/io.github.kolunmi.Bazaar.login-google.svg diff --git a/src/icons/io.github.kolunmi.Bazaar.kde.svg b/src/icons/io.github.kolunmi.Bazaar.login-kde.svg similarity index 100% rename from src/icons/io.github.kolunmi.Bazaar.kde.svg rename to src/icons/io.github.kolunmi.Bazaar.login-kde.svg From 62d03a238830b9b310cfa6b02bce19988edaa51b Mon Sep 17 00:00:00 2001 From: Mimolet Date: Mon, 17 Aug 2026 12:33:43 +0200 Subject: [PATCH 2/4] chore: restored 'stopped receiving updates' strings --- src/bz-addon-tile.blp | 2 +- src/bz-addons-dialog.blp | 2 +- src/bz-full-view.blp | 2 +- src/bz-installed-tile.blp | 2 +- src/bz-rich-app-tile.blp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bz-addon-tile.blp b/src/bz-addon-tile.blp index 4ebb085df..4bee63eb8 100644 --- a/src/bz-addon-tile.blp +++ b/src/bz-addon-tile.blp @@ -61,7 +61,7 @@ template $BzAddonTile: $BzListTile { single-line-mode: true; halign: start; hexpand: true; - label: _("Uses an End-of-Life runtime"); + label: _("Stopped Receiving Updates"); styles [ "warning", diff --git a/src/bz-addons-dialog.blp b/src/bz-addons-dialog.blp index 31827377c..f1aef3d49 100644 --- a/src/bz-addons-dialog.blp +++ b/src/bz-addons-dialog.blp @@ -229,7 +229,7 @@ template $BzAddonsDialog: Adw.Dialog { ] Label { - label: _("Uses an End-of-Life runtime"); + label: _("Stopped Receiving Core Updates"); margin-top: 8; margin-start: 8; margin-end: 8; diff --git a/src/bz-full-view.blp b/src/bz-full-view.blp index 3a104f55b..6529efa70 100644 --- a/src/bz-full-view.blp +++ b/src/bz-full-view.blp @@ -441,7 +441,7 @@ template $BzFullView: Adw.Bin { ] Label { - label: _("Uses an End-of-Life runtime"); + label: _("Stopped Receiving Core Updates"); margin-top: 8; margin-start: 8; margin-end: 8; diff --git a/src/bz-installed-tile.blp b/src/bz-installed-tile.blp index 45038d280..b37a9ad06 100644 --- a/src/bz-installed-tile.blp +++ b/src/bz-installed-tile.blp @@ -52,7 +52,7 @@ template $BzInstalledTile: $BzListTile { ellipsize: end; single-line-mode: true; visible: bind $invert_boolean($is_null(template.group as <$BzEntryGroup>.eol) as ) as ; - label: _("Uses an End-of-Life runtime"); + label: _("Stopped Receiving Updates"); styles ["warning", "caption"] } } diff --git a/src/bz-rich-app-tile.blp b/src/bz-rich-app-tile.blp index f61ac7097..ee3b65a74 100644 --- a/src/bz-rich-app-tile.blp +++ b/src/bz-rich-app-tile.blp @@ -139,7 +139,7 @@ template $BzRichAppTile: $BzListTile { lines: 2; max-width-chars: 15; single-line-mode: true; - label: _("Uses an End-of-Life runtime"); + label: _("Stopped Receiving Updates"); styles [ "warning", From 7c16d336cd1f788ba9d93f6890f081b0665b4aa1 Mon Sep 17 00:00:00 2001 From: Mimolet Date: Mon, 17 Aug 2026 18:02:43 +0200 Subject: [PATCH 3/4] chore: restore the 'Adwaita' category --- src/bazaar.gresource.xml | 2 +- src/bz-flathub-category.c | 2 +- src/icons/io.github.kolumni.Bazaar.Gnome.svg | 45 -------------------- 3 files changed, 2 insertions(+), 47 deletions(-) delete mode 100644 src/icons/io.github.kolumni.Bazaar.Gnome.svg diff --git a/src/bazaar.gresource.xml b/src/bazaar.gresource.xml index 9273eca86..e22a000e5 100644 --- a/src/bazaar.gresource.xml +++ b/src/bazaar.gresource.xml @@ -209,7 +209,7 @@ icons/io.github.kolumni.Bazaar.Popular.svg icons/io.github.kolumni.Bazaar.New.svg icons/io.github.kolumni.Bazaar.Updated.svg - icons/io.github.kolumni.Bazaar.Gnome.svg + icons/io.github.kolumni.Bazaar.Adwaita.svg icons/io.github.kolumni.Bazaar.Kde.svg icons/io.github.kolunmi.Bazaar.login-github.svg diff --git a/src/bz-flathub-category.c b/src/bz-flathub-category.c index f8b395a0a..8fa534546 100644 --- a/src/bz-flathub-category.c +++ b/src/bz-flathub-category.c @@ -146,7 +146,7 @@ static const CategoryInfo category_info[] = { { "recently-added", N_ ("Recently Added"), N_ ("New"), N_ ("More New"), FALSE, TRUE, "io.github.kolumni.Bazaar.New", "", NULL }, { "recently-updated", N_ ("Recently Updated"), N_ ("Updated"), N_ ("More Updated"), FALSE, TRUE, "io.github.kolumni.Bazaar.Updated", "", NULL }, { "mobile", N_ ("Mobile"), N_ ("Mobile"), N_ ("More Mobile"), FALSE, TRUE, "io.github.kolumni.Bazaar.Mobile", "", NULL }, - { "adwaita", N_ ("GNOME Apps"), N_ ("GNOME Apps"), N_ ("More GNOME Apps"), FALSE, TRUE, "io.github.kolumni.Bazaar.Gnome", "", NULL }, + { "adwaita", N_ ("Adwaita"), N_ ("Adwaita"), N_ ("More Adwaita"), FALSE, TRUE, "io.github.kolumni.Bazaar.Adwaita", "", NULL }, { "kde", N_ ("KDE Apps"), N_ ("KDE Apps"), N_ ("More KDE Apps"), FALSE, TRUE, "io.github.kolumni.Bazaar.Kde", "", NULL }, { "game-only", N_ ("Games"), N_ ("Games"), N_ ("More Games"), FALSE, FALSE, "", "", NULL }, { "emulators", N_ ("Emulators"), N_ ("Emulators"), N_ ("More Emulators"), FALSE, FALSE, "", "", NULL }, diff --git a/src/icons/io.github.kolumni.Bazaar.Gnome.svg b/src/icons/io.github.kolumni.Bazaar.Gnome.svg deleted file mode 100644 index 3e675a86d..000000000 --- a/src/icons/io.github.kolumni.Bazaar.Gnome.svg +++ /dev/null @@ -1,45 +0,0 @@ - -image/svg+xml From 7c77fdf5ed4cd2cd20b5e0734e3976590f188358 Mon Sep 17 00:00:00 2001 From: Mimolet Date: Tue, 18 Aug 2026 23:05:21 +0200 Subject: [PATCH 4/4] chore: string tweaks --- src/bz-full-view.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/bz-full-view.c b/src/bz-full-view.c index 3ea2c0be9..958583c30 100644 --- a/src/bz-full-view.c +++ b/src/bz-full-view.c @@ -211,9 +211,7 @@ format_other_apps_label (gpointer object, const char *developer) static char * format_more_other_apps_label (gpointer object, const char *developer) { - if (!developer || *developer == '\0') - return g_strdup (_ ("Show All Apps")); - return g_strdup_printf (_ ("Show All Apps from %s"), developer); + return g_strdup (_ ("Show All")); } static char * @@ -305,9 +303,9 @@ more_apps_button_clicked_cb (BzFullView *self, developer = bz_entry_get_developer (entry); if (developer != NULL && *developer != '\0') - title = g_strdup_printf (_ ("All Apps by %s"), developer); + title = g_strdup_printf (_ ("Apps from %s"), developer); else - title = g_strdup (_ ("All Apps from this developer")); + title = g_strdup (_ ("Apps from this developer")); subtitle = g_strdup_printf (ngettext ("%d Application", "%d Applications", n_items), n_items);