diff --git a/src/bazaar.gresource.xml b/src/bazaar.gresource.xml index 4e39687da..e22a000e5 100644 --- a/src/bazaar.gresource.xml +++ b/src/bazaar.gresource.xml @@ -212,11 +212,11 @@ icons/io.github.kolumni.Bazaar.Adwaita.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-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-full-view.c b/src/bz-full-view.c index 96a70e876..958583c30 100644 --- a/src/bz-full-view.c +++ b/src/bz-full-view.c @@ -204,17 +204,14 @@ 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")); } static char * @@ -306,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 (_ ("Other Apps by %s"), developer); + title = g_strdup_printf (_ ("Apps from %s"), developer); else - title = g_strdup (_ ("Other Apps")); + title = g_strdup (_ ("Apps from this developer")); subtitle = g_strdup_printf (ngettext ("%d Application", "%d Applications", n_items), n_items); 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/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