Use 'en_US' for ${PRI_LANG}; move the 'en' locale into secondary,

deprecated status.

11 files changed, 791 insertions, 304 deletions

diff --git a/common/entities/Makefile b/common/entities/Makefile
index 37b644c..b651b7b 100644
--- a/common/entities/Makefile
+++ b/common/entities/Makefile
@@ -1,5 +1,5 @@
-PRI_LANG=en
-OTHERS =it pt_BR ru zh_CN
+PRI_LANG=en_US
+OTHERS =en it pt_BR ru zh_CN
 
 #######################################################################
 # PLEASE:
@@ -114,7 +114,7 @@ help::
 #
 define UPDATE_template
 .PHONY:	xml-${1}
-xml-${1} entities-${1}.xml: entities-${PRI_LANG}.xml ${1}.po
+xml-${1} entities-${1}.xml:: entities-${PRI_LANG}.xml ${1}.po
 	xml2po -p ${1}.po entities-${PRI_LANG}.xml >entities-${1}.xml
 
 help::
@@ -128,7 +128,7 @@ xml-${PRI_LANG}:: entities-${PRI_LANG}.xml
 $(foreach L,${OTHERS},$(eval $(call UPDATE_template,${L})))
 
 .PHONY:	xml-all
-xml-all: $(foreach L,${OTHERS},entities-${L}.xml)
+xml-all:: $(foreach L,${OTHERS},entities-${L}.xml)
 
 help::
 	@printf ${HELPFMT} "make xml-all"	"Translate XML for all locales"
diff --git a/common/entities/de.po b/common/entities/de.po
index ac67689..6c8255b 100644
--- a/common/entities/de.po
+++ b/common/entities/de.po
@@ -9,224 +9,224 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: entities-en.xml:6(title) 
+#: entities-en_US.xml:6(title) 
 msgid "These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names."
 msgstr ""
 
-#: entities-en.xml:14(comment) entities-en.xml:18(comment) 
+#: entities-en_US.xml:14(comment) entities-en_US.xml:18(comment) 
 msgid "Generic root term"
 msgstr ""
 
-#: entities-en.xml:15(text) 
+#: entities-en_US.xml:15(text) 
 msgid "Fedora"
 msgstr ""
 
-#: entities-en.xml:19(text) 
+#: entities-en_US.xml:19(text) 
 msgid "Core"
 msgstr ""
 
-#: entities-en.xml:22(comment) 
+#: entities-en_US.xml:22(comment) 
 msgid "Generic main project name"
 msgstr ""
 
-#: entities-en.xml:26(comment) 
+#: entities-en_US.xml:26(comment) 
 msgid "Legacy Entity"
 msgstr ""
 
-#: entities-en.xml:30(comment) 
+#: entities-en_US.xml:30(comment) 
 msgid "Short project name"
 msgstr ""
 
-#: entities-en.xml:31(text) 
+#: entities-en_US.xml:31(text) 
 msgid "FC"
 msgstr ""
 
-#: entities-en.xml:34(comment) 
+#: entities-en_US.xml:34(comment) 
 msgid "Generic overall project name"
 msgstr ""
 
-#: entities-en.xml:35(text) 
+#: entities-en_US.xml:35(text) 
 msgid "<use entity=\"FED\"/> Project"
 msgstr ""
 
-#: entities-en.xml:38(comment) 
+#: entities-en_US.xml:38(comment) 
 msgid "Generic docs project name"
 msgstr ""
 
-#: entities-en.xml:39(text) entities-en.xml:43(text) 
+#: entities-en_US.xml:39(text) entities-en_US.xml:43(text) 
 msgid "<use entity=\"FED\"/> Docs Project"
 msgstr ""
 
-#: entities-en.xml:42(comment) 
+#: entities-en_US.xml:42(comment) 
 msgid "Short docs project name"
 msgstr ""
 
-#: entities-en.xml:46(comment) 
+#: entities-en_US.xml:46(comment) 
 msgid "cf. Core"
 msgstr ""
 
-#: entities-en.xml:47(text) 
+#: entities-en_US.xml:47(text) 
 msgid "Extras"
 msgstr ""
 
-#: entities-en.xml:50(comment) 
+#: entities-en_US.xml:50(comment) 
 msgid "cf. Fedora Core"
 msgstr ""
 
-#: entities-en.xml:54(comment) 
+#: entities-en_US.xml:54(comment) 
 msgid "Fedora Docs Project URL"
 msgstr ""
 
-#: entities-en.xml:58(comment) 
+#: entities-en_US.xml:58(comment) 
 msgid "Fedora Project URL"
 msgstr ""
 
-#: entities-en.xml:62(comment) 
+#: entities-en_US.xml:62(comment) 
 msgid "Fedora Documentation (repository) URL"
 msgstr ""
 
-#: entities-en.xml:66(comment) entities-en.xml:67(text) 
+#: entities-en_US.xml:66(comment) entities-en_US.xml:67(text) 
 msgid "Bugzilla"
 msgstr ""
 
-#: entities-en.xml:70(comment) 
+#: entities-en_US.xml:70(comment) 
 msgid "Bugzilla URL"
 msgstr ""
 
-#: entities-en.xml:74(comment) 
+#: entities-en_US.xml:74(comment) 
 msgid "Bugzilla product for Fedora Docs"
 msgstr ""
 
-#: entities-en.xml:75(text) 
+#: entities-en_US.xml:75(text) 
 msgid "<use entity=\"FED\"/> Documentation"
 msgstr ""
 
-#: entities-en.xml:80(comment) 
+#: entities-en_US.xml:80(comment) 
 msgid "Current release version of main project"
 msgstr ""
 
-#: entities-en.xml:81(text) 
+#: entities-en_US.xml:81(text) 
 msgid "4"
 msgstr ""
 
-#: entities-en.xml:84(comment) 
+#: entities-en_US.xml:84(comment) 
 msgid "Current test number of main project"
 msgstr ""
 
-#: entities-en.xml:85(text) 
+#: entities-en_US.xml:85(text) 
 msgid "test3"
 msgstr ""
 
-#: entities-en.xml:88(comment) 
+#: entities-en_US.xml:88(comment) 
 msgid "Current test version of main project"
 msgstr ""
 
-#: entities-en.xml:89(text) 
+#: entities-en_US.xml:89(text) 
 msgid "5 <use entity=\"TESTVER\"/>"
 msgstr ""
 
-#: entities-en.xml:94(comment) 
+#: entities-en_US.xml:94(comment) 
 msgid "The generic term \"Red Hat\""
 msgstr ""
 
-#: entities-en.xml:95(text) 
+#: entities-en_US.xml:95(text) 
 msgid "Red Hat"
 msgstr ""
 
-#: entities-en.xml:98(comment) 
+#: entities-en_US.xml:98(comment) 
 msgid "The generic term \"Red Hat, Inc.\""
 msgstr ""
 
-#: entities-en.xml:99(text) 
+#: entities-en_US.xml:99(text) 
 msgid "<use entity=\"RH\"/> Inc."
 msgstr ""
 
-#: entities-en.xml:102(comment) 
+#: entities-en_US.xml:102(comment) 
 msgid "The generic term \"Red Hat Linux\""
 msgstr ""
 
-#: entities-en.xml:103(text) 
+#: entities-en_US.xml:103(text) 
 msgid "<use entity=\"RH\"/> Linux"
 msgstr ""
 
-#: entities-en.xml:106(comment) 
+#: entities-en_US.xml:106(comment) 
 msgid "The generic term \"Red Hat Network\""
 msgstr ""
 
-#: entities-en.xml:107(text) 
+#: entities-en_US.xml:107(text) 
 msgid "<use entity=\"RH\"/> Network"
 msgstr ""
 
-#: entities-en.xml:110(comment) 
+#: entities-en_US.xml:110(comment) 
 msgid "The generic term \"Red Hat Enterprise Linux\""
 msgstr ""
 
-#: entities-en.xml:111(text) 
+#: entities-en_US.xml:111(text) 
 msgid "<use entity=\"RH\"/> Enterprise Linux"
 msgstr ""
 
-#: entities-en.xml:116(comment) 
+#: entities-en_US.xml:116(comment) 
 msgid "Generic technology term"
 msgstr ""
 
-#: entities-en.xml:117(text) 
+#: entities-en_US.xml:117(text) 
 msgid "SELinux"
 msgstr ""
 
-#: entities-en.xml:123(text) 
+#: entities-en_US.xml:123(text) 
 msgid "legalnotice-en.xml"
 msgstr ""
 
-#: entities-en.xml:127(text) 
+#: entities-en_US.xml:127(text) 
 msgid "legalnotice-content-en.xml"
 msgstr ""
 
-#: entities-en.xml:131(text) 
+#: entities-en_US.xml:131(text) 
 msgid "legalnotice-opl-en.xml"
 msgstr ""
 
-#: entities-en.xml:135(text) 
+#: entities-en_US.xml:135(text) 
 msgid "opl.xml"
 msgstr ""
 
