diff --git a/Android.mk b/Android.mk
index 720a1481487aa..231c4c9785770 100644
--- a/Android.mk
+++ b/Android.mk
@@ -376,7 +376,8 @@ LOCAL_DROIDDOC_OPTIONS:= \
 		$(framework_docs_LOCAL_DROIDDOC_OPTIONS) \
 		$(web_docs_sample_code_flags) \
 		-toroot / \
-		-hdf android.whichdoc online
+		-hdf android.whichdoc online \
+		-hdf template.showLanguageMenu true
 
 LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR:=build/tools/droiddoc/templates-sdk
 LOCAL_DROIDDOC_CUSTOM_ASSET_DIR:=assets-sdk
diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 17fc85fff062c..21271872739dd 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -1,84 +1,175 @@
+<?cs # Table of contents for Dev Guide. 
+
+       For each document available in translation, add an localized title to this TOC. 
+       Do not add localized title for docs not available in translation.
+       Below are template spans for adding localized doc titles. Please ensure that
+       localized titles are added in the language order specified below.
+?>
 <ul>
 
-<li><h2>Android Basics</h2>
+  <li>
+    <h2><span class="en">Android Basics</span>
+        <span class="de">Einführung in Android</span>
+        <span class="es">Información básica sobre Android</span>
+        <span class="fr">Présentation d'Android</span>
+        <span class="it">Nozioni di base su Android</span>
+        <span class="ja">Android の基本</span>
+        <span class="zh-CN">Android 基础知识</span>
+        <span class="zh-TW">Android 簡介</span>
+    </h2>
     <ul>
-      <li><a href="<?cs var:toroot ?>guide/basics/what-is-android.html">What Is Android?</a></li>
-<!--  <li><a style="color:gray;">The Android SDK</a></li> -->
-<!--  <li><a style="color:gray;">Walkthrough for Developers</a></li> -->
+      <li><a href="<?cs var:toroot ?>guide/basics/what-is-android.html">
+        <span class="en">What Is Android?</span>
+        <span class="de">Was ist Android?</span>
+        <span class="es">¿Qué es Android?</span>
+        <span class="fr">Qu'est-ce qu'Android&nbsp;?</span>
+        <span class="it">Che cos'è Android?</span>
+        <span class="ja">Android とは</span>
+        <span class="zh-CN">Android 是什么？</span>
+        <span class="zh-TW">什麼是 Android？</span>
+          </a></li>
+  <!--  <li><a style="color:gray;">The Android SDK</a></li> -->
+  <!--  <li><a style="color:gray;">Walkthrough for Developers</a></li> -->
       <!-- quick overview of what it's like to develop on Android -->
     </ul>
-</li>
+  </li>
+  
+  <li>
+    <h2>
+      <span class="en">Framework Topics</span>
+      <span class="de">Framework-Themen</span>
+      <span class="es">Temas sobre el framework</span>
+      <span class="fr">Thèmes relatifs au framework</span>
+      <span class="it">Argomenti relativi al framework</span>
+      <span class="ja">フレームワーク トピック</span>
+      <span class="zh-CN">框架主题</span>
+      <span class="zh-TW">架構主題</span>
+    </h2>
+    <ul>
+      <li><a href="<?cs var:toroot ?>guide/topics/fundamentals.html">
+            <span class="en">Application Fundamentals</span>
+            <span class="de" style="display:none">Anwendungsgrundlagen</span>
+            <span class="es" style="display:none">Fundamentos de las aplicaciones</span>
+            <span class="fr" style="display:none">Principes de base des applications</span>
+            <span class="it" style="display:none">Concetti fondamentali sulle applicazioni</span>
+            <span class="ja" style="display:none">開発の基礎</span>
+            <span class="zh-CN" style="display:none">应用程序基础</span>
+            <span class="zh-TW" style="display:none">應用程式基本原理</span>
 
