diff --git a/assets/html/cs/tethering_help.html b/assets/html/cs/tethering_help.html
new file mode 100644
index 0000000..92ffb5a
--- /dev/null
+++ b/assets/html/cs/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Sdílené datové připojení prostřednictvím portu USB</b></p>
+<span class="style1">Propojíte-li počítač a telefon kabelem USB, můžete připojení k internetu svého telefonu sdílet s připojeným počítačem.</span>
+<ul>
+<li>Sdílení datového připojení funguje v systémech Windows Vista, Windows 7 a Linux.</li><br>
+<li>Při sdílení datového připojení prostřednictvím portu USB nelze připojit kartu SD telefonu k počítači.</li><br>
+<li>Další informace včetně informací o sdílení datového připojení prostřednictvím portu USB v jiných operačních systémech naleznete na stránce <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+<p><b>Sdílení datového připojení prostřednictvím sítě WiFi</b></p>
+<span class="style1">Telefon může sloužit jako přístupový bod sítě WiFi. Připojení k internetu svého telefonu můžete sdílet hned s několika počítači nebo jinými zařízeními.</span>
+<ul>
+<li>Používáte-li telefon jako přístupový bod, nelze se pomocí aplikací v telefonu připojit k internetu prostřednictvím připojení WiFi.</li><br>
+<li>Přístupový bod WiFi můžete konfigurovat v nabídce nastavení  připojení WiFi.</li><br>
+<li>Další informace naleznete na stránce <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/cs/tethering_usb_help.html b/assets/html/cs/tethering_usb_help.html
new file mode 100644
index 0000000..425431f
--- /dev/null
+++ b/assets/html/cs/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Sdílené datové připojení prostřednictvím portu USB</b></p>
+<span class="style1">Propojíte-li počítač a telefon kabelem USB, můžete připojení k internetu svého telefonu sdílet s připojeným počítačem.</span>
+<ul>
+<li>Sdílení datového připojení funguje v systémech Windows Vista, Windows 7 a Linux.</li><br>
+<li>Při sdílení datového připojení prostřednictvím portu USB nelze připojit kartu SD telefonu k počítači.</li><br>
+<li>Další informace včetně informací o sdílení datového připojení prostřednictvím portu USB v jiných operačních systémech naleznete na stránce <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/cs/tethering_wifi_help.html b/assets/html/cs/tethering_wifi_help.html
new file mode 100644
index 0000000..630438c
--- /dev/null
+++ b/assets/html/cs/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Sdílení datového připojení prostřednictvím sítě WiFi</b></p>
+<span class="style1">Telefon může sloužit jako přístupový bod sítě WiFi. Připojení k internetu svého telefonu můžete sdílet hned s několika počítači nebo jinými zařízeními.</span>
+<ul>
+<li>Používáte-li telefon jako přístupový bod, nelze se pomocí aplikací v telefonu připojit k internetu prostřednictvím připojení WiFi.</li><br>
+<li>Přístupový bod WiFi můžete konfigurovat v nabídce nastavení  připojení WiFi.</li><br>
+<li>Další informace naleznete na stránce <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/da/tethering_help.html b/assets/html/da/tethering_help.html
new file mode 100644
index 0000000..3b2a553
--- /dev/null
+++ b/assets/html/da/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB-tethering</b></p>
+<span class="style1">Du kan tether din telefon til din computer med et USB-kabel for at dele din telefons internetforbindelse med din computer</span>
+<ul>
+<li>Tethering fungerer med Windows Vista, Windows 7 og Linux</li><br>
+<li>Du kan ikke montere din telefons SD-kort på computeren, når USB er tethered</li><br>
+<li>Få flere oplysninger om bl.a. brug af USB-tethering med andre operativsystemer på <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+<p><b>Wi-Fi-tethering</b></p>
+<span class="style1">Du kan gøre din telefon til et Wi-Fi-adgangspunkt, så du kan dele din telefons internetforbindelse med en eller flere computere eller andre enheder</span>
+<ul>
+<li>Når din telefon fungerer som adgangspunkt, kan du ikke bruge programmerne på din telefon til at få adgang til internettet via dens Wi-Fi-forbindelse.</li><br>
+<li>Du kan konfigurere et Wi-Fi-adgangspunkt i indstillingerne for Wi-Fi-tethering</li><br>
+<li>Få flere oplysninger på <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/da/tethering_usb_help.html b/assets/html/da/tethering_usb_help.html
new file mode 100644
index 0000000..f9f7fc1
--- /dev/null
+++ b/assets/html/da/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB-tethering</b></p>
+<span class="style1">Du kan tether din telefon til din computer med et USB-kabel for at dele din telefons internetforbindelse med din computer</span>
+<ul>
+<li>Tethering fungerer med Windows Vista, Windows 7 og Linux</li><br>
+<li>Du kan ikke montere din telefons SD-kort på computeren, når USB er tethered</li><br>
+<li>Få flere oplysninger om bl.a. brug af USB-tethering med andre operativsystemer på <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/da/tethering_wifi_help.html b/assets/html/da/tethering_wifi_help.html
new file mode 100644
index 0000000..8c5063b
--- /dev/null
+++ b/assets/html/da/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Wi-Fi-tethering</b></p>
+<span class="style1">Du kan gøre din telefon til et Wi-Fi-adgangspunkt, så du kan dele din telefons internetforbindelse med en eller flere computere eller andre enheder</span>
+<ul>
+<li>Når din telefon fungerer som adgangspunkt, kan du ikke bruge programmerne på din telefon til at få adgang til internettet via dens Wi-Fi-forbindelse.</li><br>
+<li>Du kan konfigurere et Wi-Fi-adgangspunkt i indstillingerne for Wi-Fi-tethering</li><br>
+<li>Få flere oplysninger på <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/de/tethering_help.html b/assets/html/de/tethering_help.html
new file mode 100644
index 0000000..317e176
--- /dev/null
+++ b/assets/html/de/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB-Tethering</b></p>
+<span class="style1">Sie können Ihr Telefon über ein USB-Kabel mit Ihrem Computer verbinden, um die Internetverbindung auf Ihrem Telefon auf Ihrem Computer nutzen zu können.</span>
+<ul>
+<li>Tethering funktioniert mit Windows Vista, Windows 7 und Linux.</li><br>
+<li>Sie können die SD-Karte Ihres Telefons nicht in Ihren Computer einsetzen, solange eine USB-Verbindung besteht.</li><br>
+<li>Weitere Informationen (einschließlich USB-Tethering mit anderen Betriebssystemen) finden Sie auf <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
+</ul>
+<p><b>Wi-Fi-Tethering</b></p>
+<span class="style1">Sie können Ihr Telefon in einen Wi-Fi-Zugangspunkt verwandeln, um die Internetverbindung Ihres Telefons auf einem oder mehreren Computern bzw. anderen Geräten nutzen zu können.</span>
+<ul>
+<li>Wenn Ihr Telefon als Zugangspunkt fungiert, können Sie die darauf installierten Anwendungen nicht verwenden, um über die Wi-Fi-Verbindung auf das Internet zuzugreifen.</li><br>
+<li>Sie konfigurieren einen Wi-Fi-Zugangspunkt in den Wi-Fi-Tethering-Einstellungen.</li><br>
+<li>Weitere Informationen erhalten Sie auf <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/de/tethering_usb_help.html b/assets/html/de/tethering_usb_help.html
new file mode 100644
index 0000000..8bad77d
--- /dev/null
+++ b/assets/html/de/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB-Tethering</b></p>
+<span class="style1">Sie können Ihr Telefon über ein USB-Kabel mit Ihrem Computer verbinden, um die Internetverbindung auf Ihrem Telefon auf Ihrem Computer nutzen zu können.</span>
+<ul>
+<li>Tethering funktioniert mit Windows Vista, Windows 7 und Linux.</li><br>
+<li>Sie können die SD-Karte Ihres Telefons nicht in Ihren Computer einsetzen, solange eine USB-Verbindung besteht.</li><br>
+<li>Weitere Informationen (einschließlich USB-Tethering mit anderen Betriebssystemen) finden Sie auf <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/de/tethering_wifi_help.html b/assets/html/de/tethering_wifi_help.html
new file mode 100644
index 0000000..a708766
--- /dev/null
+++ b/assets/html/de/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Wi-Fi-Tethering</b></p>
+<span class="style1">Sie können Ihr Telefon in einen Wi-Fi-Zugangspunkt verwandeln, um die Internetverbindung Ihres Telefons auf einem oder mehreren Computern bzw. anderen Geräten nutzen zu können.</span>
+<ul>
+<li>Wenn Ihr Telefon als Zugangspunkt fungiert, können Sie die darauf installierten Anwendungen nicht verwenden, um über die Wi-Fi-Verbindung auf das Internet zuzugreifen.</li><br>
+<li>Sie konfigurieren einen Wi-Fi-Zugangspunkt in den Wi-Fi-Tethering-Einstellungen.</li><br>
+<li>Weitere Informationen erhalten Sie auf <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/el/tethering_help.html b/assets/html/el/tethering_help.html
new file mode 100644
index 0000000..eae22eb
--- /dev/null
+++ b/assets/html/el/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Σύνδεση μέσω κινητής συσκευής με USB</b></p>
+<span class="style1">Μπορείτε να συνδέσετε το τηλέφωνο με τον υπολογιστή σας με ένα καλώδιο USB, για κοινή χρήση της σύνδεσης στο Διαδίκτυο του τηλεφώνου σας με τον υπολογιστή σας</span>
+<ul>
+<li>Η σύνδεση μέσω κινητής συσκευής λειτουργεί με Windows Vista, Windows 7 και Linux</li><br>
+<li>Δεν είναι δυνατό να τοποθετήσετε την κάρτα SD του τηλεφώνου στον υπολογιστή σας, όταν υπάρχει σύνδεση μέσω κινητής συσκευής με USB</li><br>
+<li>Για περισσότερες πληροφορίες, συμπεριλαμβανομένης εκείνων για τη σύνδεση μέσω κινητής συσκευής με USB με άλλα λειτουργικά συστήματα, ανατρέξτε στη διεύθυνση <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+<p><b>Σύνδεση μέσω κινητής συσκευής με Wi-Fi</b></p>
+<span class="style1">Μπορείτε να μετατρέψετε το τηλέφωνό σας σε ένα σημείο πρόσβασης Wi-Fi, για κοινή χρήση της σύνδεσης στο Διαδίκτυο του τηλεφώνου σας με έναν ή περισσότερους υπολογιστές ή άλλες συσκευές</span>
+<ul>
+<li>Όταν το τηλέφωνό σας λειτουργεί ως σημείο πρόσβασης, δεν είναι δυνατό να χρησιμοποιήσετε τις εφαρμογές του τηλεφώνου σας για να αποκτήσετε πρόσβαση στο Διαδίκτυο μέσω της σύνδεσης Wi-Fi</li><br>
+<li>Μπορείτε να ρυθμίσετε ένα σημείο πρόσβασης Wi-Fi στις ρυθμίσεις σύνδεσης μέσω κινητής συσκευής με Wi-Fi</li><br>
+<li>Για περισσότερες πληροφορίες, επισκεφθείτε τη διεύθυνση <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/el/tethering_usb_help.html b/assets/html/el/tethering_usb_help.html
new file mode 100644
index 0000000..96ea2c8
--- /dev/null
+++ b/assets/html/el/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Σύνδεση μέσω κινητής συσκευής με USB</b></p>
+<span class="style1">Μπορείτε να συνδέσετε το τηλέφωνο με τον υπολογιστή σας με ένα καλώδιο USB, για κοινή χρήση της σύνδεσης στο Διαδίκτυο του τηλεφώνου σας με τον υπολογιστή σας</span>
+<ul>
+<li>Η σύνδεση μέσω κινητής συσκευής λειτουργεί με Windows Vista, Windows 7 και Linux</li><br>
+<li>Δεν είναι δυνατό να τοποθετήσετε την κάρτα SD του τηλεφώνου στον υπολογιστή σας, όταν υπάρχει σύνδεση μέσω κινητής συσκευής με USB</li><br>
+<li>Για περισσότερες πληροφορίες, συμπεριλαμβανομένης εκείνων για τη σύνδεση μέσω κινητής συσκευής με USB με άλλα λειτουργικά συστήματα, ανατρέξτε στη διεύθυνση <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/el/tethering_wifi_help.html b/assets/html/el/tethering_wifi_help.html
new file mode 100644
index 0000000..8507748
--- /dev/null
+++ b/assets/html/el/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Σύνδεση μέσω κινητής συσκευής με Wi-Fi</b></p>
+<span class="style1">Μπορείτε να μετατρέψετε το τηλέφωνό σας σε ένα σημείο πρόσβασης Wi-Fi, για κοινή χρήση της σύνδεσης στο Διαδίκτυο του τηλεφώνου σας με έναν ή περισσότερους υπολογιστές ή άλλες συσκευές</span>
+<ul>
+<li>Όταν το τηλέφωνό σας λειτουργεί ως σημείο πρόσβασης, δεν είναι δυνατό να χρησιμοποιήσετε τις εφαρμογές του τηλεφώνου σας για να αποκτήσετε πρόσβαση στο Διαδίκτυο μέσω της σύνδεσης Wi-Fi</li><br>
+<li>Μπορείτε να ρυθμίσετε ένα σημείο πρόσβασης Wi-Fi στις ρυθμίσεις σύνδεσης μέσω κινητής συσκευής με Wi-Fi</li><br>
+<li>Για περισσότερες πληροφορίες, επισκεφθείτε τη διεύθυνση <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/en_gb/tethering_help.html b/assets/html/en_gb/tethering_help.html
new file mode 100644
index 0000000..63fec31
--- /dev/null
+++ b/assets/html/en_gb/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB tethering</b></p>
+<span class="style1">You can tether your phone to your computer with a USB cable, to share your phone's Internet connection with your computer</span>
+<ul>
+<li>Tethering works with Windows Vista, Windows 7 and Linux</li><br>
+<li>You can't mount your phone's SD card on your computer when USB-tethered</li><br>
+<li>For more information, including using USB tethering with other OSs, see <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+<p><b>Wi-Fi tethering</b></p>
+<span class="style1">You can turn your phone into a Wi-Fi access point, to share your phone's Internet connection with one or more computers or other devices</span>
+<ul>
+<li>When your phone is acting as an access point, you can't use your phone's applications to access the Internet via its Wi-Fi connection</li><br>
+<li>You configure a Wi-Fi access point in Wi-Fi tethering settings</li><br>
+<li>For more information, visit <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/en_gb/tethering_usb_help.html b/assets/html/en_gb/tethering_usb_help.html
new file mode 100644
index 0000000..50e2154
--- /dev/null
+++ b/assets/html/en_gb/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB tethering</b></p>
+<span class="style1">You can tether your phone to your computer with a USB cable, to share your phone's Internet connection with your computer</span>
+<ul>
+<li>Tethering works with Windows Vista, Windows 7 and Linux</li><br>
+<li>You can't mount your phone's SD card on your computer when USB-tethered</li><br>
+<li>For more information, including using USB tethering with other OSs, see <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/en_gb/tethering_wifi_help.html b/assets/html/en_gb/tethering_wifi_help.html
new file mode 100644
index 0000000..3e8c1af
--- /dev/null
+++ b/assets/html/en_gb/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Wi-Fi tethering</b></p>
+<span class="style1">You can turn your phone into a Wi-Fi access point, to share your phone's Internet connection with one or more computers or other devices</span>
+<ul>
+<li>When your phone is acting as an access point, you can't use your phone's applications to access the Internet via its Wi-Fi connection</li><br>
+<li>You configure a Wi-Fi access point in Wi-Fi tethering settings</li><br>
+<li>For more information, visit <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/en_us/tethering_help.html b/assets/html/en_us/tethering_help.html
index 61fb32e..fa827d5 100644
--- a/assets/html/en_us/tethering_help.html
+++ b/assets/html/en_us/tethering_help.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <html>
 <head>
 <style>
@@ -21,14 +22,14 @@
 <ul>
 <li>Tethering works with Windows Vista, Windows 7, and Linux</li><br>
 <li>You can't mount your phone's SD card on your computer when USB tethered</li><br>
-<li>For more information, including using USB tethering with other OSs, see <a href="http://www.google.com/phone/tether#usb">http://www.google.com/phone/tether#usb</a></li><br>
+<li>For more information, including using USB tethering with other OSs, see <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
 </ul>
 <p><b>Wi-Fi tethering</b></p>
 <span class="style1">You can turn your phone into a Wi-Fi access point, to share your phone's internet connection with one or more computers or other devices</span>
 <ul>
 <li>When your phone is acting as an access point, you can't use your phone's applications to access the internet via its Wi-Fi connection</li><br>
 <li>You configure a Wi-Fi access point in Wi-Fi tethering settings</li><br>
-<li>For more information, visit <a href="http://www.google.com/phone/tether#wifi">http://www.google.com/phone/tether#wifi</a></li><br>
+<li>For more information, visit <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
 </ul>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/assets/html/en_us/tethering_usb_help.html b/assets/html/en_us/tethering_usb_help.html
index 143a09f..23f39e5 100644
--- a/assets/html/en_us/tethering_usb_help.html
+++ b/assets/html/en_us/tethering_usb_help.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <html>
 <head>
 <style>
@@ -21,7 +22,7 @@
 <ul>
 <li>Tethering works with Windows Vista, Windows 7, and Linux</li><br>
 <li>You can't mount your phone's SD card on your computer when USB tethered</li><br>
-<li>For more information, including using USB tethering with other OSs, see <a href="http://www.google.com/phone/tether#usb">http://www.google.com/phone/tether#usb</a></li><br>
+<li>For more information, including using USB tethering with other OSs, see <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
 </ul>
 </body>
 </html>
diff --git a/assets/html/en_us/tethering_wifi_help.html b/assets/html/en_us/tethering_wifi_help.html
index 9519e9a..cd8398d14 100644
--- a/assets/html/en_us/tethering_wifi_help.html
+++ b/assets/html/en_us/tethering_wifi_help.html
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <html>
 <head>
 <style>
@@ -21,7 +22,7 @@
 <ul>
 <li>When your phone is acting as an access point, you can't use your phone's applications to access the internet via its Wi-Fi connection</li><br>
 <li>You configure a Wi-Fi access point in Wi-Fi tethering settings</li><br>
