From d4dab9ea7f4a5e172b51956b8d9a3b81c805ec69 Mon Sep 17 00:00:00 2001
From: toady <support@8pecxstudios.com>
Date: Fri, 28 Oct 2016 00:15:22 +1000
Subject: [PATCH] Make locale.dtd get browser name from branding.

---
 chrome/locale/af/locale.dtd    | 14 +++++++++++++-
 chrome/locale/ar/locale.dtd    | 14 +++++++++++++-
 chrome/locale/be/locale.dtd    | 14 +++++++++++++-
 chrome/locale/bg/locale.dtd    | 14 +++++++++++++-
 chrome/locale/ca/locale.dtd    | 14 +++++++++++++-
 chrome/locale/cs/locale.dtd    | 14 +++++++++++++-
 chrome/locale/da/locale.dtd    | 14 +++++++++++++-
 chrome/locale/de/locale.dtd    | 14 +++++++++++++-
 chrome/locale/en-US/locale.dtd | 14 +++++++++++++-
 chrome/locale/fr/locale.dtd    | 14 +++++++++++++-
 chrome/locale/ja/locale.dtd    | 14 +++++++++++++-
 chrome/locale/pl/locale.dtd    | 14 +++++++++++++-
 chrome/locale/ru/locale.dtd    | 14 +++++++++++++-
 chrome/locale/tr/locale.dtd    | 14 +++++++++++++-
 14 files changed, 182 insertions(+), 14 deletions(-)

diff --git a/chrome/locale/af/locale.dtd b/chrome/locale/af/locale.dtd
index 832f89f..6a65935 100644
--- a/chrome/locale/af/locale.dtd
+++ b/chrome/locale/af/locale.dtd
@@ -1,3 +1,15 @@
+<!-- LOCALIZATION NOTE (<!ENTITY % brandDTD) must not be edited as it  
+	   controls the use of (&brandShortName;) this gets replaced at run time
+	   with the browsers name so in cyberfox (&brandShortName;) says cyberfox
+	   in firefox (&brandShortName;) says firefox, This item can not be edited or
+	   errors may occur.
+-->
+<!-- Do not edit -->
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+<!-- Do not edit above this message-->
+
 <!ENTITY languageManagerTitleItem.label "Language Manager">
 <!ENTITY languagePackCaptionItem.label "Language Pack Installation">
 <!ENTITY languageDescription.desc "Simply select the pack you wish to install then press the install button.">
@@ -28,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: Firefox beta language packs may not be available for your version at this time!">
\ No newline at end of file
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
\ No newline at end of file
diff --git a/chrome/locale/ar/locale.dtd b/chrome/locale/ar/locale.dtd
index 832f89f..6a65935 100644
--- a/chrome/locale/ar/locale.dtd
+++ b/chrome/locale/ar/locale.dtd
@@ -1,3 +1,15 @@
+<!-- LOCALIZATION NOTE (<!ENTITY % brandDTD) must not be edited as it  
+	   controls the use of (&brandShortName;) this gets replaced at run time
+	   with the browsers name so in cyberfox (&brandShortName;) says cyberfox
+	   in firefox (&brandShortName;) says firefox, This item can not be edited or
+	   errors may occur.
+-->
+<!-- Do not edit -->
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+<!-- Do not edit above this message-->
+
 <!ENTITY languageManagerTitleItem.label "Language Manager">
 <!ENTITY languagePackCaptionItem.label "Language Pack Installation">
 <!ENTITY languageDescription.desc "Simply select the pack you wish to install then press the install button.">
@@ -28,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: Firefox beta language packs may not be available for your version at this time!">
\ No newline at end of file
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
\ No newline at end of file
diff --git a/chrome/locale/be/locale.dtd b/chrome/locale/be/locale.dtd
index 832f89f..6a65935 100644
--- a/chrome/locale/be/locale.dtd
+++ b/chrome/locale/be/locale.dtd
@@ -1,3 +1,15 @@
+<!-- LOCALIZATION NOTE (<!ENTITY % brandDTD) must not be edited as it  
+	   controls the use of (&brandShortName;) this gets replaced at run time
+	   with the browsers name so in cyberfox (&brandShortName;) says cyberfox
+	   in firefox (&brandShortName;) says firefox, This item can not be edited or
+	   errors may occur.
+-->
+<!-- Do not edit -->
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+<!-- Do not edit above this message-->
+
 <!ENTITY languageManagerTitleItem.label "Language Manager">
 <!ENTITY languagePackCaptionItem.label "Language Pack Installation">
 <!ENTITY languageDescription.desc "Simply select the pack you wish to install then press the install button.">