-<li><h2>Framework Topics</h2>
-    <ul>
-      <li><a href="<?cs var:toroot ?>guide/topics/fundamentals.html">Application Fundamentals</a></li>
+          </a></li>
     </ul>
     <ul>
       <li class="toggle-list">
-        <div><a href="<?cs var:toroot ?>guide/topics/ui/index.html">User Interface</a></div>
-          <ul>
-            <li><a href="<?cs var:toroot ?>guide/topics/ui/declaring-layout.html">Declaring Layout</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/ui/menus.html">Creating Menus</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/ui/dialogs.html">Creating Dialogs</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/ui/ui-events.html">Handling UI Events</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/ui/notifiers/index.html">Notifying the User</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/ui/themes.html">Applying Styles and Themes</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/ui/custom-components.html">Building Custom Components</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/ui/binding.html">Binding to Data with AdapterView</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/ui/layout-objects.html">Common Layout Objects</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/ui/how-android-draws.html">How Android Draws Views</a></li>
-          </ul>
+        <div><a href="<?cs var:toroot ?>guide/topics/ui/index.html">
+               <span class="en">User Interface</span>
+             </a></div>
+        <ul>
+          <li><a href="<?cs var:toroot ?>guide/topics/ui/declaring-layout.html">
+               <span class="en">Declaring Layout</span> 
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/ui/menus.html">
+               <span class="en">Creating Menus</span> 
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/ui/dialogs.html">
+                <span class="en">Creating Dialogs</span> 
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/ui/ui-events.html">
+                <span class="en">Handling UI Events</span> 
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/ui/notifiers/index.html">
+                <span class="en">Notifying the User</span> 
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/ui/themes.html">
+                <span class="en">Applying Styles and Themes</span> 
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/ui/custom-components.html">
+                <span class="en">Building Custom Components</span> 
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/ui/binding.html">
+                <span class="en">Binding to Data with AdapterView</span> 
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/ui/layout-objects.html">
+                <span class="en">Common Layout Objects</span> 
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/ui/how-android-draws.html">
+                <span class="en">How Android Draws Views</span> 
+              </a></li>
+        </ul>
       </li>
       <li class="toggle-list">
-        <div><a href="<?cs var:toroot ?>guide/topics/resources/index.html">Resources and Assests</a></div>
-          <ul>
-            <li><a href="<?cs var:toroot ?>guide/topics/resources/resources-i18n.html">Resources and I18n</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/resources/available-resources.html">Available Resource Types</a></li>
-          </ul>
+        <div><a href="<?cs var:toroot ?>guide/topics/resources/index.html">
+               <span class="en">Resources and Assests</span> 
+             </a></div>
+        <ul>
+          <li><a href="<?cs var:toroot ?>guide/topics/resources/resources-i18n.html">
+                <span class="en">Resources and I18n</span>
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/resources/available-resources.html">
+                <span class="en">Available Resource Types</span>
+              </a></li>
+        </ul>
       </li>
-      <li><a href="<?cs var:toroot ?>guide/topics/intents/intents-filters.html">Intents and Intent Filters</a></li>
-      <li><a href="<?cs var:toroot ?>guide/topics/data/data-storage.html">Data Storage</a></li>
-      <li><a href="<?cs var:toroot ?>guide/topics/providers/content-providers.html">Content Providers</a></li>
-      <li><a href="<?cs var:toroot ?>guide/topics/security/security.html">Security and Permissions</a></li>
-<!--  <li><a style="color:gray;">Processes and Threads</a></li> -->
-<!--  <li><a style="color:gray;">Interprocess Communication</a></li> -->
+      <li><a href="<?cs var:toroot ?>guide/topics/intents/intents-filters.html">
+            <span class="en">Intents and Intent Filters</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/topics/data/data-storage.html">
+            <span class="en">Data Storage</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/topics/providers/content-providers.html">
+            <span class="en">Content Providers</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/topics/security/security.html">
+            <span class="en">Security and Permissions</span>
+          </a></li>
+  <!--  <li><a style="color:gray;">Processes and Threads</a></li> -->
+  <!--  <li><a style="color:gray;">Interprocess Communication</a></li> -->
       <li class="toggle-list">
