From f0f32f7fd25ae7bef5115b50648a25e641711b02 Mon Sep 17 00:00:00 2001
From: Laura Arjona Reina <larjona@debian.org>
Date: Sun, 27 Dec 2020 19:42:34 +0100
Subject: use Micronews instead of identi.ca (bug #926131), use normal text
 link for planet, gettextize these two links

---
 english/Pics/identica.png                      | Bin 766 -> 0 bytes
 english/Pics/planet.png                        | Bin 454 -> 0 bytes
 english/po/templates.pot                       |  22 +++++++++++++++-------
 english/template/debian/common_translation.wml |   6 ++++++
 english/template/debian/footer.wml             |   6 ++----
 5 files changed, 23 insertions(+), 11 deletions(-)
 delete mode 100644 english/Pics/identica.png
 delete mode 100644 english/Pics/planet.png

diff --git a/english/Pics/identica.png b/english/Pics/identica.png
deleted file mode 100644
index 694b455fdf6..00000000000
Binary files a/english/Pics/identica.png and /dev/null differ
diff --git a/english/Pics/planet.png b/english/Pics/planet.png
deleted file mode 100644
index 88dde6f02c8..00000000000
Binary files a/english/Pics/planet.png and /dev/null differ
diff --git a/english/po/templates.pot b/english/po/templates.pot
index 8a033bbcef9..0360b8f6e25 100644
--- a/english/po/templates.pot
+++ b/english/po/templates.pot
@@ -136,6 +136,14 @@ msgid "The Debian Blog"
 msgstr ""
 
 #: ../../english/template/debian/common_translation.wml:94
+msgid "Debian Micronews"
+msgstr ""
+
+#: ../../english/template/debian/common_translation.wml:97
+msgid "Debian Planet"
+msgstr ""
+
+#: ../../english/template/debian/common_translation.wml:100
 msgid "Last Updated"
 msgstr ""
 
@@ -180,31 +188,31 @@ msgstr ""
 #. you can add some information of your own translation mailing list
 #. (i.e. debian-l10n-XXXXXX@lists.debian.org) for reporting things in
 #. your language.
-#: ../../english/template/debian/footer.wml:91
+#: ../../english/template/debian/footer.wml:89
 msgid "To report a problem with the web site, please e-mail our publicly archived mailing list <a href=\"mailto:debian-www@lists.debian.org\">debian-www@lists.debian.org</a> in English.  For other contact information, see the Debian <a href=\"m4_HOME/contact\">contact page</a>. Web site source code is <a href=\"https://salsa.debian.org/webmaster-team/webwml\">available</a>."
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:94
+#: ../../english/template/debian/footer.wml:92
 msgid "Last Modified"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:97
+#: ../../english/template/debian/footer.wml:95
 msgid "Last Built"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:100
+#: ../../english/template/debian/footer.wml:98
 msgid "Copyright"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:103
+#: ../../english/template/debian/footer.wml:101
 msgid "<a href=\"https://www.spi-inc.org/\">SPI</a> and others;"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:106
+#: ../../english/template/debian/footer.wml:104
 msgid "See <a href=\"m4_HOME/license\" rel=\"copyright\">license terms</a>"
 msgstr ""
 
-#: ../../english/template/debian/footer.wml:109
+#: ../../english/template/debian/footer.wml:107
 msgid "Debian is a registered <a href=\"m4_HOME/trademark\">trademark</a> of Software in the Public Interest, Inc."
 msgstr ""
 
diff --git a/english/template/debian/common_translation.wml b/english/template/debian/common_translation.wml
index eeeb68b199d..d07e2048b86 100644
--- a/english/template/debian/common_translation.wml
+++ b/english/template/debian/common_translation.wml
@@ -90,6 +90,12 @@
 <define-tag debianblog whitespace=delete>
   <gettext>The Debian Blog</gettext>
 </define-tag>
+<define-tag debianmicronews whitespace=delete>
+  <gettext>Debian Micronews</gettext>
+</define-tag>
+<define-tag debianplanet whitespace=delete>
+  <gettext>Debian Planet</gettext>
+</define-tag>
 <define-tag last_updated whitespace=delete>
   <gettext>Last Updated</gettext>
 </define-tag>
diff --git a/english/template/debian/footer.wml b/english/template/debian/footer.wml
index 23a23db8719..f3b1c59c69e 100644
--- a/english/template/debian/footer.wml
+++ b/english/template/debian/footer.wml
@@ -72,10 +72,8 @@
   <li><a href="$(HOME)/sitemap"><sitemap_short/></a></li>
   <li><a href="$(SEARCH)"><search/></a></li>
   <li><a href="https://bits.debian.org"><debianblog/></a></li>
-  <li><a href="https://identi.ca/debian"><img src="$(HOME)/Pics/identica.png"
-  alt="follow debian on identi.ca!" /></a></li>
-  <li><a href="https://planet.debian.org"><img src="$(HOME)/Pics/planet.png"
-  alt="follow debian on planet.debian.org!" /></a></li>
+  <li><a href="https://micronews.debian.org"><debianmicronews></a></li>
+  <li><a href="https://planet.debian.org"><debianplanet></a></li>
 </ul>
 
 <!--/UdmComment-->
-- 
cgit v1.2.3