Merge remote-tracking branch 'mozilla/master' into l10n

Conflicts:
	web/viewer.css
	web/viewer.html

diff --cc web/viewer.css
index 3216076defba5568bf1b0d847fc66e225c235943,acaca9865547c326d8fb0c5e8d48a9ec209d6f8d..d7625a6a7042e522a05faeb6276dbc17c4668d21
--- 1/web/viewer.css
--- 2/web/viewer.css
+++ b/web/viewer.css
@@@ -52,27 -42,23 +52,34 @@@ html[dir='rtl'] .innerCenter 
    position: absolute;
    top: 0;
    bottom: 0;
 -  left: -200px;
    width: 200px;
-   -moz-transition-property: left;
+   visibility: hidden;
 -  -moz-transition-property: left;
    -moz-transition-duration: 200ms;
    -moz-transition-timing-function: ease;
--  -webkit-transition-property: left;
    -webkit-transition-duration: 200ms;
    -webkit-transition-timing-function: ease;
  }
 -#outerContainer.sidebarMoving > #sidebarContainer {
 -  visibility: visible;
 +html[dir='ltr'] #sidebarContainer {
++  -moz-transition-property: left;
++  -webkit-transition-property: left;
 +  left: -200px;
 +}
 +html[dir='rtl'] #sidebarContainer {
++  -moz-transition-property: right;
++  -webkit-transition-property: right;
 +  right: -200px;
  }
 +
++#outerContainer.sidebarMoving > #sidebarContainer,
+ #outerContainer.sidebarOpen > #sidebarContainer {
+   visibility: visible;
++}
 +html[dir='ltr'] #outerContainer.sidebarOpen > #sidebarContainer {
    left: 0px;
  }
 +html[dir='rtl'] #outerContainer.sidebarOpen > #sidebarContainer {
 +  right: 0px;
 +}
  
  #mainContainer {
    position: absolute;
@@@ -80,19 -66,16 +87,21 @@@
    right: 0;
    bottom: 0;
    left: 0;
--  -moz-transition-property: left;
    -moz-transition-duration: 200ms;
    -moz-transition-timing-function: ease;
--  -webkit-transition-property: left;
    -webkit-transition-duration: 200ms;
    -webkit-transition-timing-function: ease;
  }
 -#outerContainer.sidebarOpen > #mainContainer {
 +html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer {
++  -moz-transition-property: left;
++  -webkit-transition-property: left;
    left: 200px;
  }
 +html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer {
++  -moz-transition-property: right;
++  -webkit-transition-property: right;
 +  right: 200px;
 +}
  
  #sidebarContent {
    top: 32px;
@@@ -309,16 -267,8 +320,17 @@@ html[dir='rtl'] .splitToolbarButtonSepa
    -webkit-transition-timing-function: ease;
  }
  
 +html[dir='ltr'] .toolbarButton,
 +html[dir='ltr'] .dropdownToolbarButton {
 +  margin: 3px 2px 4px 0;
 +}
 +html[dir='rtl'] .toolbarButton,
 +html[dir='rtl'] .dropdownToolbarButton {
 +  margin: 3px 0 4px 2px;
 +}
 +
  .toolbarButton:hover,