-        <div><a href="<?cs var:toroot ?>guide/topics/manifest/manifest-intro.html">The AndroidManifest.xml File</a></div>
-          <ul>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/action-element.html">&lt;action&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/application-element.html">&lt;application&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/category-element.html">&lt;category&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/data-element.html">&lt;data&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/grant-uri-permission-element.html">&lt;grant-uri-permission&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/instrumentation-element.html">&lt;instrumentation&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/meta-data-element.html">&lt;meta-data&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/permission-group-element.html">&lt;permission-group&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/permission-tree-element.html">&lt;permission-tree&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/service-element.html">&lt;service&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-configuration-element.html">&lt;uses-configuration&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-library-element.html">&lt;uses-library&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a></li>
-          </ul>
+        <div><a href="<?cs var:toroot ?>guide/topics/manifest/manifest-intro.html">
+               <span class="en">The AndroidManifest.xml File</span>
+             </a></div>
+        <ul>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/action-element.html">&lt;action&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/activity-element.html">&lt;activity&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/activity-alias-element.html">&lt;activity-alias&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/application-element.html">&lt;application&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/category-element.html">&lt;category&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/data-element.html">&lt;data&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/grant-uri-permission-element.html">&lt;grant-uri-permission&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/instrumentation-element.html">&lt;instrumentation&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/intent-filter-element.html">&lt;intent-filter&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/meta-data-element.html">&lt;meta-data&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/permission-element.html">&lt;permission&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/permission-group-element.html">&lt;permission-group&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/permission-tree-element.html">&lt;permission-tree&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/provider-element.html">&lt;provider&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/receiver-element.html">&lt;receiver&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/service-element.html">&lt;service&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-configuration-element.html">&lt;uses-configuration&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-library-element.html">&lt;uses-library&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-permission-element.html">&lt;uses-permission&gt;</a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-sdk-element.html">&lt;uses-sdk&gt;</a></li>
+        </ul>
       </li>
     </ul>
     <ul>
       <li class="toggle-list">
-        <div><a href="<?cs var:toroot ?>guide/topics/graphics/index.html">Graphics</a></div>
-          <ul>
-            <li><a href="<?cs var:toroot ?>guide/topics/graphics/2d-graphics.html">2D Graphics</a></li>
-            <li><a href="<?cs var:toroot ?>guide/topics/graphics/opengl.html">3D with OpenGL</a></li>
-          </ul>
+        <div><a href="<?cs var:toroot ?>guide/topics/graphics/index.html">
+               <span class="en">Graphics</span>
+             </a></div>
+        <ul>
+          <li><a href="<?cs var:toroot ?>guide/topics/graphics/2d-graphics.html">
+                <span class="en">2D Graphics</span>
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/topics/graphics/opengl.html">
+                <span class="en">3D with OpenGL</span>
+              </a></li>
+        </ul>
       </li>
-      <li><a href="<?cs var:toroot ?>guide/topics/media/index.html">Audio and Video</a></li>
-<!--       <li class="toggle-list">
+      <li><a href="<?cs var:toroot ?>guide/topics/media/index.html">
+            <span class="en">Audio and Video</span>
+          </a></li>
+  <!--<li class="toggle-list">
         <div><a style="color:gray;">Sensors</a></div>
           <ul>
             <li><a style="color:gray;">Camera</a></li>
@@ -86,116 +177,256 @@
             <li><a style="color:gray;">Accelerometer</a></li>
           </ul>
       </li> -->
-      <li><a href="<?cs var:toroot ?>guide/topics/location/index.html">Location and Maps</a></li>
-<!--    <li class="toggle-list">
+      <li><a href="<?cs var:toroot ?>guide/topics/location/index.html">
+            <span class="en">Location and Maps</span>
+          </a></li>
+  <!--<li class="toggle-list">
         <div><a style="color:gray;">Wireless Controls</a></div>
           <ul>
             <li><a style="color:gray;">Wi-Fi</a></li>
             <li><a style="color:gray;">Bluetooth</a></li>
           </ul>
       </li> -->
