merge fx-team to mozilla-central
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 06 Nov 2013 13:09:28 +0100
changeset 3034 22f6afb83f8b09ca7eb79d12dc28d66bbacced84
parent 3032 bf590a301283b73ef93341209d2b83612f22ef46 (current diff)
parent 3033 6ff229fe6bd65340752f96e3f6c5f4c4f7134bba (diff)
child 3035 2e1854254afbd75b6104a06cf89ba26fd11e1281
push id1
push useraxel@mozilla.com
push dateTue, 10 Oct 2017 22:14:06 +0000
merge fx-team to mozilla-central X-Channel-Repo: mozilla-central X-Channel-Converted-Revision: 88bc6beaec9d6c03e5e4ff3003c9198423c92f76
--- a/mobile/android/chrome/config.dtd
+++ b/mobile/android/chrome/config.dtd
@@ -1,7 +1,21 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
    - 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 search.placeholder2    "Search Settings">
-<!ENTITY clear.altText          "Clear">
-<!ENTITY newpref.label2         "Add a New Setting">
+
+<!ENTITY toolbar.searchPlaceholder     "Search">
+
+<!ENTITY newPref.namePlaceholder       "Name">
+
+<!ENTITY newPref.valueBoolean          "Boolean">
+<!ENTITY newPref.valueString           "String">
+<!ENTITY newPref.valueInteger          "Integer">
+
+<!ENTITY newPref.stringPlaceholder     "Enter a string">
+<!ENTITY newPref.numberPlaceholder     "Enter a number">
+
+<!ENTITY newPref.toggleButton          "Toggle">
+<!ENTITY newPref.cancelButton          "Cancel">
+
+<!ENTITY contextMenu.copyPrefName      "Copy Name">
+<!ENTITY contextMenu.copyPrefValue     "Copy Value">
--- a/mobile/android/chrome/config.properties
+++ b/mobile/android/chrome/config.properties
@@ -1,19 +1,9 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
-addPref.title=Add
-addPref.selectType=Select type:
-addPref.type.string=String
-addPref.type.integer=Integer
-addPref.type.boolean=Boolean
-addPref.enterName=Enter name:
+newPref.createButton=Create
+newPref.changeButton=Change
 
-togglePref.label=Toggle
-modifyPref.label=Modify
-modifyPref.selectText=Select value for %1$S:
-modifyPref.promptText=Enter value for %1$S:
-modifyPref.numberErrorTitle=Invalid Value
-modifyPref.numberErrorText=The text you entered was not a number
-
-resetPref.label=Reset
+pref.toggleButton=Toggle
+pref.resetButton=Reset