-<li>For more information, visit <a href="http://www.google.com/phone/tether#wifi">http://www.google.com/phone/tether#wifi</a></li><br>
+<li>For more information, visit <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
 </ul>
 </body>
 </html>
diff --git a/assets/html/es/tethering_help.html b/assets/html/es/tethering_help.html
new file mode 100644
index 0000000..35a1e16
--- /dev/null
+++ b/assets/html/es/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Anclaje de USB</b></p>
+<span class="style1">Puedes anclar el teléfono a tu ordenador con un cable USB para compartir la conexión a Internet del teléfono con el equipo.</span>
+<ul>
+<li>El anclaje funciona con Windows Vista, Windows 7 y Linux.</li><br>
+<li>Puedes montar la tarjeta SD del teléfono en el equipo una vez realizado el anclaje de USB.</li><br>
+<li>Para obtener más información, incluido el uso del anclaje de USB con otros sistemas operativos, consulta la página <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
+</ul>
+<p><b>Anclaje a red Wi-Fi</b></p>
+<span class="style1">Puedes convertir el teléfono en un punto de acceso Wi-Fi para compartir la conexión a Internet del teléfono con uno o con varios equipos o dispositivos.</span>
+<ul>
+<li>Cuando el teléfono actúe como un punto de acceso, no podrás utilizar sus aplicaciones para acceder a Internet a través de la conexión Wi-Fi del dispositivo.</li><br>
+<li>Para configurar un punto de acceso Wi-Fi, accede a la configuración de anclaje a red Wi-Fi.</li><br>
+<li>Para obtener más información, consulta la página <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/es/tethering_usb_help.html b/assets/html/es/tethering_usb_help.html
new file mode 100644
index 0000000..ec7a746
--- /dev/null
+++ b/assets/html/es/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Anclaje de USB</b></p>
+<span class="style1">Puedes anclar el teléfono a tu ordenador con un cable USB para compartir la conexión a Internet del teléfono con el equipo.</span>
+<ul>
+<li>El anclaje funciona con Windows Vista, Windows 7 y Linux.</li><br>
+<li>Puedes montar la tarjeta SD del teléfono en el equipo una vez realizado el anclaje de USB.</li><br>
+<li>Para obtener más información, incluido el uso del anclaje de USB con otros sistemas operativos, consulta la página <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/es/tethering_wifi_help.html b/assets/html/es/tethering_wifi_help.html
new file mode 100644
index 0000000..0761735
--- /dev/null
+++ b/assets/html/es/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Anclaje a red Wi-Fi</b></p>
+<span class="style1">Puedes convertir el teléfono en un punto de acceso Wi-Fi para compartir la conexión a Internet del teléfono con uno o con varios equipos o dispositivos.</span>
+<ul>
+<li>Cuando el teléfono actúe como un punto de acceso, no podrás utilizar sus aplicaciones para acceder a Internet a través de la conexión Wi-Fi del dispositivo.</li><br>
+<li>Para configurar un punto de acceso Wi-Fi, accede a la configuración de anclaje a red Wi-Fi.</li><br>
+<li>Para obtener más información, consulta la página <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/es_us/tethering_help.html b/assets/html/es_us/tethering_help.html
new file mode 100644
index 0000000..f3055a0
--- /dev/null
+++ b/assets/html/es_us/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Anclaje a red USB</b></p>
+<span class="style1">Puedes anclar tu teléfono a tu computadora con un cable USB para compartir la conexión a Internet de tu teléfono con tu computadora.</span>
+<ul>
+<li>El anclaje funciona con Windows Vista, Windows 7 y Linux.</li><br>
+<li>No puedes montar la tarjeta SD de tu teléfono en tu computadora cuando el USB esté anclado.</li><br>
+<li>Para obtener más información, incluido el anclaje a red USB con otros SO, consulta <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
+</ul>
+<p><b>Anclaje a redes de Wi-Fi</b></p>
+<span class="style1">Puedes cambiar tu teléfono a un punto de acceso Wi-Fi para compartir la conexión a Internet de tu teléfono con una computadora o un dispositivo, o más.</span>
+<ul>
+<li>Cuando tu teléfono actúa como punto de acceso, no puedes usar las aplicaciones de tu teléfono para acceder a Internet a través de la conexión Wi-Fi.</li><br>
+<li>Debes configurar un punto de acceso Wi-Fi en configuración de anclaje a redes de Wi-Fi.</li><br>
+<li>Para obtener más información, visita <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/es_us/tethering_usb_help.html b/assets/html/es_us/tethering_usb_help.html
new file mode 100644
index 0000000..b29b8a9
--- /dev/null
+++ b/assets/html/es_us/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Anclaje a red USB</b></p>
+<span class="style1">Puedes anclar tu teléfono a tu computadora con un cable USB para compartir la conexión a Internet de tu teléfono con tu computadora.</span>
+<ul>
+<li>El anclaje funciona con Windows Vista, Windows 7 y Linux.</li><br>
+<li>No puedes montar la tarjeta SD de tu teléfono en tu computadora cuando el USB esté anclado.</li><br>
+<li>Para obtener más información, incluido el anclaje a red USB con otros SO, consulta <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/es_us/tethering_wifi_help.html b/assets/html/es_us/tethering_wifi_help.html
new file mode 100644
index 0000000..ae08093
--- /dev/null
+++ b/assets/html/es_us/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Anclaje a redes de Wi-Fi</b></p>
+<span class="style1">Puedes cambiar tu teléfono a un punto de acceso Wi-Fi para compartir la conexión a Internet de tu teléfono con una computadora o un dispositivo, o más.</span>
+<ul>
+<li>Cuando tu teléfono actúa como punto de acceso, no puedes usar las aplicaciones de tu teléfono para acceder a Internet a través de la conexión Wi-Fi.</li><br>
+<li>Debes configurar un punto de acceso Wi-Fi en configuración de anclaje a redes de Wi-Fi.</li><br>
+<li>Para obtener más información, visita <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/fr/tethering_help.html b/assets/html/fr/tethering_help.html
new file mode 100644
index 0000000..7356067
--- /dev/null
+++ b/assets/html/fr/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Partage de connexion par USB</b></p>
+<span class="style1">Vous pouvez partager la connexion Internet de votre mobile avec votre ordinateur, cela en connectant le téléphone à l'ordinateur par le biais d'un câble USB.</span>
+<ul>
+<li>Ce procédé est possible avec Windows Vista, Windows 7 et Linux</li><br>
+<li>Vous ne pouvez cependant pas monter la carte SD du mobile sur l'ordinateur en cas de partage de connexion par USB.</li><br>
+<li>Pour de plus amples informations, en particulier sur le partage de connexion par USB avec d'autres systèmes d'exploitation, consultez la page <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+<p><b>Partage de connexion via Wi-Fi</b></p>
+<span class="style1">Vous pouvez transformer votre mobile en point d'accès Wi-Fi et ainsi partager la connexion Internet du téléphone avec un ou plusieurs ordinateurs ou autres appareils.</span>
+<ul>
+<li>Lorsque votre mobile fait office de point d'accès, notez qu'il n'est pas possible d'utiliser ses applications pour accéder à Internet via sa connexion Wi-Fi.</li><br>
+<li>Vous configurez un point d'accès Wi-Fi dans les paramètres de partage de connexion via Wi-Fi.</li><br>
+<li>Pour de plus amples informations, consultez la page <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/fr/tethering_usb_help.html b/assets/html/fr/tethering_usb_help.html
new file mode 100644
index 0000000..2000bcc
--- /dev/null
+++ b/assets/html/fr/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Partage de connexion par USB</b></p>
+<span class="style1">Vous pouvez partager la connexion Internet de votre mobile avec votre ordinateur, cela en connectant le téléphone à l'ordinateur par le biais d'un câble USB.</span>
+<ul>
+<li>Ce procédé est possible avec Windows Vista, Windows 7 et Linux</li><br>
+<li>Vous ne pouvez cependant pas monter la carte SD du mobile sur l'ordinateur en cas de partage de connexion par USB.</li><br>
+<li>Pour de plus amples informations, en particulier sur le partage de connexion par USB avec d'autres systèmes d'exploitation, consultez la page <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/fr/tethering_wifi_help.html b/assets/html/fr/tethering_wifi_help.html
new file mode 100644
index 0000000..4fab911
--- /dev/null
+++ b/assets/html/fr/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Partage de connexion via Wi-Fi</b></p>
+<span class="style1">Vous pouvez transformer votre mobile en point d'accès Wi-Fi et ainsi partager la connexion Internet du téléphone avec un ou plusieurs ordinateurs ou autres appareils.</span>
+<ul>
+<li>Lorsque votre mobile fait office de point d'accès, notez qu'il n'est pas possible d'utiliser ses applications pour accéder à Internet via sa connexion Wi-Fi.</li><br>
+<li>Vous configurez un point d'accès Wi-Fi dans les paramètres de partage de connexion via Wi-Fi.</li><br>
+<li>Pour de plus amples informations, consultez la page <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/it/tethering_help.html b/assets/html/it/tethering_help.html
new file mode 100644
index 0000000..7434bb8
--- /dev/null
+++ b/assets/html/it/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Tethering USB</b></p>
+<span class="style1">È possibile eseguire il tethering tra telefono e computer con un cavo USB per condividere la connessione Internet del cellulare con il computer.</span>
+<ul>
+<li>Il tethering funziona con Windows Vista, Windows 7 e Linux.</li><br>
+<li>Non è possibile montare la scheda SD del telefono sul computer quando viene eseguito il tethering USB.</li><br>
+<li>Per ulteriori informazioni, incluso l'utilizzo del tethering USB con altri sistemi operativi, visita l'indirizzo <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
+</ul>
+<p><b>Tethering Wi-Fi</b></p>
+<span class="style1">È possibile trasformare il telefono in un punto di accesso Wi-Fi per condividere la connessione Internet del cellulare con uno o più computer o altri dispositivi.</span>
+<ul>
+<li>Quando il telefono funge da punto di accesso, non è possibile utilizzare le applicazioni del telefono per accedere a Internet attraverso la sua connessione Wi-Fi.</li><br>
+<li>Puoi configurare un punto di accesso Wi-Fi nelle impostazioni di tethering Wi-Fi.</li><br>
+<li>Per ulteriori informazioni, visita l'indirizzo <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/it/tethering_usb_help.html b/assets/html/it/tethering_usb_help.html
new file mode 100644
index 0000000..fcd7a03
--- /dev/null
+++ b/assets/html/it/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Tethering USB</b></p>
+<span class="style1">È possibile eseguire il tethering tra telefono e computer con un cavo USB per condividere la connessione Internet del cellulare con il computer.</span>
+<ul>
+<li>Il tethering funziona con Windows Vista, Windows 7 e Linux.</li><br>
+<li>Non è possibile montare la scheda SD del telefono sul computer quando viene eseguito il tethering USB.</li><br>
+<li>Per ulteriori informazioni, incluso l'utilizzo del tethering USB con altri sistemi operativi, visita l'indirizzo <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/it/tethering_wifi_help.html b/assets/html/it/tethering_wifi_help.html
new file mode 100644
index 0000000..d53b07f
--- /dev/null
+++ b/assets/html/it/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Tethering Wi-Fi</b></p>
+<span class="style1">È possibile trasformare il telefono in un punto di accesso Wi-Fi per condividere la connessione Internet del cellulare con uno o più computer o altri dispositivi.</span>
+<ul>
+<li>Quando il telefono funge da punto di accesso, non è possibile utilizzare le applicazioni del telefono per accedere a Internet attraverso la sua connessione Wi-Fi.</li><br>
+<li>Puoi configurare un punto di accesso Wi-Fi nelle impostazioni di tethering Wi-Fi.</li><br>
+<li>Per ulteriori informazioni, visita l'indirizzo <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/ja/tethering_help.html b/assets/html/ja/tethering_help.html
new file mode 100644
index 0000000..4fd6065
--- /dev/null
+++ b/assets/html/ja/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB テザリング</b></p>
+<span class="style1">USB ケーブルを使って携帯端末をパソコンにテザリングし、端末のインターネット接続をパソコンと共有できます。</span>
+<ul>
+<li>テザリング機能は、Windows Vista、Windows 7、Linux でご利用いただけます。</li><br>
+<li>USB テザリング中は、パソコンで端末の SD カードをマウントすることはできません。</li><br>
+<li>その他の OS で USB をテザリングする方法など、テザリングについて詳しくは <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a> をご覧ください。</li><br>
+</ul>
+<p><b>Wi-Fi テザリング</b></p>
+<span class="style1">お使いの携帯端末を Wi-Fi アクセス ポイントとして利用し、端末のインターネット接続を 1 台以上のパソコンやその他の端末で共有できます。</span>
+<ul>
+<li>端末がアクセス ポイントとして機能している場合は、端末のアプリケーションを使用して、端末の Wi-Fi 接続経由でインターネットにアクセスすることはできません。</li><br>
+<li>Wi-Fi アクセス ポイントの設定は [Wi-Fiテザリング設定] で行います。</li><br>
+<li>詳しくは <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a> をご覧ください。</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/ja/tethering_usb_help.html b/assets/html/ja/tethering_usb_help.html
new file mode 100644
index 0000000..9bd95e6
--- /dev/null
+++ b/assets/html/ja/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB テザリング</b></p>
+<span class="style1">USB ケーブルを使って携帯端末をパソコンにテザリングし、端末のインターネット接続をパソコンと共有できます。</span>
+<ul>
+<li>テザリング機能は、Windows Vista、Windows 7、Linux でご利用いただけます。</li><br>
+<li>USB テザリング中は、パソコンで端末の SD カードをマウントすることはできません。</li><br>
+<li>その他の OS で USB をテザリングする方法など、テザリングについて詳しくは <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a> をご覧ください。</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/ja/tethering_wifi_help.html b/assets/html/ja/tethering_wifi_help.html
new file mode 100644
index 0000000..d6c2a9a
--- /dev/null
+++ b/assets/html/ja/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Wi-Fi テザリング</b></p>
+<span class="style1">お使いの携帯端末を Wi-Fi アクセス ポイントとして利用し、端末のインターネット接続を 1 台以上のパソコンやその他の端末で共有できます。</span>
+<ul>
+<li>端末がアクセス ポイントとして機能している場合は、端末のアプリケーションを使用して、端末の Wi-Fi 接続経由でインターネットにアクセスすることはできません。</li><br>
+<li>Wi-Fi アクセス ポイントの設定は [Wi-Fiテザリング設定] で行います。</li><br>
+<li>詳しくは <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a> をご覧ください。</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/ko/tethering_help.html b/assets/html/ko/tethering_help.html
new file mode 100644
index 0000000..0239f68
--- /dev/null
+++ b/assets/html/ko/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB 테더링</b></p>
+<span class="style1">USB 케이블로 휴대전화를 컴퓨터에 테더링하여 휴대전화의 인터넷 연결을 컴퓨터와 공유할 수 있습니다.</span>
+<ul>
+<li>테더링은 Windows Vista, Windows 7, 및 Linux에서 지원합니다.</li><br>
+<li>USB 테더링 중에 휴대전화의 SD카드를 컴퓨터에 마운트할 수 없습니다.</li><br>
+<li>기타 운영 체제에서의 테더링 사용을 비롯한 자세한 내용은 <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>를 참조하세요.</li><br>
+</ul>
+<p><b>Wi-Fi 테더링</b></p>
+<span class="style1">휴대전화를 Wi-Fi 액세스 포인트로 전환하여 휴대전화의 인터넷 연결을 하나 이상의 컴퓨터 또는 기타 기기와 공유할 수 있습니다.</span>
+<ul>
+<li>휴대전화가 액세스 포인트 역할을 하는 경우 휴대전화의 응용프로그램은 휴대전화의 Wi-Fi 연결을 통해 인터넷에 액세스할 수 없습니다.</li><br>
+<li>Wi-Fi 테더링 설정에서 Wi-Fi 액세스 포인트를 구성할 수 있습니다.</li><br>
+<li>자세한 내용은 <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>를 참조하세요.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/ko/tethering_usb_help.html b/assets/html/ko/tethering_usb_help.html
new file mode 100644
index 0000000..66ac3de
--- /dev/null
+++ b/assets/html/ko/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB 테더링</b></p>
+<span class="style1">USB 케이블로 휴대전화를 컴퓨터에 테더링하여 휴대전화의 인터넷 연결을 컴퓨터와 공유할 수 있습니다.</span>
+<ul>
+<li>테더링은 Windows Vista, Windows 7, 및 Linux에서 지원합니다.</li><br>
+<li>USB 테더링 중에 휴대전화의 SD카드를 컴퓨터에 마운트할 수 없습니다.</li><br>
+<li>기타 운영 체제에서의 테더링 사용을 비롯한 자세한 내용은 <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>를 참조하세요.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/ko/tethering_wifi_help.html b/assets/html/ko/tethering_wifi_help.html
new file mode 100644
index 0000000..b51b93e
--- /dev/null
+++ b/assets/html/ko/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Wi-Fi 테더링</b></p>
+<span class="style1">휴대전화를 Wi-Fi 액세스 포인트로 전환하여 휴대전화의 인터넷 연결을 하나 이상의 컴퓨터 또는 기타 기기와 공유할 수 있습니다.</span>
+<ul>
+<li>휴대전화가 액세스 포인트 역할을 하는 경우 휴대전화의 응용프로그램은 휴대전화의 Wi-Fi 연결을 통해 인터넷에 액세스할 수 없습니다.</li><br>
+<li>Wi-Fi 테더링 설정에서 Wi-Fi 액세스 포인트를 구성할 수 있습니다.</li><br>
+<li>자세한 내용은 <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>를 참조하세요.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/nl/tethering_help.html b/assets/html/nl/tethering_help.html
new file mode 100644
index 0000000..febd1af
--- /dev/null
+++ b/assets/html/nl/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB-tethering</b></p>
+<span class="style1">U kunt uw telefoon tetheren met een USB-kabel om de internetverbinding van uw telefoon te delen met uw computer</span>
+<ul>
+<li>Tethering werkt met Windows Vista, Windows 7 en Linux</li><br>
+<li>U kunt de SD-kaart van uw telefoon niet koppelen aan uw computer tijdens USB-tethering</li><br>
+<li>Raadpleeg <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a> voor meer informatie, waaronder het gebruik van USB-tethering met andere besturingssystemen.</li><br>
+</ul>
+<p><b>Wi-Fi-tethering</b></p>
+<span class="style1">U kunt uw telefoon gebruiken als Wi-Fi-toegangspunt om de internetverbinding van uw telefoon te delen met een of meer computers of andere apparaten</span>
+<ul>
+<li>Wanneer uw telefoon wordt gebruikt als toegangspunt, kunt u de toepassingen op uw telefoon niet gebruiken om via de Wi-Fi-verbinding toegang tot internet te krijgen</li><br>
+<li>U configureert een Wi-Fi-toegangspunt in de instellingen voor Wi-Fi-tethering</li><br>
+<li>Ga naar <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a> voor meer informatie.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/nl/tethering_usb_help.html b/assets/html/nl/tethering_usb_help.html
new file mode 100644
index 0000000..fc027da
--- /dev/null
+++ b/assets/html/nl/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB-tethering</b></p>
+<span class="style1">U kunt uw telefoon tetheren met een USB-kabel om de internetverbinding van uw telefoon te delen met uw computer</span>
+<ul>
+<li>Tethering werkt met Windows Vista, Windows 7 en Linux</li><br>
+<li>U kunt de SD-kaart van uw telefoon niet koppelen aan uw computer tijdens USB-tethering</li><br>
+<li>Raadpleeg <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a> voor meer informatie, waaronder het gebruik van USB-tethering met andere besturingssystemen.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/nl/tethering_wifi_help.html b/assets/html/nl/tethering_wifi_help.html
new file mode 100644
index 0000000..13f0fa0
--- /dev/null
+++ b/assets/html/nl/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Wi-Fi-tethering</b></p>
+<span class="style1">U kunt uw telefoon gebruiken als Wi-Fi-toegangspunt om de internetverbinding van uw telefoon te delen met een of meer computers of andere apparaten</span>
+<ul>
+<li>Wanneer uw telefoon wordt gebruikt als toegangspunt, kunt u de toepassingen op uw telefoon niet gebruiken om via de Wi-Fi-verbinding toegang tot internet te krijgen</li><br>
+<li>U configureert een Wi-Fi-toegangspunt in de instellingen voor Wi-Fi-tethering</li><br>
+<li>Ga naar <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a> voor meer informatie.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/no/tethering_help.html b/assets/html/no/tethering_help.html
new file mode 100644
index 0000000..2883592
--- /dev/null
+++ b/assets/html/no/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB-tilknytning</b></p>
+<span class="style1">Du kan knytte telefonen til datamaskinen med en USB-kabel, slik at du kan dele telefonens Internett-tilkobling med maskinen</span>
+<ul>
+<li>Tilknytning fungerer med Windows Vista, Windows 7 og Linux</li><br>
+<li>Du kan ikke montere telefonens SD-kort i datamaskinen når telefonen er tilknyttet via USB</li><br>
+<li>Du finner mer informasjon, herunder om hvordan du bruker USB-tilknytning med andre operativsystemer, på <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+<p><b>Tilknytning av trådløst nett</b></p>
+<span class="style1">Telefonen kan angis som et tilgangspunkt for trådløst nett for deling av Internett-tilkobling med én eller flere datamaskiner eller andre enheter</span>
+<ul>
+<li>Når telefonen fungerer som tilgangspunkt, kan du ikke bruke telefonens programmer til å få tilgang til Internett via trådløst nett</li><br>
+<li>Gå til innstillinger for tilknytning av trådløst nett for å konfigurere tilgangspunkt for trådløst nett</li><br>
+<li>Du finner mer informasjon på <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/no/tethering_usb_help.html b/assets/html/no/tethering_usb_help.html
new file mode 100644
index 0000000..e32c8b2
--- /dev/null
+++ b/assets/html/no/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB-tilknytning</b></p>
+<span class="style1">Du kan knytte telefonen til datamaskinen med en USB-kabel, slik at du kan dele telefonens Internett-tilkobling med maskinen</span>
+<ul>
+<li>Tilknytning fungerer med Windows Vista, Windows 7 og Linux</li><br>
+<li>Du kan ikke montere telefonens SD-kort i datamaskinen når telefonen er tilknyttet via USB</li><br>
+<li>Du finner mer informasjon, herunder om hvordan du bruker USB-tilknytning med andre operativsystemer, på <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/no/tethering_wifi_help.html b/assets/html/no/tethering_wifi_help.html
new file mode 100644
index 0000000..84e5910
--- /dev/null
+++ b/assets/html/no/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Tilknytning av trådløst nett</b></p>
+<span class="style1">Telefonen kan angis som et tilgangspunkt for trådløst nett for deling av Internett-tilkobling med én eller flere datamaskiner eller andre enheter</span>
+<ul>
+<li>Når telefonen fungerer som tilgangspunkt, kan du ikke bruke telefonens programmer til å få tilgang til Internett via trådløst nett</li><br>
+<li>Gå til innstillinger for tilknytning av trådløst nett for å konfigurere tilgangspunkt for trådløst nett</li><br>
+<li>Du finner mer informasjon på <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/pl/tethering_help.html b/assets/html/pl/tethering_help.html
new file mode 100644
index 0000000..271f92f
--- /dev/null
+++ b/assets/html/pl/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Powiązanie USB</b></p>
+<span class="style1">Telefon możesz powiązać z komputerem przy użyciu kabla USB, aby udostępniać na nim połączenie internetowe telefonu.</span>
+<ul>
+<li>Powiązanie działa w systemach Windows Vista, Windows 7 oraz Linux.</li><br>
+<li>Podczas powiązania USB nie ma możliwości podłączenia na komputerze karty SD telefonu.</li><br>
+<li>Więcej informacji, w tym również na temat korzystania z powiązania USB z innymi systemami operacyjnymi, znajdziesz pod adresem <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
+</ul>
+<p><b>Powiązanie Wi-Fi</b></p>
+<span class="style1">Telefon możesz przekształcić w punkt dostępowy Wi-Fi, aby udostępniać połączenie internetowe telefonu jednemu lub większej liczbie komputerów i innych urządzeń.</span>
+<ul>
+<li>Gdy telefon działa jako punkt dostępowy, nie możesz korzystać z aplikacji telefonu w celu uzyskania dostępu do internetu za pośrednictwem jego połączenia Wi-Fi.</li><br>
+<li>Punkt dostępowy Wi-Fi konfiguruje się w ustawieniach powiązania Wi-Fi.</li><br>
+<li>Aby uzyskać więcej informacji, odwiedź stronę <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/pl/tethering_usb_help.html b/assets/html/pl/tethering_usb_help.html
new file mode 100644
index 0000000..67d343c
--- /dev/null
+++ b/assets/html/pl/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Powiązanie USB</b></p>
+<span class="style1">Telefon możesz powiązać z komputerem przy użyciu kabla USB, aby udostępniać na nim połączenie internetowe telefonu.</span>
+<ul>
+<li>Powiązanie działa w systemach Windows Vista, Windows 7 oraz Linux.</li><br>
+<li>Podczas powiązania USB nie ma możliwości podłączenia na komputerze karty SD telefonu.</li><br>
+<li>Więcej informacji, w tym również na temat korzystania z powiązania USB z innymi systemami operacyjnymi, znajdziesz pod adresem <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/pl/tethering_wifi_help.html b/assets/html/pl/tethering_wifi_help.html
new file mode 100644
index 0000000..50a66a7
--- /dev/null
+++ b/assets/html/pl/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Powiązanie Wi-Fi</b></p>
+<span class="style1">Telefon możesz przekształcić w punkt dostępowy Wi-Fi, aby udostępniać połączenie internetowe telefonu jednemu lub większej liczbie komputerów i innych urządzeń.</span>
+<ul>
+<li>Gdy telefon działa jako punkt dostępowy, nie możesz korzystać z aplikacji telefonu w celu uzyskania dostępu do internetu za pośrednictwem jego połączenia Wi-Fi.</li><br>
+<li>Punkt dostępowy Wi-Fi konfiguruje się w ustawieniach powiązania Wi-Fi.</li><br>
+<li>Aby uzyskać więcej informacji, odwiedź stronę <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/pt_br/tethering_help.html b/assets/html/pt_br/tethering_help.html
new file mode 100644
index 0000000..00c4251
--- /dev/null
+++ b/assets/html/pt_br/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Vínculo USB</b></p>
+<span class="style1">Você pode vincular seu telefone ao seu computador com um cabo USB, compartilhando a conexão com a internet do telefone</span>
+<ul>
+<li>O vínculo funciona com Windows Vista, Windows 7 e Linux</li><br>
+<li>Você não pode usar o cartão SD do telefone no computador com vínculo USB</li><br>
+<li>Para mais informações, incluindo o uso de vínculo USB em outros SOs, veja <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+<p><b>Vínculo Wi-Fi</b></p>
+<span class="style1">Use seu telefone como um ponto de acesso Wi-Fi, compartilhando a conexão com a internet do telefone com computadores ou outros aparelhos</span>
+<ul>
+<li>Quando seu telefone atua como ponto de acesso, você não pode usar os aplicativos do telefone para acessar a internet via conexão Wi-Fi</li><br>
+<li>Configure um ponto de acesso Wi-Fi nas configurações de vínculo Wi-Fi</li><br>
+<li>Para mais informações, visite <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/pt_br/tethering_usb_help.html b/assets/html/pt_br/tethering_usb_help.html
new file mode 100644
index 0000000..8db1cc2
--- /dev/null
+++ b/assets/html/pt_br/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Vínculo USB</b></p>
+<span class="style1">Você pode vincular seu telefone ao seu computador com um cabo USB, compartilhando a conexão com a internet do telefone</span>
+<ul>
+<li>O vínculo funciona com Windows Vista, Windows 7 e Linux</li><br>
+<li>Você não pode usar o cartão SD do telefone no computador com vínculo USB</li><br>
+<li>Para mais informações, incluindo o uso de vínculo USB em outros SOs, veja <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/pt_br/tethering_wifi_help.html b/assets/html/pt_br/tethering_wifi_help.html
new file mode 100644
index 0000000..88ca44f
--- /dev/null
+++ b/assets/html/pt_br/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Vínculo Wi-Fi</b></p>
+<span class="style1">Use seu telefone como um ponto de acesso Wi-Fi, compartilhando a conexão com a internet do telefone com computadores ou outros aparelhos</span>
+<ul>
+<li>Quando seu telefone atua como ponto de acesso, você não pode usar os aplicativos do telefone para acessar a internet via conexão Wi-Fi</li><br>
+<li>Configure um ponto de acesso Wi-Fi nas configurações de vínculo Wi-Fi</li><br>
+<li>Para mais informações, visite <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/pt_pt/tethering_help.html b/assets/html/pt_pt/tethering_help.html
new file mode 100644
index 0000000..ecf9c65
--- /dev/null
+++ b/assets/html/pt_pt/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Associação USB</b></p>
+<span class="style1">Pode associar o seu telefone ao computador com um cabo USB, para partilhar com o computador a ligação à internet do telefone</span>
+<ul>
+<li>A associação funciona com o Windows Vista, Windows 7 e Linux</li><br>
+<li>Durante a associação USB, não é possível instalar o cartão SD do telefone no computador</li><br>
+<li>Para mais informações, incluindo como utilizar a associação USB com outros sistemas operativos, consulte <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+<p><b>Associação Wi-Fi</b></p>
+<span class="style1">Pode transformar o seu telefone num ponto de acesso Wi-Fi para partilhar a ligação à internet do telefone com um ou mais computadores ou outros dispositivos</span>
+<ul>
+<li>Quando o telefone estiver a ser usado como ponto de acesso, não poderá utilizar as aplicações do telefone para aceder à internet através da sua ligação Wi-Fi</li><br>
+<li>Para configurar um ponto de acesso Wi-Fi, aceda às definições de associação Wi-Fi</li><br>
+<li>Para mais informações, visite <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/pt_pt/tethering_usb_help.html b/assets/html/pt_pt/tethering_usb_help.html
new file mode 100644
index 0000000..8cfab8c
--- /dev/null
+++ b/assets/html/pt_pt/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Associação USB</b></p>
+<span class="style1">Pode associar o seu telefone ao computador com um cabo USB, para partilhar com o computador a ligação à internet do telefone</span>
+<ul>
+<li>A associação funciona com o Windows Vista, Windows 7 e Linux</li><br>
+<li>Durante a associação USB, não é possível instalar o cartão SD do telefone no computador</li><br>
+<li>Para mais informações, incluindo como utilizar a associação USB com outros sistemas operativos, consulte <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/pt_pt/tethering_wifi_help.html b/assets/html/pt_pt/tethering_wifi_help.html
new file mode 100644
index 0000000..c214ae0
--- /dev/null
+++ b/assets/html/pt_pt/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Associação Wi-Fi</b></p>
+<span class="style1">Pode transformar o seu telefone num ponto de acesso Wi-Fi para partilhar a ligação à internet do telefone com um ou mais computadores ou outros dispositivos</span>
+<ul>
+<li>Quando o telefone estiver a ser usado como ponto de acesso, não poderá utilizar as aplicações do telefone para aceder à internet através da sua ligação Wi-Fi</li><br>
+<li>Para configurar um ponto de acesso Wi-Fi, aceda às definições de associação Wi-Fi</li><br>
+<li>Para mais informações, visite <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/ru/tethering_help.html b/assets/html/ru/tethering_help.html
new file mode 100644
index 0000000..e09e428
--- /dev/null
+++ b/assets/html/ru/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB-подключение</b></p>
+<span class="style1">Вы можете подключить телефон к компьютеру с помощью USB-кабеля и предоставить компьютеру интернет-подключение, установленное посредством телефона.</span>
+<ul>
+<li>Такое подключение возможно для ОС Windows Vista, Windows 7 и Linux.</li><br>
+<li>При USB-подключении вы не сможете получить доступ к SD-карте телефона с компьютера.</li><br>
+<li>Дополнительная информация и сведения об USB-подключении в других ОС приведена на странице <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
+</ul>
+<p><b>Подключение Wi-Fi</b></p>
+<span class="style1">Телефон можно использовать как точку доступа Wi-Fi. В этом случае несколько компьютеров или других устройств смогут использовать интернет-подключение, установленное посредством телефона.</span>
+<ul>
+<li>Когда телефон выступает в роли точки доступа, его приложения не смогут получить доступ к Интернету через подключение Wi-Fi.</li><br>
+<li>Включить режим общего доступа к Интернету через Wi-Fi можно в настройках подключения Wi-Fi.</li><br>
+<li>Дополнительная информация приведена на странице <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/ru/tethering_usb_help.html b/assets/html/ru/tethering_usb_help.html
new file mode 100644
index 0000000..570b88b
--- /dev/null
+++ b/assets/html/ru/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB-подключение</b></p>
+<span class="style1">Вы можете подключить телефон к компьютеру с помощью USB-кабеля и предоставить компьютеру интернет-подключение, установленное посредством телефона.</span>
+<ul>
+<li>Такое подключение возможно для ОС Windows Vista, Windows 7 и Linux.</li><br>
+<li>При USB-подключении вы не сможете получить доступ к SD-карте телефона с компьютера.</li><br>
+<li>Дополнительная информация и сведения об USB-подключении в других ОС приведена на странице <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/ru/tethering_wifi_help.html b/assets/html/ru/tethering_wifi_help.html
new file mode 100644
index 0000000..6fcca62
--- /dev/null
+++ b/assets/html/ru/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Подключение Wi-Fi</b></p>
+<span class="style1">Телефон можно использовать как точку доступа Wi-Fi. В этом случае несколько компьютеров или других устройств смогут использовать интернет-подключение, установленное посредством телефона.</span>
+<ul>
+<li>Когда телефон выступает в роли точки доступа, его приложения не смогут получить доступ к Интернету через подключение Wi-Fi.</li><br>
+<li>Включить режим общего доступа к Интернету через Wi-Fi можно в настройках подключения Wi-Fi.</li><br>
+<li>Дополнительная информация приведена на странице <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a>.</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/sv/tethering_help.html b/assets/html/sv/tethering_help.html
new file mode 100644
index 0000000..2242e98
--- /dev/null
+++ b/assets/html/sv/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Internetdelning via USB</b></p>
+<span class="style1">Du kan ansluta telefonen till datorn med en USB-kabel om du vill dela telefonens Internetanslutning med datorn</span>
+<ul>
+<li>Internetdelning fungerar även med Windows Vista, Windows 7 och Linux</li><br>
+<li>Det går inte att montera telefonens SD-kort i datorn när du delar Internet via USB</li><br>
+<li>Om du vill veta mer, till exempel hur du använder Internetdelning via USB i andra operativsystem, besöker du <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+<p><b>Internetdelning via Wi-Fi</b></p>
+<span class="style1">Du kan göra din telefon till en åtkomstpunkt för Wi-FI om du vill dela telefonens Internetanslutning med en eller flera datorer eller enheter</span>
+<ul>
+<li>När telefonen fungerar som åtkomstpunkt kan du inte använda telefonens program med Internet via telefonens Wi-Fi-anslutning</li><br>
+<li>Du konfigurerar en Wi-Fi-åtkomstpunkt under inställningarna för Internetdelning via Wi-Fi</li><br>
+<li>Om du vill veta mer besöker du <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/sv/tethering_usb_help.html b/assets/html/sv/tethering_usb_help.html
new file mode 100644
index 0000000..a16ec51
--- /dev/null
+++ b/assets/html/sv/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Internetdelning via USB</b></p>
+<span class="style1">Du kan ansluta telefonen till datorn med en USB-kabel om du vill dela telefonens Internetanslutning med datorn</span>
+<ul>
+<li>Internetdelning fungerar även med Windows Vista, Windows 7 och Linux</li><br>
+<li>Det går inte att montera telefonens SD-kort i datorn när du delar Internet via USB</li><br>
+<li>Om du vill veta mer, till exempel hur du använder Internetdelning via USB i andra operativsystem, besöker du <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/sv/tethering_wifi_help.html b/assets/html/sv/tethering_wifi_help.html
new file mode 100644
index 0000000..cfffe4d
--- /dev/null
+++ b/assets/html/sv/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Internetdelning via Wi-Fi</b></p>
+<span class="style1">Du kan göra din telefon till en åtkomstpunkt för Wi-FI om du vill dela telefonens Internetanslutning med en eller flera datorer eller enheter</span>
+<ul>
+<li>När telefonen fungerar som åtkomstpunkt kan du inte använda telefonens program med Internet via telefonens Wi-Fi-anslutning</li><br>
+<li>Du konfigurerar en Wi-Fi-åtkomstpunkt under inställningarna för Internetdelning via Wi-Fi</li><br>
+<li>Om du vill veta mer besöker du <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/tr/tethering_help.html b/assets/html/tr/tethering_help.html
new file mode 100644
index 0000000..cb59618
--- /dev/null
+++ b/assets/html/tr/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB bağlantısı</b></p>
+<span class="style1">Telefonunuzun internet bağlantısını bilgisayarınızla paylaşmak için telefonunuzu bir USB kablosuyla bilgisayarınıza bağlayabilirsiniz</span>
+<ul>
+<li>Bu tür bağlantı Windows Vista, Windows 7 ve Linux işletim sistemlerinde kullanılır</li><br>
+<li>USB ile bağlandığında telefonunuzun SD kartını bilgisayarınızda kullanamazsınız</li><br>
+<li>Diğer işletim sistemlerinde USB bağlantısı hakkında daha fazla bilgi için bkz. <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+<p><b>Kablosuz bağlantı</b></p>
+<span class="style1">Telefonunuzun internet bağlantısını bir veya daha fazla bilgisayarla ya da diğer cihazlarla paylaşmak için telefonunuzu kablosuz erişim noktasına dönüştürebilirsiniz</span>
+<ul>
+<li>Telefonunuz erişim noktası görevi görürken kablosuz bağlantısı üzerinden internete erişmek için telefonunuzun uygulamalarını kullanamazsınız</li><br>
+<li>Kablosuz bağlantı ayarlarında bir kablosuz erişim noktası yapılandırırsınız</li><br>
+<li>Daha fazla bilgi için <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a> adresini ziyaret edin</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/tr/tethering_usb_help.html b/assets/html/tr/tethering_usb_help.html
new file mode 100644
index 0000000..9b01ff9
--- /dev/null
+++ b/assets/html/tr/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB bağlantısı</b></p>
+<span class="style1">Telefonunuzun internet bağlantısını bilgisayarınızla paylaşmak için telefonunuzu bir USB kablosuyla bilgisayarınıza bağlayabilirsiniz</span>
+<ul>
+<li>Bu tür bağlantı Windows Vista, Windows 7 ve Linux işletim sistemlerinde kullanılır</li><br>
+<li>USB ile bağlandığında telefonunuzun SD kartını bilgisayarınızda kullanamazsınız</li><br>
+<li>Diğer işletim sistemlerinde USB bağlantısı hakkında daha fazla bilgi için bkz. <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/tr/tethering_wifi_help.html b/assets/html/tr/tethering_wifi_help.html
new file mode 100644
index 0000000..60f8206
--- /dev/null
+++ b/assets/html/tr/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Kablosuz bağlantı</b></p>
+<span class="style1">Telefonunuzun internet bağlantısını bir veya daha fazla bilgisayarla ya da diğer cihazlarla paylaşmak için telefonunuzu kablosuz erişim noktasına dönüştürebilirsiniz</span>
+<ul>
+<li>Telefonunuz erişim noktası görevi görürken kablosuz bağlantısı üzerinden internete erişmek için telefonunuzun uygulamalarını kullanamazsınız</li><br>
+<li>Kablosuz bağlantı ayarlarında bir kablosuz erişim noktası yapılandırırsınız</li><br>
+<li>Daha fazla bilgi için <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a> adresini ziyaret edin</li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/zh_cn/tethering_help.html b/assets/html/zh_cn/tethering_help.html
new file mode 100644
index 0000000..0513eb7
--- /dev/null
+++ b/assets/html/zh_cn/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB 绑定</b></p>
+<span class="style1">您可以通过 USB 线将手机与计算机绑定，从而与计算机共享手机的互联网连接</span>
+<ul>
+<li>绑定适用于 Windows Vista、Windows 7 和 Linux</li><br>
+<li>在 USB 绑定期间，您无法在计算机上安装手机的 SD 卡</li><br>
+<li>要了解详细信息（包括如何在其他操作系统上使用 USB 绑定），请访问 <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+<p><b>Wi-Fi 绑定</b></p>
+<span class="style1">您可以将手机设为 Wi-Fi 接入点，从而与一台或多台计算机或者其他设备共享手机的互联网连接</span>
+<ul>
+<li>手机成为接入点后，您就无法通过 Wi-Fi 连接使用手机的应用程序访问互联网了</li><br>
+<li>您可以在 Wi-Fi 绑定设置中配置 Wi-Fi 接入点</li><br>
+<li>要了解详细信息，请访问 <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/zh_cn/tethering_usb_help.html b/assets/html/zh_cn/tethering_usb_help.html
new file mode 100644
index 0000000..adb3769
--- /dev/null
+++ b/assets/html/zh_cn/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB 绑定</b></p>
+<span class="style1">您可以通过 USB 线将手机与计算机绑定，从而与计算机共享手机的互联网连接</span>
+<ul>
+<li>绑定适用于 Windows Vista、Windows 7 和 Linux</li><br>
+<li>在 USB 绑定期间，您无法在计算机上安装手机的 SD 卡</li><br>
+<li>要了解详细信息（包括如何在其他操作系统上使用 USB 绑定），请访问 <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/zh_cn/tethering_wifi_help.html b/assets/html/zh_cn/tethering_wifi_help.html
new file mode 100644
index 0000000..32a8792
--- /dev/null
+++ b/assets/html/zh_cn/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Wi-Fi 绑定</b></p>
+<span class="style1">您可以将手机设为 Wi-Fi 接入点，从而与一台或多台计算机或者其他设备共享手机的互联网连接</span>
+<ul>
+<li>手机成为接入点后，您就无法通过 Wi-Fi 连接使用手机的应用程序访问互联网了</li><br>
+<li>您可以在 Wi-Fi 绑定设置中配置 Wi-Fi 接入点</li><br>
+<li>要了解详细信息，请访问 <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/zh_tw/tethering_help.html b/assets/html/zh_tw/tethering_help.html
new file mode 100644
index 0000000..15f69c0
--- /dev/null
+++ b/assets/html/zh_tw/tethering_help.html
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB 數據連線</b></p>
+<span class="style1">您可以使用 USB 纜線讓手機和電腦連線，使電腦可以共用手機的網際網路連線</span>
+<ul>
+<li>支援數據連線的作業系統包括 Windows Vista、Windows 7 及 Linux</li><br>
+<li>使用 USB 數據連線時，您無法將手機的 SD 卡插到電腦上</li><br>
+<li>如需更多資訊，包括在其他作業系統中使用 USB 數據連線的資訊，請參閱 <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+<p><b>Wi-Fi 數據連線</b></p>
+<span class="style1">您可以將手機變成 Wi-Fi 存取點，讓一或多台電腦或其他裝置可以共用手機的網際網路連線</span>
+<ul>
+<li>將手機當作存取點使用時，手機的應用程式將無法透過 Wi-Fi 連線存取網際網路</li><br>
+<li>您可以在 Wi-Fi 數據連線設定中配置 Wi-Fi 存取點</li><br>
+<li>如需更多資訊，請造訪 <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/zh_tw/tethering_usb_help.html b/assets/html/zh_tw/tethering_usb_help.html
new file mode 100644
index 0000000..f1a20df
--- /dev/null
+++ b/assets/html/zh_tw/tethering_usb_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>USB 數據連線</b></p>
+<span class="style1">您可以使用 USB 纜線讓手機和電腦連線，使電腦可以共用手機的網際網路連線</span>
+<ul>
+<li>支援數據連線的作業系統包括 Windows Vista、Windows 7 及 Linux</li><br>
+<li>使用 USB 數據連線時，您無法將手機的 SD 卡插到電腦上</li><br>
+<li>如需更多資訊，包括在其他作業系統中使用 USB 數據連線的資訊，請參閱 <a href="http://www.android.com/tether#usb">http://www.android.com/tether#usb</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/assets/html/zh_tw/tethering_wifi_help.html b/assets/html/zh_tw/tethering_wifi_help.html
new file mode 100644
index 0000000..f91b151
--- /dev/null
+++ b/assets/html/zh_tw/tethering_wifi_help.html
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<html DIR="LTR">
+<head>
+<style>
+P {
+    font-size: 14 px;
+    }
+B {
+	font-size: 16px;
+}
+A {
+	color: #OOC;
+}
+.style1 {
+	font-size: 16px;
+}
+</style>
+</head>
+<body>
+<p><b>Wi-Fi 數據連線</b></p>
+<span class="style1">您可以將手機變成 Wi-Fi 存取點，讓一或多台電腦或其他裝置可以共用手機的網際網路連線</span>
+<ul>
+<li>將手機當作存取點使用時，手機的應用程式將無法透過 Wi-Fi 連線存取網際網路</li><br>
+<li>您可以在 Wi-Fi 數據連線設定中配置 Wi-Fi 存取點</li><br>
+<li>如需更多資訊，請造訪 <a href="http://www.android.com/tether#wifi">http://www.android.com/tether#wifi</a></li><br>
+</ul>
+</body>
+</html>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 42ac27a..04f1d56 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Moje poloha, odemknutí obrazovky, zámek SIM, zámek úložiště pověření"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavení funkce Moje poloha, odemknutí obrazovky a zamknutí úložiště pověření"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hesla"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Nastavení bezpečnostního gesta"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"Obrazovku je třeba odemknout gestem ruky."</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Nastavení bezpečnostního kódu PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"K odemknutí obrazovky je třeba zadat číselný kód PIN."</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Nastavit bezpečnostní heslo"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"K odemknutí obrazovky je třeba zadat heslo."</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Vypnout zámek obrazovky"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Odebrat bezpečnostní gesto"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Odebrat bezpečnostní kód PIN"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Kód PIN nemůže obsahovat více než %d číslic"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Kód PIN musí obsahovat pouze číslice 0 až 9."</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Heslo obsahuje neplatný znak"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Heslo musí obsahovat nejméně jedno písmeno."</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Heslo musí obsahovat nejméně jednu číslici."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Heslo musí obsahovat nejméně jeden symbol."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Zrušit"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Správa zařízení"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"Formátovat (vymazat) kartu SD"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Nedostupný údaj"</string>
     <string name="read_only" msgid="6702420168629076340">" (Pouze pro čtení)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Odpojit kartu SD"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Pokud odpojíte kartu SD, dojde k zastavení některých používaných aplikací. Tyto aplikace pravděpodobně nebudou k dispozici až do opětovného připojení karty SD."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Odpojení karty SD se nezdařilo"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Kartu SD nelze odpojit. Zkuste to znovu později."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"Karta SD bude odpojena. Stav bude zobrazen v oznamovací oblasti."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Odpojování"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Probíhá odpojování"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stav baterie"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"Žádné aplikace třetích stran nejsou nainstalovány."</string>
     <string name="version_text" msgid="9189073826278676425">"verze <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Přesunout"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Přesunout do telefonu"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Přesunout na kartu SD"</string>
     <string name="moving" msgid="6431016143218876491">"Přesouvání"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"V úložišti je nedostatek volného místa."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Aplikace neexistuje."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"Aplikace je chráněna proti kopírování."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"Zadané místo pro instalaci není platné."</string>