-<!--  <li><a style="color:gray;">Localization</a></li>  -->
-      <li><a href="<?cs var:toroot ?>guide/topics/appwidgets/index.html">App Widgets</a></li>
+  <!--<li><a style="color:gray;">Localization</a></li>  -->
+      <li><a href="<?cs var:toroot ?>guide/topics/appwidgets/index.html">
+            <span class="en">App Widgets</span>
+          </a></li>
     </ul>
-</li>
-
-<li><h2>Developing</h2>
+  </li>
+  
+  <li>
+    <h2><span class="en">Developing</span>
+               <span class="de">Entwicklung</span>
+               <span class="es">Desarrollo</span>
+               <span class="fr">Développement</span>
+               <span class="it">Sviluppo</span>
+               <span class="ja">開発</span>
+               <span class="zh-CN">开发</span>
+               <span class="zh-TW">開發</span>
+    </h2>
     <ul>
-      <!--       <li><a style="color:gray;">Developing for Android</a></li>
+  <!--<li><a href="">Developing for Android</a></li>
       signing, upgrading, selecting a package name, select device profile, touch, trackball, dpad available, etc. -->
-      <li><a href="<?cs var:toroot ?>guide/developing/eclipse-adt.html">In Eclipse, with ADT</a></li>
-      <li><a href="<?cs var:toroot ?>guide/developing/other-ide.html">In Other IDEs</a></li>
-      <li><a href="<?cs var:toroot ?>guide/developing/device.html">On a Device</a></li>
-      <li><a href="<?cs var:toroot ?>guide/developing/debug-tasks.html">Debugging Tasks</a></li>
+      <li><a href="<?cs var:toroot ?>guide/developing/eclipse-adt.html">
+            <span class="en">In Eclipse, with ADT</span> 
+            <span class="de" style="display:none">In Eclipse, mit ADT</span>
+            <span class="es" style="display:none">En Eclipse, con ADT</span>
+            <span class="fr" style="display:none">Sous Eclipse, à l'aide du plugin ADT</span>
+            <span class="it" style="display:none">In Eclipse, con ADT</span>
+            <span class="ja" style="display:none">Eclipse 内で ADT を使用</span>
+            <span class="zh-CN" style="display:none">利用 ADT 在 Eclipse 中开发</span>
+            <span class="zh-TW" style="display:none">在加裝 ADT 工具的 Eclipse 環境中</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/developing/other-ide.html">
+            <span class="en">In Other IDEs</span>
+            <span class="de" style="display:none">In anderen IDEs</span>
+            <span class="es" style="display:none">En otros entornos</span>
+            <span class="fr" style="display:none">Sous d'autres environnements</span>
+            <span class="it" style="display:none">In altri IDE</span>
+            <span class="ja" style="display:none">その他の統合開発環境</span>
+            <span class="zh-CN" style="display:none">在其他 IDE 中开发</span>
+            <span class="zh-TW" style="display:none">在其他開發環境中</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/developing/device.html">
+            <span class="en">On a Device</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/developing/debug-tasks.html">
+            <span class="en">Debugging Tasks</span>
+          </a></li>
       <li class="toggle-list">