@@ -28,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: Firefox beta language packs may not be available for your version at this time!">
\ No newline at end of file
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
\ No newline at end of file
diff --git a/chrome/locale/bg/locale.dtd b/chrome/locale/bg/locale.dtd
index 832f89f..6a65935 100644
--- a/chrome/locale/bg/locale.dtd
+++ b/chrome/locale/bg/locale.dtd
@@ -1,3 +1,15 @@
+<!-- LOCALIZATION NOTE (<!ENTITY % brandDTD) must not be edited as it  
+	   controls the use of (&brandShortName;) this gets replaced at run time
+	   with the browsers name so in cyberfox (&brandShortName;) says cyberfox
+	   in firefox (&brandShortName;) says firefox, This item can not be edited or
+	   errors may occur.
+-->
+<!-- Do not edit -->
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+<!-- Do not edit above this message-->
+
 <!ENTITY languageManagerTitleItem.label "Language Manager">
 <!ENTITY languagePackCaptionItem.label "Language Pack Installation">
 <!ENTITY languageDescription.desc "Simply select the pack you wish to install then press the install button.">
@@ -28,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: Firefox beta language packs may not be available for your version at this time!">
\ No newline at end of file
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
\ No newline at end of file
diff --git a/chrome/locale/ca/locale.dtd b/chrome/locale/ca/locale.dtd
index 832f89f..6a65935 100644
--- a/chrome/locale/ca/locale.dtd
+++ b/chrome/locale/ca/locale.dtd
@@ -1,3 +1,15 @@
+<!-- LOCALIZATION NOTE (<!ENTITY % brandDTD) must not be edited as it  
+	   controls the use of (&brandShortName;) this gets replaced at run time
+	   with the browsers name so in cyberfox (&brandShortName;) says cyberfox
+	   in firefox (&brandShortName;) says firefox, This item can not be edited or
+	   errors may occur.
+-->
+<!-- Do not edit -->
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+<!-- Do not edit above this message-->
+
 <!ENTITY languageManagerTitleItem.label "Language Manager">
 <!ENTITY languagePackCaptionItem.label "Language Pack Installation">
 <!ENTITY languageDescription.desc "Simply select the pack you wish to install then press the install button.">
@@ -28,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: Firefox beta language packs may not be available for your version at this time!">
\ No newline at end of file
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
\ No newline at end of file
diff --git a/chrome/locale/cs/locale.dtd b/chrome/locale/cs/locale.dtd
index 832f89f..6a65935 100644
--- a/chrome/locale/cs/locale.dtd
+++ b/chrome/locale/cs/locale.dtd
@@ -1,3 +1,15 @@
+<!-- LOCALIZATION NOTE (<!ENTITY % brandDTD) must not be edited as it  
+	   controls the use of (&brandShortName;) this gets replaced at run time
+	   with the browsers name so in cyberfox (&brandShortName;) says cyberfox
+	   in firefox (&brandShortName;) says firefox, This item can not be edited or
+	   errors may occur.
+-->
+<!-- Do not edit -->
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+<!-- Do not edit above this message-->
+
 <!ENTITY languageManagerTitleItem.label "Language Manager">
 <!ENTITY languagePackCaptionItem.label "Language Pack Installation">
 <!ENTITY languageDescription.desc "Simply select the pack you wish to install then press the install button.">
@@ -28,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: Firefox beta language packs may not be available for your version at this time!">
\ No newline at end of file
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
\ No newline at end of file
diff --git a/chrome/locale/da/locale.dtd b/chrome/locale/da/locale.dtd
index 832f89f..6a65935 100644
--- a/chrome/locale/da/locale.dtd
+++ b/chrome/locale/da/locale.dtd
@@ -1,3 +1,15 @@
+<!-- LOCALIZATION NOTE (<!ENTITY % brandDTD) must not be edited as it  
+	   controls the use of (&brandShortName;) this gets replaced at run time
+	   with the browsers name so in cyberfox (&brandShortName;) says cyberfox
+	   in firefox (&brandShortName;) says firefox, This item can not be edited or
+	   errors may occur.
+-->
+<!-- Do not edit -->
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+<!-- Do not edit above this message-->
+
 <!ENTITY languageManagerTitleItem.label "Language Manager">
 <!ENTITY languagePackCaptionItem.label "Language Pack Installation">
 <!ENTITY languageDescription.desc "Simply select the pack you wish to install then press the install button.">
