merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 9d1e67d..5a5ec90 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -825,7 +825,7 @@
<string name="memory_available_read_only" msgid="6497534390167920206">"Tersedia (hanya baca)"</string>
<string name="memory_size" msgid="6629067715017232195">"Total ruang"</string>
<string name="memory_calculating_size" msgid="2188358544203768588">"Menghitung..."</string>
- <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikasi (konten media & data aplikasi)"</string>
+ <string name="memory_apps_usage" msgid="2348501997988663688">"Aplikasi (data & konten media)"</string>
<string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
<string name="memory_downloads_usage" msgid="3755173051677533027">"Unduhan"</string>
<string name="memory_dcim_usage" msgid="558887013613822577">"Gambar, video"</string>
@@ -991,7 +991,7 @@
<string name="use_location_title" msgid="5206937465504979977">"Lokasi & penelusuran Google"</string>
<string name="use_location_summary" msgid="3978805802386162520">"Izinkan Google menggunakan lokasi Anda untuk meningkatkan hasil penelusuran dan layanan lainnya"</string>
<string name="location_access_title" msgid="7064108942964081243">"Akses ke lokasi saya"</string>
- <string name="location_access_summary" msgid="69031404093194341">"Mengizinkan aplikasi yang telah meminta izin Anda untuk menggunakan informasi lokasi"</string>
+ <string name="location_access_summary" msgid="69031404093194341">"Aplikasi yang telah meminta izin boleh memakai informasi lokasi"</string>
<string name="location_sources_heading" msgid="1278732419851088319">"Sumber lokasi"</string>
<string name="about_settings" product="tablet" msgid="593457295516533765">"Tentang tablet"</string>
<string name="about_settings" product="default" msgid="1743378368185371685">"Tentang ponsel"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 3741134..225adc8 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -48,7 +48,7 @@
<string name="radioInfo_service_out" msgid="5238736759641916278">"Haitoi huduma"</string>
<string name="radioInfo_service_emergency" msgid="2485604591272668370">"Simu za dharura pekee"</string>
<string name="radioInfo_service_off" msgid="1434084741785525415">"Radio imezimwa"</string>
- <string name="radioInfo_roaming_in" msgid="9045363884600341051">"urandaji"</string>
+ <string name="radioInfo_roaming_in" msgid="9045363884600341051">"Uko nje ya mtandao wako wa kawaida"</string>
<string name="radioInfo_roaming_not" msgid="2851853244069662307">"Hairandi"</string>
<string name="radioInfo_phone_idle" msgid="7489244938838742820">"Hafanyi kitu"</string>
<string name="radioInfo_phone_ringing" msgid="4883724645684297895">"Inalia"</string>
@@ -574,14 +574,14 @@
<string name="wifi_show_advanced" msgid="1793703023711426246">"Onyesha chaguo za kindani"</string>
<string name="wifi_wps_setup_title" msgid="8207552222481570175">"Usanidi Uliolindwa na Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Inaanzisha WPS ..."</string>
- <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Bonyeza kitufe Kilicholindwa cha Usanidi wa Wi-Fi kwenye kipanga njia chako. Huenda kinaitwa \"WPS\" au kina ishara hii:"</string>
+ <string name="wifi_wps_onstart_pbc" msgid="5940801028985255304">"Bonyeza kitufe Kilicholindwa cha Usanidi wa Wi-Fi kwenye kisambaza data chako. Huenda kinaitwa \"WPS\" au kina ishara hii:"</string>
<string name="wifi_wps_onstart_pin" msgid="223344506445335358">"Weka pin <xliff:g id="NUMBER">%1$s</xliff:g> kwenye kisambaza data chako cha Wi-Fi. Huenda usanidi ukachukua hadi dakika mbili kabla ukamilike."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS imefanikiwa. Inaunganisha kwenye mtandao..."</string>
<string name="wifi_wps_connected" msgid="7153432445748931183">"Umeunganishwa kwenye mtandao-hewa wa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
<string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS tayari inaendelea na inaweza kuchukua hadi dakika mbili kukamilika"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS imeshindwa. Tafadhali jaribu tena baada ya dakika chache."</string>
- <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Mpangilio wa usalama wa kipanga njia pasiwaya (WEP) hauauniwi."</string>
- <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Mpangilio wa usalama wa kipanga njia pasiwaya (TKIP) hauauniwi."</string>
+ <string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Mpangilio wa usalama wa kisambaza data kisichotumia waya (WEP) hauwezi kutumika."</string>
+ <string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Mpangilio wa usalama wa kisambaza data kisichotumia waya (TKIP) hauwezi kutumika."</string>
<string name="wifi_wps_failed_auth" msgid="1174614355181181958">"Imeshindwa kuthibitisha. Tafadhali jaribu tena."</string>
<string name="wifi_wps_failed_overlap" msgid="5159533685596844778">"Kipindi kingine cha WPS kimegunduliwa. Tafadhali jaribu tena baada ya dakika chache."</string>
<string name="wifi_ssid" msgid="641393708309146745">"Mtandao wa SSID"</string>
@@ -817,7 +817,7 @@
<string name="memory_available_read_only" msgid="6497534390167920206">"Inapatikana (soma-tu)"</string>
<string name="memory_size" msgid="6629067715017232195">"Jumla ya nafasi"</string>
<string name="memory_calculating_size" msgid="2188358544203768588">"Inahesabu..."</string>
- <string name="memory_apps_usage" msgid="2348501997988663688">"Programu (data ya programu na maudhui ya media)"</string>
+ <string name="memory_apps_usage" msgid="2348501997988663688">"Programu (data na maudhui ya media)"</string>
<string name="memory_media_usage" msgid="3738830697707880405">"media"</string>
<string name="memory_downloads_usage" msgid="3755173051677533027">"Vipakuliwa"</string>
<string name="memory_dcim_usage" msgid="558887013613822577">"Picha, video"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index a820b05..0acc328 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -749,7 +749,7 @@
<string name="screensaver_settings_summary_dock" msgid="2072657401664633283">"Yuvadayken"</string>
<string name="screensaver_settings_summary_off" msgid="2481581696365146473">"Kapalı"</string>
<string name="screensaver_settings_disabled_prompt" msgid="3857507943322777651">"Telefon yuvaya yerleştirildiğinde ve/veya uyku durumunda iken ne olacağını kontrol etmek için Hafif Uyku\'yu etkinleştirin."</string>
- <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Hafif uykuya geçilecek zaman"</string>
+ <string name="screensaver_settings_when_to_dream" msgid="8352267826043957746">"Geçiş koşulu"</string>
<string name="screensaver_settings_dream_start" msgid="4998187847985120168">"Şimdi başla"</string>
<string name="screensaver_settings_button" msgid="7292214707625717013">"Ayarlar"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index a223e20..7ec01aa 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -943,8 +943,8 @@
public void onResume() {
super.onResume();
mActivityResumed = true;
- updateNumTabs();
updateCurrentTab(mViewPager.getCurrentItem());
+ updateNumTabs();
updateOptionsMenu();
}
