From 7f37c30b713e29494f00c85916fc4fee246f2936 Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Mon, 17 Jun 2013 09:14:19 -0700 Subject: [PATCH 1/3] Import translations. DO NOT MERGE Change-Id: I7da4461fe8f9c64191a5e0c46ae6d5ad4d7293a1 Auto-generated-cl: translation import --- res/values-in/strings.xml | 2 +- res/values-sw/strings.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 9d1e67d842e..1cb52854ca1 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -825,7 +825,7 @@ "Tersedia (hanya baca)" "Total ruang" "Menghitung..." - "Aplikasi (konten media & data aplikasi)" + "Aplikasi (data & konten media)" "Media" "Unduhan" "Gambar, video" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 3741134a13e..82b5aa7f988 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -574,14 +574,14 @@ "Onyesha chaguo za kindani" "Usanidi Uliolindwa na Wi-Fi" "Inaanzisha WPS ..." - "Bonyeza kitufe Kilicholindwa cha Usanidi wa Wi-Fi kwenye kipanga njia chako. Huenda kinaitwa \"WPS\" au kina ishara hii:" + "Bonyeza kitufe Kilicholindwa cha Usanidi wa Wi-Fi kwenye kisambaza data chako. Huenda kinaitwa \"WPS\" au kina ishara hii:" "Weka pin %1$s kwenye kisambaza data chako cha Wi-Fi. Huenda usanidi ukachukua hadi dakika mbili kabla ukamilike." "WPS imefanikiwa. Inaunganisha kwenye mtandao..." "Umeunganishwa kwenye mtandao-hewa wa Wi-Fi %s" "WPS tayari inaendelea na inaweza kuchukua hadi dakika mbili kukamilika" "WPS imeshindwa. Tafadhali jaribu tena baada ya dakika chache." - "Mpangilio wa usalama wa kipanga njia pasiwaya (WEP) hauauniwi." - "Mpangilio wa usalama wa kipanga njia pasiwaya (TKIP) hauauniwi." + "Mpangilio wa usalama wa kisambaza data kisichotumia waya (WEP) hauwezi kutumika." + "Mpangilio wa usalama wa kisambaza data kisichotumia waya (TKIP) hauwezi kutumika." "Imeshindwa kuthibitisha. Tafadhali jaribu tena." "Kipindi kingine cha WPS kimegunduliwa. Tafadhali jaribu tena baada ya dakika chache." "Mtandao wa SSID" From 80a0d9a37c4c70c538bce0ae7bc2fd83339e15ac Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Wed, 19 Jun 2013 12:40:06 -0700 Subject: [PATCH 2/3] Import translations. DO NOT MERGE Change-Id: Ia1811e28f847bc50278d40cfe989e2fa284d0f12 Auto-generated-cl: translation import --- res/values-in/strings.xml | 2 +- res/values-sw/strings.xml | 4 ++-- res/values-tr/strings.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 1cb52854ca1..5a5ec90a2dd 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -991,7 +991,7 @@ "Lokasi & penelusuran Google" "Izinkan Google menggunakan lokasi Anda untuk meningkatkan hasil penelusuran dan layanan lainnya" "Akses ke lokasi saya" - "Mengizinkan aplikasi yang telah meminta izin Anda untuk menggunakan informasi lokasi" + "Aplikasi yang telah meminta izin boleh memakai informasi lokasi" "Sumber lokasi" "Tentang tablet" "Tentang ponsel" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 82b5aa7f988..225adc813f5 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -48,7 +48,7 @@ "Haitoi huduma" "Simu za dharura pekee" "Radio imezimwa" - "urandaji" + "Uko nje ya mtandao wako wa kawaida" "Hairandi" "Hafanyi kitu" "Inalia" @@ -817,7 +817,7 @@ "Inapatikana (soma-tu)" "Jumla ya nafasi" "Inahesabu..." - "Programu (data ya programu na maudhui ya media)" + "Programu (data na maudhui ya media)" "media" "Vipakuliwa" "Picha, video" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index a820b057a5e..0acc328e5cb 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -749,7 +749,7 @@ "Yuvadayken" "Kapalı" "Telefon yuvaya yerleştirildiğinde ve/veya uyku durumunda iken ne olacağını kontrol etmek için Hafif Uyku\'yu etkinleştirin." - "Hafif uykuya geçilecek zaman" + "Geçiş koşulu" "Şimdi başla" "Ayarlar" "Otomatik parlaklık" From f5f08628cc0129e92277d6ddfcf6ae680887573d Mon Sep 17 00:00:00 2001 From: Dianne Hackborn Date: Wed, 19 Jun 2013 17:01:51 -0700 Subject: [PATCH 3/3] Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps We need to resume the current tab before checking to see if there are any disabled apps and deciding from that the number of tabs to show. Change-Id: I95037f15ff7a97f0234143d10ebcee79224a3114 --- src/com/android/settings/applications/ManageApplications.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index a223e20aad8..7ec01aa60e0 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -943,8 +943,8 @@ public class ManageApplications extends Fragment implements public void onResume() { super.onResume(); mActivityResumed = true; - updateNumTabs(); updateCurrentTab(mViewPager.getCurrentItem()); + updateNumTabs(); updateOptionsMenu(); }