+    <string name="system_package" msgid="1030561474413022831">"Aktualizace systému nelze nainstalovat na externí média."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Vynutit zastavení"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Tato aplikace bude okamžitě restartována. Opravdu chcete vynutit její zastavení?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Přesun aplikace"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Přesunutí aplikace se nezdařilo. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferované umístění pro instalaci"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Změna preferovaného umístění pro instalaci nových aplikací"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Spuštěné služby"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Hlasový výstup"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Rozpoznávání hlasu"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Nastavení rozpoznávání hlasu"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Nastavení pro poskytovatele <xliff:g id="RECOGNIZER_NAME">%s</xliff:g>"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Nastavení převodu textu na řeč"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Nastavení převodu textu na řeč"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Vždy používat moje nastavení"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 6ef8579..3201db7 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låsning af SIM-kort og oplysningslagring"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angiv Min placering, oplåsning af skærmen, oplysningslagring"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Adgangskoder"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Angiv oplåsningsmønster"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"Du skal tegne et mønster for at låse skærmen op"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Angiv PIN-kode til oplåsning"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"Du skal bruge en numerisk PIN-kode til oplåsning af skærmen"</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Angiv adg.kode til oplåsning"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"Du skal bruge en adgangskode for at låse skærmen op"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Slå skærmlås fra"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjern mønster til at låse op"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjern pinkode til at låse op"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN-koden kan ikke være længere end %d cifre"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Pinkoden må kun indeholde cifrene 0-9"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Adgangskoden indeholder et ulovligt tegn"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Adgangskoden skal indeholde mindst ét bogstav."</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Adgangskoden skal indeholde mindst ét tal"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Adgangskoden skal indeholde mindst ét symbol."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuller"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Enhedsadministration"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"Formater (slet) SD-kortet"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Utilgængelig"</string>
     <string name="read_only" msgid="6702420168629076340">" (Skrivebeskyttet)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Demonter SD-kort"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Hvis du demonterer SD-kortet, vil nogle af de programmer, som du bruger, stoppe, og de kan være utilgængelige, indtil du monterer SD-kortet igen."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Demonteringen af SD-kortet mislykkedes"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"SD-kortet kan ikke demonteres. Prøv igen senere. "</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"SD-kortet demonteres. Se status i meddelelsesområdet."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Demontering"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Demontering i gang"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"Du har ikke installeret nogen tredjepartsprogrammer."</string>
     <string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Flyt"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Flyt til telefon"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Flyt til SD-kort"</string>
     <string name="moving" msgid="6431016143218876491">"Flytter"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"Der er ikke nok lagerplads tilbage."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Programmet eksisterer ikke."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"Programmet er kopisikret."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"Den angivne sti til installation er ikke gyldig."</string>