-#: entities-en.xml:139(text) 
+#: entities-en_US.xml:139(text) 
 msgid "legalnotice-relnotes-en.xml"
 msgstr ""
 
-#: entities-en.xml:143(text) 
+#: entities-en_US.xml:143(text) 
 msgid "legalnotice-section-en.xml"
 msgstr ""
 
-#: entities-en.xml:147(text) 
+#: entities-en_US.xml:147(text) 
 msgid "bugreporting-en.xml"
 msgstr ""
 
-#: entities-en.xml:161(text) 
+#: entities-en_US.xml:161(text) 
 msgid "Installation Guide"
 msgstr ""
 
-#: entities-en.xml:165(text) 
+#: entities-en_US.xml:165(text) 
 msgid "Documentation Guide"
 msgstr ""
 
-#: entities-en.xml:181(text) 
+#: entities-en_US.xml:181(text) 
 msgid "draftnotice-en.xml"
 msgstr ""
 
-#: entities-en.xml:185(text) 
+#: entities-en_US.xml:185(text) 
 msgid "legacynotice-en.xml"
 msgstr ""
 
-#: entities-en.xml:189(text) 
+#: entities-en_US.xml:189(text) 
 msgid "obsoletenotice-en.xml"
 msgstr ""
 
-#: entities-en.xml:193(text) 
+#: entities-en_US.xml:193(text) 
 msgid "deprecatednotice-en.xml"
 msgstr ""
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: entities-en.xml:0(None) 
+#: entities-en_US.xml:0(None) 
 msgid "translator-credits"
 msgstr ""
 
diff --git a/common/entities/en.po b/common/entities/en.po
new file mode 100644
index 0000000..739ac9a
--- /dev/null
+++ b/common/entities/en.po
@@ -0,0 +1,232 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2006-03-02 16:46-0600\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: entities-en_US.xml:4(title) 
+msgid "These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names."
+msgstr ""
+
+#: entities-en_US.xml:7(comment) entities-en_US.xml:11(comment) 
+msgid "Generic root term"
+msgstr ""
+
+#: entities-en_US.xml:8(text) 
+msgid "Fedora"
+msgstr ""
+
+#: entities-en_US.xml:12(text) 
+msgid "Core"
+msgstr ""
+
+#: entities-en_US.xml:15(comment) 
+msgid "Generic main project name"
+msgstr ""
+
+#: entities-en_US.xml:19(comment) 
+msgid "Legacy Entity"
+msgstr ""
+
+#: entities-en_US.xml:23(comment) 
+msgid "Short project name"
+msgstr ""
+
+#: entities-en_US.xml:24(text) 
+msgid "FC"
+msgstr ""
+
+#: entities-en_US.xml:27(comment) 
+msgid "Generic overall project name"
+msgstr ""
+
+#: entities-en_US.xml:28(text) 
+msgid "<use entity=\"FED\"/> Project"
+msgstr ""
+
+#: entities-en_US.xml:31(comment) 
+msgid "Generic docs project name"
+msgstr ""
+
+#: entities-en_US.xml:32(text) entities-en_US.xml:36(text) 
+msgid "<use entity=\"FED\"/> Docs Project"
+msgstr ""
+
+#: entities-en_US.xml:35(comment) 
+msgid "Short docs project name"
+msgstr ""
+
+#: entities-en_US.xml:39(comment) 
+msgid "cf. Core"
+msgstr ""
+
+#: entities-en_US.xml:40(text) 
+msgid "Extras"
+msgstr ""
+
+#: entities-en_US.xml:43(comment) 
+msgid "cf. Fedora Core"
+msgstr ""
+
+#: entities-en_US.xml:47(comment) 
+msgid "Fedora Docs Project URL"
+msgstr ""
+
+#: entities-en_US.xml:51(comment) 
+msgid "Fedora Project URL"
+msgstr ""
+
+#: entities-en_US.xml:55(comment) 
+msgid "Fedora Documentation (repository) URL"
+msgstr ""
+
+#: entities-en_US.xml:59(comment) entities-en_US.xml:60(text) 
+msgid "Bugzilla"
+msgstr ""
+
+#: entities-en_US.xml:63(comment) 
+msgid "Bugzilla URL"
+msgstr ""
+
+#: entities-en_US.xml:67(comment) 
+msgid "Bugzilla product for Fedora Docs"
+msgstr ""
+
+#: entities-en_US.xml:68(text) 
+msgid "<use entity=\"FED\"/> Documentation"
+msgstr ""
+
+#: entities-en_US.xml:73(comment) 
+msgid "Current release version of main project"
+msgstr ""
+
+#: entities-en_US.xml:74(text) 
+msgid "4"
+msgstr ""
+
+#: entities-en_US.xml:77(comment) 
+msgid "Current test number of main project"
+msgstr ""
+
+#: entities-en_US.xml:78(text) 
+msgid "test3"
+msgstr ""
+
+#: entities-en_US.xml:81(comment) 
+msgid "Current test version of main project"
+msgstr ""
+
+#: entities-en_US.xml:82(text) 
+msgid "5 <use entity=\"TESTVER\"/>"
+msgstr ""
+
+#: entities-en_US.xml:87(comment) 
+msgid "The generic term \"Red Hat\""
+msgstr ""
+
+#: entities-en_US.xml:88(text) 
+msgid "Red Hat"
+msgstr ""
+
+#: entities-en_US.xml:91(comment) 
+msgid "The generic term \"Red Hat, Inc.\""
+msgstr ""
+
+#: entities-en_US.xml:92(text) 
+msgid "<use entity=\"RH\"/> Inc."
+msgstr ""
+
+#: entities-en_US.xml:95(comment) 
+msgid "The generic term \"Red Hat Linux\""
+msgstr ""
+
+#: entities-en_US.xml:96(text) 
+msgid "<use entity=\"RH\"/> Linux"
+msgstr ""
+
+#: entities-en_US.xml:99(comment) 
+msgid "The generic term \"Red Hat Network\""
+msgstr ""
+
+#: entities-en_US.xml:100(text) 
+msgid "<use entity=\"RH\"/> Network"
+msgstr ""
+
+#: entities-en_US.xml:103(comment) 
+msgid "The generic term \"Red Hat Enterprise Linux\""
+msgstr ""
+
+#: entities-en_US.xml:104(text) 
+msgid "<use entity=\"RH\"/> Enterprise Linux"
+msgstr ""
+
+#: entities-en_US.xml:109(comment) 
+msgid "Generic technology term"
+msgstr ""
+
+#: entities-en_US.xml:110(text) 
+msgid "SELinux"
+msgstr ""
+
+#: entities-en_US.xml:116(text) 
+msgid "legalnotice-en.xml"
+msgstr ""
+
+#: entities-en_US.xml:120(text) 
+msgid "legalnotice-content-en.xml"
+msgstr ""
+
+#: entities-en_US.xml:124(text) 
+msgid "legalnotice-opl-en.xml"
+msgstr ""
+
+#: entities-en_US.xml:128(text) 
+msgid "opl.xml"
+msgstr ""
+
+#: entities-en_US.xml:132(text) 
+msgid "legalnotice-relnotes-en.xml"
+msgstr ""
+
+#: entities-en_US.xml:136(text) 
+msgid "legalnotice-section-en.xml"
+msgstr ""
+
+#: entities-en_US.xml:140(text) 
+msgid "bugreporting-en.xml"
+msgstr ""
+
+#: entities-en_US.xml:154(text) 
+msgid "Installation Guide"
+msgstr ""
+
+#: entities-en_US.xml:158(text) 
+msgid "Documentation Guide"
+msgstr ""
+
+#: entities-en_US.xml:174(text) 
+msgid "draftnotice-en.xml"
+msgstr ""
+
+#: entities-en_US.xml:178(text) 
+msgid "legacynotice-en.xml"
+msgstr ""
+
+#: entities-en_US.xml:182(text) 
+msgid "obsoletenotice-en.xml"
+msgstr ""
+
+#: entities-en_US.xml:186(text) 
+msgid "deprecatednotice-en.xml"
+msgstr ""
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
+#: entities-en_US.xml:0(None) 
+msgid "translator-credits"
+msgstr ""
+
diff --git a/common/entities/entities-en.ent b/common/entities/entities-en.ent
index 82940da..692370c 100644
--- a/common/entities/entities-en.ent
+++ b/common/entities/entities-en.ent
@@ -1,11 +1,6 @@
 <!-- Group: Automatic Entities -->
 <!ENTITY FDPCOMMONDIR  "../docs-common/common" > <!-- Base directory -->
-  <!-- 
-    These common entities are useful shorthand terms and names,
-    which may be subject to change at anytime.  This is an important
-    value the the entity provides: a single location to update terms
-    and common names.
-   -->
+  <!-- These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names. -->
 
   <!-- Group: Fedora common entries -->
 
