=== modified file 'HUBackup/GUI/SimpleGladeApp.py'
--- HUBackup/GUI/SimpleGladeApp.py 2006-05-02 11:17:36 +0000
+++ HUBackup/GUI/SimpleGladeApp.py 2007-06-28 13:09:28 +0000
@@ -39,7 +39,7 @@
languages.
app_name:
- a domain to look for translations, tipically the name of an application.
+ a domain to look for translations, typically the name of an application.
locale_dir:
a directory with locales like locale_dir/lang_isocode/LC_MESSAGES/app_name.mo
@@ -74,11 +74,11 @@
root:
the name of the widget that is the root of the user interface,
usually a window or dialog (a top level widget).
- If None or ommited, the full user interface is loaded.
+ If None or omitted, the full user interface is loaded.
domain:
A domain to use for loading translations.
- If None or ommited, no translation is loaded.
+ If None or omitted, no translation is loaded.
**kwargs:
a dictionary representing the named extra arguments.
@@ -119,7 +119,7 @@
def new(self):
"""
Method called when the user interface is loaded and ready to be used.
- At this moment, the widgets are loaded and can be refered as self.widget_name
+ At this moment, the widgets are loaded and can be referred as self.widget_name
"""
pass
@@ -143,7 +143,7 @@
"""
It is internally used to normalize the name of the widgets.
It means a widget named foo:vbox-dialog in glade
- is refered self.vbox_dialog in the code.
+ is referred self.vbox_dialog in the code.
It also sets a data "prefixes" with the list of
prefixes a widget has for each widget.
@@ -170,7 +170,7 @@
It means entry1 and label3 has a prefix action named foo.
Then, prefix_actions_proxy must have a method named prefix_foo which
- is called everytime a widget with prefix foo is found, using the found widget
+ is called every time a widget with prefix foo is found, using the found widget
as argument.
prefix_actions_proxy:
@@ -311,7 +311,7 @@
"""
Starts the main loop of processing events checking for Control-C.
- The default implementation checks wheter a Control-C is pressed,
+ The default implementation checks whether a Control-C is pressed,
then calls on_keyboard_interrupt().
Use this method for starting programs.
=== modified file 'HUBackup/GUI/hubackup.py'
--- HUBackup/GUI/hubackup.py 2007-02-10 09:20:34 +0000
+++ HUBackup/GUI/hubackup.py 2007-06-28 13:17:31 +0000
@@ -55,7 +55,7 @@
self.curCdBurn = None
self.curIsoBuild = None
self.spawnedProcOBJ = None # required to hold spawned object, and then later get its pty fd.
- self.curPrecent = 0 # global precentage holder of spawned process that report it or can be calc'd it
+ self.curPrecent = 0 # global percentage holder of spawned process that report it or can be calc'd it
SimpleGladeApp.__init__(self, path, root, domain, **kwargs)
def new(self):
@@ -131,22 +131,22 @@
# to what nautilus-cd-burner does in order to find out how
# much free space is left on the CD, to make sure the
# current differential archive will fit on it.
- # 2) Not a CDROM device. In which case we will assume this
+ # 2) Not a CD-ROM device. In which case we will assume this
# device has not been formatted (for example, a non
# initialized USB disk) and thus not usable as backup target
# so we will ignore it and not list it. Actually we are now
# ignoring it part of the new policy - the gtk.ComboBox
# should only allow to choose between available RW optical
- # drives, and let a filechooserdialog to do the rest of the
+ # drives, and let a filechooser dialog to do the rest of the
# work of backing up to other targets that are more closely
# operated as a file system. (USB drives, NFS mounts etc.)
- # 3) This is a CDROM device, but is currently empty and does
- # not hold any media. We shall list it without aditional
+ # 3) This is a CD-ROM device, but is currently empty and does
+ # not hold any media. We shall list it without additional
# information as this information will be available only
- # when the user inserts a CDR/CDRW into the drive. This is
- # (from this point) likely to happen when the users chooses
- # to execute a backup process when he has not medium in
- # drive.
+ # when the user inserts a CD-R/CD-RW into the drive. This is
+ # (from this point) likely to happen when the user chooses
+ # to execute a backup process when he has not got a medium in
+ # the drive.
if thisDevice['Type'] == "cdrom":
tmpListRef.append([StockId,Name,"","",i])
continue
@@ -319,7 +319,7 @@
def GUIBackupPrepare(self):
if DEBUG_PRINT: print "Enterting GUIBackupPrepare method."
- # set up the backup stages func list exlucindg the startup stage (GUIBackupPrepare)
+ # set up the backup stages func list excluding the startup stage (GUIBackupPrepare)
# GUIBurnPrepare is not here since burning is done after each ISO creation , kick started by
# GUIIsolatePrepare.
@@ -407,7 +407,7 @@
self.running = True
self.spawnedProcOBJ = self.bkpEngine.pre_isolate_kick()
self.curBkp = self.bkpEngine.isolate()
- self.cur_line = _(" Extracting Catalogue...")
+ self.cur_line = _(" Extracting Catalog...")
self.pushBkpTagID = gobject.timeout_add(100,self.pushGUIBackup)
gobject.io_add_watch(self.spawnedProcOBJ.fileno(), gobject.IO_IN, self.watch_Backup_pty_callback)
@@ -463,10 +463,10 @@
try:
fsMisc.eject(self.backup_target_device)
except fsMisc.fsMiscEjectError:
- self.popupMountErrorMessage(_("Could not eject media. Choose OK to go back and then retry."))
+ self.popupMountErrorMessage(_("Could not eject medium. Choose OK to go back and then retry."))
return
- pre_iso_build_message = _("Please take out the CD in drive , and insert your CHANGES backup CD instead."
- "If this is the first time you are creating a differential backup snapshot,"
+ pre_iso_build_message = _("Please take out the CD in drive and insert your CHANGES backup CD instead."
+ "If this is the first time you have created a differential backup snapshot,"
"insert a blank CD onto which the archive will be burnt")
dialog = gtk.MessageDialog(self.window_backup, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
@@ -497,8 +497,8 @@
vol_lable)
except ISOBuilder.CannotUnMountError:
- self.popupMountErrorMessage(_("Cannont unmount chosen reference device."
- "This is neccessary to continue. Click OK to go back"
+ self.popupMountErrorMessage(_("Cannot unmount chosen reference device."
+ "This is necessary to continue. Click OK to go back"
"and retry starting backup operation."))
self.goBack()
@@ -511,10 +511,10 @@
def GUIVerifyPrepare(self, standalone=False):
# standalone parameter indicated weather we are executed part of a complete backup process and
- # scheduled by self.nextPhase(..) or weather we were called as a response to cliking on the
- # "Verfiy Integrity" Button from the main backup/restore dialog.
+ # scheduled by self.nextPhase(..) or weather we were called as a response to clicking on the
+ # "Verify Integrity" Button from the main backup/restore dialog.
# Another thing, since this method is not a first method to kick up a process,
- # we need to attach the progress propogation stuff inside of it, to distinguish from the backup method which
+ # we need to attach the progress propagation stuff inside of it, to distinguish from the backup method which
# actually starts a complete backup process, and thus has someone else to take care of that for it.
if DEBUG_PRINT: print "* Entering GUIVerifyPrepare method."
self.aborted = False
@@ -544,7 +544,7 @@
else:
self.backup_reference_device = None
if DEBUG_PRINT: print "no device chosen for reference to verify backup data on"
- myresult = self.popupMsg(_("Plesae go back and choose a reference device where media with backup data is available."),
+ myresult = self.popupMsg(_("Please go back and choose a reference device where medium with backup data is available."),
buttonsSpec=gtk.BUTTONS_OK)
return
@@ -578,7 +578,7 @@
try:
bkpSourceMountPoint = fsMisc.mount(self.backup_reference_device) # replaced with the reference device for the verify
except fsMisc.fsMiscMountError:
- if DEBUG_PRINT: print "* Cannot mount source device. Aboring."
+ if DEBUG_PRINT: print "* Cannot mount source device. Aborting."
# removed reference passing for the 'parent' window to allow calling this from hurestore
dialog = gtk.MessageDialog(None , gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
gtk.MESSAGE_WARNING,
@@ -621,8 +621,8 @@
dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
gtk.MESSAGE_WARNING,
gtk.BUTTONS_OK,
- _("The media does not seem to contain valid HUBackup data.\n"
- "Please make sure media #1 of your backup set is in drive and retry."
+ _("The medium does not seem to contain valid HUBackup data.\n"
+ "Please make sure medium #1 of your backup set is in drive and retry."
"(You can always use the \"Verify\" button independently)"))
dialog.show()
res = dialog.run()
@@ -688,8 +688,8 @@
if DEBUG_PRINT: print "* Moving to next cd burn process "
def popupCatalogNeeded(self):
- catalogNeededMsg = _("The reference device you have specificed does not seem to contain a valid"
- "catalog neccessary for creating a differential backup snapshot.\n"
+ catalogNeededMsg = _("The reference device you have specified does not seem to contain a valid"
+ "catalog necessary for creating a differential backup snapshot.\n"
"Please provide this in the reference device you have chosen."
"If you've backed up to CDs, this is the CD labeled:\n"
"'HUBackup MASTER ARCHIVE CATALOG #1'")
@@ -705,7 +705,7 @@
if msg:
myMsg = msg
else:
- myMsg = _("Error mounting media. Make sure the media is not blank and retry.")
+ myMsg = _("Error mounting medium. Make sure the medium is not blank and retry.")
dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
gtk.MESSAGE_ERROR,
gtk.BUTTONS_OK,
@@ -735,7 +735,7 @@
if self.diffBackup:
pre_burn_message = _("Please make sure the your CHANGES backup CD is in drive to continue.\n")
else:
- pre_burn_message = _("Please make sure a blank media is in chosen target drive to continue.")
+ pre_burn_message = _("Please make sure a blank medium is in chosen target drive to continue.")
dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,
gtk.MESSAGE_QUESTION,
@@ -797,11 +797,11 @@
# check for slice changes which mean CD changes
if self.bkpEngine.waitingForSliceChange():
if self.bkpEngine.changeSliceReason()=="next":
- message = _("Please insert backup media #%s") % self.bkpEngine.reportNeededSliceNumber()
+ message = _("Please insert backup medium #%s") % self.bkpEngine.reportNeededSliceNumber()
elif self.bkpEngine.changeSliceReason()=="last":
- message = _("Please insert the last backup media and click okay to continue")
+ message = _("Please insert the last backup medium and click okay to continue")
else:
- message = _("Fatal error occured, exiting in error!")
+ message = _("Fatal error occurred, exiting in error!")
self.popupMsg(message)
sys.exit(1)
@@ -911,7 +911,7 @@
# start the backup process.
def on_button_start_clicked(self, widget, *args):
- # we need to gather values for several properties that are neccessary
+ # we need to gather values for several properties that are necessary
# to execute the backup process.
# This begins by getting the selected item from the combo box
model = self.combo.get_model()
@@ -949,12 +949,12 @@
okay_to_proceed = True
else:
if DEBUG_PRINT:
- print "* Devices seems to still be empty. Are you"\
- " sure you've inserted a media in drive ;-)?"
+ print "* Device seems to still be empty. Are you"\
+ " sure you've inserted a medium in drive ;-)?"
else:
if DEBUG_PRINT:
- print "backup prcoess cancelled. user would not insert"\
- " media in drive and selected to backup to cdrom"
+ print "backup process canceled. User didn't insert"\
+ " medium in drive and select backup to cdrom"
return
# Let's do some printouts to see what sort of sessions we're going to
=== modified file 'data/hubackup.desktop.in'
--- data/hubackup.desktop.in 2006-05-05 09:27:34 +0000
+++ data/hubackup.desktop.in 2007-06-28 13:18:51 +0000
@@ -1,7 +1,7 @@
[Desktop Entry]
_Name=Home User Backup
_GenericName=Desktop Backup Program
-_Comment=Backup Your Home Data
+_Comment=Backup your home folder's data
Exec=hubackup
Terminal=false
Type=Application
=== modified file 'data/hubackup.glade'
--- data/hubackup.glade 2007-02-11 12:55:33 +0000
+++ data/hubackup.glade 2007-06-28 13:21:12 +0000
@@ -592,7 +592,7 @@
True
<big><b>Always backup to a separate medium</b></big>
-Otherwise you could loose all your data in case of an hardware failure.
+Otherwise you could lose all your data in case of an hardware failure.
False
True
GTK_JUSTIFY_LEFT
@@ -2060,7 +2060,7 @@
True
- <i>You will need approximiately 5 Cdroms or 1 DVD.</i>
+ <i>You will need approximately 5 CD-ROMs or 1 DVD.</i>
False
True
GTK_JUSTIFY_LEFT
=== modified file 'data/hurestore.1'
--- data/hurestore.1 2006-05-05 12:41:13 +0000
+++ data/hurestore.1 2007-06-28 13:22:43 +0000
@@ -8,7 +8,7 @@
.SH SYNOPSIS
.B hurestore
.SH DESCRIPTION
-The Home User Backup System tries to provide the non too technical,
+The Home User Backup System tries to provide a not too technical
home user with a concise backup and restore application to cater
for keeping his data safe and restorable in times of need.
@@ -19,10 +19,10 @@
but you can choose another folder to backup through the main dialog if
you wish.
-HUBackup uses the Disk ARchive , DAR underneath to do the acutal
+HUBackup uses the Disk ARchive format (DAR) internally to do the acutal
archiving. To read more about it see http://dar.linux.free.fr/#pres
-To use it, just run hubackup from your terminal or run it from the
+To use HUBackup, just run hubackup from your terminal or run it from the
"System"->"Administration" menu.
HUBackup was written by Sivan Greenberg and
=== modified file 'data/hurestore.glade'
--- data/hurestore.glade 2007-02-11 09:15:06 +0000
+++ data/hurestore.glade 2007-06-28 13:24:32 +0000
@@ -79,7 +79,7 @@
True
- <b>Indicate where to find saved Backup Data:</b>
+ <b>Indicate where to find saved backup data:</b>
False
True
GTK_JUSTIFY_LEFT
@@ -207,7 +207,7 @@
True
- <i>(Use the file chooser if you would like to restore to an alternative location and afterwards manually cherry-pick lost or changed files)</i>
+ <i>(Use the file chooser if you would like to restore to an alternative location and afterwards manually cherry-pick lost or changed files)</i>
False
True
GTK_JUSTIFY_LEFT
@@ -263,7 +263,7 @@
True
- Select A Folder
+ Select a folder
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER
True
False
@@ -832,7 +832,7 @@
True
- <b>Restore Your Data </b>
+ <b>Restore your data </b>
False
True
GTK_JUSTIFY_LEFT
=== modified file 'data/restore-progress.glade'
--- data/restore-progress.glade 2006-03-20 23:33:43 +0000
+++ data/restore-progress.glade 2007-06-28 13:25:33 +0000
@@ -68,7 +68,7 @@
True
- <b>Restoring Data</b>
+ <b>Restoring data</b>
False
True
GTK_JUSTIFY_LEFT
=== modified file 'data/standalone-restore-progress.glade'
--- data/standalone-restore-progress.glade 2006-12-20 11:40:47 +0000
+++ data/standalone-restore-progress.glade 2007-06-28 13:26:03 +0000
@@ -63,7 +63,7 @@
True
- <big><b>Verifying Backup</b></big>
+ <big><b>Verifying backup</b></big>
False
True
GTK_JUSTIFY_LEFT