# Bazaar revision bundle v0.9 # # message: # UI fixes # committer: Bruce Cowan # date: Thu 2007-06-28 21:08:31.967999935 +0100 === modified file HUBackup/GUI/SimpleGladeApp.py // last-changed:bruce.cowan@ds ... l.pipex.com-20070628134338-jmk1lrbk36nvdyvv --- HUBackup/GUI/SimpleGladeApp.py +++ HUBackup/GUI/SimpleGladeApp.py @@ -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 // last-changed:bruce.cowan@dsl.pipe ... x.com-20070628134338-jmk1lrbk36nvdyvv --- HUBackup/GUI/hubackup.py +++ HUBackup/GUI/hubackup.py @@ -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 // last-changed:bruce.cowan@dsl.pipe ... x.com-20070628134338-jmk1lrbk36nvdyvv --- data/hubackup.desktop.in +++ data/hubackup.desktop.in @@ -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 +++ data/hubackup.glade @@ -1,2326 +1,1427 @@ - - - + + + - - - True - Backup - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ALWAYS - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - - 12 - True - False - 24 - - - - True - False - 18 - - - - True - False - 6 - - - - True - <b>Files and folders to backup</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 18 - - - - True - False - 6 - - - - True - False - 6 - - - - True - True - Backup all files in my home folder - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - Exclude temporary files, music and videos - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - - - - - 0 - False - False - - - - - - True - False - 6 - - - - True - True - Backup only a specific folder: - True - GTK_RELIEF_NORMAL - True - False - False - True - custom_source_path - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Datei auswählen - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - True - False - False - -1 - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 6 - - - - True - <b>Save Backup To</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 12 - - - - True - GTK_BUTTONBOX_DEFAULT_STYLE - 0 - - - - True - True - gtk-help - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - True - - - - - - True - GTK_BUTTONBOX_END - 12 - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - _Backup - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - True - GTK_FILE_CHOOSER_ACTION_SAVE - True - False - False - False - Choose a backup file - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 24 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - True - gtk-save - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 12 - - - - True - gtk-dialog-info - 6 - 0 - 0.5 - 0 - 0 - - - 0 - False - True - - - - - - True - <big><b>Always backup to a separate medium</b></big> - -Otherwise you could loose all your data in case of an hardware failure. - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - False - False - - - - - - - - 6 - True - Creating New Backup - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - True - False - 12 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - False - 12 - - - - True - <big><b>Creating new backup</b></big> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 3 - 2 - False - 6 - 12 - - - - True - 0.5 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - True - 0.5 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - True - 0.5 - 0.5 - 0 - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - True - Preparing backup - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - Writing the backup - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - Verifying the backup - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 2 - 3 - fill - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 6 - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.10000000149 - PANGO_ELLIPSIZE_NONE - - - 0 - False - False - - - - - - True - <i>Adding bladas.asd to the archive</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - False - False - - - - - 0 - True - True - - - - - - - - 6 - True - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - True - False - 18 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - _Restore Backed Up File - True - GTK_RELIEF_NORMAL - True - -5 - - - - - - True - True - True - Keep The Current File - True - GTK_RELIEF_NORMAL - True - -6 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - False - 12 - - - - True - gtk-dialog-question - 6 - 0 - 0 - 0 - 0 - - - 0 - False - True - - - - - - True - False - 12 - - - - True - <big><b>There is a later version of »blal.deb« on your system</b></big> + + True + Backup + False + GTK_WIN_POS_CENTER_ALWAYS + + + + True + 12 + 24 + + + True + 18 + + + True + 6 + + + True + 0 + <b>Files and folders to backup</b> + True + + + False + False + + + + + True + + + True + + + + False + False + + + + + True + 18 + + + True + 6 + + + True + 6 + + + True + True + Backup all files in my home folder + True + True + + + + False + False + + + + + True + + + True + + + + False + False + + + + + True + True + Exclude temporary files, music and videos + True + True + + + + False + False + 1 + + + + + False + False + 1 + + + + + True + 6 + + + True + True + Backup only a specific folder: + True + True + custom_source_path + + + False + False + + + + + True + + + True + + + + False + False + + + + + True + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + Datei auswählen + + + 1 + + + + + 1 + + + + + 2 + + + + + + + + + 1 + + + + + 1 + + + + + False + False + + + + + True + 6 + + + True + 0 + <b>Save Backup To</b> + True + + + False + False + + + + + True + + + True + + + + False + False + + + + + True + 6 + + + + + + + + + 1 + + + + + 1 + + + + + 1 + + + + + + + True + 12 + + + True + + + True + True + gtk-help + True + + + + + False + + + + + True + 12 + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + + + + + + True + True + True + _Backup + True + + + + 1 + + + + + 1 + + + + + 1 + + + + + + + True + Choose a backup file + GDK_WINDOW_TYPE_HINT_DIALOG + GTK_FILE_CHOOSER_ACTION_SAVE + + + True + 24 + + + True + 12 + + + True + 0 + gtk-dialog-info + 6 + + + False + + + + + True + <big><b>Always backup to a separate medium</b></big> + +Otherwise you could lose all your data in case of an hardware failure. + True + + + False + False + 1 + + + + + False + False + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + True + gtk-save + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + + + True + 6 + Creating New Backup + False + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + True + 12 + + + True + 6 + 12 + + + True + 0 + <big><b>Creating new backup</b></big> + True + + + False + False + + + + + True + + + True + + + + False + False + + + + + True + 3 + 2 + 12 + 6 + + + True + 0 + Verifying the backup + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + True + 0 + Writing the backup + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + 0 + Preparing backup + + + 1 + 2 + GTK_FILL + + + + + + True + gtk-missing-image + + + 2 + 3 + GTK_FILL + + + + + True + gtk-missing-image + + + 1 + 2 + GTK_FILL + + + + + True + gtk-missing-image + + + GTK_FILL + + + + + 1 + + + + + 1 + + + + + True + 6 + + + True + 0.10000000149 + + + False + False + + + + + True + 0 + <i>Adding bladas.asd to the archive</i> + True + + + False + False + 1 + + + + + False + False + 2 + + + + + 1 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + False + GTK_PACK_END + + + + + + + True + 6 + False + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + True + 18 + + + True + 6 + 12 + + + True + 0 + 0 + gtk-dialog-question + 6 + + + False + + + + + True + 12 + + + True + 0 + <big><b>There is a later version of »blal.deb« on your system</b></big> The file on the system was last modified on 2007-08-01. The backed up file is from 2006-01-01. - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - Apply the action for all further conflicts - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - 12 - True - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - True - False - 12 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - True - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 0 - - - - - - - - True - False - 0 - - - - True - <b><big>Insert a blank CD or DVD</big></b> + True + True + + + False + False + + + + + True + True + Apply the action for all further conflicts + True + True + + + False + False + 1 + + + + + 1 + + + + + 1 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + _Restore Backed Up File + True + -5 + + + 1 + + + + + True + True + True + _Keep The Current File + True + -6 + + + 2 + + + + + False + GTK_PACK_END + + + + + + + True + 12 + False + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + True + 12 + + + True + + + + + + True + + + True + 0 + <b><big>Insert a blank CD or DVD</big></b> To only backup the latest changes. bla bla. - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - 6 - True - Backup File love-me.dar - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - False - - - - - True - False - 12 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - - - True - True - True - _Add Changed Files - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - - True - True - True - _Verify - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - - True - True - True - _Restore - True - GTK_RELIEF_NORMAL - True - 0 - - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - False - 12 - - - - True - gtk-cdrom - 6 - 0 - 0 - 0 - 0 - - - 0 - False - True - - - - - - True - <b><big>Backup »%s«</big></b> + True + True + + + False + False + + + + + + + + 1 + + + + + 1 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + True + True + True + gtk-ok + True + -5 + + + 1 + + + + + False + GTK_PACK_END + + + + + + + True + 6 + Backup File love-me.dar + False + GDK_WINDOW_TYPE_HINT_DIALOG + False + + + + True + 12 + + + True + 6 + 12 + + + True + 0 + 0 + gtk-cdrom + 6 + + + False + + + + + True + 0 + <b><big>Backup »%s«</big></b> You can restore files from the backup, verify its integrity or add files that have been changed since the backup. - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - 6 - True - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - True - False - - - - True - False - 12 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - True - -7 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - False - 12 - - - - True - gtk-dialog-info - 6 - 0 - 0 - 0 - 0 - - - 0 - False - True - - - - - - True - False - 0 - - - - True - <big><b>To restore or to add changed files, insert the CD</b></big> + True + True + + + 1 + + + + + 1 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + + True + True + True + _Add Changed Files + True + + + + 1 + + + + + True + True + True + _Verify + True + + + + 2 + + + + + True + True + True + _Restore + True + + + + 3 + + + + + False + GTK_PACK_END + + + + + + + True + 6 + False + GDK_WINDOW_TYPE_HINT_DIALOG + True + False + + + True + 12 + + + True + 6 + 12 + + + True + 0 + 0 + gtk-dialog-info + 6 + + + False + + + + + True + + + True + 0 + <big><b>To restore or to add changed files, insert the CD.</b></big> The backup is now complete. - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - True - Restore - lala.dar - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 12 - True - False - 18 - - - - True - False - 12 - - - - True - False - 6 - - - - True - Files to restore: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 12 - - - - True - Restore to: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Datei auswählen - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - True - False - False - -1 - - - 0 - True - True - - - - - 0 - False - True - - - - - 0 - True - True - - - - - - True - False - 18 - - - - True - GTK_BUTTONBOX_DEFAULT_STYLE - 0 - - - - True - True - True - gtk-help - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - False - True - - - - - - True - GTK_BUTTONBOX_END - 12 - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - _Restore - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - True - True - - - - - 0 - False - True - - - - - - - - True - System Backup - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 12 - True - False - 24 - - - - True - False - 18 - - - - True - False - 6 - - - - True - <b>Backup data</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 18 - - - - True - False - 6 - - - - True - False - 6 - - - - True - True - All home folders - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - System configuration - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - List of installed software - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 6 - - - - True - <b>Backup medium</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - False - 6 - - - - True - Backup file + True + True + + + False + False + + + + + 1 + + + + + 1 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-close + True + -7 + + + + + False + GTK_PACK_END + + + + + + + True + Restore - lala.dar + + + True + 12 + 18 + + + True + 12 + + + True + 6 + + + True + 0 + Files to restore: + + + False + False + + + + + True + True + GTK_SHADOW_IN + + + True + True + + + + + 1 + + + + + + + True + 12 + + + True + Restore to: + + + False + False + + + + + True + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + Datei auswählen + + + 1 + + + + + False + 1 + + + + + + + True + 18 + + + True + + + True + True + True + gtk-help + True + + + + + + False + + + + + True + 12 + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + + + + + + True + True + True + _Restore + True + + + + 1 + + + + + 1 + + + + + False + 1 + + + + + + + True + System Backup + False + + + True + 12 + 24 + + + True + 18 + + + True + 6 + + + True + 0 + <b>Backup data</b> + True + + + False + False + + + + + True + + + True + + + + False + False + + + + + True + 18 + + + True + 6 + + + True + 6 + + + True + True + All home folders + True + True + + + False + False + + + + + True + True + System configuration + True + True + + + False + False + 1 + + + + + True + True + List of installed software + True + True + + + False + False + 2 + + + + + + + + + 1 + + + + + 1 + + + + + False + False + + + + + True + 6 + + + True + 0 + <b>Backup medium</b> + True + + + False + False + + + + + True + + + True + + + + False + False + + + + + True + 6 + + + True + Backup file DVD/CD-Writer SuperToll - False - True - - - 0 - True - True - - - - - - True - <i>You will need approximiately 5 Cdroms or 1 DVD.</i> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - True - False - 12 - - - - True - GTK_BUTTONBOX_DEFAULT_STYLE - 0 - - - - True - True - True - gtk-help - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - True - - - - - - True - GTK_BUTTONBOX_END - 12 - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - - - - - - True - True - True - _Backup - True - GTK_RELIEF_NORMAL - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - - 6 - True - dialog1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - False - True - False - False - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 0 - - - - 26 - 19 - True - <big><b>%s</b></big> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Please wait while %s. - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - True - True - - - - - - 150 - 20 - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.10000000149 - PANGO_ELLIPSIZE_NONE - - - 0 - False - False - - - - - 0 - True - True - - - - - - + + + + + True + <i>You will need approximately 5 CD-ROMs or 1 DVD.</i> + True + + + False + False + 1 + + + + + 1 + + + + + 1 + + + + + 1 + + + + + + + True + 12 + + + True + + + True + True + True + gtk-help + True + + + + + False + + + + + True + 12 + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + + + + + True + True + True + _Backup + True + + + 1 + + + + + 1 + + + + + 1 + + + + + + + True + 6 + dialog1 + False + GDK_WINDOW_TYPE_HINT_DIALOG + + + True + + + True + + + 26 + 19 + True + 0 + <big><b>%s</b></big> + True + + + False + False + + + + + True + Please wait while %s. + + + 1 + + + + + 150 + 20 + True + 0.10000000149 + + + False + False + 2 + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + False + GTK_PACK_END + + + + + === modified file data/hurestore.1 // last-changed:bruce.cowan@dsl.pipex.com-20 ... 070628134338-jmk1lrbk36nvdyvv --- data/hurestore.1 +++ data/hurestore.1 @@ -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 +++ data/hurestore.glade @@ -1,877 +1,478 @@ - - - + + + - - - - True - Ubuntu Personal Backup System - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_IN - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - <b>Indicate where to find saved Backup Data:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - 0 - False - False - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - - - 0 - False - True - - - - - - True - 2 - 2 - False - 0 - 0 - - - - True - <b>Restore to: </b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - 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> - False - True - GTK_JUSTIFY_LEFT - True - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - Select A Folder - GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - True - False - False - -1 - - - 1 - 2 - 0 - 1 - fill - fill - - - - - 0 - False - True - - - - - - True - - - 0 - False - True - - - - - - True - <b>Restore: </b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - 3 - 2 - False - 0 - 0 - - - - True - - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 2 - 3 - fill - - - - - - - True - True - Lost files only - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - True - lost or changed files - True - GTK_RELIEF_NORMAL - True - False - False - True - radiobutton11 - - - - 1 - 2 - 1 - 2 - fill - - - - - - - True - True - all files - True - GTK_RELIEF_NORMAL - True - False - False - True - radiobutton11 - - - - 1 - 2 - 2 - 3 - fill - - - - - - 0 - False - True - - - - - - True - - - 0 - False - True - - - - - - True - 2 - 2 - False - 0 - 0 - - - - True - <b>Media files:</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - - - - True - True - Include - True - GTK_RELIEF_NORMAL - True - True - False - True - - - - 1 - 2 - 0 - 1 - fill - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - Exclude - True - GTK_RELIEF_NORMAL - True - False - False - True - radiobutton9 - - - 1 - 2 - 1 - 2 - fill - - - - - - 0 - False - False - - - - - - True - - - 0 - False - True - - - - - - 4 - True - GTK_BUTTONBOX_START - 5 - - - - True - True - True - GTK_RELIEF_NORMAL - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-media-record - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Start - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - True - True - True - GTK_RELIEF_NORMAL - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-zoom-100 - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Verify Integrity - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - - - - True - True - True - gtk-about - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - gtk-quit - True - GTK_RELIEF_NORMAL - True - - - - - - - 0 - False - True - - - - - - - - - - True - <b>Restore Your Data </b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - True - - - 0 - False - False - - - - - - + + True + Ubuntu Personal Backup System + GTK_WIN_POS_CENTER + + + True + + + True + 0 + GTK_SHADOW_IN + + + True + 12 + + + True + + + True + 0 + + + + False + False + + + + + True + 0 + <b>Indicate where to find saved backup data:</b> + True + + + False + False + 1 + + + + + True + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + + + True + True + + + + + False + False + 2 + + + + + True + + + False + False + 3 + + + + + True + 2 + 2 + + + True + 0 + <b>Restore to: </b> + True + + + GTK_FILL + + + + + + True + 0 + <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> + True + True + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + 0 + + + + 1 + 2 + GTK_FILL + + + + + + True + GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + Select a folder + + + 1 + 2 + GTK_FILL + GTK_FILL + + + + + False + 4 + + + + + True + 0 + <b>Restore: </b> + True + + + False + False + 5 + + + + + True + 3 + 2 + + + True + 0 + + True + + + GTK_FILL + + + + + + True + 0 + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + + + 2 + 3 + GTK_FILL + + + + + + True + True + Lost files only + True + True + + + 1 + 2 + GTK_FILL + + + + + + True + True + lost or changed files + True + True + radiobutton11 + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + True + True + all files + True + True + radiobutton11 + + + 1 + 2 + 2 + 3 + GTK_FILL + + + + + + False + 6 + + + + + True + 2 + 2 + 17 + + + True + 0 + <b>Media files:</b> + True + + + GTK_FILL + + + + + + True + True + Include + True + True + True + + + 1 + 2 + GTK_FILL + + + + + + True + 0 + + + 1 + 2 + GTK_FILL + + + + + + True + True + Exclude + True + True + radiobutton9 + + + 1 + 2 + 1 + 2 + GTK_FILL + + + + + + False + False + 7 + + + + + True + 4 + 5 + GTK_BUTTONBOX_START + + + True + True + True + + + True + 0 + 0 + + + True + 2 + + + True + gtk-media-record + + + False + False + + + + + True + _Start + True + + + False + False + 1 + + + + + + + + + + + True + True + True + + + True + 0 + 0 + + + True + 2 + + + True + gtk-zoom-100 + + + False + False + + + + + True + _Verify Integrity + True + + + False + False + 1 + + + + + + + + + 1 + + + + + True + True + True + gtk-about + True + + + 2 + + + + + True + True + True + gtk-quit + True + + + 3 + + + + + False + 8 + + + + + + + + + True + <b>Restore your data </b> + True + + + label_item + + + + + + + True + + + False + False + 1 + + + + + === modified file data/restore-progress.glade --- data/restore-progress.glade +++ data/restore-progress.glade @@ -1,188 +1,109 @@ - - - + + + - - - 6 - Restore Operation In Progress - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER_ON_PARENT - False - False - False - True - False - True - GDK_WINDOW_TYPE_HINT_DIALOG - GDK_GRAVITY_NORTH_WEST - True - False - True - - - - True - False - 6 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - True - -6 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - False - 6 - - - - True - False - 6 - - - - True - <b>Restoring Data</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - 400 - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.10000000149 - PANGO_ELLIPSIZE_NONE - - - 0 - True - False - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - - - - - - - - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - True - True - - - - - - + + 6 + Restore Operation In Progress + False + GTK_WIN_POS_CENTER_ON_PARENT + GDK_WINDOW_TYPE_HINT_DIALOG + True + False + + + True + 6 + + + True + 6 + 6 + + + True + 6 + + + True + 0 + <b>Restoring data</b> + True + + + False + False + + + + + 400 + True + 0.10000000149 + + + False + 1 + + + + + True + 0 + + + False + False + 2 + + + + + + + + + + + + + + + + True + + + False + False + 4 + + + + + 2 + + + + + True + GTK_BUTTONBOX_END + + + True + True + True + gtk-cancel + True + -6 + + + + + False + GTK_PACK_END + + + + + === modified file data/standalone-restore-progress.glade // last-changed:bruce. ... cowan@dsl.pipex.com-20070628134338-jmk1lrbk36nvdyvv --- data/standalone-restore-progress.glade +++ data/standalone-restore-progress.glade @@ -63,7 +63,7 @@ True - <big><b>Verifying Backup</b></big> + <big><b>Verifying backup</b></big> False True GTK_JUSTIFY_LEFT === modified directory // last-changed:bruce.cowan@dsl.pipex.com-2007062820083 ... 1-8jqlsr2sittjqexs # revision id: bruce.cowan@dsl.pipex.com-20070628200831-8jqlsr2sittjqexs # sha1: 7039da35b36b83a6edf237d79c103f215a1ad04d # inventory sha1: 864818a43a6dcaa0f2f851a978ce0bd775efd8fc # parent ids: # bruce.cowan@dsl.pipex.com-20070628134338-jmk1lrbk36nvdyvv # base id: mb@ubuntu-20070212123534-3f403eebe008341e # properties: # branch-nick: bcowan--grammar # message: # Grammar fixes # committer: Bruce Cowan # date: Thu 2007-06-28 14:43:38.135999918 +0100 === modified file HUBackup/GUI/SimpleGladeApp.py // encoding:base64 LS0tIEhVQmFja3VwL0dVSS9TaW1wbGVHbGFkZUFwcC5weQorKysgSFVCYWNrdXAvR1VJL1NpbXBs ZUdsYWRlQXBwLnB5CkBAIC0zOSw3ICszOSw3IEBACiAgICAgbGFuZ3VhZ2VzLgogCiAgICAgYXBw X25hbWU6Ci0gICAgICAgIGEgZG9tYWluIHRvIGxvb2sgZm9yIHRyYW5zbGF0aW9ucywgdGlwaWNh bGx5IHRoZSBuYW1lIG9mIGFuIGFwcGxpY2F0aW9uLgorICAgICAgICBhIGRvbWFpbiB0byBsb29r IGZvciB0cmFuc2xhdGlvbnMsIHR5cGljYWxseSB0aGUgbmFtZSBvZiBhbiBhcHBsaWNhdGlvbi4K IAogICAgIGxvY2FsZV9kaXI6CiAgICAgICAgIGEgZGlyZWN0b3J5IHdpdGggbG9jYWxlcyBsaWtl IGxvY2FsZV9kaXIvbGFuZ19pc29jb2RlL0xDX01FU1NBR0VTL2FwcF9uYW1lLm1vCkBAIC03NCwx MSArNzQsMTEgQEAKICAgICAgICAgcm9vdDoKICAgICAgICAgICAgIHRoZSBuYW1lIG9mIHRoZSB3 aWRnZXQgdGhhdCBpcyB0aGUgcm9vdCBvZiB0aGUgdXNlciBpbnRlcmZhY2UsCiAgICAgICAgICAg ICB1c3VhbGx5IGEgd2luZG93IG9yIGRpYWxvZyAoYSB0b3AgbGV2ZWwgd2lkZ2V0KS4KLSAgICAg ICAgICAgIElmIE5vbmUgb3Igb21taXRlZCwgdGhlIGZ1bGwgdXNlciBpbnRlcmZhY2UgaXMgbG9h ZGVkLgorICAgICAgICAgICAgSWYgTm9uZSBvciBvbWl0dGVkLCB0aGUgZnVsbCB1c2VyIGludGVy ZmFjZSBpcyBsb2FkZWQuCiAKICAgICAgICAgZG9tYWluOgogICAgICAgICAgICAgQSBkb21haW4g dG8gdXNlIGZvciBsb2FkaW5nIHRyYW5zbGF0aW9ucy4KLSAgICAgICAgICAgIElmIE5vbmUgb3Ig b21taXRlZCwgbm8gdHJhbnNsYXRpb24gaXMgbG9hZGVkLgorICAgICAgICAgICAgSWYgTm9uZSBv ciBvbWl0dGVkLCBubyB0cmFuc2xhdGlvbiBpcyBsb2FkZWQuCiAKICAgICAgICAgKiprd2FyZ3M6 CiAgICAgICAgICAgICBhIGRpY3Rpb25hcnkgcmVwcmVzZW50aW5nIHRoZSBuYW1lZCBleHRyYSBh cmd1bWVudHMuCkBAIC0xMTksNyArMTE5LDcgQEAKICAgICBkZWYgbmV3KHNlbGYpOgogICAgICAg ICAiIiIKICAgICAgICAgTWV0aG9kIGNhbGxlZCB3aGVuIHRoZSB1c2VyIGludGVyZmFjZSBpcyBs b2FkZWQgYW5kIHJlYWR5IHRvIGJlIHVzZWQuCi0gICAgICAgIEF0IHRoaXMgbW9tZW50LCB0aGUg d2lkZ2V0cyBhcmUgbG9hZGVkIGFuZCBjYW4gYmUgcmVmZXJlZCBhcyBzZWxmLndpZGdldF9uYW1l CisgICAgICAgIEF0IHRoaXMgbW9tZW50LCB0aGUgd2lkZ2V0cyBhcmUgbG9hZGVkIGFuZCBjYW4g YmUgcmVmZXJyZWQgYXMgc2VsZi53aWRnZXRfbmFtZQogICAgICAgICAiIiIKICAgICAgICAgcGFz cwogCkBAIC0xNDMsNyArMTQzLDcgQEAKICAgICAgICAgIiIiCiAgICAgICAgIEl0IGlzIGludGVy bmFsbHkgdXNlZCB0byBub3JtYWxpemUgdGhlIG5hbWUgb2YgdGhlIHdpZGdldHMuCiAgICAgICAg IEl0IG1lYW5zIGEgd2lkZ2V0IG5hbWVkIGZvbzp2Ym94LWRpYWxvZyBpbiBnbGFkZQotICAgICAg ICBpcyByZWZlcmVkIHNlbGYudmJveF9kaWFsb2cgaW4gdGhlIGNvZGUuCisgICAgICAgIGlzIHJl ZmVycmVkIHNlbGYudmJveF9kaWFsb2cgaW4gdGhlIGNvZGUuCiAKICAgICAgICAgSXQgYWxzbyBz ZXRzIGEgZGF0YSAicHJlZml4ZXMiIHdpdGggdGhlIGxpc3Qgb2YKICAgICAgICAgcHJlZml4ZXMg YSB3aWRnZXQgaGFzIGZvciBlYWNoIHdpZGdldC4KQEAgLTE3MCw3ICsxNzAsNyBAQAogICAgICAg ICBJdCBtZWFucyBlbnRyeTEgYW5kIGxhYmVsMyBoYXMgYSBwcmVmaXggYWN0aW9uIG5hbWVkIGZv by4KIAogICAgICAgICBUaGVuLCBwcmVmaXhfYWN0aW9uc19wcm94eSBtdXN0IGhhdmUgYSBtZXRo b2QgbmFtZWQgcHJlZml4X2ZvbyB3aGljaAotICAgICAgICBpcyBjYWxsZWQgZXZlcnl0aW1lIGEg d2lkZ2V0IHdpdGggcHJlZml4IGZvbyBpcyBmb3VuZCwgdXNpbmcgdGhlIGZvdW5kIHdpZGdldAor ICAgICAgICBpcyBjYWxsZWQgZXZlcnkgdGltZSBhIHdpZGdldCB3aXRoIHByZWZpeCBmb28gaXMg Zm91bmQsIHVzaW5nIHRoZSBmb3VuZCB3aWRnZXQKICAgICAgICAgYXMgYXJndW1lbnQuCiAKICAg ICAgICAgcHJlZml4X2FjdGlvbnNfcHJveHk6CkBAIC0zMTEsNyArMzExLDcgQEAKICAgICAgICAg IiIiCiAgICAgICAgIFN0YXJ0cyB0aGUgbWFpbiBsb29wIG9mIHByb2Nlc3NpbmcgZXZlbnRzIGNo ZWNraW5nIGZvciBDb250cm9sLUMuCiAKLSAgICAgICAgVGhlIGRlZmF1bHQgaW1wbGVtZW50YXRp b24gY2hlY2tzIHdoZXRlciBhIENvbnRyb2wtQyBpcyBwcmVzc2VkLAorICAgICAgICBUaGUgZGVm YXVsdCBpbXBsZW1lbnRhdGlvbiBjaGVja3Mgd2hldGhlciBhIENvbnRyb2wtQyBpcyBwcmVzc2Vk LAogICAgICAgICB0aGVuIGNhbGxzIG9uX2tleWJvYXJkX2ludGVycnVwdCgpLgogCiAgICAgICAg IFVzZSB0aGlzIG1ldGhvZCBmb3Igc3RhcnRpbmcgcHJvZ3JhbXMuCgo= === modified file HUBackup/GUI/hubackup.py // encoding:base64 LS0tIEhVQmFja3VwL0dVSS9odWJhY2t1cC5weQorKysgSFVCYWNrdXAvR1VJL2h1YmFja3VwLnB5 CkBAIC01NSw3ICs1NSw3IEBACiAgICAgICAgIHNlbGYuY3VyQ2RCdXJuID0gTm9uZQogICAgICAg ICBzZWxmLmN1cklzb0J1aWxkID0gTm9uZQogICAgICAgICBzZWxmLnNwYXduZWRQcm9jT0JKID0g Tm9uZSAjIHJlcXVpcmVkIHRvIGhvbGQgc3Bhd25lZCBvYmplY3QsIGFuZCB0aGVuIGxhdGVyIGdl dCBpdHMgcHR5IGZkLgotICAgICAgICBzZWxmLmN1clByZWNlbnQgPSAwICMgZ2xvYmFsIHByZWNl bnRhZ2UgaG9sZGVyIG9mIHNwYXduZWQgcHJvY2VzcyB0aGF0IHJlcG9ydCBpdCBvciBjYW4gYmUg Y2FsYydkIGl0CisgICAgICAgIHNlbGYuY3VyUHJlY2VudCA9IDAgIyBnbG9iYWwgcGVyY2VudGFn ZSBob2xkZXIgb2Ygc3Bhd25lZCBwcm9jZXNzIHRoYXQgcmVwb3J0IGl0IG9yIGNhbiBiZSBjYWxj J2QgaXQKICAgICAgICAgU2ltcGxlR2xhZGVBcHAuX19pbml0X18oc2VsZiwgcGF0aCwgcm9vdCwg ZG9tYWluLCAqKmt3YXJncykKIAogICAgIGRlZiBuZXcoc2VsZik6CkBAIC0xMzEsMjIgKzEzMSwy MiBAQAogICAgICAgICAgICAgICAgICMgICB0byB3aGF0IG5hdXRpbHVzLWNkLWJ1cm5lciBkb2Vz IGluIG9yZGVyIHRvIGZpbmQgb3V0IGhvdwogICAgICAgICAgICAgICAgICMgICBtdWNoIGZyZWUg c3BhY2UgaXMgbGVmdCBvbiB0aGUgQ0QsIHRvIG1ha2Ugc3VyZSB0aGUKICAgICAgICAgICAgICAg ICAjICAgY3VycmVudCBkaWZmZXJlbnRpYWwgYXJjaGl2ZSB3aWxsIGZpdCBvbiBpdC4KLSAgICAg ICAgICAgICAgICAjICAgMikgTm90IGEgQ0RST00gZGV2aWNlLiBJbiB3aGljaCBjYXNlIHdlIHdp bGwgYXNzdW1lIHRoaXMKKyAgICAgICAgICAgICAgICAjICAgMikgTm90IGEgQ0QtUk9NIGRldmlj ZS4gSW4gd2hpY2ggY2FzZSB3ZSB3aWxsIGFzc3VtZSB0aGlzCiAgICAgICAgICAgICAgICAgIyAg IGRldmljZSBoYXMgbm90IGJlZW4gZm9ybWF0dGVkIChmb3IgZXhhbXBsZSwgYSBub24KICAgICAg ICAgICAgICAgICAjICAgaW5pdGlhbGl6ZWQgVVNCIGRpc2spIGFuZCB0aHVzIG5vdCB1c2FibGUg YXMgYmFja3VwIHRhcmdldAogICAgICAgICAgICAgICAgICMgICBzbyB3ZSB3aWxsIGlnbm9yZSBp dCBhbmQgbm90IGxpc3QgaXQuIEFjdHVhbGx5IHdlIGFyZSBub3cKICAgICAgICAgICAgICAgICAj ICAgaWdub3JpbmcgaXQgcGFydCBvZiB0aGUgbmV3IHBvbGljeSAtIHRoZSBndGsuQ29tYm9Cb3gK ICAgICAgICAgICAgICAgICAjICAgc2hvdWxkIG9ubHkgYWxsb3cgdG8gY2hvb3NlIGJldHdlZW4g YXZhaWxhYmxlIFJXIG9wdGljYWwKLSAgICAgICAgICAgICAgICAjICAgZHJpdmVzLCBhbmQgbGV0 IGEgZmlsZWNob29zZXJkaWFsb2cgdG8gZG8gdGhlIHJlc3Qgb2YgdGhlCisgICAgICAgICAgICAg ICAgIyAgIGRyaXZlcywgYW5kIGxldCBhIGZpbGVjaG9vc2VyIGRpYWxvZyB0byBkbyB0aGUgcmVz dCBvZiB0aGUKICAgICAgICAgICAgICAgICAjICAgd29yayBvZiBiYWNraW5nIHVwIHRvIG90aGVy IHRhcmdldHMgdGhhdCBhcmUgbW9yZSBjbG9zZWx5CiAgICAgICAgICAgICAgICAgIyAgIG9wZXJh dGVkIGFzIGEgZmlsZSBzeXN0ZW0uIChVU0IgZHJpdmVzLCBORlMgbW91bnRzIGV0Yy4pCi0gICAg ICAgICAgICAgICAgIyAgIDMpIFRoaXMgaXMgYSBDRFJPTSBkZXZpY2UsIGJ1dCBpcyBjdXJyZW50 bHkgZW1wdHkgYW5kIGRvZXMKLSAgICAgICAgICAgICAgICAjICAgbm90IGhvbGQgYW55IG1lZGlh LiBXZSBzaGFsbCBsaXN0IGl0IHdpdGhvdXQgYWRpdGlvbmFsCisgICAgICAgICAgICAgICAgIyAg IDMpIFRoaXMgaXMgYSBDRC1ST00gZGV2aWNlLCBidXQgaXMgY3VycmVudGx5IGVtcHR5IGFuZCBk b2VzCisgICAgICAgICAgICAgICAgIyAgIG5vdCBob2xkIGFueSBtZWRpYS4gV2Ugc2hhbGwgbGlz dCBpdCB3aXRob3V0IGFkZGl0aW9uYWwKICAgICAgICAgICAgICAgICAjICAgaW5mb3JtYXRpb24g YXMgdGhpcyBpbmZvcm1hdGlvbiB3aWxsIGJlIGF2YWlsYWJsZSBvbmx5Ci0gICAgICAgICAgICAg ICAgIyAgIHdoZW4gdGhlIHVzZXIgaW5zZXJ0cyBhIENEUi9DRFJXIGludG8gdGhlIGRyaXZlLiBU aGlzIGlzCi0gICAgICAgICAgICAgICAgIyAgIChmcm9tIHRoaXMgcG9pbnQpIGxpa2VseSB0byBo YXBwZW4gd2hlbiB0aGUgdXNlcnMgY2hvb3NlcyAKLSAgICAgICAgICAgICAgICAjICAgdG8gZXhl Y3V0ZSBhICBiYWNrdXAgcHJvY2VzcyB3aGVuIGhlIGhhcyBub3QgbWVkaXVtIGluCi0gICAgICAg ICAgICAgICAgIyAgIGRyaXZlLgorICAgICAgICAgICAgICAgICMgICB3aGVuIHRoZSB1c2VyIGlu c2VydHMgYSBDRC1SL0NELVJXIGludG8gdGhlIGRyaXZlLiBUaGlzIGlzCisgICAgICAgICAgICAg ICAgIyAgIChmcm9tIHRoaXMgcG9pbnQpIGxpa2VseSB0byBoYXBwZW4gd2hlbiB0aGUgdXNlciBj aG9vc2VzIAorICAgICAgICAgICAgICAgICMgICB0byBleGVjdXRlIGEgYmFja3VwIHByb2Nlc3Mg d2hlbiBoZSBoYXMgbm90IGdvdCBhIG1lZGl1bSBpbgorICAgICAgICAgICAgICAgICMgICB0aGUg ZHJpdmUuCiAgICAgICAgICAgICAgICAgaWYgdGhpc0RldmljZVsnVHlwZSddID09ICJjZHJvbSI6 CiAgICAgICAgICAgICAgICAgICAgICAgICB0bXBMaXN0UmVmLmFwcGVuZChbU3RvY2tJZCxOYW1l LCIiLCIiLGldKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlCkBAIC0zMTksNyArMzE5LDcgQEAK ICAgICBkZWYgR1VJQmFja3VwUHJlcGFyZShzZWxmKToKICAgICAgICAgaWYgREVCVUdfUFJJTlQ6 IHByaW50ICJFbnRlcnRpbmcgR1VJQmFja3VwUHJlcGFyZSBtZXRob2QuIgogCi0gICAgICAgICMg c2V0IHVwIHRoZSBiYWNrdXAgc3RhZ2VzIGZ1bmMgbGlzdCBleGx1Y2luZGcgdGhlIHN0YXJ0dXAg c3RhZ2UgKEdVSUJhY2t1cFByZXBhcmUpCisgICAgICAgICMgc2V0IHVwIHRoZSBiYWNrdXAgc3Rh Z2VzIGZ1bmMgbGlzdCBleGNsdWRpbmcgdGhlIHN0YXJ0dXAgc3RhZ2UgKEdVSUJhY2t1cFByZXBh cmUpCiAgICAgICAgICMgR1VJQnVyblByZXBhcmUgaXMgbm90IGhlcmUgc2luY2UgYnVybmluZyBp cyBkb25lIGFmdGVyIGVhY2ggSVNPIGNyZWF0aW9uICwga2ljayBzdGFydGVkIGJ5CiAgICAgICAg ICMgR1VJSXNvbGF0ZVByZXBhcmUuCiAKQEAgLTQwNyw3ICs0MDcsNyBAQAogICAgICAgICBzZWxm LnJ1bm5pbmcgPSBUcnVlCiAgICAgICAgIHNlbGYuc3Bhd25lZFByb2NPQkogPSBzZWxmLmJrcEVu Z2luZS5wcmVfaXNvbGF0ZV9raWNrKCkKICAgICAgICAgc2VsZi5jdXJCa3AgPSBzZWxmLmJrcEVu Z2luZS5pc29sYXRlKCkKLSAgICAgICAgc2VsZi5jdXJfbGluZSA9IF8oIjxiPiBFeHRyYWN0aW5n IENhdGFsb2d1ZS4uLjwvYj4iKQorICAgICAgICBzZWxmLmN1cl9saW5lID0gXygiPGI+IEV4dHJh Y3RpbmcgQ2F0YWxvZy4uLjwvYj4iKQogICAgICAgICBzZWxmLnB1c2hCa3BUYWdJRCA9ICBnb2Jq ZWN0LnRpbWVvdXRfYWRkKDEwMCxzZWxmLnB1c2hHVUlCYWNrdXApCiAgICAgICAgIGdvYmplY3Qu aW9fYWRkX3dhdGNoKHNlbGYuc3Bhd25lZFByb2NPQkouZmlsZW5vKCksIGdvYmplY3QuSU9fSU4s IHNlbGYud2F0Y2hfQmFja3VwX3B0eV9jYWxsYmFjaykKICAKQEAgLTQ2MywxMCArNDYzLDEwIEBA CiAgICAgICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAgZnNNaXNjLmVqZWN0KHNlbGYuYmFj a3VwX3RhcmdldF9kZXZpY2UpCiAgICAgICAgICAgICBleGNlcHQgZnNNaXNjLmZzTWlzY0VqZWN0 RXJyb3I6Ci0gICAgICAgICAgICAgICAgc2VsZi5wb3B1cE1vdW50RXJyb3JNZXNzYWdlKF8oIkNv dWxkIG5vdCBlamVjdCBtZWRpYS4gQ2hvb3NlIE9LIHRvIGdvIGJhY2sgYW5kIHRoZW4gcmV0cnku IikpCisgICAgICAgICAgICAgICAgc2VsZi5wb3B1cE1vdW50RXJyb3JNZXNzYWdlKF8oIkNvdWxk IG5vdCBlamVjdCBtZWRpdW0uIENob29zZSBPSyB0byBnbyBiYWNrIGFuZCB0aGVuIHJldHJ5LiIp KQogICAgICAgICAgICAgICAgIHJldHVybgotICAgICAgICAgICAgcHJlX2lzb19idWlsZF9tZXNz YWdlID0gXygiUGxlYXNlIHRha2Ugb3V0IHRoZSBDRCBpbiBkcml2ZSAsIGFuZCBpbnNlcnQgeW91 ciBDSEFOR0VTIGJhY2t1cCBDRCBpbnN0ZWFkLiIKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIklmIHRoaXMgaXMgdGhlIGZpcnN0IHRpbWUgeW91IGFyZSBjcmVhdGluZyBh IGRpZmZlcmVudGlhbCBiYWNrdXAgc25hcHNob3QsIgorICAgICAgICAgICAgcHJlX2lzb19idWls ZF9tZXNzYWdlID0gXygiUGxlYXNlIHRha2Ugb3V0IHRoZSBDRCBpbiBkcml2ZSBhbmQgaW5zZXJ0 IHlvdXIgQ0hBTkdFUyBiYWNrdXAgQ0QgaW5zdGVhZC4iCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJJZiB0aGlzIGlzIHRoZSBmaXJzdCB0aW1lIHlvdSBoYXZlIGNyZWF0 ZWQgYSBkaWZmZXJlbnRpYWwgYmFja3VwIHNuYXBzaG90LCIKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgImluc2VydCBhIGJsYW5rIENEIG9udG8gd2hpY2ggdGhlIGFyY2hp dmUgd2lsbCBiZSBidXJudCIpCiAgICAgICAgICAgICAKICAgICAgICAgICAgIGRpYWxvZyA9IGd0 ay5NZXNzYWdlRGlhbG9nKHNlbGYud2luZG93X2JhY2t1cCwgZ3RrLkRJQUxPR19NT0RBTCB8IGd0 ay5ESUFMT0dfREVTVFJPWV9XSVRIX1BBUkVOVCwKQEAgLTQ5Nyw4ICs0OTcsOCBAQAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHZvbF9sYWJs ZSkKIAogICAgICAgICBleGNlcHQgSVNPQnVpbGRlci5DYW5ub3RVbk1vdW50RXJyb3I6Ci0gICAg ICAgICAgICBzZWxmLnBvcHVwTW91bnRFcnJvck1lc3NhZ2UoXygiQ2Fubm9udCB1bm1vdW50IGNo b3NlbiByZWZlcmVuY2UgZGV2aWNlLiIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICJUaGlzIGlzIG5lY2Nlc3NhcnkgdG8gY29udGludWUuIENsaWNrIE9LIHRvIGdv IGJhY2siCisgICAgICAgICAgICBzZWxmLnBvcHVwTW91bnRFcnJvck1lc3NhZ2UoXygiQ2Fubm90 IHVubW91bnQgY2hvc2VuIHJlZmVyZW5jZSBkZXZpY2UuIgorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIlRoaXMgaXMgbmVjZXNzYXJ5IHRvIGNvbnRpbnVlLiBDbGlj ayBPSyB0byBnbyBiYWNrIgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgImFuZCByZXRyeSBzdGFydGluZyBiYWNrdXAgb3BlcmF0aW9uLiIpKQogICAgICAgICAgICAg c2VsZi5nb0JhY2soKQogICAgICAgICAKQEAgLTUxMSwxMCArNTExLDEwIEBACiAKICAgICBkZWYg R1VJVmVyaWZ5UHJlcGFyZShzZWxmLCBzdGFuZGFsb25lPUZhbHNlKToKICAgICAgICAgIyBzdGFu ZGFsb25lIHBhcmFtZXRlciBpbmRpY2F0ZWQgd2VhdGhlciB3ZSBhcmUgZXhlY3V0ZWQgcGFydCBv ZiBhIGNvbXBsZXRlIGJhY2t1cCBwcm9jZXNzIGFuZAotICAgICAgICAjIHNjaGVkdWxlZCBieSBz ZWxmLm5leHRQaGFzZSguLikgb3Igd2VhdGhlciB3ZSB3ZXJlIGNhbGxlZCBhcyBhIHJlc3BvbnNl IHRvIGNsaWtpbmcgb24gdGhlCi0gICAgICAgICMgIlZlcmZpeSBJbnRlZ3JpdHkiIEJ1dHRvbiBm cm9tIHRoZSBtYWluIGJhY2t1cC9yZXN0b3JlIGRpYWxvZy4KKyAgICAgICAgIyBzY2hlZHVsZWQg Ynkgc2VsZi5uZXh0UGhhc2UoLi4pIG9yIHdlYXRoZXIgd2Ugd2VyZSBjYWxsZWQgYXMgYSByZXNw b25zZSB0byBjbGlja2luZyBvbiB0aGUKKyAgICAgICAgIyAiVmVyaWZ5IEludGVncml0eSIgQnV0 dG9uIGZyb20gdGhlIG1haW4gYmFja3VwL3Jlc3RvcmUgZGlhbG9nLgogICAgICAgICAjIEFub3Ro ZXIgdGhpbmcsIHNpbmNlIHRoaXMgbWV0aG9kIGlzIG5vdCBhIGZpcnN0IG1ldGhvZCB0byBraWNr IHVwIGEgcHJvY2VzcywKLSAgICAgICAgIyB3ZSBuZWVkIHRvIGF0dGFjaCB0aGUgcHJvZ3Jlc3Mg cHJvcG9nYXRpb24gc3R1ZmYgaW5zaWRlIG9mIGl0LCB0byBkaXN0aW5ndWlzaCBmcm9tIHRoZSBi YWNrdXAgbWV0aG9kIHdoaWNoCisgICAgICAgICMgd2UgbmVlZCB0byBhdHRhY2ggdGhlIHByb2dy ZXNzIHByb3BhZ2F0aW9uIHN0dWZmIGluc2lkZSBvZiBpdCwgdG8gZGlzdGluZ3Vpc2ggZnJvbSB0 aGUgYmFja3VwIG1ldGhvZCB3aGljaAogICAgICAgICAjIGFjdHVhbGx5IHN0YXJ0cyBhIGNvbXBs ZXRlIGJhY2t1cCBwcm9jZXNzLCBhbmQgdGh1cyBoYXMgc29tZW9uZSBlbHNlIHRvIHRha2UgY2Fy ZSBvZiB0aGF0IGZvciBpdC4KICAgICAgICAgaWYgREVCVUdfUFJJTlQ6IHByaW50ICIqIEVudGVy aW5nIEdVSVZlcmlmeVByZXBhcmUgbWV0aG9kLiIKICAgICAgICAgc2VsZi5hYm9ydGVkID0gRmFs c2UKQEAgLTU0NCw3ICs1NDQsNyBAQAogICAgICAgICBlbHNlOgogICAgICAgICAgICAgc2VsZi5i YWNrdXBfcmVmZXJlbmNlX2RldmljZSA9IE5vbmUKICAgICAgICAgICAgIGlmIERFQlVHX1BSSU5U OiBwcmludCAibm8gZGV2aWNlIGNob3NlbiBmb3IgcmVmZXJlbmNlIHRvIHZlcmlmeSBiYWNrdXAg ZGF0YSBvbiIKLSAgICAgICAgICAgIG15cmVzdWx0ID0gc2VsZi5wb3B1cE1zZyhfKCJQbGVzYWUg Z28gYmFjayBhbmQgY2hvb3NlIGEgcmVmZXJlbmNlIGRldmljZSB3aGVyZSBtZWRpYSB3aXRoIGJh Y2t1cCBkYXRhIGlzIGF2YWlsYWJsZS4iKSwKKyAgICAgICAgICAgIG15cmVzdWx0ID0gc2VsZi5w b3B1cE1zZyhfKCJQbGVhc2UgZ28gYmFjayBhbmQgY2hvb3NlIGEgcmVmZXJlbmNlIGRldmljZSB3 aGVyZSBtZWRpdW0gd2l0aCBiYWNrdXAgZGF0YSBpcyBhdmFpbGFibGUuIiksCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYnV0dG9uc1NwZWM9Z3RrLkJVVFRPTlNfT0spCiAg ICAgICAgICAgICByZXR1cm4KICAgICAgICAgCkBAIC01NzgsNyArNTc4LDcgQEAKICAgICAgICAg ICAgIHRyeToKICAgICAgICAgICAgICAgICBia3BTb3VyY2VNb3VudFBvaW50ID0gZnNNaXNjLm1v dW50KHNlbGYuYmFja3VwX3JlZmVyZW5jZV9kZXZpY2UpICMgcmVwbGFjZWQgd2l0aCB0aGUgcmVm ZXJlbmNlIGRldmljZSBmb3IgdGhlIHZlcmlmeQogICAgICAgICAgICAgZXhjZXB0IGZzTWlzYy5m c01pc2NNb3VudEVycm9yOgotICAgICAgICAgICAgICAgIGlmIERFQlVHX1BSSU5UOiBwcmludCAi KiBDYW5ub3QgbW91bnQgc291cmNlIGRldmljZS4gQWJvcmluZy4iCisgICAgICAgICAgICAgICAg aWYgREVCVUdfUFJJTlQ6IHByaW50ICIqIENhbm5vdCBtb3VudCBzb3VyY2UgZGV2aWNlLiBBYm9y dGluZy4iCiAgICAgICAgICAgICAgICAgIyByZW1vdmVkIHJlZmVyZW5jZSBwYXNzaW5nIGZvciB0 aGUgJ3BhcmVudCcgd2luZG93IHRvIGFsbG93IGNhbGxpbmcgdGhpcyBmcm9tIGh1cmVzdG9yZQog ICAgICAgICAgICAgICAgIGRpYWxvZyA9IGd0ay5NZXNzYWdlRGlhbG9nKE5vbmUgLCBndGsuRElB TE9HX01PREFMIHwgZ3RrLkRJQUxPR19ERVNUUk9ZX1dJVEhfUEFSRU5ULAogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGd0ay5NRVNTQUdFX1dBUk5JTkcsCkBAIC02 MjEsOCArNjIxLDggQEAKICAgICAgICAgICAgICAgICBkaWFsb2cgPSBndGsuTWVzc2FnZURpYWxv ZyhOb25lLCBndGsuRElBTE9HX01PREFMIHwgZ3RrLkRJQUxPR19ERVNUUk9ZX1dJVEhfUEFSRU5U LCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBndGsuTUVTU0FH RV9XQVJOSU5HLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGd0 ay5CVVRUT05TX09LLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IF8oIlRoZSBtZWRpYSBkb2VzIG5vdCBzZWVtIHRvIGNvbnRhaW4gdmFsaWQgSFVCYWNrdXAgZGF0 YS5cbiIgCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiUGxl YXNlIG1ha2Ugc3VyZSBtZWRpYSAjMSBvZiB5b3VyIGJhY2t1cCBzZXQgaXMgaW4gZHJpdmUgYW5k IHJldHJ5LiIKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBfKCJU aGUgbWVkaXVtIGRvZXMgbm90IHNlZW0gdG8gY29udGFpbiB2YWxpZCBIVUJhY2t1cCBkYXRhLlxu IiAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJQbGVhc2Ug bWFrZSBzdXJlIG1lZGl1bSAjMSBvZiB5b3VyIGJhY2t1cCBzZXQgaXMgaW4gZHJpdmUgYW5kIHJl dHJ5LiIKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICIoWW91 IGNhbiBhbHdheXMgdXNlIHRoZSBcIlZlcmlmeVwiIGJ1dHRvbiBpbmRlcGVuZGVudGx5KSIpKQog ICAgICAgICAgICAgICAgIGRpYWxvZy5zaG93KCkKICAgICAgICAgICAgICAgICByZXMgPSBkaWFs b2cucnVuKCkKQEAgLTY4OCw4ICs2ODgsOCBAQAogICAgICAgICAgICAgICAgIGlmIERFQlVHX1BS SU5UOiBwcmludCAiKiBNb3ZpbmcgdG8gbmV4dCBjZCBidXJuIHByb2Nlc3MgIgogCiAgICAgZGVm IHBvcHVwQ2F0YWxvZ05lZWRlZChzZWxmKToKLSAgICAgICAgY2F0YWxvZ05lZWRlZE1zZyA9IF8o IlRoZSByZWZlcmVuY2UgZGV2aWNlIHlvdSBoYXZlIHNwZWNpZmljZWQgZG9lcyBub3Qgc2VlbSB0 byBjb250YWluIGEgdmFsaWQiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICJjYXRhbG9n IG5lY2Nlc3NhcnkgZm9yIGNyZWF0aW5nIGEgZGlmZmVyZW50aWFsIGJhY2t1cCBzbmFwc2hvdC5c biIKKyAgICAgICAgY2F0YWxvZ05lZWRlZE1zZyA9IF8oIlRoZSByZWZlcmVuY2UgZGV2aWNlIHlv dSBoYXZlIHNwZWNpZmllZCBkb2VzIG5vdCBzZWVtIHRvIGNvbnRhaW4gYSB2YWxpZCIKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgImNhdGFsb2cgbmVjZXNzYXJ5IGZvciBjcmVhdGluZyBh IGRpZmZlcmVudGlhbCBiYWNrdXAgc25hcHNob3QuXG4iCiAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICJQbGVhc2UgcHJvdmlkZSB0aGlzIGluIHRoZSByZWZlcmVuY2UgZGV2aWNlIHlvdSBo YXZlIGNob3Nlbi4iCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJJZiB5b3UndmUgYmFj a2VkIHVwIHRvIENEcywgdGhpcyBpcyB0aGUgQ0QgbGFiZWxlZDpcbiIKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIidIVUJhY2t1cCBNQVNURVIgQVJDSElWRSBDQVRBTE9HICMxJyIpCkBA IC03MDUsNyArNzA1LDcgQEAKICAgICAgICAgaWYgbXNnOgogICAgICAgICAgICAgbXlNc2cgPSBt c2cKICAgICAgICAgZWxzZToKLSAgICAgICAgICAgIG15TXNnID0gXygiRXJyb3IgbW91bnRpbmcg bWVkaWEuIE1ha2Ugc3VyZSB0aGUgbWVkaWEgaXMgbm90IGJsYW5rIGFuZCByZXRyeS4iKQorICAg ICAgICAgICAgbXlNc2cgPSBfKCJFcnJvciBtb3VudGluZyBtZWRpdW0uIE1ha2Ugc3VyZSB0aGUg bWVkaXVtIGlzIG5vdCBibGFuayBhbmQgcmV0cnkuIikKICAgICAgICAgZGlhbG9nID0gZ3RrLk1l c3NhZ2VEaWFsb2coTm9uZSwgZ3RrLkRJQUxPR19NT0RBTCB8IGd0ay5ESUFMT0dfREVTVFJPWV9X SVRIX1BBUkVOVCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ3RrLk1FU1NB R0VfRVJST1IsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGd0ay5CVVRUT05T X09LLApAQCAtNzM1LDcgKzczNSw3IEBACiAgICAgICAgIGlmIHNlbGYuZGlmZkJhY2t1cDoKICAg ICAgICAgICAgIHByZV9idXJuX21lc3NhZ2UgPSBfKCJQbGVhc2UgbWFrZSBzdXJlIHRoZSB5b3Vy IENIQU5HRVMgYmFja3VwIENEIGlzIGluIGRyaXZlIHRvIGNvbnRpbnVlLlxuIikKICAgICAgICAg ZWxzZToKLSAgICAgICAgICAgIHByZV9idXJuX21lc3NhZ2UgPSBfKCJQbGVhc2UgbWFrZSBzdXJl IGEgYmxhbmsgbWVkaWEgaXMgaW4gY2hvc2VuIHRhcmdldCBkcml2ZSB0byBjb250aW51ZS4iKQor ICAgICAgICAgICAgcHJlX2J1cm5fbWVzc2FnZSA9IF8oIlBsZWFzZSBtYWtlIHN1cmUgYSBibGFu ayBtZWRpdW0gaXMgaW4gY2hvc2VuIHRhcmdldCBkcml2ZSB0byBjb250aW51ZS4iKQogICAgICAg ICAgICAgCiAgICAgICAgIGRpYWxvZyA9IGd0ay5NZXNzYWdlRGlhbG9nKE5vbmUsIGd0ay5ESUFM T0dfTU9EQUwgfCBndGsuRElBTE9HX0RFU1RST1lfV0lUSF9QQVJFTlQsCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGd0ay5NRVNTQUdFX1FVRVNUSU9OLApAQCAtNzk3LDExICs3 OTcsMTEgQEAKICAgICAgICAgICAgICMgY2hlY2sgZm9yIHNsaWNlIGNoYW5nZXMgd2hpY2ggbWVh biBDRCBjaGFuZ2VzCiAgICAgICAgICAgICBpZiBzZWxmLmJrcEVuZ2luZS53YWl0aW5nRm9yU2xp Y2VDaGFuZ2UoKToKICAgICAgICAgICAgICAgICBpZiBzZWxmLmJrcEVuZ2luZS5jaGFuZ2VTbGlj ZVJlYXNvbigpPT0ibmV4dCI6Ci0gICAgICAgICAgICAgICAgICAgIG1lc3NhZ2UgPSBfKCJQbGVh c2UgaW5zZXJ0IGJhY2t1cCBtZWRpYSAjJXMiKSAlIHNlbGYuYmtwRW5naW5lLnJlcG9ydE5lZWRl ZFNsaWNlTnVtYmVyKCkKKyAgICAgICAgICAgICAgICAgICAgbWVzc2FnZSA9IF8oIlBsZWFzZSBp bnNlcnQgYmFja3VwIG1lZGl1bSAjJXMiKSAlIHNlbGYuYmtwRW5naW5lLnJlcG9ydE5lZWRlZFNs aWNlTnVtYmVyKCkKICAgICAgICAgICAgICAgICBlbGlmIHNlbGYuYmtwRW5naW5lLmNoYW5nZVNs aWNlUmVhc29uKCk9PSJsYXN0IjoKLSAgICAgICAgICAgICAgICAgICAgbWVzc2FnZSA9IF8oIlBs ZWFzZSBpbnNlcnQgdGhlIGxhc3QgYmFja3VwIG1lZGlhIGFuZCBjbGljayBva2F5IHRvIGNvbnRp bnVlIikKKyAgICAgICAgICAgICAgICAgICAgbWVzc2FnZSA9IF8oIlBsZWFzZSBpbnNlcnQgdGhl IGxhc3QgYmFja3VwIG1lZGl1bSBhbmQgY2xpY2sgb2theSB0byBjb250aW51ZSIpCiAgICAgICAg ICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICAgICAgbWVzc2FnZSA9IF8oIkZhdGFsIGVy cm9yIG9jY3VyZWQsIGV4aXRpbmcgaW4gZXJyb3IhIikKKyAgICAgICAgICAgICAgICAgICAgbWVz c2FnZSA9IF8oIkZhdGFsIGVycm9yIG9jY3VycmVkLCBleGl0aW5nIGluIGVycm9yISIpCiAgICAg ICAgICAgICAgICAgICAgIHNlbGYucG9wdXBNc2cobWVzc2FnZSkKICAgICAgICAgICAgICAgICAg ICAgc3lzLmV4aXQoMSkKICAgICAgICAgICAgICAgICAgICAgCkBAIC05MTEsNyArOTExLDcgQEAK IAogICAgICMgc3RhcnQgdGhlIGJhY2t1cCBwcm9jZXNzLgogICAgIGRlZiBvbl9idXR0b25fc3Rh cnRfY2xpY2tlZChzZWxmLCB3aWRnZXQsICphcmdzKToKLSAgICAgICAgIyB3ZSBuZWVkIHRvIGdh dGhlciB2YWx1ZXMgZm9yIHNldmVyYWwgcHJvcGVydGllcyB0aGF0IGFyZSBuZWNjZXNzYXJ5Cisg ICAgICAgICMgd2UgbmVlZCB0byBnYXRoZXIgdmFsdWVzIGZvciBzZXZlcmFsIHByb3BlcnRpZXMg dGhhdCBhcmUgbmVjZXNzYXJ5CiAgICAgICAgICMgdG8gZXhlY3V0ZSB0aGUgYmFja3VwIHByb2Nl c3MuCiAgICAgICAgICMgVGhpcyBiZWdpbnMgYnkgZ2V0dGluZyB0aGUgc2VsZWN0ZWQgaXRlbSBm cm9tIHRoZSBjb21ibyBib3gKICAgICAgICAgbW9kZWwgPSBzZWxmLmNvbWJvLmdldF9tb2RlbCgp CkBAIC05NDksMTIgKzk0OSwxMiBAQAogICAgICAgICAgICAgICAgICAgICAgICAgb2theV90b19w cm9jZWVkID0gVHJ1ZQogICAgICAgICAgICAgICAgICAgICBlbHNlOgogICAgICAgICAgICAgICAg ICAgICAgICAgaWYgREVCVUdfUFJJTlQ6Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJp bnQgIiogRGV2aWNlcyBzZWVtcyB0byBzdGlsbCBiZSBlbXB0eS4gQXJlIHlvdSJcCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIiBzdXJlIHlvdSd2ZSBpbnNlcnRlZCBhIG1lZGlh IGluIGRyaXZlIDstKT8iCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgcHJpbnQgIiogRGV2 aWNlIHNlZW1zIHRvIHN0aWxsIGJlIGVtcHR5LiBBcmUgeW91IlwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiIHN1cmUgeW91J3ZlIGluc2VydGVkIGEgbWVkaXVtIGluIGRyaXZl IDstKT8iCiAgICAgICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICAgICAgaWYgREVC VUdfUFJJTlQ6Ci0gICAgICAgICAgICAgICAgICAgICAgICBwcmludCAiYmFja3VwIHByY29lc3Mg Y2FuY2VsbGVkLiB1c2VyIHdvdWxkIG5vdCBpbnNlcnQiXAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIiBtZWRpYSBpbiBkcml2ZSBhbmQgc2VsZWN0ZWQgdG8gYmFja3VwIHRvIGNkcm9t IgorICAgICAgICAgICAgICAgICAgICAgICAgcHJpbnQgImJhY2t1cCBwcm9jZXNzIGNhbmNlbGVk LiBVc2VyIGRpZG4ndCBpbnNlcnQiXAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIiBt ZWRpdW0gaW4gZHJpdmUgYW5kIHNlbGVjdCBiYWNrdXAgdG8gY2Ryb20iCiAgICAgICAgICAgICAg ICAgICAgIHJldHVybgogCiAgICAgICAgICMgTGV0J3MgZG8gc29tZSBwcmludG91dHMgdG8gc2Vl IHdoYXQgc29ydCBvZiBzZXNzaW9ucyB3ZSdyZSBnb2luZyB0bwoK === modified file data/hubackup.desktop.in // encoding:base64 LS0tIGRhdGEvaHViYWNrdXAuZGVza3RvcC5pbgorKysgZGF0YS9odWJhY2t1cC5kZXNrdG9wLmlu CkBAIC0xLDcgKzEsNyBAQAogW0Rlc2t0b3AgRW50cnldCiBfTmFtZT1Ib21lIFVzZXIgQmFja3Vw CiBfR2VuZXJpY05hbWU9RGVza3RvcCBCYWNrdXAgUHJvZ3JhbQotX0NvbW1lbnQ9QmFja3VwIFlv dXIgSG9tZSBEYXRhCitfQ29tbWVudD1CYWNrdXAgeW91ciBob21lIGZvbGRlcidzIGRhdGEKIEV4 ZWM9aHViYWNrdXAKIFRlcm1pbmFsPWZhbHNlCiBUeXBlPUFwcGxpY2F0aW9uCgo= === modified file data/hubackup.glade // encoding:base64 LS0tIGRhdGEvaHViYWNrdXAuZ2xhZGUKKysrIGRhdGEvaHViYWNrdXAuZ2xhZGUKQEAgLTU5Miw3 ICs1OTIsNyBAQAogCSAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ2aXNpYmxlIj5UcnVlPC9wcm9wZXJ0 eT4KIAkgICAgICA8cHJvcGVydHkgbmFtZT0ibGFiZWwiIHRyYW5zbGF0YWJsZT0ieWVzIj4mbHQ7 YmlnJmd0OyZsdDtiJmd0O0Fsd2F5cyBiYWNrdXAgdG8gYSBzZXBhcmF0ZSBtZWRpdW0mbHQ7L2Im Z3Q7Jmx0Oy9iaWcmZ3Q7CiAKLU90aGVyd2lzZSB5b3UgY291bGQgbG9vc2UgYWxsIHlvdXIgZGF0 YSBpbiBjYXNlIG9mIGFuIGhhcmR3YXJlIGZhaWx1cmUuPC9wcm9wZXJ0eT4KK090aGVyd2lzZSB5 b3UgY291bGQgbG9zZSBhbGwgeW91ciBkYXRhIGluIGNhc2Ugb2YgYW4gaGFyZHdhcmUgZmFpbHVy ZS48L3Byb3BlcnR5PgogCSAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ1c2VfdW5kZXJsaW5lIj5GYWxz ZTwvcHJvcGVydHk+CiAJICAgICAgPHByb3BlcnR5IG5hbWU9InVzZV9tYXJrdXAiPlRydWU8L3By b3BlcnR5PgogCSAgICAgIDxwcm9wZXJ0eSBuYW1lPSJqdXN0aWZ5Ij5HVEtfSlVTVElGWV9MRUZU PC9wcm9wZXJ0eT4KQEAgLTIwNjAsNyArMjA2MCw3IEBACiAJCSAgICAgIDxjaGlsZD4KIAkJCTx3 aWRnZXQgY2xhc3M9Ikd0a0xhYmVsIiBpZD0ibGFiZWwzMSI+CiAJCQkgIDxwcm9wZXJ0eSBuYW1l PSJ2aXNpYmxlIj5UcnVlPC9wcm9wZXJ0eT4KLQkJCSAgPHByb3BlcnR5IG5hbWU9ImxhYmVsIiB0 cmFuc2xhdGFibGU9InllcyI+Jmx0O2kmZ3Q7WW91IHdpbGwgbmVlZCBhcHByb3hpbWlhdGVseSA1 IENkcm9tcyBvciAxIERWRC4mbHQ7L2kmZ3Q7PC9wcm9wZXJ0eT4KKwkJCSAgPHByb3BlcnR5IG5h bWU9ImxhYmVsIiB0cmFuc2xhdGFibGU9InllcyI+Jmx0O2kmZ3Q7WW91IHdpbGwgbmVlZCBhcHBy b3hpbWF0ZWx5IDUgQ0QtUk9NcyBvciAxIERWRC4mbHQ7L2kmZ3Q7PC9wcm9wZXJ0eT4KIAkJCSAg PHByb3BlcnR5IG5hbWU9InVzZV91bmRlcmxpbmUiPkZhbHNlPC9wcm9wZXJ0eT4KIAkJCSAgPHBy b3BlcnR5IG5hbWU9InVzZV9tYXJrdXAiPlRydWU8L3Byb3BlcnR5PgogCQkJICA8cHJvcGVydHkg bmFtZT0ianVzdGlmeSI+R1RLX0pVU1RJRllfTEVGVDwvcHJvcGVydHk+Cgo= === modified file data/hurestore.1 // encoding:base64 LS0tIGRhdGEvaHVyZXN0b3JlLjEKKysrIGRhdGEvaHVyZXN0b3JlLjEKQEAgLTgsNyArOCw3IEBA CiAuU0ggU1lOT1BTSVMKIC5CIGh1cmVzdG9yZQogLlNIIERFU0NSSVBUSU9OCi1UaGUgSG9tZSBV c2VyIEJhY2t1cCBTeXN0ZW0gdHJpZXMgdG8gcHJvdmlkZSB0aGUgbm9uIHRvbyB0ZWNobmljYWws CitUaGUgSG9tZSBVc2VyIEJhY2t1cCBTeXN0ZW0gdHJpZXMgdG8gcHJvdmlkZSBhIG5vdCB0b28g dGVjaG5pY2FsCiBob21lIHVzZXIgd2l0aCBhIGNvbmNpc2UgYmFja3VwIGFuZCByZXN0b3JlIGFw cGxpY2F0aW9uIHRvIGNhdGVyCiBmb3Iga2VlcGluZyBoaXMgZGF0YSBzYWZlIGFuZCByZXN0b3Jh YmxlIGluIHRpbWVzIG9mIG5lZWQuCiAKQEAgLTE5LDEwICsxOSwxMCBAQAogYnV0IHlvdSBjYW4g Y2hvb3NlIGFub3RoZXIgZm9sZGVyIHRvIGJhY2t1cCB0aHJvdWdoIHRoZSBtYWluIGRpYWxvZyBp ZgogeW91IHdpc2guCiAKLUhVQmFja3VwIHVzZXMgdGhlIERpc2sgQVJjaGl2ZSAsIERBUiB1bmRl cm5lYXRoIHRvIGRvIHRoZSBhY3V0YWwKK0hVQmFja3VwIHVzZXMgdGhlIERpc2sgQVJjaGl2ZSBm b3JtYXQgKERBUikgaW50ZXJuYWxseSB0byBkbyB0aGUgYWN1dGFsCiBhcmNoaXZpbmcuIFRvIHJl YWQgbW9yZSBhYm91dCBpdCBzZWUgaHR0cDovL2Rhci5saW51eC5mcmVlLmZyLyNwcmVzCiAKLVRv IHVzZSBpdCwganVzdCBydW4gaHViYWNrdXAgZnJvbSB5b3VyIHRlcm1pbmFsIG9yIHJ1biBpdCBm cm9tIHRoZQorVG8gdXNlIEhVQmFja3VwLCBqdXN0IHJ1biBodWJhY2t1cCBmcm9tIHlvdXIgdGVy bWluYWwgb3IgcnVuIGl0IGZyb20gdGhlCiAiU3lzdGVtIi0+IkFkbWluaXN0cmF0aW9uIiBtZW51 LgogCiBIVUJhY2t1cCB3YXMgd3JpdHRlbiBieSBTaXZhbiBHcmVlbmJlcmcgPHNpdmFuQHVidW50 dS5jb20+IGFuZAoK === modified file data/hurestore.glade // encoding:base64 LS0tIGRhdGEvaHVyZXN0b3JlLmdsYWRlCisrKyBkYXRhL2h1cmVzdG9yZS5nbGFkZQpAQCAtNzks NyArNzksNyBAQAogCQkgIDxjaGlsZD4KIAkJICAgIDx3aWRnZXQgY2xhc3M9Ikd0a0xhYmVsIiBp ZD0ibGFiZWwxMDMiPgogCQkgICAgICA8cHJvcGVydHkgbmFtZT0idmlzaWJsZSI+VHJ1ZTwvcHJv cGVydHk+Ci0JCSAgICAgIDxwcm9wZXJ0eSBuYW1lPSJsYWJlbCIgdHJhbnNsYXRhYmxlPSJ5ZXMi PiZsdDtiJmd0O0luZGljYXRlIHdoZXJlIHRvIGZpbmQgc2F2ZWQgQmFja3VwIERhdGE6Jmx0Oy9i Jmd0OzwvcHJvcGVydHk+CisJCSAgICAgIDxwcm9wZXJ0eSBuYW1lPSJsYWJlbCIgdHJhbnNsYXRh YmxlPSJ5ZXMiPiZsdDtiJmd0O0luZGljYXRlIHdoZXJlIHRvIGZpbmQgc2F2ZWQgYmFja3VwIGRh dGE6Jmx0Oy9iJmd0OzwvcHJvcGVydHk+CiAJCSAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ1c2VfdW5k ZXJsaW5lIj5GYWxzZTwvcHJvcGVydHk+CiAJCSAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ1c2VfbWFy a3VwIj5UcnVlPC9wcm9wZXJ0eT4KIAkJICAgICAgPHByb3BlcnR5IG5hbWU9Imp1c3RpZnkiPkdU S19KVVNUSUZZX0xFRlQ8L3Byb3BlcnR5PgpAQCAtMjA3LDcgKzIwNyw3IEBACiAJCSAgICAgIDxj aGlsZD4KIAkJCTx3aWRnZXQgY2xhc3M9Ikd0a0xhYmVsIiBpZD0ibGFiZWw4OSI+CiAJCQkgIDxw cm9wZXJ0eSBuYW1lPSJ2aXNpYmxlIj5UcnVlPC9wcm9wZXJ0eT4KLQkJCSAgPHByb3BlcnR5IG5h bWU9ImxhYmVsIiB0cmFuc2xhdGFibGU9InllcyI+Jmx0O2kmZ3Q7KFVzZSB0aGUgZmlsZSBjaG9v c2VyIGlmIHlvdSB3b3VsZCBsaWtlICB0byByZXN0b3JlIHRvIGFuIGFsdGVybmF0aXZlIGxvY2F0 aW9uIGFuZCBhZnRlcndhcmRzIG1hbnVhbGx5IGNoZXJyeS1waWNrIGxvc3Qgb3IgY2hhbmdlZCBm aWxlcykmbHQ7L2kmZ3Q7PC9wcm9wZXJ0eT4KKwkJCSAgPHByb3BlcnR5IG5hbWU9ImxhYmVsIiB0 cmFuc2xhdGFibGU9InllcyI+Jmx0O2kmZ3Q7KFVzZSB0aGUgZmlsZSBjaG9vc2VyIGlmIHlvdSB3 b3VsZCBsaWtlIHRvIHJlc3RvcmUgdG8gYW4gYWx0ZXJuYXRpdmUgbG9jYXRpb24gYW5kIGFmdGVy d2FyZHMgbWFudWFsbHkgY2hlcnJ5LXBpY2sgbG9zdCBvciBjaGFuZ2VkIGZpbGVzKSZsdDsvaSZn dDs8L3Byb3BlcnR5PgogCQkJICA8cHJvcGVydHkgbmFtZT0idXNlX3VuZGVybGluZSI+RmFsc2U8 L3Byb3BlcnR5PgogCQkJICA8cHJvcGVydHkgbmFtZT0idXNlX21hcmt1cCI+VHJ1ZTwvcHJvcGVy dHk+CiAJCQkgIDxwcm9wZXJ0eSBuYW1lPSJqdXN0aWZ5Ij5HVEtfSlVTVElGWV9MRUZUPC9wcm9w ZXJ0eT4KQEAgLTI2Myw3ICsyNjMsNyBAQAogCQkgICAgICA8Y2hpbGQ+CiAJCQk8d2lkZ2V0IGNs YXNzPSJHdGtGaWxlQ2hvb3NlckJ1dHRvbiIgaWQ9ImZpbGVjaG9vc2VyYnV0dG9uMyI+CiAJCQkg IDxwcm9wZXJ0eSBuYW1lPSJ2aXNpYmxlIj5UcnVlPC9wcm9wZXJ0eT4KLQkJCSAgPHByb3BlcnR5 IG5hbWU9InRpdGxlIiB0cmFuc2xhdGFibGU9InllcyI+U2VsZWN0IEEgRm9sZGVyPC9wcm9wZXJ0 eT4KKwkJCSAgPHByb3BlcnR5IG5hbWU9InRpdGxlIiB0cmFuc2xhdGFibGU9InllcyI+U2VsZWN0 IGEgZm9sZGVyPC9wcm9wZXJ0eT4KIAkJCSAgPHByb3BlcnR5IG5hbWU9ImFjdGlvbiI+R1RLX0ZJ TEVfQ0hPT1NFUl9BQ1RJT05fU0VMRUNUX0ZPTERFUjwvcHJvcGVydHk+CiAJCQkgIDxwcm9wZXJ0 eSBuYW1lPSJsb2NhbF9vbmx5Ij5UcnVlPC9wcm9wZXJ0eT4KIAkJCSAgPHByb3BlcnR5IG5hbWU9 InNob3dfaGlkZGVuIj5GYWxzZTwvcHJvcGVydHk+CkBAIC04MzIsNyArODMyLDcgQEAKIAkgIDxj aGlsZD4KIAkgICAgPHdpZGdldCBjbGFzcz0iR3RrTGFiZWwiIGlkPSJsYWJlbDIyIj4KIAkgICAg ICA8cHJvcGVydHkgbmFtZT0idmlzaWJsZSI+VHJ1ZTwvcHJvcGVydHk+Ci0JICAgICAgPHByb3Bl cnR5IG5hbWU9ImxhYmVsIiB0cmFuc2xhdGFibGU9InllcyI+ICZsdDtiJmd0O1Jlc3RvcmUgWW91 ciBEYXRhICZsdDsvYiZndDs8L3Byb3BlcnR5PgorCSAgICAgIDxwcm9wZXJ0eSBuYW1lPSJsYWJl bCIgdHJhbnNsYXRhYmxlPSJ5ZXMiPiAmbHQ7YiZndDtSZXN0b3JlIHlvdXIgZGF0YSAmbHQ7L2Im Z3Q7PC9wcm9wZXJ0eT4KIAkgICAgICA8cHJvcGVydHkgbmFtZT0idXNlX3VuZGVybGluZSI+RmFs c2U8L3Byb3BlcnR5PgogCSAgICAgIDxwcm9wZXJ0eSBuYW1lPSJ1c2VfbWFya3VwIj5UcnVlPC9w cm9wZXJ0eT4KIAkgICAgICA8cHJvcGVydHkgbmFtZT0ianVzdGlmeSI+R1RLX0pVU1RJRllfTEVG VDwvcHJvcGVydHk+Cgo= === modified file data/restore-progress.glade // encoding:base64 LS0tIGRhdGEvcmVzdG9yZS1wcm9ncmVzcy5nbGFkZQorKysgZGF0YS9yZXN0b3JlLXByb2dyZXNz LmdsYWRlCkBAIC02OCw3ICs2OCw3IEBACiAJICAgICAgPGNoaWxkPgogCQk8d2lkZ2V0IGNsYXNz PSJHdGtMYWJlbCIgaWQ9ImxhYmVsX2FjdGlvbiI+CiAJCSAgPHByb3BlcnR5IG5hbWU9InZpc2li bGUiPlRydWU8L3Byb3BlcnR5PgotCQkgIDxwcm9wZXJ0eSBuYW1lPSJsYWJlbCIgdHJhbnNsYXRh YmxlPSJ5ZXMiPiZsdDtiJmd0O1Jlc3RvcmluZyBEYXRhJmx0Oy9iJmd0OzwvcHJvcGVydHk+CisJ CSAgPHByb3BlcnR5IG5hbWU9ImxhYmVsIiB0cmFuc2xhdGFibGU9InllcyI+Jmx0O2ImZ3Q7UmVz dG9yaW5nIGRhdGEmbHQ7L2ImZ3Q7PC9wcm9wZXJ0eT4KIAkJICA8cHJvcGVydHkgbmFtZT0idXNl X3VuZGVybGluZSI+RmFsc2U8L3Byb3BlcnR5PgogCQkgIDxwcm9wZXJ0eSBuYW1lPSJ1c2VfbWFy a3VwIj5UcnVlPC9wcm9wZXJ0eT4KIAkJICA8cHJvcGVydHkgbmFtZT0ianVzdGlmeSI+R1RLX0pV U1RJRllfTEVGVDwvcHJvcGVydHk+Cgo= === modified file data/standalone-restore-progress.glade // encoding:base64 LS0tIGRhdGEvc3RhbmRhbG9uZS1yZXN0b3JlLXByb2dyZXNzLmdsYWRlCisrKyBkYXRhL3N0YW5k YWxvbmUtcmVzdG9yZS1wcm9ncmVzcy5nbGFkZQpAQCAtNjMsNyArNjMsNyBAQAogCSAgPGNoaWxk PgogCSAgICA8d2lkZ2V0IGNsYXNzPSJHdGtMYWJlbCIgaWQ9ImxhYmVsMyI+CiAJICAgICAgPHBy b3BlcnR5IG5hbWU9InZpc2libGUiPlRydWU8L3Byb3BlcnR5PgotCSAgICAgIDxwcm9wZXJ0eSBu YW1lPSJsYWJlbCIgdHJhbnNsYXRhYmxlPSJ5ZXMiPiZsdDtiaWcmZ3Q7Jmx0O2ImZ3Q7VmVyaWZ5 aW5nIEJhY2t1cCZsdDsvYiZndDsmbHQ7L2JpZyZndDs8L3Byb3BlcnR5PgorCSAgICAgIDxwcm9w ZXJ0eSBuYW1lPSJsYWJlbCIgdHJhbnNsYXRhYmxlPSJ5ZXMiPiZsdDtiaWcmZ3Q7Jmx0O2ImZ3Q7 VmVyaWZ5aW5nIGJhY2t1cCZsdDsvYiZndDsmbHQ7L2JpZyZndDs8L3Byb3BlcnR5PgogCSAgICAg IDxwcm9wZXJ0eSBuYW1lPSJ1c2VfdW5kZXJsaW5lIj5GYWxzZTwvcHJvcGVydHk+CiAJICAgICAg PHByb3BlcnR5IG5hbWU9InVzZV9tYXJrdXAiPlRydWU8L3Byb3BlcnR5PgogCSAgICAgIDxwcm9w ZXJ0eSBuYW1lPSJqdXN0aWZ5Ij5HVEtfSlVTVElGWV9MRUZUPC9wcm9wZXJ0eT4KCg== === modified directory // last-changed:bruce.cowan@dsl.pipex.com-2007062813433 ... 8-jmk1lrbk36nvdyvv # revision id: bruce.cowan@dsl.pipex.com-20070628134338-jmk1lrbk36nvdyvv # sha1: e47c08df83438da9dd433daa381e22a6b8248e4f # inventory sha1: 8f977d97c23594427544b4ba1edf61f3bfde9f22 # parent ids: # mb@ubuntu-20070212123534-3f403eebe008341e # properties: # branch-nick: bcowan--grammar