diff --git a/common/entities/entities-en.xml b/common/entities/entities-en.xml
index 95f6ad9..c9420b8 100644
--- a/common/entities/entities-en.xml
+++ b/common/entities/entities-en.xml
@@ -1,14 +1,7 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 <!DOCTYPE entities SYSTEM "entities.dtd">
-
 <entities>
-  <title>
-    These common entities are useful shorthand terms and names,
-    which may be subject to change at anytime.  This is an important
-    value the the entity provides: a single location to update terms
-    and common names.
-  </title>
+  <title>These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names.</title>
   <group name="Fedora common entries">
     <entity name="FED">
       <comment>Generic root term</comment>
diff --git a/common/entities/entities-en_US.ent b/common/entities/entities-en_US.ent
new file mode 100644
index 0000000..692370c
--- /dev/null
+++ b/common/entities/entities-en_US.ent
@@ -0,0 +1,76 @@
+<!-- Group: Automatic Entities -->
+<!ENTITY FDPCOMMONDIR  "../docs-common/common" > <!-- Base directory -->
+  <!-- These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names. -->
+
+  <!-- Group: Fedora common entries -->
+
+    <!ENTITY FED  "Fedora" > <!-- Generic root term -->
+    <!ENTITY CORE  "Core" > <!-- Generic root term -->
+    <!ENTITY FC  "&FED; &CORE;" > <!-- Generic main project name -->
+    <!ENTITY DISTRO  "&FC;" > <!-- Legacy Entity -->
+    <!ENTITY FCX  "FC" > <!-- Short project name -->
+    <!ENTITY FP  "&FED; Project" > <!-- Generic overall project name -->
+    <!ENTITY FDP  "&FED; Docs Project" > <!-- Generic docs project name -->
+    <!ENTITY FDPX  "&FED; Docs Project" > <!-- Short docs project name -->
+    <!ENTITY EX  "Extras" > <!-- cf. Core -->
+    <!ENTITY FEX  "&FED; &EX;" > <!-- cf. Fedora Core -->
+    <!ENTITY FDP-URL  "<ulink url='http://fedora.redhat.com/projects/docs/'/>" > <!-- Fedora Docs Project URL -->
+    <!ENTITY FP-URL  "<ulink url='http://fedora.redhat.com/'/>" > <!-- Fedora Project URL -->
+    <!ENTITY FDPDOCS-URL  "<ulink url='http://fedora.redhat.com/docs/'/>" > <!-- Fedora Documentation (repository) URL -->
+    <!ENTITY BZ  "Bugzilla" > <!-- Bugzilla -->
+    <!ENTITY BZ-URL  "<ulink url='http://bugzilla.redhat.com'/>" > <!-- Bugzilla URL -->
+    <!ENTITY BZ-PROD  "&FED; Documentation" > <!-- Bugzilla product for Fedora Docs -->
+  
+  <!-- Group: Fedora Version Numbers -->
+
+    <!ENTITY FCVER  "4" > <!-- Current release version of main project -->
+    <!ENTITY TESTVER  "test3" > <!-- Current test number of main project -->
+    <!ENTITY FCTESTVER  "5 &TESTVER;" > <!-- Current test version of main project -->
+  
+  <!-- Group: Other common names -->
+
+    <!ENTITY RH  "Red Hat" > <!-- The generic term "Red Hat" -->
+    <!ENTITY FORMAL-RHI  "&RH; Inc." > <!-- The generic term "Red Hat, Inc." -->
+    <!ENTITY RHL  "&RH; Linux" > <!-- The generic term "Red Hat Linux" -->
+    <!ENTITY RHN  "&RH; Network" > <!-- The generic term "Red Hat Network" -->
+    <!ENTITY RHEL  "&RH; Enterprise Linux" > <!-- The generic term "Red Hat Enterprise Linux" -->
+  
+  <!-- Group: Technology terms -->
+
+    <!ENTITY SEL  "SELinux" > <!-- Generic technology term -->
+  
+  <!-- Group: Common doc files -->
+
+    <!ENTITY LEGALNOTICE SYSTEM "../docs-common/common/legalnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY LEGALNOTICE-CONTENT SYSTEM "../docs-common/common/legalnotice-content-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY LEGALNOTICE-OPL SYSTEM "../docs-common/common/legalnotice-opl-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY LEGALNOTICE-OPL-CONTENT SYSTEM "../docs-common/common/opl.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY LEGALNOTICE-RELNOTES SYSTEM "../docs-common/common/legalnotice-relnotes-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY LEGALNOTICE-SECTION SYSTEM "../docs-common/common/legalnotice-section-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY BUG-REPORTING SYSTEM "../docs-common/common/bugreporting-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+  
+  <!-- Group: Common applications -->
+
+  
+  <!-- Group: Required by build scripts -->
+
+    <!ENTITY PROJECT  "&FP;" > <!-- FIXME: PLEASE DEFINE ME -->
+  
+  <!-- Group: Tutorial Titles -->
+
+    <!ENTITY IG  "Installation Guide" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY DOCG  "Documentation Guide" > <!-- FIXME: PLEASE DEFINE ME -->
+  
+  <!-- Group: Tutorial URL's -->
+
+    <!ENTITY IG-URL  "<ulink url='http://fedora.redhat.com/docs/fedora-install-guide-en/'/>" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY DOCG-URL  "<ulink url='http://fedora.redhat.com/participate/documentation-guide/'/>" > <!-- FIXME: PLEASE DEFINE ME -->
+  
+  <!-- Group: Status notices -->
+
+    <!ENTITY DRAFTNOTICE SYSTEM "draftnotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY LEGACYNOTICE SYSTEM "legacynotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY OBSOLETENOTICE SYSTEM "obsoletenotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+    <!ENTITY DEPRECATEDNOTICE SYSTEM "deprecatednotice-en.xml" > <!-- FIXME: PLEASE DEFINE ME -->
+  
+
diff --git a/common/entities/entities-en_US.xml b/common/entities/entities-en_US.xml
new file mode 100644
index 0000000..c9420b8
--- /dev/null
+++ b/common/entities/entities-en_US.xml
@@ -0,0 +1,189 @@
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<!DOCTYPE entities SYSTEM "entities.dtd">
+<entities>
+  <title>These common entities are useful shorthand terms and names, which may be subject to change at anytime. This is an important value the the entity provides: a single location to update terms and common names.</title>
+  <group name="Fedora common entries">
+    <entity name="FED">
+      <comment>Generic root term</comment>
+      <text>Fedora</text>
+    </entity>
+    <entity name="CORE">
+      <comment>Generic root term</comment>
+      <text>Core</text>
+    </entity>
+    <entity name="FC">
+      <comment>Generic main project name</comment>
+      <text><use entity="FED"/> <use entity="CORE"/></text>
+    </entity>
+    <entity name="DISTRO">
+      <comment>Legacy Entity</comment>
+      <text><use entity="FC"/></text>
+    </entity>
+    <entity name="FCX">
+      <comment>Short project name</comment>
+      <text>FC</text>
+    </entity>
+    <entity name="FP">
+      <comment>Generic overall project name</comment>
+      <text><use entity="FED"/> Project</text>
+    </entity>
+    <entity name="FDP">
+      <comment>Generic docs project name</comment>
+      <text><use entity="FED"/> Docs Project</text>
+    </entity>
+    <entity name="FDPX">
+      <comment>Short docs project name</comment>
+      <text><use entity="FED"/> Docs Project</text>
+    </entity>
+    <entity name="EX">
+      <comment>cf. Core</comment>
+      <text>Extras</text>
+    </entity>
+    <entity name="FEX">
+      <comment>cf. Fedora Core</comment>
+      <text><use entity="FED"/> <use entity="EX"/></text>
+    </entity>
+    <entity name="FDP-URL">
+      <comment>Fedora Docs Project URL</comment>
+      <text><ulink url="http://fedora.redhat.com/projects/docs/"/></text>
+    </entity>
+    <entity name="FP-URL">
+      <comment>Fedora Project URL</comment>
+      <text><ulink url="http://fedora.redhat.com/"/></text>
+    </entity>
+    <entity name="FDPDOCS-URL">
+      <comment>Fedora Documentation (repository) URL</comment>
+      <text><ulink url="http://fedora.redhat.com/docs/"/></text>
+    </entity>
+    <entity name="BZ">
+      <comment>Bugzilla</comment>
+      <text>Bugzilla</text>
+    </entity>
+    <entity name="BZ-URL">
+      <comment>Bugzilla URL</comment>
+      <text><ulink url="http://bugzilla.redhat.com"/></text>
+    </entity>
+    <entity name="BZ-PROD">
+      <comment>Bugzilla product for Fedora Docs</comment>
+      <text><use entity="FED"/> Documentation</text>
+    </entity>
+  </group>
+  <group name="Fedora Version Numbers">
+    <entity name="FCVER">
+      <comment>Current release version of main project</comment>
+      <text>4</text>
+    </entity>
+    <entity name="TESTVER">
+      <comment>Current test number of main project</comment>
+      <text>test3</text>
+    </entity>
+    <entity name="FCTESTVER">
+      <comment>Current test version of main project</comment>
+      <text>5 <use entity="TESTVER"/></text>
+    </entity>
+  </group>
+  <group name="Other common names">
+    <entity name="RH">
+      <comment>The generic term "Red Hat"</comment>
+      <text>Red Hat</text>
+    </entity>
+    <entity name="FORMAL-RHI">
+      <comment>The generic term "Red Hat, Inc."</comment>
+      <text><use entity="RH"/> Inc.</text>
+    </entity>
+    <entity name="RHL">
+      <comment>The generic term "Red Hat Linux"</comment>
+      <text><use entity="RH"/> Linux</text>
+    </entity>
+    <entity name="RHN">
+      <comment>The generic term "Red Hat Network"</comment>
+      <text><use entity="RH"/> Network</text>
+    </entity>
+    <entity name="RHEL">
+      <comment>The generic term "Red Hat Enterprise Linux"</comment>
+      <text><use entity="RH"/> Enterprise Linux</text>
+    </entity>
+  </group>
+  <group name="Technology terms">
+    <entity name="SEL">
+      <comment>Generic technology term</comment>
+      <text>SELinux</text>
+    </entity>
+  </group>
+  <group name="Common doc files">
+    <entity name="LEGALNOTICE" kind="fdpcommon">
+      <comment/>
+      <text>legalnotice-en.xml</text>
+    </entity>
+    <entity name="LEGALNOTICE-CONTENT" kind="fdpcommon">
+      <comment/>
+      <text>legalnotice-content-en.xml</text>
+    </entity>
+    <entity name="LEGALNOTICE-OPL" kind="fdpcommon">
+      <comment/>
+      <text>legalnotice-opl-en.xml</text>
+    </entity>
+    <entity name="LEGALNOTICE-OPL-CONTENT" kind="fdpcommon">
+      <comment/>
+      <text>opl.xml</text>
+    </entity>
+    <entity name="LEGALNOTICE-RELNOTES" kind="fdpcommon">
+      <comment/>
+      <text>legalnotice-relnotes-en.xml</text>
+    </entity>
+    <entity name="LEGALNOTICE-SECTION" kind="fdpcommon">
+      <comment/>
+      <text>legalnotice-section-en.xml</text>
+    </entity>
+    <entity name="BUG-REPORTING" kind="fdpcommon">
+      <comment/>
+      <text>bugreporting-en.xml</text>
+    </entity>
+  </group>
+  <group name="Common applications">
+  </group>
+  <group name="Required by build scripts">
+    <entity name="PROJECT">
+      <comment/>
+      <text><use entity="FP"/></text>
+    </entity>
+  </group>
+  <group name="Tutorial Titles">
+    <entity name="IG">
+      <comment/>
+      <text>Installation Guide</text>
+    </entity>
+    <entity name="DOCG">
+      <comment/>
+      <text>Documentation Guide</text>
+    </entity>
+  </group>
+  <group name="Tutorial URL's">
+    <entity name="IG-URL">
+      <comment/>
+      <text><ulink url="http://fedora.redhat.com/docs/fedora-install-guide-en/"/></text>
+    </entity>
+    <entity name="DOCG-URL">
+      <comment/>
+      <text><ulink url="http://fedora.redhat.com/participate/documentation-guide/"/></text>
+    </entity>
+  </group>
+  <group name="Status notices">
+    <entity name="DRAFTNOTICE" kind="system">
+      <comment/>
+      <text>draftnotice-en.xml</text>
+    </entity>
+    <entity name="LEGACYNOTICE" kind="system">
+      <comment/>
+      <text>legacynotice-en.xml</text>
+    </entity>
+    <entity name="OBSOLETENOTICE" kind="system">
+      <comment/>
+      <text>obsoletenotice-en.xml</text>
+    </entity>
+    <entity name="DEPRECATEDNOTICE" kind="system">
+      <comment/>
+      <text>deprecatednotice-en.xml</text>
+    </entity>
+  </group>
+</entities>
diff --git a/common/entities/it.po b/common/entities/it.po
index 7f8108a..0f65631 100644
--- a/common/entities/it.po
+++ b/common/entities/it.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
-"POT-Creation-Date: 2006-02-28 20:10-0500\n"
+"POT-Creation-Date: 2006-03-02 16:46-0600\n"
 "PO-Revision-Date: 2006-03-01 17:26+0100\n"
 "Last-Translator: Francesco Tombolini <tombo@adamantio.net>\n"
 "Language-Team: Italiano <fedora-trans-it@redhat.com>\n"
