diff options
| author | Mike Fulbright <msf@redhat.com> | 2002-05-23 15:21:26 +0000 |
|---|---|---|
| committer | Mike Fulbright <msf@redhat.com> | 2002-05-23 15:21:26 +0000 |
| commit | d7505f5e013cfa2b0af3eff08111c846f5930397 (patch) | |
| tree | e38fd6d8e6f8bab5ef2d191fdde2d31f43707fbf | |
| parent | 4bdbb8966ae3997688ad2668b2eed934bf8ed770 (diff) | |
| download | anaconda-d7505f5e013cfa2b0af3eff08111c846f5930397.tar.gz anaconda-d7505f5e013cfa2b0af3eff08111c846f5930397.tar.xz anaconda-d7505f5e013cfa2b0af3eff08111c846f5930397.zip | |
1) Fix all copyrights 2) move everything to use rhpl.translate instead of our own translate.py
107 files changed, 253 insertions, 207 deletions
@@ -13,7 +13,7 @@ # # ... And many others # -# Copyright 2002 Red Hat, Inc. +# Copyright 1999-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. diff --git a/anaconda_log.py b/anaconda_log.py index e6a0ad900..9aa165fdc 100644 --- a/anaconda_log.py +++ b/anaconda_log.py @@ -3,7 +3,7 @@ # # Matt Wilson <msw@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2001 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. diff --git a/autopart.py b/autopart.py index d058374e4..eb86bbf53 100644 --- a/autopart.py +++ b/autopart.py @@ -3,7 +3,7 @@ # # Jeremy Katz <katzj@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -22,7 +22,7 @@ from partitioning import * import partedUtils import partRequests from constants import * -from translate import _, N_ +from rhpl.translate import _, N_ from partErrors import * from log import log diff --git a/bootloader.py b/bootloader.py index 750d30fd1..1dd9319c0 100644 --- a/bootloader.py +++ b/bootloader.py @@ -26,7 +26,7 @@ import string from flags import flags from log import log from constants import * -from translate import _ +from rhpl.translate import _ from booty import * from bootloaderInfo import * @@ -4,7 +4,7 @@ # Erik Troan <ewt@redhat.com> # Matt Wilson <msw@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 1999-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -19,7 +19,7 @@ import os from string import * import types import urllib -from translate import _, N_ +from rhpl.translate import _, N_ from log import log import time diff --git a/dispatch.py b/dispatch.py index 60107154f..8cd2f5629 100644 --- a/dispatch.py +++ b/dispatch.py @@ -3,7 +3,7 @@ # # Erik Troan <ewt@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. diff --git a/exception.py b/exception.py index 21e4762b1..5fc4db2af 100644 --- a/exception.py +++ b/exception.py @@ -4,7 +4,7 @@ # Matt Wilson <msw@redhat.com> # Erik Troan <ewt@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -24,7 +24,7 @@ import types import rpm from string import joinfields from cPickle import Pickler -from translate import _ +from rhpl.translate import _ from flags import flags dumpHash = {} @@ -3,7 +3,7 @@ # # Erik Troan <ewt@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -23,7 +23,7 @@ import kudzu from constants import * from log import log from flags import flags -from translate import _ +from rhpl.translate import _ def probeFloppyDevice(): fdDevice = "fd0" @@ -3,7 +3,7 @@ # # Matt Wilson <msw@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -26,7 +26,7 @@ import partedUtils import raid import types from log import log -from translate import _, N_ +from rhpl.translate import _, N_ defaultMountPoints = ['/', '/home', '/tmp', '/usr', '/var'] @@ -3,7 +3,7 @@ # # Matt Wilson <msw@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 1999-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -21,7 +21,7 @@ import sys import parted import gtk import htmlbuffer -from translate import _, N_, utf8 +from rhpl.translate import _, N_, utf8 from language import expandLangs from splashscreen import splashScreenPop from log import log diff --git a/harddrive.py b/harddrive.py index 787c42f92..1cfb6dce2 100644 --- a/harddrive.py +++ b/harddrive.py @@ -1,4 +1,16 @@ -# Install method for hard drive installs +# +# harddrive.py - Install method for hard drive installs +# +# Copyright 1999-2002 Red Hat, Inc. +# +# This software may be freely redistributed under the terms of the GNU +# library public license. +# +# You should have received a copy of the GNU Library Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + from comps import ComponentSet, HeaderList, HeaderListFromFile from installmethod import InstallMethod @@ -8,7 +20,7 @@ import isys import iutil import rpm import string -from translate import _, cat, N_ +from rhpl.translate import _, cat, N_ FILENAME = 1000000 @@ -1,4 +1,15 @@ -# Install method for disk image installs (CD & NFS) +# +# image.py - Install method for disk image installs (CD & NFS) +# +# Copyright 1999-2002 Red Hat, Inc. +# +# This software may be freely redistributed under the terms of the GNU +# library public license. +# +# You should have received a copy of the GNU Library Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# from comps import ComponentSet, HeaderListFromFile from installmethod import InstallMethod @@ -8,7 +19,7 @@ import isys import time import kudzu import string -from translate import _ +from rhpl.translate import _ from log import log class ImageInstallMethod(InstallMethod): diff --git a/installclass.py b/installclass.py index 9ddb5660e..84405149c 100644 --- a/installclass.py +++ b/installclass.py @@ -3,11 +3,21 @@ # # The interface to BaseInstallClass is *public* -- ISVs/OEMs can customize the # install by creating a new derived type of this class. +# +# Copyright 1999-2002 Red Hat, Inc. +# +# This software may be freely redistributed under the terms of the GNU +# library public license. +# +# You should have received a copy of the GNU Library Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# import gettext_rh, os, iutil import string from xf86config import XF86Config -from translate import _ +from rhpl.translate import _ from instdata import InstallData from partitioning import * from log import log diff --git a/installclasses/custom.py b/installclasses/custom.py index 2789d823a..9ae165dc9 100644 --- a/installclasses/custom.py +++ b/installclasses/custom.py @@ -1,5 +1,5 @@ from installclass import BaseInstallClass -from translate import N_ +from rhpl.translate import N_ from constants import * import os import iutil diff --git a/installclasses/laptop.py b/installclasses/laptop.py index cfb780d48..b575aa3df 100644 --- a/installclasses/laptop.py +++ b/installclasses/laptop.py @@ -1,5 +1,5 @@ import workstation -from translate import N_ +from rhpl.translate import N_ import os import pcmcia diff --git a/installclasses/server.py b/installclasses/server.py index 44551963f..e1bde3b5f 100644 --- a/installclasses/server.py +++ b/installclasses/server.py @@ -1,5 +1,5 @@ from installclass import BaseInstallClass -from translate import * +from rhpl.translate import * from constants import * import os import iutil diff --git a/installclasses/upgradeclass.py b/installclasses/upgradeclass.py index 61f14827f..1aee1a175 100644 --- a/installclasses/upgradeclass.py +++ b/installclasses/upgradeclass.py @@ -1,6 +1,6 @@ from installclass import BaseInstallClass -from translate import N_ -from translate import _ +from rhpl.translate import N_, _ + import os import iutil diff --git a/installclasses/workstation.py b/installclasses/workstation.py index addf913bd..c8556c37a 100644 --- a/installclasses/workstation.py +++ b/installclasses/workstation.py @@ -1,5 +1,5 @@ from installclass import BaseInstallClass -from translate import N_ +from rhpl.translate import N_ from constants import * import os import iutil @@ -3,7 +3,7 @@ # # Erik Troan <ewt@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 1999-2001 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. diff --git a/iw/account_gui.py b/iw/account_gui.py index c7dc5bac8..b006d65fe 100644 --- a/iw/account_gui.py +++ b/iw/account_gui.py @@ -1,7 +1,7 @@ # # account_gui.py: gui root password and user creation dialog # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -17,7 +17,7 @@ import re import string import gui from iw_gui import * -from translate import _, N_ +from rhpl.translate import _, N_ from flags import flags class AccountWindow (InstallWindow): diff --git a/iw/auth_gui.py b/iw/auth_gui.py index 5659a4f6e..feca6bf5b 100644 --- a/iw/auth_gui.py +++ b/iw/auth_gui.py @@ -1,7 +1,7 @@ # # auth_gui.py: gui authentication configuration dialog # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -13,7 +13,7 @@ import gtk from iw_gui import * -from translate import _, N_ +from rhpl.translate import _, N_ class AuthWindow (InstallWindow): diff --git a/iw/bootdisk_gui.py b/iw/bootdisk_gui.py index fcadc2ced..dce7b6227 100644 --- a/iw/bootdisk_gui.py +++ b/iw/bootdisk_gui.py @@ -1,7 +1,7 @@ # # bootdisk_gui.py: gui bootdisk creation dialog # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -14,7 +14,7 @@ import iutil from iw_gui import * import gtk -from translate import _, N_ +from rhpl.translate import _, N_ from constants import * class BootdiskWindow (InstallWindow): diff --git a/iw/bootloader_gui.py b/iw/bootloader_gui.py index 79bece4e8..33dc6876f 100644 --- a/iw/bootloader_gui.py +++ b/iw/bootloader_gui.py @@ -19,7 +19,7 @@ import iutil import partedUtils import gui from iw_gui import * -from translate import _, N_ +from rhpl.translate import _, N_ class BootloaderWindow (InstallWindow): windowTitle = N_("Boot Loader Configuration") diff --git a/iw/checklist.py b/iw/checklist.py index fe27d261c..f3510fe50 100644 --- a/iw/checklist.py +++ b/iw/checklist.py @@ -5,7 +5,7 @@ # Brent Fox <bfox@redhat.com> # Jeremy Katz <katzj@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2001 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. diff --git a/iw/confirm_gui.py b/iw/confirm_gui.py index b5fee41b2..9abb49ab1 100644 --- a/iw/confirm_gui.py +++ b/iw/confirm_gui.py @@ -1,7 +1,7 @@ # # confirm_gui.py: install/upgrade point of no return screen. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -13,7 +13,7 @@ import gtk from iw_gui import * -from translate import _, N_ +from rhpl.translate import _, N_ from constants import * from package_gui import queryUpgradeContinue import gui diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py index 736e38aa4..4c3830253 100644 --- a/iw/congrats_gui.py +++ b/iw/congrats_gui.py @@ -1,7 +1,7 @@ # # congrats_gui.py: install/upgrade complete screen. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -13,7 +13,7 @@ import gtk from iw_gui import * -from translate import _, N_ +from rhpl.translate import _, N_ from constants import * import iutil diff --git a/iw/dependencies_gui.py b/iw/dependencies_gui.py index c6c45948c..7388b092a 100644 --- a/iw/dependencies_gui.py +++ b/iw/dependencies_gui.py @@ -1,7 +1,7 @@ # # dependencies_gui.py: screen to allow resolution of unresolved dependencies. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -14,7 +14,7 @@ import gobject import gtk from iw_gui import * -from translate import _, N_ +from rhpl.translate import _, N_ class UnresolvedDependenciesWindow (InstallWindow): diff --git a/iw/examine_gui.py b/iw/examine_gui.py index 3fc90ed89..be7985ce1 100644 --- a/iw/examine_gui.py +++ b/iw/examine_gui.py @@ -2,7 +2,7 @@ # examine_gui.py: dialog to allow selection of a RHL installation to upgrade # and if the user wishes to select individual packages. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -15,7 +15,7 @@ import gtk from iw_gui import * from package_gui import * -from translate import _, N_ +from rhpl.translate import _, N_ from constants import * from upgrade import * diff --git a/iw/fdasd_gui.py b/iw/fdasd_gui.py index db61de62c..706535ec9 100644 --- a/iw/fdasd_gui.py +++ b/iw/fdasd_gui.py @@ -1,7 +1,7 @@ # # fdasd_gui.py: interface that allows the user to run util-linux fdasd. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -14,7 +14,7 @@ from gtk import * from iw_gui import * from gnome.zvt import * -from translate import _ +from rhpl.translate import _ from dispatch import DISPATCH_NOOP import partitioning import isys diff --git a/iw/fdisk_gui.py b/iw/fdisk_gui.py index 37ed6261d..2eb079c54 100644 --- a/iw/fdisk_gui.py +++ b/iw/fdisk_gui.py @@ -1,7 +1,7 @@ # # fdisk_gui.py: interface that allows the user to run util-linux fdisk. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -14,7 +14,7 @@ import gtk from iw_gui import * from gnome import zvt -from translate import _ +from rhpl.translate import _ from dispatch import DISPATCH_NOOP import partitioning import isys diff --git a/iw/firewall_gui.py b/iw/firewall_gui.py index 685dbc922..d6942f545 100644 --- a/iw/firewall_gui.py +++ b/iw/firewall_gui.py @@ -1,7 +1,7 @@ # # firewall_gui.py: firewall setup screen # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -16,7 +16,7 @@ import gtk import gui from iw_gui import * from isys import * -from translate import _, N_ +from rhpl.translate import _, N_ class FirewallWindow (InstallWindow): diff --git a/iw/installpath_gui.py b/iw/installpath_gui.py index da7150c5e..d017e69dc 100644 --- a/iw/installpath_gui.py +++ b/iw/installpath_gui.py @@ -1,7 +1,7 @@ # # installpath_gui.py: screen for selecting which installclass to use. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -15,7 +15,7 @@ import installclass import gtk from iw_gui import InstallWindow from flags import flags -from translate import _, N_ +from rhpl.translate import _, N_ UPGRADE = 0 INSTALL = 1 diff --git a/iw/ipwidget.py b/iw/ipwidget.py index 62a0826c4..6e061c5ae 100644 --- a/iw/ipwidget.py +++ b/iw/ipwidget.py @@ -19,7 +19,7 @@ import gettext import gtk import gobject import gui -from translate import _, N_ +from rhpl.translate import _, N_ ip_re = re.compile('^([0-2]?[0-9]?[0-9])\\.([0-2]?[0-9]?[0-9])\\.([0-2]?[0-9]?[0-9])\\.([0-2]?[0-9]?[0-9])$') _=gettext.gettext diff --git a/iw/iw_gui.py b/iw/iw_gui.py index 72c6694a7..b4dc4e280 100644 --- a/iw/iw_gui.py +++ b/iw/iw_gui.py @@ -1,7 +1,7 @@ # # iw_gui.py: install window base class # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -11,7 +11,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -from translate import _ +from rhpl.translate import _ class InstallWindow: diff --git a/iw/keyboard_gui.py b/iw/keyboard_gui.py index 1987efd27..6848e5035 100644 --- a/iw/keyboard_gui.py +++ b/iw/keyboard_gui.py @@ -1,7 +1,7 @@ # # keyboard_gui.py: keyboard configuration gui dialog # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -21,7 +21,7 @@ from iw_gui import * from kbd import Keyboard from log import log from flags import flags -from translate import _, N_ +from rhpl.translate import _, N_ class KeyboardWindow (InstallWindow): windowTitle = N_("Keyboard Configuration") diff --git a/iw/language_gui.py b/iw/language_gui.py index 859327cae..302a1fbe2 100644 --- a/iw/language_gui.py +++ b/iw/language_gui.py @@ -1,7 +1,7 @@ # # langauge_gui.py: installtime language selection. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -14,7 +14,7 @@ import gobject import gtk from iw_gui import * -from translate import _, N_ +from rhpl.translate import _, N_ class LanguageWindow (InstallWindow): diff --git a/iw/language_support_gui.py b/iw/language_support_gui.py index 67e037899..a27588228 100644 --- a/iw/language_support_gui.py +++ b/iw/language_support_gui.py @@ -1,7 +1,7 @@ # # langauge_support_gui.py: dialog for selection of which languages to support. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -15,7 +15,7 @@ import checklist import gtk from iw_gui import * from flags import flags -from translate import _, N_ +from rhpl.translate import _, N_ class LanguageSupportWindow (InstallWindow): windowTitle = _("Additional Language Support") diff --git a/iw/mouse_gui.py b/iw/mouse_gui.py index 86adddbe4..99652e178 100644 --- a/iw/mouse_gui.py +++ b/iw/mouse_gui.py @@ -1,7 +1,7 @@ # # mouse_gui.py: gui mouse configuration. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -16,7 +16,7 @@ import string import gobject from iw_gui import * from re import * -from translate import _, N_ +from rhpl.translate import _, N_ from flags import flags class MouseWindow(InstallWindow): diff --git a/iw/network_gui.py b/iw/network_gui.py index bb13a15aa..07319ba58 100644 --- a/iw/network_gui.py +++ b/iw/network_gui.py @@ -3,7 +3,7 @@ # # Michael Fulbright <msf@redhat.com> # -# Copyright 2002 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -18,7 +18,7 @@ import gtk from iw_gui import * from isys import * import gui -from translate import _, N_ +from rhpl.translate import _, N_ import network import checklist import ipwidget diff --git a/iw/package_gui.py b/iw/package_gui.py index d7f14fe48..651518bfb 100644 --- a/iw/package_gui.py +++ b/iw/package_gui.py @@ -5,7 +5,7 @@ # Matt Wilson <msw@redhat.com> # Jeremy Katz <katzj@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -26,7 +26,7 @@ from iw_gui import * from string import * from thread import * from examine_gui import * -from translate import _, N_, utf8 +from rhpl.translate import _, N_, utf8 def queryUpgradeContinue(intf): diff --git a/iw/partition_gui.py b/iw/partition_gui.py index aa6afe814..74eb14567 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -4,7 +4,7 @@ # Matt Wilson <msw@redhat.com> # Michael Fulbright <msf@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -27,7 +27,7 @@ import types import checklist import raid from iw_gui import * -from translate import _, N_ +from rhpl.translate import _, N_ from partitioning import * from partIntfHelpers import * from partedUtils import * diff --git a/iw/partmethod_gui.py b/iw/partmethod_gui.py index efb84ada8..99d625ebe 100644 --- a/iw/partmethod_gui.py +++ b/iw/partmethod_gui.py @@ -3,7 +3,7 @@ # # Matt Wilson <msw@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -16,7 +16,7 @@ import gtk from gui import WrappingLabel from iw_gui import * -from translate import _ +from rhpl.translate import _ from autopart import PARTMETHOD_TYPE_DESCR_TEXT class PartitionMethodWindow(InstallWindow): diff --git a/iw/progress_gui.py b/iw/progress_gui.py index 6c809aeea..87d5c5bed 100644 --- a/iw/progress_gui.py +++ b/iw/progress_gui.py @@ -1,7 +1,7 @@ # # progress_gui.py: install/upgrade progress window setup. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -20,7 +20,7 @@ import timer import gobject import gtk from iw_gui import * -from translate import _, N_, utf8 +from rhpl.translate import _, N_, utf8 from packages import doInstall from constants import * diff --git a/iw/silo_gui.py b/iw/silo_gui.py index 10b88e022..e12f564e8 100644 --- a/iw/silo_gui.py +++ b/iw/silo_gui.py @@ -1,7 +1,7 @@ # # silo_gui.py: SILO configuration -- THIS FILE IS DEPRECIATED. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -15,7 +15,7 @@ from iw_gui import * from gtk import * -from translate import _ +from rhpl.translate import _ from xpms_gui import SMALL_CHECK import gdkpixbuf diff --git a/iw/timezone_gui.py b/iw/timezone_gui.py index 332d5d524..fc10df7fd 100644 --- a/iw/timezone_gui.py +++ b/iw/timezone_gui.py @@ -1,7 +1,7 @@ # # timezone_gui.py: gui timezone selection. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -17,7 +17,7 @@ import gtk import gobject from timezone_map_gui import TimezoneMap, ZoneTab from iw_gui import * -from translate import _ +from rhpl.translate import _ class TimezoneWindow(InstallWindow): def __init__(self, ics): diff --git a/iw/timezone_map_gui.py b/iw/timezone_map_gui.py index 165bd6af4..9c81ced7b 100644 --- a/iw/timezone_map_gui.py +++ b/iw/timezone_map_gui.py @@ -1,7 +1,7 @@ # # timezone_map_gui.py: gui timezone map widget. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -18,7 +18,7 @@ import gnome.canvas import string import re import math -from translate import _ +from rhpl.translate import _ class Enum: def __init__(self, *args): diff --git a/iw/upgrade_bootloader_gui.py b/iw/upgrade_bootloader_gui.py index 164a4eabf..872229e8d 100644 --- a/iw/upgrade_bootloader_gui.py +++ b/iw/upgrade_bootloader_gui.py @@ -18,7 +18,7 @@ from iw_gui import * import gtk -from translate import _, N_ +from rhpl.translate import _, N_ import iutil import gui import checkbootloader diff --git a/iw/upgrade_migratefs_gui.py b/iw/upgrade_migratefs_gui.py index 37635dd2e..573633bc0 100644 --- a/iw/upgrade_migratefs_gui.py +++ b/iw/upgrade_migratefs_gui.py @@ -3,7 +3,7 @@ # # Mike Fulbright <msf@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -14,7 +14,7 @@ # from iw_gui import * -from translate import _, N_ +from rhpl.translate import _, N_ from constants import * import string import isys diff --git a/iw/upgrade_swap_gui.py b/iw/upgrade_swap_gui.py index bd69f58e8..fb7bbf936 100644 --- a/iw/upgrade_swap_gui.py +++ b/iw/upgrade_swap_gui.py @@ -3,7 +3,7 @@ # # Mike Fulbright <msf@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -22,7 +22,7 @@ import gobject import gtk from iw_gui import * from package_gui import queryUpgradeContinue -from translate import _, N_ +from rhpl.translate import _, N_ from log import log from flags import flags diff --git a/iw/welcome_gui.py b/iw/welcome_gui.py index 45cea6583..c8d3cf49a 100644 --- a/iw/welcome_gui.py +++ b/iw/welcome_gui.py @@ -1,7 +1,7 @@ # # welcome_gui.py: gui welcome screen. # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -13,7 +13,7 @@ import gtk from iw_gui import * -from translate import _, N_ +from rhpl.translate import _, N_ class WelcomeWindow (InstallWindow): diff --git a/iw/xconfig_gui.py b/iw/xconfig_gui.py index 298e640cf..bf79eb263 100644 --- a/iw/xconfig_gui.py +++ b/iw/xconfig_gui.py @@ -3,7 +3,7 @@ # # Brent Fox <bfox@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -22,7 +22,7 @@ import gui import gobject import gtk from iw_gui import * -from translate import _, N_ +from rhpl.translate import _, N_ from monitor import isValidSyncRange from videocard import Videocard_blacklist from log import log diff --git a/iw/zipl_gui.py b/iw/zipl_gui.py index d6dfba768..801365ca2 100644 --- a/iw/zipl_gui.py +++ b/iw/zipl_gui.py @@ -1,7 +1,7 @@ # # bootloader_gui.py: gui bootloader configuration dialog # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -16,7 +16,7 @@ from iw_gui import * from gtk import * from gnome.ui import * -from translate import _, N_ +from rhpl.translate import _, N_ import gdkpixbuf import iutil from package_gui import queryUpgradeContinue @@ -3,7 +3,7 @@ # # Mike Fulbright <msf@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 1999-2001 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. diff --git a/kickstart.py b/kickstart.py index 6fa6836dd..4cbe59170 100644 --- a/kickstart.py +++ b/kickstart.py @@ -1,3 +1,16 @@ +# +# kickstart.py: kickstart install support +# +# Copyright 1999-2002 Red Hat, Inc. +# +# This software may be freely redistributed under the terms of the GNU +# library public license. +# +# You should have received a copy of the GNU Library Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + import iutil import isys import os diff --git a/language.py b/language.py index 1f2002916..1cf8eedfa 100644 --- a/language.py +++ b/language.py @@ -3,7 +3,7 @@ # installer runtime language choice and installed system # language support. # -# Copyright 2002 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -18,7 +18,7 @@ import string import locale from simpleconfig import SimpleConfigFile import rpm -from translate import cat +from rhpl.translate import cat # Converts a single language into a "language search path". For example, # fr_FR.utf8@euro would become "fr_FR.utf8@eueo fr_FR.utf8 fr_FR fr" @@ -3,7 +3,7 @@ # # Matt Wilson <msw@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2001 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. diff --git a/monitor.py b/monitor.py index 56f136970..a3c82fc8e 100644 --- a/monitor.py +++ b/monitor.py @@ -3,7 +3,7 @@ # # Mike Fulbright <msf@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -15,9 +15,7 @@ import string import kudzu -import iutil -import isys -from translate import _ +from rhpl.translate import _ from log import log def isValidSyncRange(syncrange): @@ -245,17 +243,20 @@ class MonitorInfo: pass self.fbmonMode = {} - if fbDevice != None: - try: - (vidram, depth, mode, monitor) = isys.fbconProbe("/dev/" + fbDevice) - self.fbmonSect = monitor - self.fbmonMode = {} - if int(depth) == 24: - depth = 32 +# +# we're removing framebuffer code +# +# if fbDevice != None: +# try: +# (vidram, depth, mode, monitor) = isys.fbconProbe("/dev/" + fbDevice) +# self.fbmonSect = monitor +# self.fbmonMode = {} +# if int(depth) == 24: +# depth = 32 - self.fbmonMode[str(depth)] = [str(mode)] - except: - pass +# self.fbmonMode[str(depth)] = [str(mode)] +# except: +# pass # save for reset() method self.orig_monName = self.monName @@ -1,7 +1,7 @@ # # mouse.py: mouse configuration data # -# Copyright 2001 Red Hat, Inc. +# Copyright 1999-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -14,7 +14,7 @@ import kudzu from simpleconfig import SimpleConfigFile import os -from translate import _, N_ +from rhpl.translate import _, N_ class Mouse (SimpleConfigFile): mice = { diff --git a/network.py b/network.py index 43f7cc259..a36f7e675 100644 --- a/network.py +++ b/network.py @@ -6,7 +6,7 @@ # Mike Fulbright <msf@redhat.com> # Brent Fox <bfox@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -22,7 +22,7 @@ import isys import socket import os from log import log -from translate import _, N_ +from rhpl.translate import _, N_ def inStrRange(v, s): if string.find(s, v) == -1: diff --git a/packages.py b/packages.py index 476dc84d8..546ee77e5 100644 --- a/packages.py +++ b/packages.py @@ -3,7 +3,7 @@ # # Erik Troan <ewt@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -26,7 +26,7 @@ import fsset from log import log from flags import flags from constants import * -from translate import _ +from rhpl.translate import _ from syslogd import syslog rpm.addMacro("_i18ndomains", "redhat-dist") diff --git a/partIntfHelpers.py b/partIntfHelpers.py index 89b1ff0de..b58863249 100644 --- a/partIntfHelpers.py +++ b/partIntfHelpers.py @@ -18,7 +18,7 @@ """Helper functions shared between partitioning interfaces.""" import string -from translate import _ +from rhpl.translate import _ from constants import * import partedUtils import parted diff --git a/partRequests.py b/partRequests.py index 0e64adf0b..2c4ee9d9c 100644 --- a/partRequests.py +++ b/partRequests.py @@ -23,7 +23,7 @@ import string import os, sys from constants import * -from translate import _ +from rhpl.translate import _ import fsset import raid diff --git a/partedUtils.py b/partedUtils.py index 661fc623d..10017bffc 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -26,7 +26,7 @@ import raid from log import log from flags import flags from partErrors import * -from translate import _ +from rhpl.translate import _ fsTypes = {} diff --git a/partitioning.py b/partitioning.py index 8a1a7fe7f..586008aa5 100644 --- a/partitioning.py +++ b/partitioning.py @@ -6,7 +6,7 @@ # Mike Fulbright <msf@redhat.com> # Harald Hoyer <harald@redhat.de> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -30,7 +30,7 @@ import string import iutil import partedUtils import raid -from translate import _ +from rhpl.translate import _ from log import log from constants import * from flags import flags diff --git a/partitions.py b/partitions.py index c9c0a5361..4b125245a 100644 --- a/partitions.py +++ b/partitions.py @@ -23,7 +23,7 @@ import string import os, sys from constants import * -from translate import _ +from rhpl.translate import _ from log import log import fsset @@ -3,7 +3,7 @@ # # Erik Troan <ewt@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 1999-2001 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -4,7 +4,7 @@ # # Erik Troan <ewt@redhat.com> # -# Copyright 2001-2002 Red Hat, Inc. +# Copyright 1999-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -3,7 +3,7 @@ # # Mike Fulbright <msf@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -17,7 +17,7 @@ import upgrade from snack import * from constants_text import * from text import WaitWindow, OkCancelWindow -from translate import _ +from rhpl.translate import _ import sys import os from log import log diff --git a/scripts/getlangnames.py b/scripts/getlangnames.py index e11302abe..0bf3027cf 100644 --- a/scripts/getlangnames.py +++ b/scripts/getlangnames.py @@ -1,7 +1,7 @@ import sys sys.path.extend(["..", "../iconvmodule"]) -from translate import _ -import translate +from rhpl.translate import _ +import rhpl.translate import language translate.cat.setunicode(1) diff --git a/simpleconfig.py b/simpleconfig.py index 2e698adf2..0df75b6e5 100644 --- a/simpleconfig.py +++ b/simpleconfig.py @@ -3,7 +3,7 @@ # # Matt Wilson <msw@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 1999-2001 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. diff --git a/splashscreen.py b/splashscreen.py index 3c01eaed6..ab2276ab7 100644 --- a/splashscreen.py +++ b/splashscreen.py @@ -3,7 +3,7 @@ # # Matt Wilson <msw@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -19,7 +19,7 @@ os.environ["GNOME_DISABLE_CRASH_DIALOG"] = "1" import gtk from flags import flags -from translate import cat +from rhpl.translate import cat # for GTK+ 2.0 cat.setunicode(1) diff --git a/syslogd.py b/syslogd.py index 5e458e963..fdafbcd99 100644 --- a/syslogd.py +++ b/syslogd.py @@ -3,7 +3,7 @@ # # Erik Troan <ewt@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 1999-2001 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -4,7 +4,7 @@ # Erik Troan <ewt@redhat.com> # Matt Wilson <msw@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 1999-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -24,7 +24,7 @@ import gettext_rh import signal import parted import string -from translate import _, cat, N_ +from rhpl.translate import _, cat, N_ from language import expandLangs from log import log from flags import flags diff --git a/textw/bootdisk_text.py b/textw/bootdisk_text.py index c1961aebc..c5d74f0f3 100644 --- a/textw/bootdisk_text.py +++ b/textw/bootdisk_text.py @@ -1,7 +1,7 @@ # # bootdisk_text.py: text mode bootdisk creation # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -12,7 +12,7 @@ # import iutil -from translate import _ +from rhpl.translate import _ from snack import * from constants_text import * from constants import * diff --git a/textw/bootloader_text.py b/textw/bootloader_text.py index d1f47dd21..a0d285839 100644 --- a/textw/bootloader_text.py +++ b/textw/bootloader_text.py @@ -1,7 +1,7 @@ # # bootloader_text.py: text mode bootloader setup # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -13,7 +13,7 @@ from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ from flags import flags import string import iutil diff --git a/textw/complete_text.py b/textw/complete_text.py index 24f48f8e5..c30441efc 100644 --- a/textw/complete_text.py +++ b/textw/complete_text.py @@ -1,7 +1,7 @@ # # complete_text.py: text mode congratulations windows # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -13,7 +13,7 @@ from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ from constants import * import iutil diff --git a/textw/confirm_text.py b/textw/confirm_text.py index aff5fea88..a657b68b2 100644 --- a/textw/confirm_text.py +++ b/textw/confirm_text.py @@ -1,7 +1,7 @@ # # confirm_text.py: text mode install/upgrade confirmation window # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -13,7 +13,7 @@ from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ class BeginInstallWindow: def __call__ (self, screen): diff --git a/textw/constants_text.py b/textw/constants_text.py index c75af5267..1211f6ac2 100644 --- a/textw/constants_text.py +++ b/textw/constants_text.py @@ -1,7 +1,7 @@ # # constants_text.py: text mode constants # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -11,7 +11,7 @@ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. # -from translate import _, N_ +from rhpl.translate import _, N_ INSTALL_OK = 0 INSTALL_BACK = -1 diff --git a/textw/fdasd_text.py b/textw/fdasd_text.py index dac27e6ff..4ac373f42 100644 --- a/textw/fdasd_text.py +++ b/textw/fdasd_text.py @@ -5,7 +5,7 @@ # Harald Hoyer <harald@redhat.de> # Jeremy Katz <katzj@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -19,7 +19,7 @@ import os import isys import iutil from snack import * -from translate import _, cat, N_ +from rhpl.translate import _, cat, N_ from constants_text import * import partitioning diff --git a/textw/fdisk_text.py b/textw/fdisk_text.py index 7f9e75631..df2565cd9 100644 --- a/textw/fdisk_text.py +++ b/textw/fdisk_text.py @@ -4,7 +4,7 @@ # # Jeremy Katz <katzj@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -18,7 +18,7 @@ import os import isys import iutil from snack import * -from translate import _, cat, N_ +from rhpl.translate import _, cat, N_ from constants_text import * import partitioning diff --git a/textw/firewall_text.py b/textw/firewall_text.py index 3308cf7c4..14c0c56fa 100644 --- a/textw/firewall_text.py +++ b/textw/firewall_text.py @@ -3,7 +3,7 @@ # # Bill Nottingham <notting@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -15,7 +15,7 @@ from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ class FirewallWindow: def __call__(self, screen, intf, network, firewall): diff --git a/textw/installpath_text.py b/textw/installpath_text.py index 4e063af23..9289d1153 100644 --- a/textw/installpath_text.py +++ b/textw/installpath_text.py @@ -1,7 +1,7 @@ # # installpath_text: text mode installation type selection dialog # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -13,7 +13,7 @@ from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ from flags import flags import installclass diff --git a/textw/keyboard_text.py b/textw/keyboard_text.py index 6f9b430f5..0acd8d01c 100644 --- a/textw/keyboard_text.py +++ b/textw/keyboard_text.py @@ -1,7 +1,7 @@ # # keyboard_text: text mode keyboard setup dialogs # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -15,7 +15,7 @@ import isys import iutil from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ from log import * from flags import flags diff --git a/textw/language_text.py b/textw/language_text.py index 94c0ea4b8..2c285a215 100644 --- a/textw/language_text.py +++ b/textw/language_text.py @@ -1,7 +1,7 @@ # # language_text.py: text mode language selection dialog # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -17,7 +17,7 @@ import iutil from snack import * from constants_text import * from log import * -from translate import _ +from rhpl.translate import _ from flags import flags class LanguageWindow: diff --git a/textw/mouse_text.py b/textw/mouse_text.py index 7467596da..156a95ab0 100644 --- a/textw/mouse_text.py +++ b/textw/mouse_text.py @@ -1,7 +1,7 @@ # # mouse_text.py: text mode mouse selection dialog # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -13,7 +13,7 @@ from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ class MouseDeviceWindow: def __call__(self, screen, mouse): diff --git a/textw/network_text.py b/textw/network_text.py index 38661338a..76fbe5096 100644 --- a/textw/network_text.py +++ b/textw/network_text.py @@ -1,7 +1,7 @@ # # network_text.py: text mode network configuration dialogs # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -16,7 +16,7 @@ import os import isys from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ class NetworkWindow: def setsensitive (self): diff --git a/textw/packages_text.py b/textw/packages_text.py index 7d92dd24a..a40b847f2 100644 --- a/textw/packages_text.py +++ b/textw/packages_text.py @@ -1,7 +1,7 @@ # # packages_text.py: text mode package selection dialog # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -14,7 +14,7 @@ import rpm from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ class PackageGroupWindow: diff --git a/textw/partition_text.py b/textw/partition_text.py index dc30d8626..ffd58105d 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -4,7 +4,7 @@ # # Jeremy Katz <katzj@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -27,7 +27,7 @@ from fsset import * from autopart import * from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ from log import log diff --git a/textw/partmethod_text.py b/textw/partmethod_text.py index 328b5a3dd..e19530c13 100644 --- a/textw/partmethod_text.py +++ b/textw/partmethod_text.py @@ -4,7 +4,7 @@ # # Jeremy Katz <katzj@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -15,7 +15,7 @@ # from snack import * -from translate import _, cat, N_ +from rhpl.translate import _, cat, N_ from constants_text import * from autopart import PARTMETHOD_TYPE_DESCR_TEXT diff --git a/textw/progress_text.py b/textw/progress_text.py index 294aee63c..3a998096d 100644 --- a/textw/progress_text.py +++ b/textw/progress_text.py @@ -1,7 +1,7 @@ # # progress_text.py: text mode install/upgrade progress dialog # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -15,7 +15,7 @@ import rpm from constants import * from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ class InstallProgressWindow: def completePackage(self, header, timer): diff --git a/textw/silo_text.py b/textw/silo_text.py index ec3219c42..b0a650dbd 100644 --- a/textw/silo_text.py +++ b/textw/silo_text.py @@ -1,7 +1,7 @@ # # silo_text.py: text mode silo setup dialog # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -16,7 +16,7 @@ import iutil from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ class SiloAppendWindow: diff --git a/textw/statusline_text.py b/textw/statusline_text.py index 1be747064..74337694e 100644 --- a/textw/statusline_text.py +++ b/textw/statusline_text.py @@ -1,7 +1,7 @@ # # statusline_text.py: text mode status line management functions # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2001 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. diff --git a/textw/timezone_text.py b/textw/timezone_text.py index 8d2e8fd75..3aa6a8d87 100644 --- a/textw/timezone_text.py +++ b/textw/timezone_text.py @@ -1,7 +1,7 @@ # # timezone_text.py: text mode timezone selection dialog # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -17,7 +17,7 @@ import os from time import * from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ class TimezoneWindow: diff --git a/textw/upgrade_bootloader_text.py b/textw/upgrade_bootloader_text.py index 5a61e22db..e1ae104cb 100644 --- a/textw/upgrade_bootloader_text.py +++ b/textw/upgrade_bootloader_text.py @@ -16,7 +16,7 @@ from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ from flags import flags import string import iutil diff --git a/textw/upgrade_text.py b/textw/upgrade_text.py index a33bfd827..fcf632182 100644 --- a/textw/upgrade_text.py +++ b/textw/upgrade_text.py @@ -20,7 +20,7 @@ from snack import * from fsset import * from log import log from flags import flags -from translate import _ +from rhpl.translate import _ from constants import * class UpgradeMigrateFSWindow: diff --git a/textw/userauth_text.py b/textw/userauth_text.py index f52d45eba..db7615618 100644 --- a/textw/userauth_text.py +++ b/textw/userauth_text.py @@ -1,7 +1,7 @@ # # userauth_text.py: text mode authentication setup dialogs # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -13,7 +13,7 @@ from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ import iutil from flags import flags diff --git a/textw/welcome_text.py b/textw/welcome_text.py index 3dd571880..231ec66a2 100644 --- a/textw/welcome_text.py +++ b/textw/welcome_text.py @@ -1,7 +1,7 @@ # # welcome_text.py: text mode welcome window # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -13,7 +13,7 @@ from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ from constants import * import os diff --git a/textw/xconfig_text.py b/textw/xconfig_text.py index 56c4b2a26..aec4b07c4 100644 --- a/textw/xconfig_text.py +++ b/textw/xconfig_text.py @@ -1,7 +1,7 @@ # # xconfig_text.py: text mode X Windows System setup dialogs # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -16,7 +16,7 @@ from monitor import isValidSyncRange from videocard import Videocard_blacklist from constants_text import * from snack import * -from translate import _ +from rhpl.translate import _ ddc_monitor_string = _("DDC Probed Monitor") unprobed_monitor_string = _("Unprobed Monitor") diff --git a/textw/zipl_text.py b/textw/zipl_text.py index f8a15c574..907bce9a2 100644 --- a/textw/zipl_text.py +++ b/textw/zipl_text.py @@ -1,7 +1,7 @@ # # zipl_text.py: text mode z/IPL setup dialog # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -14,7 +14,7 @@ import iutil from snack import * from constants_text import * -from translate import _ +from rhpl.translate import _ class ZiplWindow: def __call__(self, screen, dispatch, bl, fsset, diskSet): @@ -3,7 +3,7 @@ # # Erik Troan <ewt@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2000-2001 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. diff --git a/upgrade.py b/upgrade.py index 692225fb3..14ec1f1bd 100644 --- a/upgrade.py +++ b/upgrade.py @@ -3,7 +3,7 @@ # # Matt Wilson <msw@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -26,7 +26,7 @@ from flags import flags from fsset import * from partitioning import * from log import log -from translate import _ +from rhpl.translate import _ from constants import * def findRootParts(intf, id, dir, chroot): diff --git a/upgradeclass.py b/upgradeclass.py index 61f14827f..1aee1a175 100644 --- a/upgradeclass.py +++ b/upgradeclass.py @@ -1,6 +1,6 @@ from installclass import BaseInstallClass -from translate import N_ -from translate import _ +from rhpl.translate import N_, _ + import os import iutil diff --git a/urlinstall.py b/urlinstall.py index fe0a4990e..f75204c1f 100644 --- a/urlinstall.py +++ b/urlinstall.py @@ -3,7 +3,7 @@ # # Erik Troan <ewt@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 1999-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. diff --git a/videocard.py b/videocard.py index b410c2300..707e4506b 100644 --- a/videocard.py +++ b/videocard.py @@ -5,7 +5,7 @@ # Brent Fox <bfox@redhat.com> # Mike Fulbright <msf@redhat.com> # -# Copyright 2002 Red Hat, Inc. +# Copyright 2001-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -18,12 +18,10 @@ import copy import string import kudzu -import iutil -import isys import os from log import log -from translate import _ +from rhpl.translate import _ Videocard_blacklist = ["Generic VGA compatible", "Generic VGA16", @@ -192,14 +190,17 @@ class FrameBufferCard(VideoCard): def hasFixedMode(self): return 1 - def FixedMode(self): - fb = isys.fbinfo() - if fb: - (x, y, bpp) = fb - rc = {} - rc[str(bpp)] = ["%sx%s" % (x, y)] - return rc - return None +# +# we're removing frame buffer code +# +# def FixedMode(self): +# fb = isys.fbinfo() +# if fb: +# (x, y, bpp) = fb +# rc = {} +# rc[str(bpp)] = ["%sx%s" % (x, y)] +# return rc +# return None # fake card entry for frame buffer class VGA16Card(VideoCard): diff --git a/xf86config.py b/xf86config.py index 2901d82bd..d01b94d15 100644 --- a/xf86config.py +++ b/xf86config.py @@ -5,7 +5,7 @@ # Brent Fox <bfox@redhat.com> # Michael Fulbright <msf@redhat.com> # -# Copyright 2002 Red Hat, Inc. +# Copyright 1999-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -27,7 +27,7 @@ import time import os from kbd import Keyboard from mouse import Mouse -from translate import _ +from rhpl.translate import _ from log import log XF86Config_template = """ @@ -959,9 +959,7 @@ class XF86Config: # else: # raise RuntimeError, "trying frame buffer but no valid modes to try..." # elif self.videocard.hasFixedMode(): - - if self.videocard.hasFixedMode(): - self.manualModes = self.videocard.FixedMode() +# self.manualModes = self.videocard.FixedMode() # save current manually selected mode, override if non-existant manmodes = self.manualModes @@ -3,7 +3,7 @@ # # Matt Wilson <msw@redhat.com> # -# Copyright 2001 Red Hat, Inc. +# Copyright 1999-2001 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. diff --git a/xserver.py b/xserver.py index 9417cd1fb..f0558791d 100644 --- a/xserver.py +++ b/xserver.py @@ -4,7 +4,7 @@ # Matt Wilson <msw@redhat.com> # Brent Fox <bfox@redhat.com> # -# Copyright 2002 Red Hat, Inc. +# Copyright 1999-2002 Red Hat, Inc. # # This software may be freely redistributed under the terms of the GNU # library public license. @@ -24,7 +24,7 @@ from xf86config import * from kbd import Keyboard from mouse import Mouse from snack import * -from translate import _ +from rhpl.translate import _ from constants_text import * from mouse_text import MouseWindow, MouseDeviceWindow from videocard import VGA16Card, VESADriverCard |