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

26 files changed, 49 insertions, 49 deletions

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):