+    <string name="system_package" msgid="1030561474413022831">"Systemopdateringerne kan ikke installeres på eksterne medier."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Tving til at standse"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Dette program bliver genstartet med det samme. Er du sikker på, at du vil tvangsstandse?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Flyt program"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Programmet kunne ikke flyttes. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Foretrukken installationsplacering"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Skift den foretrukne installationsplacering for nye programmer."</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kørende tjenester"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Stemmeoutput"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Stemmegenkendelse"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Stemmegenkendelsesindstillinger"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Indstillinger for \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Indstillinger for tekst-til-tale"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Indstillinger for tekst-til-tale"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Brug altid mine indstil."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f4073bb..cedb18e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperrung und Sperrung des Anmeldeinformationsspeichers festlegen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Meinen Standort festlegen, Bildschirm entsperren, Sperren des Speichers für Anmeldeinformationen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passwörter"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Entsperrungsmuster einrichten"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"Zum Entsperren muss ein Muster gezeichnet werden."</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Entsperrungs-PIN einrichten"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"Zum Entsperren ist eine numerische PIN erforderlich."</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Entsperr.-Passw. einr."</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"Zum Entsperren ist ein Passwort erforderlich."</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Display-Sperre deaktivieren"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Entsperrungsmuster entfernen"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Entsperrungs-PIN entfernen"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Die PIN darf maximal %d Zeichen enthalten."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN darf nur die Ziffern 0 - 9 enthalten."</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Das Passwort enthält ein ungültiges Zeichen."</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Das Passwort muss mindestens einen Buchstaben enthalten."</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Das Passwort muss mindestens eine Zahl enthalten."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Das Passwort muss mindestens ein Symbol enthalten."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Abbrechen"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Geräteverwaltung"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"SD-Karte formatieren (löschen)"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Nicht verfügbar"</string>
     <string name="read_only" msgid="6702420168629076340">" (schreibgeschützt)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"SD-Karte entnehmen"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Wenn Sie die SD-Karte entfernen, werden einige von Ihnen verwendete Anwendungen angehalten und sind nicht mehr verfügbar, bis Sie die SD-Karte wieder einsetzen."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Fehler beim Entfernen der SD-Karte"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"SD-Karte kann nicht entfernt werden. Versuchen Sie es später erneut."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"SD-Karte wird getrennt. Überprüfen Sie den Status im Benachrichtigungsfeld."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Trennen..."</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Trennung..."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Akkustatus"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"Sie haben keine Anwendungen von Drittanbietern installiert."</string>
     <string name="version_text" msgid="9189073826278676425">"Version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Verschieben"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Auf Telefon verschieben"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Auf SD-Karte verschieben"</string>
     <string name="moving" msgid="6431016143218876491">"Verschieben"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"Es ist nicht genügend Speicher vorhanden."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Diese Anwendung existiert nicht."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"Die Anwendung ist kopiergeschützt."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"Der angegebene Installationsort ist nicht gültig."</string>
