Merge branch 'master' of git://github.com/mozilla/pdf.js.git into l10n

Conflicts:
	web/viewer.html

diff --cc l10n/en-US/viewer.properties
index b0d26d2def871f27f4f476a254ffdb826fb121f4,0000000000000000000000000000000000000000..88238edd4b712e78b4f54974134d65c9d203e8d2
mode 100644,000000..100644
--- 1/l10n/en-US/viewer.properties
--- /dev/null
+++ b/l10n/en-US/viewer.properties
@@@ -1,31 -1,0 +1,42 @@@
- previous.title=Previous
- next.title=Next
 +bookmark.title=Current view (copy or open in new window)
++previous.title=Previous Page
++next.title=Next Page
 +print.title=Print
 +download.title=Download
 +zoom_out.title=Zoom Out
 +zoom_in.title=Zoom In
 +error_more_info=More Information
 +error_less_info=Less Information
 +error_close=Close
 +error_build=PDF.JS Build: {{build}}
 +error_message=Message: {{message}}
 +error_stack=Stack: {{stack}}
 +error_file=File: {{file}}
 +error_line=Line: {{line}}
 +page_scale_width=Page Width
 +page_scale_fit=Page Fit
 +page_scale_auto=Automatic Zoom
 +page_scale_actual=Actual Size
 +toggle_slider.title=Toggle Slider
 +thumbs.title=Show Thumbnails
 +outline.title=Show Document Outline
 +loading=Loading... {{percent}}%
 +loading_error_indicator=Error
 +loading_error=An error occurred while loading the PDF.
 +rendering_error=An error occurred while rendering the page.
 +page_label=Page:
 +page_of=of {{pageCount}}
 +no_outline=No Outline Available
 +open_file.title=Open File
 +text_annotation_type=[{{type}} Annotation]
++toggle_slider_label=Toggle Slider
++thumbs_label=Show Thumbnails
++outline_label=Show Document Outline
++bookmark_label=Current View
++previous_label=Previous
++next_label=Next
++print_label=Print
++download_label=Download
++zoom_out_label=Zoom Out
++zoom_in_label=Zoom In
++zoom.title=Zoom

diff --cc web/viewer.css
Simple merge

diff --cc web/viewer.html
index b257ec61ad454be0fcaffefe20bf95b3200ed98d,b4e4e1c778a73f32e7f3685dba91e75d808c1ff8..0ec05e031943eb650a87d2cce05accbef8ac4f85
--- 1/web/viewer.html
--- 2/web/viewer.html
+++ b/web/viewer.html
@@@ -46,8 -43,12 +46,12 @@@
        <div id="sidebarContainer">
          <div id="toolbarSidebar">
            <div class="splitToolbarButton toggled">
-             <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>
 -            <button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" onclick="PDFView.switchSidebarView('thumbs')" tabindex="1">
 -               <span>Thumbnails</span>
++            <button id="viewThumbnail" class="toolbarButton toggled" title="Show Thumbnails" onclick="PDFView.switchSidebarView('thumbs')" tabindex="1" data-l10n-id="thumbs">
++               <span data-l10n-id="thumbs_label">Thumbnails</span>
+             </button>
 -            <button id="viewOutline" class="toolbarButton" title="Show Document Outline" onclick="PDFView.switchSidebarView('outline')" tabindex="2">
 -               <span>Document Outline</span>
++            <button id="viewOutline" class="toolbarButton" title="Show Document Outline" onclick="PDFView.switchSidebarView('outline')" tabindex="2" data-l10n-id="outline">
++               <span data-l10n-id="outline_label">Document Outline</span>
+             </button>
            </div>
          </div>
          <div id="sidebarContent">
@@@ -64,14 -65,20 +68,20 @@@
  
              <div id="toolbarViewer">
                <div id="toolbarViewerLeft">
-                 <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="3" data-l10n-id="toggle_slider"></button>
 -                <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="3">
 -                  <span>Toggle Sidebar</span>
++                <button id="sidebarToggle" class="toolbarButton" title="Toggle Sidebar" tabindex="3" data-l10n-id="toggle_slider">
++                  <span data-l10n-id="toggle_slider_label">Toggle Sidebar</span>
+                 </button>
                  <div class="toolbarButtonSpacer"></div>
                  <div class="splitToolbarButton">
-                   <button class="toolbarButton pageUp" title="Previous Page" onclick="PDFView.page--" id="previous" tabindex="4" data-l10n-id="previous"></button>
 -                  <button class="toolbarButton pageUp" title="Previous Page" onclick="PDFView.page--" id="previous" tabindex="4">
 -                    <span>Previous</span>