-        <div><a href="<?cs var:toroot ?>guide/developing/tools/index.html">Tools</a></div>
-          <ul>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/aapt.html">aapt</a></li>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html">adb</a></li>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#android">android</a></li>
-<!--			<li><a href="<?cs var:toroot ?>guide/developing/tools/adt.html">ADT Plugin</a></li>-->
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/aidl.html" >aidl</a></li>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/avd.html" >AVDs</a></li>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/ddms.html" >ddms</a></li>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#dx">dx</a></li>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/draw9patch.html">Draw 9-Patch</a></li>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/emulator.html">Emulator</a></li>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/hierarchy-viewer.html">Hierarchy Viewer</a></li>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#mksdcard">mksdcard</a></li>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/monkey.html">Monkey</a></li>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html#sqlite">sqlite3</a></li>
-			<li><a href="<?cs var:toroot ?>guide/developing/tools/traceview.html" >Traceview</a></li>
-		  </ul></li>
-<!--      <li><a href="<?cs var:toroot ?>guide/developing/instrumentation/index.html">Instrumentation</a></li>
+        <div><a href="<?cs var:toroot ?>guide/developing/tools/index.html">
+            <span class="en">Tools</span>
+          </a></div>
+        <ul>
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/aapt.html">aapt</a></li>
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html">adb</a></li>
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#android">android</a></li>
+      <!--<li><a href="<?cs var:toroot ?>guide/developing/tools/adt.html">ADT Plugin</a></li>-->
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/aidl.html">aidl</a></li>
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/avd.html">AVDs</a></li>
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/ddms.html">ddms</a></li>
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#dx">dx</a></li>
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/draw9patch.html">Draw 9-Patch</a></li>
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/emulator.html">Emulator</a></li>
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/hierarchy-viewer.html">Hierarchy Viewer</a></li>
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/othertools.html#mksdcard">mksdcard</a></li>
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/monkey.html">Monkey</a></li>
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/adb.html#sqlite">sqlite3</a></li>
+      		<li><a href="<?cs var:toroot ?>guide/developing/tools/traceview.html" >Traceview</a></li>
+    	  </ul>
+  	  </li>
+  <!--<li><a href="<?cs var:toroot ?>guide/developing/instrumentation/index.html">Instrumentation</a></li>
       <li><a style="color:gray;">JUnit</a></li> -->
-   </ul>
-
-</li>
-
-<li><h2>Publishing</h2>
-    <ul>
-      <li><a href="<?cs var:toroot ?>guide/publishing/app-signing.html">Signing Your Applications</a></li>
-      <li><a href="<?cs var:toroot ?>guide/publishing/versioning.html">Versioning Your Applications</a></li>
-      <li><a href="<?cs var:toroot ?>guide/publishing/preparing.html">Preparing to Publish</a></li>
-      <li><a href="<?cs var:toroot ?>guide/publishing/publishing.html">Publishing Your Applications</a></li>
     </ul>
-</li>
-
-<li><h2>Best Practices</h2>
+  </li>
+  
+  <li>
+    <h2><span class="en">Publishing</span>
+        <span class="de">Veröffentlichung</span>
+        <span class="es">Publicación</span>
+        <span class="fr">Publication</span>
+        <span class="it">Pubblicazione</span>
+        <span class="ja">公開</span>
+        <span class="zh-CN">发布</span>
+        <span class="zh-TW">發佈</span>
+    </h2>
+    <ul>
+      <li><a href="<?cs var:toroot ?>guide/publishing/app-signing.html">
+            <span class="en">Signing Your Applications</span>
+            <span class="de" style="display:none">Signieren Ihrer Anwendungen</span>
+            <span class="es" style="display:none">Firma de aplicaciones</span>
+            <span class="fr" style="display:none">Attribution de votre signature <br />à vos applications</span>
+            <span class="it" style="display:none">Firma delle applicazioni</span>
+            <span class="ja" style="display:none">アプリケーションへの署名</span>
+            <span class="zh-CN" style="display:none">应用程序签名</span>
+            <span class="zh-TW" style="display:none">簽署應用程式</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/publishing/versioning.html">
+            <span class="en">Versioning Your Applications</span>
+            <span class="de" style="display:none">Versionsverwaltung für Ihre <br />Anwendungen</span>
+            <span class="es" style="display:none">Versiones de las aplicaciones</span>
+            <span class="fr" style="display:none">Attribution d'une version à vos applications</span>
+            <span class="it" style="display:none">Controllo versioni delle applicazioni</span>
+            <span class="ja" style="display:none">アプリケーションのバージョニング</span>
+            <span class="zh-CN" style="display:none">应用程序版本控制</span>
+            <span class="zh-TW" style="display:none">應用程式版本設定</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/publishing/preparing.html">
+            <span class="en">Preparing to Publish</span>
+            <span class="de" style="display:none">Vorbereitung auf die Veröffentlichung</span>
+            <span class="es" style="display:none">Publicación de aplicaciones</span>
+            <span class="fr" style="display:none">Préparation à la publication</span>
+            <span class="it" style="display:none">Preparativi per la pubblicazione</span>
+            <span class="ja" style="display:none">公開の準備</span>
+            <span class="zh-CN" style="display:none">准备发布</span>
+            <span class="zh-TW" style="display:none">準備發佈</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/publishing/publishing.html">
+            <span class="en">Publishing Your Applications</span>
+          </a></li>
+    </ul>
+  </li>
+  
+  <li>
+    <h2><span class="en">Best Practices</span>
+               <span class="de">Bewährte Verfahren</span>
+               <span class="es">Prácticas recomendadas</span>
+               <span class="fr">Meilleures pratiques</span>
+               <span class="it">Best practice</span>
+               <span class="ja">ベスト プラクティス</span>
+               <span class="zh-CN">最佳实践</span>
+               <span class="zh-TW">最佳實務</span>
+    </h2>
     <ul>
       <li class="toggle-list">
