update-manager: update patches for release 22.04.17

This commit is contained in:
Luis Guzmán 2023-12-13 19:04:32 +00:00
parent 6c22d50cf0
commit a5023df0f2
6 changed files with 149 additions and 1897 deletions

View file

@ -0,0 +1,38 @@
This patch now includes the l10n for the $DATA/prevent-autoconnection.patch
diff --git a/po/es.po b/po/es.po
index ca668e1..c18d0f8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -997,8 +997,8 @@ msgstr ""
#~ "actualización no puede continuar.\n"
#~ "Asegúrese de que el directorio de sistema permite escribir."
-#~ msgid "Include latest updates from the Internet?"
-#~ msgstr "¿Incluir las últimas actualizaciones desde Internet?"
+msgid "Include latest updates from the Internet?"
+msgstr "¿Incluir las últimas actualizaciones desde Internet?"
#~ msgid ""
#~ "The upgrade system can use the Internet to automatically download the "
@@ -2499,3 +2499,20 @@ msgstr ""
#~ "Estas actualizaciones de software se publicaron después del lanzamiento "
#~ "de esta versión de Trisquel. Si no quiere instalarlas ahora, abra más tarde "
#~ "el Gestor de actualizaciones desde el menú Administración."
+
+#: UpdateManager/Dialogs.py
+msgid "Check for Updates"
+msgstr "Buscar actualizaciones"
+
+#: UpdateManager/Dialogs.py
+msgid "Ask Me Later"
+msgstr "Preguntarme más tarde"
+
+msgid ""
+"To prevent unwanted connections to the Internet\n"
+"Trisquel will not automatically check for updates\n"
+"unless you say so in the Settings panel."
+msgstr ""
+"Para prevenir conexiones inesperadas a Internet\n"
+"Trisquel no descargará actualizaciones automáticamente\n"
+"salvo que lo indique en el panel de Configuración."

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,38 @@
This patch now includes the l10n for the $DATA/prevent-autoconnection.patch
diff --git a/po/fr.po b/po/fr.po
index ca668e1..c18d0f8 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -997,8 +997,8 @@ msgstr ""
#~ "actualización no puede continuar.\n"
#~ "Asegúrese de que el directorio de sistema permite escribir."
-#~ msgid "Include latest updates from the Internet?"
-#~ msgstr "Inclure les dernières mises à jour en provenance d'Internet ?"
+msgid "Include latest updates from the Internet?"
+msgstr "Inclure les dernières mises à jour depuis Internet ?"
#~ msgid ""
#~ "The upgrade system can use the Internet to automatically download the "
@@ -2499,3 +2499,20 @@ msgstr ""
#~ "sortie. Si vous ne voulez pas les installer maintenant, vous pourrez les "
#~ "installer plus tard à partir du « Gestionnaire de mises à jour » situé "
#~ "dans le menu Administration."
+
+#: UpdateManager/Dialogs.py
+msgid "Check for Updates"
+msgstr "Rechercher les mises à jour"
+
+#: UpdateManager/Dialogs.py
+msgid "Ask Me Later"
+msgstr "Me demander plus tard"
+
+msgid ""
+"To prevent unwanted connections to the Internet\n"
+"Trisquel will not automatically check for updates\n"
+"unless you say so in the Settings panel."
+msgstr ""
+"Afin déviter des connexions non désirées à Internet\n"
+"Trisquel ne recherchera pas automatiquement les mises à jour\n"
+"sauf à modifier les Paramètres en ce sens."

View file

@ -0,0 +1,38 @@
This patch now includes the l10n for the $DATA/prevent-autoconnection.patch
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 29e001e..6ec80c0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -993,8 +993,8 @@ msgstr ""
#~ "atualização não pode continuar.\n"
#~ "Por favor, tenha certeza que o diretório do sistema é gravável."
-#~ msgid "Include latest updates from the Internet?"
-#~ msgstr "Incluir as últimas atualizações através da Internet?"
+msgid "Include latest updates from the Internet?"
+msgstr "Incluir as últimas atualizações da Internet?"
#~ msgid ""
#~ "The upgrade system can use the Internet to automatically download the "
@@ -2483,3 +2483,20 @@ msgstr ""
#~ msgid "1 kB"
#~ msgstr "1 kB"
+
+#: UpdateManager/Dialogs.py
+msgid "Check for Updates"
+msgstr "Buscar atualizações"
+
+#: UpdateManager/Dialogs.py
+msgid "Ask Me Later"
+msgstr "Me pergunte mais tarde"
+
+msgid ""
+"To prevent unwanted connections to the Internet\n"
+"Trisquel will not automatically check for updates\n"
+"unless you say so in the Settings panel."
+msgstr ""
+"Para evitar conexões indesejadas a Internet\n"
+"Trisquel não busca atualizações automaticamente\n"
+"a menos que você ative isso no painel de Configurações."

View file

@ -1,7 +1,16 @@
diff -ru a/UpdateManager/Dialogs.py b/UpdateManager/Dialogs.py
--- a/UpdateManager/Dialogs.py 2022-04-11 07:56:45.000000000 +0000
+++ b/UpdateManager/Dialogs.py.clean 2022-06-21 18:44:39.204551351 +0000
@@ -148,70 +148,6 @@
diff --git a/UpdateManager/Dialogs.py b/UpdateManager/Dialogs.py
index a33f9c0..5a9e36c 100644
--- a/UpdateManager/Dialogs.py
+++ b/UpdateManager/Dialogs.py
@@ -38,7 +38,6 @@ import distro_info
import os
import HweSupportStatus.consts
-from .Core.LivePatchSocket import LivePatchSocket
from .Core.utils import get_dist
from gettext import gettext as _
@@ -148,62 +147,6 @@ class InternalDialog(BuilderDialog):
self.main_container.add(content_widget)
self.main_container.set_visible(bool(content_widget))
@ -10,25 +19,17 @@ diff -ru a/UpdateManager/Dialogs.py b/UpdateManager/Dialogs.py
- codename = get_dist()
- return di.is_lts(codename)
-
- def _has_livepatch_settings_ui(self):
- try:
- return Gio.DesktopAppInfo \
- .new('gnome-online-accounts-panel.desktop')
- except Exception:
- return None
-
- def on_livepatch_status_ready(self, active, cs, ps, fixes):
- self.set_desc(None)
-
- if not active:
- if self._is_livepatch_supported() and \
- self.settings_button and \
- self._has_livepatch_settings_ui() and \
- self.settings.get_int('launch-count') >= 4:
- self.set_desc(_("<b>Tip:</b> You can use Livepatch to "
- "keep your computer more secure between "
- "restarts."))
- self.settings_button.set_label(_("Settings & Livepatch…"))
- self.set_desc(_("<b>Tip:</b> You can use Livepatch with "
- "Ubuntu Pro to keep your computer more "
- "secure between restarts."))
- self.settings_button.set_label(_("Settings & Pro…"))
- return
-
- needs_reschedule = False
@ -72,3 +73,11 @@ diff -ru a/UpdateManager/Dialogs.py b/UpdateManager/Dialogs.py
class StoppedUpdatesDialog(InternalDialog):
def __init__(self, window_main):
InternalDialog.__init__(self, window_main)
@@ -227,7 +170,6 @@ class NoUpdatesDialog(InternalDialog):
self.settings_button = self.add_settings_button()
self.focus_button = self.add_button(Gtk.STOCK_OK,
self.window_main.close)
- self.check_livepatch_status()
class DistUpgradeDialog(InternalDialog):