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

Conflicts:
	l10n/en-US/viewer.properties
	web/viewer.html

diff --cc l10n/en-US/viewer.properties
index c8b061d494696c940fe86b8b3d28267d0d79c220,0922062a6cdaf34a3ac6ffd3d3ba9cf820bf322c..27917d348d7146bf2b44e3f276b3fa63ff68c102
--- 1/l10n/en-US/viewer.properties
--- 2/l10n/en-US/viewer.properties
+++ b/l10n/en-US/viewer.properties
@@@ -43,6 -43,4 +43,7 @@@ zoom.title=Zoo
  thumb_page_title=Page {{page}}
  thumb_page_canvas=Thumbnail of Page {{page}}
  request_password=PDF is protected by a password:
+ open_file_label=Open
 +search.title=Search Document
 +search_label=Search
 +

diff --cc src/fonts.js
Simple merge

diff --cc web/viewer.css
Simple merge

diff --cc web/viewer.html
index b2d1a924387b03f9ecef1684f41e2196b6b05ac6,4a307c7effd93c76af20e5143df7122ffea28816..68f01236dfdca0b9e29a522f89bdb2bacf866c13
--- 1/web/viewer.html
--- 2/web/viewer.html
+++ b/web/viewer.html
@@@ -95,14 -87,10 +95,10 @@@
                  <span id="numPages" class="toolbarLabel"></span>
                </div>
                <div id="toolbarViewerRight">
-                 <input id="fileInput" class="fileInput" type="file" oncontextmenu="return false;" tabindex="11" />
- 
-                 <!--
                  <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 File" tabindex="10" data-l10n-id="open_file" onclick="document.getElementById('fileInput').click()">
 -                <button id="openFile" class="toolbarButton openFile" title="Open File" tabindex="10" data-l10n-id="open_file" onclick="document.getElementById('fileInput').click()">
++                <button id="openFile" class="toolbarButton openFile" title="Open File" tabindex="11" data-l10n-id="open_file" onclick="document.getElementById('fileInput').click()">
                     <span data-l10n-id="open_file_label">Open</span>
                  </button>
-                 -->
  
                  <!--
                  <button id="print" class="toolbarButton print" title="Print" tabindex="11" data-l10n-id="print" onclick="window.print()">

diff --cc web/viewer.js
Simple merge