Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b403e8c authored by David Friedman's avatar David Friedman Committed by Android Git Automerger
Browse files

am 3ab2e664: Merge "Docs: Localized DAC landing pages for M Preview, updated... 

am 3ab2e664: Merge "Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3." into mnc-dev

* commit '3ab2e664':
  Docs: Localized DAC landing pages for M Preview, updated for Dev Prev 3.
parents 144020c9 3ab2e664

docs/html-intl/intl/es/index.jd

+6 −9
Original line number Diff line number Diff line
@@ -10,19 +10,16 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3 
<section class="dac-hero-carousel">



<!-- <article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);"> -->

<article class="dac-expand dac-hero dac-invert active" style="background-color: #455A64;">

<article class="dac-expand dac-hero dac-invert dac-darken mprev active" style="background-color: #75d1ff;">

<a href="/preview/index.html">

  <div class="wrap" style="max-width:1100px;">

  <div class="wrap" style="max-width:1100px;margin-top:0">

    <div class="cols dac-hero-content">

      <div class="col-10of16 col-push-6of16 dac-hero-figure">

        <img class="dac-hero-image" src="{@docRoot}images/home/devices-hero_620px_2x.png"

             srcset="{@docRoot}images/home/devices-hero_620px.png 1x,

             {@docRoot}images/home/devices-hero_620px_2x.png 2x">

      <div class="col-8of16 col-push-6of16 dac-hero-figure mprev">

      </div>

      <div class="col-6of16 col-pull-10of16">

      <div class="col-8of16 col-pull-7of16">

        <div class="dac-hero-tag"></div>



        <h1 class="dac-hero-title">Android M Developer Preview</h1>

        <h1 class="dac-hero-title" style="white-space:nowrap;">Android 6.0 Marshmallow</h1>

        <p class="dac-hero-description">Prepárese para la próxima versión de

Android. Pruebe sus aplicaciones en Nexus 5, 6, 9 y Player. </p>
@@ -31,7 +28,7 @@ Android. Pruebe sus aplicaciones en Nexus 5, 6, 9 y Player. </p> 
          ¡Empiece hoy mismo!</a><br>

        <a class="dac-hero-cta" href="{@docRoot}preview/support.html">

          <span class="dac-sprite dac-auto-chevron"></span>

          Developer Preview 2</a>

          Developer Preview 3 (final SDK)</a>

        </a>

      </div>

    </div>

docs/html-intl/intl/es/preview/download.jd