+ .toolbarButton:focus,
  .dropdownToolbarButton {
    background-color: hsla(0,0%,0%,.12);
    background-image: -moz-linear-gradient(hsla(0,0%,100%,.05), hsla(0,0%,100%,0));

diff --cc web/viewer.html
index 3803fe329490281cd0fabc663df3eb1364301881,6711a67d17e0f47985afaa255ea4d4349dea1f1a..545e7405bc915d13c9afde27167cd61e80e10c3c
--- 1/web/viewer.html
--- 2/web/viewer.html
+++ b/web/viewer.html
@@@ -46,8 -43,8 +46,8 @@@
        <div id="sidebarContainer">
          <div id="toolbarSidebar">
            <div class="splitToolbarButton toggled">
-             <button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" onclick="PDFView.switchSidebarView('thumbs')" data-l10n-id="thumbs"></button>
-             <button id="viewOutline" class="toolbarButton" title="Show Document Outline" onclick="PDFView.switchSidebarView('outline')" data-l10n-id="outline"></button>
 -            <button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" onclick="PDFView.switchSidebarView('thumbs')" tabindex="1"></button>
 -            <button id="viewOutline" class="toolbarButton" title="Show Document Outline" onclick="PDFView.switchSidebarView('outline')" tabindex="2"></button>
++            <button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" onclick="PDFView.switchSidebarView('thumbs')" tabindex="1" data-l10n-id="thumbs"></button>
++            <button id="viewOutline" class="toolbarButton" title="Show Document Outline" onclick="PDFView.switchSidebarView('outline')" tabindex="2" data-l10n-id="outline"></button>
            </div>
          </div>
          <div id="sidebarContent">
@@@ -64,40 -61,43 +64,43 @@@
  
              <div id="toolbarViewer">
                <div id="toolbarViewerLeft">
-                 <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" data-l10n-id="toggle_slider"></button>
 -                <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="3"></button>
++                <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="3" data-l10n-id="toggle_slider"></button>
                  <div class="toolbarButtonSpacer"></div>
                  <div class="splitToolbarButton">
-                   <button class="toolbarButton pageUp" title="Previous Page" onclick="PDFView.page--" id="previous" data-l10n-id="previous"></button>
 -                  <button class="toolbarButton pageUp" title="Previous Page" onclick="PDFView.page--" id="previous" tabindex="4"></button>
++                  <button class="toolbarButton pageUp" title="Previous Page" onclick="PDFView.page--" id="previous" tabindex="4" data-l10n-id="previous"></button>
                    <div class="splitToolbarButtonSeparator"></div>
-                   <button class="toolbarButton pageDown" title="Next Page" onclick="PDFView.page++" id="next" data-l10n-id="next"></button>
 -                  <button class="toolbarButton pageDown" title="Next Page" onclick="PDFView.page++" id="next" tabindex="5"></button>
++                  <button class="toolbarButton pageDown" title="Next Page" onclick="PDFView.page++" id="next" tabindex="5" data-l10n-id="next"></button>
                  </div>
 -                <div class="toolbarLabel">Page: </div>
 +                <div class="toolbarLabel" data-l10n-id="page_label">Page: </div>
-                 <input type="number" id="pageNumber" class="toolbarField pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1">
+                 <input type="number" id="pageNumber" class="toolbarField pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" tabindex="6">
                  </input>
                  <span id="numPages" class="toolbarLabel"></span>
                </div>
                <div id="toolbarViewerRight">
-                 <input id="fileInput" class="fileInput" type="file" oncontextmenu="return false;"/>
+                 <input id="fileInput" class="fileInput" type="file" oncontextmenu="return false;" tabindex="10" />
  
-                 <!-- <button id="print" class="toolbarButton print" title="Print" onclick="window.print()"></button> -->
-                 <button id="download" class="toolbarButton download" title="Download" onclick="PDFView.download();" data-l10n-id="download"></button>
+                 <!-- <input id="fileInput" class="fileInput" type="file" oncontextmenu="return false;" style="visibility: hidden; position: fixed; right: 0; top: 0" /> -->
 -                <!-- <button id="openFile" class="toolbarButton print" title="Open" tabindex="10" onclick="document.getElementById('fileInput').click()"></button> -->
++                <!-- <button id="openFile" class="toolbarButton print" title="Open" tabindex="10" data-l10n-id="open_file" onclick="document.getElementById('fileInput').click()"></button> -->
+ 
 -                <!-- <button id="print" class="toolbarButton print" title="Print" tabindex="11" onclick="window.print()"></button> -->
 -                <button id="download" class="toolbarButton download" title="Download" onclick="PDFView.download();" tabindex="12"></button>
++                <!-- <button id="print" class="toolbarButton print" title="Print" tabindex="11" data-l10n-id="print" onclick="window.print()"></button> -->
++                <button id="download" class="toolbarButton download" title="Download" onclick="PDFView.download();" tabindex="12" data-l10n-id="download"></button>
                  <!-- <div class="toolbarButtonSpacer"></div> -->
-                 <a href="#" id="viewBookmark" class="toolbarButton bookmark" title="Bookmark (or copy) current location" data-l10n-id="bookmark">
 -                <a href="#" id="viewBookmark" class="toolbarButton bookmark" title="Bookmark (or copy) current location" tabindex="13">
++                <a href="#" id="viewBookmark" class="toolbarButton bookmark" title="Bookmark (or copy) current location" tabindex="13" data-l10n-id="bookmark">
                  </a>
                </div>
                <div class="outerCenter">
                  <div class="innerCenter" id="toolbarViewerMiddle">
                    <div class="splitToolbarButton">
-                     <button class="toolbarButton zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" data-l10n-id="zoom_out"></button>
 -                    <button class="toolbarButton zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" tabindex="7"></button>
++                    <button class="toolbarButton zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" tabindex="7" data-l10n-id="zoom_out"></button>
                      <div class="splitToolbarButtonSeparator"></div>
-                     <button class="toolbarButton zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" data-l10n-id="zoom_in"></button>
 -                    <button class="toolbarButton zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" tabindex="8"></button>
++                    <button class="toolbarButton zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" tabindex="8" data-l10n-id="zoom_in"></button>
                    </div>
                    <span class="dropdownToolbarButton">
-                      <select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;">
+                      <select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;" tabindex="9">
 -                      <option id="pageAutoOption" value="auto" selected="selected">Automatic Zoom</option>
 -                      <option value="page-actual">Actual Size</option>
 -                      <option id="pageFitOption" value="page-fit">Fit Page</option>
 -                      <option id="pageWidthOption" value="page-width">Full Width</option>
 +                      <option id="pageAutoOption" value="auto" selected="selected" data-l10n-id="page_scale_auto">Automatic Zoom</option>
 +                      <option id="pageActualOption" value="page-actual" data-l10n-id="page_scale_actual">Actual Size</option>
 +                      <option id="pageFitOption" value="page-fit" data-l10n-id="page_scale_fit">Fit Page</option>
 +                      <option id="pageWidthOption" value="page-width" data-l10n-id="page_scale_width">Full Width</option>
                        <option id="customScaleOption" value="custom"></option>
                        <option value="0.5">50%</option>
                        <option value="0.75">75%</option>

diff --cc web/viewer.js
Simple merge