Merge remote-tracking branch 'origin/master'

README.md

@@ -55,7 +55,6 @@ You can selectively include items for backup from the ***Settings*** window. Sel
 ![](images/settings_users_rsync.png)
 
 ![](images/settings_filters.png)
-### Better Snapshots & Rotation
 
 *   Unlike similar tools that are scheduled to take backups at a fixed time of the day, Timeshift is designed to run once every hour and take snapshots only when a snapshot is due. This is more suitable for desktop users who keep their laptops and desktops switched on for few hours daily. Scheduling snapshots at a fixed time on such users will result in missed backups since the system may not be running when the snapshot is scheduled to run. By running once every hour and creating snapshots when due, Timeshift ensures that backups are not missed.
 *   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.
@@ -90,6 +89,7 @@ You can selectively include items for backup from the ***Settings*** window. Sel
   - Only Ubuntu-type layouts with **@** and **@home** subvolumes are supported
   - **@** and **@home** subvolumes may be on same or different BTRFS volumes
   - **@** may be on BTRFS volume and **/home** may be mounted on non-BTRFS partition
+  - If swap files are used they should not be located in **@** or **@home** and could instead be stored in their own subvolume, eg **@swap**
   - Other layouts are not supported
 
 - **GRUB2** - Bootloader must be GRUB2. GRUB legacy and other bootloaders are not supported.
@@ -150,6 +150,8 @@ If you used the installer to install Timeshift, you can remove the installed fil
 
 #### BTRFS volumes
 BTRFS volumes must have an Ubuntu-type layout with **@** and **@home** subvolumes. Other layouts are not supported. Systems having the **@** subvolume and having **/home** on a non-BTRFS partition are also supported.
+
+`Text file busy / btrfs returned an error: 256 / Failed to create snapshot` can occur if you have a Linux swapfile mounted within the **@** or **@home** subvolumes which prevents snapshot from succeeding. Relocate the swapfile out of **@** or **@home*, for example into it's own subvolume like **@swap**.
 #### Disk Space
 Timeshift requires a lot of disk space to keep snapshot data. The device selected as snapshot device must have sufficient free space to store the snapshots that will be created. 
 

po/timeshift-da.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: timeshift\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2020-11-16 17:44+0530\n"
-"PO-Revision-Date: 2020-02-07 15:59+0100\n"
+"PO-Revision-Date: 2021-06-04 21:52+0200\n"
 "Last-Translator: Alan Mortensen <[email protected]>\n"
 "Language-Team: Danish\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.6\n"
+"X-Generator: Poedit 2.3\n"
 
 #: Console/AppConsole.vala:615
 #, c-format
@@ -415,9 +415,8 @@ msgid "Commands listed below are not available on this system"
 msgstr "Kommandoerne oplistet nedenfor er ikke tilgængelige på dette system"
 
 #: Gtk/SnapshotListBox.vala:224
-#, fuzzy
 msgid "Comments (click to edit)"
-msgstr "<b>Kommentarer</b> (dobbeltklik for at redigere)"
+msgstr "Kommentarer (klik for at redigere)"
 
 #: Gtk/RestoreBox.vala:74 Gtk/RestoreBox.vala:187 Core/Main.vala:2795
 msgid "Comparing Files (Dry Run)..."
@@ -822,9 +821,8 @@ msgid "Examples"
 msgstr "Eksempler"
 
 #: Gtk/UsersBox.vala:136
-#, fuzzy
 msgid "Exclude All Files"
-msgstr "Udeladte programmer"
+msgstr "Udelad alle filer"
 
 #: Gtk/RestoreExcludeBox.vala:55 Gtk/ExcludeAppsBox.vala:51
 msgid "Exclude Application Settings"
@@ -1107,7 +1105,7 @@ msgstr "Danner initramfs …"
 
 #: Utility/Gtk/DonationWindow.vala:91
 msgid "GitHub"
-msgstr ""
+msgstr "GitHub"
 
 #: Console/AppConsole.vala:375
 msgid "Global"
@@ -1193,14 +1191,12 @@ msgid "Include @home subvolume in backups"
 msgstr "Medtag @home-underdiskenhed i sikkerhedskopier"
 
 #: Gtk/UsersBox.vala:266
-#, fuzzy
 msgid "Include All Files"
-msgstr "Udeladte programmer"
+msgstr "Medtag alle filer"
 
 #: Gtk/UsersBox.vala:194
-#, fuzzy
 msgid "Include Only Hidden Files"
-msgstr "Medtag skjulte elementer"
+msgstr "Medtag kun skjulte filer"
 
 #: Core/Main.vala:2046
 msgid "Invalid Snapshot"