+21 −19
Original line number Diff line number Diff line
@@ -164,14 +164,16 @@ Este es el Contrato de licencia de la versión preliminar del SDK de Android (el 
  <div id="qv">

    <h2>Contenido del documento</h2>

      <ol>

        <li><a href="#sdk">SDK de la versión preliminar</a></li>

        <li><a href="#sdk">Android 6.0 SDK</a></li>

        <li><a href="#docs">Documentación para desarrolladores</a></li>

        <li><a href="#images">Imágenes del sistema de hardware</a></li>

      </ol>



      <h2>Legacy downloads</h2>

        <ol>

           <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview Archive</a></li>

           <li><a href="{@docRoot}preview/download_mp1.html">Developer Preview 1</a></li>

		   <li><a href="{@docRoot}preview/download_mp2.html">Developer Preview 2</a></li>



        </ol>

  </div>

</div>
@@ -184,7 +186,7 @@ Este es el Contrato de licencia de la versión preliminar del SDK de Android (el 
</p>





<h2 id="sdk">SDK de la versión preliminar</h2>

<h2 id="sdk">Android 6.0 SDK</h2>



<p>

  El SDK de la versión preliminar se encuentra disponible para descargarlo a través del <a href="{@docRoot}tools/help/sdk-manager.html">Administrador de SDK de Android</a>. Para obtener más información sobre cómo descargar y configurar el SDK de la versión preliminar, consulte la sección <a href="{@docRoot}preview/setup-sdk.html#downloadSdk">Configurar el SDK de la versión preliminar</a>.
@@ -204,11 +206,11 @@ Este es el Contrato de licencia de la versión preliminar del SDK de Android (el 
    <th scope="col">Download / Checksums</th>

  </tr>

  <tr id="docs-dl">

    <td>Android M Preview 2<br>Developer Docs</td>

    <td>Android M Preview 3<br>Developer Docs</td>

    <td><a href="#top" onclick="onDownload(this)"

      >m-preview-2-developer-docs.zip</a><br>

      MD5: 1db6fff9c722b0339757e1cdf43663a8<br>

      SHA-1: 5a4ae88d644e63824d21b0e18f8e3977a7665157

      >m-preview-3-developer-docs.zip</a><br>

      MD5: d99b14b0c06d31c8dfecb25072654ca3<br>

      SHA-1: 9cefeeda07676130da606a1796e1c00fffc667c1

    </td>

  </tr>

</table>
@@ -241,34 +243,34 @@ Este es el Contrato de licencia de la versión preliminar del SDK de Android (el 
  <tr id="hammerhead">

    <td>Nexus 5 (GSM/LTE) <br>"hammerhead"</td>

    <td><a href="#top" onclick="onDownload(this)"

      >hammerhead-MPZ79M-preview-b1f4bde4.tgz</a><br>

      MD5: 2ca9f18bf47a061b339bab52647ceb0d<br>

      SHA-1: b1f4bde447eccbf8ce5d9b8b8ba954e3eac8e939

      >hammerhead-MPA44I-preview-2ebbc049.tgz</a><br>

      MD5: 91a924fb0c9f8e716e3b4c9954fd0dbb<br>

      SHA-1: 2ebbc049b68c4da8baeee3e42bb94d7a965ba4a3

    </td>

  </tr>

  <tr id="shamu">

    <td>Nexus 6 <br>"shamu"</td>

    <td><a href="#top" onclick="onDownload(this)"

      >shamu-MPZ79M-preview-e1024040.tgz</a><br>

      MD5: 24a2118da340b9afedfbdfc026f6ff81<br>

      SHA-1: e10240408859d5188c4aae140e1c539130ba614b

      >shamu-MPA44I-preview-62b9c486.tgz</a><br>

      MD5: ac6e58da86125073d9c395257fd42664<br>

      SHA-1: 62b9c486fd7a5020e228d53ca5acd5c1857e48ff

    </td>

  </tr>

  <tr id="volantis">

    <td>Nexus 9 <br>"volantis"</td>

    <td><a href="#top" onclick="onDownload(this)"

      >volantis-MPZ79M-preview-9f305342.tgz</a><br>

      MD5: 9edabf0a4c61b247f1cbb9dfdc0a899e<br>

      SHA-1: 9f30534216f10899a6a75495fc7e92408ea333a7

      >volantis-MPA44I-preview-5c30a6e2.tgz</a><br>

      MD5: 7f83768757913d3fea945a661020d185<br>

      SHA-1: 5c30a6e2acd11a81f4105b12d23ff654f534f699

    </td>

  </tr>



  <tr id="fugu">

    <td>Nexus Player <br>"fugu"</td>

    <td><a href="#top" onclick="onDownload(this)"

      >fugu-MPZ79N-preview-fb63af98.tgz</a><br>

      MD5: e8d081137a20b66df595ee69523314b5<br>

      SHA-1: fb63af98302dd97be8de9313734d389ccdcce250

      >fugu-MPA44I-preview-2860040a.tgz</a><br>

      MD5: 438da8d37da9e341a69cfb16a4001ac5<br>

      SHA-1: 2860040a326582f1ff5f702bf9a1ef002717fc98

    </td>

  </tr>

docs/html-intl/intl/es/preview/download_mp2.jd

0 → 100644
+360 −0

File added.

Preview size limit exceeded, changes collapsed.

docs/html-intl/intl/es/preview/index.jd

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ footer.hide=1 


        <a class="dac-hero-cta" href="{@docRoot}preview/support.html">

          <span class="dac-sprite dac-auto-chevron"></span>

          Developer Preview 2</a>

          Developer Preview 3 (final SDK)</a>



      </div>

    </div>

docs/html-intl/intl/ja/index.jd

+6 −9
Original line number Diff line number Diff line
@@ -10,19 +10,16 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3 
<section class="dac-hero-carousel">



<!-- <article class="dac-expand dac-hero dac-invert active" style="background-color: rgb(38, 50, 56);"> -->

<article class="dac-expand dac-hero dac-invert active" style="background-color: #455A64;">

<article class="dac-expand dac-hero dac-invert dac-darken mprev active" style="background-color: #75d1ff;">

<a href="/preview/index.html">

  <div class="wrap" style="max-width:1100px;">

  <div class="wrap" style="max-width:1100px;margin-top:0">

    <div class="cols dac-hero-content">

      <div class="col-10of16 col-push-6of16 dac-hero-figure">

        <img class="dac-hero-image" src="{@docRoot}images/home/devices-hero_620px_2x.png"

             srcset="{@docRoot}images/home/devices-hero_620px.png 1x,

             {@docRoot}images/home/devices-hero_620px_2x.png 2x">

      <div class="col-8of16 col-push-6of16 dac-hero-figure mprev">

      </div>

      <div class="col-6of16 col-pull-10of16">

      <div class="col-8of16 col-pull-7of16">

        <div class="dac-hero-tag"></div>



        <h1 class="dac-hero-title">Android M Developer Preview</h1>

        <h1 class="dac-hero-title" style="white-space:nowrap;">Android 6.0 Marshmallow</h1>

        <p class="dac-hero-description">次期バージョンの Android に向けて準備しましょう。

        Nexus 5、6、9、Nexus Player でアプリをテストします。 </p>
@@ -32,7 +29,7 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3 
        </a><br>

        <a class="dac-hero-cta" href="{@docRoot}preview/support.html">

          <span class="dac-sprite dac-auto-chevron"></span>

          Developer Preview 2</a>

          Developer Preview 3 (final SDK)</a>



      </div>

    </div>