@@ -28,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: Firefox beta language packs may not be available for your version at this time!">
\ No newline at end of file
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
\ No newline at end of file
diff --git a/chrome/locale/de/locale.dtd b/chrome/locale/de/locale.dtd
index 76d3a58..94f764a 100644
--- a/chrome/locale/de/locale.dtd
+++ b/chrome/locale/de/locale.dtd
@@ -1,3 +1,15 @@
+<!-- LOCALIZATION NOTE (<!ENTITY % brandDTD) must not be edited as it  
+	   controls the use of (&brandShortName;) this gets replaced at run time
+	   with the browsers name so in cyberfox (&brandShortName;) says cyberfox
+	   in firefox (&brandShortName;) says firefox, This item can not be edited or
+	   errors may occur.
+-->
+<!-- Do not edit -->
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+<!-- Do not edit above this message-->
+
 <!ENTITY languageManagerTitleItem.label "Cyberfox Sprachmanager">
 <!ENTITY languagePackCaptionItem.label "Sprachpaket Installieren">
 <!ENTITY languageDescription.desc "Wählen Sie einfach das Sprachpacket aus und drücken sie auf Installieren.">
@@ -28,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Entferne Packet">
 <!ENTITY languageManagerToggleRemove.tooltip "Entferne Sprachpacket">
 
-<!ENTITY languageManagerBetaWarning.label "Important: Firefox beta language packs may not be available for your version at this time!">
\ No newline at end of file
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
\ No newline at end of file
diff --git a/chrome/locale/en-US/locale.dtd b/chrome/locale/en-US/locale.dtd
index 832f89f..6a65935 100644
--- a/chrome/locale/en-US/locale.dtd
+++ b/chrome/locale/en-US/locale.dtd
@@ -1,3 +1,15 @@
+<!-- LOCALIZATION NOTE (<!ENTITY % brandDTD) must not be edited as it  
+	   controls the use of (&brandShortName;) this gets replaced at run time
+	   with the browsers name so in cyberfox (&brandShortName;) says cyberfox
+	   in firefox (&brandShortName;) says firefox, This item can not be edited or
+	   errors may occur.
+-->
+<!-- Do not edit -->
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+<!-- Do not edit above this message-->
+
 <!ENTITY languageManagerTitleItem.label "Language Manager">
 <!ENTITY languagePackCaptionItem.label "Language Pack Installation">
 <!ENTITY languageDescription.desc "Simply select the pack you wish to install then press the install button.">
@@ -28,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: Firefox beta language packs may not be available for your version at this time!">
\ No newline at end of file
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
\ No newline at end of file
diff --git a/chrome/locale/fr/locale.dtd b/chrome/locale/fr/locale.dtd
index ea5f0b8..0596ea5 100644
--- a/chrome/locale/fr/locale.dtd
+++ b/chrome/locale/fr/locale.dtd
@@ -1,3 +1,15 @@
+<!-- LOCALIZATION NOTE (<!ENTITY % brandDTD) must not be edited as it  
+	   controls the use of (&brandShortName;) this gets replaced at run time
+	   with the browsers name so in cyberfox (&brandShortName;) says cyberfox
+	   in firefox (&brandShortName;) says firefox, This item can not be edited or
+	   errors may occur.
+-->
+<!-- Do not edit -->
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+<!-- Do not edit above this message-->
+
 <!ENTITY languageManagerTitleItem.label "Gestionnaire de langues">
 <!ENTITY languagePackCaptionItem.label "Installation d’un paquet linguistique">
 <!ENTITY languageDescription.desc "Choisissez le paquet linguistique que vous souhaitez installer, puis cliquez sur le bouton Installer.">
@@ -28,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Enlever le paquet">
 <!ENTITY languageManagerToggleRemove.tooltip "Enlever le paquet linguistique">
 
-<!ENTITY languageManagerBetaWarning.label "Important: Firefox beta language packs may not be available for your version at this time!">
\ No newline at end of file
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
\ No newline at end of file
diff --git a/chrome/locale/ja/locale.dtd b/chrome/locale/ja/locale.dtd
index 7d37c61..b494c3a 100644
--- a/chrome/locale/ja/locale.dtd
+++ b/chrome/locale/ja/locale.dtd
@@ -1,3 +1,15 @@
+<!-- LOCALIZATION NOTE (<!ENTITY % brandDTD) must not be edited as it  
+	   controls the use of (&brandShortName;) this gets replaced at run time
+	   with the browsers name so in cyberfox (&brandShortName;) says cyberfox
+	   in firefox (&brandShortName;) says firefox, This item can not be edited or
+	   errors may occur.
+-->
+<!-- Do not edit -->
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+<!-- Do not edit above this message-->
+
 <!ENTITY languageManagerTitleItem.label "Language Manager">
 <!ENTITY languagePackCaptionItem.label "言語パックのインストール">
 <!ENTITY languageDescription.desc "インストールしたいパックを選択し、 [インストール] ボタンを押してください。">