@@ -2715,13 +2711,12 @@ msgstr ""
 "gendannelsen."
 
 #: Utility/Gtk/DonationWindow.vala:85
-#, fuzzy
 msgid ""
 "You can use the GitHub issue tracker for reporting issues, or post your "
 "questions on the Linux Mint forums. Please avoid reporting issues by email."
 msgstr ""
-"Brug problemsporingen til at rapportere problemer, stille spørgsmål og "
-"anmode om nye funktioner. Undgå at rapportere problemer via e-mail."
+"Brug GitHub-problemsporingen til at rapportere problemer, eller stil dine "
+"spørgsmål i Linux Mints fora. Undlad at rapportere problemer via e-mail."
 
 #: Gtk/RestoreDeviceBox.vala:413
 msgid ""
@@ -2792,15 +2787,3 @@ msgstr "rsync returnerede en fejl"
 #: Core/SnapshotRepo.vala:823
 msgid "un-tagged"
 msgstr "umærket"
-
-#~ msgid "Comments"
-#~ msgstr "Kommentarer"
-
-#~ msgid "Dir not found"
-#~ msgstr "Mappen blev ikke fundet"
-
-#~ msgid "File is missing"
-#~ msgstr "Filen mangler"
-
-#~ msgid "Issue Tracker"
-#~ msgstr "Problemsporing"

po/timeshift-ja.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: linuxmint\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
 "POT-Creation-Date: 2020-11-16 17:44+0530\n"
-"PO-Revision-Date: 2019-10-13 04:55+0900\n"
-"Last-Translator: @ kazuo210 <kazu.nito@gmail.com>\n"
+"PO-Revision-Date: 2021-02-11 23:23+0900\n"
+"Last-Translator: KotaKato(@kato-k) <peony.btn@gmail.com>\n"
 "Language-Team: \n"
 "Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Launchpad-Export-Date: 2018-02-03 14:28+0000\n"
-"X-Generator: Poedit 2.2.4\n"
+"X-Generator: Poedit 2.3\n"
 "X-Launchpad-Export-Date: 2017-11-23 10:47+0000\n"
 "X-Generator: Launchpad (build 18509)\n"
 "X-Poedit-Basepath: ../src\n"
@@ -383,7 +383,7 @@ msgstr "クリックして編集します。 ドラッグアンドドロップ
 
 #: Gtk/ExcludeBox.vala:59
 msgid "Click to edit. Drag-drop to re-order."
-msgstr "編集する時にクリックします。 ドラッグアンドドロップして並べ替えます。"
+msgstr "クリックして編集します。 ドラッグアンドドロップして並べ替えます。"
 
 #: Gtk/RestoreWindow.vala:69
 msgid "Clone System"
@@ -418,9 +418,8 @@ msgid "Commands listed below are not available on this system"
 msgstr "以下にリストされているコマンドは、このシステムでは使用できません"
 
 #: Gtk/SnapshotListBox.vala:224
-#, fuzzy
 msgid "Comments (click to edit)"
-msgstr "<b>コメント</b> (ダブルクリックして編集)"
+msgstr "コメント (クリックして編集)"
 
 #: Gtk/RestoreBox.vala:74 Gtk/RestoreBox.vala:187 Core/Main.vala:2795
 msgid "Comparing Files (Dry Run)..."
@@ -446,7 +445,7 @@ msgstr "アクションを確認する"
 #: Console/AppConsole.vala:1070
 #, c-format
 msgid "Continue with restore? (y/n): "
-msgstr "復元を続行しますか？ (y /n): "
+msgstr "復元を続行しますか？ (y/n): "
 
 #: Utility/Gtk/AboutWindow.vala:425
 msgid "Contributors"
@@ -581,15 +580,15 @@ msgstr "重大なエラー"
 
 #: Utility/CronTab.vala:136
 msgid "Cron job added"
-msgstr "Cron ジョブが追加されました"
+msgstr "cron ジョブが追加されました"
 
 #: Utility/CronTab.vala:217
 msgid "Cron job removed"
-msgstr "Cron ジョブが削除されました"
+msgstr "cron ジョブが削除されました"
 
 #: Utility/CronTab.vala:304
 msgid "Cron task exists"
-msgstr "Cron タスクが存在します"
+msgstr "cron タスクが存在します"
 
 #: Gtk/MiscBox.vala:98
 msgid "Custom"
@@ -613,7 +612,7 @@ msgstr "データは次のデバイスで変更されます:"
 
 #: Gtk/MiscBox.vala:71
 msgid "Date Format"