-        <div><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/index.html">UI Guidelines</a></div>
-          <ul>
-            <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design.html">Icon Design</a></li>
-            <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/widget_design.html">App Widget Design</a></li>
-            <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/activity_task_design.html">Activity and Task Design</a></li>
-            <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/menu_design.html">Menu Design</a></li>
-          </ul>
+        <div><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/index.html">
+               <span class="en">UI Guidelines</span>
+             </a></div>
+        <ul>
+          <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/icon_design.html">
+                <span class="en">Icon Design</span>
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/widget_design.html">
+                <span class="en">App Widget Design</span>
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/activity_task_design.html">
+                <span class="en">Activity and Task Design</span>
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/practices/ui_guidelines/menu_design.html">
+                <span class="en">Menu Design</span>
+              </a></li>
+        </ul>
       </li>
-      <li><a href="<?cs var:toroot ?>guide/practices/design/performance.html">Designing for Performance</a></li>
-      <li><a href="<?cs var:toroot ?>guide/practices/design/responsiveness.html">Designing for Responsiveness</a></li>
-      <li><a href="<?cs var:toroot ?>guide/practices/design/seamlessness.html">Designing for Seamlessness</a></li>
-<!--  <li><a style="color:gray;">User Interface Guidelines</a></li> -->
+      <li><a href="<?cs var:toroot ?>guide/practices/design/performance.html">
+            <span class="en">Designing for Performance</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/practices/design/responsiveness.html">
+            <span class="en">Designing for Responsiveness</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/practices/design/seamlessness.html">
+            <span class="en">Designing for Seamlessness</span>
+          </a></li>
     </ul>
-</li>
-
-<li><h2>Tutorials and Sample Code</h2>
+  </li>
+  
+  <li>
+    <h2><span class="en">Tutorials and Sample Code</span>
+               <span class="de">Lernprogramme und Beispielcode</span>
+               <span class="es">Tutoriales y código de ejemplo</span>
+               <span class="fr">Didacticiels et exemple de code</span>
+               <span class="it">Esercitazioni e codice di esempio</span>
+               <span class="ja">チュートリアルとサンプル コード</span>
+               <span class="zh-CN">辅导手册和示例代码</span>
+               <span class="zh-TW">教學課程與程式碼範例</span>
+    </h2>
     <ul>