@@ -13,227 +13,230 @@ msgstr ""
 "X-Generator: KBabel 1.11.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
-#: entities-en.xml:6(title)
+#: entities-en_US.xml:4(title)
 msgid ""
 "These common entities are useful shorthand terms and names, which may be "
 "subject to change at anytime. This is an important value the the entity "
 "provides: a single location to update terms and common names."
-msgstr "Queste entità comuni sono utili abbreviazioni di termini e nomi, che potrebbero essere soggette a cambiamento in qualsiasi momento. Questo è il valore importante che le entità forniscono: Una singola locazione per aggiornare termini e nomi comuni."
+msgstr ""
+"Queste entità comuni sono utili abbreviazioni di termini e nomi, che "
+"potrebbero essere soggette a cambiamento in qualsiasi momento. Questo è il "
+"valore importante che le entità forniscono: Una singola locazione per "
+"aggiornare termini e nomi comuni."
 
-#: entities-en.xml:14(comment) entities-en.xml:18(comment)
+#: entities-en_US.xml:7(comment) entities-en_US.xml:11(comment)
 msgid "Generic root term"
 msgstr "Termine generico principale"
 
-#: entities-en.xml:15(text)
+#: entities-en_US.xml:8(text)
 msgid "Fedora"
 msgstr "Fedora"
 
-#: entities-en.xml:19(text)
+#: entities-en_US.xml:12(text)
 msgid "Core"
 msgstr "Core"
 
-#: entities-en.xml:22(comment)
+#: entities-en_US.xml:15(comment)
 msgid "Generic main project name"
 msgstr "Nome generico del progetto principale"
 
-#: entities-en.xml:26(comment)
+#: entities-en_US.xml:19(comment)
 msgid "Legacy Entity"
 msgstr "Entità obsolete"
 
-#: entities-en.xml:30(comment)
+#: entities-en_US.xml:23(comment)
 msgid "Short project name"
 msgstr "Nome breve del progetto"
 
-#: entities-en.xml:31(text)
+#: entities-en_US.xml:24(text)
 msgid "FC"
 msgstr "FC"
 
-#: entities-en.xml:34(comment)
+#: entities-en_US.xml:27(comment)
 msgid "Generic overall project name"
 msgstr "Nome generico del progetto complessivo"
 
-#: entities-en.xml:35(text)
+#: entities-en_US.xml:28(text)
 msgid "<use entity=\"FED\"/> Project"
 msgstr "Progetto <use entity=\"FED\"/>"
 
-#: entities-en.xml:38(comment)
+#: entities-en_US.xml:31(comment)
 msgid "Generic docs project name"
 msgstr "Nome generico progetto di documentazione"
 
-#: entities-en.xml:39(text) entities-en.xml:43(text)
+#: entities-en_US.xml:32(text) entities-en_US.xml:36(text)
 msgid "<use entity=\"FED\"/> Docs Project"
 msgstr "Progetto di documentazione <use entity=\"FED\"/>"
 
-#: entities-en.xml:42(comment)
+#: entities-en_US.xml:35(comment)
 msgid "Short docs project name"
 msgstr "Nome breve del progetto di documentazione"
 
-#: entities-en.xml:46(comment)
+#: entities-en_US.xml:39(comment)
 msgid "cf. Core"
 msgstr "cf. Core"
 
-#: entities-en.xml:47(text)
+#: entities-en_US.xml:40(text)
 msgid "Extras"
 msgstr "Extras"
 
-#: entities-en.xml:50(comment)
+#: entities-en_US.xml:43(comment)
 msgid "cf. Fedora Core"
 msgstr "cf. Fedora Core"
 
-#: entities-en.xml:54(comment)
+#: entities-en_US.xml:47(comment)
 msgid "Fedora Docs Project URL"
 msgstr "URL del Progetto di documentazione Fedora"
 
-#: entities-en.xml:58(comment)
+#: entities-en_US.xml:51(comment)
 msgid "Fedora Project URL"
 msgstr "URL del progetto Fedora"
 
-#: entities-en.xml:62(comment)
+#: entities-en_US.xml:55(comment)
 msgid "Fedora Documentation (repository) URL"
 msgstr "URL della documentazione Fedora (repositorio)"
 
-#: entities-en.xml:66(comment) entities-en.xml:67(text)
+#: entities-en_US.xml:59(comment) entities-en_US.xml:60(text)
 msgid "Bugzilla"
 msgstr "Bugzilla"
 
-#: entities-en.xml:70(comment)
+#: entities-en_US.xml:63(comment)
 msgid "Bugzilla URL"
 msgstr "URL di Bugzilla"
 