-msgstr "日付形式"
+msgstr "日付の形式"
 
 #: Console/AppConsole.vala:371 Gtk/MainWindow.vala:161
 #: Gtk/SnapshotListBox.vala:322 Gtk/DeleteWindow.vala:98
@@ -673,7 +672,7 @@ msgstr "説明"
 #: Core/Subvolume.vala:181
 #, c-format
 msgid "Destroyed qgroup"
-msgstr "qgroup 破棄されました"
+msgstr "qgroup を破棄しました"
 
 #: Core/Subvolume.vala:171
 #, c-format
@@ -827,9 +826,8 @@ msgid "Examples"
 msgstr "例"
 
 #: Gtk/UsersBox.vala:136
-#, fuzzy
 msgid "Exclude All Files"
-msgstr "すべて除外"
+msgstr "すべてを除外"
 
 #: Gtk/RestoreExcludeBox.vala:55 Gtk/ExcludeAppsBox.vala:51
 msgid "Exclude Application Settings"
@@ -1088,7 +1086,7 @@ msgstr "既存の復元前のスナップショットが見つかりました"
 
 #: Gtk/BackupDeviceBox.vala:215
 msgid "Free"
-msgstr "未使用"
+msgstr "空き容量"
 
 #: Core/SnapshotRepo.vala:77 Core/SnapshotRepo.vala:147
 msgid "Free space"
@@ -1201,14 +1199,12 @@ msgid "Include @home subvolume in backups"
 msgstr "バックアップに @home サブボリュームを含めます"
 
 #: Gtk/UsersBox.vala:266
-#, fuzzy
 msgid "Include All Files"
-msgstr "すべて含める"
+msgstr "すべてを含める"
 
 #: Gtk/UsersBox.vala:194
-#, fuzzy
 msgid "Include Only Hidden Files"
-msgstr "Include hidden items"
+msgstr "非表示にされたファイルのみを含める"
 
 #: Core/Main.vala:2046
 msgid "Invalid Snapshot"
@@ -1229,7 +1225,7 @@ msgstr "選択されていないアイテム"
 
 #: Gtk/ScheduleBox.vala:283
 msgid "Keep"
-msgstr "保持"
+msgstr "保持上限"
 
 #: Gtk/RestoreExcludeBox.vala:112
 msgid ""
@@ -1526,7 +1522,7 @@ msgstr ""
 #: Utility/Gtk/CustomMessageDialog.vala:171 Gtk/SettingsWindow.vala:123
 #: Gtk/ExcludeListSummaryWindow.vala:84 Core/SnapshotRepo.vala:615
 msgid "OK"
-msgstr "はい"
+msgstr "OK"
 
 #: Gtk/SnapshotBackendBox.vala:180
 msgid ""
@@ -1981,7 +1977,7 @@ msgstr "このディスク上のパーティションを選択します"
 
 #: Gtk/MainWindow.vala:794
 msgid "Select a single snapshot to restore"
-msgstr "復元するスナップショットを 1 つ選択する"
+msgstr "復元するスナップショットを1つ選択してください"
 
 #: Gtk/RestoreDeviceBox.vala:481
 msgid "Select another device for root file system (/)"
@@ -2662,11 +2658,11 @@ msgstr "作成時のRsyncログを表示"
 
 #: Gtk/SnapshotListBox.vala:350
 msgid "View Rsync Log for Restore"
-msgstr "復元時のRsync ログを表示"
+msgstr "復元時のRsyncログを表示"
 
 #: Gtk/MainWindow.vala:380
 msgid "View TimeShift Logs"
-msgstr "タイムシフトログを表示"
+msgstr "タイムシフトのログを表示"
 
 #: Gtk/RestoreDeviceBox.vala:101
 msgid "Volume"
@@ -2727,13 +2723,12 @@ msgstr ""
 "復元し、復元を '元に戻す' ことができます。"
 
 #: Utility/Gtk/DonationWindow.vala:85
-#, fuzzy
 msgid ""
 "You can use the GitHub issue tracker for reporting issues, or post your "
 "questions on the Linux Mint forums. Please avoid reporting issues by email."
 msgstr ""
-"問題の報告、質問、機能のリクエストには、問題追跡ツールを使用します。 電子メー"
-"ルによる問題の報告は避けてください。"
+"問題はGitHub issue trackerで報告できます。また、Linux Mint forumsで質問をする"
+"こともできます。emailで報告することは避けてください。"
 
 #: Gtk/RestoreDeviceBox.vala:413
 msgid ""