Bug 1326098 - Use placeholder text for container name, remove unused strings. r=jkt

browser/components/preferences/containers.xul

@@ -32,7 +32,7 @@
   <vbox class="contentPane largeDialogContainer" flex="1" hidden="true" id="containers-content">
     <hbox align="start">
       <label id="nameLabel" control="name" value="&name.label;" accesskey="&name.accesskey;"/>
-      <textbox id="name" flex="1" onkeyup="gContainersManager.checkForm();" />
+      <textbox id="name" placeholder="&name.placeholder;" flex="1" onkeyup="gContainersManager.checkForm();" />
     </hbox>
     <hbox align="center" id="iconWrapper">
       <label id="iconLabel" control="icon" value="&icon.label;" accesskey="&icon.accesskey;"/>

browser/components/preferences/in-content/containers.xul

@@ -37,7 +37,7 @@
     <richlistbox id="containersView" orient="vertical" persist="lastSelectedType"
                  flex="1">
       <listheader equalsize="always">
-          <treecol id="typeColumn" label="&label.label;" value="type"
+          <treecol id="typeColumn" value="type"
                    persist="sortDirection"
                    flex="1" sortDirection="ascending"/>
           <treecol id="actionColumn" value="action"

browser/locales/en-US/chrome/browser/preferences/containers.dtd

@@ -2,7 +2,6 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY label.label          "Name">
 <!ENTITY addButton.label      "Add New Container">
 <!ENTITY addButton.accesskey  "A">
 <!-- &#171; is &laquo; however it's not defined in XML -->
@@ -13,6 +12,7 @@
 
 <!ENTITY name.label           "Name:">
 <!ENTITY name.accesskey       "N">
+<!ENTITY name.placeholder     "Enter a container name">
 <!ENTITY icon.label           "Icon:">
 <!ENTITY icon.accesskey       "I">
 <!ENTITY color.label          "Color:">

browser/locales/en-US/chrome/browser/preferences/containers.properties

@@ -2,14 +2,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-containers.removeButton = Remove
-containers.preferencesButton = Preferences
-containers.colorHeading = Color:
 containers.labelMinWidth = 4rem
-containers.nameLabel = Name:
-containers.namePlaceholder = Enter a container name
-containers.submitButton = Done
-containers.iconHeading = Icon:
 containers.updateContainerTitle = %S Container Preferences
 
 containers.blue.label = Blue