-      <li><a href="<?cs var:toroot ?>guide/tutorials/hello-world.html">Hello World</a></li>
-      <li><a href="<?cs var:toroot ?>guide/tutorials/views/index.html">Hello Views</a></li>
-      <li><a href="<?cs var:toroot ?>guide/tutorials/notepad/index.html">Notepad Tutorial</a></li>
+      <li><a href="<?cs var:toroot ?>guide/tutorials/hello-world.html">
+            <span class="en">Hello World</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/tutorials/views/index.html">
+            <span class="en">Hello Views</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/tutorials/notepad/index.html">
+            <span class="en">Notepad Tutorial</span>
+          </a></li>
     </ul>
     <ul>
     <?cs if:android.whichdoc != "online" ?>
-      <li><a href="<?cs var:toroot ?>../samples">Sample Code &raquo;</a></li>
+      <li><a href="<?cs var:toroot ?>../samples">
+            <span class="en">Sample Code</span>
+          &raquo;</a></li>
     <?cs else ?>
       <li class="toggle-list">
-        <div><a href="<?cs var:toroot ?>guide/samples/index.html">Sample Code</a></div>
-	  <ul>
-            <li><a href="<?cs var:toroot ?>guide/samples/ApiDemos/index.html">API Demos</a></li>
-            <li><a href="<?cs var:toroot ?>guide/samples/LunarLander/index.html">Lunar Lander</a></li>
-            <li><a href="<?cs var:toroot ?>guide/samples/NotePad/index.html">NotePad</a></li>
-          </ul>
+        <div><a href="<?cs var:toroot ?>guide/samples/index.html">
+               <span class="en">Sample Code</span>
+             </a></div>
+        <ul>
+          <li><a href="<?cs var:toroot ?>guide/samples/ApiDemos/index.html">
+                <span class="en">API Demos</span>
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/samples/LunarLander/index.html">
+                <span class="en">Lunar Lander</span>
+              </a></li>
+          <li><a href="<?cs var:toroot ?>guide/samples/NotePad/index.html">
+                <span class="en">NotePad</span>
+              </a></li>
+        </ul>
       </li>
     <?cs /if ?>
     </ul>
-</li>
+  </li>
 
-
-
-<li><h2>Appendix</h2>
+  <li>
+    <h2><span class="en">Appendix</span>
+               <span class="de">Anhang</span>
+               <span class="es">Apéndice</span>
+               <span class="fr">Annexes</span>
+               <span class="it">Appendice</span>
+               <span class="ja">付録</span>
+               <span class="zh-CN">附录</span>
+               <span class="zh-TW">附錄</span>
+    </h2>
     <ul>
-      <li><a href="<?cs var:toroot ?>guide/appendix/media-formats.html">Supported Media Formats</a></li>
-      <li><a href="<?cs var:toroot ?>guide/appendix/g-app-intents.html">Intents List: Google Apps</a></li>
-      <li><a href="<?cs var:toroot ?>guide/appendix/glossary.html">Glossary</a></li>
-      <li><a href="<?cs var:toroot ?>guide/appendix/faq/index.html">FAQ</a></li>
+      <li><a href="<?cs var:toroot ?>guide/appendix/media-formats.html">
+            <span class="en">Supported Media Formats</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/appendix/g-app-intents.html">
+            <span class="en">Intents List: Google Apps</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/appendix/glossary.html">
+            <span class="en">Glossary</span>
+          </a></li>
+      <li><a href="<?cs var:toroot ?>guide/appendix/faq/index.html">
+            <span class="en">FAQ</span>
+          </a></li>
     </ul>
-</li>
+  </li>
 
 </ul>
 
 <script type="text/javascript">
 <!--
     buildToggleLists();
+    changeNavLang(getLangPref());
 //-->
 </script>
diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs
index ce1ee6e084ab1..bcf32b006191d 100644
--- a/docs/html/sdk/sdk_toc.cs
+++ b/docs/html/sdk/sdk_toc.cs
@@ -4,13 +4,39 @@
    if:android.whichdoc != "online" ?>
     <h2>Android <?cs var:sdk.version ?> SDK, r<?cs var:sdk.rel.id ?></h2><?cs 
    else ?>
