From 9df8f28262f9dab0c653f8277144941f69cf2f6e Mon Sep 17 00:00:00 2001
From: Holger Wansing <holgerw@debian.org>
Date: Fri, 25 Nov 2016 18:17:27 +0000
Subject: Re-format arch-title entity for easier maintenance; remove
 no-longer-existing ARM arch from translations

---
 build/entities/common.ent  | 15 ++++++++++++++-
 build/entities/l10n/de.ent |  3 ++-
 build/entities/l10n/fr.ent |  1 -
 build/entities/l10n/it.ent |  1 -
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/build/entities/common.ent b/build/entities/common.ent
index 5dcbbdd52..2206397aa 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -24,7 +24,20 @@
 
 <!-- proper nouns for architectures -->
 <!ENTITY arch-title
-  "<phrase arch='any-amd64'>64-bit PC</phrase><phrase arch='armel'>32-bit soft-float ARM</phrase><phrase arch='armhf'>32-bit hard-float ARMv7</phrase><phrase arch='arm64'>64-bit ARM</phrase><phrase arch='hppa'>PA-RISC</phrase><phrase arch='any-i386'>32-bit PC</phrase><phrase arch='ia64'>IA-64</phrase><phrase arch='mips'>32-bit Mips (big-endian)</phrase><phrase arch='mips64el'>64-bit Mips (little-endian)</phrase><phrase arch='mipsel'>32-bit Mips (little-endian)</phrase><phrase arch='powerpc'>PowerPC</phrase><phrase arch='ppc64el'>64-bit PowerPC (little-endian)</phrase><phrase arch='sparc'>SPARC</phrase><phrase arch='s390'>S/390</phrase>">
+  "<phrase arch='any-amd64'>64-bit PC</phrase>
+   <phrase arch='armel'>32-bit soft-float ARM</phrase>
+   <phrase arch='armhf'>32-bit hard-float ARMv7</phrase>
+   <phrase arch='arm64'>64-bit ARM</phrase>
+   <phrase arch='hppa'>PA-RISC</phrase>
+   <phrase arch='any-i386'>32-bit PC</phrase>
+   <phrase arch='ia64'>IA-64</phrase>
+   <phrase arch='mips'>32-bit Mips (big-endian)</phrase>
+   <phrase arch='mips64el'>64-bit Mips (little-endian)</phrase>
+   <phrase arch='mipsel'>32-bit Mips (little-endian)</phrase>
+   <phrase arch='powerpc'>PowerPC</phrase>
+   <phrase arch='ppc64el'>64-bit PowerPC (little-endian)</phrase>
+   <phrase arch='sparc'>SPARC</phrase>
+   <phrase arch='s390'>S/390</phrase>">
 
 <!-- general things from installer -->
 <!ENTITY ekey "<keycap>e</keycap>">
diff --git a/build/entities/l10n/de.ent b/build/entities/l10n/de.ent
index dc6ce9785..96c64d310 100644
--- a/build/entities/l10n/de.ent
+++ b/build/entities/l10n/de.ent
@@ -26,4 +26,5 @@
    arch='mipsel'>32-Bit Mips (Little-Endian)</phrase><phrase 
    arch='powerpc'>PowerPC</phrase><phrase 
    arch='ppc64el'>64-Bit PowerPC (Little-endian)</phrase><phrase 
-   arch='sparc'>SPARC</phrase><phrase arch='s390'>S/390</phrase>">
+   arch='sparc'>SPARC</phrase><phrase
+   arch='s390'>S/390</phrase>">
diff --git a/build/entities/l10n/fr.ent b/build/entities/l10n/fr.ent
index c610ad334..0832c416a 100644
--- a/build/entities/l10n/fr.ent
+++ b/build/entities/l10n/fr.ent
@@ -2,7 +2,6 @@
 <!ENTITY d-i "<classname>installateur Debian</classname>">
 <!ENTITY arch-title
   "<phrase arch='any-amd64'>PC 64 bits</phrase>
-  <!--<phrase arch='arm'>ARM</phrase>-->
   <phrase arch='armel'>ARM 32 bits</phrase>
   <phrase arch='armhf'>ARMv7 32 bits avec unité de calcul flottant</phrase>
   <phrase arch='arm64'>ARM 64 bit</phrase>
diff --git a/build/entities/l10n/it.ent b/build/entities/l10n/it.ent
index 5d1158f9d..180c4c7ce 100644
--- a/build/entities/l10n/it.ent
+++ b/build/entities/l10n/it.ent
@@ -11,7 +11,6 @@
 <!ENTITY d-i "<classname>installatore Debian</classname>">
 <!ENTITY arch-title
   "<phrase arch='any-amd64'>PC 64 bit</phrase>
-  <phrase arch='arm'>ARM</phrase>
   <phrase arch='armel'>ARM 32 bit</phrase>
   <phrase arch='armhf'>ARMv7 32 bit con unità di calcolo in virgola mobile</phrase>
   <phrase arch='arm64'>ARM 64 bit</phrase>
-- 
cgit v1.2.3