From 6b0ebfa95f1930f03eef602aa7ea001a8f24a77b Mon Sep 17 00:00:00 2001 From: Tony George Date: Sun, 14 Jan 2018 12:33:02 +0530 Subject: [PATCH] v18.1 --- debian/changelog | 2 + timeshift.pot | 186 +++++++++++++++++++++++------------------------ 2 files changed, 95 insertions(+), 93 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3c71605b..f5764f6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ timeshift (18.1) xenial; urgency=medium * Number of snapshots to keep will be enabled, even if snapshot level is not selected. + * Excluded paths/devices will not be mounted during restore + * /var/lib/schroot will be excluded by default to prevent an issue with the snapshot never completing diff --git a/timeshift.pot b/timeshift.pot index 6fcc7f3d..a4eb301d 100644 --- a/timeshift.pot +++ b/timeshift.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: timeshift 1.6\n" "Report-Msgid-Bugs-To: teejeetech@gmail.com\n" -"POT-Creation-Date: 2018-01-14 11:44+0530\n" +"POT-Creation-Date: 2018-01-14 12:28+0530\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -47,19 +47,19 @@ msgstr "" msgid "** Uninstalled Timeshift BTRFS **" msgstr "" -#: Core/Main.vala:3251 +#: Core/Main.vala:3267 msgid "/ is mapped to device" msgstr "" -#: Core/Main.vala:3273 +#: Core/Main.vala:3289 msgid "/boot is mapped to device" msgstr "" -#: Core/Main.vala:3284 +#: Core/Main.vala:3300 msgid "/boot/efi is mapped to device" msgstr "" -#: Core/Main.vala:3262 +#: Core/Main.vala:3278 msgid "/home is mapped to device" msgstr "" @@ -142,7 +142,7 @@ msgstr "" msgid "All other files and folders are excluded." msgstr "" -#: Gtk/RestoreDeviceBox.vala:498 +#: Gtk/RestoreDeviceBox.vala:499 msgid "" "An encrypted device is selected for root file system (/). The boot directory " "(/boot) must be mounted on a non-encrypted device for the system to boot " @@ -168,11 +168,11 @@ msgstr "" msgid "Answer YES to all confirmation prompts" msgstr "" -#: Core/Main.vala:3090 +#: Core/Main.vala:3106 msgid "App config loaded" msgstr "" -#: Core/Main.vala:2996 +#: Core/Main.vala:3012 msgid "App config saved" msgstr "" @@ -180,7 +180,7 @@ msgstr "" msgid "Application needs admin access." msgstr "" -#: Core/Main.vala:3428 +#: Core/Main.vala:3444 msgid "Application will exit" msgstr "" @@ -218,7 +218,7 @@ msgstr "" msgid "BTRFS Tools Not Found" msgstr "" -#: Core/Main.vala:1963 Core/Main.vala:1967 +#: Core/Main.vala:1979 Core/Main.vala:1983 msgid "BTRFS device is not mounted" msgstr "" @@ -242,11 +242,11 @@ msgstr "" msgid "Backup" msgstr "" -#: Core/Main.vala:1939 +#: Core/Main.vala:1955 msgid "Backup Device" msgstr "" -#: Core/Main.vala:1934 +#: Core/Main.vala:1950 msgid "Backup device not specified!" msgstr "" @@ -262,7 +262,7 @@ msgstr "" msgid "Boot" msgstr "" -#: Gtk/RestoreDeviceBox.vala:497 +#: Gtk/RestoreDeviceBox.vala:498 msgid "Boot device not selected" msgstr "" @@ -283,7 +283,7 @@ msgstr "" msgid "Bootloader Options" msgstr "" -#: Gtk/RestoreDeviceBox.vala:410 +#: Gtk/RestoreDeviceBox.vala:411 msgid "Bootloader Options (Advanced)" msgstr "" @@ -299,7 +299,7 @@ msgstr "" msgid "Browse selected snapshot" msgstr "" -#: Core/Main.vala:2401 +#: Core/Main.vala:2417 msgid "Building file list..." msgstr "" @@ -333,7 +333,7 @@ msgstr "" msgid "Changed items:" msgstr "" -#: Core/Main.vala:2622 +#: Core/Main.vala:2638 msgid "Checking file systems for errors..." msgstr "" @@ -341,7 +341,7 @@ msgstr "" msgid "Checksum" msgstr "" -#: Core/Main.vala:2290 +#: Core/Main.vala:2306 msgid "Cleaning up..." msgstr "" @@ -371,7 +371,7 @@ msgstr "" msgid "Cloning System..." msgstr "" -#: Core/Main.vala:2667 +#: Core/Main.vala:2683 msgid "Cloning system..." msgstr "" @@ -426,11 +426,11 @@ msgstr "" msgid "Could not find snapshot" msgstr "" -#: Core/Main.vala:2868 +#: Core/Main.vala:2884 msgid "Could not find system subvolume" msgstr "" -#: Core/Main.vala:2896 +#: Core/Main.vala:2912 msgid "Could not find system subvolumes for creating pre-restore snapshot" msgstr "" @@ -500,7 +500,7 @@ msgstr "" msgid "Created directory" msgstr "" -#: Core/Main.vala:2918 +#: Core/Main.vala:2934 msgid "Created pre-restore snapshot" msgstr "" @@ -520,7 +520,7 @@ msgstr "" msgid "Creating new snapshot..." msgstr "" -#: Core/Main.vala:2846 +#: Core/Main.vala:2862 msgid "Creating pre-restore snapshot from system subvolumes..." msgstr "" @@ -528,7 +528,7 @@ msgstr "" msgid "Credits" msgstr "" -#: Core/Main.vala:3427 +#: Core/Main.vala:3443 msgid "Critical Error" msgstr "" @@ -556,7 +556,7 @@ msgstr "" msgid "Daily snapshots are enabled" msgstr "" -#: Core/Main.vala:2031 +#: Core/Main.vala:2047 msgid "Data will be modified on following devices:" msgstr "" @@ -593,7 +593,7 @@ msgstr "" msgid "Deleted subvolume" msgstr "" -#: Core/Main.vala:2826 Core/Main.vala:2829 +#: Core/Main.vala:2842 Core/Main.vala:2845 msgid "Deleted system subvolumes" msgstr "" @@ -622,7 +622,7 @@ msgid "Destroying qgroup" msgstr "" #: Core/SnapshotRepo.vala:49 Core/SnapshotRepo.vala:639 -#: Core/SnapshotRepo.vala:642 Core/Main.vala:2034 Core/Main.vala:2062 +#: Core/SnapshotRepo.vala:642 Core/Main.vala:2050 Core/Main.vala:2078 #: Console/AppConsole.vala:452 Console/AppConsole.vala:491 #: Console/AppConsole.vala:539 Gtk/RestoreDeviceBox.vala:98 #: Utility/Device.vala:1798 Utility/Device.vala:1808 @@ -638,7 +638,7 @@ msgstr "" msgid "Device name is empty!" msgstr "" -#: Core/SnapshotRepo.vala:516 Core/Main.vala:3143 Console/AppConsole.vala:661 +#: Core/SnapshotRepo.vala:516 Core/Main.vala:3159 Console/AppConsole.vala:661 msgid "Device not found" msgstr "" @@ -689,7 +689,7 @@ msgstr "" msgid "Directory not found" msgstr "" -#: Core/Main.vala:2119 Gtk/RestoreSummaryBox.vala:64 +#: Core/Main.vala:2135 Gtk/RestoreSummaryBox.vala:64 msgid "Disclaimer" msgstr "" @@ -725,7 +725,7 @@ msgstr "" msgid "Enable scheduled snapshots to protect your system" msgstr "" -#: Core/Main.vala:3926 Core/Main.vala:3959 +#: Core/Main.vala:3942 Core/Main.vala:3975 msgid "Enabled subvolume quota support" msgstr "" @@ -765,7 +765,7 @@ msgstr "" msgid "Enter the pattern to exclude (Ex: *.mp3, *.bak)" msgstr "" -#: Gtk/RestoreDeviceBox.vala:534 Utility/GtkHelper.vala:18 +#: Gtk/RestoreDeviceBox.vala:535 Utility/GtkHelper.vala:18 msgid "Error" msgstr "" @@ -865,11 +865,11 @@ msgstr "" msgid "Failed to destroy qgroup" msgstr "" -#: Core/Main.vala:3946 +#: Core/Main.vala:3962 msgid "Failed to enable subvolume quota" msgstr "" -#: Core/Main.vala:3642 Core/Main.vala:3648 +#: Core/Main.vala:3658 Core/Main.vala:3664 msgid "Failed to estimate system size" msgstr "" @@ -887,7 +887,7 @@ msgstr "" msgid "Failed to get partition list" msgstr "" -#: Core/Main.vala:3226 +#: Core/Main.vala:3242 msgid "Failed to get partition list." msgstr "" @@ -895,7 +895,7 @@ msgstr "" msgid "Failed to install crontab file" msgstr "" -#: Gtk/RestoreDeviceBox.vala:535 +#: Gtk/RestoreDeviceBox.vala:536 msgid "Failed to mount devices" msgstr "" @@ -903,15 +903,15 @@ msgstr "" msgid "Failed to move file" msgstr "" -#: Core/Main.vala:2883 +#: Core/Main.vala:2899 msgid "Failed to move system subvolume to snapshot directory" msgstr "" -#: Core/Main.vala:3765 +#: Core/Main.vala:3781 msgid "Failed to query subvolume list" msgstr "" -#: Core/Main.vala:3848 +#: Core/Main.vala:3864 msgid "Failed to query subvolume quota" msgstr "" @@ -935,11 +935,11 @@ msgstr "" msgid "Failed to remove snapshot" msgstr "" -#: Core/Main.vala:3979 +#: Core/Main.vala:3995 msgid "Failed to rescan subvolume quota" msgstr "" -#: Core/Main.vala:2763 +#: Core/Main.vala:2779 msgid "Failed to restore system subvolume" msgstr "" @@ -956,7 +956,7 @@ msgstr "" msgid "Failed to unmount" msgstr "" -#: Core/Main.vala:3428 +#: Core/Main.vala:3444 msgid "Failed to unmount device!" msgstr "" @@ -1025,7 +1025,7 @@ msgstr "" msgid "First snapshot requires:" msgstr "" -#: Core/Main.vala:2816 +#: Core/Main.vala:2832 msgid "Found existing pre-restore snapshot" msgstr "" @@ -1041,7 +1041,7 @@ msgstr "" msgid "GRUB Device" msgstr "" -#: Gtk/RestoreDeviceBox.vala:511 +#: Gtk/RestoreDeviceBox.vala:512 msgid "GRUB device not selected" msgstr "" @@ -1049,7 +1049,7 @@ msgstr "" msgid "GRUB will NOT be reinstalled" msgstr "" -#: Core/Main.vala:2250 +#: Core/Main.vala:2266 msgid "Generating initramfs..." msgstr "" @@ -1109,7 +1109,7 @@ msgid "" "install Timeshift, and try restoring another snapshot." msgstr "" -#: Core/Main.vala:2125 +#: Core/Main.vala:2141 msgid "" "If these terms are not acceptable to you, please do not proceed beyond this " "point!" @@ -1135,7 +1135,7 @@ msgstr "" msgid "Info" msgstr "" -#: Core/Main.vala:1948 +#: Core/Main.vala:1964 msgid "Invalid Snapshot" msgstr "" @@ -1173,11 +1173,11 @@ msgid "" "checked, previous configuration files will be restored from snapshot" msgstr "" -#: Gtk/RestoreDeviceBox.vala:243 +#: Gtk/RestoreDeviceBox.vala:244 msgid "Keep on Root Device" msgstr "" -#: Gtk/RestoreDeviceBox.vala:228 +#: Gtk/RestoreDeviceBox.vala:229 msgid "Keep this mount path on the root filesystem" msgstr "" @@ -1341,11 +1341,11 @@ msgstr "" msgid "Monthly snapshot failed!" msgstr "" -#: Core/Main.vala:2033 Core/Main.vala:2062 +#: Core/Main.vala:2049 Core/Main.vala:2078 msgid "Mount" msgstr "" -#: Core/Main.vala:2890 +#: Core/Main.vala:2906 msgid "Moved system subvolume to snapshot directory" msgstr "" @@ -1447,7 +1447,7 @@ msgid "" "(@ and @home subvolumes). Other layouts are not supported." msgstr "" -#: Core/Main.vala:4082 +#: Core/Main.vala:4098 msgid "Older log files removed" msgstr "" @@ -1459,7 +1459,7 @@ msgstr "" msgid "On demand (manual)" msgstr "" -#: Core/Main.vala:369 Core/Main.vala:3341 Gtk/RestoreDeviceBox.vala:525 +#: Core/Main.vala:369 Core/Main.vala:3357 Gtk/RestoreDeviceBox.vala:526 msgid "" "Only ubuntu-type layouts with @ and @home subvolumes are currently supported." msgstr "" @@ -1468,7 +1468,7 @@ msgstr "" msgid "Open Menu" msgstr "" -#: Core/Main.vala:3125 +#: Core/Main.vala:3141 msgid "" "Option --snapshot-device should not be specified for creating snapshots in " "BTRFS mode" @@ -1491,12 +1491,12 @@ msgstr "" msgid "Parent Device" msgstr "" -#: Core/Main.vala:1374 Core/Main.vala:2371 Core/Main.vala:2450 +#: Core/Main.vala:1374 Core/Main.vala:2387 Core/Main.vala:2466 #: Gtk/RsyncLogWindow.vala:118 msgid "Parsing log file..." msgstr "" -#: Gtk/RestoreDeviceBox.vala:524 +#: Gtk/RestoreDeviceBox.vala:525 msgid "Partition has an unsupported subvolume layout." msgstr "" @@ -1517,7 +1517,7 @@ msgstr "" msgid "Please check if you have multiple windows open." msgstr "" -#: Core/Main.vala:2157 +#: Core/Main.vala:2173 msgid "Please do not interrupt the restore process!" msgstr "" @@ -1533,7 +1533,7 @@ msgstr "" msgid "Please run the application as admin (using 'sudo' or 'su')" msgstr "" -#: Core/Main.vala:2107 +#: Core/Main.vala:2123 msgid "Please save your work and close all applications." msgstr "" @@ -1541,7 +1541,7 @@ msgstr "" msgid "Please select a snapshot to view the log!" msgstr "" -#: Gtk/RestoreDeviceBox.vala:512 +#: Gtk/RestoreDeviceBox.vala:513 msgid "Please select the GRUB device" msgstr "" @@ -1575,11 +1575,11 @@ msgstr "" msgid "Print debug information" msgstr "" -#: Core/Main.vala:3703 +#: Core/Main.vala:3719 msgid "Query completed" msgstr "" -#: Core/Main.vala:3686 +#: Core/Main.vala:3702 msgid "Querying subvolume info..." msgstr "" @@ -1602,7 +1602,7 @@ msgstr "" msgid "Re-install GRUB2 bootloader?" msgstr "" -#: Core/Main.vala:2209 +#: Core/Main.vala:2225 msgid "Re-installing GRUB2 bootloader..." msgstr "" @@ -1615,7 +1615,7 @@ msgstr "" msgid "Read %'d of %'d lines..." msgstr "" -#: Core/Main.vala:2302 +#: Core/Main.vala:2318 msgid "Rebooting system..." msgstr "" @@ -1641,7 +1641,7 @@ msgid "Remove" msgstr "" #: Core/Snapshot.vala:426 Core/SnapshotRepo.vala:931 Core/Main.vala:1555 -#: Core/Main.vala:1566 Core/Main.vala:4078 +#: Core/Main.vala:1566 Core/Main.vala:4094 #, c-format msgid "Removed" msgstr "" @@ -1650,7 +1650,7 @@ msgstr "" msgid "Removed cron task" msgstr "" -#: Core/Main.vala:3491 +#: Core/Main.vala:3507 #, c-format msgid "Removed mount directory: '%s'" msgstr "" @@ -1690,7 +1690,7 @@ msgstr "" msgid "Restore Snapshot" msgstr "" -#: Core/Main.vala:2692 Core/Main.vala:2775 +#: Core/Main.vala:2708 Core/Main.vala:2791 msgid "Restore completed" msgstr "" @@ -1706,7 +1706,7 @@ msgstr "" msgid "Restored subvolumes will become active after system is restarted." msgstr "" -#: Core/Main.vala:2770 +#: Core/Main.vala:2786 msgid "Restored system subvolume" msgstr "" @@ -1721,7 +1721,7 @@ msgid "" "snapshot can be restored later to 'undo' the restore." msgstr "" -#: Core/Main.vala:2664 +#: Core/Main.vala:2680 msgid "Restoring snapshot..." msgstr "" @@ -1739,7 +1739,7 @@ msgstr "" msgid "Revision" msgstr "" -#: Gtk/RestoreDeviceBox.vala:450 +#: Gtk/RestoreDeviceBox.vala:451 msgid "Root device not selected" msgstr "" @@ -1850,7 +1850,7 @@ msgstr "" msgid "Select a single snapshot to restore" msgstr "" -#: Gtk/RestoreDeviceBox.vala:479 +#: Gtk/RestoreDeviceBox.vala:480 msgid "Select another device for root file system (/)" msgstr "" @@ -1890,7 +1890,7 @@ msgstr "" msgid "Select snapshots to delete" msgstr "" -#: Gtk/RestoreDeviceBox.vala:451 +#: Gtk/RestoreDeviceBox.vala:452 msgid "Select the device for root file system (/)" msgstr "" @@ -1926,11 +1926,11 @@ msgstr "" msgid "Select the target devices where system will be cloned." msgstr "" -#: Core/Main.vala:3153 +#: Core/Main.vala:3169 msgid "Selected default snapshot device" msgstr "" -#: Core/Main.vala:3104 Core/Main.vala:3108 +#: Core/Main.vala:3120 Core/Main.vala:3124 msgid "Selected default snapshot type" msgstr "" @@ -1950,7 +1950,7 @@ msgstr "" msgid "Selected snapshot device is not a system disk" msgstr "" -#: Core/Main.vala:1949 +#: Core/Main.vala:1965 msgid "Selected snapshot is marked for deletion" msgstr "" @@ -2033,7 +2033,7 @@ msgstr "" msgid "Skip GRUB2 reinstall" msgstr "" -#: Core/SnapshotRepo.vala:670 Core/SnapshotRepo.vala:708 Core/Main.vala:1954 +#: Core/SnapshotRepo.vala:670 Core/SnapshotRepo.vala:708 Core/Main.vala:1970 #: Gtk/SnapshotListBox.vala:95 #, c-format msgid "Snapshot" @@ -2081,11 +2081,11 @@ msgstr "" msgid "Snapshot saved successfully" msgstr "" -#: Core/Main.vala:1944 +#: Core/Main.vala:1960 msgid "Snapshot to restore not specified!" msgstr "" -#: Core/Main.vala:2779 +#: Core/Main.vala:2795 msgid "Snapshot will become active after system is rebooted." msgstr "" @@ -2220,11 +2220,11 @@ msgstr "" msgid "Symlinks updated" msgstr "" -#: Core/Main.vala:2284 +#: Core/Main.vala:2300 msgid "Synching file systems..." msgstr "" -#: Core/Main.vala:1317 Core/Main.vala:2439 Core/Main.vala:2670 +#: Core/Main.vala:1317 Core/Main.vala:2455 Core/Main.vala:2686 msgid "Synching files with rsync..." msgstr "" @@ -2245,11 +2245,11 @@ msgstr "" msgid "System can be rolled-back to a previous date by restoring a snapshot." msgstr "" -#: Core/Main.vala:2158 +#: Core/Main.vala:2174 msgid "System will reboot after files are restored" msgstr "" -#: Core/Main.vala:2108 +#: Core/Main.vala:2124 msgid "System will reboot after files are restored." msgstr "" @@ -2261,15 +2261,15 @@ msgstr "" msgid "Tags" msgstr "" -#: Core/Main.vala:1979 +#: Core/Main.vala:1995 msgid "Target device is not mounted" msgstr "" -#: Gtk/RestoreDeviceBox.vala:478 +#: Gtk/RestoreDeviceBox.vala:479 msgid "Target device is same as system device" msgstr "" -#: Core/Main.vala:1973 +#: Core/Main.vala:1989 msgid "Target device not specified!" msgstr "" @@ -2290,7 +2290,7 @@ msgstr "" msgid "The system partition has an unsupported subvolume layout." msgstr "" -#: Core/Main.vala:3340 +#: Core/Main.vala:3356 msgid "The target partition has an unsupported subvolume layout." msgstr "" @@ -2303,7 +2303,7 @@ msgstr "" msgid "This device is not encrypted" msgstr "" -#: Core/Main.vala:2124 +#: Core/Main.vala:2140 msgid "" "This software comes without absolutely NO warranty and the author takes no " "responsibility for any damage arising from the use of this program." @@ -2373,7 +2373,7 @@ msgstr "" msgid "Unshared" msgstr "" -#: Core/Main.vala:3344 Gtk/RestoreDeviceBox.vala:522 +#: Core/Main.vala:3360 Gtk/RestoreDeviceBox.vala:523 msgid "Unsupported Subvolume Layout" msgstr "" @@ -2385,11 +2385,11 @@ msgstr "" msgid "Update initramfs" msgstr "" -#: Core/Main.vala:2614 +#: Core/Main.vala:2630 msgid "Updated /etc/crypttab on target device" msgstr "" -#: Core/Main.vala:2534 +#: Core/Main.vala:2550 msgid "Updated /etc/fstab on target device" msgstr "" @@ -2399,11 +2399,11 @@ msgid "" "be left selected." msgstr "" -#: Core/Main.vala:2267 +#: Core/Main.vala:2283 msgid "Updating GRUB menu..." msgstr "" -#: Core/Main.vala:2458 +#: Core/Main.vala:2474 msgid "Updating bootloader configuration..." msgstr "" @@ -2458,7 +2458,7 @@ msgstr "" msgid "Volume" msgstr "" -#: Core/Main.vala:2026 Gtk/RestoreSummaryBox.vala:53 +#: Core/Main.vala:2042 Gtk/RestoreSummaryBox.vala:53 msgid "Warning" msgstr "" @@ -2510,7 +2510,7 @@ msgid "" "later if required, to 'undo' the restore." msgstr "" -#: Gtk/RestoreDeviceBox.vala:412 +#: Gtk/RestoreDeviceBox.vala:413 msgid "" "[Advanced Users Only] Change these settings only if the restored system " "fails to boot." @@ -2534,8 +2534,8 @@ msgstr "" msgid "all" msgstr "" -#: Core/Main.vala:1432 Core/Main.vala:2762 Core/Main.vala:3764 -#: Core/Main.vala:3847 Core/Main.vala:3945 Core/Main.vala:3978 +#: Core/Main.vala:1432 Core/Main.vala:2778 Core/Main.vala:3780 +#: Core/Main.vala:3863 Core/Main.vala:3961 Core/Main.vala:3994 msgid "btrfs returned an error" msgstr ""