+    <string name="system_package" msgid="1030561474413022831">"Systemupdates können nicht auf externen Datenträgern installiert werden."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Stoppen erzwingen"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Diese Anwendung wird sofort neu gestartet. Möchten Sie das Beenden wirklich erzwingen?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Anwendung verschieben"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Verschieben der Anwendung fehlgeschlagen. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Bevorzugter Installationspfad"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Bevorzugten Installationspfad für neue Anwendungen ändern"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktive Dienste"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Sprachausgabe"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Spracherkennung"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Einstellungen für die Spracherkennung"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Einstellungen für \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Text-in-Sprache-Einstellungen"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Text-in-Sprache-Einstellungen"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Immer meine Einst. verwenden"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 67529e5..b38aa6a 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ορισμός του \"Η τοποθεσία μου\", του ξεκλειδώματος οθόνης και του κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Κωδικοί πρόσβασης"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Ορισμός μοτίβου ξεκλειδώματος"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"Πρέπει να σχεδιάσετε το μοτίβο για το ξεκλείδωμα της οθόνης"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Ορισμός αριθμού PIN ξεκλειδώματος"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"Για το ξεκλείδωμα της οθόνης πρέπει να χρησιμοποιηθεί αριθμητικό PIN"</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Ορισμός κωδικού πρόσβασης ξεκλειδώματος"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"Για το ξεκλείδωμα της οθόνης πρέπει να χρησιμοποιηθεί κωδικός πρόσβασης"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Απενεργοποίηση κλειδώματος οθόνης"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Κατάργηση μοτίβου ξεκλειδώματος"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Κατάργηση αριθμού PIN ξεκλειδώματος"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Ο αριθμός PIN δεν μπορεί να υπερβαίνει τα %d ψηφία"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Ο αριθμός PIN πρέπει να περιέχει μόνο ψηφία από το 0 έως το 9"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Ο κωδικός πρόσβασης περιέχει ένα μη έγκυρο χαρακτήρα"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"O κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον ένα γράμμα"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Ο κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον ένα ψηφίο"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"O κωδικός πρόσβασης πρέπει να περιέχει τουλάχιστον ένα σύμβολο"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ΟΚ"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Ακύρωση"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Διαχείριση συσκευής"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"Διαμόρφωση (διαγραφή) της κάρτας SD"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Μη διαθέσιμο"</string>
     <string name="read_only" msgid="6702420168629076340">" (Μόνο για ανάγνωση)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Αφαίρεση κάρτας SD"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Εάν αφαιρέσετε την κάρτα SD, ορισμένες από τις εφαρμογές που χρησιμοποιείτε θα σταματήσουν και ενδέχεται να μην είναι διαθέσιμες μέχρι να την τοποθετήσετε ξανά."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Η αφαίρεση της κάρτας SD απέτυχε"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Δεν είναι δυνατή η αφαίρεση της κάρτας SD. Προσπαθήστε ξανά αργότερα."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"Η κάρτα SD θα αφαιρεθεί. Ελέγξτε την περιοχή ειδοποιήσεων για πληροφορίες κατάστασης."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Αφαίρεση"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Αφαίρεση σε εξέλιξη"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Κατάσταση μπαταρίας"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"Δεν έχετε εγκαταστήσει εφαρμογές τρίτων μερών."</string>
     <string name="version_text" msgid="9189073826278676425">"έκδοση <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Μετακίνηση"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Μετακίνηση στο τηλέφωνο"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Μετακίνηση στην κάρτα SD"</string>
     <string name="moving" msgid="6431016143218876491">"Μετακίνηση"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"Ο διαθέσιμος χώρος αποθήκευσης δεν επαρκεί."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Η εφαρμογή δεν υπάρχει."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"Η εφαρμογή διαθέτει προστασία αντιγραφής."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"Η καθορισμένη τοποθεσία εγκατάστασης δεν είναι έγκυρη."</string>
+    <string name="system_package" msgid="1030561474413022831">"Δεν είναι δυνατή η αποθήκευση των ενημερώσεων συστήματος σε εξωτερικά μέσα."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Αναγκαστική διακοπή"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Θα γίνει αμέσως επανεκκίνηση αυτής της εφαρμογής. Είστε βέβαιοι ότι θέλετε να γίνει διακοπή;"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Μετακίνηση εφαρμογής"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Η μετακίνηση της εφαρμογής απέτυχε. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Προτιμώμενη θέση εγκατάστασης"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Αλλαγή της προτιμώμενης θέσης εγκατάστασης για νέες εφαρμογές."</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Υπηρεσίες που εκτελούνται"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Φωνητική έξοδος"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Αναγνώριση φωνής"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Ρυθμίσεις αναγνώρισης ομιλίας"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Ρυθμίσεις για \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Ρυθμίσεις μετατροπής κειμένου σε ομιλία"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Ρυθμίσεις κειμένου σε λόγο"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Χρήση των ρυθμίσεών μου πάντα"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1a9e91d..83b13f8 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de la credencial"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Conf. patrón de desbloq."</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"Debes extraer el patrón para desbloquear la pantalla"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Configurar el PIN de desbloqueo"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"Debes utilizar un PIN numérico para desbloquear la pantalla."</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Config. la contraseña de desbloq."</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"Debes utilizar una contraseña para desbloquear la pantalla."</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactivar el bloqueo de pantalla"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminar el gráfico de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminar el PIN de desbloqueo"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"El PIN no puede tener más de %d dígitos."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"El PIN debe contener de 0 a 9 dígitos únicamente."</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"La contraseña tiene un caracter no admitido."</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"La contraseña debe contener al menos una letra."</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"La contraseña debe contener al menos un dígito."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"La contraseña debe contener al menos un símbolo."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administración del dispositivo"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"Formato (borrar) la tarjeta SD"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"No disponible"</string>
     <string name="read_only" msgid="6702420168629076340">" (Sólo lectura)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Desmontar la tarjeta SD"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Si desmontas la tarjeta SD, algunas aplicaciones que estás usando se detendrán y es posible que no estén disponibles hasta que retires la tarjeta SD."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Error al desmontar la tarjeta SD"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"No se pudo desmontar la tarjeta SD. Vuelve a intentarlo más tarde."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"Se desmontará la tarjeta SD. Verifica el área de notificación para conocer el estado."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Desmontando"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmontaje en progreso"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado de batería"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"No tienes instalada ninguna aplicación de terceros."</string>
     <string name="version_text" msgid="9189073826278676425">"versión <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mover"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Mover al teléfono"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Mover a la tarjeta SD"</string>
     <string name="moving" msgid="6431016143218876491">"Moviendo"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"No queda suficiente espacio de almacenamiento."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"La aplicación no existe."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"La aplicación está protegida por derecho de autor."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"La ubicación específica de la instalación no es válida."</string>
+    <string name="system_package" msgid="1030561474413022831">"Las actualizaciones del sistema no se pueden instalar en medios externos."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Provocar la detención"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Esta aplicación se reiniciará inmediatamente. ¿Estás seguro de que deseas provocar la detención?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Mover aplicación"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Error al mover la aplicación. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Ubicación de instalación preferida"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Cambiar la ubicación de instalación preferida para nuevas aplicaciones"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Salida de voz"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Reconocedor de voz"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Configuración del reconocedor de voz"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Configuraciones para \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Configuración de texto de voz"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Configuración de texto a voz"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usar siempre mi config."</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 9955c39..679cd75 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -137,7 +137,7 @@
   <string-array name="app_install_location_entries">
     <item msgid="8151497958991952759">"Almacenamiento de dispositivo interno"</item>
     <item msgid="3738430123799803530">"Tarjeta SD extraíble"</item>
-    <item msgid="4498124044785815005">"Permitir que el sistema seleccione la ubicación"</item>
+    <item msgid="4498124044785815005">"Selección de sistema"</item>
   </string-array>
   <string-array name="vibrate_entries">
     <item msgid="3388952299521009213">"Siempre"</item>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 109fe7a..7e4bdab 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, bloqueo de pantalla, bloqueo de tarjeta SIM y bloqueo de almacenamiento de credenciales"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer ubicación, bloqueo de pantalla y bloqueo de almacenamiento de credenciales"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Contraseñas"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Establecer patrón de desbloqueo"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"Se debe crear un patrón para desbloquear la pantalla."</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Establecer PIN de desbloqueo"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"Se debe utilizar un PIN numérico para desbloquear la pantalla."</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Establecer contraseña de desbloqueo"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"Se debe utilizar una contraseña para desbloquear la pantalla."</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactivar bloqueo de pantalla"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Eliminar patrón de desbloqueo"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Eliminar PIN de desbloqueo"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"El PIN no puede tener más de %d dígitos."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"El PIN solo debe contener dígitos comprendidos entre el cero y el nueve."</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"La contraseña contiene un carácter no permitido."</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"La contraseña debe contener al menos una letra."</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"La contraseña debe contener al menos un dígito."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"La contraseña debe contener al menos un símbolo."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Aceptar"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administración de dispositivos"</string>
@@ -409,8 +428,8 @@
     <string name="notification_sound_title" msgid="6316316069880531693">"Tono de notificación"</string>
     <!-- no translation found for notification_sound_summary (2953599929394109819) -->
     <skip />
-    <string name="notification_pulse_title" msgid="1247988024534030629">"Pulsar luz de notificación"</string>
-    <string name="notification_pulse_summary" msgid="6899220780534617152">"Pulsar la luz de la bola de seguimiento de forma repetida para obtener nuevas notificaciones"</string>
+    <string name="notification_pulse_title" msgid="1247988024534030629">"Luz de notificación"</string>
+    <string name="notification_pulse_summary" msgid="6899220780534617152">"Pulsa la bola de seguimiento para obtener nuevas notificaciones"</string>
     <string name="incoming_call_volume_title" msgid="8073714801365904099">"Tono"</string>
     <string name="notification_volume_title" msgid="2012640760341080408">"Notificación"</string>
     <string name="checkbox_notification_same_as_incoming_call" msgid="1073644356290338921">"Utilizar volumen de llamada entrante para notificaciones"</string>
@@ -425,12 +444,12 @@
     <string name="sound_effects_enable_title" msgid="3197313718929122833">"Selección sonora"</string>
     <string name="sound_effects_enable_summary_on" msgid="6154141289879491329">"Reproducir sonido cuando se realiza una selección de pantalla"</string>
     <string name="sound_effects_enable_summary_off" msgid="3447739581759560125">"Reproducir sonido cuando se realiza una selección de pantalla"</string>
-    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Sonidos de bloqueo de pantalla"</string>
+    <string name="lock_sounds_enable_title" msgid="1575990840389107141">"Bloqueo de pantalla"</string>
     <string name="lock_sounds_enable_summary_on" msgid="145741024028391473">"Reproducir sonidos al bloquear y al desbloquear la pantalla"</string>
     <string name="lock_sounds_enable_summary_off" msgid="8481243116223542804">"Reproducir sonidos al bloquear y al desbloquear la pantalla"</string>
     <string name="haptic_feedback_enable_title" msgid="6311736559245411290">"Respuesta táctil"</string>
-    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrar al pulsar teclas programables o durante ciertas interacciones con la interfaz de usuario"</string>
-    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrar al pulsar teclas programables o durante ciertas interacciones con la interfaz de usuario"</string>
+    <string name="haptic_feedback_enable_summary_on" msgid="1875779656524793053">"Vibrar al pulsar teclas programables o tocar la interfaz de usuario"</string>
+    <string name="haptic_feedback_enable_summary_off" msgid="7287885436963105314">"Vibrar al pulsar teclas programables o tocar la interfaz de usuario"</string>
     <string name="audio_record_proc_title" msgid="4271091199976457534">"Supresión de ruido"</string>
     <string name="audio_record_proc_summary" msgid="8113628457499616498">"Suprimir ruido de fondo al hablar o al grabar"</string>
     <string name="dock_settings" msgid="1820107306693002541">"Conector"</string>
@@ -442,23 +461,23 @@
     <string name="dock_audio_summary_unknown" msgid="4465059868974255693">"Configuración del conector adjunto"</string>
     <string name="dock_not_found_title" msgid="3290961741828952424">"No se ha encontrado el conector"</string>
     <string name="dock_not_found_text" msgid="3035260358985111855">"El teléfono debe estar conectado para configurar el audio del conector."</string>
-    <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Reproducir sonido al insertar el teléfono en el conector"</string>
-    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Reproducir sonido al insertar el teléfono en el conector o al extraerlo del mismo"</string>
-    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"No reproducir sonido al insertar el teléfono en el conector o al extraerlo del mismo"</string>
+    <string name="dock_sounds_enable_title" msgid="3659084028644948905">"Reproducir sonido"</string>
+    <string name="dock_sounds_enable_summary_on" msgid="8491180514199743771">"Reproducir sonido al insertar o extraer el teléfono del conector"</string>
+    <string name="dock_sounds_enable_summary_off" msgid="3151046599205265919">"No reproducir sonido al insertar o extraer el teléfono del conector"</string>
     <string name="sync_settings" msgid="9186125469300013491">"Cuentas y sincronización"</string>
     <string name="sync_settings_summary" msgid="2962179505214965667">"Añadir o eliminar cuentas y modificar la configuración de las cuentas"</string>
     <string name="search_settings" msgid="1910951467596035063">"Búsqueda"</string>
-    <string name="search_settings_summary" msgid="9205656546570654169">"Administrar historial y configuración de búsqueda"</string>
+    <string name="search_settings_summary" msgid="9205656546570654169">"Gestionar historial y configuración de búsqueda"</string>
     <string name="display_settings" msgid="3912042046350078328">"Configuración de pantalla"</string>
     <string name="animations_title" msgid="1062189037402346023">"Animación"</string>
     <string name="animations_summary_on" msgid="8843613112130484436">"Mostrar animación al abrir y cerrar ventanas"</string>
     <string name="animations_summary_off" msgid="2777026828025551983">"Mostrar animación al abrir y cerrar ventanas"</string>
-    <string name="accelerometer_title" msgid="7854608399547349157">"Girar pantalla automáticamente"</string>
+    <string name="accelerometer_title" msgid="7854608399547349157">"Pantalla giratoria"</string>
     <string name="accelerometer_summary_on" msgid="1133737282813048021">"Cambiar orientación automáticamente al girar el teléfono"</string>
     <string name="accelerometer_summary_off" msgid="5485489363715740761">"Cambiar orientación automáticamente al girar el teléfono"</string>
     <string name="brightness" msgid="2354961343555249270">"Brillo"</string>
     <string name="brightness_summary" msgid="838917350127550703">"Ajustar el brillo de la pantalla"</string>
-    <string name="screen_timeout" msgid="4882669461447531301">"Tiempo de espera de la pantalla"</string>
+    <string name="screen_timeout" msgid="4882669461447531301">"Tiempo espera pantalla"</string>
     <string name="screen_timeout_summary" msgid="2905757633140605334">"Ajustar el tiempo de retraso antes de que la pantalla se apague automáticamente"</string>
     <string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
     <string name="sim_lock_settings" msgid="3392331196873564292">"Configuración de bloqueo de tarjeta SIM"</string>
@@ -495,8 +514,8 @@
     <string name="device_status_activity_title" msgid="1411201799384697904">"Estado"</string>
     <string name="device_status" msgid="607405385799807324">"Estado"</string>
     <string name="device_status_summary" msgid="2599162787451519618">"Número de teléfono, señal, etc."</string>
-    <string name="storage_settings" msgid="6681164315506788024">"Almacenamiento en teléfono y en tarjeta SD"</string>
-    <string name="storage_settings_title" msgid="5379463509034022773">"Configuración de almacenamiento en teléfono y en tarjeta SD"</string>
+    <string name="storage_settings" msgid="6681164315506788024">"Almacenamiento"</string>
+    <string name="storage_settings_title" msgid="5379463509034022773">"Configuración de almacenamiento"</string>
     <string name="storage_settings_summary" msgid="9176693537325988610">"Desactivar tarjeta SD, ver almacenamiento disponible."</string>
     <string name="status_number" msgid="5123197324870153205">"Mi número de teléfono"</string>
     <string name="status_min_number" msgid="3519504522179420597">"MIN"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"Formatear (borrar) la tarjeta SD"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"No disponible"</string>
     <string name="read_only" msgid="6702420168629076340">" (Sólo lectura)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Desmontar tarjeta SD"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Si desmontas la tarjeta SD, se detendrán algunas aplicaciones que estás utilizando y estas no estarán disponibles hasta que la vuelvas a montar."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"No se ha podido desmontar la tarjeta SD."</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"No se puede desmontar la tarjeta SD. Vuelve a intentarlo más tarde."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"Se va a desmontar la tarjeta SD. Puedes consultar el estado en el área de notificaciones."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Desmontando"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"La tarjeta SD se está desmontando."</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado de la batería"</string>
@@ -610,7 +624,7 @@
     <string name="location_networks_disabled" msgid="2708968452901433980">"Para ver una ubicación en aplicaciones (por ejemplo, Google Maps)"</string>
     <string name="location_neighborhood_level" msgid="4656658097932515921">"Ubicación determinada por redes móviles o Wi-Fi"</string>
     <string name="location_gps" msgid="6296125378829097831">"Utilizar satélites GPS"</string>
-    <string name="location_street_level" msgid="6460740847018275745">"Durante la localización, preciso en el nivel de calle (desactivar para ahorrar batería)"</string>
+    <string name="location_street_level" msgid="6460740847018275745">"Para detectar ubicación (desactivar para ahorrar batería)"</string>
     <string name="location_gps_disabled" msgid="6632537158777308128">"Localizar en nivel de calle (requiere más batería además de la vista aérea)"</string>
     <string name="assisted_gps" msgid="4649317129586736885">"Utilizar GPS asistido"</string>
     <string name="assisted_gps_enabled" msgid="8751899609589792803">"Utilizar el servidor para asistir al GPS (desactivar para reducir el uso de la red)"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"No tienes instalada ninguna aplicación externa."</string>
     <string name="version_text" msgid="9189073826278676425">"versión <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mover"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Mover al teléfono"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Mover a la tarjeta SD"</string>
     <string name="moving" msgid="6431016143218876491">"Moviendo"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"No queda suficiente espacio de almacenamiento."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"La aplicación especificada no existe."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"La aplicación está protegida contra copias."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"La ubicación de instalación especificada no es válida."</string>
+    <string name="system_package" msgid="1030561474413022831">"Las actualizaciones del sistema no se pueden instalar en medios externos."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Forzar detención"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Esta aplicación se reiniciará de forma inmediata. ¿Estás seguro de que deseas forzar la detención?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Mover aplicación"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"No se ha podido mover la aplicación. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Ubicación de instalación preferida"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Modificar ubicación de instalación preferida para nuevas aplicaciones"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servicios en ejecución"</string>
@@ -782,8 +786,8 @@
     <string name="show_password" msgid="2198798062604049206">"Contraseñas visibles"</string>
     <string name="show_password_summary" msgid="3806709974395178121">"Mostrar contraseña mientras se escribe"</string>
     <string name="ime_security_warning" msgid="812267421486877917">"Este método de introducción de texto puede registrar todo lo que escribas, incluidos datos personales, como las contraseñas y los números de las tarjetas de crédito. Procede de la aplicación <xliff:g id="IME_APPLICATION_NAME">%1$s</xliff:g>. ¿Deseas utilizar este método de introducción de texto?"</string>
-    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionario del usuario"</string>
-    <string name="user_dict_settings_title" msgid="8357027437499042191">"Diccionario del usuario"</string>
+    <string name="user_dict_settings_titlebar" msgid="765659257455000490">"Diccionario de usuario"</string>
+    <string name="user_dict_settings_title" msgid="8357027437499042191">"Diccionario de usuario"</string>
     <!-- no translation found for user_dict_settings_summary (7965571192902870454) -->
     <skip />
     <string name="user_dict_settings_add_menu_title" msgid="4056762757149923551">"Añadir"</string>