-#: entities-en.xml:74(comment)
+#: entities-en_US.xml:67(comment)
 msgid "Bugzilla product for Fedora Docs"
 msgstr "Prodotti bugzilla per la documentazione Fedora"
 
-#: entities-en.xml:75(text)
+#: entities-en_US.xml:68(text)
 msgid "<use entity=\"FED\"/> Documentation"
 msgstr "Documentazione <use entity=\"FED\"/>"
 
-#: entities-en.xml:80(comment)
+#: entities-en_US.xml:73(comment)
 msgid "Current release version of main project"
 msgstr "Versione attuale del progetto principale"
 
-#: entities-en.xml:81(text)
+#: entities-en_US.xml:74(text)
 msgid "4"
 msgstr "4"
 
-#: entities-en.xml:84(comment)
+#: entities-en_US.xml:77(comment)
 msgid "Current test number of main project"
 msgstr "Numero attuale di test del progetto principale"
 
-#: entities-en.xml:85(text)
+#: entities-en_US.xml:78(text)
 msgid "test3"
 msgstr "test3"
 
-#: entities-en.xml:88(comment)
+#: entities-en_US.xml:81(comment)
 msgid "Current test version of main project"
 msgstr "Versione attuale di test del progetto principale"
 
-#: entities-en.xml:89(text)
+#: entities-en_US.xml:82(text)
 msgid "5 <use entity=\"TESTVER\"/>"
 msgstr "5 <use entity=\"TESTVER\"/>"
 
-#: entities-en.xml:94(comment)
+#: entities-en_US.xml:87(comment)
 msgid "The generic term \"Red Hat\""
 msgstr "Il termine generico \"Red Hat\""
 
-#: entities-en.xml:95(text)
+#: entities-en_US.xml:88(text)
 msgid "Red Hat"
 msgstr "Red Hat"
 
-#: entities-en.xml:98(comment)
+#: entities-en_US.xml:91(comment)
 msgid "The generic term \"Red Hat, Inc.\""
 msgstr "Il termine generico \"Red Hat, Inc.\""
 
-#: entities-en.xml:99(text)
+#: entities-en_US.xml:92(text)
 msgid "<use entity=\"RH\"/> Inc."
 msgstr "<use entity=\"RH\"/> Inc."
 
-#: entities-en.xml:102(comment)
+#: entities-en_US.xml:95(comment)
 msgid "The generic term \"Red Hat Linux\""
 msgstr "Il termine generico \"Red Hat Linux\""
 
-#: entities-en.xml:103(text)
+#: entities-en_US.xml:96(text)
 msgid "<use entity=\"RH\"/> Linux"
 msgstr "<use entity=\"RH\"/> Linux"
 
-#: entities-en.xml:106(comment)
+#: entities-en_US.xml:99(comment)
 msgid "The generic term \"Red Hat Network\""
 msgstr "Il termine generico \"Red Hat Network\""
 
-#: entities-en.xml:107(text)
+#: entities-en_US.xml:100(text)
 msgid "<use entity=\"RH\"/> Network"
 msgstr "<use entity=\"RH\"/> Network"
 
-#: entities-en.xml:110(comment)
+#: entities-en_US.xml:103(comment)
 msgid "The generic term \"Red Hat Enterprise Linux\""
 msgstr "Il termine generico \"Red Hat Enterprise Linux\""
 
-#: entities-en.xml:111(text)
+#: entities-en_US.xml:104(text)
 msgid "<use entity=\"RH\"/> Enterprise Linux"
 msgstr "<use entity=\"RH\"/> Enterprise Linux"
 
-#: entities-en.xml:116(comment)
+#: entities-en_US.xml:109(comment)
 msgid "Generic technology term"
 msgstr "Termine tecnologico generico"
 
-#: entities-en.xml:117(text)
+#: entities-en_US.xml:110(text)
 msgid "SELinux"
 msgstr "SELinux"
 
-#: entities-en.xml:123(text)
+#: entities-en_US.xml:116(text)
 msgid "legalnotice-en.xml"
 msgstr "legalnotice-en.xml"
 
-#: entities-en.xml:127(text)
+#: entities-en_US.xml:120(text)
 msgid "legalnotice-content-en.xml"
 msgstr "legalnotice-content-it.xml"
 
-#: entities-en.xml:131(text)
+#: entities-en_US.xml:124(text)
 msgid "legalnotice-opl-en.xml"
 msgstr "legalnotice-opl-en.xml"
 
-#: entities-en.xml:135(text)
+#: entities-en_US.xml:128(text)
 msgid "opl.xml"
 msgstr "opl.xml"
 
-#: entities-en.xml:139(text)
+#: entities-en_US.xml:132(text)
 msgid "legalnotice-relnotes-en.xml"
 msgstr "legalnotice-relnotes-it.xml"
 
-#: entities-en.xml:143(text)
+#: entities-en_US.xml:136(text)
 msgid "legalnotice-section-en.xml"
 msgstr "legalnotice-section-it.xml"
 
-#: entities-en.xml:147(text)
+#: entities-en_US.xml:140(text)
 msgid "bugreporting-en.xml"
 msgstr "bugreporting-it.xml"
 
-#: entities-en.xml:161(text)
+#: entities-en_US.xml:154(text)
 msgid "Installation Guide"
 msgstr "Guida all'installazione"
 
-#: entities-en.xml:165(text)
+#: entities-en_US.xml:158(text)
 msgid "Documentation Guide"
 msgstr "Guida alla documentazione"
 
-#: entities-en.xml:181(text)
+#: entities-en_US.xml:174(text)
 msgid "draftnotice-en.xml"
 msgstr "draftnotice-it.xml"
 
-#: entities-en.xml:185(text)
+#: entities-en_US.xml:178(text)
 msgid "legacynotice-en.xml"
 msgstr "legacynotice-it.xml"
 
-#: entities-en.xml:189(text)
+#: entities-en_US.xml:182(text)
 msgid "obsoletenotice-en.xml"
 msgstr "obsoletenotice-it.xml"
 
-#: entities-en.xml:193(text)
+#: entities-en_US.xml:186(text)
 msgid "deprecatednotice-en.xml"
 msgstr "deprecatednotice-it.xml"
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: entities-en.xml:0(None)
+#: entities-en_US.xml:0(None)
 msgid "translator-credits"
 msgstr "translator-credits"
-
diff --git a/common/entities/pt_BR.po b/common/entities/pt_BR.po
index 50ac13d..be74205 100644
--- a/common/entities/pt_BR.po
+++ b/common/entities/pt_BR.po
@@ -3,7 +3,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: pt_BR\n"
-"POT-Creation-Date: 2006-02-28 20:10-0500\n"
+"POT-Creation-Date: 2006-03-02 16:46-0600\n"
 "PO-Revision-Date: 2006-03-01 15:26-0300\n"
 "Last-Translator: Hugo Cisneiros <hugo@devin.com.br>\n"
 "Language-Team: Brazilian Portuguese <fedora-trans-pt_BR@redhat.com>\n"
@@ -12,230 +12,229 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.1\n"
 
-#: entities-en.xml:6(title)
+#: entities-en_US.xml:4(title)
 msgid ""
 "These common entities are useful shorthand terms and names, which may be "
 "subject to change at anytime. This is an important value the the entity "
 "provides: a single location to update terms and common names."
 msgstr ""
-"Estas entidades comuns são termos de mão e nomes úteis que podem ser "
-"mudados a qualquer momento. É muito importante que se forneça um local "
-"único para a atualização de termos e nomes comuns."
+"Estas entidades comuns são termos de mão e nomes úteis que podem ser mudados "
+"a qualquer momento. É muito importante que se forneça um local único para a "
+"atualização de termos e nomes comuns."
 
-#: entities-en.xml:14(comment) entities-en.xml:18(comment)
+#: entities-en_US.xml:7(comment) entities-en_US.xml:11(comment)
 msgid "Generic root term"
 msgstr "Termo principal genérico"
 
-#: entities-en.xml:15(text)
+#: entities-en_US.xml:8(text)
 msgid "Fedora"
 msgstr "Fedora"
 
-#: entities-en.xml:19(text)
+#: entities-en_US.xml:12(text)
 msgid "Core"
 msgstr "Core"
 
-#: entities-en.xml:22(comment)
+#: entities-en_US.xml:15(comment)
 msgid "Generic main project name"
 msgstr "Nome genérico do projeto principal"
 
-#: entities-en.xml:26(comment)
+#: entities-en_US.xml:19(comment)
 msgid "Legacy Entity"
 msgstr "Entidade Legada"
 
-#: entities-en.xml:30(comment)
+#: entities-en_US.xml:23(comment)
 msgid "Short project name"
 msgstr "Nome curto do projeto"
 
-#: entities-en.xml:31(text)
+#: entities-en_US.xml:24(text)
 msgid "FC"
 msgstr "FC"
 
