From d631fd9abcc58a6f522085ee70c3a2fd2994ca8b Mon Sep 17 00:00:00 2001
From: James Valleroy <jvalleroy@mailbox.org>
Date: Mon, 12 Feb 2018 18:01:44 -0500
Subject: [PATCH] Update translation strings

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
---
 plinth/locale/bn/LC_MESSAGES/django.po      | 115 ++++--
 plinth/locale/cs/LC_MESSAGES/django.po      | 145 ++++---
 plinth/locale/da/LC_MESSAGES/django.po      | 123 ++++--
 plinth/locale/de/LC_MESSAGES/django.po      | 163 +++++---
 plinth/locale/django.pot                    | 115 ++++--
 plinth/locale/es/LC_MESSAGES/django.po      | 131 ++++--
 plinth/locale/fa/LC_MESSAGES/django.po      | 123 ++++--
 plinth/locale/fake/LC_MESSAGES/django.po    | 123 ++++--
 plinth/locale/fr/LC_MESSAGES/django.po      | 131 ++++--
 plinth/locale/gu/LC_MESSAGES/django.po      | 146 ++++---
 plinth/locale/hi/LC_MESSAGES/django.po      | 115 ++++--
 plinth/locale/id/LC_MESSAGES/django.po      | 121 ++++--
 plinth/locale/it/LC_MESSAGES/django.po      | 115 ++++--
 plinth/locale/ja/LC_MESSAGES/django.po      | 115 ++++--
 plinth/locale/kn/LC_MESSAGES/django.po      | 115 ++++--
 plinth/locale/nb/LC_MESSAGES/django.po      | 131 ++++--
 plinth/locale/nl/LC_MESSAGES/django.po      | 133 ++++--
 plinth/locale/pl/LC_MESSAGES/django.po      | 121 ++++--
 plinth/locale/pt/LC_MESSAGES/django.po      | 115 ++++--
 plinth/locale/ru/LC_MESSAGES/django.po      | 131 ++++--
 plinth/locale/sv/LC_MESSAGES/django.po      | 123 ++++--
 plinth/locale/ta/LC_MESSAGES/django.po      | 115 ++++--
 plinth/locale/te/LC_MESSAGES/django.po      | 430 ++++++++++----------
 plinth/locale/tr/LC_MESSAGES/django.po      | 133 ++++--
 plinth/locale/uk/LC_MESSAGES/django.po      | 115 ++++--
 plinth/locale/zh_Hans/LC_MESSAGES/django.po | 131 ++++--
 26 files changed, 2249 insertions(+), 1325 deletions(-)

diff --git a/plinth/locale/bn/LC_MESSAGES/django.po b/plinth/locale/bn/LC_MESSAGES/django.po
index 0873d9440..8dfe8ef02 100644
--- a/plinth/locale/bn/LC_MESSAGES/django.po
+++ b/plinth/locale/bn/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,32 +18,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr ""
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr ""
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr ""
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr ""
@@ -171,15 +171,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr ""
@@ -230,34 +230,34 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr ""
 
@@ -1313,7 +1313,7 @@ msgstr ""
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr ""
 
@@ -2263,7 +2263,7 @@ msgid "Interface"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3261,11 +3261,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3279,46 +3278,76 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+msgid "Hourly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:36
+msgid "Daily Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:40
+msgid "Weekly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+msgid "Yearly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr ""
@@ -3336,8 +3365,8 @@ msgstr ""
 msgid "Delete the following snapshots permanently?"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr ""
 
@@ -3361,38 +3390,38 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
-msgid "Timeline Snapshots configuration updated"
+#: plinth/modules/snapshot/views.py:96
+msgid "Storage snapshots configuration updated"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/cs/LC_MESSAGES/django.po b/plinth/locale/cs/LC_MESSAGES/django.po
index 7eb9ada73..dbd7810a7 100644
--- a/plinth/locale/cs/LC_MESSAGES/django.po
+++ b/plinth/locale/cs/LC_MESSAGES/django.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2018-02-05 06:47+0000\n"
 "Last-Translator: Pavel Borecki <pavel.borecki@gmail.com>\n"
