diff -Nru timeshift-1.7.6~184~ubuntu16.04.1/build-deb-for-dist.sh timeshift-16.3~186~ubuntu16.04.1/build-deb-for-dist.sh --- timeshift-1.7.6~184~ubuntu16.04.1/build-deb-for-dist.sh 1970-01-01 00:00:00.000000000 +0000 +++ timeshift-16.3~186~ubuntu16.04.1/build-deb-for-dist.sh 2016-03-28 16:17:31.000000000 +0000 @@ -0,0 +1,58 @@ +#!/bin/bash + +app_name='timeshift' +app_fullname='Timeshift' +dsc="${app_name}*.dsc" + +backup=`pwd` +DIR="$( cd "$( dirname "$0" )" && pwd )" +cd $DIR + +if [ -z "$1" ]; then + echo "" + echo "E: Distribution name not specified" + echo "" + echo "Syntax: build-deb-for-dist " + echo "Example: build-deb-for-dist trusty amd64" + echo "" + exit 1 +else + dist=$1 +fi + +if [ -z "$2" ]; then + echo "" + echo "E: Architecture not specified" + echo "" + echo "Syntax: build-deb-for-dist " + echo "Example: build-deb-for-dist trusty amd64" + echo "" + exit 1 +else + arch=$2 +fi + + +sh build-source.sh +cd ../builds + +# build installer ------------------------------------- + +#for arch in amd64 +#do + +rm -rf "${dist}-${arch}" +mkdir -p "${dist}-${arch}" + +sudo pbuilder --build --distribution ${dist} --architecture ${arch} --buildresult "${dist}-${arch}" --basetgz "../pbuilder/build/${dist}/base-${arch}.tgz" ${dsc} + +#check for errors +if [ $? -ne 0 ]; then + cd "$backup" + echo "Failed" + exit 1 +fi + +#done + +cd "$backup" diff -Nru timeshift-1.7.6~184~ubuntu16.04.1/debian/bzr-builder.manifest timeshift-16.3~186~ubuntu16.04.1/debian/bzr-builder.manifest --- timeshift-1.7.6~184~ubuntu16.04.1/debian/bzr-builder.manifest 2015-11-08 14:02:32.000000000 +0000 +++ timeshift-16.3~186~ubuntu16.04.1/debian/bzr-builder.manifest 2016-03-28 16:17:31.000000000 +0000 @@ -1,2 +1,2 @@ -# bzr-builder format 0.3 deb-version {debupstream}~184 -lp:timeshift revid:tony.george.kol@gmail.com-20151108135848-kdup131ajjg0vnob +# bzr-builder format 0.3 deb-version {debupstream}~186 +lp:timeshift revid:tony.george.kol@gmail.com-20160328160108-gphwa0r3nkrmfev6 diff -Nru timeshift-1.7.6~184~ubuntu16.04.1/debian/changelog timeshift-16.3~186~ubuntu16.04.1/debian/changelog --- timeshift-1.7.6~184~ubuntu16.04.1/debian/changelog 2015-11-08 14:02:32.000000000 +0000 +++ timeshift-16.3~186~ubuntu16.04.1/debian/changelog 2016-03-28 16:17:31.000000000 +0000 @@ -1,15 +1,11 @@ -timeshift (1.7.6~184~ubuntu16.04.1) xenial; urgency=low +timeshift (16.3~186~ubuntu16.04.1) xenial; urgency=low * Auto build. - -- Tony George Sun, 08 Nov 2015 14:02:32 +0000 + -- Tony George Mon, 28 Mar 2016 16:17:31 +0000 -timeshift (1.7.6) trusty; urgency=medium +timeshift (16.3) trusty; urgency=medium - * Fixed: Enumerating device name for SD cards would throw an exception while sorting + * Added embedded VTE terminal for restoring snapshots - * Fixed: Timeshift creates large log files with junk messages when executed in the background as a scheduled job, with the backup device unplugged - - * Fixed: Check if value read from stdin is null before using it - - -- Tony George Sun, 08 Nov 2015 10:00:00 +0530 + -- Tony George Mon, 28 Mar 2016 10:00:00 +0530 diff -Nru timeshift-1.7.6~184~ubuntu16.04.1/debian/control timeshift-16.3~186~ubuntu16.04.1/debian/control --- timeshift-1.7.6~184~ubuntu16.04.1/debian/control 2015-11-08 14:02:32.000000000 +0000 +++ timeshift-16.3~186~ubuntu16.04.1/debian/control 2016-03-28 16:17:31.000000000 +0000 @@ -2,7 +2,7 @@ Section: utils Priority: extra Maintainer: Tony George -Build-Depends: debhelper (>= 8.0.0), autotools-dev, valac-0.26, libgtk-3-dev, libgee-0.8-dev, libgudev-1.0-dev, libjson-glib-dev +Build-Depends: debhelper (>= 8.0.0), autotools-dev, valac-0.26, libgtk-3-dev, libgee-0.8-dev, libgudev-1.0-dev, libjson-glib-dev, libvte-2.91-dev | libvte-2.90-dev Standards-Version: 3.9.3 Homepage: http://teejeetech.blogspot.in/ #Vcs-Git: git://git.debian.org/collab-maint/hello.git Binary files /tmp/tmpAwTKZo/8iky7jspfA/timeshift-1.7.6~184~ubuntu16.04.1/icons/timeshift-14.png and /tmp/tmpAwTKZo/xGRUyjTS4o/timeshift-16.3~186~ubuntu16.04.1/icons/timeshift-14.png differ Binary files /tmp/tmpAwTKZo/8iky7jspfA/timeshift-1.7.6~184~ubuntu16.04.1/icons/timeshift-192.png and /tmp/tmpAwTKZo/xGRUyjTS4o/timeshift-16.3~186~ubuntu16.04.1/icons/timeshift-192.png differ Binary files /tmp/tmpAwTKZo/8iky7jspfA/timeshift-1.7.6~184~ubuntu16.04.1/icons/timeshift-64.png and /tmp/tmpAwTKZo/xGRUyjTS4o/timeshift-16.3~186~ubuntu16.04.1/icons/timeshift-64.png differ diff -Nru timeshift-1.7.6~184~ubuntu16.04.1/README timeshift-16.3~186~ubuntu16.04.1/README --- timeshift-1.7.6~184~ubuntu16.04.1/README 2015-11-08 14:02:32.000000000 +0000 +++ timeshift-16.3~186~ubuntu16.04.1/README 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -TimeShift -============ - -A system restore utility for Linux. diff -Nru timeshift-1.7.6~184~ubuntu16.04.1/README.md timeshift-16.3~186~ubuntu16.04.1/README.md --- timeshift-1.7.6~184~ubuntu16.04.1/README.md 1970-01-01 00:00:00.000000000 +0000 +++ timeshift-16.3~186~ubuntu16.04.1/README.md 2016-03-28 16:17:31.000000000 +0000 @@ -0,0 +1,118 @@ +# TimeShift + +https://launchpad.net/timeshift + +TimeShift for Linux is an application that provides functionality similar to the _System Restore_ feature in Windows and the _Time Machine_ tool in Mac OS. TimeShift protects your system by taking incremental snapshots of the file system at regular intervals. These snapshots can be restored at a later date to undo all changes to the system. + +Snapshots are taken using [rsync](http://rsync.samba.org/) and [hard-links](http://en.wikipedia.org/wiki/Hard_link). Common files are shared between snapshots which saves disk space. Each snapshot is a full system backup that can be browsed with a file manager. + +TimeShift is similar to applications like [rsnapshot](http://www.rsnapshot.org/), [BackInTime](http://backintime.le-web.org/) and [TimeVault](https://wiki.ubuntu.com/TimeVault) but with different goals. It is designed to protect only system files and settings. User files such as documents, pictures and music are excluded. This ensures that your files remains unchanged when you restore your system to an earlier date. If you need a tool to backup your documents and files please take a look at the excellent [BackInTime](http://backintime.le-web.org/) application which is more configurable and provides options for saving user files. + +## Screenshots +[![](http://3.bp.blogspot.com/-tViIIYtGIVk/VqJWGBwwv9I/AAAAAAAADKY/p6qdUPyD8Ug/s1600/Timeshift%2BRSYNC%2Bv1.7.6_055.png)](http://3.bp.blogspot.com/-tViIIYtGIVk/VqJWGBwwv9I/AAAAAAAADKY/p6qdUPyD8Ug/s1600/Timeshift%2BRSYNC%2Bv1.7.6_055.png) + +[![](http://1.bp.blogspot.com/-H59eRf950rU/VqJWFBjSTYI/AAAAAAAADKA/re-otOjxqbc/s1600/Settings_056.png)](http://1.bp.blogspot.com/-H59eRf950rU/VqJWFBjSTYI/AAAAAAAADKA/re-otOjxqbc/s1600/Settings_056.png) + +[![](http://3.bp.blogspot.com/-ixRtHJ-e_7I/VqJWFs36CYI/AAAAAAAADKM/QaN3VDF2jT8/s1600/Settings_057.png)](http://3.bp.blogspot.com/-ixRtHJ-e_7I/VqJWFs36CYI/AAAAAAAADKM/QaN3VDF2jT8/s1600/Settings_057.png) + +[![](http://2.bp.blogspot.com/-AXDmlVFhYhg/VqJWFyYmBJI/AAAAAAAADKQ/GKY4iqWNWts/s1600/Settings_058.png)](http://2.bp.blogspot.com/-AXDmlVFhYhg/VqJWFyYmBJI/AAAAAAAADKQ/GKY4iqWNWts/s1600/Settings_058.png) + +[![](http://4.bp.blogspot.com/-2XB9AIiAh2U/VqJWFIF2nGI/AAAAAAAADKI/v-O2xERMueY/s1600/Restore_059.png)](http://4.bp.blogspot.com/-2XB9AIiAh2U/VqJWFIF2nGI/AAAAAAAADKI/v-O2xERMueY/s1600/Restore_059.png) + +[![](http://2.bp.blogspot.com/-IaiAmmrrhbs/VqJWFKLBupI/AAAAAAAADKE/TfslgQ74IPk/s1600/Restore_060.png)](http://2.bp.blogspot.com/-IaiAmmrrhbs/VqJWFKLBupI/AAAAAAAADKE/TfslgQ74IPk/s1600/Restore_060.png) + +## Features: +### Minimal Setup + +* TimeShift requires very little setup. Just install it, run it for the first time and take the first snapshot. Cron job can be enabled for taking automatic snapshots of the system at regular intervals. The backup levels can be selected from the _Settings_ window. +* Snapshots are saved by default on the system (root) partition in path **/timeshift**. Other linux partitions can also be selected. + +### Boot Snapshots + +* Boot snapshots provide an additional level of backup. +* Hourly, daily, weekly and monthly levels can be enabled if required. + +### Better Snapshots and Rotation + +* TimeShift runs at regular intervals but takes snapshots only when needed. +* Applications like rsnapshot rotate a snapshot to the next level by creating a hard-linked copy. Creating a hard-linked copy may seem like a good idea but it is still a waste of disk space, since only files can be hard-linked and not directories. The duplicated directory structure can take up as much as 100 MB of space. TimeShift avoids this wastage by using tags for maintaining backup levels. Each snapshot will have only one copy on disk and is tagged as "daily", "monthly", etc. The snapshot location will have a set of folders for each backup level ("Monthly", "Daily", etc) with symbolic links pointing to the actual snapshots tagged with the level. + +### System Restore +Snapshots can be restored either from the running system or from a live CD. Restoring backups from the running system requires a reboot to complete the restore process. +### Cross-Distribution Restore +You can also TimeShift across distributions. Let's say you are currently using Xubuntu and decide to try out Linux Mint. You install Linux Mint on your system and try it out for a week before deciding to go back to Xubuntu. Using TimeShift you can simply restore the last week's snapshot to get your Xubuntu system back. TimeShift will take care of things like reinstalling the bootloader and other details. Since installing a new linux distribution also formats your root partition you need to save your snapshots on a separate linux partition for this to work. +### Exclude Files +TimeShift is designed to protect system files and settings. User data such as documents, pictures and music are excluded by default. This has two advantages: + +* You don't need to worry about your documents getting overwritten when you restore a previous snapshot. +* Your music and video collection will not waste space on the backup device. + +## Installation + +### Ubuntu +Packages are available in my launchpad PPA for supported Ubuntu releases. Run the following commands in a terminal window: + + sudo apt-add-repository -y ppa:teejee2008/ppa + sudo apt-get update + sudo apt-get install timeshift + +### Other Linux Distributions +Download the installer from following links: +[timeshift-latest-i386.run](http://dl.dropbox.com/u/67740416/linux/timeshift-latest-i386.run?dl=1) (32-bit, 170 KB) +[timeshift-latest-amd64.run](http://dl.dropbox.com/u/67740416/linux/timeshift-latest-amd64.run?dl=1) (64-bit, 180 KB) + +Run it from a terminal window using the following commands: + + ./timeshift-latest-i386.run #32-bit + ./timeshift-latest-amd64.run #64-bit + +Depending on the distribution that you are using, you may need to install packages for the following dependencies: + + libgee json-glib rsync + +## UnInstall + +Run the following command in a terminal window: + + sudo apt-get remove timeshift + +or + + sudo timeshift-uninstall + +Remember to delete all snapshots before un-installing. Otherwise the snapshots continue to occupy space on your system. To delete all snapshots, run the application, select all snapshots from the list (CTRL+A) and click the _Delete_ button on the toolbar. This will delete all snapshots and remove the _/timeshift_ folder in the root directory. + +[![](http://3.bp.blogspot.com/-2Ry_OvakBIw/UmNrdxoiRKI/AAAAAAAABH4/yaEuwCT3trA/s320/delete.png)](http://3.bp.blogspot.com/-2Ry_OvakBIw/UmNrdxoiRKI/AAAAAAAABH4/yaEuwCT3trA/s1600/delete.png) +If you used the installer to install TimeShift, you can remove the installed files with following command: + + sudo timeshift-uninstall + +## Known Issues and Limitations + +### BTRFS volumes +BTRFS volumes must have an Ubuntu-type layout with @ and @home subvolumes. Other layouts are not supported. +### Disk Space +If the backup device is running out of space, try the following steps: + +* Reduce the number of backup levels - Enable the _boot_ backup level and disable the others. +* Reduce the number of snapshots that are kept - In the _Auto-Remove_ tab set the limit for _boot_ snapshots to 10 or less. +* You can also disable the scheduled snapshots completely. + +[![](http://4.bp.blogspot.com/-y0dracHFgGI/UmNpZn8g7hI/AAAAAAAABHw/Itao7TivCpU/s320/Settings.png)](http://4.bp.blogspot.com/-y0dracHFgGI/UmNpZn8g7hI/AAAAAAAABHw/Itao7TivCpU/s1600/Settings.png) + +### GRUB2 Bootloader +Only those systems are supported which use GRUB2 bootloader. Trying to create and restore snapshots on a system using older versions of GRUB will result in a non-bootable system. + +## Disclaimer + +This program is free for personal and commercial use and comes with absolutely no warranty. You use this program entirely at your own risk. The author will not be liable for any damages arising from the use of this program. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. + +## Donate + +This application is completely free and will continue to remain that way. Your contributions will help in keeping this project alive and improving it further. Feel free to send me an email if you find any issues in this application or if you need any changes. Suggestions and feedback are always welcome. + +If you want to buy me a coffee or send some donations my way, you can use Google wallet or Paypal to send a donation to **teejeetech at gmail dot com**. + +[Donate with Paypal](https://www.paypal.com/cgi-bin/webscr?business=teejeetech@gmail.com&cmd=_xclick¤cy_code=USD&amount=10&item_name=Timeshift%20Donation) + +[Donate with Google Wallet](https://support.google.com/mail/answer/3141103?hl=en) \ No newline at end of file diff -Nru timeshift-1.7.6~184~ubuntu16.04.1/src/Main.vala timeshift-16.3~186~ubuntu16.04.1/src/Main.vala --- timeshift-1.7.6~184~ubuntu16.04.1/src/Main.vala 2015-11-08 14:02:32.000000000 +0000 +++ timeshift-16.3~186~ubuntu16.04.1/src/Main.vala 2016-03-28 16:17:31.000000000 +0000 @@ -39,7 +39,7 @@ public Main App; public const string AppName = "Timeshift RSYNC"; public const string AppShortName = "timeshift"; -public const string AppVersion = "1.7.6"; +public const string AppVersion = "16.3"; public const string AppAuthor = "Tony George"; public const string AppAuthorEmail = "teejee2008@gmail.com"; @@ -2855,23 +2855,11 @@ if (restore_current_system){ //current system, gui, fullscreen temp_script = create_temp_bash_script(sh); - ret_val = execute_bash_script_fullscreen_sync(temp_script); - if (ret_val == -1){ - string msg = _("Failed to find a terminal emulator on this system!") + "\n"; - msg += _("Please install one of the following terminal emulators and try again") + ":\n"; - msg += "xfce4-terminal gnome-terminal xterm konsole\n\n"; - msg += _("No changes were made to system."); - - log_error(msg); - - string title = _("Error"); - gtk_messagebox(title, msg, null, true); - - thr_success = false; - thr_running = false; - return; - } + //restore or clone + var dlg = new TerminalWindow.with_parent(null); + dlg.execute_script(temp_script, true); + } else{ //other system, gui diff -Nru timeshift-1.7.6~184~ubuntu16.04.1/src/makefile timeshift-16.3~186~ubuntu16.04.1/src/makefile --- timeshift-1.7.6~184~ubuntu16.04.1/src/makefile 2015-11-08 14:02:32.000000000 +0000 +++ timeshift-16.3~186~ubuntu16.04.1/src/makefile 2016-03-28 16:17:31.000000000 +0000 @@ -9,9 +9,12 @@ app_name=timeshift app_fullname=Timeshift +vte_version=$(shell { ((ldconfig -p | grep libvte-2.91*.so) >/dev/null && echo 'vte-2.91') || echo 'vte-2.90'; } ) +define_symbols=$(shell { ((ldconfig -p | grep libvte-2.91*.so) >/dev/null && echo '-D VTE_291') || echo ''; } ) + all: #build binaries - valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" -X -Wl,-rpath,/usr/share/${app_name}/libs --thread "Main.vala" "Utility.vala" "MainWindow.vala" "SettingsWindow.vala" "RestoreWindow.vala" "ExcludeMessageWindow.vala" "AboutWindow.vala" "DonationWindow.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg gee-0.8 --pkg json-glib-1.0 --pkg gudev-1.0 + valac -X -D'GETTEXT_PACKAGE="${app_name}"' --Xcc="-lm" -X -Wl,-rpath,/usr/share/${app_name}/libs ${define_symbols} --thread "Main.vala" "Utility.vala" "MainWindow.vala" "SettingsWindow.vala" "RestoreWindow.vala" "ExcludeMessageWindow.vala" "AboutWindow.vala" "DonationWindow.vala" "TerminalWindow.vala" -o ${app_name} --pkg glib-2.0 --pkg gio-unix-2.0 --pkg posix --pkg gtk+-3.0 --pkg $(vte_version) --pkg gee-0.8 --pkg json-glib-1.0 --pkg gudev-1.0 #update translation template xgettext --language=C --keyword=_ --copyright-holder='Tony George (teejee2008@gmail.com)' --package-name="${app_name}" --package-version='1.6' --msgid-bugs-address='teejee2008@gmail.com' --escape --sort-output -o ../${app_name}.pot *.vala diff -Nru timeshift-1.7.6~184~ubuntu16.04.1/src/RestoreWindow.vala timeshift-16.3~186~ubuntu16.04.1/src/RestoreWindow.vala --- timeshift-1.7.6~184~ubuntu16.04.1/src/RestoreWindow.vala 2015-11-08 14:02:32.000000000 +0000 +++ timeshift-16.3~186~ubuntu16.04.1/src/RestoreWindow.vala 2016-03-28 16:17:31.000000000 +0000 @@ -663,14 +663,24 @@ } } + string txt = pi.device; + if ((App.root_device != null) && (pi.device == App.root_device.device)){ - (cell as Gtk.CellRendererText).text = pi.device + " (" + _("sys") + ")" + ((symlink.length > 0) ? " → " + symlink : ""); - } - else{ - (cell as Gtk.CellRendererText).text = pi.device + ((symlink.length > 0) ? " → " + symlink : ""); + txt += " (" + _("sys") + ")"; } + if (symlink.length > 0){ + txt += " → "; + if (symlink.length > 10){ + txt += symlink[0:10] + "..."; + } + else{ + txt += symlink; + } + } + Gtk.CellRendererText ctxt = (cell as Gtk.CellRendererText); + ctxt.text = txt; set_cell_text_color(ref ctxt); } diff -Nru timeshift-1.7.6~184~ubuntu16.04.1/src/TerminalWindow.vala timeshift-16.3~186~ubuntu16.04.1/src/TerminalWindow.vala --- timeshift-1.7.6~184~ubuntu16.04.1/src/TerminalWindow.vala 1970-01-01 00:00:00.000000000 +0000 +++ timeshift-16.3~186~ubuntu16.04.1/src/TerminalWindow.vala 2016-03-28 16:17:31.000000000 +0000 @@ -0,0 +1,244 @@ +/* + * TerminalWindow.vala + * + * Copyright 2015 Tony George + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + * + * + */ + + +using Gtk; +using Gee; + +using TeeJee.Logging; +using TeeJee.FileSystem; +using TeeJee.JSON; +using TeeJee.ProcessManagement; +using TeeJee.GtkHelper; +using TeeJee.Multimedia; +using TeeJee.System; +using TeeJee.Misc; + +public class TerminalWindow : Gtk.Window { + private Gtk.Box vbox_main; + private Vte.Terminal term; + + private int def_width = 800; + private int def_height = 600; + + private Pid child_pid; + private Gtk.Window parent_win = null; + public bool is_running = false; + + // init + + public TerminalWindow.with_parent(Gtk.Window? parent) { + if (parent != null){ + set_transient_for(parent); + parent_win = parent; + } + set_modal(true); + fullscreen(); + + this.delete_event.connect(()=>{ + // do not allow window to close + return true; + }); + + init_window(); + } + + public void init_window () { + title = ""; + icon = get_app_icon(16); + resizable = true; + deletable = false; + + // vbox_main --------------- + + vbox_main = new Box (Orientation.VERTICAL, 6); + vbox_main.set_size_request (def_width, def_height); + add (vbox_main); + + // terminal ---------------------- + + term = new Vte.Terminal(); + term.expand = true; + vbox_main.add(term); + + #if VTE_291 + + term.input_enabled = true; + term.backspace_binding = Vte.EraseBinding.AUTO; + term.cursor_blink_mode = Vte.CursorBlinkMode.SYSTEM; + term.cursor_shape = Vte.CursorShape.UNDERLINE; + term.rewrap_on_resize = true; + + #endif + + term.scroll_on_keystroke = true; + term.scroll_on_output = true; + + // colors ----------------------------- + + #if VTE_291 + + var color = Gdk.RGBA(); + color.parse("#FFFFFF"); + term.set_color_foreground(color); + + color.parse("#404040"); + term.set_color_background(color); + + #else + + Gdk.Color color; + Gdk.Color.parse("#FFFFFF", out color); + term.set_color_foreground(color); + + Gdk.Color.parse("#404040", out color); + term.set_color_background(color); + + #endif + + // grab focus ---------------- + + term.grab_focus(); + + show_all(); + } + + public void start_shell(){ + string[] argv = new string[1]; + argv[0] = "/bin/sh"; + + string[] env = Environ.get(); + + try{ + + is_running = true; + + #if VTE_291 + + term.spawn_sync( + Vte.PtyFlags.DEFAULT, //pty_flags + TEMP_DIR, //working_directory + argv, //argv + env, //env + GLib.SpawnFlags.SEARCH_PATH, //spawn_flags + null, //child_setup + out child_pid, + null + ); + + #else + + term.fork_command_full( + Vte.PtyFlags.DEFAULT, //pty_flags + TEMP_DIR, //working_directory + argv, //argv + env, //env + GLib.SpawnFlags.SEARCH_PATH, //spawn_flags + null, //child_setup + out child_pid + ); + + #endif + } + catch (Error e) { + log_error (e.message); + } + } + + public void execute_command(string command){ + term.feed_child("%s\n".printf(command), -1); + } + + public void execute_script(string script_path, bool wait = false){ + string[] argv = new string[1]; + argv[0] = script_path; + + string[] env = Environ.get(); + + try{ + + is_running = true; + + #if VTE_291 + + term.spawn_sync( + Vte.PtyFlags.DEFAULT, //pty_flags + TEMP_DIR, //working_directory + argv, //argv + env, //env + GLib.SpawnFlags.SEARCH_PATH, //spawn_flags + null, //child_setup + out child_pid, + null + ); + + #else + + term.fork_command_full( + Vte.PtyFlags.DEFAULT, //pty_flags + TEMP_DIR, //working_directory + argv, //argv + env, //env + GLib.SpawnFlags.SEARCH_PATH, //spawn_flags + null, //child_setup + out child_pid + ); + + #endif + + term.watch_child(child_pid); + + term.child_exited.connect(script_exit); + + if (wait){ + while (is_running){ + sleep(200); + gtk_do_events(); + } + } + } + catch (Error e) { + log_error (e.message); + } + } + + #if VTE_291 + public void script_exit(int status){ + #else + public void script_exit(){ + #endif + + is_running = false; + + this.hide(); + + //no need to check status again + + //destroying parent will display main window + if (parent != null){ + parent_win.destroy(); + } + } +} + + diff -Nru timeshift-1.7.6~184~ubuntu16.04.1/src/timeshift.desktop timeshift-16.3~186~ubuntu16.04.1/src/timeshift.desktop --- timeshift-1.7.6~184~ubuntu16.04.1/src/timeshift.desktop 2015-11-08 14:02:32.000000000 +0000 +++ timeshift-16.3~186~ubuntu16.04.1/src/timeshift.desktop 2016-03-28 16:17:31.000000000 +0000 @@ -6,7 +6,7 @@ GenericName=System Restore Utility Terminal=false Icon=timeshift -Caption=System Restore Utility +Comment=System Restore Utility X-KDE-StartupNotify=false Categories=System; Name[en_IN]=Timeshift diff -Nru timeshift-1.7.6~184~ubuntu16.04.1/src/Utility.vala timeshift-16.3~186~ubuntu16.04.1/src/Utility.vala --- timeshift-1.7.6~184~ubuntu16.04.1/src/Utility.vala 2015-11-08 14:02:32.000000000 +0000 +++ timeshift-16.3~186~ubuntu16.04.1/src/Utility.vala 2016-03-28 16:17:31.000000000 +0000 @@ -2834,6 +2834,10 @@ return ""; } } + + public void sleep(int milliseconds){ + Thread.usleep ((ulong) milliseconds * 1000); + } } namespace TeeJee.Misc { diff -Nru timeshift-1.7.6~184~ubuntu16.04.1/timeshift.geany timeshift-16.3~186~ubuntu16.04.1/timeshift.geany --- timeshift-1.7.6~184~ubuntu16.04.1/timeshift.geany 2015-11-08 14:02:32.000000000 +0000 +++ timeshift-16.3~186~ubuntu16.04.1/timeshift.geany 2016-03-28 16:17:31.000000000 +0000 @@ -17,21 +17,26 @@ long_line_column=80 [files] -current_page=0 -FILE_NAME_0=30209;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FMain.vala;0;4 +current_page=15 +FILE_NAME_0=1216;Vala;0;EUTF-8;1;1;0;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FMain.vala;0;4 FILE_NAME_1=0;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FAboutWindow.vala;0;4 FILE_NAME_2=3392;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FDonationWindow.vala;0;4 FILE_NAME_3=5557;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FExcludeMessageWindow.vala;0;4 -FILE_NAME_4=16547;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FMainWindow.vala;0;4 -FILE_NAME_5=2241;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2Fmakefile;0;4 -FILE_NAME_6=39594;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FRestoreWindow.vala;0;4 +FILE_NAME_4=33936;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FMainWindow.vala;0;4 +FILE_NAME_5=462;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2Fmakefile;0;4 +FILE_NAME_6=38346;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FRestoreWindow.vala;0;4 FILE_NAME_7=21369;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FSettingsWindow.vala;0;4 -FILE_NAME_8=0;Conf;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2Ftimeshift.desktop;0;4 +FILE_NAME_8=245;Conf;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2Ftimeshift.desktop;0;4 FILE_NAME_9=0;Sh;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2Ftimeshift-launcher;0;4 FILE_NAME_10=0;Sh;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2Ftimeshift-uninstall;0;4 -FILE_NAME_11=74104;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FUtility.vala;0;4 -FILE_NAME_12=163;Conf;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fdebian%2Fcontrol;0;4 -FILE_NAME_13=140;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fdebian%2Fchangelog;0;4 +FILE_NAME_11=66925;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FUtility.vala;0;4 +FILE_NAME_12=832;Conf;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fdebian%2Fcontrol;0;4 +FILE_NAME_13=175;None;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fdebian%2Fchangelog;0;4 +FILE_NAME_14=33716;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FPackageWindow.vala;0;4 +FILE_NAME_15=1473;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FTerminalWindow.vala;0;4 +FILE_NAME_16=1137;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2Fmakefile;0;4 +FILE_NAME_17=44263;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fsrc%2FUtility.vala;0;4 +FILE_NAME_18=209;Conf;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Faptik%2Fdebian%2Fcontrol;0;4 [VTE] last_dir=/home/teejee diff -Nru timeshift-1.7.6~184~ubuntu16.04.1/timeshift.pot timeshift-16.3~186~ubuntu16.04.1/timeshift.pot --- timeshift-1.7.6~184~ubuntu16.04.1/timeshift.pot 2015-11-08 14:02:32.000000000 +0000 +++ timeshift-16.3~186~ubuntu16.04.1/timeshift.pot 2016-03-28 16:17:31.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: timeshift 1.6\n" "Report-Msgid-Bugs-To: teejee2008@gmail.com\n" -"POT-Creation-Date: 2015-11-08 19:18+0530\n" +"POT-Creation-Date: 2016-03-28 21:30+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -31,12 +31,12 @@ msgid "** Advanced Users **" msgstr "" -#: Main.vala:3585 +#: Main.vala:3573 #, c-format msgid "/ is mapped to device: %s, UUID=%s" msgstr "" -#: Main.vala:3592 +#: Main.vala:3580 #, c-format msgid "/home is mapped to device: %s, UUID=%s" msgstr "" @@ -74,7 +74,7 @@ msgstr "" #: Main.vala:1028 Main.vala:1049 Main.vala:2129 Main.vala:2211 Main.vala:2286 -#: Main.vala:2351 Main.vala:2448 Main.vala:2473 Main.vala:2508 Main.vala:3174 +#: Main.vala:2351 Main.vala:2448 Main.vala:2473 Main.vala:2508 Main.vala:3162 msgid "Aborted." msgstr "" @@ -110,15 +110,15 @@ msgid "Answer YES to all confirmation prompts" msgstr "" -#: RestoreWindow.vala:1148 +#: RestoreWindow.vala:1158 msgid "Any exclude patterns in the current exclude list will also be excluded." msgstr "" -#: Main.vala:3480 +#: Main.vala:3468 msgid "App config loaded" msgstr "" -#: Main.vala:3390 +#: Main.vala:3378 msgid "App config saved" msgstr "" @@ -130,7 +130,7 @@ msgid "Application Info" msgstr "" -#: Main.vala:3817 +#: Main.vala:3805 msgid "Application will exit" msgstr "" @@ -176,11 +176,11 @@ msgid "Backup device does not have enough space" msgstr "" -#: Main.vala:1336 Main.vala:3868 MainWindow.vala:1431 MainWindow.vala:1439 +#: Main.vala:1336 Main.vala:3856 MainWindow.vala:1431 MainWindow.vala:1439 msgid "Backup device does not have enough space!" msgstr "" -#: MainWindow.vala:1398 RestoreWindow.vala:1285 +#: MainWindow.vala:1398 RestoreWindow.vala:1295 msgid "Backup device is not available" msgstr "" @@ -188,19 +188,19 @@ msgid "Backup device is not mounted!" msgstr "" -#: Main.vala:3855 Main.vala:3862 +#: Main.vala:3843 Main.vala:3850 msgid "Backup device not available" msgstr "" -#: Main.vala:3632 +#: Main.vala:3620 msgid "Backup device not found" msgstr "" -#: Main.vala:3624 +#: Main.vala:3612 msgid "Backup device not set!" msgstr "" -#: Main.vala:3430 +#: Main.vala:3418 msgid "Backup device not set! Defaulting to system device" msgstr "" @@ -208,7 +208,7 @@ msgid "Backup device not specified!" msgstr "" -#: Main.vala:3646 Main.vala:3669 +#: Main.vala:3634 Main.vala:3657 #, c-format msgid "Backup path changed to '%s/timeshift'" msgstr "" @@ -221,7 +221,7 @@ msgid "Boot" msgstr "" -#: RestoreWindow.vala:1395 +#: RestoreWindow.vala:1405 msgid "Boot device not selected" msgstr "" @@ -241,7 +241,7 @@ msgid "Browse Snapshot" msgstr "" -#: RestoreWindow.vala:1147 +#: RestoreWindow.vala:1157 msgid "" "By default, any item that was included/excluded at the time of taking the " "snapshot will be included/excluded." @@ -267,7 +267,7 @@ msgid "Click 'OK' to confirm" msgstr "" -#: RestoreWindow.vala:1439 +#: RestoreWindow.vala:1449 msgid "Click OK to continue" msgstr "" @@ -303,11 +303,11 @@ msgid "Comments" msgstr "" -#: RestoreWindow.vala:1442 +#: RestoreWindow.vala:1452 msgid "Confirm Mounts" msgstr "" -#: RestoreWindow.vala:1407 +#: RestoreWindow.vala:1417 msgid "Continue with restore?" msgstr "" @@ -316,11 +316,11 @@ msgid "Continue with restore? (y/n): " msgstr "" -#: Main.vala:2101 Main.vala:2260 Main.vala:2427 Main.vala:3422 +#: Main.vala:2101 Main.vala:2260 Main.vala:2427 Main.vala:3410 msgid "Could not find device" msgstr "" -#: Main.vala:2181 Main.vala:3144 +#: Main.vala:2181 Main.vala:3132 msgid "Could not find snapshot" msgstr "" @@ -328,15 +328,15 @@ msgid "Credits" msgstr "" -#: Main.vala:3816 +#: Main.vala:3804 msgid "Critical Error" msgstr "" -#: Main.vala:4129 +#: Main.vala:4117 msgid "Cron job added" msgstr "" -#: Main.vala:4142 +#: Main.vala:4130 msgid "Cron job removed" msgstr "" @@ -344,7 +344,7 @@ msgid "Crontab is empty" msgstr "" -#: Main.vala:2704 RestoreWindow.vala:1410 +#: Main.vala:2704 RestoreWindow.vala:1420 msgid "DISCLAIMER" msgstr "" @@ -384,13 +384,13 @@ msgid "Description" msgstr "" -#: Main.vala:900 Main.vala:973 RestoreWindow.vala:185 RestoreWindow.vala:855 -#: RestoreWindow.vala:1423 RestoreWindow.vala:1433 +#: Main.vala:900 Main.vala:973 RestoreWindow.vala:185 RestoreWindow.vala:865 +#: RestoreWindow.vala:1433 RestoreWindow.vala:1443 #, c-format msgid "Device" msgstr "" -#: MainWindow.vala:1398 RestoreWindow.vala:1285 +#: MainWindow.vala:1398 RestoreWindow.vala:1295 msgid "Device Offline" msgstr "" @@ -427,7 +427,7 @@ "(teejeetech@gmail.com)" msgstr "" -#: Main.vala:3238 Main.vala:3331 +#: Main.vala:3226 Main.vala:3319 msgid "Directory not found" msgstr "" @@ -524,13 +524,13 @@ msgid "Enter passphrase to unlock '%s'" msgstr "" -#: Main.vala:2203 Main.vala:3166 +#: Main.vala:2203 Main.vala:3154 #, c-format msgid "Enter snapshot number (a=Abort, p=Previous, n=Next)" msgstr "" -#: Main.vala:269 Main.vala:2658 Main.vala:2868 MainWindow.vala:1170 -#: RestoreWindow.vala:1385 Utility.vala:125 +#: Main.vala:269 Main.vala:2658 MainWindow.vala:1170 RestoreWindow.vala:1395 +#: Utility.vala:125 msgid "Error" msgstr "" @@ -575,7 +575,7 @@ msgid "Excluded Directories" msgstr "" -#: Main.vala:4133 +#: Main.vala:4121 msgid "Failed to add cron job" msgstr "" @@ -591,16 +591,12 @@ msgid "Failed to delete symlinks" msgstr "" -#: Main.vala:3990 Main.vala:3996 +#: Main.vala:3978 Main.vala:3984 msgid "Failed to estimate system size" msgstr "" -#: Main.vala:2861 -msgid "Failed to find a terminal emulator on this system!" -msgstr "" - #: Main.vala:2128 Main.vala:2210 Main.vala:2285 Main.vala:2350 Main.vala:2447 -#: Main.vala:2472 Main.vala:2507 Main.vala:3173 +#: Main.vala:2472 Main.vala:2507 Main.vala:3161 msgid "Failed to get input from user in 3 attempts" msgstr "" @@ -608,7 +604,7 @@ msgid "Failed to get partition list" msgstr "" -#: Main.vala:3557 +#: Main.vala:3545 msgid "Failed to get partition list." msgstr "" @@ -616,19 +612,19 @@ msgid "Failed to hard-link last snapshot" msgstr "" -#: Main.vala:3739 Main.vala:3745 +#: Main.vala:3727 Main.vala:3733 msgid "Failed to mount BTRFS subvolume" msgstr "" -#: RestoreWindow.vala:1386 +#: RestoreWindow.vala:1396 msgid "Failed to mount device" msgstr "" -#: Main.vala:3225 Main.vala:3318 +#: Main.vala:3213 Main.vala:3306 msgid "Failed to remove" msgstr "" -#: Main.vala:4146 +#: Main.vala:4134 msgid "Failed to remove cron job" msgstr "" @@ -648,7 +644,7 @@ msgid "Failed to unmount" msgstr "" -#: Main.vala:3817 +#: Main.vala:3805 msgid "Failed to unmount device!" msgstr "" @@ -677,7 +673,7 @@ msgid "First Snapshot" msgstr "" -#: Main.vala:3877 MainWindow.vala:1440 +#: Main.vala:3865 MainWindow.vala:1440 msgid "First snapshot needs" msgstr "" @@ -685,7 +681,7 @@ msgid "First snapshot not taken" msgstr "" -#: RestoreWindow.vala:1420 +#: RestoreWindow.vala:1430 msgid "Following mounts will be used for restored system:" msgstr "" @@ -795,7 +791,7 @@ msgid "Keep one snapshot per week" msgstr "" -#: Main.vala:904 RestoreWindow.vala:858 +#: Main.vala:904 RestoreWindow.vala:868 #, c-format msgid "Label" msgstr "" @@ -925,7 +921,7 @@ msgid "Monthly snapshot failed!" msgstr "" -#: RestoreWindow.vala:209 RestoreWindow.vala:1422 RestoreWindow.vala:1433 +#: RestoreWindow.vala:209 RestoreWindow.vala:1432 RestoreWindow.vala:1443 msgid "Mount" msgstr "" @@ -941,15 +937,11 @@ msgid "No Snapshots Selected" msgstr "" -#: Main.vala:2864 -msgid "No changes were made to system." -msgstr "" - #: Main.vala:1027 msgid "No response from user" msgstr "" -#: Main.vala:381 Main.vala:2190 Main.vala:3153 Main.vala:3274 +#: Main.vala:381 Main.vala:2190 Main.vala:3141 Main.vala:3262 msgid "No snapshots found on device" msgstr "" @@ -977,11 +969,11 @@ msgid "OK" msgstr "" -#: Main.vala:4187 +#: Main.vala:4175 msgid "Older log files removed" msgstr "" -#: Main.vala:434 Main.vala:3724 RestoreWindow.vala:1375 +#: Main.vala:434 Main.vala:3712 RestoreWindow.vala:1385 msgid "" "Only ubuntu-type layouts with @ and @home subvolumes are currently supported." msgstr "" @@ -1004,10 +996,6 @@ msgid "Please do not interrupt the restore process!" msgstr "" -#: Main.vala:2862 -msgid "Please install one of the following terminal emulators and try again" -msgstr "" - #: Main.vala:419 msgid "Please install required packages and try running TimeShift again" msgstr "" @@ -1032,15 +1020,15 @@ msgid "Please select a snapshot to view the log!" msgstr "" -#: Main.vala:3852 MainWindow.vala:1420 +#: Main.vala:3840 MainWindow.vala:1420 msgid "Please select the backup device" msgstr "" -#: RestoreWindow.vala:1396 +#: RestoreWindow.vala:1406 msgid "Please select the boot device" msgstr "" -#: RestoreWindow.vala:1363 +#: RestoreWindow.vala:1373 msgid "Please select the root device (/)" msgstr "" @@ -1052,7 +1040,7 @@ msgid "Please select the snapshots to delete" msgstr "" -#: RestoreWindow.vala:1355 +#: RestoreWindow.vala:1365 msgid "Please select the target device from the list" msgstr "" @@ -1097,11 +1085,11 @@ msgid "Remove selected items" msgstr "" -#: Main.vala:3231 Main.vala:3324 +#: Main.vala:3219 Main.vala:3312 msgid "Removed" msgstr "" -#: Main.vala:3787 Main.vala:3906 +#: Main.vala:3775 Main.vala:3894 #, c-format msgid "Removed mount directory: '%s'" msgstr "" @@ -1118,7 +1106,7 @@ msgid "Removing selected snapshots..." msgstr "" -#: Main.vala:3213 +#: Main.vala:3201 msgid "Removing snapshot" msgstr "" @@ -1147,11 +1135,11 @@ msgid "Restore Snapshot" msgstr "" -#: Main.vala:2907 +#: Main.vala:2895 msgid "Restore completed without errors" msgstr "" -#: Main.vala:2902 +#: Main.vala:2890 msgid "Restore failed with exit code" msgstr "" @@ -1216,7 +1204,7 @@ msgid "Select GRUB device" msgstr "" -#: RestoreWindow.vala:1362 +#: RestoreWindow.vala:1372 msgid "Select Root Device" msgstr "" @@ -1224,7 +1212,7 @@ msgid "Select Snapshot" msgstr "" -#: RestoreWindow.vala:1354 +#: RestoreWindow.vala:1364 msgid "Select Target Device" msgstr "" @@ -1232,15 +1220,15 @@ msgid "Select backup device" msgstr "" -#: RestoreWindow.vala:1111 SettingsWindow.vala:821 +#: RestoreWindow.vala:1121 SettingsWindow.vala:821 msgid "Select directory" msgstr "" -#: RestoreWindow.vala:1094 SettingsWindow.vala:804 +#: RestoreWindow.vala:1104 SettingsWindow.vala:804 msgid "Select file(s)" msgstr "" -#: Main.vala:3158 +#: Main.vala:3146 msgid "Select snapshot to delete" msgstr "" @@ -1284,7 +1272,7 @@ msgid "Show rsync output (default)" msgstr "" -#: Main.vala:902 RestoreWindow.vala:249 RestoreWindow.vala:859 +#: Main.vala:902 RestoreWindow.vala:249 RestoreWindow.vala:869 #, c-format msgid "Size" msgstr "" @@ -1316,7 +1304,7 @@ msgid "Snapshot saved successfully" msgstr "" -#: Main.vala:3183 +#: Main.vala:3171 msgid "Snapshot to delete not specified!" msgstr "" @@ -1381,7 +1369,7 @@ msgid "Synching files..." msgstr "" -#: MainWindow.vala:328 RestoreWindow.vala:258 RestoreWindow.vala:861 +#: MainWindow.vala:328 RestoreWindow.vala:258 RestoreWindow.vala:871 #, c-format msgid "System" msgstr "" @@ -1438,11 +1426,11 @@ msgid "Target device is not mounted" msgstr "" -#: Main.vala:2308 Main.vala:2391 Main.vala:3705 +#: Main.vala:2308 Main.vala:2391 Main.vala:3693 msgid "Target device not specified!" msgstr "" -#: Main.vala:4232 +#: Main.vala:4220 msgid "Terminating rsync process" msgstr "" @@ -1454,7 +1442,7 @@ msgid "The system partition has an unsupported subvolume layout." msgstr "" -#: Main.vala:3723 RestoreWindow.vala:1374 +#: Main.vala:3711 RestoreWindow.vala:1384 msgid "The target partition has an unsupported subvolume layout." msgstr "" @@ -1481,7 +1469,7 @@ msgid "TimeShift needs admin access to backup and restore system files." msgstr "" -#: RestoreWindow.vala:1149 +#: RestoreWindow.vala:1159 msgid "" "To see which files are included in the snapshot use the 'Browse' button on " "the main window." @@ -1492,12 +1480,12 @@ msgid "Translators" msgstr "" -#: Main.vala:903 RestoreWindow.vala:200 RestoreWindow.vala:857 +#: Main.vala:903 RestoreWindow.vala:200 RestoreWindow.vala:867 #, c-format msgid "Type" msgstr "" -#: RestoreWindow.vala:856 +#: RestoreWindow.vala:866 #, c-format msgid "UUID" msgstr "" @@ -1528,24 +1516,24 @@ msgid "Unmounting from" msgstr "" -#: Main.vala:3727 RestoreWindow.vala:1373 +#: Main.vala:3715 RestoreWindow.vala:1383 msgid "Unsupported Subvolume Layout" msgstr "" -#: Main.vala:2995 +#: Main.vala:2983 msgid "Updated /etc/fstab on target device" msgstr "" -#: RestoreWindow.vala:860 +#: RestoreWindow.vala:870 #, c-format msgid "Used" msgstr "" -#: Main.vala:3088 +#: Main.vala:3076 msgid "Using the default exclude-list" msgstr "" -#: Main.vala:3091 +#: Main.vala:3079 msgid "Using user-specified exclude-list" msgstr "" @@ -1611,7 +1599,7 @@ msgid "days..." msgstr "" -#: Main.vala:3841 +#: Main.vala:3829 msgid "free" msgstr "" @@ -1632,7 +1620,7 @@ msgid "snapshots older than" msgstr "" -#: RestoreWindow.vala:667 +#: RestoreWindow.vala:669 msgid "sys" msgstr ""