-#: entities-en.xml:34(comment)
+#: entities-en_US.xml:27(comment)
 msgid "Generic overall project name"
 msgstr "Nome genérico do projeto geral"
 
-#: entities-en.xml:35(text)
+#: entities-en_US.xml:28(text)
 msgid "<use entity=\"FED\"/> Project"
 msgstr "Projeto <use entity=\"FED\"/>"
 
-#: entities-en.xml:38(comment)
+#: entities-en_US.xml:31(comment)
 msgid "Generic docs project name"
 msgstr "Nome genérico do projeto de documentação"
 
-#: entities-en.xml:39(text) entities-en.xml:43(text)
+#: entities-en_US.xml:32(text) entities-en_US.xml:36(text)
 msgid "<use entity=\"FED\"/> Docs Project"
 msgstr "Projeto de Documentação <use entity=\"FED\"/>"
 
-#: entities-en.xml:42(comment)
+#: entities-en_US.xml:35(comment)
 msgid "Short docs project name"
 msgstr "Nome curto do projeto de documentação"
 
-#: entities-en.xml:46(comment)
+#: entities-en_US.xml:39(comment)
 msgid "cf. Core"
 msgstr "cf. Core"
 
-#: entities-en.xml:47(text)
+#: entities-en_US.xml:40(text)
 msgid "Extras"
 msgstr "Extras"
 
-#: entities-en.xml:50(comment)
+#: entities-en_US.xml:43(comment)
 msgid "cf. Fedora Core"
 msgstr "cf. Fedora Core"
 
-#: entities-en.xml:54(comment)
+#: entities-en_US.xml:47(comment)
 msgid "Fedora Docs Project URL"
 msgstr "URL do Projeto de Documentação Fedora"
 
-#: entities-en.xml:58(comment)
+#: entities-en_US.xml:51(comment)
 msgid "Fedora Project URL"
 msgstr "URL do Projeto Fedora"
 
-#: entities-en.xml:62(comment)
+#: entities-en_US.xml:55(comment)
 msgid "Fedora Documentation (repository) URL"
 msgstr "URL de Documentação Fedora (repositório)"
 
-#: entities-en.xml:66(comment) entities-en.xml:67(text)
+#: entities-en_US.xml:59(comment) entities-en_US.xml:60(text)
 msgid "Bugzilla"
 msgstr "Bugzilla"
 
-#: entities-en.xml:70(comment)
+#: entities-en_US.xml:63(comment)
 msgid "Bugzilla URL"
 msgstr "URL do Bugzilla"
 
-#: entities-en.xml:74(comment)
+#: entities-en_US.xml:67(comment)
 msgid "Bugzilla product for Fedora Docs"
 msgstr "Produto Bugzilla para a Documentação Fedora"
 
-#: entities-en.xml:75(text)
+#: entities-en_US.xml:68(text)
 msgid "<use entity=\"FED\"/> Documentation"
 msgstr "Documentação <use entity=\"FED\"/>"
 
-#: entities-en.xml:80(comment)
+#: entities-en_US.xml:73(comment)
 msgid "Current release version of main project"
 msgstr "Versão de lançamento atual do projeto principal"
 
-#: entities-en.xml:81(text)
+#: entities-en_US.xml:74(text)
 msgid "4"
 msgstr "4"
 
-#: entities-en.xml:84(comment)
+#: entities-en_US.xml:77(comment)
 msgid "Current test number of main project"
 msgstr "Número atual de teste do projeto principal"
 
-#: entities-en.xml:85(text)
+#: entities-en_US.xml:78(text)
 msgid "test3"
 msgstr "test3"
 
-#: entities-en.xml:88(comment)
+#: entities-en_US.xml:81(comment)
 msgid "Current test version of main project"
 msgstr "Versão de teste atual do projeto principal"
 
-#: entities-en.xml:89(text)
+#: entities-en_US.xml:82(text)
 msgid "5 <use entity=\"TESTVER\"/>"
 msgstr "5 <use entity=\"TESTVER\"/>"
 
-#: entities-en.xml:94(comment)
+#: entities-en_US.xml:87(comment)
 msgid "The generic term \"Red Hat\""
 msgstr "O termo genérico \"Red Hat\""
 
-#: entities-en.xml:95(text)
+#: entities-en_US.xml:88(text)
 msgid "Red Hat"
 msgstr "Red Hat"
 
-#: entities-en.xml:98(comment)
+#: entities-en_US.xml:91(comment)
 msgid "The generic term \"Red Hat, Inc.\""
 msgstr "O termo genérico \"Red Hat, Inc.\""
 
-#: entities-en.xml:99(text)
+#: entities-en_US.xml:92(text)
 msgid "<use entity=\"RH\"/> Inc."
 msgstr "<use entity=\"RH\"/> Inc."
 
-#: entities-en.xml:102(comment)
+#: entities-en_US.xml:95(comment)
 msgid "The generic term \"Red Hat Linux\""
 msgstr "O termo genérico \"Red Hat Linux\""
 
-#: entities-en.xml:103(text)
+#: entities-en_US.xml:96(text)
 msgid "<use entity=\"RH\"/> Linux"
 msgstr "<use entity=\"RH\"/> Linux"
 
-#: entities-en.xml:106(comment)
+#: entities-en_US.xml:99(comment)
 msgid "The generic term \"Red Hat Network\""
 msgstr "O termo genérico \"Red Hat Network\""
 
-#: entities-en.xml:107(text)
+#: entities-en_US.xml:100(text)
 msgid "<use entity=\"RH\"/> Network"
 msgstr "<use entity=\"RH\"/> Network"
 
-#: entities-en.xml:110(comment)
+#: entities-en_US.xml:103(comment)
 msgid "The generic term \"Red Hat Enterprise Linux\""
 msgstr "O termo genérico \"Red Hat Enterprise Linux\""
 
-#: entities-en.xml:111(text)
+#: entities-en_US.xml:104(text)
 msgid "<use entity=\"RH\"/> Enterprise Linux"
 msgstr "<use entity=\"RH\"/> Enterprise Linux"
 
-#: entities-en.xml:116(comment)
+#: entities-en_US.xml:109(comment)
 msgid "Generic technology term"
 msgstr "Termo de tecnologia genérico"
 
-#: entities-en.xml:117(text)
+#: entities-en_US.xml:110(text)
 msgid "SELinux"
 msgstr "SELinux"
 
-#: entities-en.xml:123(text)
+#: entities-en_US.xml:116(text)
 msgid "legalnotice-en.xml"
 msgstr "legalnotice-en.xml"
 
-#: entities-en.xml:127(text)
+#: entities-en_US.xml:120(text)
 msgid "legalnotice-content-en.xml"
 msgstr "legalnotice-content-en.xml"
 
-#: entities-en.xml:131(text)
+#: entities-en_US.xml:124(text)
 msgid "legalnotice-opl-en.xml"
 msgstr "legalnotice-opl-en.xml"
 
-#: entities-en.xml:135(text)
+#: entities-en_US.xml:128(text)
 msgid "opl.xml"
 msgstr "opl.xml"
 
-#: entities-en.xml:139(text)
+#: entities-en_US.xml:132(text)
 msgid "legalnotice-relnotes-en.xml"
 msgstr "legalnotice-relnotes-en.xml"
 
-#: entities-en.xml:143(text)
+#: entities-en_US.xml:136(text)
 msgid "legalnotice-section-en.xml"
 msgstr "legalnotice-section-en.xml"
 
-#: entities-en.xml:147(text)
+#: entities-en_US.xml:140(text)
 msgid "bugreporting-en.xml"
 msgstr "bugreporting-pt_BR.xml"
 
-#: entities-en.xml:161(text)
+#: entities-en_US.xml:154(text)
 msgid "Installation Guide"
 msgstr "Guia de Instalação"
 
-#: entities-en.xml:165(text)
+#: entities-en_US.xml:158(text)
 msgid "Documentation Guide"
 msgstr "Guia de Documentação"
 
-#: entities-en.xml:181(text)
+#: entities-en_US.xml:174(text)
 msgid "draftnotice-en.xml"
 msgstr "draftnotice-pt_BR.xml"
 
-#: entities-en.xml:185(text)
+#: entities-en_US.xml:178(text)
 msgid "legacynotice-en.xml"
 msgstr "legacynotice-pt_BR.xml"
 
-#: entities-en.xml:189(text)
+#: entities-en_US.xml:182(text)
 msgid "obsoletenotice-en.xml"
 msgstr "obsoletenotice-pt_BR.xml"
 
-#: entities-en.xml:193(text)
+#: entities-en_US.xml:186(text)
 msgid "deprecatednotice-en.xml"
 msgstr "deprecatednotice-pt_BR.xml"
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: entities-en.xml:0(None)
+#: entities-en_US.xml:0(None)
 msgid "translator-credits"
 msgstr "Hugo Cisneiros <hugo@devin.com.br>, 2006"
