update-manager: update patches for release 22.04.17

helpers/DATA/update-manager/l10n/es_po_r202312.patch

@@ -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."

helpers/DATA/update-manager/l10n/fr_po_r202312.patch

@@ -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."

helpers/DATA/update-manager/l10n/pt_BR_po_r202312.patch

@@ -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."

helpers/DATA/update-manager/remove-livepatch2.patch

@@ -1,7 +1,16 @@
-diff -ru a/UpdateManager/Dialogs.py b/UpdateManager/Dialogs.py
+diff --git a/UpdateManager/Dialogs.py b/UpdateManager/Dialogs.py
---- a/UpdateManager/Dialogs.py	2022-04-11 07:56:45.000000000 +0000
+index a33f9c0..5a9e36c 100644
-+++ b/UpdateManager/Dialogs.py.clean	2022-06-21 18:44:39.204551351 +0000
+--- a/UpdateManager/Dialogs.py
-@@ -148,70 +148,6 @@
++++ 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 "
+-                self.set_desc(_("<b>Tip:</b> You can use Livepatch with "
--                                "keep your computer more secure between "
+-                                "Ubuntu Pro to keep your computer more "
--                                "restarts."))
+-                                "secure between restarts."))
--                self.settings_button.set_label(_("Settings & Livepatch…"))
+-                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):

helpers/make-update-manager

@@ -19,16 +19,14 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=20
+VERSION=21
 
 . ./config
 
 rm UpdateManager/Core/LivePatchSocket.py
 rm tests/test_livepatch_socket.py
+# Important patch make sure to update when necessary.
 patch --no-backup-if-mismatch -p1 < $DATA/remove-livepatch2.patch
-sed -i '/import LivePatchSocket/d' UpdateManager/Dialogs.py
-sed -i '/self.check_livepatch_status/d' UpdateManager/Dialogs.py
-
 sed -i "/ubuntu-advantage-tools/d" debian/control
 
 #Closes #12545
@@ -38,17 +36,7 @@ cp $DATA/index.docbook help/C/index.docbook
 
 # Prevent automated connections
 patch --no-backup-if-mismatch -p1 < $DATA/prevent-autoconnection.patch
-cat << EOF >> po/es.po
+# NOTE: prevent-autoconnection.patch l10n is now part of the DATA/l10n/ patches.
-
-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 indiques en el panel de Configuración."
-EOF
 
 replace internet Internet .
 replace Ubuntu Trisquel .
@@ -57,10 +45,10 @@ replace "Trisquel-Gettext" "Ubuntu-Gettext" .
 
 sed -i 's/Trisquel 20.04 LTS to Trisquel 22.04 LTS/Trisquel 10.0 LTS to Trisquel 11.0 LTS/' HweSupportStatus/consts.py
 
-replace ubuntu-desktop trisquel .
 replace kubuntu-desktop triskel .
 replace xubuntu-desktop trisquel-mini .
 replace edubuntu-desktop toast .
+replace ubuntu-desktop trisquel .
 
 sed '/%s base/ s/name.*/name = "Trisquel base"/' -i ./UpdateManager/Core/UpdateList.py
 sed 's_https://changelogs.ubuntu.com/changelogs/pool/_https://packages.trisquel.org/changelogs/pool/_' -i UpdateManager/Core/MyCache.py
@@ -82,9 +70,12 @@ sed -i '/do-partial-upgrade/s|ubuntu-release|trisquel-release|' UpdateManager/Di
 #Fix base_uri for trisquel meta-release-lts
 sed -i 's|changelogs.ubuntu.com/|archive.trisquel.org/trisquel/|' UpdateManager/Core/MetaRelease.py
 
-# l10n patch fixes
+# Trisquel l10n modifications using git patches.
-## es.po
+for patch in $(ls -v ${DATA}/l10n/*.patch)
-patch --no-backup-if-mismatch -p0 < $DATA/l10n/es_po_rev032023.patch
+do
+    echo "> Applying $patch"
+    patch --no-backup-if-mismatch -Np1 < $patch
+done
 
 changelog "Compiled for Trisquel"