summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-af/strings.xml9
-rw-r--r--res/values-en-rGB/strings.xml18
-rw-r--r--res/values-fa/strings.xml9
-rw-r--r--res/values-fi/strings.xml18
-rw-r--r--res/values-it/strings.xml2
-rw-r--r--res/values-ro/strings.xml9
-rw-r--r--res/values-sw/strings.xml9
-rw-r--r--src/com/android/settings/LocationSettings.java5
8 files changed, 25 insertions, 54 deletions
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index c73ac4c..bf70e61 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -751,8 +751,7 @@
<string name="memory_available" msgid="5052397223077021181">"Beskikbaar"</string>
<string name="memory_size" msgid="6629067715017232195">"Totale spasie"</string>
<string name="memory_calculating_size" msgid="2188358544203768588">"Bereken tans…"</string>
- <!-- no translation found for memory_apps_usage (2348501997988663688) -->
- <skip />
+ <string name="memory_apps_usage" msgid="2348501997988663688">"Programme (programdata en media-inhoud)"</string>
<string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
<string name="memory_downloads_usage" msgid="3755173051677533027">"Aflaaisels"</string>
<string name="memory_dcim_usage" msgid="558887013613822577">"Prente, video\'s"</string>
@@ -785,10 +784,8 @@
<string name="unmount_inform_text" product="default" msgid="1904212716075458402">"SD-kaart sal ontheg word."</string>
<string name="sd_ejecting_title" msgid="8824572198034365468">"Onthegting"</string>
<string name="sd_ejecting_summary" msgid="2028753069184908491">"Onthegting besig"</string>
- <!-- no translation found for storage_low_title (1388569749716225155) -->
- <skip />
- <!-- no translation found for storage_low_summary (7737465774892563129) -->
- <skip />
+ <string name="storage_low_title" msgid="1388569749716225155">"Bergingspasie is besig om min te raak"</string>
+ <string name="storage_low_summary" msgid="7737465774892563129">"Sommige stelselfunksies, soos sinkronisasie, werk moontlik nie korrek nie. Probeer om ruimte te skep deur items, soos programme of media-inhoud, te skrap of los te speld."</string>
<string name="storage_menu_usb" msgid="5708207885333243384">"USB-rekenaaraansluiting"</string>
<string name="storage_title_usb" msgid="679612779321689418">"USB-rekenaaraansluiting"</string>
<string name="usb_connection_category" msgid="7805945595165422882">"Koppel as"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 256a163..b4657ec 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -1045,18 +1045,12 @@
<string name="clear_failed_dlg_text" msgid="1092177570631523106">"Couldn\'t clear data for app."</string>
<string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"This app can access the following on your tablet:"</string>
<string name="security_settings_desc" product="default" msgid="61749028818785244">"This app can access the following on your phone:"</string>
- <!-- no translation found for security_settings_desc_multi (7300932212437084403) -->
- <skip />
- <!-- no translation found for security_settings_desc_multi (6610268420793984752) -->
- <skip />
- <!-- no translation found for join_two_items (1336880355987539064) -->
- <skip />
- <!-- no translation found for join_many_items_last (5925635036718502724) -->
- <skip />
- <!-- no translation found for join_many_items_first (4333907712038448660) -->
- <skip />
- <!-- no translation found for join_many_items_middle (7556692394478220814) -->
- <skip />
+ <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"This app can access the following on your tablet. In order to improve performance and reduce memory usage, some of these permissions are available to <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> because it runs in the same process as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+ <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"This app can access the following on your phone. In order to improve performance and reduce memory usage, some of these permissions are available to <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> because it runs in the same process as <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+ <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> and <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
+ <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> and <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
+ <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
+ <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
<string name="computing_size" msgid="1599186977475211186">"Computing…"</string>
<string name="invalid_size_value" msgid="7563537715280712285">"Couldn\'t compute the package size."</string>
<string name="empty_list_msg" msgid="5993162337235907160">"You don\'t have any third-party apps installed."</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7ec81b6..3c53978 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -751,8 +751,7 @@
<string name="memory_available" msgid="5052397223077021181">"موجود"</string>
<string name="memory_size" msgid="6629067715017232195">"کل فضا"</string>
<string name="memory_calculating_size" msgid="2188358544203768588">"در حال محاسبه..."</string>
- <!-- no translation found for memory_apps_usage (2348501997988663688) -->
- <skip />
+ <string name="memory_apps_usage" msgid="2348501997988663688">"برنامه‌ها (داده‌های برنامه و محتوای رسانه)"</string>
<string name="memory_media_usage" msgid="3738830697707880405">"رسانه"</string>
<string name="memory_downloads_usage" msgid="3755173051677533027">"دانلودها"</string>
<string name="memory_dcim_usage" msgid="558887013613822577">"عکس‌ها، ویدیوها"</string>
@@ -785,10 +784,8 @@
<string name="unmount_inform_text" product="default" msgid="1904212716075458402">"کارت SD جدا می شود."</string>
<string name="sd_ejecting_title" msgid="8824572198034365468">"جدا کردن"</string>
<string name="sd_ejecting_summary" msgid="2028753069184908491">"جدا کردن در حال انجام است"</string>
- <!-- no translation found for storage_low_title (1388569749716225155) -->
- <skip />
- <!-- no translation found for storage_low_summary (7737465774892563129) -->
- <skip />
+ <string name="storage_low_title" msgid="1388569749716225155">"فضای ذخیره‌سازی رو به اتمام است"</string>
+ <string name="storage_low_summary" msgid="7737465774892563129">"برخی از عملکردهای سیستم مانند همگام‌سازی ممکن است به نحوه صحیح کار نکنند. با حذف یا لغو پین کردن مواردی همچون برنامه‌ها یا محتوای رسانه، سعی کنید فضا را خالی کنید."</string>
<string name="storage_menu_usb" msgid="5708207885333243384">"اتصال به کامپیوتر با USB"</string>
<string name="storage_title_usb" msgid="679612779321689418">"اتصال به کامپیوتر با USB"</string>
<string name="usb_connection_category" msgid="7805945595165422882">"اتصال به عنوان"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index c97fa32..4872a99 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -1045,18 +1045,12 @@
<string name="clear_failed_dlg_text" msgid="1092177570631523106">"Sovelluksen tietojen poistaminen epäonnistui."</string>
<string name="security_settings_desc" product="tablet" msgid="1292421279262430109">"Tämä sovellus voi käyttää seuraavia tablet-laitteesi ominaisuuksia:"</string>
<string name="security_settings_desc" product="default" msgid="61749028818785244">"Tämä sovellus saa käyttää seuraavia puhelimesi toimintoja:"</string>
- <!-- no translation found for security_settings_desc_multi (7300932212437084403) -->
- <skip />
- <!-- no translation found for security_settings_desc_multi (6610268420793984752) -->
- <skip />
- <!-- no translation found for join_two_items (1336880355987539064) -->
- <skip />
- <!-- no translation found for join_many_items_last (5925635036718502724) -->
- <skip />
- <!-- no translation found for join_many_items_first (4333907712038448660) -->
- <skip />
- <!-- no translation found for join_many_items_middle (7556692394478220814) -->
- <skip />
+ <string name="security_settings_desc_multi" product="tablet" msgid="7300932212437084403">"Tämä sovellus voi käyttää seuraavia tablet-laitteen ominaisuuksia. Tehokkuuden parantamiseksi ja muistin käytön vähentämiseksi <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> saa käyttää joitakin näistä luvista, koska se käyttää samaa prosessia kuin <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+ <string name="security_settings_desc_multi" product="default" msgid="6610268420793984752">"Tämä sovellus voi käyttää seuraavia puhelimen ominaisuuksia. Tehokkuuden parantamiseksi ja muistin käytön vähentämiseksi <xliff:g id="BASE_APP_NAME">%1$s</xliff:g> saa käyttää joitakin näistä luvista, koska se käyttää samaa prosessia kuin <xliff:g id="ADDITIONAL_APPS_LIST">%2$s</xliff:g>:"</string>
+ <string name="join_two_items" msgid="1336880355987539064">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g> ja <xliff:g id="SECOND_ITEM">%2$s</xliff:g>"</string>
+ <string name="join_many_items_last" msgid="5925635036718502724">"<xliff:g id="ALL_BUT_LAST_ITEM">%1$s</xliff:g> ja <xliff:g id="LAST_ITEM_0">%2$s</xliff:g>"</string>
+ <string name="join_many_items_first" msgid="4333907712038448660">"<xliff:g id="FIRST_ITEM">%1$s</xliff:g>, <xliff:g id="ALL_BUT_FIRST_AND_LAST_ITEM">%2$s</xliff:g>"</string>
+ <string name="join_many_items_middle" msgid="7556692394478220814">"<xliff:g id="ADDED_ITEM">%1$s</xliff:g>, <xliff:g id="REST_OF_ITEMS">%2$s</xliff:g>"</string>
<string name="computing_size" msgid="1599186977475211186">"Lasketaan..."</string>
<string name="invalid_size_value" msgid="7563537715280712285">"Paketin koon laskeminen epäonnistui."</string>
<string name="empty_list_msg" msgid="5993162337235907160">"Et ole asentanut yhtään kolmannen osapuolen sovellusta."</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a872aad..7317a94 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -1479,7 +1479,7 @@
<string name="background_data_summary" msgid="8328521479872763452">"Sincron., invio e ricezione dati possibili in ogni momento"</string>
<string name="background_data_dialog_title" msgid="6059217698124786537">"Disatt. dati backgr.?"</string>
<string name="background_data_dialog_message" msgid="6981661606680941633">"La disattivazione dei dati in background aumenta la durata della batteria e riduce l\'utilizzo dei dati. Alcune applicazioni potrebbero utilizzare comunque la connessione dati in background."</string>
- <string name="sync_automatically" msgid="1682730255435062059">"Sincr. automatica dati applicazioni"</string>
+ <string name="sync_automatically" msgid="1682730255435062059">"Sincr. automatica"</string>
<string name="sync_enabled" msgid="4551148952179416813">"Sincronizzazione attiva"</string>
<string name="sync_disabled" msgid="8511659877596511991">"La sincronizzazione non è attiva"</string>
<string name="sync_error" msgid="5060969083117872149">"Errore sincronizz."</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3158db3..2c0f09d 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -751,8 +751,7 @@
<string name="memory_available" msgid="5052397223077021181">"Disponibil"</string>
<string name="memory_size" msgid="6629067715017232195">"Spaţiu total"</string>
<string name="memory_calculating_size" msgid="2188358544203768588">"Se calculează..."</string>
- <!-- no translation found for memory_apps_usage (2348501997988663688) -->
- <skip />
+ <string name="memory_apps_usage" msgid="2348501997988663688">"Aplicaţii (date aplicaţii şi conţinut media)"</string>
<string name="memory_media_usage" msgid="3738830697707880405">"Media"</string>
<string name="memory_downloads_usage" msgid="3755173051677533027">"Descărcări"</string>
<string name="memory_dcim_usage" msgid="558887013613822577">"Imagini, videoclipuri"</string>
@@ -785,10 +784,8 @@
<string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Cardul SD va fi demontat."</string>
<string name="sd_ejecting_title" msgid="8824572198034365468">"În curs de demontare"</string>
<string name="sd_ejecting_summary" msgid="2028753069184908491">"Demontare în curs"</string>
- <!-- no translation found for storage_low_title (1388569749716225155) -->
- <skip />
- <!-- no translation found for storage_low_summary (7737465774892563129) -->
- <skip />
+ <string name="storage_low_title" msgid="1388569749716225155">"Spaţiu de stocare aproape ocupat"</string>
+ <string name="storage_low_summary" msgid="7737465774892563129">"Este posibil ca unele funcţii de sistem, cum ar fi sincronizarea, să nu funcţioneze corect. Încercaţi să eliberaţi spaţiu, ştergând elemente sau anulând fixarea acestora (de ex., aplicaţii sau conţinut media)."</string>
<string name="storage_menu_usb" msgid="5708207885333243384">"Conectare la computer prin USB"</string>
<string name="storage_title_usb" msgid="679612779321689418">"Conectare la computer prin USB"</string>
<string name="usb_connection_category" msgid="7805945595165422882">"Conectaţi-vă ca"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index be62f8b..3c1c08b 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -741,8 +741,7 @@
<string name="memory_available" msgid="5052397223077021181">"Inapatikana"</string>
<string name="memory_size" msgid="6629067715017232195">"Jumla ya nafasi"</string>
<string name="memory_calculating_size" msgid="2188358544203768588">"Inahesabu..."</string>
- <!-- no translation found for memory_apps_usage (2348501997988663688) -->
- <skip />
+ <string name="memory_apps_usage" msgid="2348501997988663688">"Programu (data ya programu na maudhui ya midia)"</string>
<string name="memory_media_usage" msgid="3738830697707880405">"media"</string>
<string name="memory_downloads_usage" msgid="3755173051677533027">"Vipakuzi"</string>
<string name="memory_dcim_usage" msgid="558887013613822577">"Picha, video"</string>
@@ -775,10 +774,8 @@
<string name="unmount_inform_text" product="default" msgid="1904212716075458402">"Kadi ya SD itaanguliwa"</string>
<string name="sd_ejecting_title" msgid="8824572198034365468">"Inaangua"</string>
<string name="sd_ejecting_summary" msgid="2028753069184908491">"Shughuli ya kuanguliwa inaendelea"</string>
- <!-- no translation found for storage_low_title (1388569749716225155) -->
- <skip />
- <!-- no translation found for storage_low_summary (7737465774892563129) -->
- <skip />
+ <string name="storage_low_title" msgid="1388569749716225155">"Nafasi ya kuhafadhi inakwisha"</string>
+ <string name="storage_low_summary" msgid="7737465774892563129">"Baadhi ya vipengee vya mfumo, kama vile ulandanishaji, huenda visifanye kazi vizuri. Jaribu kuweka nafasi kwa kufuta au kubanua vipengee, kama vile programu au maudhui ya midia."</string>
<string name="storage_menu_usb" msgid="5708207885333243384">"Muunganisho wa kompyuta ya USB"</string>
<string name="storage_title_usb" msgid="679612779321689418">"Muunganisho wa kompyuta ya USB"</string>
<string name="usb_connection_category" msgid="7805945595165422882">"Unganisha kama"</string>
diff --git a/src/com/android/settings/LocationSettings.java b/src/com/android/settings/LocationSettings.java
index fe2052c..5301db1 100644
--- a/src/com/android/settings/LocationSettings.java
+++ b/src/com/android/settings/LocationSettings.java
@@ -100,11 +100,6 @@ public class LocationSettings extends SettingsPreferenceFragment
mUseLocation = useLocation;
}
- // Change the summary for wifi-only devices
- if (Utils.isWifiOnly(getActivity())) {
- mNetwork.setSummaryOn(R.string.location_neighborhood_level_wifi);
- }
-
return root;
}
generated by cgit v1.1 at 2025-08-16 16:54:15 +0000