@@ -791,7 +795,7 @@
     <string name="user_dict_settings_edit_dialog_title" msgid="8967476444840548674">"Editar palabra"</string>
     <string name="user_dict_settings_context_menu_edit_title" msgid="2210564879320004837">"Editar"</string>
     <string name="user_dict_settings_context_menu_delete_title" msgid="9140703913776549054">"Suprimir"</string>
-    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"No tienes ninguna palabra en el diccionario del usuario. Puedes añadir una palabra a través del menú."</string>
+    <string name="user_dict_settings_empty_text" msgid="6209268025109242806">"No tienes ninguna palabra en el diccionario de usuario. Puedes añadir una palabra a través del menú."</string>
     <string name="testing" msgid="6584352735303604146">"Prueba"</string>
     <string name="testing_phone_info" msgid="8656693364332840056">"Información sobre el teléfono"</string>
     <string name="testing_battery_info" msgid="3497865525976497848">"Información sobre la batería"</string>
@@ -872,8 +876,8 @@
     <string name="accessibility_service_no_apps_title" msgid="898893674114288531">"No se han encontrado aplicaciones relacionadas con la accesibilidad."</string>
     <string name="accessibility_service_no_apps_message" msgid="2450056749545404807">"No tienes ninguna aplicación relacionada con la accesibilidad instalada."\n\n"Puedes descargar un lector de pantalla para tu dispositivo desde Android Market."\n\n"Haz clic en \"Aceptar\" para instalar el lector de pantalla."</string>
     <string name="accessibility_power_button_category" msgid="8545885236482339928">"Botón de encendido"</string>
-    <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"La llamada finaliza al pulsar el botón de encendido"</string>
-    <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Si se pulsa el botón de encendido durante una llamada, esta finalizará en lugar de apagarse la pantalla."</string>
+    <string name="accessibility_power_button_ends_call" msgid="7698764194501089533">"Colgar con botón de encendido"</string>
+    <string name="accessibility_power_button_ends_call_summary" msgid="8878097632186291462">"Al pulsar el botón de encendido, la llamada finalizará."</string>
     <string name="power_usage_summary_title" msgid="5180282911164282324">"Uso de la batería"</string>
     <string name="power_usage_summary" msgid="7237084831082848168">"Consumo de la batería"</string>
     <string name="battery_since_unplugged" msgid="338073389740738437">"Uso de la batería desde que se cargó"</string>
@@ -932,17 +936,18 @@
     <string name="menu_stats_refresh" msgid="1676215433344981075">"Actualizar"</string>
     <string name="process_kernel_label" msgid="3916858646836739323">"Sistema operativo de Android"</string>
     <string name="process_mediaserver_label" msgid="6500382062945689285">"Servidor multimedia"</string>
-    <string name="voice_input_output_settings" msgid="1336135218350444783">"Introducción y salida de voz"</string>
-    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuración de introducción y de salida de voz"</string>
+    <string name="voice_input_output_settings" msgid="1336135218350444783">"Entrada y salida de voz"</string>
+    <string name="voice_input_output_settings_title" msgid="2442850635048676991">"Configuración entrada y salida de voz"</string>
     <string name="voice_search_settings_title" msgid="2775469246913196536">"Búsqueda por voz"</string>
     <string name="keyboard_settings_title" msgid="5080115226780201234">"Teclado de Android"</string>
     <string name="voice_input_category" msgid="1589318440824204736">"Introducción de voz"</string>
     <string name="voice_output_category" msgid="2624538587784986229">"Salida de voz"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Reconocedor de voz"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Configuración de reconocimiento de voz"</string>
-    <string name="tts_settings" msgid="8186971894801348327">"Configuración de síntesis de voz"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Configuración de \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
+    <string name="tts_settings" msgid="8186971894801348327">"Configuración síntesis voz"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Configuración de síntesis de voz"</string>
-    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utilizar siempre mi configuración"</string>
+    <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utilizar mi configuración"</string>
     <string name="use_default_tts_settings_summary" msgid="4253502106159206276">"La configuración predeterminada anula la de la aplicación."</string>
     <string name="tts_default_settings_section" msgid="5787915620218907443">"Configuración predeterminada"</string>
     <string name="tts_default_synth_title" msgid="29467896463371992">"Motor predeterminado"</string>
@@ -1055,7 +1060,7 @@
     <string name="vpn_secret_unchanged" msgid="8700613973594154529">"(sin modificar)"</string>
     <string name="vpn_secret_not_set" msgid="1037792636371641845">"(sin definir)"</string>
     <string name="credentials_category" msgid="8536992056377271234">"Almacenamiento de credenciales"</string>
-    <string name="credentials_access" msgid="4843187230913860492">"Utilizar credenciales seguras"</string>
+    <string name="credentials_access" msgid="4843187230913860492">"Credenciales seguras"</string>
     <string name="credentials_access_summary" msgid="319662078718574168">"Permitir que las aplicaciones accedan a los certificados seguros y a otras credenciales"</string>
     <string name="credentials_unlock" msgid="1463040326264133844">"Introducir contraseña"</string>
     <string name="credentials_unlock_hint" msgid="594679530407918031">"Introduce la contraseña de almacenamiento de credenciales."</string>
@@ -1086,7 +1091,7 @@
     <string name="privacy_settings_title" msgid="1987089301293213705">"Configuración de privacidad"</string>
     <string name="backup_section_title" msgid="717834414028702406">"Realizar copia de seguridad y restaurar"</string>
     <string name="personal_data_section_title" msgid="7815209034443782061">"Datos personales"</string>
-    <string name="backup_settings_title" msgid="2968262658155327829">"Realizar copia de seguridad de mi configuración"</string>
+    <string name="backup_settings_title" msgid="2968262658155327829">"Copia seguridad de configuración"</string>
     <string name="auto_restore_title" msgid="5397528966329126506">"Restauración automática"</string>
     <string name="auto_restore_summary" msgid="2029683590724508019">"Restaurar datos de copias de seguridad de aplicaciones al instalarse"</string>
     <string name="backup_erase_dialog_title" msgid="3438255037256586237">"Copia de seguridad"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index 354b831..55a3e6d 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -72,7 +72,7 @@
     <!-- no translation found for wifi_status:0 (1922181315419294640) -->
     <!-- no translation found for wifi_status_with_ssid:0 (7714855332363650812) -->
   <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"Ouvrir"</item>
+    <item msgid="1435933968767043814">"Ouvert"</item>
     <item msgid="6318432659048829665">"WEP"</item>
     <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
     <item msgid="9098390198768443435">"802.1x EAP"</item>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 91eeb36..4bb525f 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Définir les paramètres de l\'option Ma position et de verrouillage"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Définir Ma position, le déverrouillage de l\'écran et le blocage des informations d\'identification stockées"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Mots de passe"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Créer un schéma de déverrouillage"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"Vous devez dessiner le schéma pour déverrouiller l\'écran."</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Définir le code PIN de déverrouillage"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"Utiliser un code PIN numérique pour déverrouiller l\'écran"</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Définir le mot de passe de déverrouillage"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"Utiliser un mot de passe pour déverrouiller l\'écran"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Désactiver le verrouillage de l\'écran"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Supprimer le schéma de déverrouillage"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Supprimer le code PIN de déverrouillage"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Le code PIN ne doit pas contenir plus de %d chiffres."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Le code PIN ne doit contenir que des chiffres compris entre 0 et 9."</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Le mot de passe contient un caractère non autorisé."</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Le mot de passe doit comporter au moins une lettre."</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Le mot de passe doit comporter au moins un chiffre."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Le mot de passe doit comporter au moins un symbole."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuler"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administration du périphérique"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"Formater (effacer) la carte SD"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Non disponible"</string>
     <string name="read_only" msgid="6702420168629076340">" (Lecture seule)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Désactiver la carte SD"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Si vous désactivez la carte SD, certaines applications que vous utilisez s\'arrêteront et risquent de ne plus être disponibles tant que vous n\'aurez pas réactivé la carte SD."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Échec de la désactivation de la carte SD"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Impossible de désactiver la carte SD. Réessayez ultérieurement."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"La carte SD sera désactivée. Pour connaître l\'état de la carte, consultez la zone de notification."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Désactivation en cours"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Désactivation en cours"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"État de la batterie"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"Aucune application tierce n\'est installée."</string>
     <string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Déplacer"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Déplacer vers le téléphone"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Déplacer vers la carte SD"</string>
     <string name="moving" msgid="6431016143218876491">"Déplacement en cours"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"L\'espace de stockage restant est insuffisant."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Cette application n\'existe pas."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"L\'application est protégée contre la copie."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"L\'emplacement d\'installation indiqué n\'est pas valide."</string>
+    <string name="system_package" msgid="1030561474413022831">"Les mises à jour du système ne peuvent pas être installées sur des supports externes."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Forcer l\'arrêt"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Cette application sera immédiatement redémarrée. Voulez-vous vraiment forcer sa fermeture ?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Déplacer l\'application"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Échec du déplacement de l\'application. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Emplacement d\'installation souhaité"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Modifiez l\'emplacement d\'installation par défaut pour les nouvelles applications."</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Services en cours d\'exécution"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Sortie vocale"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Reconnaissance vocale"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Paramètres de reconnaissance vocale"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Paramètres de \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Paramètres de la synthèse vocale"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Paramètres de la synthèse vocale"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Tjrs utiliser mes param."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a814435..ab0a4d2 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Imposta La mia posizione, sblocco schermo, blocco SIM, blocco cred."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Imposta La mia posizione, sblocco schermo, blocco archivio credenziali"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Password"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Imposta sequenza di sblocco"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"Devi inserire la sequenza per sbloccare lo schermo"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Imposta PIN di sblocco"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"È necessario utilizzare un PIN numerico per sbloccare lo schermo"</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Imposta password di sblocco"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"È necessario utilizzare una password per sbloccare lo schermo"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Disattiva blocco schermo"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Rimuovi sequenza di sblocco"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Rimuovi PIN di sblocco"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Il PIN non può superare %d cifre"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Il PIN deve contenere solo cifre da 0 a 9"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"La password contiene un carattere non valido"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"La password deve contenere almeno una lettera"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"La password deve contenere almeno una cifra"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"La password deve contenere almeno un simbolo"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annulla"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Amministrazione dispositivo"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"Formatta (cancella) la scheda SD"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Non disponibile"</string>
     <string name="read_only" msgid="6702420168629076340">" (Sola lettura)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Smonta scheda SD"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Se smonti la scheda SD, alcune applicazioni in uso si bloccheranno e potrebbero risultare non disponibili finché non rimonterai la scheda SD."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Smontaggio scheda SD non riuscito"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Impossibile smontare la scheda SD. Riprova più tardi."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"La scheda SD verrà smontata. Verifica lo stato nell\'area di notifica."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Smontaggio in corso"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Smontaggio in corso"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stato batteria"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"Nessuna applicazione di terze parti installata."</string>
     <string name="version_text" msgid="9189073826278676425">"versione <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Sposta"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Sposta sul telefono"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Sposta su scheda SD"</string>
     <string name="moving" msgid="6431016143218876491">"Spostamento"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"Spazio di archiviazione rimanente insufficiente."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Applicazione inesistente."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"L\'applicazione è protetta dalla copia."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"La posizione di installazione specificata non è valida."</string>
+    <string name="system_package" msgid="1030561474413022831">"Impossibile installare aggiornamenti di sistema su supporti esterni."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Forza interruzione"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Questa applicazione verrà riavviata immediatamente. Procedere con l\'interruzione forzata?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Sposta applicazione"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Spostamento applicazione non riuscito. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Posizione di installazione preferita"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Cambia la posizione di installazione preferita per nuove applicazioni."</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Servizi in esecuzione"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Impostazioni vocali in uscita"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Riconoscimento vocale"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Impostazioni riconoscimento vocale"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Impostazioni per \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Impostazioni di sintesi vocale"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Impostazioni di sintesi vocale"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usa sempre mie imp."</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c04757e..6dadb75 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"現在地、画面のロック解除、認証情報ストレージのロックを設定します"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"パスワード"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"ロック解除パターンの設定"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"画面ロックを解除するにはパターンの入力が必要"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"ロック解除PINの設定"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"画面ロックを解除するには数値PINの入力が必要"</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"ロック解除パスワードの設定"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"画面ロックを解除するにはパスワードの入力が必要"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"画面ロックをOFFにする"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"ロック解除パターンを削除"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"ロック解除PINを削除"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PINは%d桁以内で指定してください"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PINに使用できるのは数字0～9のみです"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"パスワードに無効な文字が含まれています"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"パスワードには英字が1文字以上必要です"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"パスワードには数字が1つ以上必要です"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"パスワードには記号が1つ以上必要です"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"キャンセル"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"デバイス管理"</string>
@@ -381,7 +400,7 @@
     <string name="wifi_gateway" msgid="163914742461092086">"ゲートウェイ"</string>
     <string name="wifi_netmask" msgid="4520635321425529085">"ネットマスク"</string>
     <string name="wifi_tether_checkbox_text" msgid="796007268580464534">"Wi-Fiテザリング"</string>
-    <string name="wifi_tether_enabled_subtext" msgid="6758080605207549918">"アクセスポンイト<xliff:g id="NETWORK_SSID">%1$s</xliff:g>が有効です"</string>
+    <string name="wifi_tether_enabled_subtext" msgid="6758080605207549918">"アクセスポイント<xliff:g id="NETWORK_SSID">%1$s</xliff:g>が有効です"</string>
     <string name="wifi_tether_failed_subtext" msgid="4379214348183654280">"Wi-Fiテザリングエラー"</string>
     <string name="wifi_tether_settings_text" msgid="8831276059149506799">"Wi-Fiテザリング設定"</string>
     <string name="wifi_tether_settings_subtext" msgid="3415164631321782704">"アクセスポイントのセットアップと管理"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"SDカードをフォーマット（消去）する"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"使用不可"</string>
     <string name="read_only" msgid="6702420168629076340">" （読み取り専用）"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"SDカードのマウント解除"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"SDカードのマウントを解除すると、使用中のアプリケーションの一部が停止し、SDカードを再マウントするまで使用できなくなる場合があります。"</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"SDカードのマウントを解除できません"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"SDカードのマウントを解除できません。しばらくしてからもう一度お試しください。"</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"SDカードのマウントを解除します。ステータスは通知エリアで確認してください。"</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"マウント解除中"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"マウントを解除中"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"電池の状態:"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"サードパーティ製アプリケーションはインストールされていません。"</string>
     <string name="version_text" msgid="9189073826278676425">"バージョン<xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"移動"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"携帯端末に移動"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"SDカードに移動"</string>
     <string name="moving" msgid="6431016143218876491">"移動中"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"ストレージの容量が不足しています。"</string>
+    <string name="does_not_exist" msgid="837163572898468245">"そのアプリケーションは存在しません."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"このアプリケーションはコピー防止機能付きです。"</string>
+    <string name="invalid_location" msgid="4934491353200240499">"指定したインストール先が無効です。"</string>
+    <string name="system_package" msgid="1030561474413022831">"システムアップデートは外部メディアにはインストールできません。"</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"強制停止"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"このアプリケーションはすぐに再起動されます。強制停止してもよろしいですか？"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"アプリケーションを移動"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"アプリケーションを移動できません。<xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"優先インストール先"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"新しいアプリケーションの優先インストール先を変更する"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"実行中のサービス"</string>
@@ -940,8 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"音声出力"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"音声認識装置"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"音声認識装置の設定"</string>
-    <!-- no translation found for recognizer_settings_summary (4472287934134546902) -->
-    <skip />
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"「<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>」の設定"</string>
     <string name="tts_settings" msgid="8186971894801348327">"テキスト読み上げの設定"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"テキスト読み上げの設定"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"常に自分の設定を使用"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 5888abe..606d2a7 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"내 위치, 화면 잠금해제, 자격증명 저장소 잠금 설정"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"비밀번호"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"잠금해제 패턴 설정"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"화면 잠금을 해제하려면 패턴을 그려야 합니다."</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"잠금해제 PIN 설정"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"화면 잠금을 해제하려면 숫자 PIN을 사용해야 합니다."</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"잠금해제 비밀번호 설정"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"화면 잠금을 해제하려면 비밀번호를 사용해야 함"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"화면 잠금 사용 안함"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"잠금해제 패턴 삭제"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"잠금 해제 PIN 삭제"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN은 %d자리 이하여야 합니다."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN에는 숫자 0-9만 사용할 수 있습니다."</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"비밀번호에 잘못된 글자가 들어 있습니다."</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"비밀번호에는 적어도 하나의 문자가 포함되어야 합니다."</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"비밀번호에는 적어도 하나의 숫자가 포함되어야 합니다."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"비밀번호에는 적어도 하나의 기호가 포함되어야 합니다."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"확인"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"취소"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"기기 관리"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"SD 카드 포맷(지우기)"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"사용할 수 없음"</string>
     <string name="read_only" msgid="6702420168629076340">" (읽기전용)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"SD 카드 마운트 해제"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"SD 카드를 마운트 해제하면 사용 중인 일부 응용프로그램이 중지되고 SD 카드를 다시 마운트할 때까지 사용할 수 없게 됩니다."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"SD 카드 마운트 해제 실패\n"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"SD 카드를 마운트 해제할 수 없습니다. 나중에 다시 시도하세요."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"SD 카드가 마운트 해제됩니다. 알림 영역에서 상태를 확인하세요."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"마운트 해제 중"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"마운트 해제 중"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"배터리 상태"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"타사 응용프로그램을 설치하지 않았습니다."</string>
     <string name="version_text" msgid="9189073826278676425">"버전 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"이동"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"휴대전화로 이동"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"SD 카드로 이동"</string>
     <string name="moving" msgid="6431016143218876491">"이동하는 중"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"남은 저장공간이 부족합니다."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"응용프로그램이 없습니다."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"복제가 금지된 응용프로그램입니다."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"지정된 설치 위치가 잘못되었습니다."</string>
