Merge f-t to m-c
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 02 Feb 2014 18:58:48 -0800
changeset 182585 89c6374e6618a7609d6fd74b96177989aae3ebaa
parent 182580 692318f3d859535d8fca9814c697ee98a72f22ab (current diff)
parent 182584 92c81bf6052cbdab60c5d413e862b3f13a87d72f (diff)
child 182586 44ba69cacd7eb21066ed40ad23cab9b54b657d25
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone29.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge f-t to m-c
--- a/browser/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd
+++ b/browser/locales/en-US/chrome/browser/aboutPrivateBrowsing.dtd
@@ -14,8 +14,13 @@
 <!ENTITY privatebrowsingpage.openPrivateWindow.accesskey "P">
 
 <!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart4): please leave &newPrivateWindow.label; intact in the translation -->
 <!ENTITY privatebrowsingpage.howToStart4               "To start Private Browsing, you can also select &newPrivateWindow.label; from the menu.">
 <!ENTITY privatebrowsingpage.howToStop3                "To stop Private Browsing, you can close this window.">
 
 <!ENTITY privatebrowsingpage.moreInfo                  "While this computer won't have a record of your browsing history, your internet service provider or employer can still track the pages you visit.">
 <!ENTITY privatebrowsingpage.learnMore                 "Learn More">
+
+
+<!-- TO BE REMOVED POST-AUSTRALIS --> 
+<!-- LOCALIZATION NOTE (privatebrowsingpage.howToStart3): please leave &basePBMenu.label; intact in the translation -->
+<!ENTITY privatebrowsingpage.howToStart3               "To start Private Browsing, you can also select &basePBMenu.label; &gt; &newPrivateWindow.label;.">
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -767,10 +767,15 @@ just addresses the organization to follo
 <!ENTITY zoomOutButton.tooltip         "Zoom out">
 <!ENTITY zoomInButton.tooltip          "Zoom in">
 <!ENTITY zoomControls.label            "Zoom Controls">
 <!ENTITY addonBarCloseButton.tooltip   "Close Add-on Bar">
 <!ENTITY toggleAddonBarCmd.key         "/">
 <!ENTITY backForwardItem.title         "Back/Forward">
 <!ENTITY viewBookmarksSidebar.label    "Show in Sidebar">
 <!ENTITY bookmarksItem.title           "Bookmarks">
+<!ENTITY openLocationCmd.label         "Open Location…">
+<!ENTITY openLocationCmd.accesskey     "L">
+<!ENTITY bookmarksMenuButton.tooltip   "Display your bookmarks">
+<!ENTITY switchToMetroCmd2.label       "Relaunch in &brandShortName; for Windows 8 Touch">
+<!ENTITY tabGroupsButton.tooltip       "Group your tabs">
 <!-- end of strings to be removed post-Australis -->
 
new file mode 100644
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/openLocation.dtd
@@ -0,0 +1,14 @@
+<!-- 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/. -->
+
+<!-- extracted from content/openLocation.xul -->
+
+<!ENTITY enter.label "Enter the web location (URL), or specify the local file you would like to open:">  
+<!ENTITY chooseFile.label "Choose File…">
+<!ENTITY newTab.label "New Tab">
+<!ENTITY newWindow.label "New Window">
+<!ENTITY topTab.label "Current Tab">
+<!ENTITY caption.label "Open Web Location">
+<!ENTITY openWhere.label "Open in:">
+<!ENTITY openBtn.label "Open">
new file mode 100644
--- /dev/null
+++ b/browser/locales/en-US/chrome/browser/openLocation.properties
@@ -0,0 +1,5 @@
+# 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/.
+
+chooseFileDialogTitle=Choose File
--- a/browser/themes/osx/browser.css
+++ b/browser/themes/osx/browser.css
@@ -194,18 +194,18 @@ toolbarbutton.bookmark-item:not(.subview
   margin: 0 !important;
 }
 
 toolbarbutton.bookmark-item:hover,
 toolbarbutton.bookmark-item[open="true"] {
   background-color: rgba(0, 0, 0, .205);
 }
 
-+toolbarbutton.bookmark-item:hover:not(.subviewbutton),
-+toolbarbutton.bookmark-item[open="true"]:not(.subviewbutton) {
+toolbarbutton.bookmark-item:hover:not(.subviewbutton),
+toolbarbutton.bookmark-item[open="true"]:not(.subviewbutton) {
   color: #FFF !important;
   text-shadow: 0 1px rgba(0, 0, 0, .4) !important;
 }
 
 .bookmark-item:hover > .toolbarbutton-menu-dropmarker,
 .bookmark-item[open="true"] > .toolbarbutton-menu-dropmarker {
   -moz-image-region: rect(5px, 7px, 10px, 0);
 }
@@ -605,17 +605,17 @@ toolbar .toolbarbutton-1:not([type="menu
     -moz-image-region: rect(36px, 612px, 54px, 594px);
   }
 
   #tabview-button@toolbarButtonPressed@ {
     -moz-image-region: rect(18px, 648px, 36px, 630px);
   }
 
   #email-link-button@toolbarButtonPressed@ {
-    -moz-image-region: rect(18px, 306px, 36px, 288px);
+    -moz-image-region: rect(18px, 666px, 36px, 648px);
   }
 
   /**
    * OSX has a unique set of icons when fullscreen is in the checked state.
    */
 
   #fullscreen-button[checked="true"]:not([cui-areatype="menu-panel"]) {
     -moz-image-region: rect(36px, 432px, 54px, 414px);
