diff --git a/icons/README b/icons/README new file mode 100644 index 0000000..8b6db49 --- /dev/null +++ b/icons/README @@ -0,0 +1 @@ +Font is Mathjax_Fractur diff --git a/icons/timeshift_2_black.xcf b/icons/timeshift_2_black.xcf index 129f330..eb21467 100644 Binary files a/icons/timeshift_2_black.xcf and b/icons/timeshift_2_black.xcf differ diff --git a/icons/timeshift_2_black_bold.xcf b/icons/timeshift_2_black_bold.xcf new file mode 100644 index 0000000..e3d8454 Binary files /dev/null and b/icons/timeshift_2_black_bold.xcf differ diff --git a/icons/timeshift_2_white_bold.xcf b/icons/timeshift_2_white_bold.xcf new file mode 100644 index 0000000..9a0ca8f Binary files /dev/null and b/icons/timeshift_2_white_bold.xcf differ diff --git a/icons/timeshift_black_bold.png b/icons/timeshift_black_bold.png new file mode 100644 index 0000000..01b84d0 Binary files /dev/null and b/icons/timeshift_black_bold.png differ diff --git a/icons/timeshift_white_bold.png b/icons/timeshift_white_bold.png new file mode 100644 index 0000000..b202c7e Binary files /dev/null and b/icons/timeshift_white_bold.png differ diff --git a/installer/install.sh b/installer/install.sh index 10d3b75..67db173 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -6,7 +6,7 @@ app_fullname='Timeshift' generic_depends=(rsync libgee json-glib) debian_depends=(rsync libgee2 libjson-glib-1.0-0) redhat_depends=(rsync libgee json-glib) -arch_depends=(rsync libgee06 json-glib) +arch_depends=(rsync libgee json-glib) generic_recommends=() debian_recommends=() diff --git a/src/Gtk/FinishBox.vala b/src/Gtk/FinishBox.vala index 2dcce35..e3f5cc0 100644 --- a/src/Gtk/FinishBox.vala +++ b/src/Gtk/FinishBox.vala @@ -82,9 +82,9 @@ class FinishBox : Gtk.Box{ msg += _("◈ Avoid storing snapshots on your system partition. Using another partition will allow you to format and re-install the OS on your system partition without losing the snapshots stored on it. You can even install another Linux distribution and later roll-back the previous distribution by restoring the snapshot.") + "\n\n"; - msg += _("◈ The first snapshot creates a copy of all files on your system. Subsequent snapshots only store files which have changed. You can reduce the size of snapshots by adding filters to exclude files which are not required. For example, you can exclude your web browser cache as these files change constantly and are not very important.") + "\n\n"; + msg += _("◈ The first snapshot creates a copy of all files on your system. Subsequent snapshots only store files which have changed. You can reduce the size of snapshots by adding filters to exclude files which are not required. For example, you can exclude your web browser cache as these files change constantly and are not important.") + "\n\n"; - msg += _("◈ Common files are hard-linked between snapshots. Copying the files manually to another location will duplicate the files and break hard-links between them. Snapshots must be moved carefully by running 'rsync' from a terminal and the file system at destination path must support hard-links.") + "\n\n"; + msg += _("◈ Common files are hard-linked between snapshots. Copying the files manually to another location will duplicate the files and break hard-links between them. Snapshots must be moved carefully by running 'rsync' from a terminal. The file system at destination path must support hard-links.") + "\n\n"; lbl_message.label = msg; } diff --git a/src/Gtk/RsyncLogWindow.vala b/src/Gtk/RsyncLogWindow.vala index 0a60613..11cda2b 100644 --- a/src/Gtk/RsyncLogWindow.vala +++ b/src/Gtk/RsyncLogWindow.vala @@ -462,6 +462,7 @@ public class RsyncLogWindow : Window { } if (item.file_type == FileType.DIRECTORY){ + log_debug("Appending: %s".printf(item.file_path)); tv_append_to_iter(ref model, ref iter0, item, odd_row, false); } } diff --git a/src/Main.vala b/src/Main.vala index 4e25aaf..949f928 100644 --- a/src/Main.vala +++ b/src/Main.vala @@ -263,6 +263,7 @@ public class Main : GLib.Object{ this.current_distro = LinuxDistro.get_dist_info("/"); log_msg(_("Distribution") + ": " + current_distro.full_name()); + log_msg("DIST_ID" + ": " + current_distro.dist_id); //check dependencies --------------------- @@ -2872,13 +2873,27 @@ public class Main : GLib.Object{ log_debug("grub_device=%s".printf( (grub_device == null) ? "null" : grub_device)); + + var target_distro = LinuxDistro.get_dist_info(target_path); sh_grub = ""; + if (reinstall_grub2 && (grub_device != null) && (grub_device.length > 0)){ + sh_grub += "sync \n"; sh_grub += "echo '' \n"; sh_grub += "echo '" + _("Re-installing GRUB2 bootloader...") + "' \n"; + string chroot = ""; + if (!restore_current_system){ + if (target_distro.dist_id.down().contains("manjaro")){ + chroot += "arch-chroot \"%s\"".printf(target_path); + } + else{ + chroot += "chroot \"%s\"".printf(target_path); + } + } + // bind system directories for chrooted system sh_grub += "for i in /dev /proc /run /sys; do mount --bind \"$i\" \"%s$i\"; done \n".printf(target_path); @@ -2887,14 +2902,11 @@ public class Main : GLib.Object{ // re-install grub --------------- - var target_distro = LinuxDistro.get_dist_info(target_path); - if (target_distro.dist_id == "fedora"){ - // this will run only on clone mode + // this will run only in clone mode - sh_grub += "chroot \"%s\" grub2-install --recheck %s \n".printf( - target_path, grub_device); + sh_grub += "%s grub2-install --recheck %s \n".printf(chroot, grub_device); /* NOTE: * grub2-install should NOT be run on Fedora EFI systems @@ -2907,9 +2919,8 @@ public class Main : GLib.Object{ * kernels and restoring a snapshot with an older kernel. */ } - else{ - sh_grub += "chroot \"%s\" grub-install --recheck %s \n".printf( - target_path, grub_device); + else { + sh_grub += "%s grub-install --recheck %s \n".printf(chroot, grub_device); } // create new grub menu @@ -2918,20 +2929,25 @@ public class Main : GLib.Object{ // update initramfs -------------- if (target_distro.dist_id == "fedora"){ - - sh_grub += "chroot \"%s\" dracut -f -v \n".printf(target_path); + sh_grub += "%s dracut -f -v \n".printf(chroot); + } + else if (target_distro.dist_id.down().contains("manjaro")){ + sh_grub += "%s mkinitcpio -p /etc/mkinitcpio.d/*.preset\n".printf(chroot); } else{ - sh_grub += "chroot \"%s\" update-initramfs -u -k all \n".printf(target_path); + sh_grub += "%s update-initramfs -u -k all \n".printf(chroot); } // update grub menu -------------- if (target_distro.dist_id == "fedora"){ - sh_grub += "chroot \"%s\" grub-mkconfig -o /boot/grub2/grub.cfg \n".printf(target_path); + sh_grub += "%s grub-mkconfig -o /boot/grub2/grub.cfg \n".printf(chroot); + } + else if (target_distro.dist_id.down().contains("manjaro")){ + sh_grub += "%s update-grub \n".printf(chroot); } else{ - sh_grub += "chroot \"%s\" update-grub \n".printf(target_path); + sh_grub += "%s update-grub \n".printf(chroot); } sh_grub += "echo '' \n"; @@ -2951,14 +2967,18 @@ public class Main : GLib.Object{ //sh += sh_grub; } + else{ + log_debug("skipping sh_grub: reinstall_grub2=%s, grub_device=%s".printf( + reinstall_grub2.to_string(), (grub_device == null) ? "null" : grub_device)); + } //reboot if required -------- if (restore_current_system){ sh_reboot += "echo '' \n"; sh_reboot += "echo '" + _("Rebooting system...") + "' \n"; - //sh += "reboot -f \n"; - sh_reboot += "shutdown -r now \n"; + sh += "reboot -f \n"; + //sh_reboot += "shutdown -r now \n"; } //check if current system is being restored and do some housekeeping --------- diff --git a/src/share/pixmaps/timeshift.png b/src/share/pixmaps/timeshift.png index 4c8a0da..01b84d0 100644 Binary files a/src/share/pixmaps/timeshift.png and b/src/share/pixmaps/timeshift.png differ diff --git a/src/share/timeshift/images/edit-delete.png b/src/share/timeshift/images/edit-delete.png new file mode 100644 index 0000000..7f5119b Binary files /dev/null and b/src/share/timeshift/images/edit-delete.png differ diff --git a/timeshift.geany b/timeshift.geany index f76f295..709bef4 100644 --- a/timeshift.geany +++ b/timeshift.geany @@ -41,14 +41,14 @@ FILE_NAME_19=3114;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftime FILE_NAME_20=0;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FDonationWindow.vala;0;4 FILE_NAME_21=892;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FExcludeMessageWindow.vala;0;4 FILE_NAME_22=2846;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FGtkHelper.vala;0;4 -FILE_NAME_23=9515;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FMainWindow.vala;0;4 -FILE_NAME_24=5632;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FRestoreWindow.vala;0;4 +FILE_NAME_23=4121;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FMainWindow.vala;0;4 +FILE_NAME_24=5915;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FRestoreWindow.vala;0;4 FILE_NAME_25=2503;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FSettingsWindow.vala;0;4 FILE_NAME_26=811;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FTerminalWindow.vala;0;4 FILE_NAME_27=7684;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FUtility%2FRsyncTask.vala;0;4 FILE_NAME_28=5593;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FCore%2FAppExcludeEntry.vala;0;4 FILE_NAME_29=46;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FCore%2FFsTabEntry.vala;0;4 -FILE_NAME_30=46;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FCore%2FSnapshot.vala;0;4 +FILE_NAME_30=3579;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FCore%2FSnapshot.vala;0;4 FILE_NAME_31=6132;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FCore%2FSnapshotRepo.vala;0;4 FILE_NAME_32=805;Make;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2Fmakefile;0;4 FILE_NAME_33=10518;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FRsyncLogWindow.vala;0;4 @@ -61,15 +61,15 @@ FILE_NAME_39=888;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimes FILE_NAME_40=888;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FFinishBox.vala;0;4 FILE_NAME_41=883;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FSetupWizardWindow.vala;0;4 FILE_NAME_42=878;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FBackupWindow.vala;0;4 -FILE_NAME_43=893;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FSnapshotListBox.vala;0;4 +FILE_NAME_43=7369;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FSnapshotListBox.vala;0;4 FILE_NAME_44=878;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FDeleteWindow.vala;0;4 FILE_NAME_45=887;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FDeleteBox.vala;0;4 FILE_NAME_46=1909;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FUtility%2FDeleteFileTask.vala;0;4 FILE_NAME_47=888;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FRestoreBox.vala;0;4 FILE_NAME_48=895;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FRestoreSummaryBox.vala;0;4 -FILE_NAME_49=6953;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FRestoreDeviceBox.vala;0;4 +FILE_NAME_49=12047;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FRestoreDeviceBox.vala;0;4 FILE_NAME_50=4830;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FRestoreExcludeBox.vala;0;4 -FILE_NAME_51=74440;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FMain.vala;0;4 +FILE_NAME_51=73666;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FMain.vala;0;4 FILE_NAME_52=46;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FCore%2FCryptTabEntry.vala;0;4 FILE_NAME_53=893;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FGtk%2FRestoreFinishBox.vala;0;4 FILE_NAME_54=492;Vala;0;EUTF-8;1;1;1;%2Fhome%2Fteejee%2Fprojects%2Flinux%2Ftimeshift%2Fsrc%2FCore%2FMountEntry.vala;0;4 diff --git a/timeshift.pot b/timeshift.pot index 88e061f..f6a181b 100644 --- a/timeshift.pot +++ b/timeshift.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: timeshift 1.6\n" "Report-Msgid-Bugs-To: teejee2008@gmail.com\n" -"POT-Creation-Date: 2016-10-05 22:26+0530\n" +"POT-Creation-Date: 2016-10-07 15:14+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -17,28 +17,28 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: Main.vala:2434 +#: Main.vala:2435 #, c-format msgid "'%s' will be on '%s'" msgstr "" -#: Main.vala:2431 +#: Main.vala:2432 #, c-format msgid "'%s' will be on root device" msgstr "" -#: Main.vala:3524 +#: Main.vala:3547 #, c-format msgid "/ is mapped to device: %s, UUID=%s" msgstr "" -#: Main.vala:3531 +#: Main.vala:3554 #, c-format msgid "/home is mapped to device: %s, UUID=%s" msgstr "" -#: Main.vala:1193 Main.vala:1218 Main.vala:1969 Main.vala:2266 Main.vala:2409 -#: Main.vala:2533 Main.vala:2574 Main.vala:2614 +#: Main.vala:1194 Main.vala:1219 Main.vala:1970 Main.vala:2267 Main.vala:2410 +#: Main.vala:2534 Main.vala:2575 Main.vala:2615 msgid "Aborted." msgstr "" @@ -46,55 +46,55 @@ msgstr "" msgid "Admin Access Required" msgstr "" -#: Main.vala:285 +#: Main.vala:286 msgid "Another instance of Timeshift is creating a snapshot." msgstr "" -#: Main.vala:289 +#: Main.vala:290 msgid "Another instance of timeshift is currently running!" msgstr "" -#: Main.vala:805 +#: Main.vala:806 msgid "Answer YES to all confirmation prompts" msgstr "" -#: Main.vala:3430 +#: Main.vala:3453 msgid "App config loaded" msgstr "" -#: Main.vala:3349 +#: Main.vala:3372 msgid "App config saved" msgstr "" -#: Main.vala:3681 +#: Main.vala:3704 msgid "Application will exit" msgstr "" -#: Main.vala:479 +#: Main.vala:480 msgid "Application will exit." msgstr "" -#: Main.vala:787 +#: Main.vala:788 msgid "Backup" msgstr "" -#: Main.vala:2206 +#: Main.vala:2207 msgid "Backup Device" msgstr "" -#: Main.vala:2211 +#: Main.vala:2212 msgid "Backup device not specified!" msgstr "" -#: Main.vala:1534 +#: Main.vala:1535 msgid "Boot snapshot failed!" msgstr "" -#: Main.vala:1515 +#: Main.vala:1516 msgid "Boot snapshots are enabled" msgstr "" -#: Main.vala:3019 +#: Main.vala:3042 msgid "Building file list..." msgstr "" @@ -102,89 +102,89 @@ msgstr "" msgid "Cancel" msgstr "" -#: Main.vala:2942 +#: Main.vala:2961 msgid "Cleaning up..." msgstr "" -#: Main.vala:793 +#: Main.vala:794 msgid "Clone current system" msgstr "" -#: Main.vala:2995 +#: Main.vala:3018 msgid "Cloning system..." msgstr "" -#: Main.vala:459 +#: Main.vala:460 msgid "Commands listed below are not available on this system" msgstr "" -#: Main.vala:2607 +#: Main.vala:2608 #, c-format msgid "Continue with restore? (y/n): " msgstr "" -#: Main.vala:1163 Main.vala:2342 Main.vala:2508 Main.vala:3472 +#: Main.vala:1164 Main.vala:2343 Main.vala:2509 Main.vala:3495 msgid "Could not find device" msgstr "" -#: Main.vala:1938 Main.vala:2236 +#: Main.vala:1939 Main.vala:2237 msgid "Could not find snapshot" msgstr "" -#: Main.vala:3680 +#: Main.vala:3703 msgid "Critical Error" msgstr "" -#: Main.vala:3975 +#: Main.vala:3998 msgid "Cron job added" msgstr "" -#: Main.vala:3988 +#: Main.vala:4011 msgid "Cron job removed" msgstr "" -#: Main.vala:4060 Main.vala:4089 +#: Main.vala:4083 Main.vala:4112 msgid "Crontab is empty" msgstr "" -#: Main.vala:1594 +#: Main.vala:1595 msgid "Daily snapshot failed!" msgstr "" -#: Main.vala:1575 +#: Main.vala:1576 msgid "Daily snapshots are enabled" msgstr "" -#: Main.vala:2659 +#: Main.vala:2660 msgid "Data will be modified on following devices:" msgstr "" -#: Main.vala:799 +#: Main.vala:800 msgid "Delete" msgstr "" -#: Main.vala:801 +#: Main.vala:802 msgid "Delete all snapshots" msgstr "" -#: Main.vala:800 +#: Main.vala:801 msgid "Delete snapshot" msgstr "" -#: Main.vala:973 Main.vala:1088 +#: Main.vala:974 Main.vala:1089 msgid "Description" msgstr "" -#: Main.vala:1000 Main.vala:1039 Main.vala:1087 Main.vala:2662 Main.vala:2696 +#: Main.vala:1001 Main.vala:1040 Main.vala:1088 Main.vala:2663 Main.vala:2697 #, c-format msgid "Device" msgstr "" -#: Main.vala:424 +#: Main.vala:425 msgid "Devices with Linux file systems" msgstr "" -#: Main.vala:2751 +#: Main.vala:2752 msgid "Disclaimer" msgstr "" @@ -192,17 +192,17 @@ msgstr "" msgid "Distribution" msgstr "" -#: Main.vala:2399 +#: Main.vala:2400 #, c-format msgid "Enter device name or number" msgstr "" -#: Main.vala:1183 Main.vala:2553 +#: Main.vala:1184 Main.vala:2554 #, c-format msgid "Enter device name or number (a=Abort)" msgstr "" -#: Main.vala:1961 Main.vala:2258 +#: Main.vala:1962 Main.vala:2259 #, c-format msgid "Enter snapshot number (a=Abort, p=Previous, n=Next)" msgstr "" @@ -211,24 +211,24 @@ msgstr "" msgid "Error" msgstr "" -#: Main.vala:812 +#: Main.vala:813 msgid "Examples" msgstr "" -#: Main.vala:3979 +#: Main.vala:4002 msgid "Failed to add cron job" msgstr "" -#: Main.vala:1841 +#: Main.vala:1842 msgid "Failed to create new snapshot" msgstr "" -#: Main.vala:3831 Main.vala:3837 +#: Main.vala:3854 Main.vala:3860 msgid "Failed to estimate system size" msgstr "" -#: Main.vala:1192 Main.vala:1968 Main.vala:2265 Main.vala:2408 Main.vala:2532 -#: Main.vala:2573 Main.vala:2613 +#: Main.vala:1193 Main.vala:1969 Main.vala:2266 Main.vala:2409 Main.vala:2533 +#: Main.vala:2574 Main.vala:2614 msgid "Failed to get input from user in 3 attempts" msgstr "" @@ -236,19 +236,19 @@ msgstr "" msgid "Failed to get partition list" msgstr "" -#: Main.vala:3509 +#: Main.vala:3532 msgid "Failed to get partition list." msgstr "" -#: Main.vala:3617 Main.vala:3623 +#: Main.vala:3640 Main.vala:3646 msgid "Failed to mount BTRFS subvolume" msgstr "" -#: Main.vala:3992 +#: Main.vala:4015 msgid "Failed to remove cron job" msgstr "" -#: Main.vala:1800 +#: Main.vala:1801 msgid "Failed to save exclude list" msgstr "" @@ -260,135 +260,135 @@ msgstr "" msgid "Failed to unmount" msgstr "" -#: Main.vala:3681 +#: Main.vala:3704 msgid "Failed to unmount device!" msgstr "" -#: Main.vala:2583 +#: Main.vala:2584 msgid "GRUB Device" msgstr "" -#: Main.vala:2588 +#: Main.vala:2589 msgid "GRUB will NOT be reinstalled" msgstr "" -#: Main.vala:803 +#: Main.vala:804 msgid "Global" msgstr "" -#: Main.vala:808 +#: Main.vala:809 msgid "Hide rsync output" msgstr "" -#: Main.vala:1564 +#: Main.vala:1565 msgid "Hourly snapshot failed!" msgstr "" -#: Main.vala:1545 +#: Main.vala:1546 msgid "Hourly snapshots are enabled" msgstr "" -#: Main.vala:2757 +#: Main.vala:2758 msgid "" "If these terms are not acceptable to you, please do not proceed beyond this " "point!" msgstr "" -#: Main.vala:2274 +#: Main.vala:2275 msgid "Invalid Snapshot" msgstr "" -#: Main.vala:935 +#: Main.vala:936 msgid "Invalid command line arguments" msgstr "" -#: Main.vala:1004 Main.vala:1043 +#: Main.vala:1005 Main.vala:1044 msgid "Label" msgstr "" -#: Main.vala:1527 +#: Main.vala:1528 #, c-format msgid "Last boot snapshot is %d hours old" msgstr "" -#: Main.vala:1522 +#: Main.vala:1523 msgid "Last boot snapshot is older than system start time" msgstr "" -#: Main.vala:1518 +#: Main.vala:1519 msgid "Last boot snapshot not found" msgstr "" -#: Main.vala:1587 +#: Main.vala:1588 #, c-format msgid "Last daily snapshot is %d hours old" msgstr "" -#: Main.vala:1582 +#: Main.vala:1583 msgid "Last daily snapshot is more than 1 day old" msgstr "" -#: Main.vala:1578 +#: Main.vala:1579 msgid "Last daily snapshot not found" msgstr "" -#: Main.vala:1557 +#: Main.vala:1558 #, c-format msgid "Last hourly snapshot is %d minutes old" msgstr "" -#: Main.vala:1552 +#: Main.vala:1553 msgid "Last hourly snapshot is more than 1 hour old" msgstr "" -#: Main.vala:1548 +#: Main.vala:1549 msgid "Last hourly snapshot not found" msgstr "" -#: Main.vala:1647 +#: Main.vala:1648 #, c-format msgid "Last monthly snapshot is %d days old" msgstr "" -#: Main.vala:1642 +#: Main.vala:1643 msgid "Last monthly snapshot is more than 1 month old" msgstr "" -#: Main.vala:1638 +#: Main.vala:1639 msgid "Last monthly snapshot not found" msgstr "" -#: Main.vala:1617 +#: Main.vala:1618 #, c-format msgid "Last weekly snapshot is %d days old" msgstr "" -#: Main.vala:1612 +#: Main.vala:1613 msgid "Last weekly snapshot is more than 1 week old" msgstr "" -#: Main.vala:1608 +#: Main.vala:1609 msgid "Last weekly snapshot not found" msgstr "" -#: Main.vala:1789 +#: Main.vala:1790 #, c-format msgid "Linking from snapshot" msgstr "" -#: Main.vala:783 +#: Main.vala:784 msgid "List" msgstr "" -#: Main.vala:785 +#: Main.vala:786 msgid "List devices" msgstr "" -#: Main.vala:784 +#: Main.vala:785 msgid "List snapshots" msgstr "" -#: Main.vala:272 +#: Main.vala:273 msgid "Missing Dependencies" msgstr "" @@ -396,39 +396,39 @@ msgstr "" msgid "Missing Icon" msgstr "" -#: Main.vala:1635 +#: Main.vala:1636 msgid "Monthly snapshot are enabled" msgstr "" -#: Main.vala:1654 +#: Main.vala:1655 msgid "Monthly snapshot failed!" msgstr "" -#: Main.vala:2661 Main.vala:2696 +#: Main.vala:2662 Main.vala:2697 msgid "Mount" msgstr "" -#: Main.vala:971 +#: Main.vala:972 msgid "Name" msgstr "" -#: Main.vala:418 Main.vala:1947 Main.vala:2245 +#: Main.vala:419 Main.vala:1948 Main.vala:2246 msgid "No snapshots found on device" msgstr "" -#: Main.vala:480 +#: Main.vala:481 msgid "Not Supported" msgstr "" -#: Main.vala:823 +#: Main.vala:824 msgid "Notes" msgstr "" -#: Main.vala:1664 +#: Main.vala:1665 msgid "Nothing to do!" msgstr "" -#: Main.vala:969 Main.vala:998 Main.vala:1037 Main.vala:1085 +#: Main.vala:970 Main.vala:999 Main.vala:1038 Main.vala:1086 msgid "Num" msgstr "" @@ -436,32 +436,32 @@ msgstr "" msgid "OK" msgstr "" -#: Main.vala:4154 +#: Main.vala:4177 msgid "Older log files removed" msgstr "" -#: Main.vala:478 Main.vala:3602 +#: Main.vala:479 Main.vala:3625 msgid "" "Only ubuntu-type layouts with @ and @home subvolumes are currently supported." msgstr "" -#: Main.vala:781 +#: Main.vala:782 msgid "Options" msgstr "" -#: Main.vala:1849 +#: Main.vala:1850 msgid "Parsing log file..." msgstr "" -#: Main.vala:290 +#: Main.vala:291 msgid "Please check if you have multiple windows open." msgstr "" -#: Main.vala:2836 +#: Main.vala:2837 msgid "Please do not interrupt the restore process!" msgstr "" -#: Main.vala:460 +#: Main.vala:461 msgid "Please install required packages and try running TimeShift again" msgstr "" @@ -469,54 +469,54 @@ msgstr "" msgid "Please run the application as admin (using 'sudo' or 'su')" msgstr "" -#: Main.vala:2739 +#: Main.vala:2740 msgid "Please save your work and close all applications." msgstr "" -#: Main.vala:286 +#: Main.vala:287 msgid "Please wait a few minutes and try again." msgstr "" -#: Main.vala:2526 +#: Main.vala:2527 #, c-format msgid "Re-install GRUB2 bootloader? (y/n)" msgstr "" -#: Main.vala:2880 +#: Main.vala:2885 msgid "Re-installing GRUB2 bootloader..." msgstr "" -#: Main.vala:2956 +#: Main.vala:2979 msgid "Rebooting system..." msgstr "" -#: Main.vala:2032 +#: Main.vala:2033 #, c-format msgid "Removed" msgstr "" -#: Main.vala:3713 +#: Main.vala:3736 #, c-format msgid "Removed mount directory: '%s'" msgstr "" -#: Main.vala:791 +#: Main.vala:792 msgid "Restore" msgstr "" -#: Main.vala:3146 +#: Main.vala:3169 msgid "Restore completed without errors" msgstr "" -#: Main.vala:3141 +#: Main.vala:3164 msgid "Restore failed with exit code" msgstr "" -#: Main.vala:792 +#: Main.vala:793 msgid "Restore snapshot" msgstr "" -#: Main.vala:2992 +#: Main.vala:3015 msgid "Restoring snapshot..." msgstr "" @@ -524,36 +524,36 @@ msgstr "" msgid "Running" msgstr "" -#: Main.vala:293 +#: Main.vala:294 msgid "Scheduled snapshot in progress..." msgstr "" -#: Main.vala:1664 +#: Main.vala:1665 msgid "Scheduled snapshots are disabled" msgstr "" -#: Main.vala:2385 +#: Main.vala:2386 #, c-format msgid "Select '%s' device (default = %s)" msgstr "" -#: Main.vala:2543 +#: Main.vala:2544 msgid "Select GRUB device" msgstr "" -#: Main.vala:1173 +#: Main.vala:1174 msgid "Select backup device" msgstr "" -#: Main.vala:1953 +#: Main.vala:1954 msgid "Select snapshot to delete" msgstr "" -#: Main.vala:2250 +#: Main.vala:2251 msgid "Select snapshot to restore" msgstr "" -#: Main.vala:2275 +#: Main.vala:2276 msgid "Selected snapshot is marked for deletion" msgstr "" @@ -561,66 +561,66 @@ msgstr "" msgid "Session log file" msgstr "" -#: Main.vala:806 +#: Main.vala:807 msgid "Show additional debug messages" msgstr "" -#: Main.vala:809 +#: Main.vala:810 msgid "Show all options" msgstr "" -#: Main.vala:807 +#: Main.vala:808 msgid "Show rsync output (default)" msgstr "" -#: Main.vala:1002 Main.vala:1041 +#: Main.vala:1003 Main.vala:1042 msgid "Size" msgstr "" -#: Main.vala:797 +#: Main.vala:798 msgid "Skip GRUB2 reinstall" msgstr "" -#: Main.vala:1738 Main.vala:1866 Main.vala:2282 +#: Main.vala:1739 Main.vala:1867 Main.vala:2283 #, c-format msgid "Snapshot" msgstr "" -#: Main.vala:1860 +#: Main.vala:1861 #, c-format msgid "Snapshot saved successfully" msgstr "" -#: Main.vala:1978 +#: Main.vala:1979 msgid "Snapshot to delete not specified!" msgstr "" -#: Main.vala:2288 +#: Main.vala:2289 msgid "Snapshot to restore not specified!" msgstr "" -#: Main.vala:368 +#: Main.vala:369 msgid "Snapshots cannot be created in Live CD mode" msgstr "" -#: Main.vala:411 +#: Main.vala:412 #, c-format msgid "Snapshots on device %s" msgstr "" -#: Main.vala:804 +#: Main.vala:805 msgid "Specify backup device" msgstr "" -#: Main.vala:796 +#: Main.vala:797 msgid "Specify device for installing GRUB2 bootloader" msgstr "" -#: Main.vala:794 +#: Main.vala:795 msgid "Specify snapshot to restore" msgstr "" -#: Main.vala:795 +#: Main.vala:796 msgid "Specify target device" msgstr "" @@ -628,56 +628,56 @@ msgstr "" msgid "Stopped" msgstr "" -#: Main.vala:2663 Main.vala:2698 +#: Main.vala:2664 Main.vala:2699 #, c-format msgid "Subvol" msgstr "" -#: Main.vala:2937 +#: Main.vala:2956 msgid "Synching file systems..." msgstr "" -#: Main.vala:1806 Main.vala:2998 Main.vala:3050 +#: Main.vala:1807 Main.vala:3021 Main.vala:3073 msgid "Synching files with rsync..." msgstr "" -#: Main.vala:2837 +#: Main.vala:2838 msgid "System will reboot after files are restored" msgstr "" -#: Main.vala:2740 +#: Main.vala:2741 msgid "System will reboot after files are restored." msgstr "" -#: Main.vala:972 +#: Main.vala:973 msgid "Tags" msgstr "" -#: Main.vala:789 +#: Main.vala:790 msgid "Take on-demand backup" msgstr "" -#: Main.vala:788 +#: Main.vala:789 msgid "Take scheduled backup" msgstr "" -#: Main.vala:2816 +#: Main.vala:2817 msgid "Target device is not mounted" msgstr "" -#: Main.vala:2465 Main.vala:3583 +#: Main.vala:2466 Main.vala:3606 msgid "Target device not specified!" msgstr "" -#: Main.vala:477 +#: Main.vala:478 msgid "The system partition has an unsupported subvolume layout." msgstr "" -#: Main.vala:3601 +#: Main.vala:3624 msgid "The target partition has an unsupported subvolume layout." msgstr "" -#: Main.vala:2756 +#: Main.vala:2757 msgid "" "This software comes without absolutely NO warranty and the author takes no " "responsibility for any damage arising from the use of this program." @@ -687,11 +687,11 @@ msgstr "" msgid "TimeShift needs admin access to backup and restore system files." msgstr "" -#: Main.vala:1003 Main.vala:1042 +#: Main.vala:1004 Main.vala:1043 msgid "Type" msgstr "" -#: Main.vala:1718 +#: Main.vala:1719 msgid "Unknown snapshot type" msgstr "" @@ -699,39 +699,39 @@ msgstr "" msgid "Unmounting from" msgstr "" -#: Main.vala:3605 +#: Main.vala:3628 msgid "Unsupported Subvolume Layout" msgstr "" -#: Main.vala:3276 +#: Main.vala:3299 msgid "Updated /etc/crypttab on target device" msgstr "" -#: Main.vala:3213 +#: Main.vala:3236 msgid "Updated /etc/fstab on target device" msgstr "" -#: Main.vala:2654 Utility.vala:125 +#: Main.vala:2655 Utility.vala:125 msgid "Warning" msgstr "" -#: Main.vala:1624 +#: Main.vala:1625 msgid "Weekly snapshot failed!" msgstr "" -#: Main.vala:1605 +#: Main.vala:1606 msgid "Weekly snapshots are enabled" msgstr "" -#: Main.vala:2396 +#: Main.vala:2397 #, c-format msgid "[a = Abort, d = Default (%s), r = Root device]" msgstr "" -#: Main.vala:1840 +#: Main.vala:1841 msgid "rsync returned an error" msgstr "" -#: Main.vala:1738 Main.vala:1866 +#: Main.vala:1739 Main.vala:1867 msgid "tagged" msgstr ""