-"Language-Team: Czech "
-"<https://hosted.weblate.org/projects/freedombox/plinth/cs/>\n"
+"Language-Team: Czech <https://hosted.weblate.org/projects/freedombox/plinth/"
+"cs/>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,32 +19,32 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 "X-Generator: Weblate 2.19-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "Spojení očekáváno na {kind} portu {listen_address}:{port}"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "Spojení očekáváno na {kind} portu {port}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "Přístup na URL adrese {url} na tcp{kind}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "Přístup na URL adrese {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "Připojit k {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "Nedaří se připojit k {host}:{port}"
@@ -195,15 +195,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr "Zatím je k dispozici pouze omezená funkčnost."
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Nastavit"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "Název domény"
@@ -261,34 +261,34 @@ msgstr "Jazyk pro toto webové správní rozhraní"
 msgid "Submit"
 msgstr "Potvrdit"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "Obecná nastavení"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Chyba při nastavování názvu stroje: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "Nastavení názvu stroje"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Chyba při nastavování názvu domény: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "Nastavení doménového názvu"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "Chyba při nastavování jazyka: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "Jazyk změněn"
 
@@ -1184,8 +1184,8 @@ msgid ""
 "this status log to the bug report."
 msgstr ""
 "Toto je nejnovějších %(num_lines)s řádek ze záznamu (log) stavů tohoto "
-"webového rozhraní. Pokud chcete nahlásit chybu, použijte k tomu <a href=\""
-"https://salsa.debian.org/freedombox-team/plinth/issues\">systém správy "
+"webového rozhraní. Pokud chcete nahlásit chybu, použijte k tomu <a href="
+"\"https://salsa.debian.org/freedombox-team/plinth/issues\">systém správy "
 "hlášení chyb</a> a tyto řádky připojte k hlášení."
 
 #: plinth/modules/help/templates/statuslog.html:38
@@ -1509,7 +1509,7 @@ msgstr "Získat znovu"
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "Smazat"
 
@@ -2597,7 +2597,7 @@ msgid "Interface"
 msgstr "Rozhraní"
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3768,12 +3768,19 @@ msgstr ""
 "funkčního stavu v případě nechtěných změn v systému."
 
 #: plinth/modules/snapshot/__init__.py:38
+#, fuzzy
+#| msgid ""
+#| "Automatic snapshots are taken every hour, day, month and year. Older "
+#| "snapshots are automatically deleted keeping 10 of each kind and 50 in "
+#| "total. Although snapshots are efficient and only store the differences, "
+#| "they may be deleted to reclaim free space.  Individual files from older "
+#| "snapshots can be accessed by visiting \".snapshots\" directory in the "
+#| "filesystem. Snapshots are not a replacement for backups."
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 "Zachycené stavy jsou pořizovány každou hodinu, den, měsíc a rok. Starší "
@@ -3795,46 +3802,84 @@ msgstr ""
 "Zrušte zaškrtnutí tohoto pro vypnutí zachycených stavů časové osy (denně, "
 "týdně, měsíčně a ročně)."
 
+#: plinth/modules/snapshot/forms.py:32
+#, fuzzy
+#| msgid "Storage Snapshots"
+msgid "Hourly Snapshots Limit"
+msgstr "Zachycené stavy datového úložiště"
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Daily Snapshots Limit"
+msgstr "Smazat zachycené stavy"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Weekly Snapshots Limit"
+msgstr "Smazat zachycené stavy"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Yearly Snapshots Limit"
+msgstr "Smazat zachycené stavy"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr "Pořídit zachycený stav"
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr "Smazat všechny zachycené stavy"
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr "Smazat vše"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr "Počet"
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr "Datum"
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr "Obnovit ze zálohy"
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr "aktivní"
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr "Vrátit k zachycenému stavu č. %(number)s"
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr "Smazat zachycený stav č. %(number)s"
@@ -3852,8 +3897,8 @@ msgstr "Smazat zachycený stav č. %(number)s"
 msgid "Delete the following snapshots permanently?"
 msgstr "Smazat tyto zachycené stavy natrvalo?"
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr "Smazat zachycené stavy"
 
@@ -3879,38 +3924,40 @@ msgstr "Vrátit k zachycenému stavu č. %(number)s"
 msgid "Created snapshot."
 msgstr "Zachycený stav vytvořen."
 
-#: plinth/modules/snapshot/views.py:75
-msgid "Timeline Snapshots configuration updated"
+#: plinth/modules/snapshot/views.py:96
+#, fuzzy
+#| msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "Nastavení zachycování stavů časové osy aktualizováno"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr "Chyba akce: {0} [{1}] [{2}]"
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr "Zachycený stav #{number} smazán."
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr "Smazat zachycený stav"
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr "Všechny zachycené stavy smazány."
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr "Vráceno zpět do podoby zachyceného stavu #{number}."
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr "Pro dokončení obnovy ze zálohy je třeba systém restartovat."
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr "Vrátit do podoby zachyceného stavu"
 
@@ -4789,8 +4836,8 @@ msgid ""
 "Plinth project <a href=\"https://salsa.debian.org/freedombox-team/plinth/"
 "issues\">issue tracker</a>."
 msgstr ""
-"Pokud se domníváte, že by chybějící stránka měla existovat, nahlaste to do <"
-"a href=\"https://salsa.debian.org/freedombox-team/plinth/issues\">systému "
+"Pokud se domníváte, že by chybějící stránka měla existovat, nahlaste to do "
+"<a href=\"https://salsa.debian.org/freedombox-team/plinth/issues\">systému "
 "hlášení chyb</a> projektu Plinth."
 
 #: plinth/templates/500.html:25
diff --git a/plinth/locale/da/LC_MESSAGES/django.po b/plinth/locale/da/LC_MESSAGES/django.po
index df099be9c..237ad0ea4 100644
--- a/plinth/locale/da/LC_MESSAGES/django.po
+++ b/plinth/locale/da/LC_MESSAGES/django.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2016-07-03 21:44+0000\n"
 "Last-Translator: Mikkel Kirkgaard Nielsen <memb_weblate@mikini.dk>\n"
 "Language-Team: Danish <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -21,32 +21,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.7-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "Lytter på {kind} port {listen_address}:{port}"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "Lytter på {kind} port {port}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "Tilgå URL {url} på tcp{kind}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "Tilgå URL {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "Forbind til {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "Kan ikke forbinde til {host}:{port}"
@@ -193,15 +193,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Konfigurer"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "Domænenavn"
@@ -261,34 +261,34 @@ msgstr "Sprog i dette administrationsværktøj"
 msgid "Submit"
 msgstr "Indsend"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "Generel Konfiguration"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Kunne ikke sætte værtsnavn: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "Værtsnavn gemt"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Kunne ikke sætte domænenavn: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "Domænenavn gemt"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "Kunne ikke sætte sprog: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "Sprog ændret"
 
@@ -1552,7 +1552,7 @@ msgstr "Generhverv"
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "Slet"
 
@@ -2633,7 +2633,7 @@ msgid "Interface"
 msgstr "Interface"
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3812,11 +3812,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3832,54 +3831,92 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+#, fuzzy
+#| msgid "Create User"
+msgid "Hourly Snapshots Limit"
+msgstr "Opret Bruger"
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Daily Snapshots Limit"
+msgstr "Slet %(name)s"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Weekly Snapshots Limit"
+msgstr "Slet %(name)s"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Yearly Snapshots Limit"
+msgstr "Slet %(name)s"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 #, fuzzy
 #| msgid "Create User"
 msgid "Create Snapshot"
 msgstr "Opret Bruger"
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Delete all the snapshots"
 msgstr "Slet %(name)s"
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete All"
 msgstr "Slet"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 #, fuzzy
 #| msgid "Inactive"
 msgid "active"
 msgstr "Inaktiv"
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, fuzzy, python-format
 #| msgid "Delete %(name)s"
 msgid "Delete snapshot #%(number)s"
@@ -3903,8 +3940,8 @@ msgstr "Slet %(name)s"
 msgid "Delete the following snapshots permanently?"
 msgstr "Slet bruger permanent?"
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Delete Snapshots"
@@ -3930,44 +3967,44 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
+#: plinth/modules/snapshot/views.py:96
 #, fuzzy
 #| msgid "Configuration updated"
-msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "Konfiguration opdateret"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr "Fejl under handling: {0} [{1}] [{2}]"
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Delete Snapshot"
 msgstr "Slet %(name)s"
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Deleted all snapshots."
 msgstr "Slet %(name)s"
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/de/LC_MESSAGES/django.po b/plinth/locale/de/LC_MESSAGES/django.po
index b35bdf4a6..3fa3d7184 100644
--- a/plinth/locale/de/LC_MESSAGES/django.po
+++ b/plinth/locale/de/LC_MESSAGES/django.po
@@ -9,11 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2018-02-04 15:35+0000\n"
 "Last-Translator: Johannes Keyser <johanneskeyser@posteo.de>\n"
-"Language-Team: German "
-"<https://hosted.weblate.org/projects/freedombox/plinth/de/>\n"
+"Language-Team: German <https://hosted.weblate.org/projects/freedombox/plinth/"
+"de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,32 +21,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.19-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "Gebunden auf {kind} Port {listen_address}:{port}"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "Gebunden an {kind} Port {port}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "Zugangs URL {url} via TCP{kind}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "Zugangs-URL {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "Verbinden mit {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "Verbindung mit {host}:{port} fehlgeschlagen"
@@ -199,15 +199,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr "Derzeit ist nur eine eingeschränkte Funktionalität möglich."
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "Domain-Name"
@@ -267,34 +267,34 @@ msgstr "Die Sprache der Web-Administrations-Oberfläche"
 msgid "Submit"
 msgstr "Absenden"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "Allgemeine Konfiguration"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Fehler beim Setzen des Hostnamens: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "Hostname gesetzt"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Fehler beim Setzen des Domain-Namens: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "Domain Name gesetzt"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "Fehler beim Setzen der Sprache: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "Sprache geändert"
 
@@ -1196,9 +1196,9 @@ msgid ""
 "this status log to the bug report."
 msgstr ""
 "Dies sind die letzten %(num_lines)s Zeilen des Statusprotokolls der Web-"
-"Oberfläche. Bitte melden Sie den Fehler im <a href=\"https://salsa.debian.org"
-"/freedombox-team/plinth/issues\">online Fehlerverfolger</a> und fügen diese "
-"Ausgabe hinzu."
+"Oberfläche. Bitte melden Sie den Fehler im <a href=\"https://salsa.debian."
+"org/freedombox-team/plinth/issues\">online Fehlerverfolger</a> und fügen "
+"diese Ausgabe hinzu."
 
 #: plinth/modules/help/templates/statuslog.html:38
 msgid "Caution:"
@@ -1524,7 +1524,7 @@ msgstr "Wieder beziehen"
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "Löschen"
 
@@ -1861,10 +1861,10 @@ msgid ""
 "CreateAccount\">Special:CreateAccount</a> page."
 msgstr ""
 "Diese MediaWiki-Instanz hat zunächst ein zufällig generiertes "
-"Administratorpasswort. Sie können ein neues Passwort in der \"Konfiguration\""
-" erstellen und sich mit dem \"admin\"-Nutzer anmelden. Dann können Sie "
-"weitere Nutzerkonten direkt in MediaWiki anlegen indem Sie die <a href=\""
-"/mediawiki/index.php/Special:CreateAccount\">spezielle Konto-Erstellen</a> "
+"Administratorpasswort. Sie können ein neues Passwort in der \"Konfiguration"
+"\" erstellen und sich mit dem \"admin\"-Nutzer anmelden. Dann können Sie "
+"weitere Nutzerkonten direkt in MediaWiki anlegen indem Sie die <a href=\"/"
+"mediawiki/index.php/Special:CreateAccount\">spezielle Konto-Erstellen</a> "
 "Seite nutzen."
 
 #: plinth/modules/mediawiki/__init__.py:48
@@ -2627,7 +2627,7 @@ msgid "Interface"
 msgstr "Schnittstelle"
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3819,12 +3819,19 @@ msgstr ""
 "dem man weiß dass er gut wahr."
 
 #: plinth/modules/snapshot/__init__.py:38
+#, fuzzy
+#| msgid ""
+#| "Automatic snapshots are taken every hour, day, month and year. Older "
+#| "snapshots are automatically deleted keeping 10 of each kind and 50 in "
+#| "total. Although snapshots are efficient and only store the differences, "
+#| "they may be deleted to reclaim free space.  Individual files from older "
+#| "snapshots can be accessed by visiting \".snapshots\" directory in the "
+#| "filesystem. Snapshots are not a replacement for backups."
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 "Automatische Schnappschüsse des Dateisystems werden stündlich, täglich, "
@@ -3848,46 +3855,84 @@ msgstr ""
 "Um Speicherauszug-Intervalle (stündlich, täglich, monatlich und jährlich) "
 "auszuschalten, deaktivieren sie diese Option."
 
+#: plinth/modules/snapshot/forms.py:32
+#, fuzzy
+#| msgid "Storage Snapshots"
+msgid "Hourly Snapshots Limit"
+msgstr "Speicherauszüge"
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Daily Snapshots Limit"
+msgstr "Lösche Speicherauszüge"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Weekly Snapshots Limit"
+msgstr "Lösche Speicherauszüge"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Yearly Snapshots Limit"
+msgstr "Lösche Speicherauszüge"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr "Speicherauszug anlegen"
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr "Lösche alle Speicherauszüge"
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr "Alle löschen"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr "Nummer"
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr "Datum"
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr "Zurücksetzen"
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr "aktiv"
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr "Zurücksetzen auf Speicherauszug #%(number)s"
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr "Lösche Speicherauszug #%(number)s"
@@ -3905,8 +3950,8 @@ msgstr "Lösche Speicherauszug #%(number)s"
 msgid "Delete the following snapshots permanently?"
 msgstr "Den folgenden Speicherauszug permanent löschen?"
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr "Lösche Speicherauszüge"
 
@@ -3933,39 +3978,41 @@ msgstr "Zurücksetzen auf Speicherauszug #%(number)s"
 msgid "Created snapshot."
 msgstr "Speicherauszug erstellt."
 
-#: plinth/modules/snapshot/views.py:75
-msgid "Timeline Snapshots configuration updated"
+#: plinth/modules/snapshot/views.py:96
+#, fuzzy
+#| msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "Konfiguration der Speicherauszug-Intervalle aktualisiert"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr "Action error: {0} [{1}] [{2}]"
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr "Speicherauszug #{number} gelöscht."
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr "Lösche Speicherauszug"
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr "Alle Speicherauszüge gelöscht."
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr "Zurückgesetzt auf Speicherauszug #{number}."
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 "Das System muss neu gestartet werden um das Zurücksetzen abzuschließen."
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr "Zurücksetzen auf Speicherauszug"
 
@@ -4869,8 +4916,8 @@ msgid ""
 "issues\">issue tracker</a>."
 msgstr ""
 "Wenn Sie denken, dass diese fehlende Seite vorhanden sein sollte, erstellen "
-"Sie bitte eine Fehlermeldung im <a href=\"https://salsa.debian.org"
-"/freedombox-team/plinth/issues\">online Problemverfolger</a> des Plinth "
+"Sie bitte eine Fehlermeldung im <a href=\"https://salsa.debian.org/"
+"freedombox-team/plinth/issues\">online Problemverfolger</a> des Plinth "
 "Projektes."
 
 #: plinth/templates/500.html:25
@@ -4886,10 +4933,10 @@ msgid ""
 "href=\"%(status_log_url)s\">status log</a> to the bug report."
 msgstr ""
 "Dies ist ein interner Fehler und nicht etwas, das Sie verursacht haben oder "
-"beheben können. Bitte melden Sie den Fehler im <a href=\""
-"https://salsa.debian.org/freedombox-team/plinth/issues\">online "
-"Fehlermelder</a>, so dass wir ihn beheben können. Fügen sie auch das <a href="
-"\"%(status_log_url)s\">Statusprotokoll</a> dem Fehlerbericht bei."
+"beheben können. Bitte melden Sie den Fehler im <a href=\"https://salsa."
+"debian.org/freedombox-team/plinth/issues\">online Fehlermelder</a>, so dass "
+"wir ihn beheben können. Fügen sie auch das <a href=\"%(status_log_url)s"
+"\">Statusprotokoll</a> dem Fehlerbericht bei."
 
 #: plinth/templates/apps.html:33
 msgid "Services and Applications"
diff --git a/plinth/locale/django.pot b/plinth/locale/django.pot
index ab3d75e55..14178ff81 100644
--- a/plinth/locale/django.pot
+++ b/plinth/locale/django.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,32 +17,32 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr ""
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr ""
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr ""
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr ""
@@ -170,15 +170,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr ""
@@ -229,34 +229,34 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr ""
 
@@ -1312,7 +1312,7 @@ msgstr ""
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr ""
 
@@ -2262,7 +2262,7 @@ msgid "Interface"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3260,11 +3260,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3278,46 +3277,76 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+msgid "Hourly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:36
+msgid "Daily Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:40
+msgid "Weekly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+msgid "Yearly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr ""
@@ -3335,8 +3364,8 @@ msgstr ""
 msgid "Delete the following snapshots permanently?"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr ""
 
@@ -3360,38 +3389,38 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
-msgid "Timeline Snapshots configuration updated"
+#: plinth/modules/snapshot/views.py:96
+msgid "Storage snapshots configuration updated"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/es/LC_MESSAGES/django.po b/plinth/locale/es/LC_MESSAGES/django.po
index 15cb26373..dda2ae54c 100644
--- a/plinth/locale/es/LC_MESSAGES/django.po
+++ b/plinth/locale/es/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2017-10-04 22:47+0000\n"
 "Last-Translator: Luis A. Arizmendi <luis.arizmendi@mailfence.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/freedombox/"
@@ -19,32 +19,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.17-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "Escuchando en el puerto {kind} {listen_address}:{port}"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "Escuchando en el puerto {port} {kind}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "Acceso a {url} en tcp{kind}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "Acceso a {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "Conectar a {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "No se pudo conectar a {host}:{port}"
@@ -198,15 +198,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Configurar"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "Nombre de dominio"
@@ -267,34 +267,34 @@ msgstr "Idioma para la interfaz de administración web"
 msgid "Submit"
 msgstr "Enviar"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "Configuración general"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Error al definir el nombre de anfitrión: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "Asignar nombre de anfitrión"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Error al establecer nombre de dominio: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "Asignar nombre de dominio"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "Error al establecer idioma: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "Idioma cambiado"
 
@@ -1539,7 +1539,7 @@ msgstr "Volver a obtener"
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -2640,7 +2640,7 @@ msgid "Interface"
 msgstr "Interfaz"
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3805,12 +3805,19 @@ msgstr ""
 "cambios no deseados."
 
 #: plinth/modules/snapshot/__init__.py:38
+#, fuzzy
+#| msgid ""
+#| "Automatic snapshots are taken every hour, day, month and year. Older "
+#| "snapshots are automatically deleted keeping 10 of each kind and 50 in "
+#| "total. Although snapshots are efficient and only store the differences, "
+#| "they may be deleted to reclaim free space.  Individual files from older "
+#| "snapshots can be accessed by visiting \".snapshots\" directory in the "
+#| "filesystem. Snapshots are not a replacement for backups."
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 "Se toman instantáneas automáticas cada hora, día, mes y año. Los más "
@@ -3832,50 +3839,88 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+#, fuzzy
+#| msgid "Storage Snapshots"
+msgid "Hourly Snapshots Limit"
+msgstr "Almacén de instantáneas"
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Daily Snapshots Limit"
+msgstr "Eliminar instantánea"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Weekly Snapshots Limit"
+msgstr "Eliminar instantánea"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Yearly Snapshots Limit"
+msgstr "Eliminar instantánea"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr "Crear instantánea"
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Delete all the snapshots"
 msgstr "Eliminar instantánea"
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete All"
 msgstr "Eliminar"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr "Número"
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr "Fecha"
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr "Restaurar"
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr "Activa"
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr "Restaurar a instantánea %(number)s"
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr "Eliminar instantánea %(number)s"
@@ -3895,8 +3940,8 @@ msgstr "Eliminar instantánea %(number)s"
 msgid "Delete the following snapshots permanently?"
 msgstr "¿Eliminar esta instantánea definitivamente?"
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Delete Snapshots"
@@ -3924,42 +3969,42 @@ msgstr "Restaurar a instantánea %(number)s"
 msgid "Created snapshot."
 msgstr "Instantánea creada."
 
-#: plinth/modules/snapshot/views.py:75
+#: plinth/modules/snapshot/views.py:96
 #, fuzzy
 #| msgid "Access rights configuration updated"
-msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "Configuración de derechos de acceso actualizada"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr "Acción de error: {0} [{1}] [{2}]"
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr "Borrar instantánea {number}."
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr "Eliminar instantánea"
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Deleted all snapshots."
 msgstr "Eliminar instantánea"
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr "Sistema restaurado a la instantánea {number}."
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr "Debe reiniciar el sistema para completar la restauración."
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr "Restaurar a instantánea"
 
diff --git a/plinth/locale/fa/LC_MESSAGES/django.po b/plinth/locale/fa/LC_MESSAGES/django.po
index 543168080..5427ebf6f 100644
--- a/plinth/locale/fa/LC_MESSAGES/django.po
+++ b/plinth/locale/fa/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2016-08-12 15:51+0000\n"
 "Last-Translator: Masoud Abkenar <ampbox@gmail.com>\n"
 "Language-Team: Persian <https://hosted.weblate.org/projects/freedombox/"
@@ -19,32 +19,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.8-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, fuzzy, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "در حال گوش دادن به پورت {kind} در {listen_address}:{port}"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, fuzzy, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "در حال گوش دادن به پورت {kind} یعنی {port}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, fuzzy, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "دسترسی به نشانی {url} در tcp{kind}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, fuzzy, python-brace-format
 msgid "Access URL {url}"
 msgstr "دسترسی به نشانی {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, fuzzy, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "اتصال به {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, fuzzy, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "نمی‌توان به {host}:{port} وصل شد"
@@ -190,7 +190,7 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
@@ -198,8 +198,8 @@ msgstr ""
 msgid "Configure"
 msgstr "پیکربندی"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "نام دامنه"
@@ -262,34 +262,34 @@ msgstr "زبان محیط این برنامهٔ مدیریتی"
 msgid "Submit"
 msgstr "فرستادن"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "پیکربندی عمومی"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "خطا در هنگام تنظیم نام میزبان: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "نام میزبان تنظیم شد"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "خطا در هنگام تنظیم نام دامنه: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "نام دامنه تنظیم شد"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "خطا در هنگام تنظیم زبان: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "زبان عوض شد"
 
@@ -1516,7 +1516,7 @@ msgstr "بازپس‌گیری"
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "پاک‌کردن"
 
@@ -2567,7 +2567,7 @@ msgid "Interface"
 msgstr "واسط"
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3594,11 +3594,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3614,50 +3613,88 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Hourly Snapshots Limit"
+msgstr "پاک‌کردن %(name)s"
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Daily Snapshots Limit"
+msgstr "پاک‌کردن %(name)s"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Weekly Snapshots Limit"
+msgstr "پاک‌کردن %(name)s"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Yearly Snapshots Limit"
+msgstr "پاک‌کردن %(name)s"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Delete all the snapshots"
 msgstr "پاک‌کردن %(name)s"
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete All"
 msgstr "پاک‌کردن"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, fuzzy, python-format
 #| msgid "Delete %(name)s"
 msgid "Delete snapshot #%(number)s"
@@ -3677,8 +3714,8 @@ msgstr "پاک‌کردن %(name)s"
 msgid "Delete the following snapshots permanently?"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Delete Snapshots"
@@ -3704,44 +3741,44 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
+#: plinth/modules/snapshot/views.py:96
 #, fuzzy
 #| msgid "Configuration updated"
-msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "پیکربندی به‌روز شد"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Delete Snapshot"
 msgstr "پاک‌کردن %(name)s"
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Deleted all snapshots."
 msgstr "پاک‌کردن %(name)s"
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/fake/LC_MESSAGES/django.po b/plinth/locale/fake/LC_MESSAGES/django.po
index b4ee363f7..11f451f5d 100644
--- a/plinth/locale/fake/LC_MESSAGES/django.po
+++ b/plinth/locale/fake/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Plinth 0.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2016-01-31 22:24+0530\n"
 "Last-Translator: Sunil Mohan Adapa <sunil@medhas.org>\n"
 "Language-Team: Plinth Developers <freedombox-discuss@lists.alioth.debian."
@@ -18,33 +18,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "LISTENING ON {kind} PORT {listen_address}:{port}"
 
 # LISTENING ON {kind} PORT {port}
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "LISTENING ON {kind} PORT {port}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "ACCESS URL {url} ON TCP{kind}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "ACCESS URL {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "CONNECT TO {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "CANNOT CONNECT TO {host}:{port}"
@@ -204,15 +204,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "CONFIGURE"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "DOMAIN NAME"
@@ -273,34 +273,34 @@ msgstr "LANGUAGE FOR THIS WEB ADMINISTRATION INTERFACE"
 msgid "Submit"
 msgstr "SUBMIT"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "GENERAL CONFIGURATION"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "ERROR SETTING HOSTNAME: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "HOSTNAME SET"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "ERROR SETTING DOMAIN NAME: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "DOMAIN NAME SET"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "ERROR SETTING LANGUAGE: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "LANGUAGE UNCHANGED"
 
@@ -1613,7 +1613,7 @@ msgstr "RE-OBTAIN"
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "DELETE"
 
@@ -2712,7 +2712,7 @@ msgid "Interface"
 msgstr "INTERFACE"
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3919,11 +3919,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3939,54 +3938,92 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+#, fuzzy
+#| msgid "Create User"
+msgid "Hourly Snapshots Limit"
+msgstr "CREATE USER"
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Daily Snapshots Limit"
+msgstr "DELETE %(name)s"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Weekly Snapshots Limit"
+msgstr "DELETE %(name)s"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Yearly Snapshots Limit"
+msgstr "DELETE %(name)s"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 #, fuzzy
 #| msgid "Create User"
 msgid "Create Snapshot"
 msgstr "CREATE USER"
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Delete all the snapshots"
 msgstr "DELETE %(name)s"
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete All"
 msgstr "DELETE"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 #, fuzzy
 #| msgid "Inactive"
 msgid "active"
 msgstr "INACTIVE"
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, fuzzy, python-format
 #| msgid "Delete %(name)s"
 msgid "Delete snapshot #%(number)s"
@@ -4010,8 +4047,8 @@ msgstr "DELETE %(name)s"
 msgid "Delete the following snapshots permanently?"
 msgstr "DELETE USER PERMANENTLY?"
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Delete Snapshots"
@@ -4037,44 +4074,44 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
+#: plinth/modules/snapshot/views.py:96
 #, fuzzy
 #| msgid "Configuration updated"
-msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "CONFIGURATION UPDATED"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr "ACTION ERROR: {0} [{1}] [{2}]"
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Delete Snapshot"
 msgstr "DELETE %(name)s"
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Deleted all snapshots."
 msgstr "DELETE %(name)s"
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/fr/LC_MESSAGES/django.po b/plinth/locale/fr/LC_MESSAGES/django.po
index bfef00b16..c75a2e7c8 100644
--- a/plinth/locale/fr/LC_MESSAGES/django.po
+++ b/plinth/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2018-01-03 10:08+0000\n"
 "Last-Translator: pitchum <pitchum@gramaton.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -19,32 +19,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 2.19-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "Écoute sur le port {listen_address}:{port} ({kind})"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "Écoute sur le port {port}, type {kind}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "Accès à l'URL {url} via tcp{kind}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "Accès à l'URL {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "Connexion à {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "Impossible de se connecter à {host}:{port}"
@@ -198,15 +198,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Configurer"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "Nom de Domaine"
@@ -270,34 +270,34 @@ msgstr "Langue de cette interface web d'administration"
 msgid "Submit"
 msgstr "Soumettre"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "Configuration générale"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Erreur lors de l'établissement du nom de machine : {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "Nom de machine établi"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Erreur lors de l'établissement du nom de domaine : {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "Nom de domaine établi"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "Erreur lors de la configuration de la langue : {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "Langue modifiée"
 
@@ -1560,7 +1560,7 @@ msgstr "Obtenir à nouveau"
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -2679,7 +2679,7 @@ msgid "Interface"
 msgstr "Interface"
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3861,12 +3861,19 @@ msgstr ""
 "à un précédent état correct connu en cas de changements non désirés."
 
 #: plinth/modules/snapshot/__init__.py:38
+#, fuzzy
+#| msgid ""
+#| "Automatic snapshots are taken every hour, day, month and year. Older "
+#| "snapshots are automatically deleted keeping 10 of each kind and 50 in "
+#| "total. Although snapshots are efficient and only store the differences, "
+#| "they may be deleted to reclaim free space.  Individual files from older "
+#| "snapshots can be accessed by visiting \".snapshots\" directory in the "
+#| "filesystem. Snapshots are not a replacement for backups."
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 "Les instantanés automatiques sont établis chaque heure, chaque jour, chaque "
@@ -3890,50 +3897,88 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+#, fuzzy
+#| msgid "Storage Snapshots"
+msgid "Hourly Snapshots Limit"
+msgstr "Instantanés de stockage"
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Daily Snapshots Limit"
+msgstr "Supprimer l'instantané"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Weekly Snapshots Limit"
+msgstr "Supprimer l'instantané"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Yearly Snapshots Limit"
+msgstr "Supprimer l'instantané"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr "Créer un instantané"
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Delete all the snapshots"
 msgstr "Supprimer l'instantané"
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete All"
 msgstr "Supprimer"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr "Numéro"
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr "Date"
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr "Revenir en arrière"
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr "actif"
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr "Revenir à l'instantané #%(number)s"
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr "Effacer l'instantané #%(number)s"
@@ -3953,8 +3998,8 @@ msgstr "Supprimer l'instantané numéro #%(number)s"
 msgid "Delete the following snapshots permanently?"
 msgstr "Supprimer définitivement cet instantané ?"
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Delete Snapshots"
@@ -3983,42 +4028,42 @@ msgstr "Revenir à l'instantané  #%(number)s"
 msgid "Created snapshot."
 msgstr "Instantané créé."
 
-#: plinth/modules/snapshot/views.py:75
+#: plinth/modules/snapshot/views.py:96
 #, fuzzy
 #| msgid "Access rights configuration updated"
-msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "Configuration des droits d'accès mise à jour"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr "Erreur sur action : {0} [{1}] [{2}]"
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr "Instantané #{number} supprimé."
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr "Supprimer l'instantané"
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Deleted all snapshots."
 msgstr "Supprimer l'instantané"
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr "Retour vers l'instantané #{number} effectué."
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr "Le système doit être redémarré pour terminer le retour en arrière."
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr "Revenir à l'instantané"
 
diff --git a/plinth/locale/gu/LC_MESSAGES/django.po b/plinth/locale/gu/LC_MESSAGES/django.po
index 2841aa8b0..a06e83bce 100644
--- a/plinth/locale/gu/LC_MESSAGES/django.po
+++ b/plinth/locale/gu/LC_MESSAGES/django.po
@@ -7,11 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-15 14:36-0500\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2018-02-05 18:37+0000\n"
 "Last-Translator: drashti kaushik <drashtipandya37@gmail.com>\n"
-"Language-Team: Gujarati "
-"<https://hosted.weblate.org/projects/freedombox/plinth/gu/>\n"
+"Language-Team: Gujarati <https://hosted.weblate.org/projects/freedombox/"
+"plinth/gu/>\n"
 "Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,32 +19,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 2.19-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "સાંભળે છે {kind} પોર્ટ {listen_address}:{port}"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "સાંભળે છે {kind} પોર્ટ {port}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "ઍક્સેસ URL {url} tcp પર {kind}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "ઍક્સેસ URL {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "{host}:{port} ને સંપર્ક કરો"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "{host}:{port} નો સંપર્ક નથી સાધી શકતા"
@@ -189,15 +189,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr "હાલમાં ફક્ત મર્યાદિત કાર્યક્ષમતા ઉપલબ્ધ છે."
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "ગોઠવો"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "ક્ષેત્રનું નામ"
@@ -257,34 +257,34 @@ msgstr "આ વેબ પ્રબંધક ઈન્ટરફેસ માટ
 msgid "Submit"
 msgstr "સમર્પિત કરો"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "સામાન્ય ગોઠવણી"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "હોસ્ટનું નામ સ્થાપિત કરતાં ભૂલ થઇ: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "હોસ્ટનું નામ સ્થાપિત કર્યું"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "ક્ષેત્રીય નામ સ્થાપિત કરતાં ભૂલ થઇ: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "ક્ષેત્રીય નામ સ્થાપિત કર્યું"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "ભાષા સ્થાપિત કરતાં ભૂલ થઇ: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "ભાષા બદલી"
 
@@ -886,9 +886,9 @@ msgid ""
 "network traffic on your {box_name}. Keeping a firewall enabled and properly "
 "configured reduces risk of security threat from the Internet."
 msgstr ""
-"ફાયરવોલ એક સુરક્ષા પ્રણાલી છે જે તમારા અને તમારા આઉટગોઇંગ નેટવર્ક ટ્રાફિકને "
-"નિયંત્રિત કરે છે {box_name}. ફાયરવૉલ સક્ષમ અને યોગ્ય રીતે રૂપરેખાંકિત રાખીને "
-"ઇન્ટરનેટથી સુરક્ષાના ભયને ઘટાડે છે."
+"ફાયરવોલ એક સુરક્ષા પ્રણાલી છે જે તમારા અને તમારા આઉટગોઇંગ નેટવર્ક ટ્રાફિકને નિયંત્રિત કરે "
+"છે {box_name}. ફાયરવૉલ સક્ષમ અને યોગ્ય રીતે રૂપરેખાંકિત રાખીને ઇન્ટરનેટથી સુરક્ષાના ભયને "
+"ઘટાડે છે."
 
 #: plinth/modules/firewall/templates/firewall.html:25
 msgid "Current status:"
@@ -902,10 +902,10 @@ msgid ""
 "you may run it using the command 'service firewalld start' or in case of a "
 "system with systemd 'systemctl start firewalld'."
 msgstr ""
-"ફાયરવોલ ડિમન ચાલી રહ્યું નથી. કૃપા કરીને તેને ચલાવો.  ફાયરવોલ %(box_name)s "
-"પર મૂળભૂત સક્ષમ કરેલું છે. કોઈપણ ડેબિયન આધારિત સિસ્ટમ પર(જેવી કે "
-"%(box_name)s) તમે આદેશનો ઉપયોગ કરીને તેને ચલાવી શકો છો 'service firewalld "
-"start' અથવા systemd સાથે સિસ્ટમના કિસ્સામાં 'systemctl start firewalld'."
+"ફાયરવોલ ડિમન ચાલી રહ્યું નથી. કૃપા કરીને તેને ચલાવો.  ફાયરવોલ %(box_name)s પર મૂળભૂત "
+"સક્ષમ કરેલું છે. કોઈપણ ડેબિયન આધારિત સિસ્ટમ પર(જેવી કે %(box_name)s) તમે આદેશનો ઉપયોગ "
+"કરીને તેને ચલાવી શકો છો 'service firewalld start' અથવા systemd સાથે સિસ્ટમના "
+"કિસ્સામાં 'systemctl start firewalld'."
 
 #: plinth/modules/firewall/templates/firewall.html:45
 msgid "Show Ports"
@@ -950,9 +950,8 @@ msgid ""
 "also permitted in the firewall and when you disable a service it is also "
 "disabled in the firewall."
 msgstr ""
-"ફાયરવૉલનું સંચાલન આપોઆપ છે. જ્યારે તમે સેવાને સક્ષમ કરો છો ત્યારે તેને "
-"ફાયરવૉલમાં પણ પરવાનગી છે અને જ્યારે તમે કોઈ સેવા અક્ષમ કરો છો ત્યારે તે "
-"ફાયરવૉલમાં પણ અક્ષમ થાય છે."
+"ફાયરવૉલનું સંચાલન આપોઆપ છે. જ્યારે તમે સેવાને સક્ષમ કરો છો ત્યારે તેને ફાયરવૉલમાં પણ "
+"પરવાનગી છે અને જ્યારે તમે કોઈ સેવા અક્ષમ કરો છો ત્યારે તે ફાયરવૉલમાં પણ અક્ષમ થાય છે."
 
 #: plinth/modules/first_boot/templates/firstboot_complete.html:29
 msgid "Setup Complete!"
@@ -973,8 +972,8 @@ msgid ""
 "You may want to check the <a href=\"%(networks_url)s\">network setup</a> and "
 "modify it if necessary."
 msgstr ""
-"તમે તપાસી શકો છો <a href=\"%(networks_url)s\">નેટવર્ક સેટઅપ</a> અને જો જરૂરી "
-"હોય તો તેને સુધારો."
+"તમે તપાસી શકો છો <a href=\"%(networks_url)s\">નેટવર્ક સેટઅપ</a> અને જો જરૂરી હોય "
+"તો તેને સુધારો."
 
 #: plinth/modules/first_boot/templates/firstboot_navbar.html:23
 #: plinth/modules/help/templates/help_index.html:33
@@ -992,8 +991,8 @@ msgid ""
 "To complete the setup of your %(box_name)s, please provide some basic "
 "information."
 msgstr ""
-"તમારા %(box_name)s ના સેટઅપને પૂર્ણ કરવા માટે, કૃપા કરીને કેટલીક મૂળભૂત "
-"માહિતી પ્રદાન કરો."
+"તમારા %(box_name)s ના સેટઅપને પૂર્ણ કરવા માટે, કૃપા કરીને કેટલીક મૂળભૂત માહિતી પ્રદાન "
+"કરો."
 
 #: plinth/modules/first_boot/views.py:56
 msgid "Setup Complete"
@@ -1424,7 +1423,7 @@ msgstr ""
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr ""
 
@@ -2378,7 +2377,7 @@ msgid "Interface"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3376,11 +3375,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3394,46 +3392,76 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+msgid "Hourly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:36
+msgid "Daily Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:40
+msgid "Weekly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+msgid "Yearly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr ""
@@ -3451,8 +3479,8 @@ msgstr ""
 msgid "Delete the following snapshots permanently?"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr ""
 
@@ -3476,39 +3504,39 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
+#: plinth/modules/snapshot/views.py:96
 #, fuzzy
-msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "DNSSEC ગોઠવણીને સુધારેલી શરુ કરો"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/hi/LC_MESSAGES/django.po b/plinth/locale/hi/LC_MESSAGES/django.po
index f4208cc30..f367b3819 100644
--- a/plinth/locale/hi/LC_MESSAGES/django.po
+++ b/plinth/locale/hi/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2018-01-22 14:10+0000\n"
 "Last-Translator: drashti kaushik <drashtipandya37@gmail.com>\n"
 "Language-Team: Hindi <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -19,32 +19,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 2.19-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr ""
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr ""
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr ""
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, fuzzy, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "{host}:{port} से जुड़े"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr ""
@@ -173,15 +173,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "कॉन्फ़िगर करें"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 #, fuzzy
 msgid "Domain Name"
@@ -238,34 +238,34 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "सामान्य कॉन्फ़िगरेशन"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, fuzzy, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "{exception}: होस्ट नाम सेट करने में त्रुटि"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, fuzzy, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "{exception}: डोमेन नाम सेट करने में त्रुटि"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 #, fuzzy
 msgid "Language changed"
 msgstr "भाषा बदल दी गयी है"
@@ -1326,7 +1326,7 @@ msgstr ""
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr ""
 
@@ -2276,7 +2276,7 @@ msgid "Interface"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3274,11 +3274,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3292,46 +3291,76 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+msgid "Hourly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:36
+msgid "Daily Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:40
+msgid "Weekly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+msgid "Yearly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr ""
@@ -3349,8 +3378,8 @@ msgstr ""
 msgid "Delete the following snapshots permanently?"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr ""
 
@@ -3374,38 +3403,38 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
-msgid "Timeline Snapshots configuration updated"
+#: plinth/modules/snapshot/views.py:96
+msgid "Storage snapshots configuration updated"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/id/LC_MESSAGES/django.po b/plinth/locale/id/LC_MESSAGES/django.po
index e67fee285..2b7162ce3 100644
--- a/plinth/locale/id/LC_MESSAGES/django.po
+++ b/plinth/locale/id/LC_MESSAGES/django.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Indonesian (FreedomBox)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2016-08-28 19:39+0000\n"
 "Last-Translator: Izharul Haq <atoz.chevara.2013@gmail.com>\n"
 "Language-Team: Indonesian <https://hosted.weblate.org/projects/freedombox/"
@@ -14,32 +14,32 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 2.10-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr ""
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "Akses URL {url} pada tcp{kind}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "Akses URL {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "Terhubung ke {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "Tidak dapat terhubung ke {host}:{port}"
@@ -173,15 +173,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Konfigurasi"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr ""
@@ -232,34 +232,34 @@ msgstr "Bahasa untuk antarmuka web administrasi"
 msgid "Submit"
 msgstr ""
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "Konfigurasi Umum"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Kesalahan pengaturan nama domain: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "Kesalahan pengaturan bahasa: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "Bahasa telah dipilih"
 
@@ -1344,7 +1344,7 @@ msgstr ""
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "Hapus"
 
@@ -2314,7 +2314,7 @@ msgid "Interface"
 msgstr "Interface"
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3322,11 +3322,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3340,48 +3339,84 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+msgid "Hourly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Daily Snapshots Limit"
+msgstr "Hapus %(name)s"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Weekly Snapshots Limit"
+msgstr "Hapus %(name)s"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Yearly Snapshots Limit"
+msgstr "Hapus %(name)s"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete All"
 msgstr "Hapus"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr "Tanggal"
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr ""
@@ -3399,8 +3434,8 @@ msgstr ""
 msgid "Delete the following snapshots permanently?"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Delete Snapshots"
@@ -3426,40 +3461,40 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
+#: plinth/modules/snapshot/views.py:96
 #, fuzzy
 #| msgid "General Configuration"
-msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "Konfigurasi Umum"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/it/LC_MESSAGES/django.po b/plinth/locale/it/LC_MESSAGES/django.po
index 0873d9440..8dfe8ef02 100644
--- a/plinth/locale/it/LC_MESSAGES/django.po
+++ b/plinth/locale/it/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,32 +18,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr ""
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr ""
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr ""
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr ""
@@ -171,15 +171,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr ""
@@ -230,34 +230,34 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr ""
 
@@ -1313,7 +1313,7 @@ msgstr ""
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr ""
 
@@ -2263,7 +2263,7 @@ msgid "Interface"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3261,11 +3261,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3279,46 +3278,76 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+msgid "Hourly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:36
+msgid "Daily Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:40
+msgid "Weekly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+msgid "Yearly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr ""
@@ -3336,8 +3365,8 @@ msgstr ""
 msgid "Delete the following snapshots permanently?"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr ""
 
@@ -3361,38 +3390,38 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
-msgid "Timeline Snapshots configuration updated"
+#: plinth/modules/snapshot/views.py:96
+msgid "Storage snapshots configuration updated"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/ja/LC_MESSAGES/django.po b/plinth/locale/ja/LC_MESSAGES/django.po
index a5e8bc88f..9ef6b416c 100644
--- a/plinth/locale/ja/LC_MESSAGES/django.po
+++ b/plinth/locale/ja/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,32 +18,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr ""
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr ""
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr ""
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr ""
@@ -171,15 +171,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr ""
@@ -230,34 +230,34 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr ""
 
@@ -1313,7 +1313,7 @@ msgstr ""
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr ""
 
@@ -2263,7 +2263,7 @@ msgid "Interface"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3261,11 +3261,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3279,46 +3278,76 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+msgid "Hourly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:36
+msgid "Daily Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:40
+msgid "Weekly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+msgid "Yearly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr ""
@@ -3336,8 +3365,8 @@ msgstr ""
 msgid "Delete the following snapshots permanently?"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr ""
 
@@ -3361,38 +3390,38 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
-msgid "Timeline Snapshots configuration updated"
+#: plinth/modules/snapshot/views.py:96
+msgid "Storage snapshots configuration updated"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/kn/LC_MESSAGES/django.po b/plinth/locale/kn/LC_MESSAGES/django.po
index a5e8bc88f..9ef6b416c 100644
--- a/plinth/locale/kn/LC_MESSAGES/django.po
+++ b/plinth/locale/kn/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,32 +18,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr ""
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr ""
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr ""
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr ""
@@ -171,15 +171,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr ""
@@ -230,34 +230,34 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr ""
 
@@ -1313,7 +1313,7 @@ msgstr ""
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr ""
 
@@ -2263,7 +2263,7 @@ msgid "Interface"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3261,11 +3261,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3279,46 +3278,76 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+msgid "Hourly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:36
+msgid "Daily Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:40
+msgid "Weekly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+msgid "Yearly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr ""
@@ -3336,8 +3365,8 @@ msgstr ""
 msgid "Delete the following snapshots permanently?"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr ""
 
@@ -3361,38 +3390,38 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
-msgid "Timeline Snapshots configuration updated"
+#: plinth/modules/snapshot/views.py:96
+msgid "Storage snapshots configuration updated"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/nb/LC_MESSAGES/django.po b/plinth/locale/nb/LC_MESSAGES/django.po
index 43df06a04..546869880 100644
--- a/plinth/locale/nb/LC_MESSAGES/django.po
+++ b/plinth/locale/nb/LC_MESSAGES/django.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2018-01-12 08:08+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
@@ -27,32 +27,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.19-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "Lytter på {kind} port {listen_address}:{port}"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "Lytter på {kind} port {port}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "Kontakt nettadressen {url} på tcp{kind}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "Kontakt nettadressen {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "Koble til {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "Klarer ikke koble til {host}:{port}"
@@ -204,15 +204,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr "Akkurat nå finnes det bare begrenset funksjonalitet."
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Sette opp"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "Domenenavn"
@@ -272,34 +272,34 @@ msgstr "Språk i dette nettadministrasjonsgrensesnittet"
 msgid "Submit"
 msgstr "Send inn"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "Generelt oppsett"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Feil ved setting av vertsnavn: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "Vertsnavn satt"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Feil ved innstilling/setting av domenenavn: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "Domenenavn satt"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "Språksettingsfeil: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "Språk endret"
 
@@ -1529,7 +1529,7 @@ msgstr "Gjeninnhente"
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "Slett"
 
@@ -2640,7 +2640,7 @@ msgid "Interface"
 msgstr "Grensesnitt"
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3852,12 +3852,19 @@ msgstr ""
 "på systemet."
 
 #: plinth/modules/snapshot/__init__.py:38
+#, fuzzy
+#| msgid ""
+#| "Automatic snapshots are taken every hour, day, month and year. Older "
+#| "snapshots are automatically deleted keeping 10 of each kind and 50 in "
+#| "total. Although snapshots are efficient and only store the differences, "
+#| "they may be deleted to reclaim free space.  Individual files from older "
+#| "snapshots can be accessed by visiting \".snapshots\" directory in the "
+#| "filesystem. Snapshots are not a replacement for backups."
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 "Automatisk øyeblikksbilde tas hver time, dag, måned og år.  Eldre "
@@ -3882,50 +3889,88 @@ msgstr ""
 "Fravelg dette for å skru av tidslinjeøyeblikksbilder (timevist, daglig, "
 "månedlig og årvist)."
 
+#: plinth/modules/snapshot/forms.py:32
+#, fuzzy
+#| msgid "Create Snapshot"
+msgid "Hourly Snapshots Limit"
+msgstr "Opprett øyeblikksbilde"
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Daily Snapshots Limit"
+msgstr "Slett øyeblikksbilde"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Weekly Snapshots Limit"
+msgstr "Slett øyeblikksbilde"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Yearly Snapshots Limit"
+msgstr "Slett øyeblikksbilde"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr "Opprett øyeblikksbilde"
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Delete all the snapshots"
 msgstr "Slett øyeblikksbilde"
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete All"
 msgstr "Slett"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr "Nummer"
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr "Dato"
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr "Rull tilbake"
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr "Slått på"
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr "Rull tilbake til øyeblikksbilde #%(number)s"
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr "Slett øyeblikksbilde %(number)s"
@@ -3945,8 +3990,8 @@ msgstr "Slett øyeblikksbilde #%(number)s"
 msgid "Delete the following snapshots permanently?"
 msgstr "Slett dette øyeblikksbildet permanent?"
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Delete Snapshots"
@@ -3975,42 +4020,42 @@ msgstr "Rull tilbake til øyeblikksbilde #%(number)s"
 msgid "Created snapshot."
 msgstr "Opprett øyeblikksbilde."
 
-#: plinth/modules/snapshot/views.py:75
+#: plinth/modules/snapshot/views.py:96
 #, fuzzy
 #| msgid "Access rights configuration updated"
-msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "Tilgangskontrolloppsett oppdatert"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr "Handlingsfeil: {0} [{1}] [{2}]"
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr "Slettet øyeblikksbilde #{number}."
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr "Slett øyeblikksbilde"
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Deleted all snapshots."
 msgstr "Slett øyeblikksbilde"
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr "Rullet tilbake til øyeblikksbilde #{number}."
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr "Systemet må startes på nytt for å fullføre tilbakerullingen."
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr "Rull tilbake til øyeblikksbilde"
 
diff --git a/plinth/locale/nl/LC_MESSAGES/django.po b/plinth/locale/nl/LC_MESSAGES/django.po
index 6966d4b7e..08194536c 100644
--- a/plinth/locale/nl/LC_MESSAGES/django.po
+++ b/plinth/locale/nl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2018-01-22 05:28+0000\n"
 "Last-Translator: ikmaak <info@ikmaak.nl>\n"
 "Language-Team: Dutch <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -21,32 +21,32 @@ msgstr ""
 "X-Language: nl_NL\n"
 "X-Source-Language: C\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "Luistert op {kind} poort {listen_address}:{port}"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "Luistert op {kind} poort {port}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "Gebruik URL {url} op tcp{kind}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "ToegangsURL {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "Verbind met {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "Kan niet verbinden met {host}:{port}"
@@ -197,15 +197,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Configureer"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "Domeinnaam"
@@ -266,34 +266,34 @@ msgstr "Taalkeuze voor deze webadministratie-interface"
 msgid "Submit"
 msgstr "Invoeren"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "Algemene Instellingen"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Hostnaam instellen mislukt: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "Hostnaam ingesteld"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Domeinnaam instellen mislukt: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "Domeinnaam ingesteld"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "Taal instellen mislukt: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "Taal aangepast"
 
@@ -1515,7 +1515,7 @@ msgstr "Opnieuw verkrijgen"
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -2560,7 +2560,7 @@ msgid "Interface"
 msgstr "Interface"
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3725,12 +3725,19 @@ msgstr ""
 "te keren naar een voorheen goed werkende staat."
 
 #: plinth/modules/snapshot/__init__.py:38
+#, fuzzy
+#| msgid ""
+#| "Automatic snapshots are taken every hour, day, month and year. Older "
+#| "snapshots are automatically deleted keeping 10 of each kind and 50 in "
+#| "total. Although snapshots are efficient and only store the differences, "
+#| "they may be deleted to reclaim free space.  Individual files from older "
+#| "snapshots can be accessed by visiting \".snapshots\" directory in the "
+#| "filesystem. Snapshots are not a replacement for backups."
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 "Automatische snapshots worden gemaakt op ieder uur, dag, maand en jaar. "
@@ -3751,46 +3758,84 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+#, fuzzy
+#| msgid "Storage Snapshots"
+msgid "Hourly Snapshots Limit"
+msgstr "Opslag Snapshots"
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Daily Snapshots Limit"
+msgstr "Snapshots verwijderen"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Weekly Snapshots Limit"
+msgstr "Snapshots verwijderen"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Yearly Snapshots Limit"
+msgstr "Snapshots verwijderen"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr "Maak Snapshot"
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr "Verwijder alle snapshots"
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr "Verwijder alles"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr "Nummer"
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr "Datum"
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr "Terugdraaien"
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr "actief"
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr "Terugdraaien tot snapshot #%(number)s"
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr "Snapshot #%(number)s verwijderen"
@@ -3808,8 +3853,8 @@ msgstr "Snapshot #%(number)s verwijderen"
 msgid "Delete the following snapshots permanently?"
 msgstr "De volgende snapshots permanent verwijderen?"
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr "Snapshots verwijderen"
 
@@ -3836,39 +3881,41 @@ msgstr "Terugdraaien tot Snapshot #%(number)s"
 msgid "Created snapshot."
 msgstr "Gemaakte snapshot."
 
-#: plinth/modules/snapshot/views.py:75
-msgid "Timeline Snapshots configuration updated"
+#: plinth/modules/snapshot/views.py:96
+#, fuzzy
+#| msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "Timeline Snapshots configuratie is bijgewerkt"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr "Actiefout: {0} [{1}] [{2}]"
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr "Snapshot #{number} verwijderd."
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr "Snapshot verwijderen"
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr "Snapshots allemaal verwijderd."
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr "Teruggezet naar snapshot #{number}."
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 "Het systeem moet opnieuw worden opgestart om het terugdraaien te voltooien."
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr "Terugdraaien naar Snapshot"
 
diff --git a/plinth/locale/pl/LC_MESSAGES/django.po b/plinth/locale/pl/LC_MESSAGES/django.po
index 7b7e4f192..6a1eec2f5 100644
--- a/plinth/locale/pl/LC_MESSAGES/django.po
+++ b/plinth/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2017-10-07 23:21+0000\n"
 "Last-Translator: Karol Werner <karol@ppkt.eu>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/freedombox/plinth/"
@@ -20,32 +20,32 @@ msgstr ""
 "|| n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 2.17-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "Nasłuchuję na {kind} port {listen_address}:{port}"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "Nasłuchuję na {kind} port {port}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "Adres URL {url} na {kind}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "Adres URL {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "Podłączony do {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "Nie mogę się podłączyć do {host}:{port}"
@@ -190,15 +190,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Konfiguruj"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "Nazwa domeny"
@@ -257,34 +257,34 @@ msgstr "Język tego interfejsu administratora"
 msgid "Submit"
 msgstr "Wyślij"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "Ustawienia główne"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Błąd podczas ustawiania nazwy hosta: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "Nazwa hosta ustawiona"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Błąd ustawiania nazwy domeny {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "Nazwa domeny ustawiona"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "Błąd podczas ustawiania języka {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "Język zmieniony"
 
@@ -1464,7 +1464,7 @@ msgstr ""
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "Usuń"
 
@@ -2456,7 +2456,7 @@ msgid "Interface"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3471,11 +3471,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3489,48 +3488,84 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+msgid "Hourly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Daily Snapshots Limit"
+msgstr "Usuń %(name)s"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Weekly Snapshots Limit"
+msgstr "Usuń %(name)s"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Yearly Snapshots Limit"
+msgstr "Usuń %(name)s"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete All"
 msgstr "Usuń"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr ""
@@ -3548,8 +3583,8 @@ msgstr ""
 msgid "Delete the following snapshots permanently?"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Delete Snapshots"
@@ -3575,40 +3610,40 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
+#: plinth/modules/snapshot/views.py:96
 #, fuzzy
 #| msgid "Access rights configuration updated"
-msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "Zaktualizowano ustawienia praw dostępu"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/pt/LC_MESSAGES/django.po b/plinth/locale/pt/LC_MESSAGES/django.po
index 7c10a553e..0cdd5aa12 100644
--- a/plinth/locale/pt/LC_MESSAGES/django.po
+++ b/plinth/locale/pt/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2017-09-26 14:56+0000\n"
 "Last-Translator: anonymous <>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/freedombox/"
@@ -19,32 +19,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.17-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr ""
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr ""
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr ""
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "Ligar a {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "Não é possível ligar a {host}:{port}"
@@ -190,15 +190,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Configurar"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "Nome de Domínio"
@@ -277,34 +277,34 @@ msgstr "Língua para o interface de administração web desta FreedomBox"
 msgid "Submit"
 msgstr "Submeter"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "Configuração Geral"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Erro ao definir o nome do domínio: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "Nome do domínio definido"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "Erro ao definir a língua: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "Língua mudada"
 
@@ -1382,7 +1382,7 @@ msgstr ""
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr ""
 
@@ -2356,7 +2356,7 @@ msgid "Interface"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3361,11 +3361,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3379,46 +3378,76 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+msgid "Hourly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:36
+msgid "Daily Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:40
+msgid "Weekly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+msgid "Yearly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr ""
@@ -3436,8 +3465,8 @@ msgstr ""
 msgid "Delete the following snapshots permanently?"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr ""
 
@@ -3461,40 +3490,40 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
+#: plinth/modules/snapshot/views.py:96
 #, fuzzy
 #| msgid "Configuration updated"
-msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "Configuração atualizada"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/ru/LC_MESSAGES/django.po b/plinth/locale/ru/LC_MESSAGES/django.po
index 4dce84b1d..07721a720 100644
--- a/plinth/locale/ru/LC_MESSAGES/django.po
+++ b/plinth/locale/ru/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2018-01-22 05:29+0000\n"
 "Last-Translator: Igor <f2404@yandex.ru>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/freedombox/"
@@ -20,32 +20,32 @@ msgstr ""
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 2.19-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "Слушать на {kind} порт {listen_address}:{port}"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "Слушать порт {port} на {kind}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "Доступ к URL {url} по tcp {kind}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "Доступ к URL {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "Подключение к {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "Невозможно подключиться к {host}:{port}"
@@ -191,15 +191,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr "В настоящее время доступен только ограниченный функционал."
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Настроить"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "Доменное имя"
@@ -259,34 +259,34 @@ msgstr "Язык для этого веб-интерфейса админист
 msgid "Submit"
 msgstr "Отправить"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "Общие настройки"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Ошибка параметра hostname: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "Смена имени хоста"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Ошибка параметра имени домена: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "Смена доменного имени"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "Ошибка настройки языка: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "Язык изменен"
 
@@ -1510,7 +1510,7 @@ msgstr "Получить повторно"
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "Удалить"
 
@@ -2594,7 +2594,7 @@ msgid "Interface"
 msgstr "Интерфейс"
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3749,12 +3749,19 @@ msgstr ""
 "в случае неприемлемых изменений в системе."
 
 #: plinth/modules/snapshot/__init__.py:38
+#, fuzzy
+#| msgid ""
+#| "Automatic snapshots are taken every hour, day, month and year. Older "
+#| "snapshots are automatically deleted keeping 10 of each kind and 50 in "
+#| "total. Although snapshots are efficient and only store the differences, "
+#| "they may be deleted to reclaim free space.  Individual files from older "
+#| "snapshots can be accessed by visiting \".snapshots\" directory in the "
+#| "filesystem. Snapshots are not a replacement for backups."
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 "Автоматические снимки системы моту выполнятся раз в час, день, месяц и год. "
@@ -3776,50 +3783,88 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+#, fuzzy
+#| msgid "Storage Snapshots"
+msgid "Hourly Snapshots Limit"
+msgstr "Хранилище снимков"
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Daily Snapshots Limit"
+msgstr "Удалить снимок"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Weekly Snapshots Limit"
+msgstr "Удалить снимок"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Yearly Snapshots Limit"
+msgstr "Удалить снимок"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr "Создать снимок"
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Delete all the snapshots"
 msgstr "Удалить снимок"
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete All"
 msgstr "Удалить"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr "Номер"
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr "Дата"
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr "Откат"
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr "активен"
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr "Откат к снимку #%(number)s"
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr "Удалить снимок #%(number)s"
@@ -3839,8 +3884,8 @@ msgstr "Удалить снимок %(number)s"
 msgid "Delete the following snapshots permanently?"
 msgstr "Окончательно удалить этот снимок?"
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Delete Snapshots"
@@ -3868,42 +3913,42 @@ msgstr "Откат к снимку %(number)s"
 msgid "Created snapshot."
 msgstr "Создан снимок."
 
-#: plinth/modules/snapshot/views.py:75
+#: plinth/modules/snapshot/views.py:96
 #, fuzzy
 #| msgid "Access rights configuration updated"
-msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "Конфигурация прав доступа обновлена"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr "Ошибка действий: {0}[{1}][{2}]"
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr "Удаленный снимок {number}."
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr "Удалить снимок"
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Deleted all snapshots."
 msgstr "Удалить снимок"
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr "Откат к снимку #{number}."
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr "Необходимо перезагрузить систему для завершения отката."
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr "Откат к снимку"
 
diff --git a/plinth/locale/sv/LC_MESSAGES/django.po b/plinth/locale/sv/LC_MESSAGES/django.po
index 389cdaa25..0f5d42509 100644
--- a/plinth/locale/sv/LC_MESSAGES/django.po
+++ b/plinth/locale/sv/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2016-07-23 19:30+0000\n"
 "Last-Translator: Caly <caly@aktivix.org>\n"
 "Language-Team: Swedish <https://hosted.weblate.org/projects/freedombox/"
@@ -19,32 +19,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.8-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "Lyssnar på {kind} port {listen_address}:{port}"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "Lyssnar på {kind} port {port}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "Ansluter till adress {url} on tcp{kind}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "Ansluter till adress {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "Anslut till {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "Kan inte ansluta till {host}:{port}"
@@ -198,15 +198,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Konfigurera"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "Domännamn"
@@ -266,34 +266,34 @@ msgstr "Språkval för detta administrations-webbgränssnitt"
 msgid "Submit"
 msgstr "Sänd"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "Allmän Konfiguration"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Fel inställning av värdnamn: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "Värdnamn inställt"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Fel inställning av domännamn: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "Domännamn inställt"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "Fel i språkinställning: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "Språkval ändrat"
 
@@ -1590,7 +1590,7 @@ msgstr "Återfå"
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -2668,7 +2668,7 @@ msgid "Interface"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3681,11 +3681,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3701,52 +3700,90 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Hourly Snapshots Limit"
+msgstr "Ta bort %(name)s"
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Daily Snapshots Limit"
+msgstr "Ta bort %(name)s"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Weekly Snapshots Limit"
+msgstr "Ta bort %(name)s"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete %(name)s"
+msgid "Yearly Snapshots Limit"
+msgstr "Ta bort %(name)s"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Delete all the snapshots"
 msgstr "Ta bort %(name)s"
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete All"
 msgstr "Ta bort"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 #, fuzzy
 #| msgid "Deactivate"
 msgid "active"
 msgstr "Avaktivera"
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, fuzzy, python-format
 #| msgid "Delete %(name)s"
 msgid "Delete snapshot #%(number)s"
@@ -3766,8 +3803,8 @@ msgstr "Ta bort %(name)s"
 msgid "Delete the following snapshots permanently?"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Delete Snapshots"
@@ -3793,44 +3830,44 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
+#: plinth/modules/snapshot/views.py:96
 #, fuzzy
 #| msgid "Configuration updated"
-msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "Konfiguration uppdaterad"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Delete Snapshot"
 msgstr "Ta bort %(name)s"
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 #, fuzzy
 #| msgid "Delete %(name)s"
 msgid "Deleted all snapshots."
 msgstr "Ta bort %(name)s"
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/ta/LC_MESSAGES/django.po b/plinth/locale/ta/LC_MESSAGES/django.po
index 0873d9440..8dfe8ef02 100644
--- a/plinth/locale/ta/LC_MESSAGES/django.po
+++ b/plinth/locale/ta/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,32 +18,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr ""
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr ""
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr ""
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr ""
@@ -171,15 +171,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr ""
@@ -230,34 +230,34 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr ""
 
@@ -1313,7 +1313,7 @@ msgstr ""
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr ""
 
@@ -2263,7 +2263,7 @@ msgid "Interface"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3261,11 +3261,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3279,46 +3278,76 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+msgid "Hourly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:36
+msgid "Daily Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:40
+msgid "Weekly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+msgid "Yearly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr ""
@@ -3336,8 +3365,8 @@ msgstr ""
 msgid "Delete the following snapshots permanently?"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr ""
 
@@ -3361,38 +3390,38 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
-msgid "Timeline Snapshots configuration updated"
+#: plinth/modules/snapshot/views.py:96
+msgid "Storage snapshots configuration updated"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/te/LC_MESSAGES/django.po b/plinth/locale/te/LC_MESSAGES/django.po
index a5fb6753d..150cebe20 100644
--- a/plinth/locale/te/LC_MESSAGES/django.po
+++ b/plinth/locale/te/LC_MESSAGES/django.po
@@ -9,11 +9,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FreedomBox UI\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2018-02-05 09:39+0000\n"
 "Last-Translator: Sunil Mohan Adapa <sunil@medhas.org>\n"
-"Language-Team: Telugu "
-"<https://hosted.weblate.org/projects/freedombox/plinth/te/>\n"
+"Language-Team: Telugu <https://hosted.weblate.org/projects/freedombox/plinth/"
+"te/>\n"
 "Language: te\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,32 +21,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 2.19-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "పోర్ట్{listen_address}:{port} పై వింటూ {kind}"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "పోర్ట్ {port} పై ఆలకించమండి {kind}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "tcp పై  {kind}  URL {url} యాక్సెస్ చేయండి"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "URL {url} ప్రవేశము"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "అనుసంధానించండి {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "అనుసంధానించండం సాధ్యంకాదు {host}:{port}"
@@ -117,9 +117,8 @@ msgid ""
 "BIND enables you to publish your Domain Name System (DNS) information on the "
 "Internet, and to resolve DNS queries for your user devices on your network."
 msgstr ""
-"BIND ఇంటర్నెట్ లో మీ డొమైన్ నేమ్ సిస్టం (DNS) సమాచారాన్ని ప్రచురించడానికి, "
-"మరియు మీ నెట్వర్క్ లోని వినియోగదారుల DNS విచారణలను  పరిష్కరించడానికి  "
-"అనుమతిస్తుంది."
+"BIND ఇంటర్నెట్ లో మీ డొమైన్ నేమ్ సిస్టం (DNS) సమాచారాన్ని ప్రచురించడానికి, మరియు మీ నెట్వర్క్ లోని "
+"వినియోగదారుల DNS విచారణలను  పరిష్కరించడానికి  అనుమతిస్తుంది."
 
 #: plinth/modules/bind/__init__.py:49
 #, python-brace-format
@@ -136,9 +135,7 @@ msgstr "బట్వాడ"
 #: plinth/modules/bind/forms.py:38
 msgid ""
 "A list DNS servers, separated by space, to which requests will be forwarded"
-msgstr ""
-"ఒక DNS సర్వర్ల జాబితా, స్పేస్ ద్వారా వేరు చేయబడుతుంది, దీనిలో అభ్యర్థనలు "
-"ఫార్వార్డ్ చేయబడతాయి"
+msgstr "ఒక DNS సర్వర్ల జాబితా, స్పేస్ ద్వారా వేరు చేయబడుతుంది, దీనిలో అభ్యర్థనలు ఫార్వార్డ్ చేయబడతాయి"
 
 #: plinth/modules/bind/forms.py:42
 msgid "Enable DNSSEC"
@@ -170,10 +167,9 @@ msgid ""
 "advanced functions that are not usually required. A web based terminal for "
 "console operations is also available."
 msgstr ""
-"కాక్పిట్ ఒక సర్వర్ మేనేజర్, ఇది ఒక వెబ్ బ్రౌజర్ ద్వారా GNU / Linux సర్వర్లు "
-"నిర్వహించడం సులభతరం చేస్తుంది. ఈ {box_name},లొ సాధారణంగా అవసరం లేని అనేక "
-"ఆధునిక ఫంక్షన్లకు నియంత్రణలు అందుబాటులో ఉన్నాయి.కన్సోల్ ఆపరేషన్లకు వెబ్ ఆధారి"
-"త టెర్మినల్ కూడా అందుబాటులో ఉంది."
+"కాక్పిట్ ఒక సర్వర్ మేనేజర్, ఇది ఒక వెబ్ బ్రౌజర్ ద్వారా GNU / Linux సర్వర్లు నిర్వహించడం సులభతరం "
+"చేస్తుంది. ఈ {box_name},లొ సాధారణంగా అవసరం లేని అనేక ఆధునిక ఫంక్షన్లకు నియంత్రణలు అందుబాటులో "
+"ఉన్నాయి.కన్సోల్ ఆపరేషన్లకు వెబ్ ఆధారిత టెర్మినల్ కూడా అందుబాటులో ఉంది."
 
 #: plinth/modules/cockpit/__init__.py:51
 #, python-brace-format
@@ -184,25 +180,24 @@ msgid ""
 "information and system altering abilities are limited to users belonging to "
 "admin group."
 msgstr ""
-"ప్రారంభించినప్పుడు, వెబ్ సర్వర్లో <a href=\"/_cockpit/\">/ _cockpit /</a> "
-"మార్గం నుండి కాక్పిట్ అందుబాటులో ఉంటుంది. దీన్ని <a href=\"/plinth/sys/"
-"users\"> మంది వినియోగదారులచే</a> ద్వారా పొందవచ్చు {box_name}.\n"
-"అంగీకార సమాచారం మరియు సిస్టమ్ మార్చడం సామర్ధ్యాలు నిర్వాహక సమూహం చెందిన "
-"వినియోగదారులకు పరిమితం."
+"ప్రారంభించినప్పుడు, వెబ్ సర్వర్లో <a href=\"/_cockpit/\">/ _cockpit /</a> మార్గం నుండి "
+"కాక్పిట్ అందుబాటులో ఉంటుంది. దీన్ని <a href=\"/plinth/sys/users\"> మంది వినియోగదారులచే</a> "
+"ద్వారా పొందవచ్చు {box_name}.\n"
+"అంగీకార సమాచారం మరియు సిస్టమ్ మార్చడం సామర్ధ్యాలు నిర్వాహక సమూహం చెందిన వినియోగదారులకు పరిమితం."
 
 #: plinth/modules/cockpit/__init__.py:57
 msgid "Currently only limited functionality is available."
 msgstr "ప్రస్తుతం పరిమిత కార్యాచరణ మాత్రమే అందుబాటులో ఉంది."
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "ఆకృతీకరణ"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "డొమైను పేరు"
@@ -261,34 +256,34 @@ msgstr "జాల నిర్వాహక అంతరవర్తి కోస
 msgid "Submit"
 msgstr "సమర్పించు"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "సాధారణ ఆకృతీకరణ"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "ఆతిథ్యనామం అమర్చుటలో లోపం: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "ఆతిథ్యనామం అమర్చు"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "అధికారక్షేత్రం పేరు అమర్పులోపం: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "అధికారక్షేత్రం పేరు అమర్పు"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "భాషను అమర్చుటలో లోపం: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "భాష మార్చబడింది"
 
@@ -450,8 +445,7 @@ msgid ""
 "It is an unofficial webview based client for the community-run, distributed "
 "social network diaspora*"
 msgstr ""
-"ఇది ఒక అనధికారిక వెబ్ విఎవ్ ఆధారిత క్లయింట్ కమ్యూనిటీ పరుగుల,పంపిణీ చేయబడిన "
-"సామాజిక ప్రవాస జీవ కణజాల వల"
+"ఇది ఒక అనధికారిక వెబ్ విఎవ్ ఆధారిత క్లయింట్ కమ్యూనిటీ పరుగుల,పంపిణీ చేయబడిన సామాజిక ప్రవాస జీవ కణజాల వల"
 
 #: plinth/modules/diaspora/templates/diaspora-post-setup.html:32
 #, python-format
@@ -462,12 +456,10 @@ msgid ""
 "podname wouldn't be accessible. <br/> You can access the diaspora* pod at <a "
 "href=\"https://diaspora.%(domain_name)s\"> diaspora.%(domain_name)s </a>"
 msgstr ""
-"డైస్పోరా * పాడ్ డొమైన్ <b>%(domain_name)s</b> గా అమర్చబడింది.వినియోగదారుడి "
-"ID లు <i>username @ diaspora.%(domain_name)s</i><br/> వంటివి కనిపిస్తుంది. "
-"ఫ్రీడమ్బాక్స్ డొమైన్ పేరు మార్చబడితే, మునుపటి podname తో నమోదైన వినియోగదారుల "
-"యొక్క మొత్తం డేటా అందుబాటులో<br/> మీరు <a href=\""
-"https://diaspora.%(domain_name)s\"> డయాస్పోరా.%(domain_name)s</a> లు  లో "
-"డయాస్పోరా *"
+"డైస్పోరా * పాడ్ డొమైన్ <b>%(domain_name)s</b> గా అమర్చబడింది.వినియోగదారుడి ID లు <i>username @ "
+"diaspora.%(domain_name)s</i><br/> వంటివి కనిపిస్తుంది. ఫ్రీడమ్బాక్స్ డొమైన్ పేరు మార్చబడితే, "
+"మునుపటి podname తో నమోదైన వినియోగదారుల యొక్క మొత్తం డేటా అందుబాటులో<br/> మీరు <a href="
+"\"https://diaspora.%(domain_name)s\"> డయాస్పోరా.%(domain_name)s</a> లు  లో డయాస్పోరా *"
 
 #: plinth/modules/diaspora/templates/diaspora-pre-setup.html:58
 #: plinth/modules/dynamicdns/templates/dynamicdns_configure.html:40
@@ -793,10 +785,9 @@ msgid ""
 "history of a multi-user chat room. It depends on the client settings whether "
 "the histories are stored as plain text or encrypted."
 msgstr ""
-"ప్రారంభించబడితే, మీ {box_name} చాట్ సందేశ చరిత్రలను నిల్వ చేస్తుంది. ఇది బహు"
-"ళ క్లయింట్ల మధ్య సంభాషణల సమకాలీకరణను అనుమతిస్తుంది మరియు బహుళ వినియోగదారు "
-"చాట్ రూమ్ చరిత్రను చదవగలదు. చరిత్రలు సాదా టెక్స్ట్ లేదా గుప్తీకరించబడినాయినా "
-"లేదో క్లయింట్ సెట్టింగ్లపై ఆధారపడి ఉంటుంది."
+"ప్రారంభించబడితే, మీ {box_name} చాట్ సందేశ చరిత్రలను నిల్వ చేస్తుంది. ఇది బహుళ క్లయింట్ల మధ్య "
+"సంభాషణల సమకాలీకరణను అనుమతిస్తుంది మరియు బహుళ వినియోగదారు చాట్ రూమ్ చరిత్రను చదవగలదు. చరిత్రలు "
+"సాదా టెక్స్ట్ లేదా గుప్తీకరించబడినాయినా లేదో క్లయింట్ సెట్టింగ్లపై ఆధారపడి ఉంటుంది."
 
 #: plinth/modules/ejabberd/manifest.py:25
 msgid "yaxim"
@@ -821,10 +812,9 @@ msgid ""
 "new accounts on public XMPP servers (including via Tor), or even connect to "
 "your own server for extra security."
 msgstr ""
-"సురక్షిత కబుర్లు  అనేది ఉచిత మరియు ఓపెన్ సోర్స్ సందేశ అనువర్తనం XMPP పై OTR "
-"గుప్తీకరణను కలిగి ఉంది. మీరు ఇప్పటికే ఉన్న గూగుల్ ఖాతాకు కనెక్ట్ చేయవచ్చు, "
-"పబ్లిక్ XMPP సర్వర్లలో (టోర్ ద్వారా సహా) కొత్త ఖాతాలను సృష్టించవచ్చు లేదా "
-"అదనపు భద్రత కోసం మీ స్వంత సర్వర్కు కనెక్ట్ చేయవచ్చు."
+"సురక్షిత కబుర్లు  అనేది ఉచిత మరియు ఓపెన్ సోర్స్ సందేశ అనువర్తనం XMPP పై OTR గుప్తీకరణను కలిగి "
+"ఉంది. మీరు ఇప్పటికే ఉన్న గూగుల్ ఖాతాకు కనెక్ట్ చేయవచ్చు, పబ్లిక్ XMPP సర్వర్లలో (టోర్ ద్వారా సహా) కొత్త "
+"ఖాతాలను సృష్టించవచ్చు లేదా అదనపు భద్రత కోసం మీ స్వంత సర్వర్కు కనెక్ట్ చేయవచ్చు."
 
 #: plinth/modules/ejabberd/manifest.py:64
 msgid "Conversations"
@@ -848,8 +838,7 @@ msgstr ""
 "మీ XMPP సర్వర్ డొమైన్ సెట్ చేయబడింది \n"
 "<b>%(domainname)s</b>.వినియోగదారు ఐడిలు <i>username@%(domainname)s</i> లాగా "
 "కనిపిస్తాయి \n"
-"మీరు మీ డొమైన్ను <a href=\"%(index_url)s\">kaanfigar</a> పేజీలో సెటప్ "
-"చేయవచ్చు."
+"మీరు మీ డొమైన్ను <a href=\"%(index_url)s\">kaanfigar</a> పేజీలో సెటప్ చేయవచ్చు."
 
 #: plinth/modules/ejabberd/templates/ejabberd.html:47
 #: plinth/modules/jsxc/templates/jsxc.html:32
@@ -910,10 +899,10 @@ msgid ""
 "you may run it using the command 'service firewalld start' or in case of a "
 "system with systemd 'systemctl start firewalld'."
 msgstr ""
-"ఫైర్వాల్ డెమోన్ నడుస్తుందో లేదు. దీన్ని అమలు దయచేసి. ఫైర్వాల్ ఎనేబుల్ "
-"వస్తుంది %(box_name)s . ఏ డెబియన్ ఆధారిత కంప్యూటరులో (అటువంటి %(box_name)s) "
-"మీరు కమాండ్ 'సేవ ప్రారంభించడానికి firewalld లేదా systemd systemctl ఒక వ్యవస్"
-"థ యొక్క సందర్భంలో ఉపయోగించి దీన్ని అమలు ఉండవచ్చు firewalld మొదలు."
+"ఫైర్వాల్ డెమోన్ నడుస్తుందో లేదు. దీన్ని అమలు దయచేసి. ఫైర్వాల్ ఎనేబుల్ వస్తుంది %(box_name)s . ఏ "
+"డెబియన్ ఆధారిత కంప్యూటరులో (అటువంటి %(box_name)s) మీరు కమాండ్ 'సేవ ప్రారంభించడానికి firewalld "
+"లేదా systemd systemctl ఒక వ్యవస్థ యొక్క సందర్భంలో ఉపయోగించి దీన్ని అమలు ఉండవచ్చు firewalld "
+"మొదలు."
 
 #: plinth/modules/firewall/templates/firewall.html:45
 msgid "Show Ports"
@@ -980,8 +969,7 @@ msgid ""
 "You may want to check the <a href=\"%(networks_url)s\">network setup</a> and "
 "modify it if necessary."
 msgstr ""
-"మీరు <a href=\"%(networks_url)s\">నెట్వర్క్ సెటప్</a> తనిఖీ చేసి, అవసరమైతే "
-"దాన్ని సవరించవచ్చు."
+"మీరు <a href=\"%(networks_url)s\">నెట్వర్క్ సెటప్</a> తనిఖీ చేసి, అవసరమైతే దాన్ని సవరించవచ్చు."
 
 #: plinth/modules/first_boot/templates/firstboot_navbar.html:23
 #: plinth/modules/help/templates/help_index.html:33
@@ -1218,10 +1206,9 @@ msgid ""
 "Configuration</a> you can change these permissions or add new users."
 msgstr ""
 "<b>admin</b> సమూహంలో కేవలం {box_name} వినియోగదారులు బ్లాగులను మరియు వికీలను "
-"<i>సృష్టించవచ్చు</i> మరియు <i>నిర్వహించవచ్చు</i> , కానీ <b>wiki</b> సమూహంలోని"
-" ఏ యూజర్ అయినా ఇప్పటికే ఉన్న వాటిని <i>సవరించగలరు</i>. <a href=\"/plinth/sys/"
-"users\">వినియోగదారు ఆకృతీకరణ</a> లో మీరు అనుమతులను మార్చవచ్చు లేదా క్రొత్త "
-"వినియోగదారులను  చేర్చవచ్చు."
+"<i>సృష్టించవచ్చు</i> మరియు <i>నిర్వహించవచ్చు</i> , కానీ <b>wiki</b> సమూహంలోని ఏ యూజర్ అయినా "
+"ఇప్పటికే ఉన్న వాటిని <i>సవరించగలరు</i>. <a href=\"/plinth/sys/users\">వినియోగదారు "
+"ఆకృతీకరణ</a> లో మీరు అనుమతులను మార్చవచ్చు లేదా క్రొత్త వినియోగదారులను  చేర్చవచ్చు."
 
 #: plinth/modules/ikiwiki/__init__.py:65
 #, fuzzy
@@ -1366,10 +1353,9 @@ msgid ""
 "client and install it. Then start Gobby and select \"Connect to Server\" and "
 "enter your {box_name}'s domain name."
 msgstr ""
-"దీనిని ఉపయోగించడానికి,<a href=\"https://gobby.github.io/\">డౌన్లోడ్ "
-"గాబ్బీ</a>,డెస్క్టాప్ క్లయింట్ మరియు నిక్షిప్తం చెయుము. మొడటిగ గాబ్బి మరియు "
-"సెలెక్ట్ \"సర్వర్కు కనెక్ట్ చేయండి\" మరియు మీ ఎంటర్ చెయ్యండి {box_name}'s "
-"డొమైన్ పేరు."
+"దీనిని ఉపయోగించడానికి,<a href=\"https://gobby.github.io/\">డౌన్లోడ్ గాబ్బీ</a>,డెస్క్టాప్ క్లయింట్ "
+"మరియు నిక్షిప్తం చెయుము. మొడటిగ గాబ్బి మరియు సెలెక్ట్ \"సర్వర్కు కనెక్ట్ చేయండి\" మరియు మీ ఎంటర్ చెయ్యండి "
+"{box_name}'s డొమైన్ పేరు."
 
 #: plinth/modules/infinoted/manifest.py:26
 msgid "Gobby"
@@ -1387,8 +1373,8 @@ msgid ""
 "Start Gobby and select \"Connect to Server\" and enter your {box_name}'s "
 "domain name."
 msgstr ""
-"గాబ్బీని ప్రారంభించి. \"సేవికకు కనెక్ట్ చేయండి\" ఎంచుకోండి మరియు మీ "
-"{box_name} యొక్క డొమైన్ పేరును నమోదు చేయండి."
+"గాబ్బీని ప్రారంభించి. \"సేవికకు కనెక్ట్ చేయండి\" ఎంచుకోండి మరియు మీ {box_name} యొక్క డొమైన్ పేరును "
+"నమోదు చేయండి."
 
 #: plinth/modules/jsxc/__init__.py:37 plinth/modules/jsxc/manifest.py:24
 msgid "JSXC"
@@ -1513,7 +1499,7 @@ msgstr "తిరిగి-పొందు"
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "తొలగించు"
 
@@ -1539,10 +1525,9 @@ msgid ""
 "that certificate, so most users would not prompted with security warnings "
 "when using them."
 msgstr ""
-"మీరు మీ ప్రస్తుత డొమైన్ కోసం లెట్స్ ఎన్క్రిప్ట్ సర్టిఫికేట్ను కలిగి ఉంటే, "
-"మీరు %(box_name)s దాని పునరుద్ధరణ ప్రక్రియను నిర్వహించవచ్చు. ఇది ఇతర "
-"సర్టిఫికేట్లను కూడ ఉపయోగించుకుంటుంది, అందువల్ల చాలా మంది వినియోగదారులు వాటిని"
-" ఉపయోగించినప్పుడు భద్రతా హెచ్చరికలతో ప్రోత్సహిస్తారు."
+"మీరు మీ ప్రస్తుత డొమైన్ కోసం లెట్స్ ఎన్క్రిప్ట్ సర్టిఫికేట్ను కలిగి ఉంటే, మీరు %(box_name)s దాని "
+"పునరుద్ధరణ ప్రక్రియను నిర్వహించవచ్చు. ఇది ఇతర సర్టిఫికేట్లను కూడ ఉపయోగించుకుంటుంది, అందువల్ల "
+"చాలా మంది వినియోగదారులు వాటిని ఉపయోగించినప్పుడు భద్రతా హెచ్చరికలతో ప్రోత్సహిస్తారు."
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:167
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:174
@@ -1562,8 +1547,7 @@ msgid ""
 "              "
 msgstr ""
 "\n"
-"                %(box_name)s  ధృవీకరణ పత్రం యొక్క పునరుద్ధరణూ  "
-"నిర్వహించడానికి\n"
+"                %(box_name)s  ధృవీకరణ పత్రం యొక్క పునరుద్ధరణూ  నిర్వహించడానికి\n"
 "<b>%(current_domain)s</b>\n"
 "              "
 
@@ -1573,16 +1557,16 @@ msgid ""
 "If enabled, %(box_name)s can make sure that all apps can use the certificate "
 "as soon as it is renewed."
 msgstr ""
-"సశక్త పరువు చేస్తే, %(box_name)s అన్ని అనువర్తనాలు పునరుద్ధరించబడిన వెంటనే "
-"సర్టిఫికేట్ను ఉపయోగించగలరని నిర్ధారించుకోవచ్చు."
+"సశక్త పరువు చేస్తే, %(box_name)s అన్ని అనువర్తనాలు పునరుద్ధరించబడిన వెంటనే సర్టిఫికేట్ను "
+"ఉపయోగించగలరని నిర్ధారించుకోవచ్చు."
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:192
 msgid ""
 "<b>No certificate available for the current domain.</b> First obtain a "
 "certificate to enable its management."
 msgstr ""
-"<b>ప్రస్తుత అధికారక్షేత్రం కోసం ధృవీకరణ పత్రం అందుబాటులో లేదు.</b>మొదట దాని "
-"నిర్వహణను ప్రారంభించడానికి ధృవీకరణ పత్రం పొందాలి."
+"<b>ప్రస్తుత అధికారక్షేత్రం కోసం ధృవీకరణ పత్రం అందుబాటులో లేదు.</b>మొదట దాని నిర్వహణను "
+"ప్రారంభించడానికి ధృవీకరణ పత్రం పొందాలి."
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:226
 #, python-format
@@ -1592,8 +1576,8 @@ msgid ""
 "                "
 msgstr ""
 "\n"
-"                  యొక్క ధృవీకరణ పత్రం ఉపయోగించండి %(current_domain)s "
-"కోసం<b>ఈజాబ్బర్డి</b>\n"
+"                  యొక్క ధృవీకరణ పత్రం ఉపయోగించండి %(current_domain)s కోసం<b>ఈజాబ్బర్డి</"
+"b>\n"
 "                "
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:230
@@ -1603,8 +1587,7 @@ msgid ""
 "                "
 msgstr ""
 "\n"
-"                  ప్రస్తుత డొమైన్ యొక్క ధృవీకరణ పత్రం  "
-"ఉపయోగించండి<b>ఈజాబ్బర్డి</b>\n"
+"                  ప్రస్తుత డొమైన్ యొక్క ధృవీకరణ పత్రం  ఉపయోగించండి<b>ఈజాబ్బర్డి</b>\n"
 "                "
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:240
@@ -1615,11 +1598,10 @@ msgid ""
 "certificates in client applications, and enable more wide-spread federation "
 "with other XMPP servers in the Internet."
 msgstr ""
-"ప్రారంభించబడితే, అనువర్తనం <a href=\"%(ejabberd_url)s\"> 1ejabberd </a> 2 "
-"లెట్స్ ఎన్క్రిప్ట్ ధృవీకరణ పత్రం కూడా ఉపయోగిస్తుంది. ఇది క్లయింట్ "
-"అనువర్తనాలలో స్వీయ-సంతకం ధృవీకరణ పత్రం గురించి హెచ్చరికలను తగ్గిస్తుంది మరియు"
-" అంతర్జాలంతో ఇతర XMPP సేవిక మరింత విస్తృత-విస్తరణ సమాఖ్యను ప్రారంబం "
-"చేస్తుంది."
+"ప్రారంభించబడితే, అనువర్తనం <a href=\"%(ejabberd_url)s\"> 1ejabberd </a> 2 లెట్స్ "
+"ఎన్క్రిప్ట్ ధృవీకరణ పత్రం కూడా ఉపయోగిస్తుంది. ఇది క్లయింట్ అనువర్తనాలలో స్వీయ-సంతకం ధృవీకరణ పత్రం "
+"గురించి హెచ్చరికలను తగ్గిస్తుంది మరియు అంతర్జాలంతో ఇతర XMPP సేవిక మరింత విస్తృత-విస్తరణ సమాఖ్యను "
+"ప్రారంబం చేస్తుంది."
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:248
 #, python-format
@@ -1738,10 +1720,9 @@ msgid ""
 "\">available clients</a> for mobile, desktop and the web. <a href=\"https://"
 "riot.im/\">Riot</a> client is recommended."
 msgstr ""
-"కమ్యూనికేట్ చేయడానికి, మీరు మొబైల్, డెస్క్టాప్ మరియు వెబ్ కోసం <a href=\""
-"https://matrix.org/docs/projects/\"> అందుబాటులో ఉన్న ఖాతాదారులను</a> "
-"ఉపయోగించవచ్చు. ఇచట <a href=\"https://riot.im/\">రయట్</a> క్లయింట్ సిఫార్సు "
-"చేయబడింది."
+"కమ్యూనికేట్ చేయడానికి, మీరు మొబైల్, డెస్క్టాప్ మరియు వెబ్ కోసం <a href=\"https://matrix.org/docs/"
+"projects/\"> అందుబాటులో ఉన్న ఖాతాదారులను</a> ఉపయోగించవచ్చు. ఇచట <a href=\"https://"
+"riot.im/\">రయట్</a> క్లయింట్ సిఫార్సు చేయబడింది."
 
 #: plinth/modules/matrixsynapse/forms.py:29
 #, fuzzy
@@ -1766,10 +1747,9 @@ msgid ""
 "servers will be able to reach users on this server using this domain name. "
 "Matrix user IDs will look like <em>@username:domainname</em>."
 msgstr ""
-"ఒక డొమైన్ కోసం మ్యాట్రిక్స్ సేవ ఆక్రుతికరించబడాలి. ఇతర మ్యాట్రిక్స్ "
-"సర్వర్లలోని వినియోగదారులు ఈ డొమైన్ పేరును ఉపయోగించి ఈ సర్వర్లోని "
-"వినియోగదారులను చేరుకోగలరు. మ్యాట్రిక్స్ వినియోగదారుడి ఐడిలు "
-"<em>@username:domainname</em>ఇలా కనిపిస్తుంది."
+"ఒక డొమైన్ కోసం మ్యాట్రిక్స్ సేవ ఆక్రుతికరించబడాలి. ఇతర మ్యాట్రిక్స్ సర్వర్లలోని వినియోగదారులు ఈ డొమైన్ పేరును "
+"ఉపయోగించి ఈ సర్వర్లోని వినియోగదారులను చేరుకోగలరు. మ్యాట్రిక్స్ వినియోగదారుడి ఐడిలు <em>@username:"
+"domainname</em>ఇలా కనిపిస్తుంది."
 
 #: plinth/modules/matrixsynapse/templates/matrix-synapse-pre-setup.html:42
 msgid ""
@@ -1779,8 +1759,8 @@ msgid ""
 "    "
 msgstr ""
 "\n"
-"      <strong>హెచ్చరిక!</strong> ప్రారంభ సెట్టింగు తర్వాత డొమైన్ పేరు మార్చడం"
-" ప్రస్తుతం మద్దతు లేదు.\n"
+"      <strong>హెచ్చరిక!</strong> ప్రారంభ సెట్టింగు తర్వాత డొమైన్ పేరు మార్చడం ప్రస్తుతం మద్దతు "
+"లేదు.\n"
 "    "
 
 #: plinth/modules/matrixsynapse/templates/matrix-synapse-pre-setup.html:51
@@ -1789,8 +1769,8 @@ msgid ""
 "No domain(s) are available. <a href=\"%(config_url)s\">Configure</a> at "
 "least one domain to be able to use Matrix Synapse."
 msgstr ""
-"ఏ డొమైన్ (లు) అందుబాటులో లేవు. <a href=\"%(config_url)s\">ఆక్రుతీకరించండి "
-"</a>కనీసం ఒక డొమైన్ మ్యాట్రిక్స్ సినాప్సేను ఉపయోగించగలదు."
+"ఏ డొమైన్ (లు) అందుబాటులో లేవు. <a href=\"%(config_url)s\">ఆక్రుతీకరించండి </a>కనీసం ఒక "
+"డొమైన్ మ్యాట్రిక్స్ సినాప్సేను ఉపయోగించగలదు."
 
 #: plinth/modules/matrixsynapse/templates/matrix-synapse.html:29
 #, python-format
@@ -1799,9 +1779,9 @@ msgid ""
 "look like <em>@username:%(domain_name)s</em>. Changing the domain name after "
 "the initial setup is currently not supported."
 msgstr ""
-"మ్యాట్రిక్స్ సర్వర్ డొమైన్  <em>%(domain_name)s</em>కు సెట్ చేయబడింది. "
-"వినియోగదారు ఐడి <em>@వినియోగదారిడి పేరు:%(domain_name)s</em>ఇలా కనిపిస్తుంది"
-". ప్రారంభ సెట్టింగు తర్వాత డొమైన్ పేరు మార్చడం ప్రస్తుతం మద్దతు లేదు."
+"మ్యాట్రిక్స్ సర్వర్ డొమైన్  <em>%(domain_name)s</em>కు సెట్ చేయబడింది. వినియోగదారు ఐడి "
+"<em>@వినియోగదారిడి పేరు:%(domain_name)s</em>ఇలా కనిపిస్తుంది. ప్రారంభ సెట్టింగు తర్వాత డొమైన్ పేరు "
+"మార్చడం ప్రస్తుతం మద్దతు లేదు."
 
 #: plinth/modules/matrixsynapse/views.py:119
 #, fuzzy
@@ -1846,8 +1826,7 @@ msgid ""
 "Anyone with a link to this wiki can read it. Only users that are logged in "
 "can make changes to the content."
 msgstr ""
-"ఈ వికీకి లింక్తో ఎవరైనా దానిని చదవగలరు. లాగిన్ చేయబడిన వినియోగదారులు మాత్రమే "
-"కంటెంట్కు మార్పులు చేయవచ్చు."
+"ఈ వికీకి లింక్తో ఎవరైనా దానిని చదవగలరు. లాగిన్ చేయబడిన వినియోగదారులు మాత్రమే కంటెంట్కు మార్పులు చేయవచ్చు."
 
 #: plinth/modules/mediawiki/forms.py:29
 msgid "Administrator Password"
@@ -1858,8 +1837,8 @@ msgid ""
 "Set a new password for MediaWiki's administrator account (admin). Leave this "
 "field blank to keep the current password."
 msgstr ""
-"మీడియావికీ యొక్క అడ్మినిస్ట్రేటర్ ఖాతా కోసం ఒక కొత్త పాస్ వర్డ్ ను సెట్ "
-"చెయ్యండి (అడ్మిన్). ప్రస్తుత రహస్యపదం  ఉంచడానికి ఈ ఫీల్డ్ను ఖాళీగా వదిలేయండి."
+"మీడియావికీ యొక్క అడ్మినిస్ట్రేటర్ ఖాతా కోసం ఒక కొత్త పాస్ వర్డ్ ను సెట్ చెయ్యండి (అడ్మిన్). ప్రస్తుత రహస్యపదం  "
+"ఉంచడానికి ఈ ఫీల్డ్ను ఖాళీగా వదిలేయండి."
 
 #: plinth/modules/mediawiki/views.py:50
 #, fuzzy
@@ -2626,7 +2605,7 @@ msgid "Interface"
 msgstr "అంతర్ముఖం"
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3301,8 +3280,8 @@ msgid ""
 "Currently an installation or upgrade is running. Consider waiting until it's "
 "finished before shutting down or restarting."
 msgstr ""
-"ప్రస్తుతం సంస్థాపన లేదా నవీకరణ నడుస్తోంది. మూసివేయడానికి లేదా "
-"పునఃప్రారంభించడానికి ముందు ఇది పూర్తి అయ్యే వరకు వేచి ఉండండి."
+"ప్రస్తుతం సంస్థాపన లేదా నవీకరణ నడుస్తోంది. మూసివేయడానికి లేదా పునఃప్రారంభించడానికి ముందు ఇది పూర్తి "
+"అయ్యే వరకు వేచి ఉండండి."
 
 #: plinth/modules/power/templates/power.html:37
 msgid "Restart &raquo;"
@@ -3325,8 +3304,8 @@ msgid ""
 "Currently an installation or upgrade is running. Consider waiting until it's "
 "finished before restarting."
 msgstr ""
-"ప్రస్తుతం సంస్థాపన లేదా నవీకరణ నడుస్తోంది. మూసివేయడానికి లేదా "
-"పునఃప్రారంభించడానికి ముందు ఇది పూర్తి అయ్యే వరకు వేచి ఉండండి."
+"ప్రస్తుతం సంస్థాపన లేదా నవీకరణ నడుస్తోంది. మూసివేయడానికి లేదా పునఃప్రారంభించడానికి ముందు ఇది పూర్తి "
+"అయ్యే వరకు వేచి ఉండండి."
 
 #: plinth/modules/power/templates/power_restart.html:52
 #: plinth/modules/power/templates/power_restart.html:55
@@ -3345,8 +3324,8 @@ msgid ""
 "Currently an installation or upgrade is running. Consider waiting until it's "
 "finished before shutting down."
 msgstr ""
-"ప్రస్తుతం సంస్థాపన లేదా నవీకరణ నడుస్తోంది. మూసివేయడానికి లేదా "
-"పునఃప్రారంభించడానికి ముందు ఇది పూర్తి అయ్యే వరకు వేచి ఉండండి."
+"ప్రస్తుతం సంస్థాపన లేదా నవీకరణ నడుస్తోంది. మూసివేయడానికి లేదా పునఃప్రారంభించడానికి ముందు ఇది పూర్తి "
+"అయ్యే వరకు వేచి ఉండండి."
 
 #: plinth/modules/power/templates/power_shutdown.html:51
 #: plinth/modules/power/templates/power_shutdown.html:54
@@ -3368,10 +3347,9 @@ msgid ""
 "enhancing privacy, modifying web page data and HTTP headers, controlling "
 "access, and removing ads and other obnoxious Internet junk. "
 msgstr ""
-"ప్రైవక్సీ అనేది గోప్యతను మెరుగుపరచడానికి, వెబ్ పేజీ డేటాను సవరించడం మరియు "
-"HTTP శీర్షికలు, ప్రాప్యతను నియంత్రించడం మరియు ప్రకటనలను మరియు ఇతర చెడ్డ "
-"ఇంటర్నెట్ వ్యర్థాలను తొలగించడం కోసం ఆధునిక ఫిల్టరింగ్ సామర్థ్యాలతో ఒక కాని "
-"క్యాచింగ్ వెబ్ ప్రాక్సీ. "
+"ప్రైవక్సీ అనేది గోప్యతను మెరుగుపరచడానికి, వెబ్ పేజీ డేటాను సవరించడం మరియు HTTP శీర్షికలు, ప్రాప్యతను "
+"నియంత్రించడం మరియు ప్రకటనలను మరియు ఇతర చెడ్డ ఇంటర్నెట్ వ్యర్థాలను తొలగించడం కోసం ఆధునిక ఫిల్టరింగ్ "
+"సామర్థ్యాలతో ఒక కాని క్యాచింగ్ వెబ్ ప్రాక్సీ. "
 
 #: plinth/modules/privoxy/__init__.py:54
 #, python-brace-format
@@ -3382,11 +3360,10 @@ msgid ""
 "config.privoxy.org\">http://config.privoxy.org/</a> or <a href=\"http://p.p"
 "\">http://p.p</a>."
 msgstr ""
-"పోర్టు 8118 తో మీ {box_name} హోస్ట్ నేమ్ (లేదా IP చిరునామా) కు మీ బ్రౌజర్ "
-"ప్రాక్సీ అమర్పులను మార్చడం ద్వారా మీరు ప్రివక్సీని ఉపయోగించవచ్చు. ప్రివక్సీ "
-"ఉపయోగిస్తున్నప్పుడు, దాని ఆకృతీకరణ వివరాలు మరియు డాక్యుమెంటేషన్ <a href=\""
-"http://config.privoxy.org\"> http://config.privoxy.org/</a> లేదా <a href=\""
-"http://p.p\"> http://p.p</a> లో చూడవచ్చు."
+"పోర్టు 8118 తో మీ {box_name} హోస్ట్ నేమ్ (లేదా IP చిరునామా) కు మీ బ్రౌజర్ ప్రాక్సీ అమర్పులను మార్చడం "
+"ద్వారా మీరు ప్రివక్సీని ఉపయోగించవచ్చు. ప్రివక్సీ ఉపయోగిస్తున్నప్పుడు, దాని ఆకృతీకరణ వివరాలు మరియు "
+"డాక్యుమెంటేషన్ <a href=\"http://config.privoxy.org\"> http://config.privoxy.org/</"
+"a> లేదా <a href=\"http://p.p\"> http://p.p</a> లో చూడవచ్చు."
 
 #: plinth/modules/privoxy/__init__.py:147
 #, python-brace-format
@@ -3443,10 +3420,9 @@ msgid ""
 "radicale.org/clients/\">supported client application</a> is needed. Radicale "
 "can be accessed by any user with a {box_name} login."
 msgstr ""
-"రాడికల్ అనేది  CalDAV మరియు CardDAV సర్వర్.ఇది సిన్క్రోనైజేషన్ మరియు "
-"షెడ్యూలింగ్ మరియు సంప్రదింపు డేటా యొక్క భాగస్వామ్యాన్ని అనుమతిస్తుంది.రాడికల్"
-" ను వాడటానికి <a href=\"http://radicale.org/clients/\"> supported client "
-"application</a> అవసరం.\n"
+"రాడికల్ అనేది  CalDAV మరియు CardDAV సర్వర్.ఇది సిన్క్రోనైజేషన్ మరియు షెడ్యూలింగ్ మరియు సంప్రదింపు డేటా "
+"యొక్క భాగస్వామ్యాన్ని అనుమతిస్తుంది.రాడికల్ ను వాడటానికి <a href=\"http://radicale.org/clients/"
+"\"> supported client application</a> అవసరం.\n"
 "రాడికల్ ఏ యూజర్ అయినా  {box_name}లాగిన్ తో యాక్సెస్ చేయవచ్చు"
 
 #: plinth/modules/radicale/forms.py:28
@@ -3489,8 +3465,8 @@ msgid ""
 "Evolution is a personal information management application that provides "
 "integrated mail, calendaring and address book functionality."
 msgstr ""
-"ఎవల్యూషన్ అనేది ఒక వ్యక్తిగత సమాచార నిర్వహణ అనువర్తనం, ఇది ఇంటిగ్రేటెడ్ "
-"మెయిల్, క్యాలెండింగ్ మరియు బుక్ ఫంక్షనాలిటీని అందించేది."
+"ఎవల్యూషన్ అనేది ఒక వ్యక్తిగత సమాచార నిర్వహణ అనువర్తనం, ఇది ఇంటిగ్రేటెడ్ మెయిల్, క్యాలెండింగ్ మరియు బుక్ "
+"ఫంక్షనాలిటీని అందించేది."
 
 #: plinth/modules/radicale/manifest.py:52
 msgid ""
@@ -3532,10 +3508,10 @@ msgid ""
 "\"https://f-droid.org/repository/browse/?fdid=com.csipsimple\"> CSipSimple</"
 "a> (for Android phones)."
 msgstr ""
-"SIP కాల్స్ చేయడానికి, క్లయింట్ అప్లికేషన్ అవసరమవుతుంది. <a href=\""
-"https://jitsi.org/\">Jitsi</a>(కంప్యూటర్ కు) మరియు <a href=\""
-"https://f-droid.org/repository/browse/?fdid=com.csipsimple\""
-">CSipSimple</a>(ఆండ్రాయిడ్ ఫోన్లకు) అందుబాటులో ఖాతాదారులకు ఉన్నాయి."
+"SIP కాల్స్ చేయడానికి, క్లయింట్ అప్లికేషన్ అవసరమవుతుంది. <a href=\"https://jitsi.org/"
+"\">Jitsi</a>(కంప్యూటర్ కు) మరియు <a href=\"https://f-droid.org/repository/"
+"browse/?fdid=com.csipsimple\">CSipSimple</a>(ఆండ్రాయిడ్ ఫోన్లకు) అందుబాటులో ఖాతాదారులకు "
+"ఉన్నాయి."
 
 #: plinth/modules/repro/__init__.py:53
 msgid ""
@@ -3607,10 +3583,9 @@ msgid ""
 "from an email client, including MIME support, address book, folder "
 "manipulation, message searching and spell checking."
 msgstr ""
-"రౌండ్ క్యూబ్ వెబ్మెయిల్ అనేది బ్రౌజర్-ఆధారిత బహుభాషా IMAP క్లయింట్ తొ "
-"అనువర్తన-ఆధారిత యూజర్ ఇంటర్ఫేస్తో . ఇది MIME మద్దతు, చిరునామా పుస్తకం, "
-"ఫోల్డర్ తారుమారు, సందేశ శోధన మరియు అక్షరక్రమ తనిఖీ సహా ఒక ఇమెయిల్ క్లయింట్ "
-"నుండి మీరు పూర్తి కార్యాచరణను అందిస్తుంది."
+"రౌండ్ క్యూబ్ వెబ్మెయిల్ అనేది బ్రౌజర్-ఆధారిత బహుభాషా IMAP క్లయింట్ తొ అనువర్తన-ఆధారిత యూజర్ ఇంటర్ఫేస్తో . "
+"ఇది MIME మద్దతు, చిరునామా పుస్తకం, ఫోల్డర్ తారుమారు, సందేశ శోధన మరియు అక్షరక్రమ తనిఖీ సహా ఒక "
+"ఇమెయిల్ క్లయింట్ నుండి మీరు పూర్తి కార్యాచరణను అందిస్తుంది."
 
 #: plinth/modules/roundcube/__init__.py:47
 msgid ""
@@ -3655,9 +3630,8 @@ msgid ""
 "attempts to the SSH server and other enabled password protected internet-"
 "services."
 msgstr ""
-"ఈ ఎంపిక ఎనేబుల్ చేసినప్పుడు, ఫెయిల్2బ్యాన్ SSH సర్వర్కు మరియు ఇతర "
-"ప్రారంభించబడిన పాస్వర్డ్ను రక్షిత అంతర్జాల-సేవలకు బ్రూట్ ఫోర్స్ బ్రేక్-ఇన్ "
-"ప్రయత్నాలను పరిమితం చేస్తుంది."
+"ఈ ఎంపిక ఎనేబుల్ చేసినప్పుడు, ఫెయిల్2బ్యాన్ SSH సర్వర్కు మరియు ఇతర ప్రారంభించబడిన పాస్వర్డ్ను రక్షిత "
+"అంతర్జాల-సేవలకు బ్రూట్ ఫోర్స్ బ్రేక్-ఇన్ ప్రయత్నాలను పరిమితం చేస్తుంది."
 
 #: plinth/modules/security/views.py:66
 #, fuzzy, python-brace-format
@@ -3763,12 +3737,19 @@ msgid ""
 msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
+#, fuzzy
+#| msgid ""
+#| "Automatic snapshots are taken every hour, day, month and year. Older "
+#| "snapshots are automatically deleted keeping 10 of each kind and 50 in "
+#| "total. Although snapshots are efficient and only store the differences, "
+#| "they may be deleted to reclaim free space.  Individual files from older "
+#| "snapshots can be accessed by visiting \".snapshots\" directory in the "
+#| "filesystem. Snapshots are not a replacement for backups."
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr "స్వయంచాలక స్నాప్షాట్లు ప్రతి గంట, రోజు, నెల మరియు సంవత్సరం తీసుకుంటారు."
 
@@ -3780,52 +3761,88 @@ msgstr "కాలక్రమం స్నాప్షాట్లు ఉపయ
 msgid ""
 "Uncheck this to disable timeline snapshots (hourly, daily, monthly and "
 "yearly)."
+msgstr "కాలపట్టిక స్నాప్షాట్లను (గంట, రోజువారీ, నెలవారీ మరియు వార్షిక) నిలిపివేయడానికి దీనికి టిక్కు తీసివేయండి."
+
+#: plinth/modules/snapshot/forms.py:32
+#, fuzzy
+#| msgid "Storage Snapshots"
+msgid "Hourly Snapshots Limit"
+msgstr "నిల్వ దృశ్యములు"
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Daily Snapshots Limit"
+msgstr "స్నాప్షాట్‌లను తొలగించు"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Weekly Snapshots Limit"
+msgstr "స్నాప్షాట్‌లను తొలగించు"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Yearly Snapshots Limit"
+msgstr "స్నాప్షాట్‌లను తొలగించు"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
 msgstr ""
-"కాలపట్టిక స్నాప్షాట్లను (గంట, రోజువారీ, నెలవారీ మరియు వార్షిక) "
-"నిలిపివేయడానికి దీనికి టిక్కు తీసివేయండి."
 
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr "స్నాప్షాట్‌ని  సృష్టించు"
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr "అన్ని స్నాప్షాట్‌లను  తొలగించు"
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr "అన్నింటిని  తొలగించు"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr "సంఖ్య"
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr "తేదీ"
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr "యథాస్థితి"
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 #, fuzzy
 #| msgid "Inactive"
 msgid "active"
 msgstr "క్రియాశీల"
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr "స్నాప్షాట్కు రోల్బ్యాక్ చేయండి #%(number)s"
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr "స్నాప్షాట్‌ #%(number)s 1తొలగించు"
@@ -3845,8 +3862,8 @@ msgstr "స్నాప్షాట్‌ #%(number)s 1 తొలగించు
 msgid "Delete the following snapshots permanently?"
 msgstr "క్రింది స్నాప్షాట్‌లను శాశ్వతంగా తొలగించు ?"
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr "స్నాప్షాట్‌లను తొలగించు"
 
@@ -3871,42 +3888,42 @@ msgstr "స్నాప్షాట్ #%(number)s కు రోల్‌బ్
 msgid "Created snapshot."
 msgstr "స్నాప్షాట్‌ సృష్టించబడినది."
 
-#: plinth/modules/snapshot/views.py:75
+#: plinth/modules/snapshot/views.py:96
 #, fuzzy
 #| msgid "Configuration updated"
-msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "ఆకృతీకరణ నవీకరించబడింది"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr "చాయాచిత్రం తొలగించబడింది #{number}."
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr "చాయాచిత్రం ని తొలగించండి"
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Deleted all snapshots."
 msgstr "చాయాచిత్రం ని తొలగించండి"
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr "రొల్ల్బచ్క్ ని పూర్తి చేయడానికి వ్యవస్థను పునరుద్ధరించాలి."
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr "చాయాచిత్రం కు రొల్ల్బచ్క్ చేయండి"
 
@@ -4044,10 +4061,9 @@ msgid ""
 "deletion of files on one device will be automatically replicated on all "
 "other devices that also run Syncthing."
 msgstr ""
-"syncthing అనేది మీ సమచారాన్ని మీ వివిధ  ఉపకరణాలని సమకాలీకరించడానికి,ఉ.దా మీ "
-"కంప్యూటర్ మరియు మీ ఫోను.…ఒక ఉపకరణంలో ఒక ఫైలు యొక్క తయారీ,మార్పులు, లేదా "
-"నిర్మూలిస్తే అది మిగిలిన అన్ని ఉపకరణాలలో దానికి సంబందించిన మార్పులు చెయ్యడం "
-"సమకాలీకరించడం"
+"syncthing అనేది మీ సమచారాన్ని మీ వివిధ  ఉపకరణాలని సమకాలీకరించడానికి,ఉ.దా మీ కంప్యూటర్ మరియు మీ ఫోను.…"
+"ఒక ఉపకరణంలో ఒక ఫైలు యొక్క తయారీ,మార్పులు, లేదా నిర్మూలిస్తే అది మిగిలిన అన్ని ఉపకరణాలలో దానికి "
+"సంబందించిన మార్పులు చెయ్యడం సమకాలీకరించడం"
 
 #: plinth/modules/syncthing/__init__.py:49
 #, python-brace-format
@@ -4067,9 +4083,9 @@ msgid ""
 "syncthing/\">/syncthing</a>.  Desktop and mobile clients are also <a href="
 "\"https://syncthing.net/\">available</a>."
 msgstr ""
-"ప్రారంభించినప్పుడు,సమకాలీకరించునకు అంతర్జాల ముఖ చిత్రం<a href=\"/syncthing/\""
-">/syncthing</a>కంప్యూటరు మరియు పరికరాల మధ్య కూడా <a href=\""
-"https://syncthing.net/\">లభించును</a>"
+"ప్రారంభించినప్పుడు,సమకాలీకరించునకు అంతర్జాల ముఖ చిత్రం<a href=\"/syncthing/\">/"
+"syncthing</a>కంప్యూటరు మరియు పరికరాల మధ్య కూడా <a href=\"https://syncthing.net/"
+"\">లభించును</a>"
 
 #: plinth/modules/syncthing/__init__.py:63
 #, fuzzy
@@ -4109,10 +4125,9 @@ msgid ""
 "DATA. You can access Tahoe-LAFS at <a href=\"https://"
 "%(domain_name)s:5678\">https://%(domain_name)s:5678</a>."
 msgstr ""
-"Tahoe-LAFS సర్వర్ డొమైన్ <b>%(domain_name)s</b> కు సెట్ చెయ్యబడింది. "
-"ఫ్రీడంబాక్స్ డొమైన్ పేరు మార్చడం Tahoe-LAFS యొక్క పునఃస్థాపన అవసరం మరియు మీ "
-"డేటా కోల్పోతారు. మీరు Tahoe-LAFS ను <a href=\"https://%(domain_name)s:5678\""
-">%(domain_name)s</a> వద్ద పొందవచ్చు."
+"Tahoe-LAFS సర్వర్ డొమైన్ <b>%(domain_name)s</b> కు సెట్ చెయ్యబడింది. ఫ్రీడంబాక్స్ డొమైన్ పేరు "
+"మార్చడం Tahoe-LAFS యొక్క పునఃస్థాపన అవసరం మరియు మీ డేటా కోల్పోతారు. మీరు Tahoe-LAFS ను <a "
+"href=\"https://%(domain_name)s:5678\">%(domain_name)s</a> వద్ద పొందవచ్చు."
 
 #: plinth/modules/tahoe/templates/tahoe-post-setup.html:55
 msgid "Local introducer"
@@ -4160,11 +4175,10 @@ msgid ""
 "the <a href=\"https://www.torproject.org/download/download-easy.html.en"
 "\">Tor Browser</a>."
 msgstr ""
-"టార్ అనామక కమ్యూనికేషన్ వ్యవస్థ. దాని గురించి మీరు మరింత <a href=\""
-"https://www.torproject.org/\"> టార్ ప్రాజెక్ట్ </a> వెబ్సైట్ నుండి "
-"తెలుసుకోవచ్చు. వెబ్ సర్ఫింగ్ ఉన్నప్పుడు ఉత్తమ రక్షణ కోసం, టార్ ప్రాజెక్ట్ "
-"మీరు <a href=\"https://www.torproject.org/download/download-easy.html.en\"> "
-"టార్  బ్రౌజర్ </a> ను ఉపయోగించాలని సిఫార్సు చేస్తున్నారు."
+"టార్ అనామక కమ్యూనికేషన్ వ్యవస్థ. దాని గురించి మీరు మరింత <a href=\"https://www.torproject."
+"org/\"> టార్ ప్రాజెక్ట్ </a> వెబ్సైట్ నుండి తెలుసుకోవచ్చు. వెబ్ సర్ఫింగ్ ఉన్నప్పుడు ఉత్తమ రక్షణ కోసం, "
+"టార్ ప్రాజెక్ట్ మీరు <a href=\"https://www.torproject.org/download/download-easy."
+"html.en\"> టార్  బ్రౌజర్ </a> ను ఉపయోగించాలని సిఫార్సు చేస్తున్నారు."
 
 #: plinth/modules/tor/__init__.py:75 plinth/modules/tor/__init__.py:117
 msgid "Tor Anonymity Network"
@@ -4230,10 +4244,9 @@ msgid ""
 "\">https://bridges.torproject.org/</a> and copy/paste the bridge information "
 "here. Currently supported transports are none, obfs3, obfs4 and scamblesuit."
 msgstr ""
-"మీరు <a href=\"https://bridges.torproject.org/\"> 1https: "
-"//bridges.torproject.org/ </a> నుండి కొన్ని బ్రిడ్జెస్ పొందవచ్చు మరియు ఇక్కడ "
-"బ్రిడ్జె సమాచారాన్ని కాపీ / పేస్ట్ చెయ్యండి. ప్రస్తుతం మద్దతిచ్చే "
-"ట్రాన్స్పోర్ట్ లు none, obfs3, obfs4 మరియు scamblesuit."
+"మీరు <a href=\"https://bridges.torproject.org/\"> 1https: //bridges."
+"torproject.org/ </a> నుండి కొన్ని బ్రిడ్జెస్ పొందవచ్చు మరియు ఇక్కడ బ్రిడ్జె సమాచారాన్ని కాపీ / పేస్ట్ "
+"చెయ్యండి. ప్రస్తుతం మద్దతిచ్చే ట్రాన్స్పోర్ట్ లు none, obfs3, obfs4 మరియు scamblesuit."
 
 #: plinth/modules/tor/forms.py:112
 #, fuzzy
@@ -4248,9 +4261,8 @@ msgid ""
 "the Tor network. Do this if you have more than 2 megabits/s of upload and "
 "download bandwidth."
 msgstr ""
-"ప్రారంభించినప్పుడు, మీ {box_name} 1 టోర్ రిలేని అమలు చేస్తుంది మరియు టార్ "
-"నెట్వర్క్కి బ్యాండ్విడ్త్ని దానం చేస్తుంది. మీరు 2 megabits / s కంటే ఎక్కువ "
-"అప్లోడ్ మరియు డౌన్లోడ్ బ్యాండ్విడ్త్ ఉంటే దీన్ని చేయండి."
+"ప్రారంభించినప్పుడు, మీ {box_name} 1 టోర్ రిలేని అమలు చేస్తుంది మరియు టార్ నెట్వర్క్కి బ్యాండ్విడ్త్ని దానం "
+"చేస్తుంది. మీరు 2 megabits / s కంటే ఎక్కువ అప్లోడ్ మరియు డౌన్లోడ్ బ్యాండ్విడ్త్ ఉంటే దీన్ని చేయండి."
 
 #: plinth/modules/tor/forms.py:120
 msgid "Enable Tor bridge relay"
@@ -4262,9 +4274,9 @@ msgid ""
 "instead of public Tor relay database making it harder to censor this node. "
 "This helps others circumvent censorship."
 msgstr ""
-"ఎనేబుల్ చేసినప్పుడు, రిలే సమాచారం టార్ బ్రిడ్జ్ డేటాబేస్లో పబ్లిక్ టార్ రిలే "
-"డేటాబేస్కు బదులుగా ప్రచురించబడుతుంది, ఇది ఈ నోడ్ను సెన్సార్ చేయడానికి కష్టతరం"
-" చేస్తుంది.ఇతరులు సెన్సార్షిప్ను తప్పించుకునేందుకు ఇది దోహదపడుతుంది."
+"ఎనేబుల్ చేసినప్పుడు, రిలే సమాచారం టార్ బ్రిడ్జ్ డేటాబేస్లో పబ్లిక్ టార్ రిలే డేటాబేస్కు బదులుగా "
+"ప్రచురించబడుతుంది, ఇది ఈ నోడ్ను సెన్సార్ చేయడానికి కష్టతరం చేస్తుంది.ఇతరులు సెన్సార్షిప్ను "
+"తప్పించుకునేందుకు ఇది దోహదపడుతుంది."
 
 #: plinth/modules/tor/forms.py:128
 msgid "Enable Tor Hidden Service"
@@ -4277,9 +4289,8 @@ msgid ""
 "wiki or chat) without revealing its location. Do not use this for strong "
 "anonymity yet."
 msgstr ""
-"ఎంపిక చేసిన సేవలను (వికీ లేదా చాట్ వంటివి) దాని స్థానాన్ని బహిర్గతం చేయకుండా "
-"ఒక రహస్య సేవ {box_name} 1 ను అనుమతిస్తుంది. ఇది ఇంకా బలమైన పేరు కోసం "
-"ఉపయోగించకండి."
+"ఎంపిక చేసిన సేవలను (వికీ లేదా చాట్ వంటివి) దాని స్థానాన్ని బహిర్గతం చేయకుండా ఒక రహస్య సేవ {box_name} "
+"1 ను అనుమతిస్తుంది. ఇది ఇంకా బలమైన పేరు కోసం ఉపయోగించకండి."
 
 #: plinth/modules/tor/forms.py:136
 msgid "Download software packages over Tor"
@@ -4291,14 +4302,12 @@ msgid ""
 "installations and upgrades. This adds a degree of privacy and security "
 "during software downloads."
 msgstr ""
-"ప్రారంభించబడినప్పుడు, సంస్థాపనలు మరియు నవీకరణలు కోసం సాఫ్ట్వేర్ టార్  "
-"నెట్వర్క్ ద్వారా డౌన్లోడ్ చేయబడుతుంది. ఇది సాఫ్ట్ వేర్ డౌన్లోడ్ సమయంలో గోప్"
-"యత మరియు భద్రత యొక్క డిగ్రీని జతచేస్తుంది."
+"ప్రారంభించబడినప్పుడు, సంస్థాపనలు మరియు నవీకరణలు కోసం సాఫ్ట్వేర్ టార్  నెట్వర్క్ ద్వారా డౌన్లోడ్ "
+"చేయబడుతుంది. ఇది సాఫ్ట్ వేర్ డౌన్లోడ్ సమయంలో గోప్యత మరియు భద్రత యొక్క డిగ్రీని జతచేస్తుంది."
 
 #: plinth/modules/tor/forms.py:151
 msgid "Specify at least one upstream bridge to use upstream bridges."
-msgstr ""
-"అప్స్ట్రీమ్ వంతెనలను ఉపయోగించడానికి కనీసం ఒక అప్స్ట్రీమ్ వంతెనను పేర్కొనండి."
+msgstr "అప్స్ట్రీమ్ వంతెనలను ఉపయోగించడానికి కనీసం ఒక అప్స్ట్రీమ్ వంతెనను పేర్కొనండి."
 
 #: plinth/modules/tor/manifest.py:28
 msgid "Tor Browser"
@@ -4338,9 +4347,8 @@ msgid ""
 "If your %(box_name)s is behind a router or firewall, you should make sure "
 "the following ports are open, and port-forwarded, if necessary:"
 msgstr ""
-"మీ %(box_name)s లు రౌటర్ లేదా ఫైర్వాల్ వెనుక ఉంటే, మీరు ఈ క్రింది పోర్టులు "
-"తెరిచి ఉన్నారని నిర్ధారించుకోండి మరియు అవసరమైతే పోర్ట్-ఫార్వార్డ్ చేయబడిందని "
-"నిర్ధారించుకోండి:"
+"మీ %(box_name)s లు రౌటర్ లేదా ఫైర్వాల్ వెనుక ఉంటే, మీరు ఈ క్రింది పోర్టులు తెరిచి ఉన్నారని "
+"నిర్ధారించుకోండి మరియు అవసరమైతే పోర్ట్-ఫార్వార్డ్ చేయబడిందని నిర్ధారించుకోండి:"
 
 #: plinth/modules/tor/templates/tor.html:129
 msgid "SOCKS"
@@ -4349,9 +4357,7 @@ msgstr "సాక్స్‌లు"
 #: plinth/modules/tor/templates/tor.html:132
 #, python-format
 msgid "A Tor SOCKS port is available on your %(box_name)s on TCP port 9050."
-msgstr ""
-"టిసిపి  పోర్ట్ 9050 పై ఒక టార్ సొక్స్ పోర్ట్ మీ %(box_name)sలో అందుబాటులో "
-"ఉంది."
+msgstr "టిసిపి  పోర్ట్ 9050 పై ఒక టార్ సొక్స్ పోర్ట్ మీ %(box_name)sలో అందుబాటులో ఉంది."
 
 #: plinth/modules/tor/views.py:130 plinth/modules/tor/views.py:158
 msgid "Configuration updated."
@@ -4371,15 +4377,13 @@ msgid ""
 "BitTorrent is a peer-to-peer file sharing protocol. Transmission daemon "
 "handles Bitorrent file sharing.  Note that BitTorrent is not anonymous."
 msgstr ""
-"బిట్ టోర్రెంట్ పీర్-టు-పీర్ ఫైల్ షేరింగ్ ప్రోటోకాల్. ట్రాన్స్మిషన్ డెమోన్ "
-"బిట్ టోర్రెంట్ ఫైల్ భాగస్వామ్యాన్ని నిర్వహిస్తుంది. బిట్ టోర్రెంట్ అజ్ఞాత "
-"కాదని గమనించండి."
+"బిట్ టోర్రెంట్ పీర్-టు-పీర్ ఫైల్ షేరింగ్ ప్రోటోకాల్. ట్రాన్స్మిషన్ డెమోన్ బిట్ టోర్రెంట్ ఫైల్ భాగస్వామ్యాన్ని నిర్వహిస్తుంది. "
+"బిట్ టోర్రెంట్ అజ్ఞాత కాదని గమనించండి."
 
 #: plinth/modules/transmission/__init__.py:45
 msgid ""
 "Access the web interface at <a href=\"/transmission\">/transmission</a>."
-msgstr ""
-"ఇచ్చట వెబ్ ఇంటర్ఫేస్ యాక్సెస్ చేయవచ్చును <a href=\"/transmission\"></a>."
+msgstr "ఇచ్చట వెబ్ ఇంటర్ఫేస్ యాక్సెస్ చేయవచ్చును <a href=\"/transmission\"></a>."
 
 #: plinth/modules/transmission/forms.py:30
 msgid "Download directory"
@@ -4647,8 +4651,8 @@ msgid ""
 "Use the <a href='%(change_password_url)s'>change password form </a> to "
 "change the password."
 msgstr ""
-"పాస్వర్డ్ను మార్చడానికి <a href='%(change_password_url)s'> పాస్వర్డ్ రూపాన్ని"
-" మార్చండి </a>  ని ఉపయోగించండి."
+"పాస్వర్డ్ను మార్చడానికి <a href='%(change_password_url)s'> పాస్వర్డ్ రూపాన్ని మార్చండి </a>  ని "
+"ఉపయోగించండి."
 
 #: plinth/modules/users/templates/users_update.html:53
 msgid "Save Changes"
diff --git a/plinth/locale/tr/LC_MESSAGES/django.po b/plinth/locale/tr/LC_MESSAGES/django.po
index 9a9d3391b..fc983a029 100644
--- a/plinth/locale/tr/LC_MESSAGES/django.po
+++ b/plinth/locale/tr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2018-01-03 17:10+0000\n"
 "Last-Translator: John Doe <thraex@numericable.fr>\n"
 "Language-Team: Turkish <https://hosted.weblate.org/projects/freedombox/"
@@ -18,32 +18,32 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
 "X-Generator: Weblate 2.19-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "{kind} port {listen_address}:{port} dinleniyor"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "{kind} port {port} dinleniyor"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "tcp{kind} üzerinden {url} bağlantısına eriş"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "{url} bağlantısına eriş"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "{host}:{port} konumuna bağlan"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "{host}:{port} konumuna bağlanılamadı"
@@ -195,15 +195,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr "Güncel olarak sadece sınırlı işlevsellik mevcuttur."
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "Yapılandır"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "Alan Adı"
@@ -264,34 +264,34 @@ msgstr "Bu web yönetim arayüzü için kullanılacak dil"
 msgid "Submit"
 msgstr "İbraz Et"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "Genel Yapılandırma"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "Makine isminin ayarlanmasında hata: {exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "Makine ismi ayarlandı"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "Alan adının ayarlanmasında hata: {exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "Alan adı ayarlandı"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "Dilin ayarlanmasında hata: {exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "Dil değiştirildi"
 
@@ -1526,7 +1526,7 @@ msgstr "Tekrar edin"
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "Sil"
 
@@ -2633,7 +2633,7 @@ msgid "Interface"
 msgstr "Arayüz"
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3814,12 +3814,19 @@ msgstr ""
 "daha önce bilinen iyi bir duruma geri getirilmesini sağlar."
 
 #: plinth/modules/snapshot/__init__.py:38
+#, fuzzy
+#| msgid ""
+#| "Automatic snapshots are taken every hour, day, month and year. Older "
+#| "snapshots are automatically deleted keeping 10 of each kind and 50 in "
+#| "total. Although snapshots are efficient and only store the differences, "
+#| "they may be deleted to reclaim free space.  Individual files from older "
+#| "snapshots can be accessed by visiting \".snapshots\" directory in the "
+#| "filesystem. Snapshots are not a replacement for backups."
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 "Otomatik anlıklar her saat, gün, ay ve yıl oluşturulur. Eski anlıklar her "
@@ -3841,46 +3848,84 @@ msgstr ""
 "Zaman çizelgesi anlıklarını (saat, gün, ay ve yıl başı) devre dışı bırakmak "
 "için bu şıkkı boş bırakın."
 
+#: plinth/modules/snapshot/forms.py:32
+#, fuzzy
+#| msgid "Storage Snapshots"
+msgid "Hourly Snapshots Limit"
+msgstr "Depolama Anlıkları"
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Daily Snapshots Limit"
+msgstr "Anlıkları Sil"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Weekly Snapshots Limit"
+msgstr "Anlıkları Sil"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete Snapshots"
+msgid "Yearly Snapshots Limit"
+msgstr "Anlıkları Sil"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr "Anlık Oluştur"
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr "Tüm anlıkları sil"
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr "Tümünü Sil"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr "Sayı"
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr "Tarih"
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr "Geri getir"
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr "etkin"
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr "#%(number)s  sayılı anlığa geri getir"
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr "#%(number)s sayılı anlığı sil"
@@ -3898,8 +3943,8 @@ msgstr "#%(number)s sayılı anlığı sil"
 msgid "Delete the following snapshots permanently?"
 msgstr "Bu anlıklar daimi olarak silinsin mi?"
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr "Anlıkları Sil"
 
@@ -3926,39 +3971,41 @@ msgstr "#%(number)s sayılı anlığa geri al"
 msgid "Created snapshot."
 msgstr "Anlık oluşturuldu."
 
-#: plinth/modules/snapshot/views.py:75
-msgid "Timeline Snapshots configuration updated"
+#: plinth/modules/snapshot/views.py:96
+#, fuzzy
+#| msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "Zaman Çizelgesi Anlıklarının yapılandırması güncellendi"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr "Eylem hatası: {0} [{1}] [{2}]"
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr "#{number} sayılı anlık silindi."
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr "Anlığı sil"
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr "Tüm anlıklar silindi."
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr "#{number} sayılı anlığa geri alındı."
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 "Geri alınmanın tamamlanması için sistemin yeniden başlatılması gereklidir."
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr "Anlığa Geri Al"
 
diff --git a/plinth/locale/uk/LC_MESSAGES/django.po b/plinth/locale/uk/LC_MESSAGES/django.po
index ace1c8487..789851ee0 100644
--- a/plinth/locale/uk/LC_MESSAGES/django.po
+++ b/plinth/locale/uk/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,32 +19,32 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr ""
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr ""
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr ""
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr ""
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr ""
@@ -172,15 +172,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr ""
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr ""
@@ -231,34 +231,34 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr ""
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr ""
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr ""
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr ""
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr ""
 
@@ -1314,7 +1314,7 @@ msgstr ""
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr ""
 
@@ -2264,7 +2264,7 @@ msgid "Interface"
 msgstr ""
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3262,11 +3262,10 @@ msgstr ""
 
 #: plinth/modules/snapshot/__init__.py:38
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 
@@ -3280,46 +3279,76 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+msgid "Hourly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:36
+msgid "Daily Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:40
+msgid "Weekly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+msgid "Yearly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 msgid "Delete all the snapshots"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 msgid "Delete All"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr ""
@@ -3337,8 +3366,8 @@ msgstr ""
 msgid "Delete the following snapshots permanently?"
 msgstr ""
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 msgid "Delete Snapshots"
 msgstr ""
 
@@ -3362,38 +3391,38 @@ msgstr ""
 msgid "Created snapshot."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:75
-msgid "Timeline Snapshots configuration updated"
+#: plinth/modules/snapshot/views.py:96
+msgid "Storage snapshots configuration updated"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 msgid "Deleted all snapshots."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr ""
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr ""
 
diff --git a/plinth/locale/zh_Hans/LC_MESSAGES/django.po b/plinth/locale/zh_Hans/LC_MESSAGES/django.po
index 0f1f4454f..22e298491 100644
--- a/plinth/locale/zh_Hans/LC_MESSAGES/django.po
+++ b/plinth/locale/zh_Hans/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Plinth\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-30 14:38+0530\n"
+"POT-Creation-Date: 2018-02-12 18:01-0500\n"
 "PO-Revision-Date: 2017-04-19 16:01+0000\n"
 "Last-Translator: Chi-Hsun Tsai <chihsun.tsai@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <https://hosted.weblate.org/projects/"
@@ -19,32 +19,32 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 2.14-dev\n"
 
-#: plinth/action_utils.py:252
+#: plinth/action_utils.py:263
 #, python-brace-format
 msgid "Listening on {kind} port {listen_address}:{port}"
 msgstr "正在 {kind} 侦听端口 {listen_address}:{port}"
 
-#: plinth/action_utils.py:255
+#: plinth/action_utils.py:266
 #, python-brace-format
 msgid "Listening on {kind} port {port}"
 msgstr "正在 {kind} 侦听端口 {port}"
 
-#: plinth/action_utils.py:342
+#: plinth/action_utils.py:353
 #, python-brace-format
 msgid "Access URL {url} on tcp{kind}"
 msgstr "在 tcp {kind} 访问 URL {url}"
 
-#: plinth/action_utils.py:346
+#: plinth/action_utils.py:357
 #, python-brace-format
 msgid "Access URL {url}"
 msgstr "访问 URL {url}"
 
-#: plinth/action_utils.py:374
+#: plinth/action_utils.py:385
 #, python-brace-format
 msgid "Connect to {host}:{port}"
 msgstr "连接到的主机 {host}:{port}"
 
-#: plinth/action_utils.py:377
+#: plinth/action_utils.py:388
 #, python-brace-format
 msgid "Cannot connect to {host}:{port}"
 msgstr "不能连接到的主机 {host}:{port}"
@@ -198,15 +198,15 @@ msgstr ""
 msgid "Currently only limited functionality is available."
 msgstr ""
 
-#: plinth/modules/config/__init__.py:48
+#: plinth/modules/config/__init__.py:53
 #: plinth/modules/dynamicdns/dynamicdns.py:45
 #: plinth/modules/ikiwiki/views.py:36
 #: plinth/modules/tahoe/templates/tahoe-pre-setup.html:39
 msgid "Configure"
 msgstr "配置"
 
-#: plinth/modules/config/__init__.py:66 plinth/modules/config/forms.py:81
-#: plinth/modules/config/views.py:166
+#: plinth/modules/config/__init__.py:71 plinth/modules/config/forms.py:81
+#: plinth/modules/config/views.py:163
 #: plinth/modules/dynamicdns/dynamicdns.py:143
 msgid "Domain Name"
 msgstr "域名"
@@ -264,34 +264,34 @@ msgstr "此 web 管理界面的语言"
 msgid "Submit"
 msgstr "提交"
 
-#: plinth/modules/config/views.py:73
+#: plinth/modules/config/views.py:66
 msgid "General Configuration"
 msgstr "常规配置"
 
-#: plinth/modules/config/views.py:90
+#: plinth/modules/config/views.py:87
 #, python-brace-format
 msgid "Error setting hostname: {exception}"
 msgstr "设置主机名错误：{exception}"
 
-#: plinth/modules/config/views.py:93
+#: plinth/modules/config/views.py:90
 msgid "Hostname set"
 msgstr "主机名设置"
 
-#: plinth/modules/config/views.py:99
+#: plinth/modules/config/views.py:97
 #, python-brace-format
 msgid "Error setting domain name: {exception}"
 msgstr "设置域名错误：{exception}"
 
-#: plinth/modules/config/views.py:102
+#: plinth/modules/config/views.py:100
 msgid "Domain name set"
 msgstr "域名集"
 
-#: plinth/modules/config/views.py:110
+#: plinth/modules/config/views.py:109
 #, python-brace-format
 msgid "Error setting language: {exception}"
 msgstr "设置语言错误：{exception}"
 
-#: plinth/modules/config/views.py:113
+#: plinth/modules/config/views.py:112
 msgid "Language changed"
 msgstr "语言已更改"
 
@@ -1508,7 +1508,7 @@ msgstr "重新获取"
 
 #: plinth/modules/letsencrypt/templates/letsencrypt.html:114
 #: plinth/modules/networks/templates/connection_show.html:63
-#: plinth/modules/snapshot/templates/snapshot.html:62
+#: plinth/modules/snapshot/templates/snapshot.html:61
 msgid "Delete"
 msgstr "删除"
 
@@ -2555,7 +2555,7 @@ msgid "Interface"
 msgstr "接口"
 
 #: plinth/modules/networks/templates/connection_show.html:110
-#: plinth/modules/snapshot/templates/snapshot.html:60
+#: plinth/modules/snapshot/templates/snapshot.html:59
 #: plinth/modules/snapshot/templates/snapshot_delete.html:35
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:35
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:43
@@ -3688,12 +3688,19 @@ msgstr ""
 "态，以防意外改变系统状态。"
 
 #: plinth/modules/snapshot/__init__.py:38
+#, fuzzy
+#| msgid ""
+#| "Automatic snapshots are taken every hour, day, month and year. Older "
+#| "snapshots are automatically deleted keeping 10 of each kind and 50 in "
+#| "total. Although snapshots are efficient and only store the differences, "
+#| "they may be deleted to reclaim free space.  Individual files from older "
+#| "snapshots can be accessed by visiting \".snapshots\" directory in the "
+#| "filesystem. Snapshots are not a replacement for backups."
 msgid ""
-"Automatic snapshots are taken every hour, day, month and year. Older "
-"snapshots are automatically deleted keeping 10 of each kind and 50 in total. "
-"Although snapshots are efficient and only store the differences, they may be "
-"deleted to reclaim free space.  Individual files from older snapshots can be "
-"accessed by visiting \".snapshots\" directory in the filesystem. Snapshots "
+"Automatic snapshots are taken every hour, day, month and year. Although "
+"snapshots are efficient and only store the differences, they may be deleted "
+"to reclaim free space.  Individual files from older snapshots can be "
+"accessed by visiting \"/.snapshots\" directory in the filesystem. Snapshots "
 "are not a replacement for backups."
 msgstr ""
 "每隔一小时，一天，一个月，一年自动创建快照。较旧的快照会自动删除，保留每种类"
@@ -3713,50 +3720,88 @@ msgid ""
 "yearly)."
 msgstr ""
 
+#: plinth/modules/snapshot/forms.py:32
+#, fuzzy
+#| msgid "Create Snapshot"
+msgid "Hourly Snapshots Limit"
+msgstr "创建快照"
+
+#: plinth/modules/snapshot/forms.py:36
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Daily Snapshots Limit"
+msgstr "删除快照"
+
+#: plinth/modules/snapshot/forms.py:40
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Weekly Snapshots Limit"
+msgstr "删除快照"
+
+#: plinth/modules/snapshot/forms.py:44
+msgid "Monthly Snapshots Limit"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:48
+#, fuzzy
+#| msgid "Delete Snapshot"
+msgid "Yearly Snapshots Limit"
+msgstr "删除快照"
+
+#: plinth/modules/snapshot/forms.py:53
+msgid "Delete Software Snapshots older than (days)"
+msgstr ""
+
+#: plinth/modules/snapshot/forms.py:55
+msgid ""
+"Software snapshots older than this will be deleted. This does not limit the "
+"number of software snapshots created."
+msgstr ""
+
 #: plinth/modules/snapshot/templates/snapshot.html:36
 msgid "Create Snapshot"
 msgstr "创建快照"
 
-#: plinth/modules/snapshot/templates/snapshot.html:41
+#: plinth/modules/snapshot/templates/snapshot.html:40
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Delete all the snapshots"
 msgstr "删除快照"
 
-#: plinth/modules/snapshot/templates/snapshot.html:48
+#: plinth/modules/snapshot/templates/snapshot.html:47
 #, fuzzy
 #| msgid "Delete"
 msgid "Delete All"
 msgstr "删除"
 
-#: plinth/modules/snapshot/templates/snapshot.html:58
+#: plinth/modules/snapshot/templates/snapshot.html:57
 #: plinth/modules/snapshot/templates/snapshot_delete.html:33
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:33
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:41
 msgid "Number"
 msgstr "编号"
 
-#: plinth/modules/snapshot/templates/snapshot.html:59
+#: plinth/modules/snapshot/templates/snapshot.html:58
 #: plinth/modules/snapshot/templates/snapshot_delete.html:34
 #: plinth/modules/snapshot/templates/snapshot_delete_all.html:34
 #: plinth/modules/snapshot/templates/snapshot_rollback.html:42
 msgid "Date"
 msgstr "日期"
 
-#: plinth/modules/snapshot/templates/snapshot.html:61
+#: plinth/modules/snapshot/templates/snapshot.html:60
 msgid "Rollback"
 msgstr "回滚"
 
-#: plinth/modules/snapshot/templates/snapshot.html:72
+#: plinth/modules/snapshot/templates/snapshot.html:71
 msgid "active"
 msgstr "激活"
 
-#: plinth/modules/snapshot/templates/snapshot.html:81
+#: plinth/modules/snapshot/templates/snapshot.html:80
 #, python-format
 msgid "Rollback to snapshot #%(number)s"
 msgstr "回滚到快照 #%(number)s"
 
-#: plinth/modules/snapshot/templates/snapshot.html:92
+#: plinth/modules/snapshot/templates/snapshot.html:91
 #, python-format
 msgid "Delete snapshot #%(number)s"
 msgstr "删除快照 #%(number)s"
@@ -3776,8 +3821,8 @@ msgstr "删除快照 #%(number)s"
 msgid "Delete the following snapshots permanently?"
 msgstr "永久删除此快照？"
 
-#: plinth/modules/snapshot/templates/snapshot_delete_all.html:55
-#: plinth/modules/snapshot/views.py:112
+#: plinth/modules/snapshot/templates/snapshot_delete_all.html:57
+#: plinth/modules/snapshot/views.py:134
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Delete Snapshots"
@@ -3805,42 +3850,42 @@ msgstr "回滚到快照 #%(number)s"
 msgid "Created snapshot."
 msgstr "创建快照。"
 
-#: plinth/modules/snapshot/views.py:75
+#: plinth/modules/snapshot/views.py:96
 #, fuzzy
 #| msgid "Access rights configuration updated"
-msgid "Timeline Snapshots configuration updated"
+msgid "Storage snapshots configuration updated"
 msgstr "访问权配置已更新"
 
-#: plinth/modules/snapshot/views.py:78 plinth/modules/tor/views.py:67
+#: plinth/modules/snapshot/views.py:99 plinth/modules/tor/views.py:67
 #, python-brace-format
 msgid "Action error: {0} [{1}] [{2}]"
 msgstr "操作错误：{0} [{1}] [{2}]"
 
-#: plinth/modules/snapshot/views.py:88
+#: plinth/modules/snapshot/views.py:110
 #, python-brace-format
 msgid "Deleted snapshot #{number}."
 msgstr "快照 #{number} 已删除。"
 
-#: plinth/modules/snapshot/views.py:96
+#: plinth/modules/snapshot/views.py:118
 msgid "Delete Snapshot"
 msgstr "删除快照"
 
-#: plinth/modules/snapshot/views.py:105
+#: plinth/modules/snapshot/views.py:127
 #, fuzzy
 #| msgid "Delete Snapshot"
 msgid "Deleted all snapshots."
 msgstr "删除快照"
 
-#: plinth/modules/snapshot/views.py:123
+#: plinth/modules/snapshot/views.py:145
 #, python-brace-format
 msgid "Rolled back to snapshot #{number}."
 msgstr "回滚到快照 #{number}。"
 
-#: plinth/modules/snapshot/views.py:126
+#: plinth/modules/snapshot/views.py:148
 msgid "The system must be restarted to complete the rollback."
 msgstr "系统需要重启以完成完全回滚。"
 
-#: plinth/modules/snapshot/views.py:138
+#: plinth/modules/snapshot/views.py:160
 msgid "Rollback to Snapshot"
 msgstr "回滚到快照"