@@ -759,24 +759,16 @@ toolbar .toolbarbutton-1:not([type="menu
   #social-share-button[cui-areatype="toolbar"] {
     -moz-image-region: rect(0, 612px, 36px, 576px);
   }
 
   #social-share-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
     -moz-image-region: rect(36px, 612px, 72px, 576px);
   }
 
-  #email-link-button[cui-areatype="toolbar"] {
-    -moz-image-region: rect(0, 1332px, 36px, 1296px);
-  }
-
-  #email-link-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
-    -moz-image-region: rect(36px, 1368px, 72px, 1332px);
-  }
-
   #characterencoding-button[cui-areatype="toolbar"] {
     -moz-image-region: rect(0, 648px, 36px, 612px);
   }
 
   #characterencoding-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
     -moz-image-region: rect(36px, 648px, 72px, 612px);
   }
 
@@ -935,16 +927,24 @@ toolbar .toolbarbutton-1:not([type="menu
   #tabview-button {
     -moz-image-region: rect(0, 1296px, 36px, 1260px);
   }
 
   #tabview-button@toolbarButtonPressed@ {
     -moz-image-region: rect(36px, 1296px, 72px, 1260px);
   }
 
+  #email-link-button[cui-areatype="toolbar"] {
+    -moz-image-region: rect(0, 1332px, 36px, 1296px);
+  }
+
+  #email-link-button[cui-areatype="toolbar"]:hover:active:not([disabled="true"]) {
+    -moz-image-region: rect(36px, 1332px, 72px, 1296px);
+  }
+
   :-moz-any(@primaryToolbarButtons@) > .toolbarbutton-icon,
   :-moz-any(@primaryToolbarButtons@) > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
     width: 18px;
   }
 
   /* Menu panel and palette styles */
 
   :-moz-any(@primaryToolbarButtons@)[cui-areatype="menu-panel"],
--- a/browser/themes/shared/menupanel.inc.css
+++ b/browser/themes/shared/menupanel.inc.css
@@ -50,26 +50,16 @@ toolbarpaletteitem[place="palette"] > #f
   -moz-image-region: rect(0px, 416px, 32px, 384px);
 }
 
 #social-share-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #social-share-button {
   -moz-image-region: rect(0px, 448px, 32px, 416px);
 }
 
-#email-link-button[cui-areatype="menu-panel"],
-toolbarpaletteitem[place="palette"] > #email-link-button {
-  -moz-image-region: rect(0, 448px, 32px, 416px);
-}
-
-#email-link-button[cui-areatype="menu-panel"] > image,
-toolbarpaletteitem[place="palette"] > #email-link-button > image {
-  -moz-image-region: rect(0, 800px, 32px, 768px);
-}
-
 #characterencoding-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #characterencoding-button {
   -moz-image-region: rect(0px, 480px, 32px, 448px);
 }
 
 #new-window-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #new-window-button {
   -moz-image-region: rect(0px, 512px, 32px, 480px);
@@ -110,16 +100,21 @@ toolbarpaletteitem[place="palette"] > #d
   -moz-image-region: rect(0px, 736px, 32px, 704px);
 }
 
 #preferences-button[cui-areatype="menu-panel"],
 toolbarpaletteitem[place="palette"] > #preferences-button {
   -moz-image-region: rect(0px, 768px, 32px, 736px);
 }
 
+#email-link-button[cui-areatype="menu-panel"],
+toolbarpaletteitem[place="palette"] > #email-link-button {
+  -moz-image-region: rect(0, 800px, 32px, 768px);
+}
+
 /* Wide panel control icons */
 
 #edit-controls@inAnyPanel@ > toolbarbutton,
 #zoom-controls@inAnyPanel@ > toolbarbutton,
 toolbarpaletteitem[place="palette"] > #edit-controls > toolbarbutton,
 toolbarpaletteitem[place="palette"] > #zoom-controls > toolbarbutton {
   list-style-image: url(chrome://browser/skin/menuPanel-small.png);
 }
--- a/toolkit/locales/en-US/chrome/global/charsetMenu.dtd
+++ b/toolkit/locales/en-US/chrome/global/charsetMenu.dtd
@@ -1,6 +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 charsetMenu.label             "Character Encoding">
 <!ENTITY charsetMenu.accesskey         "C">
+
+
+<!-- The strings below are unused on m-c. They will be removed post-Australis -->
+<!ENTITY charsetMenuAutodet.label      "Auto-Detect">
+<!ENTITY charsetMenuAutodet.accesskey  "D"><!-- A reserved for Arabic -->
+
+<!ENTITY charsetMenuAutodet.off.label     "(off)">
+<!ENTITY charsetMenuAutodet.off.accesskey "o">
+<!ENTITY charsetMenuAutodet.ja.label      "Japanese">
+<!ENTITY charsetMenuAutodet.ja.accesskey  "J">
+<!ENTITY charsetMenuAutodet.ru.label      "Russian">
+<!ENTITY charsetMenuAutodet.ru.accesskey  "R">
+<!ENTITY charsetMenuAutodet.uk.label      "Ukrainian">
+<!ENTITY charsetMenuAutodet.uk.accesskey  "U">
+