@@ -28,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "パックを削除">
 <!ENTITY languageManagerToggleRemove.tooltip "言語パックを削除します">
 
-<!ENTITY languageManagerBetaWarning.label "Important: Firefox beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
diff --git a/chrome/locale/pl/locale.dtd b/chrome/locale/pl/locale.dtd
index 80a0bd1..07503b8 100644
--- a/chrome/locale/pl/locale.dtd
+++ b/chrome/locale/pl/locale.dtd
@@ -1,3 +1,15 @@
+<!-- LOCALIZATION NOTE (<!ENTITY % brandDTD) must not be edited as it  
+	   controls the use of (&brandShortName;) this gets replaced at run time
+	   with the browsers name so in cyberfox (&brandShortName;) says cyberfox
+	   in firefox (&brandShortName;) says firefox, This item can not be edited or
+	   errors may occur.
+-->
+<!-- Do not edit -->
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+<!-- Do not edit above this message-->
+
 <!ENTITY languageManagerTitleItem.label "Language Manager">
 <!ENTITY languagePackCaptionItem.label "Instalowanie pakietu językowego">
 <!ENTITY languageDescription.desc "Wystarczy wybrać pakiet, który chce się zainstalować, a następnie nacisnąć przycisk 'zainstaluj'.">
@@ -28,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Usuń pakiet">
 <!ENTITY languageManagerToggleRemove.tooltip "Usuń pakiet językowy">
 
-<!ENTITY languageManagerBetaWarning.label "Ważne: pakiety językowe dla twojej wersji Firefox Beta mogą być teraz niedostępne!">
\ No newline at end of file
+<!ENTITY languageManagerBetaWarning.label "Ważne: pakiety językowe dla twojej wersji &brandShortName; Beta mogą być teraz niedostępne!">
\ No newline at end of file
diff --git a/chrome/locale/ru/locale.dtd b/chrome/locale/ru/locale.dtd
index a3fc2ad..7e88fe0 100644
--- a/chrome/locale/ru/locale.dtd
+++ b/chrome/locale/ru/locale.dtd
@@ -1,3 +1,15 @@
+<!-- LOCALIZATION NOTE (<!ENTITY % brandDTD) must not be edited as it  
+	   controls the use of (&brandShortName;) this gets replaced at run time
+	   with the browsers name so in cyberfox (&brandShortName;) says cyberfox
+	   in firefox (&brandShortName;) says firefox, This item can not be edited or
+	   errors may occur.
+-->
+<!-- Do not edit -->
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+<!-- Do not edit above this message-->
+
 <!ENTITY languageManagerTitleItem.label "Менеджер языков">
 <!ENTITY languagePackCaptionItem.label "Установка языковых пакетов">
 <!ENTITY languageDescription.desc "Выберите нужный язык и нажмите кнопку Установить.">
@@ -28,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Удалить пакет">
 <!ENTITY languageManagerToggleRemove.tooltip "Удаление языкового пакета">
 
-<!ENTITY languageManagerBetaWarning.label "Important: Firefox beta language packs may not be available for your version at this time!">
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
diff --git a/chrome/locale/tr/locale.dtd b/chrome/locale/tr/locale.dtd
index 3c6b5c6..f5eebc7 100644
--- a/chrome/locale/tr/locale.dtd
+++ b/chrome/locale/tr/locale.dtd
@@ -1,3 +1,15 @@
+<!-- LOCALIZATION NOTE (<!ENTITY % brandDTD) must not be edited as it  
+	   controls the use of (&brandShortName;) this gets replaced at run time
+	   with the browsers name so in cyberfox (&brandShortName;) says cyberfox
+	   in firefox (&brandShortName;) says firefox, This item can not be edited or
+	   errors may occur.
+-->
+<!-- Do not edit -->
+<!ENTITY % brandDTD
+    SYSTEM "chrome://branding/locale/brand.dtd">
+  %brandDTD;
+<!-- Do not edit above this message-->
+
 <!ENTITY languageManagerTitleItem.label "Dil Yöneticisi">
 <!ENTITY languagePackCaptionItem.label "Dil Paketi Yükle">
 <!ENTITY languageDescription.desc "Basitçe 'Kur' düğmesine basarak yüklemek istediğiniz paketi seçin.">
@@ -28,4 +40,4 @@
 <!ENTITY languageManagerToggleRemove.label "Remove Pack">
 <!ENTITY languageManagerToggleRemove.tooltip "Remove Language Pack">
 
-<!ENTITY languageManagerBetaWarning.label "Important: Firefox beta language packs may not be available for your version at this time!">
\ No newline at end of file
+<!ENTITY languageManagerBetaWarning.label "Important: &brandShortName; beta language packs may not be available for your version at this time!">
\ No newline at end of file