+    <string name="system_package" msgid="1030561474413022831">"외부 미디어에 시스템 업데이트를 설치할 수 없습니다. "</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"강제 종료"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"응용프로그램은 바로 다시 시작됩니다. 강제로 종료하시겠습니까?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"응용프로그램 이동"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"응용프로그램을 이동하지 못했습니다. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"기본 설치 위치"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"새 응용프로그램에 대한 기본 설치 위치를 변경합니다."</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"실행 중인 서비스"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"음성 출력"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"음성 인식기"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"음성 인식기 설정"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"\'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\' 설정"</string>
     <string name="tts_settings" msgid="8186971894801348327">"TTS(text-to-speech) 설정"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"TTS(text-to-speech) 설정"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"항상 내 설정 사용"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 5872edd..bca499d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Plassering, skjermlås, SIM-kort-lås"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angi Min posisjon, lås opp skjerm, lås påloggingsopplysninger"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Passord"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Angi opplåsingsmønster"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"Mønsteret må tegnes riktig for å låse opp skjermen"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Angi PIN-kode for opplåsning"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"Skjermen må låses opp med en numerisk PIN-kode"</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Angi passord for opplåsing"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"Skjermen må låses opp med et passord"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Slå av skjermlås"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Fjern opplåsingsmønster"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Fjern PIN-koden for opplåsing"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN-koden kan ikke inneholde mer enn %d tegn"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN-koden kan kun inneholde tall fra 0 til 9"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Passordet inneholder ugydige tegn"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Passordet må inneholde minst én bokstav"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Passordet må inneholde minst ett siffer"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Passordet må inneholde minst ett symbol"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Avbryt"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Enhetsadministrasjon"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"Formater (fjern alt fra) minnekortet"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Ikke tilgjengelig"</string>
     <string name="read_only" msgid="6702420168629076340">" (skrivebeskyttet)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Koble fra SD-kort"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Hvis du kobler fra SD-kortet, virker ikke lenger enkelte av programmene du bruker, og de kan være utilgjengelige inntil du kobler til SD-kortet på nytt."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Fikk ikke koblet fra SD-kort"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Får ikke koblet fra SD-kort. Prøv på nytt senere."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"SD-kortet kobles fra. Kontroller status i varslingsfeltet."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Kobler fra SD-kort"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Frakobling pågår"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"Du har ingen tredjepartsprogrammer installert."</string>
     <string name="version_text" msgid="9189073826278676425">"versjon <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Flytt"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Flytt til telefonen"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Flytt til SD-kort"</string>
     <string name="moving" msgid="6431016143218876491">"Flytter"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"Det er ikke nok lagringsminne."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Programmet fins ikke."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"Programmet er kopibeskyttet."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"Den angitte installasjonsplasseringen er ikke gyldig."</string>
+    <string name="system_package" msgid="1030561474413022831">"Systemoppdateringer kan ikke installeres på eksterne medier."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Tving avslutning"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Programmet startes på nytt med en gang. Er du sikker på at du vil avslutte?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Flytt program"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Fikk ikke flyttet programmet. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Foretrukket installeringssted"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Endre foretrukket plassering for installasjon av nye programmer."</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Kjørende tjenester"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Talestyring"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Talegjenkjenning"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Innstillinger for talegjenkjenning"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Innstillinger for «<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>»"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Talesyntese-kontroller"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Talesyntese-kontroller"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Overstyr innstillinger"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2e2ffcd..6fc8d89 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Mijn locatie\', schermontgrendeling, SIM- en referentieopslagvergrendeling instellen"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"\'Mijn locatie\' instellen, scherm ontgrendelen, opslag van referenties vergrendelen"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Wachtwoorden"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Ontgrendelingspatroon instellen"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"U moet een patroon tekenen om het scherm te ontgrendelen"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"PIN-code voor ontgrendelen instellen"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"U moet een numerieke PIN-code gebruiken om het scherm te ontgrendelen"</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Ontgrendelingswachtwoord instellen"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"U moet een wachtwoord gebruiken om het scherm te ontgrendelen"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Schermvergrendeling uitschakelen"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ontgrendelingspatroon verwijderen"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"PIN-code voor ontgrendelen verwijderen"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN-code mag niet langer zijn dan %d cijfers"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN-code mag alleen de cijfers 0-9 bevatten"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Wachtwoord bevat een ongeldig teken"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Wachtwoord moet ten minste één letter bevatten"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Wachtwoord moet ten minste één cijfer bevatten"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Wachtwoord moet ten minste één symbool bevatten"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Annuleren"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Apparaatbeheer"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"De SD-kaart formatteren (wissen)"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Niet beschikbaar"</string>
     <string name="read_only" msgid="6702420168629076340">" (Alleen-lezen)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"SD-kaart ontkoppelen"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Als u de SD-kaart ontkoppelt, worden bepaalde toepassingen die u gebruikt, gestopt en worden deze mogelijk pas weer beschikbaar wanneer u de SD-kaart opnieuw koppelt."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Ontkoppelen van SD-kaart is mislukt"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Kan SD-kaart niet ontkoppelen. Probeer het later opnieuw."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"SD-kaart wordt ontkoppeld. Controleer het gedeelte met meldingen voor de status."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Ontkoppelen"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Ontkoppelen wordt uitgevoerd"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Accustatus"</string>
@@ -727,27 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"U heeft geen toepassingen van derden geïnstalleerd."</string>
     <string name="version_text" msgid="9189073826278676425">"versie <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Verplaatsen"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Verplaatsen naar telefoon"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Verplaatsen naar SD-kaart"</string>
     <string name="moving" msgid="6431016143218876491">"Verplaatsen"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"Er is niet voldoende opslag beschikbaar."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"De toepassing bestaat niet."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"De toepassing is beveiligd tegen kopiëren."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"De opgegeven installatielocatie is niet geldig."</string>
     <string name="system_package" msgid="1030561474413022831">"Systeemupdates kunnen niet worden geïnstalleerd op externe media."</string>
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Gedwongen stoppen"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Deze toepassing wordt onmiddellijk opnieuw gestart. Weet u zeker dat u gedwongen wilt stoppen?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Toepassing verplaatsen"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Verplaatsen van toepassing is mislukt. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Voorkeursinstallatielocatie"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"De voorkeursinstallatielocatie voor nieuwe toepassingen wijzigen"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Actieve services"</string>
@@ -939,8 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Spraakuitvoer"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Spraakherkenning"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Instellingen voor spraakherkenning"</string>
-    <!-- no translation found for recognizer_settings_summary (4472287934134546902) -->
-    <skip />
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Instellingen voor \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Instellingen voor tekst-naar-spraak"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Instellingen voor tekst-naar-spraak"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Altijd mijn instellingen gebruiken"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 913f8d6..d63d00f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę karty SIM, blokadę magazynu danych logowania."</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ustaw funkcję Moja lokalizacja, odblokowywanie ekranu, blokadę magazynu danych uwierzytelniania"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Hasła"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Ustaw wzór odblokowania"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"Należy narysować wzór, aby odblokować ekran"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Ustaw kod PIN odblokowania"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"Należy użyć numerycznego kodu PIN, aby odblokować ekran"</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Ustaw hasło odblokowania"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"Należy użyć hasła, aby odblokować ekran"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Wyłącz blokadę ekranu"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Usuń wzór odblokowania"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Usuń kod PIN odblokowania"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"Liczba cyfr w kodzie PIN nie może przekraczać %d"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"Kod PIN musi zawierać wyłącznie cyfry 0-9"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Hasło zawiera niedozwolony znak"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Hasło musi zawierać co najmniej jedną literę"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Hasło musi zawierać co najmniej jedną cyfrę"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Hasło musi zawierać co najmniej jeden symbol"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Anuluj"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administracja urządzeniem"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"Formatuj (wymaż) kartę SD"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Niedostępna"</string>
     <string name="read_only" msgid="6702420168629076340">" (Tylko do odczytu)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Odinstaluj kartę SD"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Jeśli odinstalujesz kartę SD, niektóre używane aplikacje zostaną zatrzymane i mogą być niedostępne do chwili jej ponownego zainstalowania."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Odinstalowanie karty SD nie powiodło się"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Nie można odinstalować karty SD. Spróbuj ponownie później."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"Karta SD zostanie odinstalowana. Sprawdź stan w obszarze powiadomień."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Odinstalowywanie"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Odinstalowywanie w toku"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Stan baterii"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"Nie masz zainstalowanych żadnych aplikacji innych firm."</string>
     <string name="version_text" msgid="9189073826278676425">"wersja <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Przenieś"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Przenieś do telefonu"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Przenieś na kartę SD"</string>
     <string name="moving" msgid="6431016143218876491">"Przenoszenie"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"Brak wystarczającej ilości wolnego miejsca."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Aplikacja nie istnieje."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"Ta aplikacja jest zabezpieczona przed kopiowaniem."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"Podane położenie instalacji jest nieprawidłowe."</string>
+    <string name="system_package" msgid="1030561474413022831">"Aktualizacje systemowe nie mogą być instalowane na nośniku zewnętrznym."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Wymuś zatrzymanie"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Ta aplikacja zostanie natychmiast uruchomiona ponownie. Czy na pewno chcesz wymusić zatrzymanie?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Przenieś aplikację"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Przeniesienie aplikacji nie powiodło się. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Preferowana lokalizacja instalacji"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Zmień preferowaną lokalizację instalacji dla nowych aplikacji."</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Uruchomione usługi"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Odtwarzanie głosowe"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Moduł rozpoznawania mowy"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Ustawienia modułu rozpoznawania mowy"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Ustawienia dla „<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>”"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Ustawienia przetwarzania tekstu na mowę"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Ustawienia przetwarzania tekstu na mowę"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Zawsze używaj moich ustawień"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e97b4fd..ecd0da7 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Definir A minha localização, desbloqueio do ecrã, bloqueio do cartão SIM, bloqueio do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir O meu local, desbloqueio do ecrã, bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Palavras-passe"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Definir padrão de desbloqueio"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"É necessário desenhar padrão para desbloquear ecrã"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Definir PIN de desbloqueio"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"É necessário utilizar um PIN numérico para desbloquear o ecrã"</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Definir palavra-passe de desbloqueio"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"É necessário utilizar uma palavra-passe para desbloquear o ecrã"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desactivar bloqueio do ecrã"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remover padrão de desbloqueio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remover PIN de desbloqueio"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"O PIN não pode ter mais de %d dígitos"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"O PIN tem de conter apenas dígitos de 0 a 9"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"A palavra-passe contém um carácter ilegal"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"A palavra-passe tem de conter, pelo menos, uma letra"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"A palavra-passe tem de conter, pelo menos, um dígito"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"A palavra-passe tem de conter, pelo menos, um símbolo"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administração do dispositivo"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"Formatar (apagar) o cartão SD"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Indisponível"</string>
     <string name="read_only" msgid="6702420168629076340">" (Só de leitura)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Desmontar cartão SD"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Se desmontar o cartão SD, algumas aplicações que estiver a utilizar serão paradas e poderão ficar indisponíveis até voltar a montar o cartão SD."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Falha ao desmontar o cartão SD"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Não é possível desmontar o cartão SD. Tente novamente mais tarde."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"O cartão SD será desmontado. Verifique o estado na área de notificação."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"A desmontar"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desmontagem em curso"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Estado da bateria"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"Não tem nenhuma aplicação de terceiros instalada."</string>
     <string name="version_text" msgid="9189073826278676425">"versão <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mover"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Mover para o telefone"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Mover para cartão SD"</string>
     <string name="moving" msgid="6431016143218876491">"A mover"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"Não existe armazenamento suficiente restante."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"A aplicação não existe."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"A aplicação está protegida contra cópia."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"A localização de instalação especificada não é válida."</string>
+    <string name="system_package" msgid="1030561474413022831">"Não é possível instalar actualizações do sistema em suportes de dados externos."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Forçar paragem"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Esta aplicação será reiniciada imediatamente. Tem a certeza de que pretende forçar a paragem?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Mover aplicação"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Falha ao mover a aplicação. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Localização de instalação preferida"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Alterar a localização de instalação preferida para novas aplicações."</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Saída de voz"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Reconhecimento de voz"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Definições de reconhecimento de voz"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Definições para \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Definições de texto para voz"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Definições de texto para voz"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Utilizar sempre as minhas definições"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 9f0df78..0202e7a 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Definir Meu local, desbloqueio de tela, bloqueio do SIM e do armazenamento de credenciais"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Definir o Meu local, o desbloqueio de tela, o bloqueio do armazenamento de credenciais"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Senhas"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Definir padrão de desbloqueio"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"É necessário desenhar o padrão para desbloquear a tela"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Definir PIN de desbloqueio"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"É preciso usar um PIN numérico para desbloquear a tela."</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Definir senha de desbloqueio"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"É preciso usar uma senha para desbloquear a tela."</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Desativar o bloqueio da tela"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Remover padrão de desbloqueio"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Remover PIN de desbloqueio"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"O PIN não pode ter mais do que %d dígitos"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"O PIN precisa conter apenas dígitos de 0 a 9"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"A senha contém um caractere ilegal"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"A senha precisa ter no mínimo uma letra."</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"A senha precisa ter no mínimo um dígito."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"A senha precisa ter no mínimo um símbolo."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Cancelar"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Administração do dispositivo"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"Formatar (apagar) o cartão SD"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Não disponível"</string>
     <string name="read_only" msgid="6702420168629076340">" (Somente leitura)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Desconectar cartão SD"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Se você desconectar o cartão SD, alguns aplicativos que estão em uso serão interrompidos e podem não estar disponíveis até você conectar o cartão SD novamente."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Falha ao desconectar cartão SD"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Não é possível desconectar o cartão SD. Tente novamente mais tarde."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"O cartão SD será desconectado. Verifique a área de notificação para saber o status."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Desconectando"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Desconexão em andamento"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Status da bateria"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"Você não tem aplicativos de terceiros instalados."</string>
     <string name="version_text" msgid="9189073826278676425">"versão <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Mover"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Mover para telefone"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Mover para cartão SD"</string>
     <string name="moving" msgid="6431016143218876491">"Movendo"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"Não há espaço de armazenamento suficiente disponível."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"O aplicativo não existe."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"O aplicativo é protegido contra cópia."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"O local especificado para instalação não é válido."</string>
+    <string name="system_package" msgid="1030561474413022831">"As atualizações do sistema não podem ser instaladas em mídia externa."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Forçar parada"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Este aplicativo será reiniciado imediatamente. Tem certeza de que deseja forçar a parada?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Mover aplicativo"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Falha ao mover aplicativo. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Local de instalação preferido"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Alterar o local de instalação preferido para novos aplicativos."</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Serviços em execução"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Saída de voz"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Reconhecedor de voz"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Configurações do reconhecedor de voz"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Configurações para \'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\'"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Configurações da Conversão de texto em voz"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Configurações da Conversão de texto em voz"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Usar minhas config."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 68c8232..97a77fd 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Пароли"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Установить графический ключ разблокировки"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"Для разблокировки нужно начертить графический ключ"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Установить ПИН-код разблокировки"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"Для разблокировки экрана необходимо использовать цифровой ПИН-код"</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Установить пароль разблокировки"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"Для разблокировки экрана необходимо использовать пароль"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Отключить блокировку экрана"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Удалить графический ключ разблокировки"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Удалить ПИН-код разблокировки"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"ПИН-код не может быть длиннее %d симв."</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"ПИН-код должен состоять только из цифр от 0 до 9"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Пароль содержит недопустимые символы"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Пароль должен содержать хотя бы одну букву."</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Пароль должен содержать хотя бы одну цифру."</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Пароль должен содержать хотя бы один символ."</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"ОК"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Отмена"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Администрирование устройства"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"Форматировать (очистить) карту SD"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Недоступно"</string>
     <string name="read_only" msgid="6702420168629076340">" (только для чтения)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Отключение SD-карты"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Если отключить SD-карту, некоторые используемые приложения перестанут работать и могут оставаться недоступными до подключения SD-карты."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Не удалось отключить SD-карту."</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Не удается отключить SD-карту. Повторите попытку позже."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"SD-карта будет отключена. Проверьте статус в области уведомлений."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Извлечение"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Выполняется извлечение"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Состояние батареи"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"Не обнаружено установленных приложений сторонних разработчиков."</string>
     <string name="version_text" msgid="9189073826278676425">"Версия <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Переместить"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Переместить на телефон"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Переместить на SD-карту"</string>
     <string name="moving" msgid="6431016143218876491">"Перемещение"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"Недостаточно свободной памяти."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Приложение не существует."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"Приложение защищено от копирования."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"Указано недопустимое место установки."</string>
+    <string name="system_package" msgid="1030561474413022831">"Системные обновления не могут быть установлены на внешнем носителе."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Принудительная остановка"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Программа будет перезапущена. Вы действительно хотите выполнить принудительную остановку?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Перемещение приложения"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Не удалось переместить приложение. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Предпочтительное место установки"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Выбор места установки для новых приложений"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Работающие программы"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Голосовой вывод"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Распознавание голоса"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Настройки распознавания речи"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Настройки для <xliff:g id="RECOGNIZER_NAME">%s</xliff:g>"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Настройки синтеза речи"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Настройки синтеза речи"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Всегда использовать мои настройки"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 813e00a..6122bfc 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Ställ in Min plats, skärmupplåsning, lås för SIM-kort och lås för uppgiftslagring"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ställ in Min plats, skärmupplåsning, lås för uppgiftslagring"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Lösenord"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Ange grafiskt lösenord"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"Måste rita grafiskt lösenord för att låsa upp skärmen"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Ställ in PIN-kod för upplåsning"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"Måste använda en numerisk PIN-kod för att låsa upp skärmen"</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Ange lösenord för upplåsning"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"Måste använda ett lösenord för att låsa upp skärmen"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Inaktivera skärmlås"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Ta bort grafiskt lösenord"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Ta bort PIN-kod för upplåsning"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN-koden får inte innehålla fler än %d siffror"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN-koden får bara innehålla siffrorna 0 till 9"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Lösenordet innehåller ett ogiltigt tecken"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Lösenord måste innehålla minst en bokstav"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Lösenord måste innehålla minst en siffra"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Lösenord måste innehålla minst en symbol"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"OK"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"Avbryt"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Enhetsadministration"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"Formatera (radera) SD-kortet"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Inte tillgängligt"</string>
     <string name="read_only" msgid="6702420168629076340">" (Skrivskyddad)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"Montera bort SD-kort"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"Om du monterar bort SD-kortet avbryts några av de program som körs och de kanske inte blir tillgängliga igen förrän du monterar tillbaka SD-kortet."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"Det gick inte att montera bort SD-kort"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"Det går inte att montera bort SD-kort. Försök senare."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"SD-kortet monteras bort. Aktuell status visas i meddelandeområdet."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Monterar bort"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Monterar bort"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Batteristatus"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"Du har inte installerat några program från tredje part."</string>
     <string name="version_text" msgid="9189073826278676425">"version <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Flytta"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Flytta till telefon"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"Flytta till SD-kort"</string>
     <string name="moving" msgid="6431016143218876491">"Flyttar"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"Det finns inte tillräckligt med ledigt minne."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Programmet finns inte."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"Programmet är kopieringsskyddat."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"Den angivna installationsplatsen är inte giltig."</string>