-
diff --git a/common/entities/ru.po b/common/entities/ru.po
index 06bdc17..508bd7d 100644
--- a/common/entities/ru.po
+++ b/common/entities/ru.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-02-28 20:10-0500\n"
+"POT-Creation-Date: 2006-03-02 16:46-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -9,226 +9,226 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: entities-en.xml:6(title)
+#: entities-en_US.xml:4(title)
 msgid ""
 "These common entities are useful shorthand terms and names, which may be "
 "subject to change at anytime. This is an important value the the entity "
 "provides: a single location to update terms and common names."
 msgstr ""
 
-#: entities-en.xml:14(comment) entities-en.xml:18(comment)
+#: entities-en_US.xml:7(comment) entities-en_US.xml:11(comment)
 msgid "Generic root term"
 msgstr ""
 
-#: entities-en.xml:15(text)
+#: entities-en_US.xml:8(text)
 msgid "Fedora"
 msgstr ""
 
-#: entities-en.xml:19(text)
+#: entities-en_US.xml:12(text)
 msgid "Core"
 msgstr ""
 
-#: entities-en.xml:22(comment)
+#: entities-en_US.xml:15(comment)
 msgid "Generic main project name"
 msgstr ""
 
-#: entities-en.xml:26(comment)
+#: entities-en_US.xml:19(comment)
 msgid "Legacy Entity"
 msgstr ""
 
-#: entities-en.xml:30(comment)
+#: entities-en_US.xml:23(comment)
 msgid "Short project name"
 msgstr ""
 
-#: entities-en.xml:31(text)
+#: entities-en_US.xml:24(text)
 msgid "FC"
 msgstr ""
 
-#: entities-en.xml:34(comment)
+#: entities-en_US.xml:27(comment)
 msgid "Generic overall project name"
 msgstr ""
 
-#: entities-en.xml:35(text)
+#: entities-en_US.xml:28(text)
 msgid "<use entity=\"FED\"/> Project"
 msgstr ""
 
-#: entities-en.xml:38(comment)
+#: entities-en_US.xml:31(comment)
 msgid "Generic docs project name"
 msgstr ""
 
-#: entities-en.xml:39(text) entities-en.xml:43(text)
+#: entities-en_US.xml:32(text) entities-en_US.xml:36(text)
 msgid "<use entity=\"FED\"/> Docs Project"
 msgstr ""
 
-#: entities-en.xml:42(comment)
+#: entities-en_US.xml:35(comment)
 msgid "Short docs project name"
 msgstr ""
 
-#: entities-en.xml:46(comment)
+#: entities-en_US.xml:39(comment)
 msgid "cf. Core"
 msgstr ""
 
-#: entities-en.xml:47(text)
+#: entities-en_US.xml:40(text)
 msgid "Extras"
 msgstr ""
 
-#: entities-en.xml:50(comment)
+#: entities-en_US.xml:43(comment)
 msgid "cf. Fedora Core"
 msgstr ""
 
-#: entities-en.xml:54(comment)
+#: entities-en_US.xml:47(comment)
 msgid "Fedora Docs Project URL"
 msgstr ""
 
-#: entities-en.xml:58(comment)
+#: entities-en_US.xml:51(comment)
 msgid "Fedora Project URL"
 msgstr ""
 
-#: entities-en.xml:62(comment)
+#: entities-en_US.xml:55(comment)
 msgid "Fedora Documentation (repository) URL"
 msgstr ""
 
-#: entities-en.xml:66(comment) entities-en.xml:67(text)
+#: entities-en_US.xml:59(comment) entities-en_US.xml:60(text)
 msgid "Bugzilla"
 msgstr ""
 
-#: entities-en.xml:70(comment)
+#: entities-en_US.xml:63(comment)
 msgid "Bugzilla URL"
 msgstr ""
 
-#: entities-en.xml:74(comment)
+#: entities-en_US.xml:67(comment)
 msgid "Bugzilla product for Fedora Docs"
 msgstr ""
 
-#: entities-en.xml:75(text)
+#: entities-en_US.xml:68(text)
 msgid "<use entity=\"FED\"/> Documentation"
 msgstr ""
 
-#: entities-en.xml:80(comment)
+#: entities-en_US.xml:73(comment)
 msgid "Current release version of main project"
 msgstr ""
 
-#: entities-en.xml:81(text)
+#: entities-en_US.xml:74(text)
 msgid "4"
 msgstr ""
 
-#: entities-en.xml:84(comment)
+#: entities-en_US.xml:77(comment)
 msgid "Current test number of main project"
 msgstr ""
 
-#: entities-en.xml:85(text)
+#: entities-en_US.xml:78(text)
 msgid "test3"
 msgstr ""
 
-#: entities-en.xml:88(comment)
+#: entities-en_US.xml:81(comment)
 msgid "Current test version of main project"
 msgstr ""
 
-#: entities-en.xml:89(text)
+#: entities-en_US.xml:82(text)
 msgid "5 <use entity=\"TESTVER\"/>"
 msgstr ""
 
-#: entities-en.xml:94(comment)
+#: entities-en_US.xml:87(comment)
 msgid "The generic term \"Red Hat\""
 msgstr ""
 
-#: entities-en.xml:95(text)
+#: entities-en_US.xml:88(text)
 msgid "Red Hat"
 msgstr ""
 
-#: entities-en.xml:98(comment)
+#: entities-en_US.xml:91(comment)
 msgid "The generic term \"Red Hat, Inc.\""
 msgstr ""
 
-#: entities-en.xml:99(text)
+#: entities-en_US.xml:92(text)
 msgid "<use entity=\"RH\"/> Inc."
 msgstr ""
 
-#: entities-en.xml:102(comment)
+#: entities-en_US.xml:95(comment)
 msgid "The generic term \"Red Hat Linux\""
 msgstr ""
 
-#: entities-en.xml:103(text)
+#: entities-en_US.xml:96(text)
 msgid "<use entity=\"RH\"/> Linux"
 msgstr ""
 
-#: entities-en.xml:106(comment)
+#: entities-en_US.xml:99(comment)
 msgid "The generic term \"Red Hat Network\""
 msgstr ""
 
-#: entities-en.xml:107(text)
+#: entities-en_US.xml:100(text)
 msgid "<use entity=\"RH\"/> Network"
 msgstr ""
 
-#: entities-en.xml:110(comment)
+#: entities-en_US.xml:103(comment)
 msgid "The generic term \"Red Hat Enterprise Linux\""
 msgstr ""
 
-#: entities-en.xml:111(text)
+#: entities-en_US.xml:104(text)
 msgid "<use entity=\"RH\"/> Enterprise Linux"
 msgstr ""
 
-#: entities-en.xml:116(comment)
+#: entities-en_US.xml:109(comment)
 msgid "Generic technology term"
 msgstr ""
 
-#: entities-en.xml:117(text)
+#: entities-en_US.xml:110(text)
 msgid "SELinux"
 msgstr ""
 
-#: entities-en.xml:123(text)
+#: entities-en_US.xml:116(text)
 msgid "legalnotice-en.xml"
 msgstr ""
 
-#: entities-en.xml:127(text)
+#: entities-en_US.xml:120(text)
 msgid "legalnotice-content-en.xml"
 msgstr ""
 
-#: entities-en.xml:131(text)
+#: entities-en_US.xml:124(text)
 msgid "legalnotice-opl-en.xml"
 msgstr ""
 
-#: entities-en.xml:135(text)
+#: entities-en_US.xml:128(text)
 msgid "opl.xml"
 msgstr ""
 
-#: entities-en.xml:139(text)
+#: entities-en_US.xml:132(text)
 msgid "legalnotice-relnotes-en.xml"
 msgstr ""
 
-#: entities-en.xml:143(text)
+#: entities-en_US.xml:136(text)
 msgid "legalnotice-section-en.xml"
 msgstr ""
 
-#: entities-en.xml:147(text)
+#: entities-en_US.xml:140(text)
 msgid "bugreporting-en.xml"
 msgstr ""
 
-#: entities-en.xml:161(text)
+#: entities-en_US.xml:154(text)
 msgid "Installation Guide"
 msgstr ""
 
-#: entities-en.xml:165(text)
+#: entities-en_US.xml:158(text)
 msgid "Documentation Guide"
 msgstr ""
 
-#: entities-en.xml:181(text)
+#: entities-en_US.xml:174(text)
 msgid "draftnotice-en.xml"
 msgstr ""
 
-#: entities-en.xml:185(text)
+#: entities-en_US.xml:178(text)
 msgid "legacynotice-en.xml"
 msgstr ""
 
-#: entities-en.xml:189(text)
+#: entities-en_US.xml:182(text)
 msgid "obsoletenotice-en.xml"
 msgstr ""
 
-#: entities-en.xml:193(text)
+#: entities-en_US.xml:186(text)
 msgid "deprecatednotice-en.xml"
 msgstr ""
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: entities-en.xml:0(None)
+#: entities-en_US.xml:0(None)
 msgid "translator-credits"
 msgstr ""
