From 8b251d698936694671e9a43876484c79227ae397 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org>
Date: Tue, 19 Dec 2023 02:02:46 +0000
Subject: [PATCH] software-properties: fix and improve l10n work.
---
.../l10n/es_po_r202312.po.patch | 16 ++++++++++++
.../l10n/fr_po_r202312.po.patch | 20 +++++++++++++++
...val_of_snaps_other_packages_referral.patch | 25 +++++++++++++++++++
helpers/make-software-properties | 11 +++++++-
4 files changed, 71 insertions(+), 1 deletion(-)
create mode 100644 helpers/DATA/software-properties/l10n/es_po_r202312.po.patch
create mode 100644 helpers/DATA/software-properties/l10n/fr_po_r202312.po.patch
create mode 100644 helpers/DATA/software-properties/removal_of_snaps_other_packages_referral.patch
diff --git a/helpers/DATA/software-properties/l10n/es_po_r202312.po.patch b/helpers/DATA/software-properties/l10n/es_po_r202312.po.patch
new file mode 100644
index 00000000..e0dcbb06
--- /dev/null
+++ b/helpers/DATA/software-properties/l10n/es_po_r202312.po.patch
@@ -0,0 +1,16 @@
+diff --git a/po/es.po b/po/es.po
+index e38d16e..49e88bf 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -2027,3 +2027,11 @@ msgstr "Servidor maÅ› cercano"
+ #~ "\n"
+ #~ "El gestor de actualizaciones encontró los siguientes paquetes "
+ #~ "actualizables. Puede actualizarlos usando el botón Instalar."
++
++# data/gtkbuilder/main.ui:822
++msgid "Notify me of a new Trisquel version:"
++msgstr "Notificarme de una nueva versión de Trisquel:"
++
++# data/gtkbuilder/main.ui:549
++msgid "This system has:"
++msgstr "Este sistema tiene:"
diff --git a/helpers/DATA/software-properties/l10n/fr_po_r202312.po.patch b/helpers/DATA/software-properties/l10n/fr_po_r202312.po.patch
new file mode 100644
index 00000000..c9525166
--- /dev/null
+++ b/helpers/DATA/software-properties/l10n/fr_po_r202312.po.patch
@@ -0,0 +1,20 @@
+diff --git a/po/fr.po b/po/fr.po
+index 70cb85e..0f9e7bd 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -2029,3 +2029,15 @@ msgstr "Serveur le plus proche"
+
+ #~ msgid "0"
+ #~ msgstr "0"
++
++# data/gtkbuilder/main.ui:822
++msgid "Notify me of a new Trisquel version:"
++msgstr "M’avertir lorsqu’une nouvelle version de Trisquel est disponible :"
++
++# data/gtkbuilder/main.ui:549
++msgid "This system has:"
++msgstr "Version actuelle du système :"
++
++# data/gtkbuilder/main.ui:682
++msgid "Automatically check for updates:"
++msgstr "Vérifier automatiquement si les logiciels sont à jour :"
diff --git a/helpers/DATA/software-properties/removal_of_snaps_other_packages_referral.patch b/helpers/DATA/software-properties/removal_of_snaps_other_packages_referral.patch
new file mode 100644
index 00000000..17944feb
--- /dev/null
+++ b/helpers/DATA/software-properties/removal_of_snaps_other_packages_referral.patch
@@ -0,0 +1,25 @@
+diff --git a/data/gtkbuilder/main.ui b/data/gtkbuilder/main.ui
+index c09f7d2..eda56c9 100644
+--- a/data/gtkbuilder/main.ui
++++ b/data/gtkbuilder/main.ui
+@@ -546,7 +546,7 @@
+ <object class="GtkLabel" id="label_updates_1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+- <property name="label" translatable="yes">For other packages, this system has:</property>
++ <property name="label" translatable="yes">This system has:</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+diff --git a/po/software-properties.pot b/po/software-properties.pot
+index a9c524a..db8462a 100644
+--- a/po/software-properties.pot
++++ b/po/software-properties.pot
+@@ -1146,3 +1146,7 @@ msgstr ""
+ #: ../data/gtkbuilder/dialog-ua-attach.ui.h:5
+ msgid "Attach"
+ msgstr ""
++
++# data/gtkbuilder/main.ui:549
++msgid "This system has:"
++msgstr ""
diff --git a/helpers/make-software-properties b/helpers/make-software-properties
index f46ebcb1..00bc6bc3 100644
--- a/helpers/make-software-properties
+++ b/helpers/make-software-properties
@@ -20,7 +20,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-VERSION=12
+VERSION=13
. ./config
@@ -79,6 +79,15 @@ patch --no-backup-if-mismatch -p1 < $DATA/remove_ubuntu_suscription_tab.patch
patch --no-backup-if-mismatch -p1 < $DATA/remove_proposed_updates.patch
#Patch codename for PPAs
patch --no-backup-if-mismatch -p1 < $DATA/fix_PPA_upstream_codename.patch
+#Fix mention of "other packages" as we don't distribute snap.
+patch --no-backup-if-mismatch -p1 < $DATA/removal_of_snaps_other_packages_referral.patch
+
+# Trisquel l10n modifications using git patches.
+for patch in $(ls -v ${DATA}/l10n/*.patch)
+do
+ echo "> Applying $patch"
+ patch --no-backup-if-mismatch -Np1 < $patch
+done
changelog "Removed Ubuntu-specifc tests, Livepatch, Snap and fix PPA integration."
--
GitLab