-    <h2>Current SDK Release</h2><?cs 
+    <h2><span class="en">Current SDK Release</span>
+        <span class="de">Aktuelle SDK-Version</span>
+        <span class="es">Versión actual del SDK</span>
+        <span class="fr">Version actuelle du SDK</span>
+        <span class="it">Release SDK attuale</span>
+        <span class="ja">現在リリースされている SDK</span>
+        <span class="zh-CN">当前的 SDK 版本</span>
+        <span class="zh-TW">目前 SDK 發行版本</span>
+    </h2><?cs 
    /if ?>
     <ul><?cs 
      if:android.whichdoc == "online" ?>
-      <li><a href="<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/index.html">Download</a></li><?cs 
+      <li><a href="<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/index.html">
+          <span class="en">Download</span>
+          <span class="de">Herunterladen</span>
+          <span class="es">Descargar</span>
+          <span class="fr">Téléchargement</span>
+          <span class="it">Download</span>
+          <span class="ja">ダウンロード</span>
+          <span class="zh-CN">下载</span>
+          <span class="zh-TW">下載</span>
+         </a></li><?cs 
      /if ?>
-      <li><a href="<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/installing.html">Installing</a></li>
+      <li><a href="<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/installing.html">
+          <span class="en">Installing</span>
+          <span class="de">Installieren</span>
+          <span class="es">Instalación</span>
+          <span class="fr">Installation</span>
+          <span class="it">Installazione</span>
+          <span class="ja">インストール</span>
+          <span class="zh-CN">安装</span>
+          <span class="zh-TW">安裝</span>
+      </a></li>
       <li><a href="<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/upgrading.html">Upgrading</a></li>
       <li><a href="<?cs var:toroot ?>sdk/<?cs var:sdk.current ?>/requirements.html">System Requirements</a></li>
     </ul>
@@ -20,7 +46,15 @@
     </ul><?cs 
  if:android.whichdoc == "online" ?>
   <li>
-    <h2>System Image Version Notes</h2>
+    <h2><span class="en">System Image Version Notes</span>
+        <span class="de">Versionshinweise zum Systemabbild</span>
+        <span class="es">Notas de la versión de System Image</span>
+        <span class="fr">Notes de version de l'image système</span>
+        <span class="it">Note sulla versione dell'immagine <br />di sistema</span>
+        <span class="ja">システム イメージ バージョンに関する<br />注意事項</span>
+        <span class="zh-CN">系统图片版本说明</span>
+        <span class="zh-TW">系統影像版本資訊</span>
+    </h2>
     <ul>
       <li><a href="<?cs var:toroot ?>sdk/android-1.5.html">Android 1.5 Version Notes</a></li>
       <li><a href="<?cs var:toroot ?>sdk/android-1.1.html">Android 1.1 Version Notes</a></li>
@@ -33,7 +67,16 @@
     </ul>
   </li>
   <li>
-    <h2>Previous SDK Releases</h2>
+     <h2>
+        <span class="en">Previous SDK Releases</span>
+        <span class="de">Frühere SDK-Releases</span>
+        <span class="es">Versiones anteriores del SDK</span>
+        <span class="fr">Anciennes versions du SDK</span>
+        <span class="it">Release SDK precedenti</span>
+        <span class="ja">SDK の過去のリリース</span>
+        <span class="zh-CN">以前的 SDK 版本</span>
+        <span class="zh-TW">較舊的 SDK 發行版本</span>
+    </h2>
     <ul>
       <li><a href="<?cs var:toroot ?>sdk/1.1_r1/index.html">Android 1.1 SDK, r1</a></li>
       <li><a href="<?cs var:toroot ?>sdk/1.0_r2/index.html">Android 1.0 SDK, r2</a></li>
@@ -46,5 +89,6 @@
 <script type="text/javascript">
 <!--
     buildToggleLists();
+    changeNavLang(getLangPref());
 //-->
-</script>
\ No newline at end of file
+</script>