summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xgui.py2
-rw-r--r--loader/cdrom.c2
-rw-r--r--loader/devices.c22
-rw-r--r--loader/kickstart.c6
-rw-r--r--loader/lang.c20
-rw-r--r--loader/loader.c36
-rw-r--r--loader/net.c10
-rw-r--r--loader/pcmcia.c6
-rw-r--r--loader/urls.c8
-rw-r--r--text.py2
-rw-r--r--textw/fdisk_text.py2
-rw-r--r--textw/packages_text.py2
-rw-r--r--textw/partition_text.py2
-rw-r--r--textw/silo_text.py4
14 files changed, 62 insertions, 62 deletions
diff --git a/gui.py b/gui.py
index cfd387159..e7d790191 100755
--- a/gui.py
+++ b/gui.py
@@ -108,7 +108,7 @@ def partedExceptionWindow(exc):
flags = ((parted.EXCEPTION_FIX, N_("Fix")),
(parted.EXCEPTION_YES, N_("Yes")),
(parted.EXCEPTION_NO, N_("No")),
- (parted.EXCEPTION_OK, N_("Ok")),
+ (parted.EXCEPTION_OK, N_("OK")),
(parted.EXCEPTION_RETRY, N_("Retry")),
(parted.EXCEPTION_IGNORE, N_("Ignore")),
(parted.EXCEPTION_CANCEL, N_("Cancel")))
diff --git a/loader/cdrom.c b/loader/cdrom.c
index 39b4f9271..c765c4387 100644
--- a/loader/cdrom.c
+++ b/loader/cdrom.c
@@ -31,7 +31,7 @@ static int setupCDdevicePanel(int * type) {
rc = newtWinMenu(_("CDROM type"), _("What type of CDROM do you have?"),
30, 5, 5, 7, menuItems,
- &cdromType, _("Ok"), _("Back"), NULL);
+ &cdromType, _("OK"), _("Back"), NULL);
if (rc == 2) return LOADER_BACK;
diff --git a/loader/devices.c b/loader/devices.c
index 6a62db5b3..a3f98e142 100644
--- a/loader/devices.c
+++ b/loader/devices.c
@@ -85,11 +85,11 @@ static int getModuleArgs(struct moduleInfo * mod, char *** argPtr) {
text = _("This module can take parameters which affects its "
"operation. If you don't know what parameters to supply, "
- "just skip this screen by pressing the \"Ok\" button "
+ "just skip this screen by pressing the \"OK\" button "
"now.");
rc = newtWinEntries(_("Module Parameters"), text,
- 40, 5, 15, 20, entries, _("Ok"),
+ 40, 5, 15, 20, entries, _("OK"),
_("Back"), NULL);
if (rc == 2) {
@@ -234,9 +234,9 @@ int devLoadDriverDisk(moduleInfoSet modInfo, moduleList modLoaded,
}
eject(device);
- rc = newtWinChoice(_("Devices"), _("Ok"),
+ rc = newtWinChoice(_("Devices"), _("OK"),
cancelNotBack ? _("Cancel") : _("Back"),
- _("Insert your driver disk and press \"Ok\" to continue."));
+ _("Insert your driver disk and press \"OK\" to continue."));
if (rc == 2) return LOADER_BACK;
@@ -256,14 +256,14 @@ int devLoadDriverDisk(moduleInfoSet modInfo, moduleList modLoaded,
ddi->fs = "ext2";
if (doPwMount(ddi->mntDevice, "/tmp/drivers", ddi->fs, 1, 0, NULL,
NULL))
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("Failed to mount driver disk."));
}
if (devInitDriverDisk(modInfo, modLoaded, modDepsPtr, flags,
"/tmp/drivers", ddi))
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("The floppy disk you inserted is not a valid driver disk "
"for this release of Red Hat Linux."));
else
@@ -332,7 +332,7 @@ static int pickModule(moduleInfoSet modInfo, enum driverMajor type,
listbox = newtListbox(-1, -1, 6,
NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
- buttons = newtButtonBar(_("Ok"), &ok, _("Back"), &back, NULL);
+ buttons = newtButtonBar(_("OK"), &ok, _("Back"), &back, NULL);
checkbox = newtCheckbox(-1, -1, _("Specify module parameters"),
specifyParameters, NULL, &specifyParameters);
@@ -432,7 +432,7 @@ int devDeviceMenu(enum driverMajor type, moduleInfoSet modInfo,
}
if (rc)
- newtWinMessage(_("Error"), _("Ok"), _("Failed to insert %s module."),
+ newtWinMessage(_("Error"), _("OK"), _("Failed to insert %s module."),
mod->moduleName);
if (!rc && moduleName)
@@ -477,7 +477,7 @@ char * extractModule(struct driverDiskInfo * ddi, char * modName) {
failed = 1;
if (failed && !first) {
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("Failed to mount driver disk: %s."), strerror(errno));
} else if (!failed) {
if ((fd = open("/tmp/drivers/rhdd-6.1", O_RDONLY)) < 0)
@@ -497,7 +497,7 @@ char * extractModule(struct driverDiskInfo * ddi, char * modName) {
if (failed && !first) {
umount("/tmp/drivers");
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("The wrong diskette was inserted."));
}
}
@@ -529,7 +529,7 @@ char * extractModule(struct driverDiskInfo * ddi, char * modName) {
if (ddi->device)
eject(ddi->device);
- rc = newtWinChoice(_("Driver Disk"), _("Ok"), _("Cancel"),
+ rc = newtWinChoice(_("Driver Disk"), _("OK"), _("Cancel"),
_("Please insert the %s driver disk now."), ddi->title);
if (rc == 2) return NULL;
}
diff --git a/loader/kickstart.c b/loader/kickstart.c
index 317e78302..919066588 100644
--- a/loader/kickstart.c
+++ b/loader/kickstart.c
@@ -55,7 +55,7 @@ int ksReadCommands(char * cmdFile) {
int commandsAlloced = 5;
if ((fd = open(cmdFile, O_RDONLY)) < 0) {
- newtWinMessage(_("Kickstart Error"), _("Ok"),
+ newtWinMessage(_("Kickstart Error"), _("OK"),
_("Error opening: kickstart file %s: %s"), cmdFile,
strerror(errno));
return LOADER_ERROR;
@@ -65,7 +65,7 @@ int ksReadCommands(char * cmdFile) {
buf = alloca(sb.st_size + 1);
if (read(fd, buf, sb.st_size) != sb.st_size) {
- newtWinMessage(_("Kickstart Error"), _("Ok"),
+ newtWinMessage(_("Kickstart Error"), _("OK"),
_("Error reading contents of kickstart file %s: %s"),
cmdFile, strerror(errno));
close(fd);
@@ -104,7 +104,7 @@ int ksReadCommands(char * cmdFile) {
inPackages = 1;
} else {
if (poptParseArgvString(start, &argc, (const char ***) &argv) || !argc) {
- newtWinMessage(_("Kickstart Error"), _("Ok"),
+ newtWinMessage(_("Kickstart Error"), _("OK"),
_("Error on line %d of kickstart file %s."),
argv[0], line, cmdFile);
} else {
diff --git a/loader/lang.c b/loader/lang.c
index 17ff4bb33..2fa4b0c44 100644
--- a/loader/lang.c
+++ b/loader/lang.c
@@ -24,7 +24,7 @@
#include "windows.h"
#define errorWindow(String) \
- newtWinMessage(_("Error"), _("Ok"), String, strerror (errno));
+ newtWinMessage(_("Error"), _("OK"), String, strerror (errno));
extern int haveKon;
@@ -99,7 +99,7 @@ static void loadLanguageList(int flags) {
f = fopen(file, "r");
if (!f) {
- newtWinMessage(_("Error"), _("Ok"), "cannot open %s: %s",
+ newtWinMessage(_("Error"), _("OK"), "cannot open %s: %s",
file, strerror (errno));
return;
}
@@ -147,7 +147,7 @@ void loadLanguage (char * file, int flags) {
stream = gzopen(file, "r");
if (!stream) {
- newtWinMessage("Error", "Ok", "Translation for %s is not available. "
+ newtWinMessage("Error", "OK", "Translation for %s is not available. "
"The Installation will proceed in English.", key);
return ;
}
@@ -158,14 +158,14 @@ void loadLanguage (char * file, int flags) {
gzclose(stream);
if (rc || access("/tmp/translation", R_OK)) {
- newtWinMessage("Error", "Ok", "Cannot get translation file %s.\n",
+ newtWinMessage("Error", "OK", "Cannot get translation file %s.\n",
filename);
return;
}
fd = open("/tmp/translation", O_RDONLY);
if (fd < 0) {
- newtWinMessage("Error", "Ok", "Failed to open /tmp/translation: %s\n",
+ newtWinMessage("Error", "OK", "Failed to open /tmp/translation: %s\n",
strerror(errno));
return;
}
@@ -207,7 +207,7 @@ static int loadFont(char * fontFile, int flags) {
#endif
stream = gzopen("/etc/fonts.cgz", "r");
if (!stream) {
- newtWinMessage("Error", "Ok",
+ newtWinMessage("Error", "OK",
"Cannot open fonts: %s", strerror(errno));
return LOADER_ERROR;
}
@@ -296,7 +296,7 @@ int chooseLanguage(char ** lang, int flags) {
newtWinMenu(_("Choose a Language"), _("What language should be used "
"during the installation process?"), 40, 5, 5, 8,
- langs, &choice, _("Ok"), NULL);
+ langs, &choice, _("OK"), NULL);
*lang = languages[choice].lc_all;
@@ -355,7 +355,7 @@ int chooseLanguage(char ** lang, int flags) {
(strcmp (languages[choice].font, "None"))) {
loadLanguage (NULL, flags);
} else {
- newtWinMessage("Language Unavailable", "Ok",
+ newtWinMessage("Language Unavailable", "OK",
"%s display is unavailable in text mode. The "
"installation will continue in English until the "
"display of %s is possible.", languages[choice].lang,
@@ -570,7 +570,7 @@ int chooseKeyboard(char ** keymap, char ** kbdtypep, int flags) {
if (i < hdr.numEntries)
num = i;
else
- newtWinMessage("Kickstart Error", "Ok", "Bad keymap "
+ newtWinMessage("Kickstart Error", "OK", "Bad keymap "
"name %s passed to kickstart command.",
argv[1]);
}
@@ -605,7 +605,7 @@ int chooseKeyboard(char ** keymap, char ** kbdtypep, int flags) {
rc = newtWinMenu(_("Keyboard Type"),
_("What type of keyboard do you have?"),
- 40, 5, 5, 8, kbds, &num, _("Ok"), _("Back"), NULL);
+ 40, 5, 5, 8, kbds, &num, _("OK"), _("Back"), NULL);
if (rc == 2) return LOADER_BACK;
/* num needs to index the right keyboard infoTable */
diff --git a/loader/loader.c b/loader/loader.c
index ba0cbf785..053e71423 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -320,7 +320,7 @@ int addDeviceManually(moduleInfoSet modInfo, moduleList modLoaded,
do {
rc = newtWinMenu(_("Devices"),
_("What kind of device would you like to add"), 40,
- 0, 20, 2, items, &choice, _("Ok"), _("Back"), NULL);
+ 0, 20, 2, items, &choice, _("OK"), _("Back"), NULL);
if (rc == 2) return LOADER_BACK;
if (choice == 1)
@@ -475,7 +475,7 @@ static int setupStage2Image(int fd, char * dest, int flags,
}
if (mountLoopback(dest, mntpoint, device)) {
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
"Error mounting /dev/%s on %s (%s). This shouldn't "
"happen, and I'm rebooting your system now.",
device, mntpoint, strerror(errno));
@@ -532,7 +532,7 @@ static char * setupIsoImages(char * device, char * type, char * dirName,
sprintf(filespec, "/tmp/hdimage/%s", dirName);
if (!(dir = opendir(filespec))) {
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("Failed to read directory %s: %s"),
filespec, strerror(errno));
umount("/tmp/hdimage");
@@ -850,7 +850,7 @@ static char * mountHardDrive(struct installMethod * method,
NEWT_GRID_COMPONENT, dirEntry,
NEWT_GRID_EMPTY);
- buttons = newtButtonBar(_("Ok"), &okay, _("Back"), &back, NULL);
+ buttons = newtButtonBar(_("OK"), &okay, _("Back"), &back, NULL);
grid = newtCreateGrid(1, 4);
newtGridSetField(grid, 0, 0, NEWT_GRID_COMPONENT, text,
@@ -909,7 +909,7 @@ static char * mountHardDrive(struct installMethod * method,
url = setupIsoImages(part->name + 5, type, dir, flags);
if (!url) {
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("Device %s does not appear to contain "
"Red Hat CDROM images."), part->name);
continue;
@@ -964,7 +964,7 @@ static char * setupCdrom(struct installMethod * method,
if (probeQuickly) return NULL;
if (hasCdrom) {
- rc = newtWinChoice(_("Error"), _("Ok"), _("Back"),
+ rc = newtWinChoice(_("Error"), _("OK"), _("Back"),
_("I could not find a Red Hat Linux "
"CDROM in any of your CDROM drives. Please insert "
"the Red Hat CD and press \"OK\" to retry."));
@@ -1058,7 +1058,7 @@ static int ensureNetDevice(struct knownDevices * kd,
_("You have multiple network devices on this system. "
"Which would you like to install through?"), 40, 10, 10,
deviceNums < 6 ? deviceNums : 6, devices,
- &deviceNum, _("Ok"), _("Back"), NULL);
+ &deviceNum, _("OK"), _("Back"), NULL);
if (rc == 2)
return LOADER_BACK;
@@ -1137,12 +1137,12 @@ static char * mountNfsImage(struct installMethod * method,
}
} else {
umount("/mnt/source");
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("That directory does not seem to contain "
"a Red Hat installation tree."));
}
} else {
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("I could not mount that directory from the server"));
}
@@ -1182,7 +1182,7 @@ static int loadSingleUrlImage(struct iurlinfo * ui, char * file, int flags,
if (fd == -2) return 1;
if (fd < 0) {
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("File %s/%s not found on server."),
ui->prefix, file);
return 1;
@@ -1210,7 +1210,7 @@ static int loadUrlImages(struct iurlinfo * ui, int flags) {
"/tmp/ramfs/netstg1.img",
"/mnt/runtime", "loop0")) {
newtWinMessage(ui->protocol == URL_METHOD_FTP ?
- _("FTP") : _("HTTP"), _("Ok"),
+ _("FTP") : _("HTTP"), _("OK"),
_("Unable to retrieve the first install image"));
return 1;
}
@@ -1241,7 +1241,7 @@ static char * mountUrlImage(struct installMethod * method,
!strcmp(method->name, "FTP") ? URL_METHOD_FTP : URL_METHOD_HTTP;
if (totalMemory() < 18000) {
- newtWinMessage(_("Error"), _("Ok"), _("FTP and HTTP installs "
+ newtWinMessage(_("Error"), _("OK"), _("FTP and HTTP installs "
"require 20MB or more of system memory."));
return NULL;
@@ -1487,7 +1487,7 @@ static char * doMountImage(char * location,
_("What type of media contains the packages to be "
"installed?"),
30, 10, 20, 6, installNames,
- &methodNum, _("Ok"), _("Back"), NULL);
+ &methodNum, _("OK"), _("Back"), NULL);
if (rc && rc != 1) {
step = STEP_KBD;
dir = -1;
@@ -2204,7 +2204,7 @@ int kickstartFromFloppy(char * location, moduleList modLoaded,
}
if (access("/tmp/ks/ks.cfg", R_OK)) {
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("Cannot find ks.cfg on boot floppy."));
return 1;
}
@@ -2234,7 +2234,7 @@ int copyDirectory(char * from, char * to) {
mkdir(to, 0755);
if (!(dir = opendir(from))) {
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("Failed to read directory %s: %s"),
from, strerror(errno));
return 1;
@@ -2297,7 +2297,7 @@ void loadUpdates(struct knownDevices *kd, moduleList modLoaded,
startNewt(flags);
do {
- rc = newtWinChoice(_("Updates Disk"), _("Ok"), _("Cancel"),
+ rc = newtWinChoice(_("Updates Disk"), _("OK"), _("Cancel"),
_("Insert your updates disk and press \"OK\" to continue."));
if (rc == 2) return;
@@ -2312,7 +2312,7 @@ logMessage("UPDATES floppy device is %s", floppyDevice);
devMakeInode(floppyDevice, "/tmp/floppy");
if (doPwMount("/tmp/floppy", "/tmp/update-disk", "ext2", 1, 0, NULL,
NULL)) {
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("Failed to mount floppy disk."));
} else {
/* Copy everything to /tmp/updates so .so files don't get run
@@ -2521,7 +2521,7 @@ static void ideSetup(moduleList modLoaded, moduleDeps modDeps,
static void checkForRam(int flags) {
if (!FL_EXPERT(flags) && (totalMemory() < MIN_RAM)) {
startNewt(flags);
- newtWinMessage(_("Error"), _("Ok"), _("You do not have enough "
+ newtWinMessage(_("Error"), _("OK"), _("You do not have enough "
"RAM to install Red Hat Linux on this machine."));
stopNewt();
exit(0);
diff --git a/loader/net.c b/loader/net.c
index 211621c12..08d037cc1 100644
--- a/loader/net.c
+++ b/loader/net.c
@@ -182,7 +182,7 @@ int nfsGetSetup(char ** hostptr, char ** dirptr) {
" o the name or IP number of your NFS server\n"
" o the directory on that server containing\n"
" Red Hat Linux for your architecture"), 60, 5, 15,
- 24, entries, _("Ok"), _("Back"), NULL);
+ 24, entries, _("OK"), _("Back"), NULL);
if (rc == 2) {
if (newServer) free(newServer);
@@ -269,7 +269,7 @@ static int getDnsServers(struct networkDeviceConfig * cfg) {
"If you know what your nameserver is, please enter it "
"now. If you don't have this information, you can leave "
"this field blank and the install will continue."),
- 40, 5, 10, 25, entry, _("Ok"), _("Back"), NULL);
+ 40, 5, 10, 25, entry, _("OK"), _("Back"), NULL);
if (rc == 2) return LOADER_BACK;
@@ -356,7 +356,7 @@ int readNetConfig(char * device, struct networkDeviceConfig * cfg, int flags) {
newtGridSetField(subgrid, 1, 3, NEWT_GRID_COMPONENT, c.nsEntry,
1, 0, 0, 0, 0, 0);
- buttons = newtButtonBar(_("Ok"), &okay, _("Back"), &back, NULL);
+ buttons = newtButtonBar(_("OK"), &okay, _("Back"), &back, NULL);
grid = newtCreateGrid(1, 4);
newtGridSetField(grid, 0, 0, NEWT_GRID_COMPONENT, text,
@@ -719,7 +719,7 @@ int kickstartNetwork(char ** devicePtr, struct networkDeviceConfig * netDev,
}
if (rc < -1) {
- newtWinMessage(_("kickstart"), _("Ok"),
+ newtWinMessage(_("kickstart"), _("OK"),
_("bad argument to kickstart network command %s: %s"),
poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
poptStrerror(rc));
@@ -752,7 +752,7 @@ int kickstartNetwork(char ** devicePtr, struct networkDeviceConfig * netDev,
strcpy(netDev->dev.device, device);
readNetConfig("eth0", netDev, flags);
} else {
- newtWinMessage(_("kickstart"), _("Ok"),
+ newtWinMessage(_("kickstart"), _("OK"),
_("Bad bootproto %s specified in network command"),
bootProto);
return -1;
diff --git a/loader/pcmcia.c b/loader/pcmcia.c
index 84fe99215..255e6eaae 100644
--- a/loader/pcmcia.c
+++ b/loader/pcmcia.c
@@ -101,7 +101,7 @@ int startPcmcia(char * floppyDevice, moduleList modLoaded, moduleDeps modDeps,
}
while (rc) {
- rc = newtWinChoice(_("PCMCIA"), _("Ok"), _("Cancel"),
+ rc = newtWinChoice(_("PCMCIA"), _("OK"), _("Cancel"),
_("Please insert your PCMCIA driver disk "
"into your floppy drive now."));
if (rc == 2) return LOADER_BACK;
@@ -111,7 +111,7 @@ int startPcmcia(char * floppyDevice, moduleList modLoaded, moduleDeps modDeps,
rc = 1;
if (doPwMount("/tmp/floppy", "/modules", "ext2", 1, 0, NULL,
NULL)) {
- newtWinMessage(_("Error"), _("Ok"), _("Failed to mount disk."));
+ newtWinMessage(_("Error"), _("OK"), _("Failed to mount disk."));
} else {
int fd;
@@ -128,7 +128,7 @@ int startPcmcia(char * floppyDevice, moduleList modLoaded, moduleDeps modDeps,
if (mlLoadModule("pcmcia_core", NULL, modLoaded, modDeps,
NULL, modInfo, flags)) {
newtPopWindow();
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("That floppy does not look like a "
"Red Hat PCMCIA driver disk."));
}
diff --git a/loader/urls.c b/loader/urls.c
index 3292ab747..85af79779 100644
--- a/loader/urls.c
+++ b/loader/urls.c
@@ -155,7 +155,7 @@ int urlMainSetupPanel(struct iurlinfo * ui, urlprotocol protocol,
else
*doSecondarySetup = ' ';
- buttons = newtButtonBar(_("Ok"), &okay, _("Back"), &cancel, NULL);
+ buttons = newtButtonBar(_("OK"), &okay, _("Back"), &cancel, NULL);
switch (protocol) {
case URL_METHOD_FTP:
@@ -233,12 +233,12 @@ int urlMainSetupPanel(struct iurlinfo * ui, urlprotocol protocol,
answer = newtRunForm(form);
if (answer != cancel) {
if (!strlen(site)) {
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("You must enter a server name."));
continue;
}
if (!strlen(dir)) {
- newtWinMessage(_("Error"), _("Ok"),
+ newtWinMessage(_("Error"), _("OK"),
_("You must enter a directory."));
continue;
}
@@ -384,7 +384,7 @@ int urlSecondarySetupPanel(struct iurlinfo * ui, urlprotocol protocol) {
0, 0, 0, 0, NEWT_ANCHOR_LEFT, 0);
#endif
- buttons = newtButtonBar(_("Ok"), &okay, _("Back"), &cancel, NULL);
+ buttons = newtButtonBar(_("OK"), &okay, _("Back"), &cancel, NULL);
grid = newtCreateGrid(1, 3);
newtGridSetField(grid, 0, 0, NEWT_GRID_COMPONENT, text, 0, 0, 0, 0, 0, 0);
diff --git a/text.py b/text.py
index be666c67a..97aeb4f1c 100644
--- a/text.py
+++ b/text.py
@@ -279,7 +279,7 @@ class InstallInterface:
flags = ((parted.EXCEPTION_FIX, N_("Fix")),
(parted.EXCEPTION_YES, N_("Yes")),
(parted.EXCEPTION_NO, N_("No")),
- (parted.EXCEPTION_OK, N_("Ok")),
+ (parted.EXCEPTION_OK, N_("OK")),
(parted.EXCEPTION_RETRY, N_("Retry")),
(parted.EXCEPTION_IGNORE, N_("Ignore")),
(parted.EXCEPTION_CANCEL, N_("Cancel")))
diff --git a/textw/fdisk_text.py b/textw/fdisk_text.py
index 69f9c13ee..1b0cc4ee0 100644
--- a/textw/fdisk_text.py
+++ b/textw/fdisk_text.py
@@ -38,7 +38,7 @@ class fdiskPartitionWindow:
(button, choice) = \
ListboxChoiceWindow(screen, _("Disk Setup"),
_("Choose a disk to run fdisk on"), choices,
- [ (_("Ok"), "done"), (_("Edit"), "edit"),
+ [ (_("OK"), "done"), (_("Edit"), "edit"),
TEXT_BACK_BUTTON ], width = 50, help = "fdisk")
if button != "done" and button != TEXT_BACK_CHECK:
diff --git a/textw/packages_text.py b/textw/packages_text.py
index 4e5e31986..7d92dd24a 100644
--- a/textw/packages_text.py
+++ b/textw/packages_text.py
@@ -295,7 +295,7 @@ class PackageDepWindow:
g.add (TextboxReflowed (50, _("Some of the packages you have "
"selected to install require "
"packages you have not selected. If "
- "you just select Ok all of those "
+ "you just select OK all of those "
"required packages will be "
"installed.")), 0, 0, (0, 0, 0, 1))
g.add (Label ("%-20s %-20s" % (_("Package"), _("Requirement"))), 0, 1, anchorLeft = 1)
diff --git a/textw/partition_text.py b/textw/partition_text.py
index 4d954cf18..8262e3e15 100644
--- a/textw/partition_text.py
+++ b/textw/partition_text.py
@@ -976,7 +976,7 @@ class PartitionWindow:
self.bb = ButtonBar (screen, ((_("New"), "new", "F2"), (_("Edit"), "edit", "F3"), (_("Delete"), "delete", "F4"), (_("RAID"), "raid", "F11"), TEXT_OK_BUTTON, TEXT_BACK_BUTTON))
self.g.add(self.bb, 0, 2, (0, 1, 0, 0))
self.g.addHotKey("F5")
- screen.pushHelpLine( _(" F1-Help F2-New F3-Edit F4-Delete F5-Reset F12-Ok "))
+ screen.pushHelpLine( _(" F1-Help F2-New F3-Edit F4-Delete F5-Reset F12-OK "))
self.populate()
diff --git a/textw/silo_text.py b/textw/silo_text.py
index 3f8c68a92..ec3219c42 100644
--- a/textw/silo_text.py
+++ b/textw/silo_text.py
@@ -144,7 +144,7 @@ class SiloImagesWindow:
device = Label("/dev/" + partition)
newLabel = Entry (20, scroll = 1, returnExit = 1, text = itemLabel)
- buttons = ButtonBar(screen, [_("Ok"), _("Clear"), _("Cancel")])
+ buttons = ButtonBar(screen, [_("OK"), _("Clear"), _("Cancel")])
subgrid = Grid(2, 2)
subgrid.setField(devLabel, 0, 0, anchorLeft = 1)
@@ -157,7 +157,7 @@ class SiloImagesWindow:
g.add(buttons, 0, 1, growx = 1)
result = ""
- while (result != string.lower(_("Ok")) and result != newLabel):
+ while (result != string.lower(_("OK")) and result != newLabel):
result = g.run()
if (buttons.buttonPressed(result)):
result = buttons.buttonPressed(result)
generated by cgit (git 2.34.1) at 2024-11-11 22:51:52 +0000