++                  <button class="toolbarButton pageUp" title="Previous Page" onclick="PDFView.page--" id="previous" tabindex="4" data-l10n-id="previous">
++                    <span data-l10n-id="previous_label">Previous</span>
+                   </button>
                    <div class="splitToolbarButtonSeparator"></div>
-                   <button class="toolbarButton pageDown" title="Next Page" onclick="PDFView.page++" id="next" tabindex="5" data-l10n-id="next"></button>
 -                  <button class="toolbarButton pageDown" title="Next Page" onclick="PDFView.page++" id="next" tabindex="5">
 -                    <span>Next</span>
++                  <button class="toolbarButton pageDown" title="Next Page" onclick="PDFView.page++" id="next" tabindex="5" data-l10n-id="next">
++                    <span data-l10n-id="next_label">Next</span>
+                   </button>
                  </div>
-                 <div class="toolbarLabel" data-l10n-id="page_label">Page: </div>
 -                <label class="toolbarLabel" for="pageNumber">Page: </label>
++                <label class="toolbarLabel" for="pageNumber" data-l10n-id="page_label">Page: </label>
                  <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>
@@@ -79,28 -86,42 +89,42 @@@
                <div id="toolbarViewerRight">
                  <input id="fileInput" class="fileInput" type="file" oncontextmenu="return false;" tabindex="10" />
  
-                 <!-- <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" data-l10n-id="open_file" onclick="document.getElementById('fileInput').click()"></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()">
 -                   <span>Open</span>
++                <button id="openFile" class="toolbarButton print" title="Open File" tabindex="10" 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()"></button> -->
-                 <button id="download" class="toolbarButton download" title="Download" onclick="PDFView.download();" tabindex="12" data-l10n-id="download"></button>
+                 <!--
 -                <button id="print" class="toolbarButton print" title="Print" tabindex="11" onclick="window.print()">
 -                  <span>Print</span>
++                <button id="print" class="toolbarButton print" title="Print" tabindex="11" data-l10n-id="print" onclick="window.print()">
++                  <span data-l10n-id="print_label">Print</span>
+                 </button>
+                 -->
+ 
 -                <button id="download" class="toolbarButton download" title="Download" onclick="PDFView.download();" tabindex="12">
 -                  <span>Download</span>
++                <button id="download" class="toolbarButton download" title="Download" onclick="PDFView.download();" tabindex="12" data-l10n-id="download">
++                  <span data-l10n-id="download_label">Download</span>
+                 </button>
                  <!-- <div class="toolbarButtonSpacer"></div> -->
-                 <a href="#" id="viewBookmark" class="toolbarButton bookmark" title="Bookmark (or copy) current location" tabindex="13" data-l10n-id="bookmark">
-                 </a>
 -                <a href="#" id="viewBookmark" class="toolbarButton bookmark" title="Bookmark (or copy) current location" tabindex="13"><span>Bookmark</span></a>
++                <a href="#" id="viewBookmark" class="toolbarButton bookmark" title="Current view (copy or open in new window)" tabindex="13" data-l10n-id="bookmark"><span data-l10n-id="bookmark_label">Current View</span></a>
                </div>
                <div class="outerCenter">
                  <div class="innerCenter" id="toolbarViewerMiddle">
                    <div class="splitToolbarButton">
-                     <button class="toolbarButton zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" tabindex="7" data-l10n-id="zoom_out"></button>
 -                    <button class="toolbarButton zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" tabindex="7">
 -                      <span>Zoom Out</span>
++                    <button class="toolbarButton zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" tabindex="7" data-l10n-id="zoom_out">
++                      <span data-l10n-id="zoom_out_label">Zoom Out</span>
+                     </button>
                      <div class="splitToolbarButtonSeparator"></div>
-                     <button class="toolbarButton zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" tabindex="8" data-l10n-id="zoom_in"></button>
 -                    <button class="toolbarButton zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" tabindex="8">
 -                      <span>Zoom In</span>
++                    <button class="toolbarButton zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" tabindex="8" data-l10n-id="zoom_in">
++                      <span data-l10n-id="zoom_in_label">Zoom In</span>
+                      </button>
                    </div>
                    <span class="dropdownToolbarButton">
-                      <select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;" tabindex="9">
 -                     <select id="scaleSelect" onchange="PDFView.parseScale(this.value);" title="Zoom" 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>
++                     <select id="scaleSelect" onchange="PDFView.parseScale(this.value);" title="Zoom" oncontextmenu="return false;" tabindex="9" data-l10n-id="zoom">
 +                      <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>