1) Fix all copyrights 2) move everything to use rhpl.translate instead of our own translate.py

33 files changed, 62 insertions, 62 deletions

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