diff --git a/common/entities/zh_CN.po b/common/entities/zh_CN.po
index 06bdc17..508bd7d 100644
--- a/common/entities/zh_CN.po
+++ b/common/entities/zh_CN.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2006-02-28 20:10-0500\n"
+"POT-Creation-Date: 2006-03-02 16:46-0600\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -9,226 +9,226 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: entities-en.xml:6(title)
+#: entities-en_US.xml:4(title)
 msgid ""
 "These common entities are useful shorthand terms and names, which may be "
 "subject to change at anytime. This is an important value the the entity "
 "provides: a single location to update terms and common names."
 msgstr ""
 
-#: entities-en.xml:14(comment) entities-en.xml:18(comment)
+#: entities-en_US.xml:7(comment) entities-en_US.xml:11(comment)
 msgid "Generic root term"
 msgstr ""
 
-#: entities-en.xml:15(text)
+#: entities-en_US.xml:8(text)
 msgid "Fedora"
 msgstr ""
 
-#: entities-en.xml:19(text)
+#: entities-en_US.xml:12(text)
 msgid "Core"
 msgstr ""
 
-#: entities-en.xml:22(comment)
+#: entities-en_US.xml:15(comment)
 msgid "Generic main project name"
 msgstr ""
 
-#: entities-en.xml:26(comment)
+#: entities-en_US.xml:19(comment)
 msgid "Legacy Entity"
 msgstr ""
 
-#: entities-en.xml:30(comment)
+#: entities-en_US.xml:23(comment)
 msgid "Short project name"
 msgstr ""
 
-#: entities-en.xml:31(text)
+#: entities-en_US.xml:24(text)
 msgid "FC"
 msgstr ""
 
-#: entities-en.xml:34(comment)
+#: entities-en_US.xml:27(comment)
 msgid "Generic overall project name"
 msgstr ""
 
-#: entities-en.xml:35(text)
+#: entities-en_US.xml:28(text)
 msgid "<use entity=\"FED\"/> Project"
 msgstr ""
 
-#: entities-en.xml:38(comment)
+#: entities-en_US.xml:31(comment)
 msgid "Generic docs project name"
 msgstr ""
 
-#: entities-en.xml:39(text) entities-en.xml:43(text)
+#: entities-en_US.xml:32(text) entities-en_US.xml:36(text)
 msgid "<use entity=\"FED\"/> Docs Project"
 msgstr ""
 
-#: entities-en.xml:42(comment)
+#: entities-en_US.xml:35(comment)
 msgid "Short docs project name"
 msgstr ""
 
-#: entities-en.xml:46(comment)
+#: entities-en_US.xml:39(comment)
 msgid "cf. Core"
 msgstr ""
 
-#: entities-en.xml:47(text)
+#: entities-en_US.xml:40(text)
 msgid "Extras"
 msgstr ""
 
-#: entities-en.xml:50(comment)
+#: entities-en_US.xml:43(comment)
 msgid "cf. Fedora Core"
 msgstr ""
 
-#: entities-en.xml:54(comment)
+#: entities-en_US.xml:47(comment)
 msgid "Fedora Docs Project URL"
 msgstr ""
 
-#: entities-en.xml:58(comment)
+#: entities-en_US.xml:51(comment)
 msgid "Fedora Project URL"
 msgstr ""
 
-#: entities-en.xml:62(comment)
+#: entities-en_US.xml:55(comment)
 msgid "Fedora Documentation (repository) URL"
 msgstr ""
 
-#: entities-en.xml:66(comment) entities-en.xml:67(text)
+#: entities-en_US.xml:59(comment) entities-en_US.xml:60(text)
 msgid "Bugzilla"
 msgstr ""
 
-#: entities-en.xml:70(comment)
+#: entities-en_US.xml:63(comment)
 msgid "Bugzilla URL"
 msgstr ""
 
-#: entities-en.xml:74(comment)
+#: entities-en_US.xml:67(comment)
 msgid "Bugzilla product for Fedora Docs"
 msgstr ""
 
-#: entities-en.xml:75(text)
+#: entities-en_US.xml:68(text)
 msgid "<use entity=\"FED\"/> Documentation"
 msgstr ""
 
-#: entities-en.xml:80(comment)
+#: entities-en_US.xml:73(comment)
 msgid "Current release version of main project"
 msgstr ""
 
-#: entities-en.xml:81(text)
+#: entities-en_US.xml:74(text)
 msgid "4"
 msgstr ""
 
-#: entities-en.xml:84(comment)
+#: entities-en_US.xml:77(comment)
 msgid "Current test number of main project"
 msgstr ""
 
-#: entities-en.xml:85(text)
+#: entities-en_US.xml:78(text)
 msgid "test3"
 msgstr ""
 
-#: entities-en.xml:88(comment)
+#: entities-en_US.xml:81(comment)
 msgid "Current test version of main project"
 msgstr ""
 
-#: entities-en.xml:89(text)
+#: entities-en_US.xml:82(text)
 msgid "5 <use entity=\"TESTVER\"/>"
 msgstr ""
 
-#: entities-en.xml:94(comment)
+#: entities-en_US.xml:87(comment)
 msgid "The generic term \"Red Hat\""
 msgstr ""
 
-#: entities-en.xml:95(text)
+#: entities-en_US.xml:88(text)
 msgid "Red Hat"
 msgstr ""
 
-#: entities-en.xml:98(comment)
+#: entities-en_US.xml:91(comment)
 msgid "The generic term \"Red Hat, Inc.\""
 msgstr ""
 
-#: entities-en.xml:99(text)
+#: entities-en_US.xml:92(text)
 msgid "<use entity=\"RH\"/> Inc."
 msgstr ""
 
-#: entities-en.xml:102(comment)
+#: entities-en_US.xml:95(comment)
 msgid "The generic term \"Red Hat Linux\""
 msgstr ""
 
-#: entities-en.xml:103(text)
+#: entities-en_US.xml:96(text)
 msgid "<use entity=\"RH\"/> Linux"
 msgstr ""
 
-#: entities-en.xml:106(comment)
+#: entities-en_US.xml:99(comment)
 msgid "The generic term \"Red Hat Network\""
 msgstr ""
 
-#: entities-en.xml:107(text)
+#: entities-en_US.xml:100(text)
 msgid "<use entity=\"RH\"/> Network"
 msgstr ""
 
-#: entities-en.xml:110(comment)
+#: entities-en_US.xml:103(comment)
 msgid "The generic term \"Red Hat Enterprise Linux\""
 msgstr ""
 
-#: entities-en.xml:111(text)
+#: entities-en_US.xml:104(text)
 msgid "<use entity=\"RH\"/> Enterprise Linux"
 msgstr ""
 
-#: entities-en.xml:116(comment)
+#: entities-en_US.xml:109(comment)
 msgid "Generic technology term"
 msgstr ""
 
-#: entities-en.xml:117(text)
+#: entities-en_US.xml:110(text)
 msgid "SELinux"
 msgstr ""
 
-#: entities-en.xml:123(text)
+#: entities-en_US.xml:116(text)
 msgid "legalnotice-en.xml"
 msgstr ""
 
-#: entities-en.xml:127(text)
+#: entities-en_US.xml:120(text)
 msgid "legalnotice-content-en.xml"
 msgstr ""
 
-#: entities-en.xml:131(text)
+#: entities-en_US.xml:124(text)
 msgid "legalnotice-opl-en.xml"
 msgstr ""
 
-#: entities-en.xml:135(text)
+#: entities-en_US.xml:128(text)
 msgid "opl.xml"
 msgstr ""
 
-#: entities-en.xml:139(text)
+#: entities-en_US.xml:132(text)
 msgid "legalnotice-relnotes-en.xml"
 msgstr ""
 
-#: entities-en.xml:143(text)
+#: entities-en_US.xml:136(text)
 msgid "legalnotice-section-en.xml"
 msgstr ""
 
-#: entities-en.xml:147(text)
+#: entities-en_US.xml:140(text)
 msgid "bugreporting-en.xml"
 msgstr ""
 
-#: entities-en.xml:161(text)
+#: entities-en_US.xml:154(text)
 msgid "Installation Guide"
 msgstr ""
 
-#: entities-en.xml:165(text)
+#: entities-en_US.xml:158(text)
 msgid "Documentation Guide"
 msgstr ""
 
-#: entities-en.xml:181(text)
+#: entities-en_US.xml:174(text)
 msgid "draftnotice-en.xml"
 msgstr ""
 
-#: entities-en.xml:185(text)
+#: entities-en_US.xml:178(text)
 msgid "legacynotice-en.xml"
 msgstr ""
 
-#: entities-en.xml:189(text)
+#: entities-en_US.xml:182(text)
 msgid "obsoletenotice-en.xml"
 msgstr ""
 
-#: entities-en.xml:193(text)
+#: entities-en_US.xml:186(text)
 msgid "deprecatednotice-en.xml"
 msgstr ""
 
 #. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
-#: entities-en.xml:0(None)
+#: entities-en_US.xml:0(None)
 msgid "translator-credits"
 msgstr ""