Merge "Add Monkey protection" into ics-mr1
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 0280af5..f2f5205 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD-карта занятая. Каб дазволіць спампаванне, выберыце у апавяшчэнні \"Адключыць USB-назапашвальнiк\"."</string>
<string name="cannot_download" msgid="8150552478556798780">"Можна спампаваць толькі \"HTTP\" або \"HTTPS\" URL."</string>
<string name="download_pending" msgid="2599683668575349559">"Пачатак спампоўвання..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Даведка"</string>
<string name="search_the_web" msgid="6046130189241962337">"Пошук па ўсёй сетцы"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Памяць браўзэра поўная"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Дакранiцеся, каб вызваліць месца."</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 939d7c8..fa35317 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD картата е заета. За да разрешите изтегляния, докоснете „Изключване на USB хранилището“ в известието."</string>
<string name="cannot_download" msgid="8150552478556798780">"Могат да се изтеглят само URL адреси от тип „http“ или „https“."</string>
<string name="download_pending" msgid="2599683668575349559">"Изтеглянето се стартира…"</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Помощ"</string>
<string name="search_the_web" msgid="6046130189241962337">"Търсене в мрежата"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Хранилището на браузъра е пълно"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Докоснете, за да освободите място."</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 7e1d826..1ad875f 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"La targeta SD està ocupada. Per permetre les baixades, toca Desactiva l\'emmagatzematge d\'USB a la notificació."</string>
<string name="cannot_download" msgid="8150552478556798780">"Només pot baixar URL \"http\" o \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"S\'està iniciant la baixada…"</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Ajuda"</string>
<string name="search_the_web" msgid="6046130189241962337">"Cerca al web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"La memòria del navegador és plena"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Toca per alliberar espai."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 162fafa..5057707 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Karta SD je zaneprázdněna. Chcete-li povolit stahování, dotkněte se v oznámení možnosti Vypnout úložiště USB."</string>
<string name="cannot_download" msgid="8150552478556798780">"Lze stahovat pouze adresy URL začínající jako http nebo https."</string>
<string name="download_pending" msgid="2599683668575349559">"Zahájení stahování..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Nápověda"</string>
<string name="search_the_web" msgid="6046130189241962337">"Vyhledat na webu"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Zrušit přístup k poloze"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Dotykem uvolníte místo."</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 8726c3a..71f40a8 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD-kortet er optaget. Vælg \"Slå USB-lagring fra\" i meddelelsen for at tillade downloads."</string>
<string name="cannot_download" msgid="8150552478556798780">"Kan kun downloade webadresser, der starter med \"http\" eller https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Starter download ..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Hjælp"</string>
<string name="search_the_web" msgid="6046130189241962337">"Søg på nettet"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Browserlageret er fuldt"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Tryk for at frigøre plads."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index d4a6288..00b314e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Die SD-Karte ist ausgelastet. Tippen Sie in der Benachrichtigung auf \"USB-Speicher deaktivieren\", um Downloads zuzulassen."</string>
<string name="cannot_download" msgid="8150552478556798780">"Nur Download von URLs mit \"http\" oder \"https\" möglich"</string>
<string name="download_pending" msgid="2599683668575349559">"Download wird gestartet…"</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Hilfe"</string>
<string name="search_the_web" msgid="6046130189241962337">"Im Web suchen"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Browserspeicher voll"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Zur Freigabe von Speicherplatz berühren"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 3e2d2c8..beabfd2 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Η κάρτα SD είναι απασχολημένη. Για να επιτρέψετε τις λήψεις, αγγίξτε την επιλογή \"Απενεργοποίηση χώρου αποθήκευσης USB\" στην ειδοποίηση."</string>
<string name="cannot_download" msgid="8150552478556798780">"Είναι δυνατή η λήψη μόνο διευθύνσεων URL \"http\" ή \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Έναρξη λήψης..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Βοήθεια"</string>
<string name="search_the_web" msgid="6046130189241962337">"Αναζήτηση στον ιστό"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Χώρος αποθήκευσης προγράμματος περιήγησης πλήρης"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Αγγίξτε για να αποδεσμεύσετε χώρο."</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index bc1cf78..7db85bb 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"La tarjeta SD está ocupada. Para permitir descargas, selecciona \"Desactivar almacenamiento USB\" en la notificación."</string>
<string name="cannot_download" msgid="8150552478556798780">"Solo se pueden descargar URL de \"http\" o de \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Iniciando descarga..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Ayuda"</string>
<string name="search_the_web" msgid="6046130189241962337">"Buscar en Internet"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Almacenamiento del navegador lleno"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Toca para liberar espacio."</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 9c8d3fc..af69688 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD-kaart on hõivatud. Allalaadimiste lubamiseks valige teatises käsk „Lülita USB-mäluseade välja”."</string>
<string name="cannot_download" msgid="8150552478556798780">"Alla laadida saab ainult protokolli „http” või „https” sisaldavaid URL-e."</string>
<string name="download_pending" msgid="2599683668575349559">"Allalaadimise alustamine ..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Abi"</string>
<string name="search_the_web" msgid="6046130189241962337">"Otsige veebist"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Brauseri maht täis"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Puudutage vaba ruumi loomiseks."</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index b3bce94..5e8f60a 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD-kortti on varattu. Voit sallia lataukset valitsemalla ilmoituksessa Poista USB-tallennustila käytöstä."</string>
<string name="cannot_download" msgid="8150552478556798780">"Vain http- tai https-URL-osoitteista voi ladata"</string>
<string name="download_pending" msgid="2599683668575349559">"Aloitetaan latausta…"</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Ohje"</string>
<string name="search_the_web" msgid="6046130189241962337">"Verkkohaku"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Selaimen tallennustila täynnä"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Vapauta tilaa koskettamalla."</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 88834ec..bce533c 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"La carte SD n\'est pas disponible. Pour autoriser les téléchargements, appuyez sur \"Désactiver la mémoire de stockage USB\" dans la notification."</string>
<string name="cannot_download" msgid="8150552478556798780">"Vous ne pouvez télécharger que des URL de type \"http\" et \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Début du téléchargement..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Aide"</string>
<string name="search_the_web" msgid="6046130189241962337">"Rechercher sur le Web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Espace de stockage du navigateur saturé"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Appuyez pour libérer de l\'espace."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index d463e50..50dfb53 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD कार्ड व्यस्त है. डाउनलोड की अनुमति देने के लिए, सूचना में USB संग्रहण बंद करें स्पर्श करें."</string>
<string name="cannot_download" msgid="8150552478556798780">"केवल \"http\" या \"https\" URL डाउनलोड कर सकता है."</string>
<string name="download_pending" msgid="2599683668575349559">"डाउनलोड प्रारंभ कर रहा है…"</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"सहायता"</string>
<string name="search_the_web" msgid="6046130189241962337">"वेब पर खोजें"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"ब्राउज़र संग्रहण भर गया है"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"स्थान खाली करने के लिए स्पर्श करें."</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c57136c..008c05d 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD kartica je zauzeta. Kako biste omogućili preuzimanja, dodirnite \"Isključi USB pohranu\" u obavijesti."</string>
<string name="cannot_download" msgid="8150552478556798780">"Mogu se preuzeti samo \"http\" ili \"https\" URL-ovi."</string>
<string name="download_pending" msgid="2599683668575349559">"Početak preuzimanja…"</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Pomoć"</string>
<string name="search_the_web" msgid="6046130189241962337">"Pretraži web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Pohrana preglednika puna"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Dodirnite za oslobađanje prostora."</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d8602b1..718f936 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Kartu SD sibuk. Untuk mengizinkan unduhan, sentuh Matikan penyimpanan USB pada pemberitahuan."</string>
<string name="cannot_download" msgid="8150552478556798780">"Hanya dapat mengunduh URL \"http\" atau \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Memulai unduhan..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Bantuan"</string>
<string name="search_the_web" msgid="6046130189241962337">"Telusuri web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Penyimpanan peramban penuh"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Sentuh untuk mengosongkan ruang."</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index dca8aef..4c4dac0 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD kortelė užimta. Jei norite leisti atsisiuntimus, pranešime palieskite „Išjungti USB atmintinę“."</string>
<string name="cannot_download" msgid="8150552478556798780">"Galima atsisiųsti tik „http“ ar „https“ prasidedančius URL."</string>
<string name="download_pending" msgid="2599683668575349559">"Pradedamas atsisiuntimas..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Pagalba"</string>
<string name="search_the_web" msgid="6046130189241962337">"Ieškoti žiniatinklyje"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Naršyklės saugykla pilna"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Palieskite, jei norite atlaisvinti vietos."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 160ced9..2e31833 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD karte ir aizņemta. Lai atļautu lejupielādes, paziņojumā pieskarieties iespējai Izslēgt USB atmiņu."</string>
<string name="cannot_download" msgid="8150552478556798780">"Var lejupielādēt tikai tādus vietrāžus URL, kuri sākas ar “http” vai “https”."</string>
<string name="download_pending" msgid="2599683668575349559">"Notiek lejupielādes sākšana..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Palīdzība"</string>
<string name="search_the_web" msgid="6046130189241962337">"Meklēšana tīmeklī"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Pārlūkprogrammas krātuve ir pilna."</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Pieskarieties, lai atbrīvotu vietu."</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 21412f2..b6b0b48 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"De SD-kaart is in gebruik. Als u downloads wilt toestaan, raakt u \'USB-opslag uitschakelen\' in de melding aan."</string>
<string name="cannot_download" msgid="8150552478556798780">"Kan alleen URL\'s met \'http\' of \'https\' downloaden."</string>
<string name="download_pending" msgid="2599683668575349559">"Downloaden starten..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Help"</string>
<string name="search_the_web" msgid="6046130189241962337">"Zoeken op internet"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Browseropslag is vol"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Tik om ruimte vrij te maken."</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 48411c0..e4873c6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -267,7 +267,7 @@
<string name="pref_font_size_category" msgid="6683754355084218254">"Rozmiar tekstu"</string>
<string name="pref_lab_title" msgid="5571091610359629423">"Laboratorium"</string>
<string name="pref_lab_quick_controls" msgid="3267606522082281367">"Szybkie sterowanie"</string>
- <string name="pref_lab_quick_controls_summary" msgid="3149664132600968775">"Przesuń palcem od bocznej krawędzi, aby w opcjach ukryć paski aplikacji i URL"</string>
+ <string name="pref_lab_quick_controls_summary" msgid="3149664132600968775">"Przesuń palcem od bocznej krawędzi, by wyświetlić ukryte opcje sterowania i pasek adresu"</string>
<string name="pref_use_instant_search" msgid="1119176077760723740">"Wyszukiwanie dynamiczne Google"</string>
<string name="pref_use_instant_search_summary" msgid="839320474961917522">"Użyj wyszukiwania dynamicznego Google, aby uzyskiwać wyniki podczas pisania (może być pobierana większa ilość danych)."</string>
<string name="pref_lab_fullscreen" msgid="8173609016657987973">"Pełny ekran"</string>
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Karta SD jest zajęta. Aby umożliwić pobieranie, w powiadomieniu dotknij Wyłącz nośnik USB."</string>
<string name="cannot_download" msgid="8150552478556798780">"Pobieranie jest możliwe tylko z adresów „http” lub „https”."</string>
<string name="download_pending" msgid="2599683668575349559">"Rozpoczynanie pobierania"</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Pomoc"</string>
<string name="search_the_web" msgid="6046130189241962337">"Szukaj w internecie"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Pamięć przeglądarki jest pełna"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Dotknij, aby zwolnić miejsce."</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e9f8265..1093de7 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"O cartão SD está ocupado. Para permitir downloads, toque em Desativar armazenamento USB na notificação."</string>
<string name="cannot_download" msgid="8150552478556798780">"Somente é possível fazer download de URLs \"http\" ou \"https\""</string>
<string name="download_pending" msgid="2599683668575349559">"Iniciando download…"</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Ajuda"</string>
<string name="search_the_web" msgid="6046130189241962337">"Pesquisar na web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Armazenamento do navegador cheio"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Toque para liberar espaço."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index dc1063a..f5f44f2 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Cardul SD este ocupat. Pentru a permite descărcări, atingeţi în notificare opţiunea „Dezactivaţi stocarea USB”."</string>
<string name="cannot_download" msgid="8150552478556798780">"Puteţi descărca numai de la adrese URL care încep cu „http” sau „https”."</string>
<string name="download_pending" msgid="2599683668575349559">"Se începe descărcarea..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Ajutor"</string>
<string name="search_the_web" msgid="6046130189241962337">"Căutaţi pe web"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Spaţiul de stocare pentru browser este insuficient"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Atingeţi pentru a elibera spaţiu."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 361b6be..39453d0 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -184,7 +184,7 @@
<string name="autofill_setup_dialog_message" msgid="1096164985825394616">"Браузер может автоматически заполнять такие веб-формы. Включить автозаполнение?"</string>
<string name="autofill_setup_dialog_negative_toast" msgid="3288881675232206984">"Автозаполнение можно настроить в общих настройках браузера."</string>
<string name="disable_autofill" msgid="8305901059849400354">"Отключить автозаполнение"</string>
- <string name="pref_privacy_security_title" msgid="3480313968942160914">"Конфиденциальность и безопасность"</string>
+ <string name="pref_privacy_security_title" msgid="3480313968942160914">"Личные данные"</string>
<string name="pref_privacy_clear_cache" msgid="3380316479925886998">"Очистить кэш"</string>
<string name="pref_privacy_clear_cache_summary" msgid="2216463577207991454">"Удалить контент и данные, сохраненные браузером"</string>
<string name="pref_privacy_clear_cache_dlg" msgid="4344512581716422465">"Удалить контент и базы данных, сохраненные локально?"</string>
@@ -213,7 +213,7 @@
<string name="pref_security_remember_passwords_summary" msgid="256388703356349137">"Сохранять имена пользователей и пароли веб-сайтов"</string>
<string name="pref_security_save_form_data" msgid="1213669802810198893">"Сохранять данные форм"</string>
<string name="pref_security_save_form_data_summary" msgid="4994074685153708026">"Запоминать введенные в формы данные для дальнейшего использования"</string>
- <string name="pref_security_show_security_warning" msgid="8901135676266754559">"Предупреждать об опасности"</string>
+ <string name="pref_security_show_security_warning" msgid="8901135676266754559">"Сообщать об опасности"</string>
<string name="pref_security_show_security_warning_summary" msgid="5260098316025397525">"Сообщать о проблемах с безопасностью сайтов"</string>
<string name="pref_security_accept_cookies" msgid="3201367661925047989">"Разрешить cookie"</string>
<string name="pref_security_accept_cookies_summary" msgid="1907951236154433751">"Разрешить сайтам сохранять и читать файлы cookie"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 272f969..1a5155d 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Karta SD je zaneprázdnená. Ak chcete povoliť preberanie, dotknite sa v upozornení možnosti Vypnúť ukladací priestor USB."</string>
<string name="cannot_download" msgid="8150552478556798780">"Môžete prevziať len adresy URL začínajúce na „http“ alebo „https“."</string>
<string name="download_pending" msgid="2599683668575349559">"Prebieha spustenie preberania..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Pomocník"</string>
<string name="search_the_web" msgid="6046130189241962337">"Hľadať na webe"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Pamäť prehliadača je plná"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Dotykom uvoľníte miesto."</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 38aee29..463ef30 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD картица је заузета. Да бисте омогућили преузимања, у оквиру обавештења додирните Искључи USB меморију."</string>
<string name="cannot_download" msgid="8150552478556798780">"Могуће је преузети само URL адресе које садрже „http“ или „https“."</string>
<string name="download_pending" msgid="2599683668575349559">"Покретање преузимања…"</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Помоћ"</string>
<string name="search_the_web" msgid="6046130189241962337">"Претражи Веб"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Складиште прегледача је пуно"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Додирните да бисте ослободили простор."</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 9fd8e8c..b4b2c2c 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD-kortet är upptaget. Om du vill tillåta hämtning väljer du Inaktivera USB-lagring i meddelandet."</string>
<string name="cannot_download" msgid="8150552478556798780">"Det går bara att hämta webbadresser som inleds med http eller https."</string>
<string name="download_pending" msgid="2599683668575349559">"Startar hämtning…"</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Hjälp"</string>
<string name="search_the_web" msgid="6046130189241962337">"Sök på webben"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Webbläsarens lagringsutrymme är fullt"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Tryck här om du vill frigöra utrymme."</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 22e9fa0..bbed841 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"Kadi ya SD inashughuli. Kuruhusu vipakuzi, gusa \"Zima Hifadhi ya USB\" katika arifa."</string>
<string name="cannot_download" msgid="8150552478556798780">"Inaweza kupakua tu URLs za \"http\" au \"https\"."</string>
<string name="download_pending" msgid="2599683668575349559">"Inaanza kupakua..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Msaada"</string>
<string name="search_the_web" msgid="6046130189241962337">"Tafuta wavuti"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Hifadhi ya kivinjari imejaa"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Gusaa ili kupata nafasi."</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index acaf8f0..81136f1 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD kart meşgul. İndirme işlemlerine izin vermek için bildirim alanında USB Depolama Birimini Kapat seçeneğine dokunun."</string>
<string name="cannot_download" msgid="8150552478556798780">"Yalnızca \"http\" veya \"https\" URL\'leri indirilebilir."</string>
<string name="download_pending" msgid="2599683668575349559">"İndirme işlemi başlatılıyor…"</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"Yardım"</string>
<string name="search_the_web" msgid="6046130189241962337">"Web\'de ara"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"Tarayıcı deposu dolu"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"Yer boşaltmak için dokunun."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 2f296da..3e2c628 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD 卡正忙。要允许下载，请在通知中触摸“关闭 USB 存储设备”。"</string>
<string name="cannot_download" msgid="8150552478556798780">"只能从“http”或“https”网址下载。"</string>
<string name="download_pending" msgid="2599683668575349559">"正在开始下载..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"帮助"</string>
<string name="search_the_web" msgid="6046130189241962337">"搜索网页"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"浏览器存储空间已满"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"触摸可释放空间。"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b841947..126c165 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -313,8 +313,7 @@
<string name="download_sdcard_busy_dlg_msg" product="default" msgid="2629425950473358591">"SD 卡忙碌中。如要允許下載，請輕觸通知中的 [關閉 USB 儲存裝置]。"</string>
<string name="cannot_download" msgid="8150552478556798780">"僅可下載「http」或「https」網址的檔案。"</string>
<string name="download_pending" msgid="2599683668575349559">"正在開始下載..."</string>
- <!-- no translation found for help_page (2906208423557552540) -->
- <skip />
+ <string name="help_page" msgid="2906208423557552540">"說明"</string>
<string name="search_the_web" msgid="6046130189241962337">"搜尋網頁"</string>
<string name="webstorage_outofspace_notification_title" msgid="1160474608059771788">"瀏覽器儲存空間已滿"</string>
<string name="webstorage_outofspace_notification_text" msgid="47273584426988640">"輕觸即可釋放儲存空間。"</string>
diff --git a/src/com/android/browser/BrowserSettings.java b/src/com/android/browser/BrowserSettings.java
index e2a521a..0b8191a 100644
--- a/src/com/android/browser/BrowserSettings.java
+++ b/src/com/android/browser/BrowserSettings.java
@@ -301,6 +301,13 @@
// enable smooth transition for better performance during panning or
// zooming
settings.setEnableSmoothTransition(true);
+ // WebView should be preserving the memory as much as possible.
+ // However, apps like browser wish to turn on the performance mode which
+ // would require more memory.
+ // TODO: We need to dynamically allocate/deallocate temporary memory for
+ // apps which are trying to use minimal memory. Currently, double
+ // buffering is always turned on, which is unnecessary.
+ settings.setProperty(WebViewProperties.gfxUseMinimalMemory, "false");
// disable content url access
settings.setAllowContentAccess(false);
diff --git a/src/com/android/browser/WebViewProperties.java b/src/com/android/browser/WebViewProperties.java
index c410038..c662957 100644
--- a/src/com/android/browser/WebViewProperties.java
+++ b/src/com/android/browser/WebViewProperties.java
@@ -19,4 +19,5 @@
static final String gfxInvertedScreen = "inverted";
static final String gfxInvertedScreenContrast = "inverted_contrast";
static final String gfxEnableCpuUploadPath = "enable_cpu_upload_path";
+ static final String gfxUseMinimalMemory = "use_minimal_memory";
}