+    <string name="system_package" msgid="1030561474413022831">"Det går inte att installera systemuppdateringar på externa media."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Tvingad avslutning"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Programmet kommer att startas direkt. Vill du framtvinga avslutning?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Flytta program"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Det gick inte att flytta program. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Önskad installationsplats"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Ändra önskad installationsplats för nya program."</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Aktiva tjänster"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Röstutdata"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Röstidentifiering"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Röstidentifieringsinställningar"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"Inställningar för \"<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\""</string>
     <string name="tts_settings" msgid="8186971894801348327">"Text-till-tal-inställningar"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Text-till-tal-inställningar"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Använd alltid mina inställningar"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index e34cc0e..57b72df 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"Konumum, ekran kil. açma, SIM kart kil., kim. bilg. dep.kilidini ayarla"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"Konumum, ekran kilidi açma, kimlik bilgileri deposunun kilidi özelliklerini ayarla"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"Şifreler"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"Kilit açma desenini ayarla"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"Ekran kilidini açmak için desen çizmek gerekir"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"Kilit açma PIN\'ini ayarla"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"Ekran kilidinin açılması için bir sayısal PIN kullanılmalıdır"</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"Kilit açma şifresi ayarla"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"Ekran kilidinin açılması için bir şifre kullanılmalıdır"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"Ekran kilidini kapat"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"Kilit açma desenini kaldır"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"Kilit açma PIN\'ini kaldır"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN, en fazla %d rakamdan oluşabilir"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN yalnızca 0-9 arasındaki rakamları içermelidir"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"Şifre geçersiz bir karakter içeriyor"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"Şifre en az bir harf içermelidir"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"Şifre, en az bir rakam içermelidir"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"Şifre en az bir sembol içermelidir"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"Tamam"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"İptal"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"Cihaz yönetimi"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"SD kartı biçimlendir (sil)"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"Kullanılamıyor"</string>
     <string name="read_only" msgid="6702420168629076340">" (Salt okunur)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"SD kartının bağlantısını kes"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"SD kartı çıkarırsanız, kullanmakta olduğunuz bazı uygulamalar durur ve SD kart yeniden takılıncaya kadar kullanılamayabilir."</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"SD kartın bağlantısı kesilemedi"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"SD kartın bağlantısı kesilemiyor. Daha sonra yeniden deneyin."</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"SD kart çıkarılacak. Durum bilgisi için bildirim alanını kontrol edin."</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"Kaldırılıyor"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"Kaldırma işlemi devam ediyor"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"Pil durumu"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"Yüklenmiş hiçbir üçüncü taraf uygulamalarınız yok."</string>
     <string name="version_text" msgid="9189073826278676425">"sürüm <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"Taşı"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"Telefona taşı"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"SD karta taşı"</string>
     <string name="moving" msgid="6431016143218876491">"Taşınıyor"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"Yeterli depolama alanı kalmadı."</string>
+    <string name="does_not_exist" msgid="837163572898468245">"Uygulama mevcut değil."</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"Uygulama, kopyalamaya karşı korumalıdır."</string>
+    <string name="invalid_location" msgid="4934491353200240499">"Belirtilen yükleme konumu geçerli değil."</string>
+    <string name="system_package" msgid="1030561474413022831">"Sistem güncellemeleri, harici medyaya yüklenemez."</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"Durmaya zorla"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"Bu uygulama hemen yeniden başlatılacak. Durmaya zorlamak istediğinizden emin misiniz?"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"Uygulamayı taşı"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"Uygulama taşınamadı. <xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"Tercih edilen yükleme konumu"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"Yeni uygulamalar için tercih edilen yükleme konumunu değiştirin."</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"Çalışan hizmetler"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"Ses çıkışı"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"Ses tanıyıcı"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"Ses tanıyıcı ayarları"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"\'<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>\' ayarları"</string>
     <string name="tts_settings" msgid="8186971894801348327">"Metin-konuşma ayarları"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"Metin-konuşma ayarları"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"Her zaman benim ayarlarımı kullan"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index e61f47f..7b45065 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -72,7 +72,7 @@
     <!-- no translation found for wifi_status:0 (1922181315419294640) -->
     <!-- no translation found for wifi_status_with_ssid:0 (7714855332363650812) -->
   <string-array name="wifi_security">
-    <item msgid="1435933968767043814">"打开"</item>
+    <item msgid="1435933968767043814">"开放"</item>
     <item msgid="6318432659048829665">"WEP"</item>
     <item msgid="2966395706508338179">"WPA/WPA2 PSK"</item>
     <item msgid="9098390198768443435">"802.1x EAP"</item>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 5196bbb..907eb63 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密码"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"设置解锁图案"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"必须绘制图案才能解锁屏幕"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"设置解锁 PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"必须使用数字 PIN 才能解锁屏幕"</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"设置解锁密码"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"必须使用密码才能解锁屏幕"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"关闭屏幕锁定"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"删除解锁图案"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"删除解锁 PIN"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN 不得超过 %d 位数"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN 只能由 0-9 的数字组成"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"密码包含非法字符"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"密码中至少应包含一个字母"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"密码中至少应包含一个数字"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"密码中至少应包含一个符号"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"确定"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"取消"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"设备管理"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"格式化（清除）SD 卡"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"不可用"</string>
     <string name="read_only" msgid="6702420168629076340">" （只读）"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"卸载 SD 卡"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"如果您卸载 SD 卡，则您当前使用的某些应用程序会停止，而且在您重新安装 SD 卡前可能都无法使用。"</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"无法卸载 SD 卡"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"无法卸载 SD 卡，请稍后重试。"</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"系统将要卸载 SD 卡。请在通知区域查看状态。"</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"正在卸载"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"正在卸载"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"电池状态"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"未安装任何第三方应用程序。"</string>
     <string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"移动"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"移至手机内存"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"移至 SD 卡"</string>
     <string name="moving" msgid="6431016143218876491">"正在移动"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"存储空间不足。"</string>
+    <string name="does_not_exist" msgid="837163572898468245">"该应用程序不存在。"</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"该应用程序受版权保护。"</string>
+    <string name="invalid_location" msgid="4934491353200240499">"指定的安装位置无效。"</string>
+    <string name="system_package" msgid="1030561474413022831">"无法在外部媒体上安装系统更新。"</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"强行停止"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"此应用程序将立即重新启动。您确定要强行停止应用程序吗？"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"移动应用程序"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"无法移动应用程序。<xliff:g id="REASON">%1$s</xliff:g>"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"首选安装位置"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"更改安装新应用程序时使用的首选安装位置"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"正在运行的服务"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"语音输出"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"语音识别程序"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"语音识别程序设置"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"“<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>”的设置"</string>
     <string name="tts_settings" msgid="8186971894801348327">"文字转语音设置"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"文字转语音设置"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"总是使用我的设置"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b4f6fff..110a02c 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -236,12 +236,34 @@
     <string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
     <string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、解除鎖定畫面及鎖定認證儲存空間"</string>
     <string name="security_passwords_title" msgid="2930627259125138363">"密碼"</string>
-    <string name="unlock_set_unlock_pattern_title" msgid="1896502750816432974">"設定解鎖圖形"</string>
-    <string name="unlock_set_unlock_pattern_summary" msgid="1235339327020445576">"必須繪出圖形來解鎖螢幕"</string>
-    <string name="unlock_set_unlock_pin_title" msgid="2206721045699671063">"設定解鎖 PIN"</string>
-    <string name="unlock_set_unlock_pin_summary" msgid="3898840802187521463">"必須輸入數字 PIN 來解鎖螢幕"</string>
-    <string name="unlock_set_unlock_password_title" msgid="2410408982973923603">"設定解鎖密碼"</string>
-    <string name="unlock_set_unlock_password_summary" msgid="4711043487823726994">"必須輸入密碼來解鎖螢幕"</string>
+    <!-- no translation found for lock_settings_picker_title (3973555216065628262) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_title (1129684221223017902) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_summary (1667332113134720845) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_title (6987228635944678726) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_launch_picker_change_summary (2790960639554590668) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_title (3760684669884671990) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_none_summary (2658550480388272618) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_title (2912067603917311700) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pattern_summary (3018395214738645405) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_title (5846029709462329515) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_pin_summary (4131169672844263316) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_title (8775603825675090937) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_password_summary (4623254789833899286) -->
+    <skip />
+    <!-- no translation found for unlock_set_unlock_disabled_summary (736557879526940324) -->
+    <skip />
     <string name="unlock_disable_lock_title" msgid="1427036227416979120">"關閉螢幕鎖定"</string>
     <string name="unlock_disable_lock_pattern_summary" msgid="6801602880568869201">"移除解鎖圖形"</string>
     <string name="unlock_disable_lock_pin_summary" msgid="8856842745366993387">"移除解鎖 PIN"</string>
@@ -257,12 +279,9 @@
     <string name="lockpassword_pin_too_long" msgid="6290317580664119373">"PIN 不得超過 %d 位數"</string>
     <string name="lockpassword_pin_contains_non_digits" msgid="3379277100136600632">"PIN 只能包含數字 0-9"</string>
     <string name="lockpassword_illegal_character" msgid="6204396794254688549">"密碼包含不適用的字元"</string>
-    <!-- no translation found for lockpassword_password_requires_alpha (5668524505560400449) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_digit (4840579514154254907) -->
-    <skip />
-    <!-- no translation found for lockpassword_password_requires_symbol (4140602725865312078) -->
-    <skip />
+    <string name="lockpassword_password_requires_alpha" msgid="5668524505560400449">"密碼必須包含至少 1 個字母"</string>
+    <string name="lockpassword_password_requires_digit" msgid="4840579514154254907">"密碼必須包含至少 1 個數字"</string>
+    <string name="lockpassword_password_requires_symbol" msgid="4140602725865312078">"密碼必須包含至少 1 個符號"</string>
     <string name="lockpassword_ok_label" msgid="313822574062553672">"確定"</string>
     <string name="lockpassword_cancel_label" msgid="8818529276331121899">"取消"</string>
     <string name="device_admin_title" msgid="3562216873644263804">"裝置管理"</string>
@@ -526,16 +545,11 @@
     <string name="sd_format_summary" msgid="6616491027883134004">"將 SD 卡格式化 (清除)"</string>
     <string name="sd_unavailable" msgid="8580107589533213904">"無法取得資訊"</string>
     <string name="read_only" msgid="6702420168629076340">" (唯讀)"</string>
-    <!-- no translation found for dlg_confirm_unmount_title (8612140627310646730) -->
-    <skip />
-    <!-- no translation found for dlg_confirm_unmount_text (5851214273718817727) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_title (4004106918266783081) -->
-    <skip />
-    <!-- no translation found for dlg_error_unmount_text (9188972789897713180) -->
-    <skip />
-    <!-- no translation found for unmount_inform_text (3213378327712151498) -->
-    <skip />
+    <string name="dlg_confirm_unmount_title" msgid="8612140627310646730">"卸載 SD 卡"</string>
+    <string name="dlg_confirm_unmount_text" msgid="5851214273718817727">"如果您將 SD 卡退出，則您正在使用的某些應用程式會停止運作，而且可能無法使用，待您將 SD 卡重新插入才會恢復正常。"</string>
+    <string name="dlg_error_unmount_title" msgid="4004106918266783081">"無法退出 SD 卡"</string>
+    <string name="dlg_error_unmount_text" msgid="9188972789897713180">"無法退出 SD 卡。請稍後再試一次。"</string>
+    <string name="unmount_inform_text" msgid="3213378327712151498">"即將退出 SD 卡。請檢查通知區域，瞭解狀態。"</string>
     <string name="sd_ejecting_title" msgid="8824572198034365468">"正在取出"</string>
     <string name="sd_ejecting_summary" msgid="2028753069184908491">"正在取出"</string>
     <string name="battery_status_title" msgid="9159414319574976203">"電池狀態"</string>
@@ -727,28 +741,18 @@
     <string name="empty_list_msg" msgid="2901049162265094971">"您未安裝任何第三方應用程式。"</string>
     <string name="version_text" msgid="9189073826278676425">"版本 <xliff:g id="VERSION_NUM">%1$s</xliff:g>"</string>
     <string name="move_app" msgid="5042838441401731346">"移動"</string>
-    <!-- no translation found for move_app_to_internal (3895430471913858185) -->
-    <skip />
-    <!-- no translation found for move_app_to_sdcard (1143379049903056407) -->
-    <skip />
+    <string name="move_app_to_internal" msgid="3895430471913858185">"移至手機"</string>
+    <string name="move_app_to_sdcard" msgid="1143379049903056407">"移至 SD 卡"</string>
     <string name="moving" msgid="6431016143218876491">"正在移動"</string>
-    <!-- no translation found for insufficient_storage (8566913062094452962) -->
-    <skip />
-    <!-- no translation found for does_not_exist (837163572898468245) -->
-    <skip />
-    <!-- no translation found for app_forward_locked (5747805144210389585) -->
-    <skip />
-    <!-- no translation found for invalid_location (4934491353200240499) -->
-    <skip />
-    <!-- no translation found for system_package (1030561474413022831) -->
-    <skip />
-    <!-- no translation found for force_stop_dlg_title (4289453224368188476) -->
-    <skip />
+    <string name="insufficient_storage" msgid="8566913062094452962">"剩餘的儲存空間不足。"</string>
+    <string name="does_not_exist" msgid="837163572898468245">"應用程式不存在。"</string>
+    <string name="app_forward_locked" msgid="5747805144210389585">"禁止複製應用程式。"</string>
+    <string name="invalid_location" msgid="4934491353200240499">"所指定的安裝位置無效。"</string>
+    <string name="system_package" msgid="1030561474413022831">"無法將系統更新安裝在外部媒體上。"</string>
+    <string name="force_stop_dlg_title" msgid="4289453224368188476">"強制停止"</string>
     <string name="force_stop_dlg_text" msgid="3381302041569982075">"此應用程式即將重新啟動，確定要強制停止嗎？"</string>
-    <!-- no translation found for move_app_failed_dlg_title (4337731903265156405) -->
-    <skip />
-    <!-- no translation found for move_app_failed_dlg_text (8824246817947643697) -->
-    <skip />
+    <string name="move_app_failed_dlg_title" msgid="4337731903265156405">"移動應用程式"</string>
+    <string name="move_app_failed_dlg_text" msgid="8824246817947643697">"因為 <xliff:g id="REASON">%1$s</xliff:g>，無法移動應用程式。"</string>
     <string name="app_install_location_title" msgid="2068975150026852168">"偏好的安裝位置"</string>
     <string name="app_install_location_summary" msgid="879753854530300436">"變更新應用程式在安裝時的偏好位置。"</string>
     <string name="runningservices_settings_title" msgid="8097287939865165213">"正在運作的服務"</string>
@@ -940,6 +944,7 @@
     <string name="voice_output_category" msgid="2624538587784986229">"語音輸出裝置"</string>
     <string name="recognizer_title" msgid="3231385184559054457">"語音辨識系統"</string>
     <string name="recognizer_settings_title" msgid="6038598099039717232">"語音辨識系統設定"</string>
+    <string name="recognizer_settings_summary" msgid="4472287934134546902">"「<xliff:g id="RECOGNIZER_NAME">%s</xliff:g>」設定"</string>
     <string name="tts_settings" msgid="8186971894801348327">"文字轉語音設定"</string>
     <string name="tts_settings_title" msgid="4182348653053000933">"文字轉語音設定"</string>
     <string name="use_default_tts_settings_title" msgid="1577063839539732930">"永遠使用我的設定"</string>
diff --git a/src/com/android/settings/wifi/WifiApEnabler.java b/src/com/android/settings/wifi/WifiApEnabler.java
index b8b70c6..e907cf7 100644
--- a/src/com/android/settings/wifi/WifiApEnabler.java
+++ b/src/com/android/settings/wifi/WifiApEnabler.java
@@ -88,6 +88,7 @@
 
     public void resume() {
         mContext.registerReceiver(mReceiver, mIntentFilter);
+        enableWifiCheckBox();
         mCheckBox.setOnPreferenceChangeListener(this);
     }
 
@@ -96,6 +97,16 @@
         mCheckBox.setOnPreferenceChangeListener(null);
     }
 
+    private void enableWifiCheckBox() {
+        boolean isAirplaneMode = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.AIRPLANE_MODE_ON, 0) != 0;
+        if(!isAirplaneMode) {
+            mCheckBox.setEnabled(true);
+        } else {
+            mCheckBox.setEnabled(false);
+        }
+    }
+
     public boolean onPreferenceChange(Preference preference, Object value) {
 
         final ContentResolver cr = mContext.getContentResolver();
@@ -182,6 +193,7 @@
                  * broadcast notice
                  */
                 mCheckBox.setChecked(true);
+                /* Doesnt need the airplane check */
                 mCheckBox.setEnabled(true);
                 break;
             case WifiManager.WIFI_AP_STATE_DISABLING:
@@ -191,12 +203,12 @@
             case WifiManager.WIFI_AP_STATE_DISABLED:
                 mCheckBox.setChecked(false);
                 mCheckBox.setSummary(mOriginalSummary);
-                mCheckBox.setEnabled(true);
+                enableWifiCheckBox();
                 break;
             default:
                 mCheckBox.setChecked(false);
                 mCheckBox.setSummary(R.string.wifi_error);
-                mCheckBox.setEnabled(true);
+                enableWifiCheckBox();
         }
     }
 }