diff --git a/.ci/functional-tests.yml b/.ci/functional-tests.yml index 3089ce1ad..18651dae3 100644 --- a/.ci/functional-tests.yml +++ b/.ci/functional-tests.yml @@ -21,7 +21,7 @@ .run-functional-tests: stage: functional-tests - timeout: 150m + timeout: 3h # Need to find a way of running the cleanup step even on failure allow_failure: true when: delayed diff --git a/container b/container index bf031ca8f..cbb1fadc1 100755 --- a/container +++ b/container @@ -132,9 +132,9 @@ URLS = { 'stable': 'https://ftp.freedombox.org/pub/freedombox/hardware/' 'amd64/bullseye/freedombox-bullseye-free_all-amd64.img.xz', 'testing': 'https://ftp.freedombox.org/pub/freedombox/hardware/' - 'amd64/testing/freedombox-testing-free_dev_all-amd64.img.xz', + 'amd64/testing/freedombox-testing_dev_all-amd64.img.xz', 'unstable': 'https://ftp.freedombox.org/pub/freedombox/hardware/' - 'amd64/nightly/freedombox-unstable-free_dev_all-amd64.img.xz', + 'amd64/nightly/freedombox-unstable_dev_all-amd64.img.xz', } TRUSTED_KEYS = ['013D86D8BA32EAB4A6691BF85D4153D6FE188FC8'] diff --git a/debian/changelog b/debian/changelog index a3b2053ba..5c223dbf7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,46 @@ +freedombox (22.27) unstable; urgency=medium + + [ ikmaak ] + * Translated using Weblate (Dutch) + + [ Burak Yavuz ] + * Translated using Weblate (Turkish) + + [ Eric ] + * Translated using Weblate (Chinese (Simplified)) + + [ Ihor Hordiichuk ] + * Translated using Weblate (Ukrainian) + + [ 109247019824 ] + * Translated using Weblate (Bulgarian) + + [ Johannes Keyser ] + * Translated using Weblate (German) + + [ Jiří Podhorecký ] + * Translated using Weblate (Czech) + + [ Joseph Nuthalapati ] + * container: Drop free tag from image URLs + * tests: functional: Set timeout to 3 hours + + [ Sunil Mohan Adapa ] + * users: tests: Fix privileged tests + * minidlna: Fix incorrect marking for firewall local protection + * snapshot: Fix showing unsupported message on non-btrfs filesystems + * d/control: Don't recommend libpam-tmpdir + * package, email: Move conflicting package removal to framework + * zoph, wordpress: Add conflicts on libpam-tmpdir + + [ James Valleroy ] + * upgrades: dist-upgrade: Don't change apt security line + * wordpress: Redirect Webfinger queries + * locale: Update translation strings + * doc: Fetch latest manual + + -- James Valleroy Mon, 19 Dec 2022 20:59:17 -0500 + freedombox (22.26~bpo11+1) bullseye-backports; urgency=medium * Rebuild for bullseye-backports. diff --git a/debian/control b/debian/control index 4a8c95d6e..86f43c6ce 100644 --- a/debian/control +++ b/debian/control @@ -156,8 +156,6 @@ Recommends: libnss-mdns, # Resolve current hostname without /etc/hosts libnss-myhostname, -# Tighter $TMPDIR permissions - libpam-tmpdir, # Block repeated failed PAM login attempts libpam-abl, # Priority: standard diff --git a/doc/manual/en/ReleaseNotes.raw.wiki b/doc/manual/en/ReleaseNotes.raw.wiki index 1b4cc859f..b5f6e8a3c 100644 --- a/doc/manual/en/ReleaseNotes.raw.wiki +++ b/doc/manual/en/ReleaseNotes.raw.wiki @@ -8,6 +8,25 @@ For more technical details, see the [[https://salsa.debian.org/freedombox-team/f The following are the release notes for each !FreedomBox version. +== FreedomBox 22.27 (2022-12-19) == + +=== Highlights === + + * minidlna: Fix incorrect marking for firewall local protection + * zoph, wordpress: Add conflicts on libpam-tmpdir + +=== Other Changes === + + * container: Drop free tag from image URLs + * d/control: Don't recommend libpam-tmpdir + * locale: Update translations for Bulgarian, Chinese (Simplified), Czech, Dutch, German, Turkish, Ukrainian + * package, email: Move conflicting package removal to framework + * snapshot: Fix showing unsupported message on non-btrfs filesystems + * tests: functional: Set timeout to 3 hours + * upgrades: dist-upgrade: Don't change apt security line + * users: tests: Fix privileged tests + * wordpress: Redirect Webfinger queries + == FreedomBox 22.26 (2022-12-05) == === Highlights === diff --git a/doc/manual/es/ReleaseNotes.raw.wiki b/doc/manual/es/ReleaseNotes.raw.wiki index 1b4cc859f..b5f6e8a3c 100644 --- a/doc/manual/es/ReleaseNotes.raw.wiki +++ b/doc/manual/es/ReleaseNotes.raw.wiki @@ -8,6 +8,25 @@ For more technical details, see the [[https://salsa.debian.org/freedombox-team/f The following are the release notes for each !FreedomBox version. +== FreedomBox 22.27 (2022-12-19) == + +=== Highlights === + + * minidlna: Fix incorrect marking for firewall local protection + * zoph, wordpress: Add conflicts on libpam-tmpdir + +=== Other Changes === + + * container: Drop free tag from image URLs + * d/control: Don't recommend libpam-tmpdir + * locale: Update translations for Bulgarian, Chinese (Simplified), Czech, Dutch, German, Turkish, Ukrainian + * package, email: Move conflicting package removal to framework + * snapshot: Fix showing unsupported message on non-btrfs filesystems + * tests: functional: Set timeout to 3 hours + * upgrades: dist-upgrade: Don't change apt security line + * users: tests: Fix privileged tests + * wordpress: Redirect Webfinger queries + == FreedomBox 22.26 (2022-12-05) == === Highlights === diff --git a/plinth/__init__.py b/plinth/__init__.py index 1a9afaa47..957f0e485 100644 --- a/plinth/__init__.py +++ b/plinth/__init__.py @@ -3,4 +3,4 @@ Package init file. """ -__version__ = '22.26' +__version__ = '22.27' diff --git a/plinth/locale/ar/LC_MESSAGES/django.po b/plinth/locale/ar/LC_MESSAGES/django.po index 3c733af25..b9ea1f256 100644 --- a/plinth/locale/ar/LC_MESSAGES/django.po +++ b/plinth/locale/ar/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-05 21:13-0500\n" +"POT-Creation-Date: 2022-12-19 20:15-0500\n" "PO-Revision-Date: 2022-03-31 09:12+0000\n" "Last-Translator: abidin toumi \n" "Language-Team: Arabic \n" "Language-Team: Arabic (Saudi Arabia) \n" "Language-Team: Bulgarian \n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.14.2-dev\n" +"X-Generator: Weblate 4.15-dev\n" #: doc/dev/_templates/layout.html:11 msgid "Page source" @@ -5660,7 +5660,7 @@ msgstr "" #: plinth/modules/snapshot/templates/snapshot_delete_selected.html:42 #: plinth/modules/snapshot/templates/snapshot_manage.html:20 -#: plinth/modules/snapshot/views.py:194 +#: plinth/modules/snapshot/views.py:201 msgid "Delete Snapshots" msgstr "" @@ -5724,37 +5724,37 @@ msgstr "" msgid "Manage Snapshots" msgstr "" -#: plinth/modules/snapshot/views.py:89 +#: plinth/modules/snapshot/views.py:96 msgid "Created snapshot." msgstr "" -#: plinth/modules/snapshot/views.py:151 +#: plinth/modules/snapshot/views.py:158 msgid "Storage snapshots configuration updated" msgstr "Настройките на моментните снимки на хранилището са променени" -#: plinth/modules/snapshot/views.py:155 +#: plinth/modules/snapshot/views.py:162 #, python-brace-format msgid "Action error: {0} [{1}] [{2}]" msgstr "" -#: plinth/modules/snapshot/views.py:181 +#: plinth/modules/snapshot/views.py:188 msgid "Deleted selected snapshots" msgstr "" -#: plinth/modules/snapshot/views.py:186 +#: plinth/modules/snapshot/views.py:193 msgid "Snapshot is currently in use. Please try again later." msgstr "" -#: plinth/modules/snapshot/views.py:205 +#: plinth/modules/snapshot/views.py:212 #, python-brace-format msgid "Rolled back to snapshot #{number}." msgstr "" -#: plinth/modules/snapshot/views.py:208 +#: plinth/modules/snapshot/views.py:215 msgid "The system must be restarted to complete the rollback." msgstr "" -#: plinth/modules/snapshot/views.py:218 +#: plinth/modules/snapshot/views.py:225 msgid "Rollback to Snapshot" msgstr "" @@ -5772,7 +5772,7 @@ msgstr "" #: plinth/modules/ssh/__init__.py:61 msgid "Remotely login using Secure Shell (SSH)" -msgstr "" +msgstr "Отдалечен вход през SSH" #: plinth/modules/ssh/forms.py:13 msgid "Disable password authentication" @@ -5787,7 +5787,7 @@ msgstr "" #: plinth/modules/ssh/forms.py:21 msgid "Allow all users to login remotely" -msgstr "" +msgstr "Разрешаване на отдалечен вход на всички потребители" #: plinth/modules/ssh/forms.py:22 msgid "" @@ -5795,6 +5795,9 @@ msgid "" "disabled, only users of groups root, admin and freedombox-ssh can login via " "SSH." msgstr "" +"Дава разрешение на всички потребители, които имат валиден профил, да влизат " +"отдалечено през SSH. Когато не е отметнато, само потребителите от групите " +"root, admin и freedombox-ssh могат да влизат през SSH." #: plinth/modules/ssh/templates/ssh.html:11 msgid "Server Fingerprints" @@ -7303,34 +7306,34 @@ msgstr "Изчакване да започне: {name}" msgid "Finished: {name}" msgstr "Готово: {name}" -#: plinth/package.py:188 +#: plinth/package.py:195 #, python-brace-format msgid "Package {expression} is not available for install" msgstr "Пакетът „{expression}“ е недостъпен за инсталиране" -#: plinth/package.py:201 +#: plinth/package.py:208 #, python-brace-format msgid "Package {package_name} is the latest version ({latest_version})" msgstr "" -#: plinth/package.py:348 +#: plinth/package.py:355 msgid "installing" msgstr "" -#: plinth/package.py:350 +#: plinth/package.py:357 msgid "downloading" msgstr "" -#: plinth/package.py:352 +#: plinth/package.py:359 msgid "media change" msgstr "" -#: plinth/package.py:354 +#: plinth/package.py:361 #, python-brace-format msgid "configuration file: {file}" msgstr "" -#: plinth/package.py:382 plinth/package.py:407 +#: plinth/package.py:389 plinth/package.py:414 msgid "Timeout waiting for package manager" msgstr "Времето за изчакване на диспечера на пакети е изтекло" diff --git a/plinth/locale/bn/LC_MESSAGES/django.po b/plinth/locale/bn/LC_MESSAGES/django.po index 0d9baf6be..443e0288f 100644 --- a/plinth/locale/bn/LC_MESSAGES/django.po +++ b/plinth/locale/bn/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-05 21:13-0500\n" +"POT-Creation-Date: 2022-12-19 20:15-0500\n" "PO-Revision-Date: 2021-06-16 07:33+0000\n" "Last-Translator: Oymate \n" "Language-Team: Bengali \n" "Language-Team: Czech \n" @@ -6282,7 +6282,7 @@ msgstr "Datum" #: plinth/modules/snapshot/templates/snapshot_delete_selected.html:42 #: plinth/modules/snapshot/templates/snapshot_manage.html:20 -#: plinth/modules/snapshot/views.py:194 +#: plinth/modules/snapshot/views.py:201 msgid "Delete Snapshots" msgstr "Smazat zachycené stavy" @@ -6351,37 +6351,37 @@ msgstr "apt" msgid "Manage Snapshots" msgstr "Spravovat zachycené stavy" -#: plinth/modules/snapshot/views.py:89 +#: plinth/modules/snapshot/views.py:96 msgid "Created snapshot." msgstr "Zachycený stav pořízen." -#: plinth/modules/snapshot/views.py:151 +#: plinth/modules/snapshot/views.py:158 msgid "Storage snapshots configuration updated" msgstr "Nastavení zachycování stavů úložiště aktualizováno" -#: plinth/modules/snapshot/views.py:155 +#: plinth/modules/snapshot/views.py:162 #, python-brace-format msgid "Action error: {0} [{1}] [{2}]" msgstr "Chyba akce: {0} [{1}] [{2}]" -#: plinth/modules/snapshot/views.py:181 +#: plinth/modules/snapshot/views.py:188 msgid "Deleted selected snapshots" msgstr "Označené zachycené stavy smazány" -#: plinth/modules/snapshot/views.py:186 +#: plinth/modules/snapshot/views.py:193 msgid "Snapshot is currently in use. Please try again later." msgstr "Zachycený stav je používán. Zkuste to později." -#: plinth/modules/snapshot/views.py:205 +#: plinth/modules/snapshot/views.py:212 #, 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:208 +#: plinth/modules/snapshot/views.py:215 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:218 +#: plinth/modules/snapshot/views.py:225 msgid "Rollback to Snapshot" msgstr "Vrátit do podoby zachyceného stavu" @@ -6402,10 +6402,8 @@ msgid "Secure Shell (SSH) Server" msgstr "Server zabezpečeného shellu (SSH)" #: plinth/modules/ssh/__init__.py:61 -#, fuzzy -#| msgid "Secure Shell (SSH)" msgid "Remotely login using Secure Shell (SSH)" -msgstr "Zabezpečený shell (SSH)" +msgstr "Vzdálené přihlášení pomocí Secure Shell (SSH)" #: plinth/modules/ssh/forms.py:13 msgid "Disable password authentication" @@ -6423,7 +6421,7 @@ msgstr "" #: plinth/modules/ssh/forms.py:21 msgid "Allow all users to login remotely" -msgstr "" +msgstr "Povolit všem uživatelům vzdálené přihlášení" #: plinth/modules/ssh/forms.py:22 msgid "" @@ -6431,6 +6429,9 @@ msgid "" "disabled, only users of groups root, admin and freedombox-ssh can login via " "SSH." msgstr "" +"Povolte všem uživatelům, kteří mají platný účet, vzdálené přihlášení přes " +"SSH. Pokud je vypnuto, mohou se přes SSH přihlásit pouze uživatelé skupin " +"root, admin a freedombox-ssh." #: plinth/modules/ssh/templates/ssh.html:11 msgid "Server Fingerprints" @@ -8042,34 +8043,34 @@ msgstr "Čeká na spuštění: {name}" msgid "Finished: {name}" msgstr "Dokončeno: {name}" -#: plinth/package.py:188 +#: plinth/package.py:195 #, python-brace-format msgid "Package {expression} is not available for install" msgstr "Balíček {expression} není k dispozici pro instalaci" -#: plinth/package.py:201 +#: plinth/package.py:208 #, python-brace-format msgid "Package {package_name} is the latest version ({latest_version})" msgstr "Balíček {package_name} je nejnovější verze ({latest_version})" -#: plinth/package.py:348 +#: plinth/package.py:355 msgid "installing" msgstr "Instalace" -#: plinth/package.py:350 +#: plinth/package.py:357 msgid "downloading" msgstr "stahování" -#: plinth/package.py:352 +#: plinth/package.py:359 msgid "media change" msgstr "změna média" -#: plinth/package.py:354 +#: plinth/package.py:361 #, python-brace-format msgid "configuration file: {file}" msgstr "soubor s nastaveními: {file}" -#: plinth/package.py:382 plinth/package.py:407 +#: plinth/package.py:389 plinth/package.py:414 msgid "Timeout waiting for package manager" msgstr "Časový limit čekání na správce balíčků" diff --git a/plinth/locale/da/LC_MESSAGES/django.po b/plinth/locale/da/LC_MESSAGES/django.po index ed825b547..536d323e1 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: 2022-12-05 21:13-0500\n" +"POT-Creation-Date: 2022-12-19 20:15-0500\n" "PO-Revision-Date: 2022-09-14 17:19+0000\n" "Last-Translator: ikmaak \n" "Language-Team: Danish \n" "Language-Team: German \n" @@ -19,7 +19,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 4.14.2-dev\n" +"X-Generator: Weblate 4.15-dev\n" #: doc/dev/_templates/layout.html:11 msgid "Page source" @@ -6402,7 +6402,7 @@ msgstr "Datum" #: plinth/modules/snapshot/templates/snapshot_delete_selected.html:42 #: plinth/modules/snapshot/templates/snapshot_manage.html:20 -#: plinth/modules/snapshot/views.py:194 +#: plinth/modules/snapshot/views.py:201 msgid "Delete Snapshots" msgstr "Speicherauszüge löschen" @@ -6472,40 +6472,40 @@ msgstr "apt" msgid "Manage Snapshots" msgstr "Schnappschüsse verwalten" -#: plinth/modules/snapshot/views.py:89 +#: plinth/modules/snapshot/views.py:96 msgid "Created snapshot." msgstr "Schnappschuss erstellt." -#: plinth/modules/snapshot/views.py:151 +#: plinth/modules/snapshot/views.py:158 msgid "Storage snapshots configuration updated" msgstr "Konfiguration der Speicherauszüge aktualisiert" -#: plinth/modules/snapshot/views.py:155 +#: plinth/modules/snapshot/views.py:162 #, python-brace-format msgid "Action error: {0} [{1}] [{2}]" msgstr "Aktionsfehler: {0} [{1}] [{2}]" -#: plinth/modules/snapshot/views.py:181 +#: plinth/modules/snapshot/views.py:188 msgid "Deleted selected snapshots" msgstr "Ausgewählte Schnappschüsse gelöscht" -#: plinth/modules/snapshot/views.py:186 +#: plinth/modules/snapshot/views.py:193 msgid "Snapshot is currently in use. Please try again later." msgstr "" "Schnappschüsse ist derzeit im Gebrauch. Bitte versuchen Sie es später noch " "einmal." -#: plinth/modules/snapshot/views.py:205 +#: plinth/modules/snapshot/views.py:212 #, python-brace-format msgid "Rolled back to snapshot #{number}." msgstr "Zurückgesetzt auf Speicherauszug #{number}." -#: plinth/modules/snapshot/views.py:208 +#: plinth/modules/snapshot/views.py:215 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:218 +#: plinth/modules/snapshot/views.py:225 msgid "Rollback to Snapshot" msgstr "Zurücksetzen auf Speicherauszug" @@ -6526,10 +6526,8 @@ msgid "Secure Shell (SSH) Server" msgstr "Secure Shell (SSH) Server" #: plinth/modules/ssh/__init__.py:61 -#, fuzzy -#| msgid "Secure Shell (SSH)" msgid "Remotely login using Secure Shell (SSH)" -msgstr "Secure Shell (SSH)" +msgstr "Remote-Anmeldung mit Secure Shell (SSH)" #: plinth/modules/ssh/forms.py:13 msgid "Disable password authentication" @@ -6547,7 +6545,7 @@ msgstr "" #: plinth/modules/ssh/forms.py:21 msgid "Allow all users to login remotely" -msgstr "" +msgstr "Allen Benutzern Remote-Anmeldung erlauben" #: plinth/modules/ssh/forms.py:22 msgid "" @@ -6555,6 +6553,9 @@ msgid "" "disabled, only users of groups root, admin and freedombox-ssh can login via " "SSH." msgstr "" +"Erlaubt allen Benutzern, die ein gültiges Konto haben, sich per SSH " +"anzumelden. Falls deaktiviert, können sich nur Benutzer der Gruppen root, " +"admin und freedombox-ssh über SSH anmelden." #: plinth/modules/ssh/templates/ssh.html:11 msgid "Server Fingerprints" @@ -8217,34 +8218,34 @@ msgstr "Warten auf den Start: {name}" msgid "Finished: {name}" msgstr "Fertig: {name}" -#: plinth/package.py:188 +#: plinth/package.py:195 #, python-brace-format msgid "Package {expression} is not available for install" msgstr "Paket {expression} ist nicht verfügbar" -#: plinth/package.py:201 +#: plinth/package.py:208 #, python-brace-format msgid "Package {package_name} is the latest version ({latest_version})" msgstr "Paket {package_name} ist die aktuellste Version ({latest_version})" -#: plinth/package.py:348 +#: plinth/package.py:355 msgid "installing" msgstr "Installation läuft" -#: plinth/package.py:350 +#: plinth/package.py:357 msgid "downloading" msgstr "herunterladen" -#: plinth/package.py:352 +#: plinth/package.py:359 msgid "media change" msgstr "Medienwechsel" -#: plinth/package.py:354 +#: plinth/package.py:361 #, python-brace-format msgid "configuration file: {file}" msgstr "Konfigurationsdatei: {file}" -#: plinth/package.py:382 plinth/package.py:407 +#: plinth/package.py:389 plinth/package.py:414 msgid "Timeout waiting for package manager" msgstr "Zeitüberschreitung beim Warten auf den Paket-Manager" diff --git a/plinth/locale/django.pot b/plinth/locale/django.pot index 7fa5905b7..49a75fbdd 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: 2022-12-05 21:13-0500\n" +"POT-Creation-Date: 2022-12-19 20:15-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -5476,7 +5476,7 @@ msgstr "" #: plinth/modules/snapshot/templates/snapshot_delete_selected.html:42 #: plinth/modules/snapshot/templates/snapshot_manage.html:20 -#: plinth/modules/snapshot/views.py:194 +#: plinth/modules/snapshot/views.py:201 msgid "Delete Snapshots" msgstr "" @@ -5540,37 +5540,37 @@ msgstr "" msgid "Manage Snapshots" msgstr "" -#: plinth/modules/snapshot/views.py:89 +#: plinth/modules/snapshot/views.py:96 msgid "Created snapshot." msgstr "" -#: plinth/modules/snapshot/views.py:151 +#: plinth/modules/snapshot/views.py:158 msgid "Storage snapshots configuration updated" msgstr "" -#: plinth/modules/snapshot/views.py:155 +#: plinth/modules/snapshot/views.py:162 #, python-brace-format msgid "Action error: {0} [{1}] [{2}]" msgstr "" -#: plinth/modules/snapshot/views.py:181 +#: plinth/modules/snapshot/views.py:188 msgid "Deleted selected snapshots" msgstr "" -#: plinth/modules/snapshot/views.py:186 +#: plinth/modules/snapshot/views.py:193 msgid "Snapshot is currently in use. Please try again later." msgstr "" -#: plinth/modules/snapshot/views.py:205 +#: plinth/modules/snapshot/views.py:212 #, python-brace-format msgid "Rolled back to snapshot #{number}." msgstr "" -#: plinth/modules/snapshot/views.py:208 +#: plinth/modules/snapshot/views.py:215 msgid "The system must be restarted to complete the rollback." msgstr "" -#: plinth/modules/snapshot/views.py:218 +#: plinth/modules/snapshot/views.py:225 msgid "Rollback to Snapshot" msgstr "" @@ -7029,34 +7029,34 @@ msgstr "" msgid "Finished: {name}" msgstr "" -#: plinth/package.py:188 +#: plinth/package.py:195 #, python-brace-format msgid "Package {expression} is not available for install" msgstr "" -#: plinth/package.py:201 +#: plinth/package.py:208 #, python-brace-format msgid "Package {package_name} is the latest version ({latest_version})" msgstr "" -#: plinth/package.py:348 +#: plinth/package.py:355 msgid "installing" msgstr "" -#: plinth/package.py:350 +#: plinth/package.py:357 msgid "downloading" msgstr "" -#: plinth/package.py:352 +#: plinth/package.py:359 msgid "media change" msgstr "" -#: plinth/package.py:354 +#: plinth/package.py:361 #, python-brace-format msgid "configuration file: {file}" msgstr "" -#: plinth/package.py:382 plinth/package.py:407 +#: plinth/package.py:389 plinth/package.py:414 msgid "Timeout waiting for package manager" msgstr "" diff --git a/plinth/locale/el/LC_MESSAGES/django.po b/plinth/locale/el/LC_MESSAGES/django.po index 59067217d..f129dcdf8 100644 --- a/plinth/locale/el/LC_MESSAGES/django.po +++ b/plinth/locale/el/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-05 21:13-0500\n" +"POT-Creation-Date: 2022-12-19 20:15-0500\n" "PO-Revision-Date: 2022-09-14 17:20+0000\n" "Last-Translator: ikmaak \n" "Language-Team: Greek \n" "Language-Team: Spanish \n" "Language-Team: Persian \n" "Language-Team: Plinth Developers \n" "Language-Team: French \n" "Language-Team: Galician \n" "Language-Team: Gujarati \n" "Language-Team: Hindi \n" "Language-Team: Hungarian \n" "Language-Team: Indonesian \n" "Language-Team: Italian \n" "Language-Team: Japanese \n" "Language-Team: Kannada \n" "Language-Team: Lithuanian \n" "Language-Team: Latvian \n" "Language-Team: Norwegian Bokmål \n" "Language-Team: Dutch \n" @@ -6340,7 +6340,7 @@ msgstr "Datum" #: plinth/modules/snapshot/templates/snapshot_delete_selected.html:42 #: plinth/modules/snapshot/templates/snapshot_manage.html:20 -#: plinth/modules/snapshot/views.py:194 +#: plinth/modules/snapshot/views.py:201 msgid "Delete Snapshots" msgstr "Snapshots verwijderen" @@ -6410,38 +6410,38 @@ msgstr "apt" msgid "Manage Snapshots" msgstr "Beheren van Snapshots" -#: plinth/modules/snapshot/views.py:89 +#: plinth/modules/snapshot/views.py:96 msgid "Created snapshot." msgstr "Gemaakte snapshot." -#: plinth/modules/snapshot/views.py:151 +#: plinth/modules/snapshot/views.py:158 msgid "Storage snapshots configuration updated" msgstr "Opslag van Snapshots configuratie is bijgewerkt" -#: plinth/modules/snapshot/views.py:155 +#: plinth/modules/snapshot/views.py:162 #, python-brace-format msgid "Action error: {0} [{1}] [{2}]" msgstr "Actiefout: {0} [{1}] [{2}]" -#: plinth/modules/snapshot/views.py:181 +#: plinth/modules/snapshot/views.py:188 msgid "Deleted selected snapshots" msgstr "Verwijderde geselecteerde snapshots" -#: plinth/modules/snapshot/views.py:186 +#: plinth/modules/snapshot/views.py:193 msgid "Snapshot is currently in use. Please try again later." msgstr "Snapshot is momenteel in gebruik. Probeer het later nog eens." -#: plinth/modules/snapshot/views.py:205 +#: plinth/modules/snapshot/views.py:212 #, python-brace-format msgid "Rolled back to snapshot #{number}." msgstr "Teruggezet naar snapshot #{number}." -#: plinth/modules/snapshot/views.py:208 +#: plinth/modules/snapshot/views.py:215 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:218 +#: plinth/modules/snapshot/views.py:225 msgid "Rollback to Snapshot" msgstr "Terugdraaien naar Snapshot" @@ -6462,10 +6462,8 @@ msgid "Secure Shell (SSH) Server" msgstr "Secure Shell (SSH) Server" #: plinth/modules/ssh/__init__.py:61 -#, fuzzy -#| msgid "Secure Shell (SSH)" msgid "Remotely login using Secure Shell (SSH)" -msgstr "Secure Shell (SSH)" +msgstr "Op afstand inloggen met Secure Shell (SSH)" #: plinth/modules/ssh/forms.py:13 msgid "Disable password authentication" @@ -6483,7 +6481,7 @@ msgstr "" #: plinth/modules/ssh/forms.py:21 msgid "Allow all users to login remotely" -msgstr "" +msgstr "Alle gebruikers toestaan om op afstand in te loggen" #: plinth/modules/ssh/forms.py:22 msgid "" @@ -6491,6 +6489,9 @@ msgid "" "disabled, only users of groups root, admin and freedombox-ssh can login via " "SSH." msgstr "" +"Sta alle gebruikers met een geldig account toe om op afstand in te loggen " +"via SSH. Als dit is uitgeschakeld, kunnen alleen gebruikers van de groepen " +"root, admin en freedombox-ssh inloggen via SSH." #: plinth/modules/ssh/templates/ssh.html:11 msgid "Server Fingerprints" @@ -8128,34 +8129,34 @@ msgstr "Wachten om te starten: {name}" msgid "Finished: {name}" msgstr "Klaar: {name}" -#: plinth/package.py:188 +#: plinth/package.py:195 #, python-brace-format msgid "Package {expression} is not available for install" msgstr "Pakket {expression} is niet beschikbaar voor installatie" -#: plinth/package.py:201 +#: plinth/package.py:208 #, python-brace-format msgid "Package {package_name} is the latest version ({latest_version})" msgstr "Pakket {package_name} is de nieuwste versie ({latest_version})" -#: plinth/package.py:348 +#: plinth/package.py:355 msgid "installing" msgstr "installeren" -#: plinth/package.py:350 +#: plinth/package.py:357 msgid "downloading" msgstr "downloaden" -#: plinth/package.py:352 +#: plinth/package.py:359 msgid "media change" msgstr "media wijzigen" -#: plinth/package.py:354 +#: plinth/package.py:361 #, python-brace-format msgid "configuration file: {file}" msgstr "configuratiebestand: {file}" -#: plinth/package.py:382 plinth/package.py:407 +#: plinth/package.py:389 plinth/package.py:414 msgid "Timeout waiting for package manager" msgstr "Time-out wachtend op pakketbeheerder" diff --git a/plinth/locale/pl/LC_MESSAGES/django.po b/plinth/locale/pl/LC_MESSAGES/django.po index dbadd3a9f..f6a564430 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: 2022-12-05 21:13-0500\n" +"POT-Creation-Date: 2022-12-19 20:15-0500\n" "PO-Revision-Date: 2022-09-14 17:19+0000\n" "Last-Translator: ikmaak \n" "Language-Team: Polish \n" "Language-Team: Portuguese \n" "Language-Team: Russian \n" "Language-Team: Sinhala \n" "Language-Team: Slovenian \n" "Language-Team: Albanian \n" "Language-Team: Serbian \n" "Language-Team: Swedish \n" "Language-Team: LANGUAGE \n" @@ -5477,7 +5477,7 @@ msgstr "" #: plinth/modules/snapshot/templates/snapshot_delete_selected.html:42 #: plinth/modules/snapshot/templates/snapshot_manage.html:20 -#: plinth/modules/snapshot/views.py:194 +#: plinth/modules/snapshot/views.py:201 msgid "Delete Snapshots" msgstr "" @@ -5541,37 +5541,37 @@ msgstr "" msgid "Manage Snapshots" msgstr "" -#: plinth/modules/snapshot/views.py:89 +#: plinth/modules/snapshot/views.py:96 msgid "Created snapshot." msgstr "" -#: plinth/modules/snapshot/views.py:151 +#: plinth/modules/snapshot/views.py:158 msgid "Storage snapshots configuration updated" msgstr "" -#: plinth/modules/snapshot/views.py:155 +#: plinth/modules/snapshot/views.py:162 #, python-brace-format msgid "Action error: {0} [{1}] [{2}]" msgstr "" -#: plinth/modules/snapshot/views.py:181 +#: plinth/modules/snapshot/views.py:188 msgid "Deleted selected snapshots" msgstr "" -#: plinth/modules/snapshot/views.py:186 +#: plinth/modules/snapshot/views.py:193 msgid "Snapshot is currently in use. Please try again later." msgstr "" -#: plinth/modules/snapshot/views.py:205 +#: plinth/modules/snapshot/views.py:212 #, python-brace-format msgid "Rolled back to snapshot #{number}." msgstr "" -#: plinth/modules/snapshot/views.py:208 +#: plinth/modules/snapshot/views.py:215 msgid "The system must be restarted to complete the rollback." msgstr "" -#: plinth/modules/snapshot/views.py:218 +#: plinth/modules/snapshot/views.py:225 msgid "Rollback to Snapshot" msgstr "" @@ -7030,34 +7030,34 @@ msgstr "" msgid "Finished: {name}" msgstr "" -#: plinth/package.py:188 +#: plinth/package.py:195 #, python-brace-format msgid "Package {expression} is not available for install" msgstr "" -#: plinth/package.py:201 +#: plinth/package.py:208 #, python-brace-format msgid "Package {package_name} is the latest version ({latest_version})" msgstr "" -#: plinth/package.py:348 +#: plinth/package.py:355 msgid "installing" msgstr "" -#: plinth/package.py:350 +#: plinth/package.py:357 msgid "downloading" msgstr "" -#: plinth/package.py:352 +#: plinth/package.py:359 msgid "media change" msgstr "" -#: plinth/package.py:354 +#: plinth/package.py:361 #, python-brace-format msgid "configuration file: {file}" msgstr "" -#: plinth/package.py:382 plinth/package.py:407 +#: plinth/package.py:389 plinth/package.py:414 msgid "Timeout waiting for package manager" msgstr "" diff --git a/plinth/locale/te/LC_MESSAGES/django.po b/plinth/locale/te/LC_MESSAGES/django.po index abe324465..040a5e20e 100644 --- a/plinth/locale/te/LC_MESSAGES/django.po +++ b/plinth/locale/te/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: FreedomBox UI\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-05 21:13-0500\n" +"POT-Creation-Date: 2022-12-19 20:15-0500\n" "PO-Revision-Date: 2022-03-02 12:27+0000\n" "Last-Translator: James Valleroy \n" "Language-Team: Telugu \n" "Language-Team: Turkish \n" @@ -6306,7 +6306,7 @@ msgstr "Tarih" #: plinth/modules/snapshot/templates/snapshot_delete_selected.html:42 #: plinth/modules/snapshot/templates/snapshot_manage.html:20 -#: plinth/modules/snapshot/views.py:194 +#: plinth/modules/snapshot/views.py:201 msgid "Delete Snapshots" msgstr "Anlık Görüntüleri Sil" @@ -6376,38 +6376,38 @@ msgstr "apt" msgid "Manage Snapshots" msgstr "Anlık Görüntüleri Yönet" -#: plinth/modules/snapshot/views.py:89 +#: plinth/modules/snapshot/views.py:96 msgid "Created snapshot." msgstr "Anlık görüntü oluşturuldu." -#: plinth/modules/snapshot/views.py:151 +#: plinth/modules/snapshot/views.py:158 msgid "Storage snapshots configuration updated" msgstr "Depolama anlık görüntü yapılandırması güncellendi" -#: plinth/modules/snapshot/views.py:155 +#: plinth/modules/snapshot/views.py:162 #, python-brace-format msgid "Action error: {0} [{1}] [{2}]" msgstr "Eylem hatası: {0} [{1}] [{2}]" -#: plinth/modules/snapshot/views.py:181 +#: plinth/modules/snapshot/views.py:188 msgid "Deleted selected snapshots" msgstr "Seçilen anlık görüntüler silindi" -#: plinth/modules/snapshot/views.py:186 +#: plinth/modules/snapshot/views.py:193 msgid "Snapshot is currently in use. Please try again later." msgstr "Anlık görüntü şu anda kullanımda. Lütfen daha sonra tekrar deneyin." -#: plinth/modules/snapshot/views.py:205 +#: plinth/modules/snapshot/views.py:212 #, python-brace-format msgid "Rolled back to snapshot #{number}." msgstr "#{number} nolu anlık görüntüye geri alındı." -#: plinth/modules/snapshot/views.py:208 +#: plinth/modules/snapshot/views.py:215 msgid "The system must be restarted to complete the rollback." msgstr "" "Geri alma işlemini tamamlamak için sistem yeniden başlatılmak zorundadır." -#: plinth/modules/snapshot/views.py:218 +#: plinth/modules/snapshot/views.py:225 msgid "Rollback to Snapshot" msgstr "Anlık Görüntüye Geri Al" @@ -6428,10 +6428,8 @@ msgid "Secure Shell (SSH) Server" msgstr "Güvenli Kabuk (SSH) Sunucusu" #: plinth/modules/ssh/__init__.py:61 -#, fuzzy -#| msgid "Secure Shell (SSH)" msgid "Remotely login using Secure Shell (SSH)" -msgstr "Güvenli Kabuk (SSH)" +msgstr "Güvenli Kabuk (SSH) kullanarak uzaktan oturum açın" #: plinth/modules/ssh/forms.py:13 msgid "Disable password authentication" @@ -6449,7 +6447,7 @@ msgstr "" #: plinth/modules/ssh/forms.py:21 msgid "Allow all users to login remotely" -msgstr "" +msgstr "Tüm kullanıcıların uzaktan oturum açmasına izin ver" #: plinth/modules/ssh/forms.py:22 msgid "" @@ -6457,6 +6455,9 @@ msgid "" "disabled, only users of groups root, admin and freedombox-ssh can login via " "SSH." msgstr "" +"Geçerli bir hesabı olan tüm kullanıcıların SSH aracılığıyla uzaktan oturum " +"açmasını sağlar. Etkisizleştirildiğinde, sadece root, admin ve freedombox-" +"ssh gruplarının kullanıcıları SSH aracılığıyla oturum açabilir." #: plinth/modules/ssh/templates/ssh.html:11 msgid "Server Fingerprints" @@ -8081,34 +8082,34 @@ msgstr "Başlamak için bekleniyor: {name}" msgid "Finished: {name}" msgstr "Tamamlandı: {name}" -#: plinth/package.py:188 +#: plinth/package.py:195 #, python-brace-format msgid "Package {expression} is not available for install" msgstr "{expression} paketi yükleme için mevcut değil" -#: plinth/package.py:201 +#: plinth/package.py:208 #, python-brace-format msgid "Package {package_name} is the latest version ({latest_version})" msgstr "{package_name} paketi en son sürümdür ({latest_version})" -#: plinth/package.py:348 +#: plinth/package.py:355 msgid "installing" msgstr "yükleniyor" -#: plinth/package.py:350 +#: plinth/package.py:357 msgid "downloading" msgstr "indiriliyor" -#: plinth/package.py:352 +#: plinth/package.py:359 msgid "media change" msgstr "ortam değiştirme" -#: plinth/package.py:354 +#: plinth/package.py:361 #, python-brace-format msgid "configuration file: {file}" msgstr "yapılandırma dosyası: {file}" -#: plinth/package.py:382 plinth/package.py:407 +#: plinth/package.py:389 plinth/package.py:414 msgid "Timeout waiting for package manager" msgstr "Paket yöneticisini beklerken zaman aşımı oldu" diff --git a/plinth/locale/uk/LC_MESSAGES/django.po b/plinth/locale/uk/LC_MESSAGES/django.po index 522685748..f54674a9c 100644 --- a/plinth/locale/uk/LC_MESSAGES/django.po +++ b/plinth/locale/uk/LC_MESSAGES/django.po @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-05 21:13-0500\n" -"PO-Revision-Date: 2022-10-16 14:35+0000\n" -"Last-Translator: Tymofii Lytvynenko \n" +"POT-Creation-Date: 2022-12-19 20:15-0500\n" +"PO-Revision-Date: 2022-12-07 20:48+0000\n" +"Last-Translator: Ihor Hordiichuk \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -6306,7 +6306,7 @@ msgstr "Дата" #: plinth/modules/snapshot/templates/snapshot_delete_selected.html:42 #: plinth/modules/snapshot/templates/snapshot_manage.html:20 -#: plinth/modules/snapshot/views.py:194 +#: plinth/modules/snapshot/views.py:201 msgid "Delete Snapshots" msgstr "Видалити зріз" @@ -6374,37 +6374,37 @@ msgstr "apt" msgid "Manage Snapshots" msgstr "Керування зрізами" -#: plinth/modules/snapshot/views.py:89 +#: plinth/modules/snapshot/views.py:96 msgid "Created snapshot." msgstr "Створено зріз." -#: plinth/modules/snapshot/views.py:151 +#: plinth/modules/snapshot/views.py:158 msgid "Storage snapshots configuration updated" msgstr "Налаштування зрізів сховища оновлено" -#: plinth/modules/snapshot/views.py:155 +#: plinth/modules/snapshot/views.py:162 #, python-brace-format msgid "Action error: {0} [{1}] [{2}]" msgstr "Помилка дії: {0} [{1}] [{2}]" -#: plinth/modules/snapshot/views.py:181 +#: plinth/modules/snapshot/views.py:188 msgid "Deleted selected snapshots" msgstr "Видалити вибрані зрізи" -#: plinth/modules/snapshot/views.py:186 +#: plinth/modules/snapshot/views.py:193 msgid "Snapshot is currently in use. Please try again later." msgstr "Зріз зараз використовується. Повторіть пізніше." -#: plinth/modules/snapshot/views.py:205 +#: plinth/modules/snapshot/views.py:212 #, python-brace-format msgid "Rolled back to snapshot #{number}." msgstr "Відкочено до зрізу #{number}." -#: plinth/modules/snapshot/views.py:208 +#: plinth/modules/snapshot/views.py:215 msgid "The system must be restarted to complete the rollback." msgstr "Систему потрібно перезапустити, щоб завершити відкат." -#: plinth/modules/snapshot/views.py:218 +#: plinth/modules/snapshot/views.py:225 msgid "Rollback to Snapshot" msgstr "Повернутися до знімка" @@ -6425,10 +6425,8 @@ msgid "Secure Shell (SSH) Server" msgstr "Сервер захищеної оболонки (SSH)" #: plinth/modules/ssh/__init__.py:61 -#, fuzzy -#| msgid "Secure Shell (SSH)" msgid "Remotely login using Secure Shell (SSH)" -msgstr "Захищена оболонка (SSH)" +msgstr "Віддалений вхід за допомогою Secure Shell (SSH)" #: plinth/modules/ssh/forms.py:13 msgid "Disable password authentication" @@ -6446,7 +6444,7 @@ msgstr "" #: plinth/modules/ssh/forms.py:21 msgid "Allow all users to login remotely" -msgstr "" +msgstr "Дозволити всім користувачам входити віддалено" #: plinth/modules/ssh/forms.py:22 msgid "" @@ -6454,6 +6452,9 @@ msgid "" "disabled, only users of groups root, admin and freedombox-ssh can login via " "SSH." msgstr "" +"Дозволити всім користувачам, які мають дійсний обліковий запис, віддалено " +"входити через SSH. Якщо вимкнено, лише користувачі груп root, admin і " +"freedombox-ssh можуть увійти через SSH." #: plinth/modules/ssh/templates/ssh.html:11 msgid "Server Fingerprints" @@ -8071,34 +8072,34 @@ msgstr "Очікування запуску: {name}" msgid "Finished: {name}" msgstr "Завершено: {name}" -#: plinth/package.py:188 +#: plinth/package.py:195 #, python-brace-format msgid "Package {expression} is not available for install" msgstr "Пакунок {expression} недоступний для встановлення" -#: plinth/package.py:201 +#: plinth/package.py:208 #, python-brace-format msgid "Package {package_name} is the latest version ({latest_version})" msgstr "Пакунок {package_name} має останню версію ({latest_version})" -#: plinth/package.py:348 +#: plinth/package.py:355 msgid "installing" msgstr "встановлення" -#: plinth/package.py:350 +#: plinth/package.py:357 msgid "downloading" msgstr "завантаження" -#: plinth/package.py:352 +#: plinth/package.py:359 msgid "media change" msgstr "зміна медія" -#: plinth/package.py:354 +#: plinth/package.py:361 #, python-brace-format msgid "configuration file: {file}" msgstr "файл конфіґурації: {file}" -#: plinth/package.py:382 plinth/package.py:407 +#: plinth/package.py:389 plinth/package.py:414 msgid "Timeout waiting for package manager" msgstr "Час очікування менеджера пакунків" diff --git a/plinth/locale/vi/LC_MESSAGES/django.po b/plinth/locale/vi/LC_MESSAGES/django.po index 5ec5956b3..11cdaff64 100644 --- a/plinth/locale/vi/LC_MESSAGES/django.po +++ b/plinth/locale/vi/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-05 21:13-0500\n" +"POT-Creation-Date: 2022-12-19 20:15-0500\n" "PO-Revision-Date: 2021-07-28 08:34+0000\n" "Last-Translator: bruh \n" "Language-Team: Vietnamese \n" +"POT-Creation-Date: 2022-12-19 20:15-0500\n" +"PO-Revision-Date: 2022-12-07 20:48+0000\n" +"Last-Translator: Eric \n" "Language-Team: Chinese (Simplified) \n" "Language: zh_Hans\n" @@ -5705,7 +5705,7 @@ msgstr "日期" #: plinth/modules/snapshot/templates/snapshot_delete_selected.html:42 #: plinth/modules/snapshot/templates/snapshot_manage.html:20 -#: plinth/modules/snapshot/views.py:194 +#: plinth/modules/snapshot/views.py:201 msgid "Delete Snapshots" msgstr "删除快照" @@ -5771,37 +5771,37 @@ msgstr "" msgid "Manage Snapshots" msgstr "管理快照" -#: plinth/modules/snapshot/views.py:89 +#: plinth/modules/snapshot/views.py:96 msgid "Created snapshot." msgstr "创建快照。" -#: plinth/modules/snapshot/views.py:151 +#: plinth/modules/snapshot/views.py:158 msgid "Storage snapshots configuration updated" msgstr "存储快照配置已更新" -#: plinth/modules/snapshot/views.py:155 +#: plinth/modules/snapshot/views.py:162 #, python-brace-format msgid "Action error: {0} [{1}] [{2}]" msgstr "操作错误:{0} [{1}] [{2}]" -#: plinth/modules/snapshot/views.py:181 +#: plinth/modules/snapshot/views.py:188 msgid "Deleted selected snapshots" msgstr "已删除选定的快照" -#: plinth/modules/snapshot/views.py:186 +#: plinth/modules/snapshot/views.py:193 msgid "Snapshot is currently in use. Please try again later." msgstr "" -#: plinth/modules/snapshot/views.py:205 +#: plinth/modules/snapshot/views.py:212 #, python-brace-format msgid "Rolled back to snapshot #{number}." msgstr "回滚到快照 #{number}。" -#: plinth/modules/snapshot/views.py:208 +#: plinth/modules/snapshot/views.py:215 msgid "The system must be restarted to complete the rollback." msgstr "系统需要重启以完成完全回滚。" -#: plinth/modules/snapshot/views.py:218 +#: plinth/modules/snapshot/views.py:225 msgid "Rollback to Snapshot" msgstr "回滚到快照" @@ -5818,10 +5818,8 @@ msgid "Secure Shell (SSH) Server" msgstr "安全 Shell(SSH)服务器" #: plinth/modules/ssh/__init__.py:61 -#, fuzzy -#| msgid "Secure Shell (SSH)" msgid "Remotely login using Secure Shell (SSH)" -msgstr "安全 Shell(SSH)" +msgstr "使用 Secure Shell(SSH 远程登录" #: plinth/modules/ssh/forms.py:13 msgid "Disable password authentication" @@ -7298,34 +7296,34 @@ msgstr "" msgid "Finished: {name}" msgstr "已完成:{name}" -#: plinth/package.py:188 +#: plinth/package.py:195 #, python-brace-format msgid "Package {expression} is not available for install" msgstr "" -#: plinth/package.py:201 +#: plinth/package.py:208 #, python-brace-format msgid "Package {package_name} is the latest version ({latest_version})" msgstr "" -#: plinth/package.py:348 +#: plinth/package.py:355 msgid "installing" msgstr "安装" -#: plinth/package.py:350 +#: plinth/package.py:357 msgid "downloading" msgstr "下载中" -#: plinth/package.py:352 +#: plinth/package.py:359 msgid "media change" msgstr "媒体改变" -#: plinth/package.py:354 +#: plinth/package.py:361 #, python-brace-format msgid "configuration file: {file}" msgstr "配置文件:{file}" -#: plinth/package.py:382 plinth/package.py:407 +#: plinth/package.py:389 plinth/package.py:414 msgid "Timeout waiting for package manager" msgstr "" diff --git a/plinth/locale/zh_Hant/LC_MESSAGES/django.po b/plinth/locale/zh_Hant/LC_MESSAGES/django.po index cfe073497..5f2c22d07 100644 --- a/plinth/locale/zh_Hant/LC_MESSAGES/django.po +++ b/plinth/locale/zh_Hant/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-12-05 21:13-0500\n" +"POT-Creation-Date: 2022-12-19 20:15-0500\n" "PO-Revision-Date: 2021-12-23 12:50+0000\n" "Last-Translator: pesder \n" "Language-Team: Chinese (Traditional) Tuple[bool, str]: with open(SOURCES_LIST, 'w', encoding='utf-8') as sources_list: for line in lines: - # E.g. replace 'buster' with 'bullseye'. + # E.g. replace 'bullseye' with 'bookworm'. new_line = line.replace(dist, codename) if check_dist == 'testing': - # E.g. replace 'stable' with 'bullseye'. + # E.g. replace 'stable' with 'bookworm'. new_line = new_line.replace('stable', codename) - # Security suite name renamed starting with bullseye - if 'security' in new_line: - new_line = new_line.replace('/updates', '-security') - sources_list.write(new_line) logging.info('Dist upgrade in progress. Setting flag.') diff --git a/plinth/modules/users/tests/test_privileged.py b/plinth/modules/users/tests/test_privileged.py index 268a48aba..0852b01f9 100644 --- a/plinth/modules/users/tests/test_privileged.py +++ b/plinth/modules/users/tests/test_privileged.py @@ -246,7 +246,7 @@ def test_change_other_users_password_as_non_admin(): username2, _ = _create_user() new_password = 'pass $123' - with pytest.raises(subprocess.CalledProcessError): + with pytest.raises(PermissionError): privileged.set_user_password(username2, new_password, username1, password1) @@ -326,8 +326,7 @@ def test_groups(): groupname = _random_string() _create_group(groupname) - with pytest.raises(subprocess.CalledProcessError): - subprocess.run(['ldapgid', groupname], check=True) + subprocess.run(['ldapgid', groupname], check=True) # create-group is idempotent privileged.create_group(groupname) diff --git a/plinth/modules/wordpress/__init__.py b/plinth/modules/wordpress/__init__.py index 7b933a79c..f63bdd238 100644 --- a/plinth/modules/wordpress/__init__.py +++ b/plinth/modules/wordpress/__init__.py @@ -81,7 +81,9 @@ class WordPressApp(app_module.App): 'php-zip', # WordPress only supports MySQL/MariaDB as DB 'default-mysql-server', - ]) + ], + conflicts=['libpam-tmpdir'], + conflicts_action=Packages.ConflictsAction.REMOVE) self.add(packages) firewall = Firewall('firewall-wordpress', info.name, diff --git a/plinth/modules/wordpress/data/etc/apache2/conf-available/wordpress-freedombox.conf b/plinth/modules/wordpress/data/etc/apache2/conf-available/wordpress-freedombox.conf index 24ea002c4..c93ea1c49 100644 --- a/plinth/modules/wordpress/data/etc/apache2/conf-available/wordpress-freedombox.conf +++ b/plinth/modules/wordpress/data/etc/apache2/conf-available/wordpress-freedombox.conf @@ -8,6 +8,9 @@ ## mod_auth_pubtkt ## +# Redirect Webfinger queries, needed by ActivityPub plugin +RedirectMatch "^\/\.well-known\/webfinger(.*)$" "\/wordpress\/\.well-known\/webfinger$1" + # Match longer aliases first to meet expectations Alias /wordpress/wp-content /var/lib/wordpress/wp-content Alias /wordpress /usr/share/wordpress diff --git a/plinth/modules/zoph/__init__.py b/plinth/modules/zoph/__init__.py index 7ec541429..7d4b7f6c1 100644 --- a/plinth/modules/zoph/__init__.py +++ b/plinth/modules/zoph/__init__.py @@ -67,7 +67,9 @@ class ZophApp(app_module.App): login_required=True) self.add(shortcut) - packages = Packages('packages-zoph', ['zoph']) + packages = Packages('packages-zoph', ['zoph'], + conflicts=['libpam-tmpdir'], + conflicts_action=Packages.ConflictsAction.REMOVE) self.add(packages) firewall = Firewall('firewall-zoph', info.name, diff --git a/plinth/package.py b/plinth/package.py index c4e2a80dc..6ed4d2245 100644 --- a/plinth/package.py +++ b/plinth/package.py @@ -170,6 +170,13 @@ class Packages(app.FollowerComponent): def setup(self, old_version): """Install the packages.""" + packages_to_remove = self.find_conflicts() + if packages_to_remove and \ + self.conflicts_action not in (None, self.ConflictsAction.IGNORE): + logger.info('Removing conflicting packages: %s', + packages_to_remove) + uninstall(packages_to_remove) + install(self.get_actual_packages(), skip_recommends=self.skip_recommends) diff --git a/plinth/tests/test_package.py b/plinth/tests/test_package.py index 66ddafb15..3b40ae535 100644 --- a/plinth/tests/test_package.py +++ b/plinth/tests/test_package.py @@ -114,6 +114,36 @@ def test_packages_setup(install): install.assert_has_calls([call(['python3'], skip_recommends=False)]) +@patch('plinth.package.packages_installed') +@patch('plinth.package.uninstall') +@patch('plinth.package.install') +def test_packages_setup_with_conflicts(install, uninstall, packages_installed): + """Test setting up packages with conflicts.""" + packages_installed.return_value = ['exim4-base'] + + component = Packages('test-component', ['bash'], conflicts=['exim4-base'], + conflicts_action=Packages.ConflictsAction.REMOVE) + component.setup(old_version=0) + uninstall.assert_has_calls([call(['exim4-base'])]) + install.assert_has_calls([call(['bash'], skip_recommends=False)]) + + uninstall.reset_mock() + install.reset_mock() + component = Packages('test-component', ['bash'], conflicts=['exim4-base']) + component.setup(old_version=0) + uninstall.assert_not_called() + install.assert_has_calls([call(['bash'], skip_recommends=False)]) + + uninstall.reset_mock() + install.reset_mock() + component = Packages('test-component', ['bash'], + conflicts=['exim4-base', 'not-installed-package'], + conflicts_action=Packages.ConflictsAction.IGNORE) + component.setup(old_version=0) + uninstall.assert_not_called() + install.assert_has_calls([call(['bash'], skip_recommends=False)]) + + @patch('plinth.package.uninstall') def test_packages_uninstall(uninstall): """Test uninstalling packages component."""