From 869891298702227d9e6641f490dca331d193f75d Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mon, 28 Jun 2021 23:26:59 -0400 Subject: [PATCH 20004/20005] Change fedora-welcome to centos-welcome This is being used for CentOS Stream rather than Fedora Linux, so adjust accordingly. --- data/liveinst/gnome/Makefile.am | 16 ++++++++-------- ...ra-welcome.desktop => centos-welcome.desktop} | 4 ++-- .../{fedora-welcome.js => centos-welcome.js} | 12 ++++++------ 3 files changed, 16 insertions(+), 16 deletions(-) rename data/liveinst/gnome/{fedora-welcome.desktop => centos-welcome.desktop} (59%) rename data/liveinst/gnome/{fedora-welcome.js => centos-welcome.js} (93%) diff --git a/data/liveinst/gnome/Makefile.am b/data/liveinst/gnome/Makefile.am index 4f2f90b..f7bd07a 100644 --- a/data/liveinst/gnome/Makefile.am +++ b/data/liveinst/gnome/Makefile.am @@ -16,24 +16,24 @@ # along with this program. If not, see . welcomedir = $(datadir)/$(PACKAGE_NAME)/gnome -dist_welcome_DATA = fedora-welcome.desktop -dist_welcome_SCRIPTS = fedora-welcome.js +dist_welcome_DATA = centos-welcome.desktop +dist_welcome_SCRIPTS = centos-welcome.js MAINTAINERCLEANFILES = Makefile.in # Merge the translations into the desktop file # Use the merged translations in $(builddir). If no merged translations exist, # just exit. -# Rename fedora-welcome.js to just fedora-welcome +# Rename centos-welcome.js to just centos-welcome install-data-hook: for p in $(top_builddir)/po/*.mpo ; do \ [ -e $$p ] || exit 0 ; \ - $(MSGFMT) --desktop --template=$(DESTDIR)$(welcomedir)/fedora-welcome.desktop \ + $(MSGFMT) --desktop --template=$(DESTDIR)$(welcomedir)/centos-welcome.desktop \ --locale=$$(basename $$p .mpo) \ - -o $(DESTDIR)$(welcomedir)/fedora-welcome.desktop.new $$p || exit 1 ; \ - mv $(DESTDIR)$(welcomedir)/fedora-welcome.desktop.new $(DESTDIR)$(welcomedir)/fedora-welcome.desktop || exit 1 ; \ + -o $(DESTDIR)$(welcomedir)/centos-welcome.desktop.new $$p || exit 1 ; \ + mv $(DESTDIR)$(welcomedir)/centos-welcome.desktop.new $(DESTDIR)$(welcomedir)/centos-welcome.desktop || exit 1 ; \ done - cd $(DESTDIR)$(welcomedir) && mv fedora-welcome.js fedora-welcome + cd $(DESTDIR)$(welcomedir) && mv centos-welcome.js centos-welcome uninstall-hook: - -cd $(DESTDIR)$(welcomedir) && rm -f fedora-welcome + -cd $(DESTDIR)$(welcomedir) && rm -f centos-welcome diff --git a/data/liveinst/gnome/fedora-welcome.desktop b/data/liveinst/gnome/centos-welcome.desktop similarity index 59% rename from data/liveinst/gnome/fedora-welcome.desktop rename to data/liveinst/gnome/centos-welcome.desktop index 60e5c38..ce68d92 100644 --- a/data/liveinst/gnome/fedora-welcome.desktop +++ b/data/liveinst/gnome/centos-welcome.desktop @@ -1,6 +1,6 @@ [Desktop Entry] -Name=Welcome to Fedora -Exec=/usr/share/anaconda/gnome/fedora-welcome +Name=Welcome to CentOS Stream +Exec=/usr/share/anaconda/gnome/centos-welcome Terminal=false Type=Application StartupNotify=true diff --git a/data/liveinst/gnome/fedora-welcome.js b/data/liveinst/gnome/centos-welcome.js similarity index 93% rename from data/liveinst/gnome/fedora-welcome.js rename to data/liveinst/gnome/centos-welcome.js index 0520557..6b04106 100755 --- a/data/liveinst/gnome/fedora-welcome.js +++ b/data/liveinst/gnome/centos-welcome.js @@ -62,7 +62,7 @@ const WelcomeWindow = new Lang.Class({ default_width: 600, default_height: 550, skip_taskbar_hint: true, - title: _("Welcome to Fedora"), + title: _("Welcome to CentOS Stream"), window_position: Gtk.WindowPosition.CENTER }); this.window.connect('key-press-event', Lang.bind(this, function(w, event) { @@ -91,7 +91,7 @@ const WelcomeWindow = new Lang.Class({ spacing: 16 }); tryContent.add(new Gtk.Image({ icon_name: 'media-optical', pixel_size: 256 })); - tryContent.add(makeLabel(_("Try Fedora"), true)); + tryContent.add(makeLabel(_("Try CentOS"), true)); let tryButton = new Gtk.Button({ child: tryContent }); buttonBox.add(tryButton); @@ -99,7 +99,7 @@ const WelcomeWindow = new Lang.Class({ let installContent = new Gtk.Box({ orientation: Gtk.Orientation.VERTICAL, spacing: 16 }); - // provided by the 'fedora-logos' package + // provided by the 'centos-logos' package installContent.add(new Gtk.Image({ icon_name: 'org.fedoraproject.AnacondaInstaller', pixel_size: 256 })); installContent.add(makeLabel(anacondaApp.get_name(), true)); @@ -107,7 +107,7 @@ const WelcomeWindow = new Lang.Class({ let installButton = new Gtk.Button({ child: installContent }); buttonBox.add(installButton); - this._label = makeLabel(_("You are currently running Fedora from live media.\nYou can install Fedora now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false); + this._label = makeLabel(_("You are currently running CentOS Stream from live media.\nYou can install CentOS Stream now, or choose \"Install to Hard Drive\" in the Activities Overview at any later time."), false); mainGrid.add(this._label); installButton.connect('clicked', Lang.bind(this, @@ -121,7 +121,7 @@ const WelcomeWindow = new Lang.Class({ buttonBox.destroy(); this._label.destroy(); - // provided by the 'fedora-logos' package + // provided by the 'centos-logos' package let image = new Gtk.Image({ icon_name: 'org.fedoraproject.AnacondaInstaller', pixel_size: 256, halign: Gtk.Align.CENTER }); @@ -148,7 +148,7 @@ const WelcomeWindow = new Lang.Class({ Gettext.bindtextdomain('anaconda', LOCALE_DIR); Gettext.textdomain('anaconda'); -GLib.set_prgname('fedora-welcome'); +GLib.set_prgname('centos-welcome'); Gtk.init(null, null); Gtk.Settings.get_default().gtk_application_prefer_dark_theme = true; -- 2.43.0