am 5e34f2b6: (-s ours) Import translations. DO NOT MERGE
* commit '5e34f2b6ce70b574fc4c258d70fd841e6f86a8e5':
Import translations. DO NOT MERGE
diff --git a/Android.mk b/Android.mk
index 023e0c0..d615547 100644
--- a/Android.mk
+++ b/Android.mk
@@ -10,6 +10,8 @@
$(call all-java-files-under, src) \
src/com/android/settings/EventLogTags.logtags
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
LOCAL_PACKAGE_NAME := Settings
LOCAL_CERTIFICATE := platform
LOCAL_PRIVILEGED_MODULE := true
@@ -18,9 +20,11 @@
LOCAL_AAPT_FLAGS += -c zz_ZZ
+include frameworks/opt/setupwizard/navigationbar/common.mk
+
include $(BUILD_PACKAGE)
-# Use the folloing include to make our test apk.
+# Use the following include to make our test apk.
ifeq (,$(ONE_SHOT_MAKEFILE))
include $(call all-makefiles-under,$(LOCAL_PATH))
endif
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b96f75b..c8362f0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -168,6 +168,7 @@
</activity>
<activity android:name=".wifi.WifiSetupActivity"
+ android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardWifiTheme"
android:label="@string/wifi_setup_wizard_title"
android:icon="@drawable/empty_icon"
@@ -1512,7 +1513,8 @@
android:excludeFromRecents="true"
android:theme="@style/Theme.CryptKeeper"
android:configChanges="keyboard|keyboardHidden|uiMode"
- android:windowSoftInputMode="adjustResize">
+ android:windowSoftInputMode="adjustResize"
+ android:screenOrientation="nosensor">
<intent-filter android:priority="10">
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.HOME" />
diff --git a/res/drawable-hdpi/ic_bt_config.png b/res/drawable-hdpi/ic_bt_config.png
index 939a14d..a204936 100644
--- a/res/drawable-hdpi/ic_bt_config.png
+++ b/res/drawable-hdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_settings_accounts.png b/res/drawable-hdpi/ic_settings_accounts.png
new file mode 100644
index 0000000..cdeb8b0
--- /dev/null
+++ b/res/drawable-hdpi/ic_settings_accounts.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_wifi_emptystate.png b/res/drawable-hdpi/ic_wifi_emptystate.png
new file mode 100644
index 0000000..0192537
--- /dev/null
+++ b/res/drawable-hdpi/ic_wifi_emptystate.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_bt_config.png b/res/drawable-mdpi/ic_bt_config.png
index c2d7876..d266b39 100644
--- a/res/drawable-mdpi/ic_bt_config.png
+++ b/res/drawable-mdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_settings_accounts.png b/res/drawable-mdpi/ic_settings_accounts.png
new file mode 100644
index 0000000..65008ce
--- /dev/null
+++ b/res/drawable-mdpi/ic_settings_accounts.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_wifi_emptystate.png b/res/drawable-mdpi/ic_wifi_emptystate.png
new file mode 100644
index 0000000..15f8df8
--- /dev/null
+++ b/res/drawable-mdpi/ic_wifi_emptystate.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_bt_config.png b/res/drawable-xhdpi/ic_bt_config.png
index 6fec792..46077be 100644
--- a/res/drawable-xhdpi/ic_bt_config.png
+++ b/res/drawable-xhdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_settings_accounts.png b/res/drawable-xhdpi/ic_settings_accounts.png
new file mode 100644
index 0000000..8538036
--- /dev/null
+++ b/res/drawable-xhdpi/ic_settings_accounts.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_wifi_emptystate.png b/res/drawable-xhdpi/ic_wifi_emptystate.png
new file mode 100644
index 0000000..7853cb0
--- /dev/null
+++ b/res/drawable-xhdpi/ic_wifi_emptystate.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_bt_config.png b/res/drawable-xxhdpi/ic_bt_config.png
index fc3600e..ad964b4 100644
--- a/res/drawable-xxhdpi/ic_bt_config.png
+++ b/res/drawable-xxhdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_settings_accounts.png b/res/drawable-xxhdpi/ic_settings_accounts.png
new file mode 100644
index 0000000..6371c62
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_settings_accounts.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_wifi_emptystate.png b/res/drawable-xxhdpi/ic_wifi_emptystate.png
new file mode 100644
index 0000000..6f47efb
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_wifi_emptystate.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_bt_config.png b/res/drawable-xxxhdpi/ic_bt_config.png
index bbefb4a..e89d484 100644
--- a/res/drawable-xxxhdpi/ic_bt_config.png
+++ b/res/drawable-xxxhdpi/ic_bt_config.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_settings_accounts.png b/res/drawable-xxxhdpi/ic_settings_accounts.png
new file mode 100644
index 0000000..d1c389b
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_settings_accounts.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_wifi_emptystate.png b/res/drawable-xxxhdpi/ic_wifi_emptystate.png
new file mode 100644
index 0000000..9975f68
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_wifi_emptystate.png
Binary files differ
diff --git a/res/layout-land/dashboard_tile.xml b/res/layout-land/dashboard_tile.xml
new file mode 100644
index 0000000..a817799
--- /dev/null
+++ b/res/layout-land/dashboard_tile.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/dashboard_tile_minimum_height">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:layout_weight="1">
+
+ <ImageView
+ android:id="@+id/icon"
+ android:layout_width="@dimen/dashboard_tile_image_size"
+ android:layout_height="@dimen/dashboard_tile_image_size"
+ android:scaleType="centerInside"
+ android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
+ android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <TextView android:id="@+id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="@style/TextAppearance.TileTitle"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal" />
+
+ <TextView android:id="@+id/status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/title"
+ android:layout_alignStart="@android:id/title"
+ android:textAppearance="@style/TextAppearance.Small"
+ android:textColor="?android:attr/textColorSecondary" />
+
+ </RelativeLayout>
+
+ </LinearLayout>
+
+ <View android:id="@+id/tile_divider"
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="?android:attr/dividerVertical" />
+
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout-sw600dp/dashboard_tile.xml b/res/layout-sw600dp/dashboard_tile.xml
new file mode 100644
index 0000000..a817799
--- /dev/null
+++ b/res/layout-sw600dp/dashboard_tile.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:minHeight="@dimen/dashboard_tile_minimum_height">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dp"
+ android:orientation="horizontal"
+ android:gravity="center_vertical"
+ android:layout_weight="1">
+
+ <ImageView
+ android:id="@+id/icon"
+ android:layout_width="@dimen/dashboard_tile_image_size"
+ android:layout_height="@dimen/dashboard_tile_image_size"
+ android:scaleType="centerInside"
+ android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
+ android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <TextView android:id="@+id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="@style/TextAppearance.TileTitle"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal" />
+
+ <TextView android:id="@+id/status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/title"
+ android:layout_alignStart="@android:id/title"
+ android:textAppearance="@style/TextAppearance.Small"
+ android:textColor="?android:attr/textColorSecondary" />
+
+ </RelativeLayout>
+
+ </LinearLayout>
+
+ <View android:id="@+id/tile_divider"
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="?android:attr/dividerVertical" />
+
+ </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/account_type_preference.xml b/res/layout/account_type_preference.xml
new file mode 100644
index 0000000..f7ba859
--- /dev/null
+++ b/res/layout/account_type_preference.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/accountTypeIcon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:contentDescription="@null" />
diff --git a/res/layout/trust_agent_settings.xml b/res/layout/advanced_security_settings.xml
similarity index 91%
rename from res/layout/trust_agent_settings.xml
rename to res/layout/advanced_security_settings.xml
index 952d967..149b49b 100644
--- a/res/layout/trust_agent_settings.xml
+++ b/res/layout/advanced_security_settings.xml
@@ -18,21 +18,28 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="vertical">
+
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1">
+
<ListView android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:drawSelectorOnTop="false"
android:fastScrollEnabled="true" />
+
<TextView android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/no_trust_agents"
android:textAppearance="?android:attr/textAppearanceMedium" />
+
</FrameLayout>
+
</LinearLayout>
diff --git a/res/layout/android_beam.xml b/res/layout/android_beam.xml
index 4c9acc2..5683840 100644
--- a/res/layout/android_beam.xml
+++ b/res/layout/android_beam.xml
@@ -15,10 +15,11 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
- android:paddingStart="6dip"
- android:paddingEnd="6dip"
- android:layout_width="match_parent" android:layout_height="wrap_content"
- android:scrollbars="vertical" >
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:scrollbars="vertical"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<ScrollView
android:layout_width="match_parent"
diff --git a/res/layout/apn_disallowed_preference_screen.xml b/res/layout/apn_disallowed_preference_screen.xml
new file mode 100644
index 0000000..6ac8137
--- /dev/null
+++ b/res/layout/apn_disallowed_preference_screen.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/listContainer"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <ListView android:id="@android:id/list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:drawSelectorOnTop="false"
+ android:scrollbarStyle="insideOverlay"
+ android:background="@android:color/white"
+ android:cacheColorHint="@android:color/white"
+ android:fadingEdgeLength="16dip" />
+
+ <TextView android:id="@android:id/empty"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:text="@string/apn_settings_not_available"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/apn_preference_layout.xml b/res/layout/apn_preference_layout.xml
index b79b0b9..8938f29 100644
--- a/res/layout/apn_preference_layout.xml
+++ b/res/layout/apn_preference_layout.xml
@@ -22,7 +22,7 @@
android:gravity="center_vertical">
<RelativeLayout
- android:id="@+android:id/text_layout"
+ android:id="@+id/text_layout"
android:layout_width="0dip"
android:layout_height="match_parent"
android:paddingStart="8dip"
@@ -53,7 +53,7 @@
<RadioButton
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+android:id/apn_radiobutton"
+ android:id="@+id/apn_radiobutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dip"
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index 08042a9..9f5ae55 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -18,8 +18,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="8dip"
android:paddingBottom="8dip"
android:columnCount="3">
@@ -28,9 +26,10 @@
android:id="@android:id/icon"
android:layout_width="@android:dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size"
+ android:layout_gravity="center"
+ android:scaleType="fitXY"
android:layout_rowSpan="3"
android:layout_marginEnd="8dip"
- android:scaleType="centerInside"
android:contentDescription="@null" />
<TextView
diff --git a/res/layout/battery_history_chart.xml b/res/layout/battery_history_chart.xml
index 48eb7ed..0e3cf88 100644
--- a/res/layout/battery_history_chart.xml
+++ b/res/layout/battery_history_chart.xml
@@ -26,7 +26,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:id="@+android:id/battery_history_chart"
+ android:id="@+id/battery_history_chart"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#ff000000"
app:headerAppearance="?android:attr/textAppearanceMedium"
diff --git a/res/layout/credentials_disallowed_preference_screen.xml b/res/layout/credentials_disallowed_preference_screen.xml
new file mode 100644
index 0000000..c4e8934
--- /dev/null
+++ b/res/layout/credentials_disallowed_preference_screen.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/listContainer"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <ListView android:id="@android:id/list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:drawSelectorOnTop="false"
+ android:scrollbarStyle="insideOverlay"
+ android:background="@android:color/white"
+ android:cacheColorHint="@android:color/white"
+ android:fadingEdgeLength="16dip" />
+
+ <TextView android:id="@android:id/empty"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:text="@string/credentials_settings_not_available"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml
index 39e64b0..9015613 100644
--- a/res/layout/crypt_keeper_status.xml
+++ b/res/layout/crypt_keeper_status.xml
@@ -21,7 +21,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
>
@@ -36,17 +36,18 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/enter_password"
android:drawableLeft="@*android:drawable/ic_lock_idle_lock"
+ android:layout_gravity="center_horizontal"
/>
<TextView
android:id="@+id/owner_info"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
+ android:layout_marginStart="8dip"
+ android:layout_marginEnd="8dip"
android:singleLine="true"
android:ellipsize="marquee"
android:marqueeRepeatLimit ="marquee_forever"
- android:scrollHorizontally="true"
- android:gravity="center"
android:textSize="16sp"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
diff --git a/res/layout/dashboard.xml b/res/layout/dashboard.xml
index 7917c96..3c5fc88 100644
--- a/res/layout/dashboard.xml
+++ b/res/layout/dashboard.xml
@@ -18,16 +18,20 @@
android:id="@+id/dashboard"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingStart="@dimen/dashboard_padding_start"
- android:paddingEnd="@dimen/dashboard_padding_end"
- android:paddingBottom="@dimen/dashboard_padding_bottom"
android:scrollbarStyle="outsideOverlay"
+ android:paddingStart="@dimen/dashboard_side_margin"
+ android:paddingEnd="@dimen/dashboard_side_margin"
+ android:clipToPadding="false"
android:background="@color/dashboard_background_color">
<LinearLayout
android:id="@+id/dashboard_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingStart="@dimen/dashboard_padding_start"
+ android:paddingEnd="@dimen/dashboard_padding_end"
+ android:paddingTop="@dimen/dashboard_padding_top"
+ android:paddingBottom="@dimen/dashboard_padding_bottom"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
/>
diff --git a/res/layout/dashboard_category.xml b/res/layout/dashboard_category.xml
index afa038b..01afa5d 100644
--- a/res/layout/dashboard_category.xml
+++ b/res/layout/dashboard_category.xml
@@ -18,12 +18,17 @@
android:id="@+id/category"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:paddingStart="@dimen/dashboard_category_padding_start"
+ android:paddingEnd="@dimen/dashboard_category_padding_end"
+ android:orientation="vertical"
+ android:background="@android:color/white"
+ android:layout_marginBottom="8dip"
+ android:elevation="@dimen/dashboard_category_elevation">
<TextView android:id="@+id/category_title"
android:layout_width="match_parent"
android:layout_height="@dimen/dashboard_category_title_height"
- android:layout_marginStart="@dimen/dashboard_category_title_margin_start"
+ android:paddingStart="@dimen/dashboard_category_title_margin_start"
android:singleLine="true"
android:ellipsize="marquee"
android:gravity="center_vertical"
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index a0049be..aa1d00e 100644
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -17,7 +17,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
+ android:layout_height="wrap_content"
android:gravity="center_vertical"
android:minHeight="@dimen/dashboard_tile_minimum_height">
@@ -27,31 +27,49 @@
android:layout_height="@dimen/dashboard_tile_image_size"
android:scaleType="centerInside"
android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
- android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
- />
+ android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end" />
- <RelativeLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1" >
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
- <TextView android:id="@+id/title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:textAppearance="@style/TextAppearance.TileTitle"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="0dip"
+ android:orientation="vertical"
+ android:gravity="center_vertical"
+ android:layout_weight="1">
- <TextView android:id="@+id/status"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@android:id/title"
- android:layout_alignStart="@android:id/title"
- android:textAppearance="@style/TextAppearance.Small"
- android:textColor="?android:attr/textColorSecondary"
- />
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
- </RelativeLayout>
+ <TextView android:id="@+id/title"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textAppearance="@style/TextAppearance.TileTitle"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal" />
+
+ <TextView android:id="@+id/status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_below="@id/title"
+ android:layout_alignStart="@android:id/title"
+ android:textAppearance="@style/TextAppearance.Small"
+ android:textColor="?android:attr/textColorSecondary" />
+
+ </RelativeLayout>
+
+ </LinearLayout>
+
+ <View android:id="@+id/tile_divider"
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="?android:attr/dividerVertical" />
+
+ </LinearLayout>
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
index cec2af2..76cfc6d 100644
--- a/res/layout/data_usage_chart.xml
+++ b/res/layout/data_usage_chart.xml
@@ -54,7 +54,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="start|bottom"
- settings:strokeColor="#d88d3a"
+ settings:strokeColor="@color/theme_accent"
settings:fillColor="#c0ba7f3e"
settings:fillColorSecondary="#60ba7f3e" />
diff --git a/res/layout/data_usage_cycles.xml b/res/layout/data_usage_cycles.xml
index 2a67d6b..02aa567 100644
--- a/res/layout/data_usage_cycles.xml
+++ b/res/layout/data_usage_cycles.xml
@@ -19,9 +19,7 @@
android:layout_width="match_parent"
android:layout_height="40dip"
android:orientation="horizontal"
- android:gravity="center_vertical"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+ android:gravity="center_vertical">
<TextView
android:layout_width="wrap_content"
diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml
index 6826764..3bca030 100644
--- a/res/layout/data_usage_detail.xml
+++ b/res/layout/data_usage_detail.xml
@@ -55,7 +55,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dip"
- android:textColor="#d88d3a"
+ android:textColor="@color/theme_accent"
android:text="@string/data_usage_label_foreground"
android:textAlignment="viewStart" />
@@ -63,7 +63,7 @@
android:id="@+id/app_foreground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textColor="#d88d3a"
+ android:textColor="@color/theme_accent"
android:textAlignment="viewStart" />
<TextView
diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml
index 0a8006b..bc92c34 100644
--- a/res/layout/data_usage_header.xml
+++ b/res/layout/data_usage_header.xml
@@ -19,7 +19,9 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:clipChildren="false"
- android:clipToPadding="false">
+ android:clipToPadding="false"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<FrameLayout
android:id="@+id/network_switches_container"
diff --git a/res/layout/data_usage_item.xml b/res/layout/data_usage_item.xml
index fac3c6b..6f496d5 100644
--- a/res/layout/data_usage_item.xml
+++ b/res/layout/data_usage_item.xml
@@ -16,7 +16,9 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content">
+ android:layout_height="wrap_content"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<include layout="@layout/app_percentage_item" />
diff --git a/res/layout/device_admin_item.xml b/res/layout/device_admin_item.xml
index 56be346..102cc16 100644
--- a/res/layout/device_admin_item.xml
+++ b/res/layout/device_admin_item.xml
@@ -22,24 +22,21 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
- android:paddingEnd="6dip"
- android:paddingStart="6dip"
android:gravity="center_vertical" >
<LinearLayout
android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:minWidth="64dip"
+ android:layout_height="wrap_content"
android:gravity="center"
- android:padding="8dip"
android:orientation="horizontal">
+
<ImageView
android:id="@+id/icon"
android:layout_width="@android:dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size"
android:layout_gravity="center_vertical"
- android:contentDescription="@null"
- />
+ android:contentDescription="@null" />
+
</LinearLayout>
<RelativeLayout
@@ -70,12 +67,11 @@
</RelativeLayout>
- <CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+ <CheckBox
android:id="@+id/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_marginEnd="16dip"
android:layout_marginStart="16dip"
android:focusable="false"
android:clickable="false" />
diff --git a/res/layout/device_admin_settings.xml b/res/layout/device_admin_settings.xml
index 669ac3c..b89f48b 100644
--- a/res/layout/device_admin_settings.xml
+++ b/res/layout/device_admin_settings.xml
@@ -18,20 +18,28 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
+
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0px"
android:layout_weight="1">
+
<ListView android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:scrollbarStyle="outsideOverlay"
android:drawSelectorOnTop="false"
android:fastScrollEnabled="true" />
+
<TextView android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/no_device_admins"
android:textAppearance="?android:attr/textAppearanceMedium" />
+
</FrameLayout>
+
</LinearLayout>
diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml
index e8dd824..7ed26cb 100644
--- a/res/layout/dream_info_row.xml
+++ b/res/layout/dream_info_row.xml
@@ -15,7 +15,9 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content" >
+ android:layout_height="wrap_content"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<!-- Dream selectable row (icon, caption, radio button) -->
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index 347c12b..5b923fc 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -27,6 +27,8 @@
android:id="@+id/all_details"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingBottom="5dip"
android:orientation="vertical">
@@ -35,8 +37,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:paddingStart="?android:attr/listPreferredItemPaddingStart"
- android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="vertical">
<!-- Application snippet label, version and icon -->
diff --git a/res/layout/lock_to_app_instructions.xml b/res/layout/lock_to_app_instructions.xml
new file mode 100644
index 0000000..dfe0970
--- /dev/null
+++ b/res/layout/lock_to_app_instructions.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <LinearLayout
+ android:id="@+id/instructions_area"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:paddingLeft="@dimen/switchbar_subsettings_margin_start"
+ android:paddingRight="@dimen/screen_margin_sides">
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:paddingTop="@dimen/lock_to_app_textview_padding"
+ android:text="@string/lock_to_app_description"
+ android:textAppearance="@style/TextAppearance.Medium"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/lock_to_app_textview_padding"
+ android:text="@string/lock_to_app_start_step1"
+ android:textAppearance="@style/TextAppearance.Medium"
+ />
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/lock_to_app_textview_padding"
+ android:text="@string/lock_to_app_start_step2"
+ android:textAppearance="@style/TextAppearance.Medium"
+ />
+
+ <TextView
+ android:id="@+id/lock_to_app_start_step3"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingBottom="@dimen/lock_to_app_textview_padding"
+ android:paddingTop="@dimen/lock_to_app_textview_padding"
+ android:text="@string/lock_to_app_start_step3"
+ android:textAppearance="@style/TextAppearance.Medium"
+ />
+
+ </LinearLayout>
+
+ <ListView
+ android:id="@android:id/list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"/>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index 6f4bf10..ce2b6c6 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -70,10 +70,7 @@
android:layout_weight="0"
android:layout_marginTop="-20dp"
android:textAppearance="?android:attr/textAppearanceSmallInverse"
- android:textColor="#ccc"
- android:shadowColor="#000"
- android:shadowRadius="5"
- android:textStyle="bold"
+ android:textColor="?android:attr/textColorPrimary"
android:singleLine="true"
android:text="@string/internal_storage" />
<TextView android:id="@+id/freeStorageText"
diff --git a/res/layout/master_clear_disallowed_screen.xml b/res/layout/master_clear_disallowed_screen.xml
new file mode 100644
index 0000000..80326ca
--- /dev/null
+++ b/res/layout/master_clear_disallowed_screen.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/listContainer"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <ListView android:id="@android:id/list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:drawSelectorOnTop="false"
+ android:scrollbarStyle="insideOverlay"
+ android:background="@android:color/white"
+ android:cacheColorHint="@android:color/white"
+ android:fadingEdgeLength="16dip" />
+
+ <TextView android:id="@android:id/empty"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:text="@string/master_clear_not_available"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/notification_app_list.xml b/res/layout/notification_app_list.xml
index 9d23a54..2c5ab40 100644
--- a/res/layout/notification_app_list.xml
+++ b/res/layout/notification_app_list.xml
@@ -18,7 +18,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:orientation="vertical" >
+ android:orientation="vertical"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart">
<ListView
android:id="@android:id/list"
diff --git a/res/layout/ownerinfo.xml b/res/layout/ownerinfo.xml
index 938fd96..b38e3f0 100644
--- a/res/layout/ownerinfo.xml
+++ b/res/layout/ownerinfo.xml
@@ -14,15 +14,17 @@
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="vertical"
- android:paddingStart="6dip"
- android:paddingEnd="6dip"
- android:layout_width="match_parent" android:layout_height="wrap_content"
android:scrollbars="vertical" >
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:scrollbarStyle="outsideOverlay"
android:fillViewport="true">
<LinearLayout
diff --git a/res/layout/power_usage_detail_item_text.xml b/res/layout/power_usage_detail_item_text.xml
index 9c9c72c..04b48b8 100644
--- a/res/layout/power_usage_detail_item_text.xml
+++ b/res/layout/power_usage_detail_item_text.xml
@@ -18,6 +18,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
+
<!--Label for the item-->
<TextView
android:id="@+id/label"
@@ -31,8 +32,8 @@
android:layout_toStartOf="@+id/value"
android:layout_marginBottom="4dip"
android:layout_marginTop="4dip"
- android:layout_marginStart="4dip"
android:layout_marginEnd="4dip"/>
+
<TextView
android:id="@+id/value"
android:layout_width="wrap_content"
@@ -42,6 +43,6 @@
android:textStyle="normal"
android:singleLine="true"
android:layout_marginBottom="4dip"
- android:layout_marginTop="4dip"
- android:layout_marginEnd="10dip"/>
+ android:layout_marginTop="4dip" />
+
</RelativeLayout>
diff --git a/res/layout/power_usage_details.xml b/res/layout/power_usage_details.xml
index ca65863..a383a37 100644
--- a/res/layout/power_usage_details.xml
+++ b/res/layout/power_usage_details.xml
@@ -25,6 +25,8 @@
android:id="@+id/all_details"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="5dip"
android:paddingBottom="5dip"
android:orientation="vertical">
@@ -33,61 +35,62 @@
<!-- Force stop and report buttons -->
<LinearLayout
- android:id="@+id/two_buttons_panel"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="6dip"
- android:orientation="vertical">
+ android:id="@+id/two_buttons_panel"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="6dip"
+ android:orientation="vertical">
<include
- layout="@layout/two_buttons_panel"/>
+ layout="@layout/two_buttons_panel"/>
</LinearLayout>
-
+
<TextView
- style="?android:attr/listSeparatorTextViewStyle"
- android:text="@string/details_subtitle" />
+ style="?android:attr/listSeparatorTextViewStyle"
+ android:text="@string/details_subtitle" />
<LinearLayout
- android:id="@+id/details"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="6dip"
- android:orientation="vertical">
+ android:id="@+id/details"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="6dip"
+ android:orientation="vertical">
<!-- Insert detail items here -->
</LinearLayout>
<LinearLayout
- android:id="@+id/controls"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
+ android:id="@+id/controls"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
<TextView
- android:id="@+id/controls_title"
- style="?android:attr/listSeparatorTextViewStyle"
- android:layout_marginTop="6dip"
- android:text="@string/controls_subtitle" />
+ android:id="@+id/controls_title"
+ style="?android:attr/listSeparatorTextViewStyle"
+ android:layout_marginTop="6dip"
+ android:text="@string/controls_subtitle" />
<!-- Controls go here ... -->
</LinearLayout>
-
+
<TextView
- android:id="@+id/packages_section_title"
- style="?android:attr/listSeparatorTextViewStyle"
- android:layout_marginTop="6dip"
- android:text="@string/packages_subtitle" />
+ android:id="@+id/packages_section_title"
+ style="?android:attr/listSeparatorTextViewStyle"
+ android:layout_marginTop="6dip"
+ android:text="@string/packages_subtitle" />
<LinearLayout
- android:id="@+id/packages_section"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="6dip"
- android:orientation="vertical">
+ android:id="@+id/packages_section"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="6dip"
+ android:orientation="vertical">
<!-- Insert detail items here -->
</LinearLayout>
+
</LinearLayout>
</ScrollView>
diff --git a/res/layout/preference.xml b/res/layout/preference.xml
index ef4444a..9645679 100644
--- a/res/layout/preference.xml
+++ b/res/layout/preference.xml
@@ -19,8 +19,6 @@
android:layout_height="wrap_content"
android:minHeight="48dip"
android:gravity="center_vertical"
- android:paddingStart="@*android:dimen/preference_item_padding_side"
- android:paddingEnd="?android:attr/scrollbarSize"
android:background="?android:attr/selectableItemBackground">
<RelativeLayout
diff --git a/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml b/res/layout/preference_app_percentage.xml
similarity index 63%
rename from res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
rename to res/layout/preference_app_percentage.xml
index 1777eda..7dc9d46 100644
--- a/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
+++ b/res/layout/preference_app_percentage.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2006 The Android Open Source Project
+<!-- Copyright (C) 2014 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -16,14 +16,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center_vertical"
- android:paddingEnd="?android:attr/scrollbarSize">
+ android:layout_height="match_parent"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
- <LinearLayout android:id="@+android:id/widget_frame"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- android:orientation="vertical" />
+ <include layout="@layout/app_percentage_item" />
</LinearLayout>
diff --git a/res/layout/preference_batteryhistory.xml b/res/layout/preference_batteryhistory.xml
index 723b0e1..8697059 100644
--- a/res/layout/preference_batteryhistory.xml
+++ b/res/layout/preference_batteryhistory.xml
@@ -19,13 +19,18 @@
android:layout_height="wrap_content"
android:orientation="vertical"
android:minHeight="@dimen/battery_history_chart_height">
+
<include layout="@layout/battery_history_chart" />
+
<TextView android:id="@+id/labelsHeader"
android:layout_width="match_parent"
android:layout_height="48dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="14sp"
android:textColor="?android:attr/colorControlActivated"
- android:gravity="left|center_vertical"
- android:text="@string/power_usage_list_summary" />
+ android:gravity="start|center_vertical"
+ android:text="@string/power_usage_list_summary"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" />
+
</LinearLayout>
diff --git a/res/layout/preference_bluetooth.xml b/res/layout/preference_bluetooth.xml
index 5a7aee5..17ee70c 100644
--- a/res/layout/preference_bluetooth.xml
+++ b/res/layout/preference_bluetooth.xml
@@ -19,16 +19,6 @@
android:layout_height="wrap_content"
android:gravity="center_vertical">
- <!-- Divider -->
- <ImageView
- android:id="@+id/divider"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:src="@drawable/nav_divider"
- android:contentDescription="@null"
- />
-
<!-- Details button -->
<ImageView
android:id="@+id/deviceDetails"
diff --git a/res/layout/preference_inputmethod.xml b/res/layout/preference_inputmethod.xml
index 589ddc9..9e3d5e3 100644
--- a/res/layout/preference_inputmethod.xml
+++ b/res/layout/preference_inputmethod.xml
@@ -18,8 +18,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical">
+
<LinearLayout
android:id="@+id/inputmethod_pref"
android:layout_width="wrap_content"
@@ -29,19 +32,23 @@
android:clickable="true"
android:focusable="true"
android:background="?android:attr/selectableItemBackground">
+
<LinearLayout
android:id="@android:id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:orientation="vertical" />
+
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginStart="15dip"
android:layout_marginEnd="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
+
<TextView
android:id="@+android:id/title"
android:layout_width="wrap_content"
@@ -50,6 +57,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:ellipsize="marquee"
android:fadingEdge="horizontal"/>
+
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
@@ -63,14 +71,18 @@
android:textColor="?android:attr/textColorSecondary"
android:focusable="false"
android:maxLines="4" />
+
</RelativeLayout>
+
</LinearLayout>
+
<View
android:layout_width="2dip"
android:layout_height="match_parent"
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
android:background="@android:drawable/divider_horizontal_dark" />
+
<ImageView
android:id="@+id/inputmethod_settings"
android:layout_width="wrap_content"
@@ -83,4 +95,5 @@
android:clickable="true"
android:focusable="true"
android:background="?android:attr/selectableItemBackground" />
+
</LinearLayout>
diff --git a/res/layout/preference_linearcolor.xml b/res/layout/preference_linearcolor.xml
index 754558d..f3abb9c 100644
--- a/res/layout/preference_linearcolor.xml
+++ b/res/layout/preference_linearcolor.xml
@@ -17,7 +17,8 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
- android:paddingEnd="?android:attr/scrollbarSize">
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<com.android.settings.applications.LinearColorBar
android:id="@+id/linear_color_bar"
android:layout_width="match_parent"
@@ -31,4 +32,5 @@
android:shadowDx="2"
android:shadowDy="2">
</com.android.settings.applications.LinearColorBar>
+
</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/preference_memoryusage.xml b/res/layout/preference_memoryusage.xml
index ddc619d..6503333 100644
--- a/res/layout/preference_memoryusage.xml
+++ b/res/layout/preference_memoryusage.xml
@@ -20,8 +20,8 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
- android:paddingEnd="?android:attr/scrollbarSize"
- android:paddingStart="@*android:dimen/preference_widget_width">
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<com.android.settings.deviceinfo.PercentageBarChart
android:id="@+id/percentage_bar_chart"
@@ -30,7 +30,7 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
settings:minTickWidth="6dip"
- settings:emptyColor="@color/memory_avail">
+ settings:emptyColor="@color/material_empty_color_light">
</com.android.settings.deviceinfo.PercentageBarChart>
</LinearLayout>
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index d0cf60c..5859fbf 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -17,8 +17,12 @@
<!-- Layout used for ProgressCategory in bluetooth settings. -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
style="?android:attr/listSeparatorTextViewStyle"
+ android:background="@null"
android:gravity="center_vertical"
- android:orientation="horizontal">
+ android:orientation="horizontal"
+ android:layout_height="wrap_content"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" >
<!-- This text view has the style of the list separator text view without the background and padding. -->
<TextView
diff --git a/res/layout/preference_spellchecker.xml b/res/layout/preference_spellchecker.xml
index 3e73fa1..dd35cb3 100644
--- a/res/layout/preference_spellchecker.xml
+++ b/res/layout/preference_spellchecker.xml
@@ -18,8 +18,11 @@
android:id="@+id/pref_all"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical">
+
<LinearLayout
android:id="@+id/pref_left_button"
android:layout_width="wrap_content"
@@ -29,12 +32,14 @@
android:clickable="true"
android:focusable="true"
android:background="?android:attr/selectableItemBackground">
+
<RadioButton
android:id="@+id/pref_radio"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:focusable="false" />
+
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -42,6 +47,7 @@
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
+
<TextView
android:id="@+android:id/title"
android:layout_width="wrap_content"
@@ -50,6 +56,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:ellipsize="marquee"
android:fadingEdge="horizontal" />
+
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
@@ -61,8 +68,11 @@
android:textSize="13sp"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="4" />
+
</RelativeLayout>
+
</LinearLayout>
+
<LinearLayout
android:id="@+id/pref_right_button1"
android:layout_width="wrap_content"
@@ -72,12 +82,14 @@
android:focusable="true"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/spellchecker_quick_settings" >
+
<View
android:layout_width="2dip"
android:layout_height="match_parent"
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
android:background="@android:drawable/divider_horizontal_dark" />
+
<ImageView
android:layout_width="40dip"
android:layout_height="fill_parent"
@@ -86,7 +98,9 @@
android:src="@drawable/ic_sysbar_quicksettings"
android:layout_gravity="center"
android:contentDescription="@string/spellchecker_quick_settings" />
+
</LinearLayout>
+
<View
android:id="@+id/pref_right_separator2"
android:layout_width="2dip"
@@ -94,6 +108,7 @@
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
android:background="@android:drawable/divider_horizontal_dark" />
+
<ImageView
android:id="@+id/pref_right_button2"
android:layout_width="40dip"
@@ -106,4 +121,5 @@
android:focusable="true"
android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/spellchecker_language" />
+
</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/preference_tts_engine.xml b/res/layout/preference_tts_engine.xml
index a9d0043..db0febe 100644
--- a/res/layout/preference_tts_engine.xml
+++ b/res/layout/preference_tts_engine.xml
@@ -18,8 +18,11 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical">
+
<LinearLayout
android:id="@+id/tts_engine_pref"
android:layout_width="wrap_content"
@@ -29,15 +32,15 @@
android:clickable="true"
android:focusable="true"
android:background="?android:attr/selectableItemBackground">
+
<RadioButton
android:id="@+id/tts_engine_radiobutton"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_marginStart="10dip"
- android:layout_marginEnd="4dip"
android:layout_gravity="center_vertical"
android:orientation="vertical"
android:clickable="true" />
+
<RelativeLayout
android:id="@+id/tts_engine_pref_text"
android:layout_width="wrap_content"
@@ -47,6 +50,7 @@
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
+
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
@@ -55,6 +59,7 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:ellipsize="marquee"
android:fadingEdge="horizontal"/>
+
<TextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
@@ -66,14 +71,18 @@
android:textSize="13sp"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="4" />
+
</RelativeLayout>
+
</LinearLayout>
+
<View
android:layout_width="2dip"
android:layout_height="match_parent"
android:layout_marginTop="5dip"
android:layout_marginBottom="5dip"
android:background="@android:drawable/divider_horizontal_dark" />
+
<ImageView
android:id="@+id/tts_engine_settings"
android:layout_width="wrap_content"
@@ -86,4 +95,5 @@
android:clickable="true"
android:focusable="true"
android:background="?android:attr/selectableItemBackground" />
+
</LinearLayout>
diff --git a/res/layout/printer_dropdown_item.xml b/res/layout/printer_dropdown_item.xml
index ad393b8..eaf7c96 100644
--- a/res/layout/printer_dropdown_item.xml
+++ b/res/layout/printer_dropdown_item.xml
@@ -19,14 +19,14 @@
android:layout_height="wrap_content"
android:minHeight="48dip"
android:gravity="center_vertical"
- android:paddingStart="@*android:dimen/preference_item_padding_side"
- android:paddingEnd="?android:attr/scrollbarSize"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:background="?android:attr/selectableItemBackground">
<ImageView
android:id="@+id/icon"
- android:layout_width="32dip"
- android:layout_height="32dip"
+ android:layout_width="48dip"
+ android:layout_height="48dip"
android:layout_gravity="center_vertical"
android:layout_marginEnd="8dip"
android:duplicateParentState="true"
@@ -37,6 +37,8 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_marginTop="6dip"
+ android:layout_marginBottom="6dip"
android:orientation="vertical">
<TextView
diff --git a/res/layout/process_stats_details.xml b/res/layout/process_stats_details.xml
index 0de1054..fac9e97 100644
--- a/res/layout/process_stats_details.xml
+++ b/res/layout/process_stats_details.xml
@@ -27,50 +27,58 @@
android:layout_height="match_parent"
android:paddingTop="5dip"
android:paddingBottom="5dip"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<include layout="@layout/app_percentage_item" />
- <!-- Force stop and report buttons -->
<LinearLayout
- android:id="@+id/two_buttons_panel"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingBottom="6dip"
- android:orientation="vertical">
- <include
- layout="@layout/two_buttons_panel"/>
- </LinearLayout>
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical">
- <TextView
- style="?android:attr/listSeparatorTextViewStyle"
- android:text="@string/details_subtitle" />
+ <!-- Force stop and report buttons -->
+ <LinearLayout
+ android:id="@+id/two_buttons_panel"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingBottom="6dip"
+ android:orientation="vertical">
- <LinearLayout
- android:id="@+id/details"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="6dip"
- android:orientation="vertical">
+ <include layout="@layout/two_buttons_panel"/>
+ </LinearLayout>
- <!-- Insert detail items here -->
+ <TextView
+ style="?android:attr/listSeparatorTextViewStyle"
+ android:text="@string/details_subtitle" />
- </LinearLayout>
+ <LinearLayout
+ android:id="@+id/details"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
- <TextView
- style="?android:attr/listSeparatorTextViewStyle"
- android:text="@string/services_subtitle" />
+ <!-- Insert detail items here -->
- <LinearLayout
- android:id="@+id/services"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingStart="6dip"
- android:orientation="vertical">
+ </LinearLayout>
- <!-- Insert service items here -->
+ <TextView
+ style="?android:attr/listSeparatorTextViewStyle"
+ android:text="@string/services_subtitle" />
+
+ <LinearLayout
+ android:id="@+id/services"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <!-- Insert service items here -->
+
+ </LinearLayout>
</LinearLayout>
</LinearLayout>
+
</ScrollView>
diff --git a/res/layout/process_stats_mem_details.xml b/res/layout/process_stats_mem_details.xml
new file mode 100644
index 0000000..32d6f8e
--- /dev/null
+++ b/res/layout/process_stats_mem_details.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<ScrollView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipToPadding="false"
+ android:scrollbarStyle="@integer/preference_scrollbar_style">
+
+ <LinearLayout
+ android:id="@+id/all_details"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingTop="5dip"
+ android:paddingBottom="5dip"
+ android:orientation="vertical">
+
+ <TextView
+ style="?android:attr/listSeparatorTextViewStyle"
+ android:text="@string/mem_state_subtitle" />
+
+ <LinearLayout
+ android:id="@+id/mem_state"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="6dip"
+ android:orientation="vertical">
+
+ <!-- Insert detail items here -->
+
+ </LinearLayout>
+
+ <TextView
+ style="?android:attr/listSeparatorTextViewStyle"
+ android:text="@string/mem_use_subtitle" />
+
+ <LinearLayout
+ android:id="@+id/mem_use"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingStart="6dip"
+ android:orientation="vertical">
+
+ <!-- Insert detail items here -->
+
+ </LinearLayout>
+
+ </LinearLayout>
+</ScrollView>
diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml
index 3a2552f..68967e4 100644
--- a/res/layout/running_processes_view.xml
+++ b/res/layout/running_processes_view.xml
@@ -71,10 +71,7 @@
android:layout_weight="0"
android:layout_marginTop="-20dp"
android:textAppearance="?android:attr/textAppearanceSmallInverse"
- android:textColor="#ccc"
- android:shadowColor="#000"
- android:shadowRadius="5"
- android:textStyle="bold"
+ android:textColor="?android:attr/textColorPrimary"
android:singleLine="true"
android:text="@string/memory" />
<TextView android:id="@+id/backgroundText"
diff --git a/res/layout/search_panel.xml b/res/layout/search_panel.xml
index c892ff9..5e8d587 100644
--- a/res/layout/search_panel.xml
+++ b/res/layout/search_panel.xml
@@ -18,8 +18,8 @@
android:id="@+id/dashboard"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingStart="@dimen/search_results_padding_start"
- android:paddingEnd="@dimen/search_results_padding_end"
+ android:paddingStart="@dimen/search_panel_padding_start"
+ android:paddingEnd="@dimen/search_panel_padding_end"
android:background="@color/dashboard_background_color">
<LinearLayout android:layout_width="match_parent"
@@ -31,11 +31,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
- android:orientation="vertical">
+ android:orientation="vertical"
+ android:elevation="@dimen/search_panel_elevation">
<ListView android:id="@+id/list_suggestions"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@android:color/white"
+ android:headerDividersEnabled="false"
/>
</LinearLayout>
@@ -50,6 +53,8 @@
<ListView android:id="@+id/list_results"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@android:color/white"
+ android:headerDividersEnabled="false"
/>
</LinearLayout>
diff --git a/res/layout/search_panel_results_header.xml b/res/layout/search_panel_results_header.xml
index 07f77a7..7b3f198 100644
--- a/res/layout/search_panel_results_header.xml
+++ b/res/layout/search_panel_results_header.xml
@@ -15,7 +15,7 @@
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="@dimen/dashboard_category_title_height"
android:paddingStart="@dimen/search_title_padding_start"
android:singleLine="true"
diff --git a/res/layout/search_panel_suggestions_header.xml b/res/layout/search_panel_suggestions_header.xml
index 21500bc..d97c3cc 100644
--- a/res/layout/search_panel_suggestions_header.xml
+++ b/res/layout/search_panel_suggestions_header.xml
@@ -15,7 +15,7 @@
-->
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
+ android:layout_width="match_parent"
android:layout_height="@dimen/dashboard_category_title_height"
android:paddingStart="@dimen/search_title_padding_start"
android:singleLine="true"
diff --git a/res/layout/search_suggestion_item.xml b/res/layout/search_suggestion_item.xml
index 245b684..85a3381 100644
--- a/res/layout/search_suggestion_item.xml
+++ b/res/layout/search_suggestion_item.xml
@@ -28,7 +28,7 @@
<TextView android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingStart="@dimen/search_title_padding_start"
+ android:layout_marginStart="@dimen/search_title_padding_start"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:ellipsize="marquee"
diff --git a/res/layout/settings_main.xml b/res/layout/settings_main.xml
index ddbf2af..a06096a 100644
--- a/res/layout/settings_main.xml
+++ b/res/layout/settings_main.xml
@@ -20,7 +20,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_height="match_parent"
- android:layout_width="match_parent">
+ android:layout_width="match_parent"
+ android:background="@color/dashboard_background_color">
<LinearLayout
android:orientation="vertical"
@@ -32,12 +33,14 @@
android:layout_height="?android:attr/actionBarSize"
android:layout_width="match_parent"
android:background="@drawable/switchbar_background"
- android:theme="@android:style/Theme.Material" />
+ android:theme="@android:style/Theme.Material"
+ />
<FrameLayout
android:id="@+id/prefs"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="@android:color/white"
/>
</LinearLayout>
@@ -76,7 +79,9 @@
android:layout_margin="5dip"
android:text="@*android:string/next_button_label"
/>
+
</LinearLayout>
+
</RelativeLayout>
</LinearLayout>
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index d0cbc02..c5d686f 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -16,177 +16,142 @@
** limitations under the License.
*/
-->
-<view
+<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
- class="com.android.settings.wifi.WifiSettings$ProportionalOuterFrame"
+ android:id="@+id/fragment"
+ android:orientation="vertical"
android:layout_height="match_parent"
android:layout_width="match_parent">
-
- <RelativeLayout
- android:id="@+id/title_area"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:gravity="bottom">
-
- <LinearLayout
- android:id="@+id/title_bar"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="bottom"
- android:orientation="horizontal">
- <TextView
- android:id="@+id/title"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1.0"
- style="@style/SetupTitle"
- android:text="@string/wifi_setup_wizard_title"
- android:gravity="bottom" />
-
- <ImageButton
- android:id="@+id/more"
- android:layout_width="@dimen/setup_button_size"
- android:layout_height="@dimen/setup_button_size"
- android:layout_marginStart="8dip"
- android:layout_marginEnd="8dip"
- android:layout_marginBottom="8dip"
- android:src="?attr/ic_menu_moreoverflow"
- android:background="?android:attr/actionBarItemBackground"
- android:contentDescription="@string/wifi_menu_more_options" />
-
- </LinearLayout>
-
- <!-- Divider -->
- <View
- android:id="@+id/top_divider"
- style="@style/TopDivider"
- android:layout_below="@id/title_bar" />
-
- </RelativeLayout>
-
- <LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
+ <view
+ class="com.android.settings.widget.ProportionalOuterFrame"
+ android:layout_weight="1"
android:layout_height="match_parent"
- android:layout_below="@id/title_area"
- android:background="@android:color/transparent"
- android:orientation="vertical" >
-
- <TextView
- android:id="@+id/wifi_required_info"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="6dip"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:text="@string/wifi_required_info_text"
- android:visibility="gone" />
-
- <ListView
- android:id="@android:id/list"
- android:layout_width="match_parent"
- android:layout_height="0px"
- android:layout_weight="1"
- android:cacheColorHint="@android:color/transparent"
- android:clipToPadding="false"
- android:drawSelectorOnTop="false"
- android:paddingTop="0dip"
- android:scrollbarAlwaysDrawVerticalTrack="true" />
-
- <TextView
- android:id="@android:id/empty"
- android:layout_width="match_parent"
- android:layout_height="0px"
- android:layout_weight="1"
- android:gravity="center"
- android:visibility="gone" />
-
- <ImageView
- android:id="@+id/divider"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginTop="@dimen/setup_item_margin"
- android:background="@*android:drawable/list_divider_holo_dark" />
-
- <LinearLayout
- android:id="@+id/other_network"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/setup_item_margin"
- android:background="?android:attr/selectableItemBackground"
- android:gravity="center_vertical"
- android:minHeight="?android:attr/listPreferredItemHeight"
- android:paddingEnd="?android:attr/scrollbarSize" >
-
- <ImageView
- android:id="@+id/add_icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:src="?attr/ic_menu_add" />
-
- <TextView
- android:id="@+id/other"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="6dip"
- android:layout_marginStart="15dip"
- android:layout_marginEnd="6dip"
- android:layout_marginTop="6dip"
- android:layout_weight="1"
- android:ellipsize="marquee"
- android:fadingEdge="horizontal"
- android:singleLine="true"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:text="@string/wifi_other_network" />
-
- </LinearLayout>
+ android:layout_width="match_parent">
<RelativeLayout
- android:id="@+id/button_bar"
+ android:id="@+id/title_area"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="0"
- android:visibility="gone" >
-
- <Button
- android:id="@+id/back_button"
- android:layout_width="150dip"
- android:layout_height="wrap_content"
- android:layout_alignParentStart="true"
- android:layout_margin="5dip"
- android:text="@string/wifi_setup_back" />
-
- <Button
- android:id="@+id/custom_button"
- android:layout_width="150dip"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:layout_margin="5dip"
- android:text="@string/wifi_setup_skip" />
+ android:layout_alignParentTop="true"
+ android:gravity="bottom">
<LinearLayout
- android:layout_width="wrap_content"
+ android:id="@+id/title_bar"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:orientation="horizontal" >
-
- <Button
- android:id="@+id/skip_button"
- android:layout_width="150dip"
+ android:gravity="bottom"
+ android:orientation="horizontal">
+ <TextView
+ android:id="@+id/title"
+ android:layout_width="0dip"
android:layout_height="wrap_content"
- android:layout_margin="5dip"
- android:text="@string/wifi_setup_skip"
- android:visibility="gone" />
+ android:layout_weight="1.0"
+ style="@style/SetupTitle"
+ android:text="@string/wifi_setup_wizard_title"
+ android:gravity="bottom" />
- <Button
- android:id="@+id/next_button"
- android:layout_width="150dip"
- android:layout_height="wrap_content"
- android:layout_margin="5dip"
- android:text="@string/wifi_setup_next"
- android:visibility="gone" />
- </LinearLayout>
+ <ImageButton
+ android:id="@+id/more"
+ android:layout_width="@dimen/setup_button_size"
+ android:layout_height="@dimen/setup_button_size"
+ android:layout_marginStart="8dip"
+ android:layout_marginEnd="8dip"
+ android:layout_marginBottom="8dip"
+ android:src="?attr/ic_menu_moreoverflow"
+ android:background="?android:attr/actionBarItemBackground"
+ android:contentDescription="@string/wifi_menu_more_options" />
+
+ </LinearLayout>
+
+ <!-- Divider -->
+ <View
+ android:id="@+id/top_divider"
+ style="@style/TopDivider"
+ android:layout_below="@id/title_bar" />
+
</RelativeLayout>
- </LinearLayout>
-</view>
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_below="@id/title_area"
+ android:background="@android:color/transparent"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/wifi_required_info"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="6dip"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="@string/wifi_required_info_text"
+ android:visibility="gone" />
+
+ <ListView
+ android:id="@android:id/list"
+ android:layout_width="match_parent"
+ android:layout_height="0px"
+ android:layout_weight="1"
+ android:cacheColorHint="@android:color/transparent"
+ android:clipToPadding="false"
+ android:drawSelectorOnTop="false"
+ android:paddingTop="0dip"
+ android:scrollbarAlwaysDrawVerticalTrack="true" />
+
+ <TextView
+ android:id="@android:id/empty"
+ android:layout_width="match_parent"
+ android:layout_height="0px"
+ android:layout_weight="1"
+ android:gravity="center"
+ android:visibility="gone" />
+
+ <ImageView
+ android:id="@+id/divider"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="@dimen/setup_item_margin"
+ android:background="@*android:drawable/list_divider_holo_dark" />
+
+ <LinearLayout
+ android:id="@+id/other_network"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/setup_item_margin"
+ android:background="?android:attr/selectableItemBackground"
+ android:gravity="center_vertical"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:paddingEnd="?android:attr/scrollbarSize" >
+
+ <ImageView
+ android:id="@+id/add_icon"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:src="?attr/ic_menu_add" />
+
+ <TextView
+ android:id="@+id/other"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="6dip"
+ android:layout_marginStart="15dip"
+ android:layout_marginEnd="6dip"
+ android:layout_marginTop="6dip"
+ android:layout_weight="1"
+ android:ellipsize="marquee"
+ android:fadingEdge="horizontal"
+ android:singleLine="true"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:text="@string/wifi_other_network" />
+
+ </LinearLayout>
+
+ </LinearLayout>
+ </view>
+ <fragment android:name="com.android.setupwizard.navigationbar.SetupWizardNavBar"
+ android:id="@+id/navigation_bar"
+ style="@style/setup_wizard_navbar_style"
+ android:layout_weight="0"
+ />
+</LinearLayout>
diff --git a/res/layout/switch_bar.xml b/res/layout/switch_bar.xml
index cdf14d7..be24ff1 100644
--- a/res/layout/switch_bar.xml
+++ b/res/layout/switch_bar.xml
@@ -32,6 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_marginEnd="?attr/switchBarMarginEnd" />
+ android:layout_marginEnd="?attr/switchBarMarginEnd"
+ android:background="@null" />
</merge>
diff --git a/res/layout/trust_agent_item.xml b/res/layout/trust_agent_item.xml
index 5674d03..e2ef953 100644
--- a/res/layout/trust_agent_item.xml
+++ b/res/layout/trust_agent_item.xml
@@ -78,7 +78,6 @@
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:paddingStart="15dip"
- android:paddingEnd="?android:attr/scrollbarSize"
android:src="@drawable/ic_sysbar_quicksettings"
android:contentDescription="@string/input_method_settings_button"
android:layout_gravity="center"
diff --git a/res/layout/trusted_credential.xml b/res/layout/trusted_credential.xml
index e559a6e..d8f315a 100644
--- a/res/layout/trusted_credential.xml
+++ b/res/layout/trusted_credential.xml
@@ -18,22 +18,22 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:paddingEnd="?android:attr/scrollbarSize"
android:background="?android:attr/selectableItemBackground"
- android:padding="15dip"
- >
+ android:paddingTop="15dip"
+ android:paddingBottom="15dip">
+
<RelativeLayout
android:layout_width="0px"
android:layout_height="wrap_content"
- android:layout_weight="1"
- >
+ android:layout_weight="1">
+
<TextView
android:id="@+id/trusted_credential_subject_primary"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:textAppearance="?android:attr/textAppearanceMedium"
- />
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
<TextView
android:id="@+id/trusted_credential_subject_secondary"
android:layout_width="fill_parent"
@@ -41,9 +41,10 @@
android:layout_below="@id/trusted_credential_subject_primary"
android:layout_alignStart="@id/trusted_credential_subject_primary"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorSecondary"
- />
+ android:textColor="?android:attr/textColorSecondary" />
+
</RelativeLayout>
+
<!-- checkbox is invisible and not gone so that the height is consistent between tabs -->
<CheckBox
android:id="@+id/trusted_credential_status"
@@ -52,6 +53,6 @@
android:visibility="invisible"
android:clickable="false"
android:focusable="false"
- android:layout_weight="0"
- />
+ android:layout_weight="0" />
+
</LinearLayout>
diff --git a/res/layout/trusted_credentials.xml b/res/layout/trusted_credentials.xml
index a96fefe..f2c1562 100644
--- a/res/layout/trusted_credentials.xml
+++ b/res/layout/trusted_credentials.xml
@@ -16,65 +16,77 @@
<TabHost
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- >
+ android:layout_height="match_parent">
+
<LinearLayout
android:orientation="vertical"
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:padding="5dp"
- >
+ android:layout_height="fill_parent">
+
<TabWidget
android:id="@android:id/tabs"
android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- />
+ android:layout_height="wrap_content" />
+
<FrameLayout
android:id="@android:id/tabcontent"
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:padding="5dp"
- >
+ android:layout_height="fill_parent">
+
<FrameLayout
android:id="@+id/system_tab"
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- >
+ android:layout_height="fill_parent">
+
<ProgressBar
android:id="@+id/system_progress"
- style="?android:attr/progressBarStyleHorizontal"
+ style="?android:attr/progressBarStyleHorizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:visibility="gone"
- />
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:visibility="gone" />
+
<ListView
android:id="@+id/system_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:visibility="gone"
- >
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:scrollbarStyle="outsideOverlay"
+ android:visibility="gone">
</ListView>
+
</FrameLayout>
+
<FrameLayout
android:id="@+id/user_tab"
android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- >
+ android:layout_height="fill_parent">
+
<ProgressBar
android:id="@+id/user_progress"
style="?android:attr/progressBarStyleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:visibility="gone"
- />
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:visibility="gone" />
+
<ListView
android:id="@+id/user_list"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:visibility="gone"
- >
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
+ android:scrollbarStyle="outsideOverlay"
+ android:visibility="gone">
</ListView>
+
</FrameLayout>
+
</FrameLayout>
+
</LinearLayout>
+
</TabHost>
diff --git a/res/layout/wifi_dialog.xml b/res/layout/wifi_dialog.xml
index 7275c73..077134e 100644
--- a/res/layout/wifi_dialog.xml
+++ b/res/layout/wifi_dialog.xml
@@ -148,6 +148,8 @@
style="@style/wifi_item" >
<TextView
style="@style/wifi_item_label"
+ android:textAppearance="@android:style/TextAppearance.Material.Body2"
+ android:textColor="?android:attr/colorAccent"
android:text="@string/wifi_password" />
<EditText android:id="@+id/password"
@@ -197,11 +199,6 @@
android:prompt="@string/proxy_settings_title"
android:entries="@array/wifi_proxy_settings" />
- <TextView android:id="@+id/proxy_pac_info"
- style="@style/wifi_item_content"
- android:textStyle="bold"
- android:textAlignment="viewStart"
- android:visibility="gone"/>
</LinearLayout>
<LinearLayout android:id="@+id/proxy_warning_limited_support"
@@ -216,6 +213,21 @@
android:text="@string/proxy_warning_limited_support" />
</LinearLayout>
+ <LinearLayout android:id="@+id/proxy_pac_field"
+ style="@style/wifi_section"
+ android:visibility="gone">
+ <LinearLayout style="@style/wifi_item">
+ <TextView
+ style="@style/wifi_item_label"
+ android:text="@string/proxy_url_title" />
+
+ <EditText android:id="@+id/proxy_pac"
+ style="@style/wifi_item_content"
+ android:hint="@string/proxy_url_hint"
+ android:inputType="textNoSuggestions"
+ android:singleLine="true"/>
+ </LinearLayout>
+ </LinearLayout>
<LinearLayout android:id="@+id/proxy_fields"
style="@style/wifi_section"
android:visibility="gone">
diff --git a/res/layout/zen_mode_section.xml b/res/layout/zen_mode_section.xml
index 3e87b0c..c9daedc 100644
--- a/res/layout/zen_mode_section.xml
+++ b/res/layout/zen_mode_section.xml
@@ -16,6 +16,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="vertical" >
<View
diff --git a/res/layout/zen_mode_section_first.xml b/res/layout/zen_mode_section_first.xml
index 6054be4..e43a4d2 100644
--- a/res/layout/zen_mode_section_first.xml
+++ b/res/layout/zen_mode_section_first.xml
@@ -16,7 +16,9 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical" >
+ android:orientation="vertical"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<TextView
android:id="@android:id/title"
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index a4d92f8..7440ebb 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Geen"</item>
<item msgid="8673874894887358090">"Handmatig"</item>
+ <item msgid="168893341855953140">"Instaan-outo-opstelling"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Geen"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"wekkervolume"</item>
<item msgid="785049718065337473">"kennisgewingvolume"</item>
<item msgid="6700305533746877052">"bluetoothvolume"</item>
- <item msgid="2029227495214047094">"hou wakker"</item>
- <item msgid="26109888160231211">"monitor ligging"</item>
- <item msgid="5753382310468855812">"monitor hoë kragligging"</item>
+ <item msgid="3810969981743709839">"demp of ontdemp mikrofoon"</item>
+ <item msgid="2627903914574908209">"hou wakker"</item>
+ <item msgid="1395372654968157578">"monitor ligging"</item>
+ <item msgid="3238451051299611853">"monitor hoëkrag-ligging"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Ligging"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Wekkervolume"</item>
<item msgid="9103719301075748925">"Kennisgewingvolume"</item>
<item msgid="7025966722295861512">"Bluetoothvolume"</item>
- <item msgid="4665183401128289653">"Hou wakker"</item>
- <item msgid="8584357129746649222">"Ligging"</item>
+ <item msgid="2265317984004577529">"Demp of ontdemp mikrofoon"</item>
+ <item msgid="3646325683886507917">"Hou wakker"</item>
<item msgid="7669257279311110599">"Ligging"</item>
+ <item msgid="7745724368696313169">"Ligging"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Kort"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Geel op blou"</item>
<item msgid="7169235156349580064">"Pasgemaak"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (ontfout)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 K"</item>
+ <item msgid="505611754508988476">"256 K"</item>
+ <item msgid="6361286924268716397">"1 M"</item>
+ <item msgid="6405203239560695266">"4 M"</item>
+ <item msgid="3025431211013424097">"16 M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Gebruik Dalvik"</item>
- <item msgid="5131846588686178907">"Gebruik ART"</item>
- <item msgid="4530003713865319928">"Gebruik ART-ontfoutbou"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 K per logbuffer"</item>
+ <item msgid="2822309747675758628">"256 K per logbuffer"</item>
+ <item msgid="6699306198357496731">"1 M per logbuffer"</item>
+ <item msgid="5748528643937500349">"4 M per logbuffer"</item>
+ <item msgid="1978629051085111592">"16 M per logbuffer"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Kontroleer nooit"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Beperkte onderbrekings"</item>
<item msgid="8735337502532332056">"Geen onderbrekings nie"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normaal"</item>
+ <item msgid="866544120205026771">"Matig"</item>
+ <item msgid="7851902244436886890">"Laag"</item>
+ <item msgid="3022922196817563960">"Kritiek"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Aanhoudend"</item>
+ <item msgid="5779398140277006695">"Topaktiwiteit"</item>
+ <item msgid="1439598363694578255">"Belangrik (voorgrond)"</item>
+ <item msgid="3396458970745718652">"Belangrik (agtergrond)"</item>
+ <item msgid="5214825238247511992">"Rugsteun"</item>
+ <item msgid="311372689168254967">"Swaargewig"</item>
+ <item msgid="7438189122367820362">"Diens (werk tans)"</item>
+ <item msgid="918687422516982498">"Diens (herbegin tans)"</item>
+ <item msgid="6807727069641853029">"Ontvanger"</item>
+ <item msgid="6782857406100845127">"Tuis"</item>
+ <item msgid="2860945127596974299">"Laaste aktiwiteit"</item>
+ <item msgid="8610560843693675830">"Gekas (aktiwiteit)"</item>
+ <item msgid="4338089220026248848">"Gekas (aktiwiteitkliënt)"</item>
+ <item msgid="6652164677254579050">"Gekas (leeg)"</item>
+ </string-array>
</resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 544c803..c9c85ed 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Die poortveld moet leeg wees as die gasheerveld leeg is."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Die poort wat jy ingevoer het, is nie geldig nie."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Die HTTP-instaanbediener word deur die blaaier gebruik, maar kan nie deur die ander programme gebruik word nie."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC-URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC-URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Ligging:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Selinligting:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Wys profiel-inligting op slotskerm"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profiel-inligting"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Ligging"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Rekeninge"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Sekuriteit"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Stel my ligging, ontsluit skerm, sluit SIM-kaart, eiebewys sluit"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Stel my ligging, skermontsluiting, eiebewysbergingslot"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Enkripteer"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Wag asseblief terwyl jou tablet geënkripteer word. <xliff:g id="PERCENT">^1</xliff:g>% voltooi."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Wag asseblief terwyl jou foon geënkripteer word. <xliff:g id="PERCENT">^1</xliff:g>% voltooi."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Wag terwyl jou tablet geënkripteer word. Oorblywende tyd: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Wag terwyl jou foon geënkripteer word. Oorblywende tyd: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Probeer weer oor <xliff:g id="DELAY">^1</xliff:g> sekondes."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Voer jou wagwoord in"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsie onsuksesvol"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Moenie klank speel as tablet op dok geplaas of afgehaal word nie"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Moenie klank speel wanneer foon in dok gesit of uitgehaal word nie"</string>
<string name="account_settings" msgid="6403589284618783461">"Rekeninge"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Persoonlik"</string>
+ <string name="category_work" msgid="8699184680584175622">"Werk"</string>
<string name="search_settings" msgid="1910951467596035063">"Soek"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Bestuur soekinstellings en geskiedenis"</string>
<string name="display_settings" msgid="7965901687241669598">"Skerm"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Ontwikkelaaropsies"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Stel opsies vir programontwikkeling"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Ontwikkelaar-opsies is nie beskikbaar vir hierdie gebruiker nie"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN-instellings is nie vir hierdie gebruiker beskikbaar nie"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Verbindinginstellings is nie vir hierdie gebruiker beskikbaar nie"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Toegangspuntnaaminstellings is nie vir hierdie gebruiker beskikbaar nie"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB-ontfouting"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"In ontfoutmodus wanneer USB gekoppel is"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Herroep USB-onfoutingmagtigings"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Skerm sal nooit slaap terwyl laai nie"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktiveer Bluetooth HCI-loerloglêer"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Vang alle Bluetooth HCI-pakette in \'n lêer vas"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Kies looptyd"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Kies looptyd"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Herlaai om looptyd van <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g> te verander?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Draadlose skermsertifisering"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Aktiveer WiFi verbose loginskrywing"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Aggressiewe Wi-Fi-na-sellulêr-oordrag"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Laat Wi-Fi-swerfskanderings altyd toe"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Wys opsies vir draadlose skermsertifisering"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Verhoog Wifi-loginskrywingsvlak, wys per SSID RSSI in WiFi Kieser"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"As dit geaktiveer is, sal Wi-Fi aggressiewer wees met die oordrag van die dataverbinding na sellulêr as die Wi-Fi-sein swak is"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Laat toe of verbied Wi-Fi-swerfskanderings op grond van die hoeveelheid dataverkeer teenwoordig op die koppelvlak"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Loggerbuffer se groottes"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Kies loggergroottes per logbuffer"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Laat skynliggings toe"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Laat skynliggings toe"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Laat USB-ontfouting toe?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Looptyd"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Dienste"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Tydsduur"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Geheuebesonderhede"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Geheuetoestande"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Berginggebruik"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kern"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Oorspronklik"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Kernkaste"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam-ruiling"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Gratis"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Totaal"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 ure"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 uur"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 uur"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Verwyder alle sertifikate"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Vertroude eiebewyse"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Wys vertroude CA-sertifikate"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Gevorderd"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Bergingtipe"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardeware-geondersteun"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Net sagteware"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Eiebewyse is nie vir hierdie gebruiker beskikbaar nie"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Teken jou ontsluitpatroon"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Jy moet jou ontsluitpatroon teken om eiebewysinstallasie te bevestig."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Raak "<b>"Volgende"</b>" om voort te gaan met opstelling.\n\nRaak "<b>"Terug"</b>" om aan \'n ander Wi‑Fi-netwerk te koppel."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronisasie geaktiveer"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinkronisasie gedeaktiveer"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sinkroniseer nou"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Sinkroniseerfout."</string>
<string name="sync_failed" msgid="1696499856374109647">"Sinkronisasie het misluk"</string>
<string name="sync_active" msgid="8476943765960863040">"Sinkronisasie aktief"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Wys snitgrense, kantlyne, ens."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Dwing RTL-uitlegrigting"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Dwing skermuitlegrigting na RTL vir alle locales"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Laekragmodus"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Aktiveer batterybesparende instellings"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Wys CPU-verbruik"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skermlaag wys huidige CPU-gebruik"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Forseer GPU-lewering"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Wys alle kennisgewinginhoud"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Versteek sensitiewe kennisgewinginhoud"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Moet glad nie kennisgewings wys nie"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Wanneer moenie steur nie aan is"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Versteek nuwe kennisgewings van die lys af"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Wys alle kennisgewings op die lys"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Programkennisgewings"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Ander klanke"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Belbladtone"</string>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 1a8d001..5807c47 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"አንዱም"</item>
<item msgid="8673874894887358090">"መመሪያ"</item>
+ <item msgid="168893341855953140">"የተኪ ራስ-ውቅር"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"አንዱም"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"የማንቂያ ድምፅ መጠን"</item>
<item msgid="785049718065337473">"የማሳወቂያ ድምጽ መጠን"</item>
<item msgid="6700305533746877052">"የብሉቱዝ ድምፅ መጠን"</item>
- <item msgid="2029227495214047094">"እንደነቃ አቆይ"</item>
- <item msgid="26109888160231211">"አካባቢን ይቆጣጠሩ"</item>
- <item msgid="5753382310468855812">"የከፍተኛ ኃይል አካባቢ ተከታተል"</item>
+ <item msgid="3810969981743709839">"የማይክሮፎን ድምጽ ዝጋ/አትዝጋ"</item>
+ <item msgid="2627903914574908209">"እንደነቃ አቆይ"</item>
+ <item msgid="1395372654968157578">"አካባቢን ተቆጣጠር"</item>
+ <item msgid="3238451051299611853">"የከፍተኛ ኃይል አካባቢ ተከታተል"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"አካባቢ"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"የማንቂያ ድምፅ መጠን"</item>
<item msgid="9103719301075748925">"የማሳወቂያ ድምጽ መጠን"</item>
<item msgid="7025966722295861512">"የብሉቱዝ ድምፅ መጠን"</item>
- <item msgid="4665183401128289653">"እንደነቃ አቆይ"</item>
- <item msgid="8584357129746649222">"አካባቢ"</item>
+ <item msgid="2265317984004577529">"የማይክሮፎን ድምጽ ዝጋ/አትዝጋ"</item>
+ <item msgid="3646325683886507917">"እንደነቃ አቆይ"</item>
<item msgid="7669257279311110599">"አካባቢ"</item>
+ <item msgid="7745724368696313169">"አካባቢ"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"አጭር"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"ቢጫ በሰማያዊ ላይ"</item>
<item msgid="7169235156349580064">"ብጁ"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (ስህተት አርም)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 ኪባ"</item>
+ <item msgid="505611754508988476">"256 ኪባ"</item>
+ <item msgid="6361286924268716397">"1 ሜባ"</item>
+ <item msgid="6405203239560695266">"4 ሜባ"</item>
+ <item msgid="3025431211013424097">"16 ሜባ"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Dalvik ይጠቀሙ"</item>
- <item msgid="5131846588686178907">"ART ይጠቀሙ"</item>
- <item msgid="4530003713865319928">"ART ስህተት የማረም ግንባታ ይጠቀሙ"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 ኪባ በምዝግብ ማስታወሻ ቋጥ"</item>
+ <item msgid="2822309747675758628">"256 ኪባ በምዝግብ ማስታወሻ ቋጥ"</item>
+ <item msgid="6699306198357496731">"1 ሜ በምዝግብ ማስታወሻ ቋጥ"</item>
+ <item msgid="5748528643937500349">"4 ሜ በምዝግብ ማስታወሻ ቋጥ"</item>
+ <item msgid="1978629051085111592">"16 ሜ በምዝግብ ማስታወሻ ቋጥ"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"በፍፁም አትመልከት"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"የተገደቡ ማቋረጦች"</item>
<item msgid="8735337502532332056">"ዜሮ ማቋረጦች"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"መደበኛ"</item>
+ <item msgid="866544120205026771">"መጠነኛ"</item>
+ <item msgid="7851902244436886890">"ዝቅ ያለ"</item>
+ <item msgid="3022922196817563960">"አሳሳቢ"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"የሚጸና"</item>
+ <item msgid="5779398140277006695">"ከፍተኛ እንቅስቃሴ"</item>
+ <item msgid="1439598363694578255">"አስፈላጊ (ከፊት)"</item>
+ <item msgid="3396458970745718652">"አስፈላጊ (ከጀርባ)"</item>
+ <item msgid="5214825238247511992">"ምትኬ ስራ"</item>
+ <item msgid="311372689168254967">"ከባድ ስራ"</item>
+ <item msgid="7438189122367820362">"አገልግሎት (እያሄዱ ያለ)"</item>
+ <item msgid="918687422516982498">"አገልግሎት (ዳግም በማስጀመር ላይ)"</item>
+ <item msgid="6807727069641853029">"ተቀባይ"</item>
+ <item msgid="6782857406100845127">"መነሻ"</item>
+ <item msgid="2860945127596974299">"የመጨረሻ እንቅስቃሴ"</item>
+ <item msgid="8610560843693675830">"የተሸጎጠ (እንቅስቃሴ)"</item>
+ <item msgid="4338089220026248848">"የተሸጎጠ (የእንቅስቃሴ ደንበኛ)"</item>
+ <item msgid="6652164677254579050">"የተሸጎጠ (ባዶ)"</item>
+ </string-array>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 71eba0f..ea04e4a 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"የአስተናጋጁ መስክ ባዶ ከሆነ የወደብ መስኩ ባዶ መሆን አለበት።"</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"የተየብከው ወደብ ትክክል አይደለም።"</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"አሳሹ የHTTP ተተኪ ተጠቅሟል ሆኖም በሌሎች መተግበሪያዎች ላይጠቀም ይችላል።"</string>
- <string name="proxy_url" msgid="2523518669129974654">"ፒ ኤ ሲ ዩአርኤል፦ "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"የፒኤሲ ዩአርኤል፦ "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"ስፍራ:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"አጎራባችCID፡"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo፦"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"የመገለጫ መረጃ በቁልፍ ማያ ገጽ ላይ አሳይ"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"የመገለጫ መረጃ"</string>
<string name="location_settings_title" msgid="1369675479310751735">"አካባቢ"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"መለያዎች"</string>
<string name="security_settings_title" msgid="7945465324818485460">"ደህንነት"</string>
<string name="security_settings_summary" msgid="967393342537986570">"የእኔን ስፍራ፣ማያ ክፈት፣SIM ካርድ ሽንጉር፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"የእኔን ስፍራ፣ማያ ክፈት፣ መረጃ ማከማቻ ሽንጉር አዘጋጅ።"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"ማመስጠሪያ"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"እባክህ ጡባዊህ እስኪመሳጠር ድረስ ጠብቅ።<xliff:g id="PERCENT">^1</xliff:g> ተጠናቋል።"</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"እባክህ ስልክህ እስኪመሳጠር ድረስ ጠብቅ። <xliff:g id="PERCENT">^1</xliff:g>% ተጠናቋል።"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"ጡባዊዎ እስኪመሰጠር ድረስ ይጠብቁ። ቀሪ ጊዜ፦ <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"ስልክዎ እስኪመሰጠር ድረስ ይጠብቁ። ቀሪ ጊዜ፦ <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"በ <xliff:g id="DELAY">^1</xliff:g>ሰከንዶች ውስጥ እንደገና ሞክር።"</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"የይለፍቃልህን ተይብ"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ምስጠራ ስኬታማ አልነበረም"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"ከትከል ጡባዊ ስትከት ወይም ስታስወግድ ድምፅ አታጫውት"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"ስልኩን ከትከል ስታስገባ ወይም ስታስወግድ ዘፈን አታጫውት"</string>
<string name="account_settings" msgid="6403589284618783461">"መለያዎች"</string>
+ <string name="category_personal" msgid="1299663247844969448">"የግል"</string>
+ <string name="category_work" msgid="8699184680584175622">"ስራ"</string>
<string name="search_settings" msgid="1910951467596035063">"ፍለጋ"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"የፍለጋ ታሪክ እና ቅንብሮችን ያደራጁ"</string>
<string name="display_settings" msgid="7965901687241669598">"አሳይ"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"የገንቢዎች አማራጮች"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"ለመተግበሪያ ግንባታ አማራጮች አዘጋጅ"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"የገንቢ አማራጮች ለዚህ ተጠቃሚ አይገኙም"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"የቪፒኤን ቅንብሮች ለዚህ ተጠቃሚ አይገኙም"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"የበይነመረብ ተያያዥነት ቅንብሮች ለዚህ ተጠቃሚ አይገኙም"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"የመዳረሻ ነጥብ ስም ቅንብሮች ለዚህ ተጠቃሚ አይገኙም"</string>
<string name="enable_adb" msgid="7982306934419797485">"የUSB አራሚ"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"USB ሲያያዝ የአርም ሁኔታ"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"የዩ ኤስ ቢ ስህተት ማረም ፈቀዳዎችን ይሻሩ"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"ማያኃይል በመሙላት ላይበፍፁም አይተኛም"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"የብሉቱዝ HCI ስለላ ምዝግብ ማስታወሻን ያንቁ"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"በአንድ ፋይል ውስጥ ያሉትን የብሉቱዝ HCI እሽጎች ይቅረጹ"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"የሚፈጀውን ጊዜ ይምረጡ"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"የሚፈጀውን ጊዜ ይምረጡ"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"የሚፈጀውን ጊዜ ከ<xliff:g id="OLD">%1$s</xliff:g> ወደ <xliff:g id="NEW">%2$s</xliff:g> ለመለወጥ ዳግም ይጀምር?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"የገመድ አልባ ማሳያ እውቅና ማረጋገጫ"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"የWiFi የቃላት መለያ መግቢያን አንቃ"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"አስገዳጅ ከWifi ወደ ተንቀሳቃሽ ማቀበል"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"ሁልጊዜ የWifi እንቅስቃሴ ቅኝቶችን ፍቀድ"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"የገመድ አልባ ማሳያ እውቅና ማረጋገጫ አማራጮችን አሳይ"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"የWifi መለያ መግቢያ ደረጃ ጨምር፣ በWiFi መምረጫ ውስጥ በአንድ SSID RSSI አሳይ"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"ሲነቃ የWifi ምልክት ዝቅተኛ ሲሆን Wifi የውሂብ ግንኙነት ለተንቀሳቃሽ ማስረከብ ላይ ይበልጥ አስገዳጅ ይሆናል"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"በበይነገጹ ላይ ባለው የውሂብ ትራፊክ መጠን መሠረት የWifi እንቅስቃሴ ቅኝቶችን ፍቀድ/ከልክል"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"የምዝግብ ማስታወሻ ያዥ መጠኖች"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"በአንድ ምዝግብ ማስታወሻ ቋጥ የሚኖረው የምዝግብ ማስታወሻ ያዥ መጠኖች ይምረጡ"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"አስቂኝ ሥፍራዎችን ፍቀድ"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"የUSB ማረሚያ ይፈቀድ?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"የሚያሄድበት ጊዜ ርዝመት"</string>
<string name="services_subtitle" msgid="4296402367067266425">"አገልግሎቶች"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"የቆይታ ጊዜ"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"የማህደረ ትውስታ ዝርዝሮች"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"የማህደረ ትውስታ ሁኔታዎች"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"የማህደረ ትውስታ አጠቃቀም"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"አውራ ከዋኝ"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"ቤተኛ"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"የአውራ ከዋኝ መሸጎጫዎች"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"የZRam ማገላበጫ"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"ነፃ"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"ጠቅላላ"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 ሰዓታት"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 ሰዓታት"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 ሰዓታት"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"ሁሉንም ምስክሮችአስወግድ"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"የሚታመን ማስረጃ"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"ታማኝ የCA ምስክር አሳይ"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"ከፍተኛ"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"የማከማቻ አይነት"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"በሃርድዌር የተደገፈ"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"ሶፍትዌር ብቻ"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"ምስክርነቶች ለዚህ ተጠቃሚ አይገኙም"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"የቁልፍ መክፈቻ ስርዓተ ጥለትህን ሳል"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"የአሳማኝ መታውቂያ ጭነትን ለማረጋገጥ የመክፈቻ ስርዓተ ጥለትህን መሳል አለብህ።"</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"ማዋቀሩን ለመቀጠል "<b>"ቀጣይ"</b>"ን ይንኩ።\n\nከተለየ የWi-Fi አውታረ መረብ ጋር ለመገናኘት "<b>"ተመለስ"</b>"ን ይንኩ።"</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"አሳምርነቅቷል"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"አስምር ቦዝኗል"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"አሁን በማመሳሰል ላይ"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"የአስምር ስህተት።"</string>
<string name="sync_failed" msgid="1696499856374109647">"አመሳስል አልተሳካም"</string>
<string name="sync_active" msgid="8476943765960863040">"አመሳስል የነቃ"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"የቅንጥብ ገደቦች፣ ጠርዞች፣ ወዘተ አሳይ"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"የቀኝ-ወደ-ግራ አቀማመጥ አቅጣጫ አስገድድ"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"ለሁሉም አካባቢዎች የማያ ገጽ አቀማመጥ ከቀኝ-ወደ-ግራ እንዲሆን አስገድድ"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"አነስተኛ ሃይል ሁኔታ"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"የባትሪ ኃይል ቁጠባ ቅንብሮችን ያንቁ"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"የCPU አጠቃቀም አሳይ"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"የማያ ተደራቢ የአሁኑን የCPU አጠቃቀም እያሳየ ነው።"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"GPU ምላሽ መስጠትን አስገድድ"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ሁሉንም የማሳወቂያ ይዘቶችን አሳይ"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"ሚስጥራዊነት ያለው የማሳወቂያ ይዘት ደብቅ"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"በጭራሽ ማሳወቂያዎችን አታሳይ"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"አትረብሽ ሲበራ"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"አዲስ ማሳወቂያዎችን ከዝርዝሩ ደብቅ"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"በዝርዝሩ ውስጥ ያሉ ሁሉንም ማሳወቂያዎች አሳይ"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"የመተግበሪያ ማሳወቂያዎች"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"ሌሎች ድምጾች"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"የመደወያ ሰሌዳ ድምጾች"</string>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index 8fdf289..22ed540 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"لا شيء"</item>
<item msgid="8673874894887358090">"يدويًا"</item>
+ <item msgid="168893341855953140">"تهيئة تلقائية للوكيل"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"لا شيء"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"مستوى صوت المنبه"</item>
<item msgid="785049718065337473">"مستوى صوت الإشعار"</item>
<item msgid="6700305533746877052">"مستوى صوت البلوتوث"</item>
- <item msgid="2029227495214047094">"البقاء في الوضع النشط"</item>
- <item msgid="26109888160231211">"مراقبة الموقع"</item>
- <item msgid="5753382310468855812">"مراقبة موقع متميز"</item>
+ <item msgid="3810969981743709839">"كتم صوت/إلغاء كتم صوت الميكروفون"</item>
+ <item msgid="2627903914574908209">"البقاء في الوضع النشط"</item>
+ <item msgid="1395372654968157578">"مراقبة الموقع"</item>
+ <item msgid="3238451051299611853">"مراقبة موقع متميز"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"الموقع"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"مستوى صوت المنبّه"</item>
<item msgid="9103719301075748925">"مستوى صوت الإشعار"</item>
<item msgid="7025966722295861512">"مستوى صوت البلوتوث"</item>
- <item msgid="4665183401128289653">"البقاء في الوضع النشط"</item>
- <item msgid="8584357129746649222">"الموقع"</item>
+ <item msgid="2265317984004577529">"كتم صوت/إلغاء كتم صوت الميكروفون"</item>
+ <item msgid="3646325683886507917">"البقاء في الوضع النشط"</item>
<item msgid="7669257279311110599">"الموقع"</item>
+ <item msgid="7745724368696313169">"الموقع"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"قصيرة"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"أصفر في أزرق"</item>
<item msgid="7169235156349580064">"مخصص"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (تصحيح الأخطاء)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 كيلوبايت"</item>
+ <item msgid="505611754508988476">"256 كيلوبايت"</item>
+ <item msgid="6361286924268716397">"1 ميغابايت"</item>
+ <item msgid="6405203239560695266">"4 ميغابايت"</item>
+ <item msgid="3025431211013424097">"16 ميغابايت"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"استخدام Dalvik"</item>
- <item msgid="5131846588686178907">"استخدام ART"</item>
- <item msgid="4530003713865319928">"استخدام إصدار تصحيح الأخطاء من ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 كيلوبايت لكل ذاكرة تخزين مؤقت للتسجيل"</item>
+ <item msgid="2822309747675758628">"256 كيلوبايت لكل ذاكرة تخزين مؤقت للتسجيل"</item>
+ <item msgid="6699306198357496731">"1 ميغابايت لكل ذاكرة تخزين مؤقت للتسجيل"</item>
+ <item msgid="5748528643937500349">"4 ميغابايت لكل ذاكرة تخزين مؤقت للتسجيل"</item>
+ <item msgid="1978629051085111592">"16 ميغابايت لكل ذاكرة تخزين مؤقت للتسجيل"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"عدم التحقق مطلقًا"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"انقطاعات محدودة"</item>
<item msgid="8735337502532332056">"بدون انقطاعات"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"عادية"</item>
+ <item msgid="866544120205026771">"متوسطة"</item>
+ <item msgid="7851902244436886890">"منخفضة"</item>
+ <item msgid="3022922196817563960">"حرجة"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"ثابتة"</item>
+ <item msgid="5779398140277006695">"أهم نشاط"</item>
+ <item msgid="1439598363694578255">"مهم (المقدمة)"</item>
+ <item msgid="3396458970745718652">"مهم (الخلفية)"</item>
+ <item msgid="5214825238247511992">"النسخة الاحتياطية"</item>
+ <item msgid="311372689168254967">"مرتبة عالية"</item>
+ <item msgid="7438189122367820362">"الخدمة (قيد التشغيل)"</item>
+ <item msgid="918687422516982498">"الخدمة (إعادة التشغيل)"</item>
+ <item msgid="6807727069641853029">"مستلم"</item>
+ <item msgid="6782857406100845127">"الرئيسية"</item>
+ <item msgid="2860945127596974299">"آخر نشاط"</item>
+ <item msgid="8610560843693675830">"تخزين مؤقت (النشاط)"</item>
+ <item msgid="4338089220026248848">"تخزين مؤقت (برنامج النشاط)"</item>
+ <item msgid="6652164677254579050">"تخزين مؤقت (فارغ)"</item>
+ </string-array>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 8180fb1..fedd41b 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"يجب أن يكون حقل المنفذ فارغًا إذا كان حقل المضيف فارغًا."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"المنفذ الذي كتبته غير صالح."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"يستخدم المتصفح الخادم الوكيل HTTP، ولكنه ربما لا تستخدمه التطبيقات الأخرى."</string>
- <string name="proxy_url" msgid="2523518669129974654">"عنوان URL لتهيئة PAC "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"عنوان URL لتهيئة PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"الموقع:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"تجاور CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"معلومات الخلية:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"إظهار معلومات الملف الشخصي في شاشة التأمين"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"معلومات الملف الشخصي"</string>
<string name="location_settings_title" msgid="1369675479310751735">"الموقع"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"الحسابات"</string>
<string name="security_settings_title" msgid="7945465324818485460">"الأمان"</string>
<string name="security_settings_summary" msgid="967393342537986570">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين بطاقة SIM، تأمين تخزين الاعتماد"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"تعيين موقعي، إلغاء تأمين الشاشة، تأمين تخزين الاعتماد"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"التشفير"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"انتظر حتى يتم تشفير الجهاز اللوحي. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"انتظر حتى يتم تشفير هاتفك. اكتمل <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"انتظر بينما يتم تشفير جهازك اللوحي. الوقت المتبقي: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"انتظر بينما يتم تشفير هاتفك. الوقت المتبقي: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"حاول مرة أخرى خلال <xliff:g id="DELAY">^1</xliff:g> ثانية."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"اكتب كلمة المرور"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"لم يتم التشفير بنجاح"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"عدم تشغيل صوت أثناء إدراج الجهاز اللوحي أو إزالته من المرسى"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"عدم تشغيل صوت عند إدراج أو إزالة الهاتف من الإرساء"</string>
<string name="account_settings" msgid="6403589284618783461">"الحسابات"</string>
+ <string name="category_personal" msgid="1299663247844969448">"شخصي"</string>
+ <string name="category_work" msgid="8699184680584175622">"العمل"</string>
<string name="search_settings" msgid="1910951467596035063">"بحث"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"إدارة إعدادات البحث والسجل"</string>
<string name="display_settings" msgid="7965901687241669598">"الشاشة"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"خيارات مطور البرامج"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"تعيين خيارات تطوير التطبيق"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"لا تتوفر خيارات مطوّر البرامج لهذا المستخدم"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"لا تتوفر إعدادات VPN لهذا المستخدم"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"لا تتوفر إعدادات الربط لهذا المستخدم"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"إعدادات اسم نقطة الوصول ليست متوفرة لهذا المستخدم"</string>
<string name="enable_adb" msgid="7982306934419797485">"تصحيح أخطاء USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"وضع تصحيح الأخطاء عند توصيل USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"إلغاء عمليات تفويض تصحيح أخطاء USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"لا يتم مطلقًا دخول الشاشة في وضع السكون أثناء الشحن"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"تمكين سجل تطفل بواجهة وحدة تحكم المضيف عبر بلوتوث"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"التقاط حزم واجهة وحدة تحكم المضيف في ملف عبر بلوتوث"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"تحديد وقت التشغيل"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"تحديد وقت التشغيل"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"هل تريد إعادة التشغيل لتغيير وقت التشغيل من <xliff:g id="OLD">%1$s</xliff:g> إلى <xliff:g id="NEW">%2$s</xliff:g>؟"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"شهادة عرض شاشة لاسلكي"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"تمكين تسجيل WiFi المطوّل"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"تسليم حاد WiFi إلى خلوي"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"السماح دائمًا بعمليات فحص تجوال WiFi"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"عرض خيارات شهادة عرض شاشة لاسلكي"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"زيادة مستوى تسجيل Wifi، والعرض لكل SSID RSSI في منتقي WiFi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"عند تمكينه، سيكون WiFi أكثر حدة في تسليم اتصال البيانات إلى الشبكة الخلوية، وذلك عندما تكون إشارة WiFi منخفضة"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"السماح/عدم السماح بعمليات فحص تجوال WiFi بناءً على مقدار حركة مرور البيانات الموجودة في الواجهة"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"أحجام ذاكرة التخزين المؤقت للتسجيل"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"حدد أحجامًا أكبر لكل ذاكرة تخزين مؤقت للتسجيل"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"السماح بمواقع وهمية"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"السماح بمواقع وهمية"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"هل تريد السماح بتصحيح أخطاء USB؟"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"مدة التشغيل"</string>
<string name="services_subtitle" msgid="4296402367067266425">"الخدمات"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"المدة"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"تفاصيل الذاكرة"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"إحصاءات الذاكرة"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"استخدام الذاكرة"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"أصلية"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"وحدات ذاكرة تخزين Kernel مؤقتة"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"تبديل ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"مجانًا"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"الإجمالي"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 ساعات"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 ساعات"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 ساعة"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"إزالة جميع الشهادات"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"بيانات اعتماد موثوقة"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"عرض شهادات CA الموثوقة"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"إعدادات متقدمة"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"نوع وحدة التخزين"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"وحدة تخزين صلبة"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"وحدة تخزين برمجية فقط"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"لا تتوفر بيانات الاعتماد لهذا المستخدم"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"ارسم نقش إلغاء القفل"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"يجب عليك رسم نقش إلغاء القفل لتأكيد تثبيت بيانات الاعتماد."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"المس "<b>"التالي"</b>" لمتابعة الإعداد.\n\nالمس "<b>"رجوع"</b>" للاتصال بشبكة Wi‑Fi مختلفة."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"تم تمكين المزامنة"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"تم تعطيل المزامنة"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"جارٍ المزامنة"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"خطأ في المزامنة"</string>
<string name="sync_failed" msgid="1696499856374109647">"أخفقت المزامنة"</string>
<string name="sync_active" msgid="8476943765960863040">"المزامنة نشطة"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"عرض حدود وهوامش المقطع وما إلى ذلك."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"فرض اتجاه التنسيق ليكون من اليمين إلى اليسار"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"فرض اتجاه تنسيق الشاشة ليكون من اليمين إلى اليسار لجميع اللغات"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"وضع الطاقة المنخفضة"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"تمكين إعدادات توفير شحن البطارية"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"عرض استخدام CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"عرض تراكب الشاشة لاستخدام CPU الحالي"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"فرض عرض رسومات GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"عرض كل محتوى الإشعارات"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"إخفاء المحتوى المهم للإشعارات"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"عدم عرض إشعارات على الإطلاق"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"عند تشغيل \"عدم الإزعاج\""</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"إخفاء الإشعارات الجديدة من القائمة"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"إظهار جميع الإشعارات في القائمة"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"إشعارات التطبيقات"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"أصوات أخرى"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"نغمات لوحة الاتصال"</string>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index fb0637f..2bcb59d 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Няма"</item>
<item msgid="8673874894887358090">"Ръчно"</item>
+ <item msgid="168893341855953140">"Прокси: Автоконфигуриране"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Без"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"сила на звука на будилника"</item>
<item msgid="785049718065337473">"сила на звука за известия"</item>
<item msgid="6700305533746877052">"сила на звука за Bluetooth"</item>
- <item msgid="2029227495214047094">"оставяне в будно състояние"</item>
- <item msgid="26109888160231211">"наблюдение на местоположението"</item>
- <item msgid="5753382310468855812">"наблюдение на заявките за местоположение, изразходващи много енергия"</item>
+ <item msgid="3810969981743709839">"заглушаване/включване на микрофона"</item>
+ <item msgid="2627903914574908209">"оставяне в будно състояние"</item>
+ <item msgid="1395372654968157578">"наблюдение на местоположението"</item>
+ <item msgid="3238451051299611853">"наблюдение на заявките за местоположение, изразходващи много енергия"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Местоположение"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Сила на звука на будилника"</item>
<item msgid="9103719301075748925">"Сила на звука при известие"</item>
<item msgid="7025966722295861512">"Сила на звука за Bluetooth"</item>
- <item msgid="4665183401128289653">"Оставяне в будно състояние"</item>
- <item msgid="8584357129746649222">"Местоположение"</item>
+ <item msgid="2265317984004577529">"Заглушаване/включване на микрофона"</item>
+ <item msgid="3646325683886507917">"Оставяне в будно състояние"</item>
<item msgid="7669257279311110599">"Местоположение"</item>
+ <item msgid="7745724368696313169">"Местоположение"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Кратко"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Жълто върху синьо"</item>
<item msgid="7169235156349580064">"Персонализирано"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (отстраняване на грешки)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 КБ"</item>
+ <item msgid="505611754508988476">"256 КБ"</item>
+ <item msgid="6361286924268716397">"1 МБ"</item>
+ <item msgid="6405203239560695266">"4 МБ"</item>
+ <item msgid="3025431211013424097">"16 МБ"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Използване на Dalvik"</item>
- <item msgid="5131846588686178907">"Използване на ART"</item>
- <item msgid="4530003713865319928">"Използване на версията на ART за отстраняване на грешки"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"Рег. буфер – 64 КБ"</item>
+ <item msgid="2822309747675758628">"Рег. буфер – 256 КБ"</item>
+ <item msgid="6699306198357496731">"Рег. буфер – 1 МБ"</item>
+ <item msgid="5748528643937500349">"Рег. буфер – 4 МБ"</item>
+ <item msgid="1978629051085111592">"Рег. буфер – 16 МБ"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Никога да не се проверява"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Ограничени прекъсвания"</item>
<item msgid="8735337502532332056">"Нула прекъсвания"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Нормално"</item>
+ <item msgid="866544120205026771">"Средно"</item>
+ <item msgid="7851902244436886890">"Лошо"</item>
+ <item msgid="3022922196817563960">"Критичнo"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Постоянно"</item>
+ <item msgid="5779398140277006695">"Водеща активност"</item>
+ <item msgid="1439598363694578255">"Важно (на преден план)"</item>
+ <item msgid="3396458970745718652">"Важно (на заден план)"</item>
+ <item msgid="5214825238247511992">"Резервно копие"</item>
+ <item msgid="311372689168254967">"Голямо натоварване"</item>
+ <item msgid="7438189122367820362">"Услуга (изпълнява се)"</item>
+ <item msgid="918687422516982498">"Услуга (рестартира се)"</item>
+ <item msgid="6807727069641853029">"Приемник"</item>
+ <item msgid="6782857406100845127">"Начален екран"</item>
+ <item msgid="2860945127596974299">"Последна активност"</item>
+ <item msgid="8610560843693675830">"Кеширано (активност)"</item>
+ <item msgid="4338089220026248848">"Кеширано (клиентска програма за активността)"</item>
+ <item msgid="6652164677254579050">"Кеширано (празно)"</item>
+ </string-array>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 5b3f51d..e582736 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Полето за порт трябва да е празно, ако полето за хост е."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Въведеният от вас порт е невалиден."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP прокси сървърът се използва от браузъра, но не и от други приложения."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL адрес на PAC файла: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL адрес на PAC файла: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Местоположение:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Идентификация на съседно обаждане:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Клетъчна информация:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Показв. на инф. за потр. профил върху закл. екран"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Инф. за потр. профил"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Местоположение"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Профили"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Сигурност"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Задаване на Моето местоположение, отключване на екран, заключване на SIM картата и на хранилището за идентификационни данни"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Задаване на Моето местоположение, отключване на екран и заключване на хранилището за идентификационни данни"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифроване"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Изчакайте, докато таблетът ви се шифрова. Завършено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Изчакайте, докато телефонът ви се шифрова. Завършено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Изчакайте, докато таблетът ви се шифрова. Оставащо време: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Изчакайте, докато телефонът ви се шифрова. Оставащо време: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Опитайте отново след <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Въведете паролата си"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифроването не бе успешно"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Без пускане на звук при поставяне или премахване на таблета от докинг станция"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Без пускане на звуци при поставяне или премахване на телефона от докинг станция"</string>
<string name="account_settings" msgid="6403589284618783461">"Профили"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Лични"</string>
+ <string name="category_work" msgid="8699184680584175622">"Служебни"</string>
<string name="search_settings" msgid="1910951467596035063">"Търсене"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Управление на настройки и история на търсене"</string>
<string name="display_settings" msgid="7965901687241669598">"Дисплей"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Опции на програмиста"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Задаване на опции за програмиране на приложения"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Опциите за програмисти не са налице за този потребител"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Настройките за виртуална частна мрежа (VPN) не са налице за този потребител"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Настройките за тетъринг не са налице за този потребител"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Настройките за име на точка за достъп не са налице за този потребител"</string>
<string name="enable_adb" msgid="7982306934419797485">"Отстраняване на грешки през USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Режим за отстраняване на грешки, когато е свързано USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Отмяна на упълномощаванията за отстраняване на грешки през USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Екранът никога няма да е в спящ режим при зареждане"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Активиране на регистрационния файл за анализ на пакетите в команден ред за Bluetooth с протокола HCI"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Заснемане на всички пакети за Bluetooth с протокола HCI във файла"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Избор на изпълним модул"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Избор на изпълним модул"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Да се рестартира ли за промяна на изпълнимия модул от „<xliff:g id="OLD">%1$s</xliff:g>“ на „<xliff:g id="NEW">%2$s</xliff:g>“?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Сертифициране на безжичния дисплей"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"„Многословно“ регистр. на WiFi: Активир."</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Wi-Fi към моб. мрежи: Агресивно предав."</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Сканирането за роуминг на Wi-Fi да е разрешено винаги"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Показване на опциите за сертифициране на безжичния дисплей"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"По-подробно регистр. на WiFi – данни за RSSI на SSID в инстр. за избор на WiFi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"При активиране предаването на връзката за данни от Wi-Fi към мобилната мрежа ще е по-агресивно, когато Wi-Fi сигналът е слаб"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Разрешаване/забраняване на сканирането за роуминг на Wi-Fi въз основа на посочения в интерфейса обем на трафика на данни"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Размери на регистрационните буфери"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Размер на един рег. буфер: Избор"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Разрешаване на измислени местоположения"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешаване на измислени местоположения"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Разрешаване на отстраняването на грешки през USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Време на използване"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Услуги"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Продължителност"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Подробности за паметта"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Състояния на паметта"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Използвана памет"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Ядро"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Стандартни процеси"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Кешове на ядрото"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Размяна със ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Свободно"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Общо"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 часа"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 часа"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 часа"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Премахване на всички сертификати"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Надеждни идент. данни"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Показване на надеждни сертификати от сертифициращи органи"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Разширени"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Тип на хранилището"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"С хардуерна поддръжка"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Само софтуерно"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Идентификационните данни не са налице за този потребител"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Начертайте фигурата си за отключване"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Трябва да начертаете фигурата си за отключване, за да потвърдите инсталирането на идентификационни данни."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Докоснете "<b>"Напред"</b>", за да продължите с настройката.\n\nДокоснете "<b>"Назад"</b>", за да се свържете с друга Wi‑Fi мрежа."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизирането е активирано"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизирането е деактивирано"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Синхронизира се сега"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Грешка при синхронизирането."</string>
<string name="sync_failed" msgid="1696499856374109647">"Синхронизирането не бе успешно"</string>
<string name="sync_active" msgid="8476943765960863040">"Синхронизирането е активно"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Показв. на границите на изрязване, полетата и др."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Принуд. оформл. отдясно наляво"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Принуд. оформл. на екрана отдясно наляво за вс. локали"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Режим при изтощ. батерия"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Актив. на настройките за запазване на батерията"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Употреба на процесора"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наслагване на екрана показва употр. на процесора"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Принудително изобразяване"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показване на цялото съдържание от известията"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Скриване на деликатното съдържание в известията"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Известията въобще да не се показват"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Когато режимът „Не ме безпокойте“ е включен"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Скриване на новите известия от списъка"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Показване на всички известия в списъка"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Известия за приложенията"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Други звуци"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Тонове на клавиатурата за набиране"</string>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index bfed78f..3e38b16 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Cap"</item>
<item msgid="8673874894887358090">"Manual"</item>
+ <item msgid="168893341855953140">"Conf. autom. serv. inter."</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Cap"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"volum de l\'alarma"</item>
<item msgid="785049718065337473">"volum de notificació"</item>
<item msgid="6700305533746877052">"volum del Bluetooth"</item>
- <item msgid="2029227495214047094">"actiu"</item>
- <item msgid="26109888160231211">"supervisa la ubicació"</item>
- <item msgid="5753382310468855812">"fes un seguiment de la precisió de la ubicació"</item>
+ <item msgid="3810969981743709839">"silenciar/no silenciar el micròfon"</item>
+ <item msgid="2627903914574908209">"mantenir-los actius"</item>
+ <item msgid="1395372654968157578">"seguiment de la ubicació"</item>
+ <item msgid="3238451051299611853">"seguiment de la precisió de la ubicació"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Ubicació"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Volum de l\'alarma"</item>
<item msgid="9103719301075748925">"Volum de notificació"</item>
<item msgid="7025966722295861512">"Volum de Bluetooth"</item>
- <item msgid="4665183401128289653">"Actiu"</item>
- <item msgid="8584357129746649222">"Ubicació"</item>
+ <item msgid="2265317984004577529">"Silenciar/no silenciar el micròfon"</item>
+ <item msgid="3646325683886507917">"Mantenir-los actius"</item>
<item msgid="7669257279311110599">"Ubicació"</item>
+ <item msgid="7745724368696313169">"Ubicació"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Curt"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Groc sobre blau"</item>
<item msgid="7169235156349580064">"Personalitzat"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (depuració)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 K"</item>
+ <item msgid="505611754508988476">"256 K"</item>
+ <item msgid="6361286924268716397">"1 M"</item>
+ <item msgid="6405203239560695266">"4 M"</item>
+ <item msgid="3025431211013424097">"16 M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Fes servir Dalvik"</item>
- <item msgid="5131846588686178907">"Fes servir ART"</item>
- <item msgid="4530003713865319928">"Fes servir la compilació de depuració ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 K/memòria cau reg."</item>
+ <item msgid="2822309747675758628">"256 K/memòria cau reg."</item>
+ <item msgid="6699306198357496731">"1 M/memòria cau reg."</item>
+ <item msgid="5748528643937500349">"4 M/memòria cau reg."</item>
+ <item msgid="1978629051085111592">"16 M/memòria cau reg."</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"No comprovis mai"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Interrupcions limitades"</item>
<item msgid="8735337502532332056">"Cap interrupció"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normal"</item>
+ <item msgid="866544120205026771">"Moderada"</item>
+ <item msgid="7851902244436886890">"Baixa"</item>
+ <item msgid="3022922196817563960">"Crítica"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Persistent"</item>
+ <item msgid="5779398140277006695">"Activitat principal"</item>
+ <item msgid="1439598363694578255">"Important (primer pla)"</item>
+ <item msgid="3396458970745718652">"Important (fons)"</item>
+ <item msgid="5214825238247511992">"Còpia de seguretat"</item>
+ <item msgid="311372689168254967">"Pesat"</item>
+ <item msgid="7438189122367820362">"Servei (en execució)"</item>
+ <item msgid="918687422516982498">"Servei (reinici)"</item>
+ <item msgid="6807727069641853029">"Receptor"</item>
+ <item msgid="6782857406100845127">"Inici"</item>
+ <item msgid="2860945127596974299">"Darrera activitat"</item>
+ <item msgid="8610560843693675830">"A la memòria cau (activitat)"</item>
+ <item msgid="4338089220026248848">"A la memòria cau (client de l\'activitat)"</item>
+ <item msgid="6652164677254579050">"A la memòria cau (buit)"</item>
+ </string-array>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index d31a6d6..f4f2266 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El camp del port ha de ser buit si el camp de l\'amfitrió és buit."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"El port que has escrit no és vàlid."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utilitza un servidor intermediari HTTP, però pot ser que la resta d\'aplicacions no."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL de PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL de PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicació:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID veí:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informació mòbil:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostra la inf. de perfil a la pantalla de bloqueig"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informació de perfil"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Ubicació"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Seguretat"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Defineix La meva ubicació, el desbloqueig de la pantalla, el bloqueig de la targeta SIM i el bloqueig de l\'emmagatzematge de credencials"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Defineix La meva ubicació, el desbloqueig de pantalla i el bloqueig d\'emmagatzematge de credencials"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptació"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Espera mentre s\'encripta la tauleta. <xliff:g id="PERCENT">^1</xliff:g>% complet."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Espera mentre s\'encripta el telèfon. <xliff:g id="PERCENT">^1</xliff:g>% completat."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Espera mentre s\'encripta la tauleta. Temps restant: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Espera mentre s\'encripta el telèfon. Temps restant: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Torna-ho a provar d\'aquí a <xliff:g id="DELAY">^1</xliff:g> segons."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escriu la contrasenya"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"S\'ha produït un error en encriptar"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reprodueixis so en inserir o en retirar la tauleta de la base"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reprodueixis cap so en inserir o treure el telèfon de la base"</string>
<string name="account_settings" msgid="6403589284618783461">"Comptes"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
+ <string name="category_work" msgid="8699184680584175622">"Feina"</string>
<string name="search_settings" msgid="1910951467596035063">"Cerca"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Gestiona la configuració i l\'historial de cerca"</string>
<string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Opcions del desenvolupador"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Defineix les opcions per al desenvolupament d\'aplicacions"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Les opcions per a desenvolupadors no estan disponibles per a aquest usuari."</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"La configuració de la VPN no està disponible per a aquest usuari."</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"La configuració d\'ancoratge no està disponible per a aquest usuari."</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"La configuració del nom del punt d\'accés no està disponible per a aquest usuari."</string>
<string name="enable_adb" msgid="7982306934419797485">"Depuració USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Activa el mode de depuració quan el dispositiu estigui connectat per USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Revoca autoritzacions depuració USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla no entra mai en mode de repòs si el dispositiu està carregant-se"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activa el registre de cerca HCI de Bluetooth"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Captura tots els paquets HCI de Bluetooth en un fitxer"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Selecciona temps d\'execució"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Selecciona temps d\'execució"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vols tornar a iniciar per canviar el temps d\'execució de <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certificació de pantalla sense fil"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Activa el registre detallat de la Wi-Fi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Wi-Fi agressiva per a transfer. al mòbil"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Permet sempre les anàlisis d\'itinerància de la Wi-Fi"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostra les opcions de certificació de pantalla sense fil"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Augmenta nivell de registre de Wi-Fi; mostra l\'RSSI per SSID al selector Wi-Fi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Si està activada, la Wi-Fi serà més agressiva en transferir la connexió de dades al mòbil quan la senyal de la Wi-Fi sigui baixa."</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Permet o impedeix les anàlisis d\'itinerància de la Wi-Fi en funció de la quantitat de trànsit de dades que hi ha a la interfície."</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Mides de la memòria cau del registrador"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Selecc. mides registr. per memòria"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Ubicacions simulades"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permet les ubicacions simulades"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Voleu permetre la depuració USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Temps d\'execució"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Serveis"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durada"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Detalls de la memòria"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Estats de la memòria"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Ús de la memòria"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Nucli"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Nadiu"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Memòries cau del nucli"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Espai compartit ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Disponible"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 hores"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 hores"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 hores"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Esborra tots els certificats"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Certificats de confiança"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostra certificats de CA de confiança"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Avançada"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Tipus d\'emmagatzematge"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Emmagatzemat en maquinari"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Només programari"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Les credencials no estan disponibles per a aquest usuari."</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dibuixa el patró de desbloqueig"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Has de dibuixar el teu patró de desbloqueig per confirmar la instal·lació de les credencials."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Següent"</b>" per continuar amb la configuració.\n\nToca "<b>"Enrere"</b>" per connectar a una altra xarxa Wi‑Fi."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronització activada"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronització desactivada"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"S\'està sincronitzant ara."</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronització"</string>
<string name="sync_failed" msgid="1696499856374109647">"La sincronització ha fallat"</string>
<string name="sync_active" msgid="8476943765960863040">"Sincronització activa"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Mostra els límits de clips, els marges, etc."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Força direcció dreta-esquerra"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Força direcció de pantalla dreta-esquerra en totes les llengües"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Mode de baix consum"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Activa la configuració d\'estalvi de bateria"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Mostra l\'ús de la CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposa l\'ús de la CPU a la pantalla"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Força acceleració GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tot el contingut a les notificacions."</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Amaga el contingut confidencial de les notificac."</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"No mostris cap notificació"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Quan està en mode de no molestar"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Amaga les notificacions noves de la llista"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Mostra totes les notificacions de la llista"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Notificacions de l\'aplicació"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Altres sons"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Tons de teclat"</string>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index 9a4fdd8..fffa07a 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Žádné"</item>
<item msgid="8673874894887358090">"Ručně"</item>
+ <item msgid="168893341855953140">"Autom. konfigurace proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Žádné"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"hlasitost budíku"</item>
<item msgid="785049718065337473">"hlasitost oznámení"</item>
<item msgid="6700305533746877052">"hlasitost Bluetooth"</item>
- <item msgid="2029227495214047094">"Zakázat režim spánku"</item>
- <item msgid="26109888160231211">"sledovat polohu"</item>
- <item msgid="5753382310468855812">"sledování energeticky náročného určování polohy"</item>
+ <item msgid="3810969981743709839">"vypnout nebo zapnout zvuk mikrofonu"</item>
+ <item msgid="2627903914574908209">"zakázat režim spánku"</item>
+ <item msgid="1395372654968157578">"sledovat polohu"</item>
+ <item msgid="3238451051299611853">"sledovat energeticky náročné určování polohy"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Poloha"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Hlasitost budíku"</item>
<item msgid="9103719301075748925">"Hlasitost oznámení"</item>
<item msgid="7025966722295861512">"Hlasitost Bluetooth"</item>
- <item msgid="4665183401128289653">"Zakázat režim spánku"</item>
- <item msgid="8584357129746649222">"Poloha"</item>
+ <item msgid="2265317984004577529">"Vypnout nebo zapnout zvuk mikrofonu"</item>
+ <item msgid="3646325683886507917">"Zakázat režim spánku"</item>
<item msgid="7669257279311110599">"Určování polohy"</item>
+ <item msgid="7745724368696313169">"Poloha"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Krátká"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Žluté na modrém"</item>
<item msgid="7169235156349580064">"Vlastní"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (režim ladění)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 kB"</item>
+ <item msgid="505611754508988476">"256 kB"</item>
+ <item msgid="6361286924268716397">"1 MB"</item>
+ <item msgid="6405203239560695266">"4 MB"</item>
+ <item msgid="3025431211013424097">"16 MB"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Použít program Dalvik"</item>
- <item msgid="5131846588686178907">"Použít program ART"</item>
- <item msgid="4530003713865319928">"Použít ladicí sestavení programu ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 kB na vyrovnávací paměť protokolů"</item>
+ <item msgid="2822309747675758628">"256 kB na vyrovnávací paměť protokolů"</item>
+ <item msgid="6699306198357496731">"1 MB na vyrovnávací paměť protokolů"</item>
+ <item msgid="5748528643937500349">"4 MB na vyrovnávací paměť protokolů"</item>
+ <item msgid="1978629051085111592">"16 MB na vyrovnávací paměť protokolů"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Nikdy nekontrolovat"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Omezený počet vyrušování"</item>
<item msgid="8735337502532332056">"Žádná vyrušování"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normální"</item>
+ <item msgid="866544120205026771">"Střední"</item>
+ <item msgid="7851902244436886890">"Nízké"</item>
+ <item msgid="3022922196817563960">"Kritické"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Trvalé"</item>
+ <item msgid="5779398140277006695">"Nejvyšší aktivita"</item>
+ <item msgid="1439598363694578255">"Důležité (v popředí)"</item>
+ <item msgid="3396458970745718652">"Důležité (na pozadí)"</item>
+ <item msgid="5214825238247511992">"Záloha"</item>
+ <item msgid="311372689168254967">"Těžká váha"</item>
+ <item msgid="7438189122367820362">"Služba (spuštěno)"</item>
+ <item msgid="918687422516982498">"Služba (restartuje se)"</item>
+ <item msgid="6807727069641853029">"Přijímač"</item>
+ <item msgid="6782857406100845127">"Plocha"</item>
+ <item msgid="2860945127596974299">"Poslední aktivita"</item>
+ <item msgid="8610560843693675830">"V mezipaměti (aktivita)"</item>
+ <item msgid="4338089220026248848">"V mezipaměti (klient aktivity)"</item>
+ <item msgid="6652164677254579050">"V mezipaměti (prázdné)"</item>
+ </string-array>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 5ef2991..857f096 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pokud je pole hostitel prázdné, musí být prázdné i pole port."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Zadaný port není platný."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Server proxy protokolu HTTP může používat prohlížeč, ale nesmí jej používat další aplikace."</string>
- <string name="proxy_url" msgid="2523518669129974654">"Adresa URL PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"Adresa URL PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Místo:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sousední identifikátor CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Zobrazit informace o profilu na obrazovce uzamčení"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informace o profilu"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Poloha"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Účty"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Zabezpečení"</string>
<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>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifrování"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Počkejte prosím, než bude tablet zašifrován. Dokončeno: <xliff:g id="PERCENT">^1</xliff:g> %"</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Počkejte prosím, než bude telefon zašifrován. Dokončeno: <xliff:g id="PERCENT">^1</xliff:g> %"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Počkejte prosím, než bude tablet zašifrován. Zbývající čas: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Počkejte prosím, než bude telefon zašifrován. Zbývající čas: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Zkuste to znovu za: <xliff:g id="DELAY">^1</xliff:g> s."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Zadejte heslo"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrování se nezdařilo"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Při vložení nebo vyjmutí tabletu z doku nepřehrávat zvuk"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Nepřehrávat zvuk při vkládání nebo vyjímání telefonu z doku"</string>
<string name="account_settings" msgid="6403589284618783461">"Účty"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Osobní"</string>
+ <string name="category_work" msgid="8699184680584175622">"Pracovní"</string>
<string name="search_settings" msgid="1910951467596035063">"Vyhledávání"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Správa nastavení a historie vyhledávání"</string>
<string name="display_settings" msgid="7965901687241669598">"Displej"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Pro vývojáře"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Umožňuje nastavit možnosti pro vývoj aplikací"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Pro tohoto uživatele jsou možnosti vývojáře nedostupné."</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Nastavení sítě VPN pro tohoto uživatele není dostupné."</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Nastavení tetheringu pro tohoto uživatele není dostupné."</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Nastavení názvu přístupového budu pro tohoto uživatele není dostupné."</string>
<string name="enable_adb" msgid="7982306934419797485">"Ladění USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Povolit režim ladění s připojeným zařízením USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Zrušit autorizace k ladění USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka se při nabíjení nepřepne do režimu spánku"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Povolit protokol Bluetooth HCI"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zachytit všechny pakety Bluetooth HCI do souboru"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Výběr modulu runtime"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Výběr modulu runtime"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Chcete provést restart a změnit modul runtime z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certifikace bezdrátového displeje"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Zapnout podrobné protokolování Wi-Fi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Agresivní předání Wi-Fi > mobilní síť"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Vždy povolit vyhledávání roamingu Wi-Fi"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Zobrazit možnosti certifikace bezdrátového displeje"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Zvýšit úroveň protokolování Wi-Fi, zobrazit ve výběru Wi-Fi RSSI pro SSID"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Pokud je tato možnost zapnuta, bude síť Wi-Fi agresivnější při předávání datového připojení mobilní síti při slabém signálu Wi-Fi."</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Povolí nebo zakáže vyhledávání roamingu Wi-Fi na základě množství datového provozu na rozhraní."</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Velikosti vyrovnávacích pamětí protokolovacího nástroje"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Vyberte velikosti protokolovacího nástroje na vyrovnávací paměť protokolů"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Povolit simulované polohy"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Povolit simulované polohy"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Povolit ladění USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Doba běhu"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Služby"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Doba trvání"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Podrobnosti o paměti"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Stavy paměti"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Využití paměti"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Jádro"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Nativní"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Mezipaměti jádra"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Odkládací prostor zRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Volné"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Celkem"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 hodiny"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 hodin"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 hodin"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Odstranit všechny certifikáty"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Důvěryhodná pověření"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Zobrazit důvěryhodné certifikáty CA"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Pokročilé"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Typ úložiště"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardwarové"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Pouze software"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Pro tohoto uživatele jsou identifikační údaje nedostupné."</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Proveďte bezpečnostní gesto"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Instalaci pověření je třeba potvrdit provedením bezpečnostního gesta."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Chcete-li pokračovat v nastavení, klepněte na "<b>"Další"</b>".\n\nChcete-li se připojit k jiné síti Wi-Fi, klepněte na "<b>"Zpět"</b>"."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizace zapnuta"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizace deaktivována"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Probíhá synchronizace..."</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Chyba synchronizace."</string>
<string name="sync_failed" msgid="1696499856374109647">"Synchronizace se nezdařila"</string>
<string name="sync_active" msgid="8476943765960863040">"Synchronizace je aktivní"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Zobrazit u klipu ohraničení, okraje atd."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Vynutit směr RTL"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Vynutit ve všech jazycích směr rozvržení obrazovky RTL (zprava doleva)"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Režim nízké spotřeby"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Povolit nastavení úspory baterie"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Zobrazit využití CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Překryvná vrstva s aktuálním využitím procesoru"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Vykreslování pomocí GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobrazit veškerý obsah oznámení"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skrýt citlivý obsah oznámení"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Oznámení vůbec nezobrazovat"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Když je zapnut režim Nerušit"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Skrýt v seznamu nová oznámení"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Zobrazit v seznamu všechna oznámení"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Oznámení aplikací"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Ostatní zvuky"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Tóny číselníku"</string>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 3e0468c..65a4964 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Ingen"</item>
<item msgid="8673874894887358090">"Manuel"</item>
+ <item msgid="168893341855953140">"Proxy Auto-Config"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Ingen"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"alarmlydstyrke"</item>
<item msgid="785049718065337473">"lydstyrke for underretninger"</item>
<item msgid="6700305533746877052">"lydstyrke for bluetooth"</item>
- <item msgid="2029227495214047094">"hold aktiv"</item>
- <item msgid="26109888160231211">"overvåg placering"</item>
- <item msgid="5753382310468855812">"overvåg placering med højt strømforbrug"</item>
+ <item msgid="3810969981743709839">"slå mikrofonlyd til/fra"</item>
+ <item msgid="2627903914574908209">"hold aktiv"</item>
+ <item msgid="1395372654968157578">"overvåg placering"</item>
+ <item msgid="3238451051299611853">"overvåg placering med højt strømforbrug"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Placering"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Alarmlydstyrke"</item>
<item msgid="9103719301075748925">"Lydstyrke for underretninger"</item>
<item msgid="7025966722295861512">"Lydstyrke for bluetooth"</item>
- <item msgid="4665183401128289653">"Hold aktiv"</item>
- <item msgid="8584357129746649222">"Placering"</item>
+ <item msgid="2265317984004577529">"Slå mikrofonlyd til/fra"</item>
+ <item msgid="3646325683886507917">"Hold aktiv"</item>
<item msgid="7669257279311110599">"Placering"</item>
+ <item msgid="7745724368696313169">"Placering"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Kort"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Gult på blåt"</item>
<item msgid="7169235156349580064">"Brugerdefineret"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (debug)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 KB"</item>
+ <item msgid="505611754508988476">"256 KB"</item>
+ <item msgid="6361286924268716397">"1 MB"</item>
+ <item msgid="6405203239560695266">"4 MB"</item>
+ <item msgid="3025431211013424097">"16 MB"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Brug Dalvik"</item>
- <item msgid="5131846588686178907">"Brug ART"</item>
- <item msgid="4530003713865319928">"Brug ART debug build"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 KB pr. logbuffer"</item>
+ <item msgid="2822309747675758628">"256 KB pr. logbuffer"</item>
+ <item msgid="6699306198357496731">"1 MB pr. logbuffer"</item>
+ <item msgid="5748528643937500349">"4 MB pr. logbuffer"</item>
+ <item msgid="1978629051085111592">"16 MB pr. logbuffer"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Kontroller aldrig"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Begrænsede afbrydelser"</item>
<item msgid="8735337502532332056">"Nul afbrydelser"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normal"</item>
+ <item msgid="866544120205026771">"Moderat"</item>
+ <item msgid="7851902244436886890">"Lav"</item>
+ <item msgid="3022922196817563960">"Kritisk"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Vedvarende"</item>
+ <item msgid="5779398140277006695">"Topaktivitet"</item>
+ <item msgid="1439598363694578255">"Vigtigt (forgrund)"</item>
+ <item msgid="3396458970745718652">"Vigtigt (baggrund)"</item>
+ <item msgid="5214825238247511992">"Sikkerhedskopi"</item>
+ <item msgid="311372689168254967">"Sværvægt"</item>
+ <item msgid="7438189122367820362">"Tjeneste (kører)"</item>
+ <item msgid="918687422516982498">"Tjeneste (genstartes)"</item>
+ <item msgid="6807727069641853029">"Modtager"</item>
+ <item msgid="6782857406100845127">"Startskærm"</item>
+ <item msgid="2860945127596974299">"Seneste aktivitet"</item>
+ <item msgid="8610560843693675830">"Cachelagret (aktivitet)"</item>
+ <item msgid="4338089220026248848">"Cachelagret (aktivitetsklient)"</item>
+ <item msgid="6652164677254579050">"Cachelagret (tom)"</item>
+ </string-array>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index a5587d7..f637c85 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfeltet skal være tomt, hvis værtsfeltet er tomt."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Den indtastede port er ikke gyldig."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyen anvendes af browseren, men må ikke bruges af andre apps."</string>
- <string name="proxy_url" msgid="2523518669129974654">"Webadresse til PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"Webadresse til PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Placering:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Mobiloplysninger:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Vis profiloplysninger på låseskærmen"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profiloplysninger"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Placering"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Konti"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Sikkerhed"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Angiv Min placering, oplåsning af skærmen, låsning af SIM-kort og lager for loginoplysninger"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Angiv Min placering, oplåsning af skærmen, lager for loginoplysninger"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Kryptering"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Vent, mens din tablet krypteres. <xliff:g id="PERCENT">^1</xliff:g> % fuldført."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Vent, mens din telefon krypteres. <xliff:g id="PERCENT">^1</xliff:g> % fuldført."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Vent, mens din tablet krypteres. Resterende tid: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Vent, mens din telefon krypteres. Resterende tid: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Prøv igen om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Indtast din adgangskode"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykkedes"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Afspil ikke lyd, når tabletcomputeren isættes eller fjernes fra dockingstation"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Afspil ikke lyd, når telefonen isættes og fjernes fra dockingstation"</string>
<string name="account_settings" msgid="6403589284618783461">"Konti"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Personlig"</string>
+ <string name="category_work" msgid="8699184680584175622">"Arbejde"</string>
<string name="search_settings" msgid="1910951467596035063">"Søg"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Administrer søgeindstillinger og -historik"</string>
<string name="display_settings" msgid="7965901687241669598">"Skærm"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Indstillinger for udviklere"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Konfigurer valgmuligheder for appudvikling"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Valgmuligheder for udviklere er ikke tilgængelige for denne bruger"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN-indstillingerne er ikke tilgængelige for denne bruger"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Indstillingerne for netdeling er ikke tilgængelige for denne bruger"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Indstillingerne for Adgangspunkt (APN) er ikke tilgængelige for denne bruger"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB-fejlretning"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Fejlretningstilstand, når USB er tilsluttet"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Tilbagekald tilladelser for USB-fejlfinding"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Skærmen går ikke i dvale under opladning"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktivér Bluetooth HCI snoop log"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Gem alle Bluetooth HCI-pakker i en fil"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Vælg kørsel"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Vælg kørsel"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Genstart for at skifte kørsel fra <xliff:g id="OLD">%1$s</xliff:g> til <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certificering af trådløs skærm"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Aktivér detaljeret logføring via Wi-Fi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Tvungen overdragelse fra Wi-Fi til mobilnetværk"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Tillad altid scanning i forbindelse med Wi-Fi-roaming"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Vis valgmuligheder for certificering af trådløs skærm"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Øg logføringsniveau via Wi-Fi, vis pr. SSID RSSI i Wi-Fi Picker"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Når dette er aktiveret, gennemtvinges en overdragelse af dataforbindelsen fra Wi-Fi-netværk til mobilnetværk, når Wi-Fi-signalet er svagt"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Tillad/forbyd scanning i forbindelse med Wi-Fi-roaming afhængigt af mængden af datatrafik i grænsefladen"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Størrelser for Logger-buffer"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Vælg Logger-størrelser pr. logbuffer"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Imiterede placeringer"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Tillad imiterede placeringer"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Vil du tillade USB-fejlretning?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Visningstid"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Tjenester"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Varighed"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Hukommelsesoplysninger"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Hukommelsestilstande"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Anvendt hukommelse"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kerne"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Indbygget"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Kernecacher"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam-udskiftning"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Tilgængelig"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"I alt"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 timer"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 timer"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 timer"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Fjern alle certifikater"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Betroede loginoplysninger"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Vis betroede CA-certifikater"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Avanceret"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Lagertype"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardwarebaseret"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Kun software"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Loginoplysningerne for denne bruger er ikke tilgængelige"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Tegn dit oplåsningsmønster"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du skal tegne dit oplåsningsmønster for at bekræfte en gendannelse af fabriksindstillingerne."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Tryk på "<b>"Næste"</b>" for at fortsætte med konfigurationen.\n\n Tryk på "<b>"Tilbage"</b>" for at oprette forbindelse til et andet Wi-Fi-netværk."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktiveret"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sync deaktiveret"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synkroniserer nu"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfejl."</string>
<string name="sync_failed" msgid="1696499856374109647">"Synkroniseringen mislykkedes"</string>
<string name="sync_active" msgid="8476943765960863040">"Synkronisering er aktiveret"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Vis grænser for klip, margener osv."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Tving læsning mod venstre"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Tving til højre mod venstre-layout for alle sprog"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Strømbesparelse"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Indstillinger for aktivering af strømbesparelse"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Vis CPU-forbrug"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skærmoverlejring viser det aktuelle CPU-forbrug"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Tving gengivelse af GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Vis alt indhold i underretninger"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skjul følsomt indhold i underretninger"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Vis slet ingen underretninger"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Når Forstyr ikke er slået til"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Skjul nye underretninger på listen"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Vis alle underretninger på listen"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Appunderretninger"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Andre lyde"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Toner for numerisk tastatur"</string>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index 9d23cda..481e8ff 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Keiner"</item>
<item msgid="8673874894887358090">"Manuell"</item>
+ <item msgid="168893341855953140">"Autom. Proxy-Konfig."</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Keine"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"Weckerlautstärke"</item>
<item msgid="785049718065337473">"Benachrichtigungslautstärke"</item>
<item msgid="6700305533746877052">"Bluetooth-Lautstärke"</item>
- <item msgid="2029227495214047094">"aktiv lassen"</item>
- <item msgid="26109888160231211">"Standort beobachten"</item>
- <item msgid="5753382310468855812">"Orte mit hohem Stromverbrauch überwachen"</item>
+ <item msgid="3810969981743709839">"Mikrofon ausschalten/einschalten"</item>
+ <item msgid="2627903914574908209">"aktiv lassen"</item>
+ <item msgid="1395372654968157578">"Standort überwachen"</item>
+ <item msgid="3238451051299611853">"Standorte mit hohem Stromverbrauch überwachen"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Standort"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Weckerlautstärke"</item>
<item msgid="9103719301075748925">"Benachrichtigungslautstärke"</item>
<item msgid="7025966722295861512">"Bluetooth-Lautstärke"</item>
- <item msgid="4665183401128289653">"Aktiv lassen"</item>
- <item msgid="8584357129746649222">"Standort"</item>
+ <item msgid="2265317984004577529">"Mikrofon ausschalten oder einschalten"</item>
+ <item msgid="3646325683886507917">"Aktiv lassen"</item>
<item msgid="7669257279311110599">"Ort"</item>
+ <item msgid="7745724368696313169">"Standort"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Kurz"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Gelb auf Blau"</item>
<item msgid="7169235156349580064">"Personalisiert"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (Debug)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64.000"</item>
+ <item msgid="505611754508988476">"256.000"</item>
+ <item msgid="6361286924268716397">"1 Mio."</item>
+ <item msgid="6405203239560695266">"4 Mio."</item>
+ <item msgid="3025431211013424097">"16 Mio."</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Dalvik verwenden"</item>
- <item msgid="5131846588686178907">"ART verwenden"</item>
- <item msgid="4530003713865319928">"ART-Debug-Build verwenden"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64.000 pro Puffer"</item>
+ <item msgid="2822309747675758628">"256.000 pro Puffer"</item>
+ <item msgid="6699306198357496731">"1 Mio. pro Puffer"</item>
+ <item msgid="5748528643937500349">"4 Mio. pro Puffer"</item>
+ <item msgid="1978629051085111592">"16 Mio. pro Puffer"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Nie prüfen"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Begrenzte Unterbrechungen"</item>
<item msgid="8735337502532332056">"Keine Unterbrechungen"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Mittel"</item>
+ <item msgid="866544120205026771">"Moderat"</item>
+ <item msgid="7851902244436886890">"Niedrig"</item>
+ <item msgid="3022922196817563960">"Kritisch"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Permanent"</item>
+ <item msgid="5779398140277006695">"Topaktivität"</item>
+ <item msgid="1439598363694578255">"Wichtig (Vordergrund)"</item>
+ <item msgid="3396458970745718652">"Wichtig (Hintergrund)"</item>
+ <item msgid="5214825238247511992">"Sicherung"</item>
+ <item msgid="311372689168254967">"Hohe Auslastung"</item>
+ <item msgid="7438189122367820362">"Dienst (aktiv)"</item>
+ <item msgid="918687422516982498">"Dienst (wird neu gestartet)"</item>
+ <item msgid="6807727069641853029">"Empfänger"</item>
+ <item msgid="6782857406100845127">"Startseite"</item>
+ <item msgid="2860945127596974299">"Letzte Aktivität"</item>
+ <item msgid="8610560843693675830">"Im Cache gespeichert (Aktivität)"</item>
+ <item msgid="4338089220026248848">"Im Cache gespeichert (Aktivitätsclient)"</item>
+ <item msgid="6652164677254579050">"Im Cache gespeichert (leer)"</item>
+ </string-array>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 69dd38c..0a52add 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Das Feld für den Port muss leer sein, wenn das Feld für den Host leer ist."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Der eingegebene Port ist ungültig."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Der HTTP-Proxy wird vom Browser verwendet, möglicherweise aber nicht von anderen Apps."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC-URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC-URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Standort:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Benachbarte CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Netz-Info:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Profilinformationen auf Sperrbildschirm anzeigen"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profilinformationen"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Standort"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Konten"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Sicherheit"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Meinen Standort, Display-Entsperrung, SIM-Kartensperre und Sperre für Anmeldeinformationsspeicher festlegen"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Meinen Standort, Display-Entsperrung, SIM-Kartensperrung und Sperrung des Anmeldeinformationsspeichers festlegen"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Verschlüsselung"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Bitte warten Sie, während Ihr Tablet verschlüsselt wird. Zu <xliff:g id="PERCENT">^1</xliff:g> % abgeschlossen."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Bitte warten Sie, während Ihr Telefon verschlüsselt wird. Zu <xliff:g id="PERCENT">^1</xliff:g> % abgeschlossen."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Ihr Tablet wird verschlüsselt. Bitte warten Sie noch <xliff:g id="DURATION">^1</xliff:g>."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Ihr Telefon wird verschlüsselt. Bitte warten Sie noch <xliff:g id="DURATION">^1</xliff:g>."</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Versuchen Sie es in <xliff:g id="DELAY">^1</xliff:g> Sekunden erneut."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Passwort eingeben"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Verschlüsselung fehlgeschlagen"</string>
@@ -728,6 +731,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Beim Anschließen oder Trennen des Tablets vom Dock keinen Sound abspielen"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Beim Anschließen oder Trennen des Telefons vom Dock keinen Ton abspielen"</string>
<string name="account_settings" msgid="6403589284618783461">"Konten"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Nutzer"</string>
+ <string name="category_work" msgid="8699184680584175622">"Geschäftlich"</string>
<string name="search_settings" msgid="1910951467596035063">"Suche"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Sucheinstellungen und Suchverlauf verwalten"</string>
<string name="display_settings" msgid="7965901687241669598">"Display"</string>
@@ -1320,6 +1325,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Entwickleroptionen"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Optionen zur App-Entwicklung festlegen"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Entwickleroptionen sind für diesen Nutzer nicht verfügbar."</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Die VPN-Einstellungen sind für diesen Nutzer nicht verfügbar."</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Die Tethering-Einstellungen sind für diesen Nutzer nicht verfügbar."</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Die Einstellungen für den Zugangspunkt sind für diesen Nutzer nicht verfügbar."</string>
<string name="enable_adb" msgid="7982306934419797485">"USB-Debugging"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Debugmodus bei Anschluss über USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Autorisierungen für USB-Debugging aufheben"</string>
@@ -1329,12 +1337,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Display wird beim Laden nie in den Ruhezustand versetzt"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI-Snoop-Protokoll aktivieren"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Alle Bluetooth HCI-Pakete in einer Datei erfassen"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Laufzeit festlegen"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Laufzeit festlegen"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Neu starten, um Laufzeit von <xliff:g id="OLD">%1$s</xliff:g> zu <xliff:g id="NEW">%2$s</xliff:g> zu ändern?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Kabellose Übertragung"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Ausführliche WLAN-Protokolle aktivieren"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Aggressives Handover von WLAN an Mobilfunk"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"WLAN-Roamingsuchen immer zulassen"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Optionen zur Zertifizierung für kabellose Übertragung anzeigen"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Level für WLAN-Protokollierung erhöhen, in WiFi Picker pro SSID-RSSI anzeigen"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Wenn diese Option aktiviert ist, ist WLAN bei schwachem Signal bei der Übergabe der Datenverbindung an den Mobilfunk aggressiver."</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"WLAN-Roamingsuchen je nach Umfang des Datentraffics an der Schnittstelle zulassen bzw. nicht zulassen"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Logger-Puffergrößen"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Größe pro Protokollpuffer wählen"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Simulierte Standorte"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Simulierte Standorte zulassen"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB-Debugging zulassen?"</string>
@@ -1588,6 +1600,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Laufzeit"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Dienste"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Dauer"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Speicherdetails"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Speicherstatus"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Speichernutzung"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Nativ"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Kernel-Caches"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam-Swap"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Frei"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Gesamt"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 Stunden"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 Stunden"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 Stunden"</string>
@@ -1685,9 +1706,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Alle Zertifikate entfernen"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Vertrauenswürdige Anmeldedaten"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrauenswürdige CA-Zertifikate ansehen"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Erweitert"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Speichertyp"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-gestützt"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Nur Software"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Anmeldedaten sind für diesen Nutzer nicht verfügbar."</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Bitte zeichnen Sie Ihr Entsperrungsmuster."</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Sie müssen Ihr Entsperrungsmuster eingeben, um das Installieren der Anmeldedaten zu bestätigen."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1768,6 +1791,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Berühren Sie "<b>"Weiter"</b>", um mit der Einrichtung fortzufahren.\n\nTippen Sie auf "<b>"Zurück"</b>", um eine Verbindung zu einem anderen WLAN-Netzwerk herzustellen."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisierung aktiviert"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronisierung deaktiviert"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synchronisierung läuft"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Synchronisierungsfehler"</string>
<string name="sync_failed" msgid="1696499856374109647">"Fehler bei der Synchronisierung"</string>
<string name="sync_active" msgid="8476943765960863040">"Synchronisierung aktiv"</string>
@@ -1860,8 +1884,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Clip-Begrenzungen, Ränder usw. anzeigen"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTL-Layout erzwingen"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"RTL-Bildschirmlayout für alle Sprachen erzwingen"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Energiesparmodus"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Einstellungen für Energiesparmodus aktivieren"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"CPU-Auslastung anzeigen"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Bildschirm-Overlay mit aktueller CPU-Auslastung"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"GPU-Rendering erzwingen"</string>
@@ -2138,9 +2160,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Gesamten Nachrichteninhalt anzeigen"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sensible Benachrichtigungsinhalte ausblenden"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Keine Benachrichtigungen anzeigen"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Wenn \"Nicht stören\" aktiviert ist"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Neue Benachrichtigungen in Liste ausblenden"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Alle Benachrichtigungen in Liste anzeigen"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"App-Benachrichtigungen"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Andere Töne"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Wähltastentöne"</string>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 3e759b2..94cefbe 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Κανένας"</item>
<item msgid="8673874894887358090">"Μη αυτόματες"</item>
+ <item msgid="168893341855953140">"Αυτ. διαμ.διακομ.μεσολ."</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Κανένας"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"ένταση ήχου ξυπνητηριού"</item>
<item msgid="785049718065337473">"ένταση ήχου ειδοποιήσεων"</item>
<item msgid="6700305533746877052">"ένταση ήχου Bluetooth"</item>
- <item msgid="2029227495214047094">"διατήρηση λειτουργίας"</item>
- <item msgid="26109888160231211">"παρακολούθηση τοποθεσίας"</item>
- <item msgid="5753382310468855812">"παρακολούθηση θέσης υψηλής ισχύος"</item>
+ <item msgid="3810969981743709839">"σίγαση/κατάργηση σίγασης μικροφώνου"</item>
+ <item msgid="2627903914574908209">"διατήρηση λειτουργίας"</item>
+ <item msgid="1395372654968157578">"παρακολούθηση τοποθεσίας"</item>
+ <item msgid="3238451051299611853">"παρακολούθηση θέσης υψηλής ισχύος"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Τοποθεσία"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Ένταση ήχου ξυπνητηριού"</item>
<item msgid="9103719301075748925">"Ένταση ήχου ειδοποιήσεων"</item>
<item msgid="7025966722295861512">"Ένταση ήχου Bluetooth"</item>
- <item msgid="4665183401128289653">"Διατήρηση λειτουργίας"</item>
- <item msgid="8584357129746649222">"Τοποθεσία"</item>
+ <item msgid="2265317984004577529">"Σίγαση/κατάργηση σίγασης μικροφώνου"</item>
+ <item msgid="3646325683886507917">"Διατήρηση λειτουργίας"</item>
<item msgid="7669257279311110599">"Τοποθεσία"</item>
+ <item msgid="7745724368696313169">"Τοποθεσία"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Σύντομο"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Κίτρινο σε μπλε"</item>
<item msgid="7169235156349580064">"Προσαρμογή"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (εντοπισμός σφαλμάτων)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 K"</item>
+ <item msgid="505611754508988476">"256 K"</item>
+ <item msgid="6361286924268716397">"1 M"</item>
+ <item msgid="6405203239560695266">"4 M"</item>
+ <item msgid="3025431211013424097">"16 M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Χρήση Dalvik"</item>
- <item msgid="5131846588686178907">"Χρήση ART"</item>
- <item msgid="4530003713865319928">"Χρήση της έκδοσης εντοπισμού σφαλμάτων ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 K ανά μεγ.πρ.μν.καταγρ."</item>
+ <item msgid="2822309747675758628">"256 K ανά μεγ.πρ.μν.καταγρ."</item>
+ <item msgid="6699306198357496731">"1 Μ ανά μεγ.πρ.μν.καταγρ."</item>
+ <item msgid="5748528643937500349">"4 M ανά μεγ.πρ.μν.καταγρ."</item>
+ <item msgid="1978629051085111592">"16 M ανά μεγ.πρ.μν.καταγρ."</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Να μην γίνεται ποτέ έλεγχος"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Περιορισμένες διακοπές"</item>
<item msgid="8735337502532332056">"Χωρίς διακοπές"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Κανονική"</item>
+ <item msgid="866544120205026771">"Μέτρια"</item>
+ <item msgid="7851902244436886890">"Χαμηλή"</item>
+ <item msgid="3022922196817563960">"Σημαντική"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Συνεχής"</item>
+ <item msgid="5779398140277006695">"Κορυφαία δραστηριότητα"</item>
+ <item msgid="1439598363694578255">"Σημαντικό (προσκήνιο)"</item>
+ <item msgid="3396458970745718652">"Σημαντικό (παρασκήνιο)"</item>
+ <item msgid="5214825238247511992">"Αντίγραφο ασφαλείας"</item>
+ <item msgid="311372689168254967">"Απαιτητική"</item>
+ <item msgid="7438189122367820362">"Υπηρεσία (σε εκτέλεση)"</item>
+ <item msgid="918687422516982498">"Υπηρεσία (επανεκκίνηση)"</item>
+ <item msgid="6807727069641853029">"Δέκτης"</item>
+ <item msgid="6782857406100845127">"Αρχική σελίδα"</item>
+ <item msgid="2860945127596974299">"Τελευταία δραστηριότητα"</item>
+ <item msgid="8610560843693675830">"Αποθηκευμένο στην κρυφή μνήμη (δραστηριότητα)"</item>
+ <item msgid="4338089220026248848">"Αποθηκευμένο στην κρυφή μνήμη (δραστηριότητα πελάτη)"</item>
+ <item msgid="6652164677254579050">"Αποθηκευμένο στην κρυφή μνήμη (κενό)"</item>
+ </string-array>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index d941de7..75350c5 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Το πεδίο θύρας θα πρέπει να είναι κενό αν το πεδίο κεντρικού υπολογιστή είναι κενό."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Η θύρα που πληκτρολογήσατε δεν είναι έγκυρη."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Ο διακομιστής μεσολάβησης ΗΤΤΡ χρησιμοποιείται απο το πρόγραμμα περιήγησης, αλλά δεν πρέπει να χρησιμοποιείται από άλλες εφαρμογές."</string>
- <string name="proxy_url" msgid="2523518669129974654">"Διεύθυνση URL PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"Διεύθυνση URL PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Τοποθεσία:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Γειτονικά CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Πληροφορίες κελιού:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Εμφάνιση πληροφοριών προφίλ στην οθόνη κλειδώματος"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Πληροφορίες προφίλ"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Τοποθεσία"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Λογαριασμοί"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Ασφάλεια"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Ορισμός του \"Η τοποθεσία μου\", ξεκλειδώματος οθόνης, κλειδώματος κάρτας SIM, κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Ορισμός του \"Η τοποθεσία μου\", του ξεκλειδώματος οθόνης και του κλειδώματος αποθηκευτικού χώρου διαπιστευτηρίων"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Κρυπτογράφηση"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Περιμένετε μέχρι να γίνει κρυπτογράφηση του tablet. <xliff:g id="PERCENT">^1</xliff:g>% ολοκληρώθηκε."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Περιμένετε μέχρι να γίνει κρυπτογράφηση του τηλεφώνου σας. <xliff:g id="PERCENT">^1</xliff:g>% ολοκληρώθηκε."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Περιμένετε έως ότου ολοκληρωθεί η κρυπτογράφηση του tablet σας. Χρόνος που απομένει: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Περιμένετε έως ότου ολοκληρωθεί η κρυπτογράφηση του τηλεφώνου σας. Χρόνος που απομένει: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Προσπαθήστε ξανά σε <xliff:g id="DELAY">^1</xliff:g> δευτερόλεπτα."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Πληκτρολογήστε τον κωδικό πρόσβασής σας"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Η κρυπτογράφηση απέτυχε"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Να μην αναπαράγεται ήχος κατά την εισαγωγή ή εξαγωγή του tablet από τη βάση σύνδεσης"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Να μην αναπαράγεται ήχος κατά την εισαγωγή ή εξαγωγή του τηλεφώνου από τη βάση σύνδεσης"</string>
<string name="account_settings" msgid="6403589284618783461">"Λογαριασμοί"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Προσωπικό"</string>
+ <string name="category_work" msgid="8699184680584175622">"Εργασία"</string>
<string name="search_settings" msgid="1910951467596035063">"Αναζήτηση"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Διαχείριση ρυθμίσεων αναζήτησης και ιστορικού"</string>
<string name="display_settings" msgid="7965901687241669598">"Προβολή"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Επιλογές για προγραμματιστές"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Ορισμός επιλογών για ανάπτυξη εφαρμογής"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Οι επιλογές για προγραμματιστές δεν είναι διαθέσιμες για αυτόν το χρήστη"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Οι ρυθμίσεις VPN δεν είναι διαθέσιμες γι\' αυτόν το χρήστη"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Οι ρυθμίσεις σύνδεσης μέσω κινητής συσκευής δεν είναι διαθέσιμες γι\' αυτόν το χρήστη"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Οι ρυθμίσεις ονόματος σημείου πρόσβασης δεν είναι διαθέσιμες γι\' αυτόν το χρήστη"</string>
<string name="enable_adb" msgid="7982306934419797485">"Εντοπισμός σφαλμάτων USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Λειτουργία εντοπισμού σφαλμάτων όταν το USB είναι συνδεδεμένο"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Ανάκληση εξουσιοδοτήσεων εντοπισμού σφαλμάτων USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Η οθόνη δεν θα μεταβαίνει ποτέ σε κατάσταση αδράνειας κατά τη φόρτιση"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ενεργοποίηση αρχείου καταγραφής παρακολούθησης Bluetooth HCI"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Καταγραφή όλων των πακέτων bluetooth HCI σε ένα αρχείο"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Επιλογή χρόνου εκτέλεσης"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Επιλογή χρόνου εκτέλεσης"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Να γίνει επανεκκίνηση για την αλλαγή του χρόνου εκτέλεσης από <xliff:g id="OLD">%1$s</xliff:g> σε <xliff:g id="NEW">%2$s</xliff:g>;"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Πιστοποίηση ασύρματης οθόνης"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Ενεργοπ. λεπτομερούς καταγραφής Wi-Fi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Aggressive Wi-fi to Cellular handover"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Να επιτρέπονται πάντα Wifi Roam Scans"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Εμφάνιση επιλογών για πιστοποίηση ασύρματης οθόνης"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Αυξήστε το επίπεδο καταγραφής Wi-Fi, ως SSID RSSI στο εργαλείο επιλογής Wi-Fi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Εάν είναι ενεργό, το Wi-Fi θα παραδίδει ευκολότερα τη σύνδεση δεδομένων στο δίκτυο κινητής τηλεφωνίας, όταν το σήμα του Wi-Fi είναι αδύναμο."</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Να επιτρέπονται/να μην επιτρέπονται Wifi Roam Scans βάσει της ποσότητας επισκεψιμότητας δεδομένων στη διεπαφή."</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Μέγεθος προσωρινής μνήμης για τη λειτουργία καταγραφής"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Επιλ.μεγ. για λειτ.κατ.ανά μέγ.πρ.μνήμ. καταγρ."</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Να επιτρέπονται ψευδείς τοποθεσίες"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Να επιτρέπεται ο εντοπισμός σφαλμάτων USB;"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Χρόνος εκτέλεσης"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Υπηρεσίες"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Διάρκεια"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Λεπτομέρειες μνήμης"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Καταστάσεις μνήμης"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Χρήση μνήμης"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Πυρήνας"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Μητρική"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Κρυφή μνήμη πυρήνα"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Εναλλαγή ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Δωρεάν"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Σύνολο"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 ώρες"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 ώρες"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 ώρες"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Κατάργηση όλων των πιστοποιητικών"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Αξιόπιστα διαπιστευτήρια"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Προβολή αξιόπιστων πιστοποιητικών CA"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Για προχωρημένους"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Τύπος αποθήκευσης"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Με υποστήριξη εξοπλισμού"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Μόνο λογισμικό"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Τα διαπιστευτήρια δεν είναι διαθέσιμα γι\' αυτόν το χρήστη"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Σχεδιάστε το μοτίβο ξεκλειδώματος"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Πρέπει να σχεδιάσετε το μοτίβο ξεκλειδώματος για να επιβεβαιώσετε την εγκατάσταση των διαπιστευτηρίων."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Αγγίξτε το στοιχείο "<b>"Επόμενο"</b>" για να συνεχίσετε την εγκατάσταση.\n\nΑγγίξτε το στοιχείο "<b>"Πίσω"</b>"για να συνδεθείτε σε διαφορετικό δίκτυο Wi-Fi."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Ενεργοποιημένος συγχρονισμός"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Συγχρονισμός είναι απενεργοποιημένος"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Συγχρονισμός τώρα"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Σφάλμα συγχρονισμού."</string>
<string name="sync_failed" msgid="1696499856374109647">"Ο συγχρονισμός απέτυχε"</string>
<string name="sync_active" msgid="8476943765960863040">"Ενεργοποίηση συγχρονισμού"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Εμφάνιση ορίων κλιπ, περιθωρίων, κλπ."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Επιβολή κατ. διάταξης RTL"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Επιβολή διάταξης οθόν. RTL για όλες τις τοπ. ρυθμ."</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Χαμηλή καταν. ενέργειας"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Ενεργ.ρυθ.εξοικονόμησης ενέργειας μπαταρίας"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Προβολή χρήσης CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Επικάλυψη οθόνης για προβολή τρέχουσας χρήσης CPU"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Αναγκαστική απόδοση GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Εμφάνιση ολόκληρου του περιεχομένου ειδοποιήσεων"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Απόκρυψη ευαίσθητου περιεχομένου ειδοποιήσεων"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Να μην εμφανίζονται ειδοποιήσεις"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\""</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Απόκρυψη νέων ειδοποιήσεων από τη λίστα"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Εμφάνιση όλων των ειδοποιήσεων στη λίστα"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Ειδοποιήσεις εφαρμογών"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Άλλοι ήχοι"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Ήχοι πληκτρολογίου κλήσης"</string>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 2d1c621..96d06ba 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"None"</item>
<item msgid="8673874894887358090">"Manual"</item>
+ <item msgid="168893341855953140">"Proxy Auto-Config"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"None"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"alarm volume"</item>
<item msgid="785049718065337473">"notification volume"</item>
<item msgid="6700305533746877052">"Bluetooth volume"</item>
- <item msgid="2029227495214047094">"keep awake"</item>
- <item msgid="26109888160231211">"monitor location"</item>
- <item msgid="5753382310468855812">"monitor high power location"</item>
+ <item msgid="3810969981743709839">"mute/unmute microphone"</item>
+ <item msgid="2627903914574908209">"keep awake"</item>
+ <item msgid="1395372654968157578">"monitor location"</item>
+ <item msgid="3238451051299611853">"monitor high power location"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Location"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Alarm volume"</item>
<item msgid="9103719301075748925">"Notification volume"</item>
<item msgid="7025966722295861512">"Bluetooth volume"</item>
- <item msgid="4665183401128289653">"Keep awake"</item>
- <item msgid="8584357129746649222">"Location"</item>
+ <item msgid="2265317984004577529">"Mute/unmute microphone"</item>
+ <item msgid="3646325683886507917">"Keep awake"</item>
<item msgid="7669257279311110599">"Location"</item>
+ <item msgid="7745724368696313169">"Location"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Short"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Yellow on blue"</item>
<item msgid="7169235156349580064">"Customise"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (debug)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 K"</item>
+ <item msgid="505611754508988476">"256 K"</item>
+ <item msgid="6361286924268716397">"1 M"</item>
+ <item msgid="6405203239560695266">"4 M"</item>
+ <item msgid="3025431211013424097">"16 M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Use Dalvik"</item>
- <item msgid="5131846588686178907">"Use ART"</item>
- <item msgid="4530003713865319928">"Use ART debug build"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 K per log buffer"</item>
+ <item msgid="2822309747675758628">"256 K per log buffer"</item>
+ <item msgid="6699306198357496731">"1 M per log buffer"</item>
+ <item msgid="5748528643937500349">"4 M per log buffer"</item>
+ <item msgid="1978629051085111592">"16 M per log buffer"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Never check"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Limited interruptions"</item>
<item msgid="8735337502532332056">"Zero interruptions"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normal"</item>
+ <item msgid="866544120205026771">"Moderate"</item>
+ <item msgid="7851902244436886890">"Low"</item>
+ <item msgid="3022922196817563960">"Critical"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Persistent"</item>
+ <item msgid="5779398140277006695">"Top activity"</item>
+ <item msgid="1439598363694578255">"Important (foreground)"</item>
+ <item msgid="3396458970745718652">"Important (background)"</item>
+ <item msgid="5214825238247511992">"Backup"</item>
+ <item msgid="311372689168254967">"Heavy weight"</item>
+ <item msgid="7438189122367820362">"Service (running)"</item>
+ <item msgid="918687422516982498">"Service (restarting)"</item>
+ <item msgid="6807727069641853029">"Receiver"</item>
+ <item msgid="6782857406100845127">"Home"</item>
+ <item msgid="2860945127596974299">"Last activity"</item>
+ <item msgid="8610560843693675830">"Cached (activity)"</item>
+ <item msgid="4338089220026248848">"Cached (activity client)"</item>
+ <item msgid="6652164677254579050">"Cached (empty)"</item>
+ </string-array>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6b7b72e..366e02c 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"The port field must be empty if the host field is empty."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"The port that you typed is not valid."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Location:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Neighbouring CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Show profile info on lock screen"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profile info"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Security"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encrypting"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Wait while your tablet is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Wait while your phone is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Wait while your tablet is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Wait while your phone is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Try again in <xliff:g id="DELAY">^1</xliff:g> seconds."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Type your password"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryption unsuccessful"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Don\'t play sound when inserting or removing tablet from dock"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Don\'t play sound when inserting or removing phone from dock"</string>
<string name="account_settings" msgid="6403589284618783461">"Accounts"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
+ <string name="category_work" msgid="8699184680584175622">"Work"</string>
<string name="search_settings" msgid="1910951467596035063">"Search"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Manage search settings and history"</string>
<string name="display_settings" msgid="7965901687241669598">"Display"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Developer options"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Set options for app development"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Developer options are not available for this user"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN settings are not available for this user"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Tethering settings are not available for this user"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Access Point Name settings are not available for this user"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB debugging"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Debug mode when USB is connected"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Revoke USB debugging authorisations"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Screen will never sleep while charging"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Enable Bluetooth HCI snoop log"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capture all Bluetooth HCI packets in a file"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Select runtime"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Select runtime"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reboot to change runtime from <xliff:g id="OLD">%1$s</xliff:g> to <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Wireless display certification"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Enable Wi-Fi Verbose Logging"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Aggressive Wi-Fi to Mobile handover"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Always allow Wi-Fi Roam Scans"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Show options for wireless display certification"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Increase Wi-Fi logging level, show per SSID RSSI in Wi-Fi Picker"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"When enabled, Wi-Fi will be more aggressive in handing over the data connection to Mobile, when Wi-Fi signal is low"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Allow/Disallow Wi-Fi Roam Scans based on the amount of data traffic present at the interface"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Select Logger sizes per log buffer"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Running time"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duration"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Memory details"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Memory states"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Memory use"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Native"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Kernel caches"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Free"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 hours"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 hours"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 hours"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Remove all certificates"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Trusted credentials"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Display trusted CA certificates"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Advanced"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Storage type"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-backed"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Software only"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Credentials are not available for this user"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Draw your unlock pattern"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"You need to draw your unlock pattern to confirm credential installation."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Touch "<b>"Next"</b>" to continue with setup.\n\nTouch "<b>"Back"</b>" to connect to a different Wi‑Fi network."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sync enabled"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sync disabled"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Syncing now"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Sync error..."</string>
<string name="sync_failed" msgid="1696499856374109647">"Sync failed"</string>
<string name="sync_active" msgid="8476943765960863040">"Sync active"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Show clip bounds, margins, etc."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Force RTL layout direction"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Force screen layout direction to RTL for all locales"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Low Power Mode"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Enable battery saving settings"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Show CPU usage"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Screen overlay showing current CPU usage"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Force GPU rendering"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Hide sensitive notification content"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Don\'t show notifications at all"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"When do not disturb is on"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Hide new notifications from the list"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Show all notifications in the list"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Other sounds"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Dial pad tones"</string>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 2d1c621..96d06ba 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"None"</item>
<item msgid="8673874894887358090">"Manual"</item>
+ <item msgid="168893341855953140">"Proxy Auto-Config"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"None"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"alarm volume"</item>
<item msgid="785049718065337473">"notification volume"</item>
<item msgid="6700305533746877052">"Bluetooth volume"</item>
- <item msgid="2029227495214047094">"keep awake"</item>
- <item msgid="26109888160231211">"monitor location"</item>
- <item msgid="5753382310468855812">"monitor high power location"</item>
+ <item msgid="3810969981743709839">"mute/unmute microphone"</item>
+ <item msgid="2627903914574908209">"keep awake"</item>
+ <item msgid="1395372654968157578">"monitor location"</item>
+ <item msgid="3238451051299611853">"monitor high power location"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Location"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Alarm volume"</item>
<item msgid="9103719301075748925">"Notification volume"</item>
<item msgid="7025966722295861512">"Bluetooth volume"</item>
- <item msgid="4665183401128289653">"Keep awake"</item>
- <item msgid="8584357129746649222">"Location"</item>
+ <item msgid="2265317984004577529">"Mute/unmute microphone"</item>
+ <item msgid="3646325683886507917">"Keep awake"</item>
<item msgid="7669257279311110599">"Location"</item>
+ <item msgid="7745724368696313169">"Location"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Short"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Yellow on blue"</item>
<item msgid="7169235156349580064">"Customise"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (debug)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 K"</item>
+ <item msgid="505611754508988476">"256 K"</item>
+ <item msgid="6361286924268716397">"1 M"</item>
+ <item msgid="6405203239560695266">"4 M"</item>
+ <item msgid="3025431211013424097">"16 M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Use Dalvik"</item>
- <item msgid="5131846588686178907">"Use ART"</item>
- <item msgid="4530003713865319928">"Use ART debug build"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 K per log buffer"</item>
+ <item msgid="2822309747675758628">"256 K per log buffer"</item>
+ <item msgid="6699306198357496731">"1 M per log buffer"</item>
+ <item msgid="5748528643937500349">"4 M per log buffer"</item>
+ <item msgid="1978629051085111592">"16 M per log buffer"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Never check"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Limited interruptions"</item>
<item msgid="8735337502532332056">"Zero interruptions"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normal"</item>
+ <item msgid="866544120205026771">"Moderate"</item>
+ <item msgid="7851902244436886890">"Low"</item>
+ <item msgid="3022922196817563960">"Critical"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Persistent"</item>
+ <item msgid="5779398140277006695">"Top activity"</item>
+ <item msgid="1439598363694578255">"Important (foreground)"</item>
+ <item msgid="3396458970745718652">"Important (background)"</item>
+ <item msgid="5214825238247511992">"Backup"</item>
+ <item msgid="311372689168254967">"Heavy weight"</item>
+ <item msgid="7438189122367820362">"Service (running)"</item>
+ <item msgid="918687422516982498">"Service (restarting)"</item>
+ <item msgid="6807727069641853029">"Receiver"</item>
+ <item msgid="6782857406100845127">"Home"</item>
+ <item msgid="2860945127596974299">"Last activity"</item>
+ <item msgid="8610560843693675830">"Cached (activity)"</item>
+ <item msgid="4338089220026248848">"Cached (activity client)"</item>
+ <item msgid="6652164677254579050">"Cached (empty)"</item>
+ </string-array>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 6b7b72e..366e02c 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"The port field must be empty if the host field is empty."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"The port that you typed is not valid."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"The HTTP proxy is used by the browser but may not be used by the other apps."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Location:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Neighbouring CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Show profile info on lock screen"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profile info"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Location"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Security"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Set My Location, screen unlock, SIM card lock, credential storage lock"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Set My Location, screen unlock, credential storage lock"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encrypting"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Wait while your tablet is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Wait while your phone is being encrypted. <xliff:g id="PERCENT">^1</xliff:g>% complete."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Wait while your tablet is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Wait while your phone is being encrypted. Time remaining: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Try again in <xliff:g id="DELAY">^1</xliff:g> seconds."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Type your password"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryption unsuccessful"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Don\'t play sound when inserting or removing tablet from dock"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Don\'t play sound when inserting or removing phone from dock"</string>
<string name="account_settings" msgid="6403589284618783461">"Accounts"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
+ <string name="category_work" msgid="8699184680584175622">"Work"</string>
<string name="search_settings" msgid="1910951467596035063">"Search"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Manage search settings and history"</string>
<string name="display_settings" msgid="7965901687241669598">"Display"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Developer options"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Set options for app development"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Developer options are not available for this user"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN settings are not available for this user"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Tethering settings are not available for this user"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Access Point Name settings are not available for this user"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB debugging"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Debug mode when USB is connected"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Revoke USB debugging authorisations"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Screen will never sleep while charging"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Enable Bluetooth HCI snoop log"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capture all Bluetooth HCI packets in a file"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Select runtime"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Select runtime"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reboot to change runtime from <xliff:g id="OLD">%1$s</xliff:g> to <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Wireless display certification"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Enable Wi-Fi Verbose Logging"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Aggressive Wi-Fi to Mobile handover"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Always allow Wi-Fi Roam Scans"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Show options for wireless display certification"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Increase Wi-Fi logging level, show per SSID RSSI in Wi-Fi Picker"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"When enabled, Wi-Fi will be more aggressive in handing over the data connection to Mobile, when Wi-Fi signal is low"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Allow/Disallow Wi-Fi Roam Scans based on the amount of data traffic present at the interface"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Logger buffer sizes"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Select Logger sizes per log buffer"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Allow mock locations"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Allow mock locations"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Allow USB debugging?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Running time"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duration"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Memory details"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Memory states"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Memory use"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Native"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Kernel caches"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Free"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 hours"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 hours"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 hours"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Remove all certificates"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Trusted credentials"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Display trusted CA certificates"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Advanced"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Storage type"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-backed"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Software only"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Credentials are not available for this user"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Draw your unlock pattern"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"You need to draw your unlock pattern to confirm credential installation."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Touch "<b>"Next"</b>" to continue with setup.\n\nTouch "<b>"Back"</b>" to connect to a different Wi‑Fi network."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sync enabled"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sync disabled"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Syncing now"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Sync error..."</string>
<string name="sync_failed" msgid="1696499856374109647">"Sync failed"</string>
<string name="sync_active" msgid="8476943765960863040">"Sync active"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Show clip bounds, margins, etc."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Force RTL layout direction"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Force screen layout direction to RTL for all locales"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Low Power Mode"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Enable battery saving settings"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Show CPU usage"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Screen overlay showing current CPU usage"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Force GPU rendering"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Show all notification content"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Hide sensitive notification content"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Don\'t show notifications at all"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"When do not disturb is on"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Hide new notifications from the list"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Show all notifications in the list"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"App notifications"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Other sounds"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Dial pad tones"</string>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index adcd085..c500ce2 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Ninguno"</item>
<item msgid="8673874894887358090">"Manual"</item>
+ <item msgid="168893341855953140">"Config. automática proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Ninguno"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"volumen de alarma"</item>
<item msgid="785049718065337473">"volumen de notificación"</item>
<item msgid="6700305533746877052">"volumen de bluetooth"</item>
- <item msgid="2029227495214047094">"mantener en funcionamiento"</item>
- <item msgid="26109888160231211">"controlar ubicación"</item>
- <item msgid="5753382310468855812">"supervisar ubicación de alta potencia"</item>
+ <item msgid="3810969981743709839">"silenciar/dejar de silenciar micrófono"</item>
+ <item msgid="2627903914574908209">"mantener activo"</item>
+ <item msgid="1395372654968157578">"controlar ubicación"</item>
+ <item msgid="3238451051299611853">"controlar ubicación de alta potencia"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Ubicación"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Volumen de alarma"</item>
<item msgid="9103719301075748925">"Volumen de notificación"</item>
<item msgid="7025966722295861512">"Volumen de Bluetooth"</item>
- <item msgid="4665183401128289653">"Mantener en funcionamiento"</item>
- <item msgid="8584357129746649222">"Ubicación"</item>
+ <item msgid="2265317984004577529">"Silenciar/dejar de silenciar micrófono"</item>
+ <item msgid="3646325683886507917">"Mantener activo"</item>
<item msgid="7669257279311110599">"Ubicación"</item>
+ <item msgid="7745724368696313169">"Ubicación"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Corto"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Amarillo sobre azul"</item>
<item msgid="7169235156349580064">"Personalizado"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (depuración)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 K"</item>
+ <item msgid="505611754508988476">"256 K"</item>
+ <item msgid="6361286924268716397">"1 M"</item>
+ <item msgid="6405203239560695266">"4 M"</item>
+ <item msgid="3025431211013424097">"16 M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Usar Dalvik"</item>
- <item msgid="5131846588686178907">"Usar ART"</item>
- <item msgid="4530003713865319928">"Usar compilación de depuración de ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 K/búfer registro"</item>
+ <item msgid="2822309747675758628">"256 K/búfer registro"</item>
+ <item msgid="6699306198357496731">"1 M/búfer registro"</item>
+ <item msgid="5748528643937500349">"4 M/búfer registro"</item>
+ <item msgid="1978629051085111592">"16 M/búfer registro"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Nunca comprobar"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Interrupciones limitadas"</item>
<item msgid="8735337502532332056">"Sin interrupciones"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normal"</item>
+ <item msgid="866544120205026771">"Moderado"</item>
+ <item msgid="7851902244436886890">"Bajo"</item>
+ <item msgid="3022922196817563960">"Crítico"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Persistente"</item>
+ <item msgid="5779398140277006695">"Actividad principal"</item>
+ <item msgid="1439598363694578255">"Importante (en primer plano)"</item>
+ <item msgid="3396458970745718652">"Importante (en segundo plano)"</item>
+ <item msgid="5214825238247511992">"Respaldo"</item>
+ <item msgid="311372689168254967">"Peso pesado"</item>
+ <item msgid="7438189122367820362">"Servicio (en ejecución)"</item>
+ <item msgid="918687422516982498">"Servicio (reiniciando)"</item>
+ <item msgid="6807727069641853029">"Receptor"</item>
+ <item msgid="6782857406100845127">"Pantalla principal"</item>
+ <item msgid="2860945127596974299">"Última actividad"</item>
+ <item msgid="8610560843693675830">"En caché (actividad)"</item>
+ <item msgid="4338089220026248848">"En caché (cliente de actividad)"</item>
+ <item msgid="6652164677254579050">"En caché (vacío)"</item>
+ </string-array>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 3e91d2de..c1d5142 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo del puerto debe estar vacío si el campo de servidor está vacío."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"El puerto que has escrito no es válido."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador usa el proxy HTTP pero tal vez las demás aplicaciones no lo usen."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL de configuración automática de proxy: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL config. autom. proxy: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID cercano:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Información móvil:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar datos del perfil en pantalla bloqueada"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Datos del perfil"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Ubicación"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Cuentas"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de la tarjeta SIM, bloqueo de almacenamiento de credenciales"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Establecer Mi ubicación, desbloqueo de pantalla, bloqueo de almacenamiento de credencial"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptando"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Espera mientras se encripta tu tablet. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Espera mientras se encripta tu dispositivo. <xliff:g id="PERCENT">^1</xliff:g>% completado."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Espera mientras se encripta la tablet. Tiempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Espera mientras se encripta el teléfono. Tiempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Vuelve a intentarlo en <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escribe la contraseña"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encriptación incorrecta"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reproducir sonido cuando se inserte o elimine un tablet de la base."</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reproducir sonido al insertar o retirar el dispositivo de la base."</string>
<string name="account_settings" msgid="6403589284618783461">"Cuentas"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
+ <string name="category_work" msgid="8699184680584175622">"Trabajo"</string>
<string name="search_settings" msgid="1910951467596035063">"Buscar"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Administrar la configuración y el historial de búsqueda"</string>
<string name="display_settings" msgid="7965901687241669598">"Pantalla"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Opciones del programador"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Establecer opciones para desarrollar aplicaciones"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Las opciones de programador no están disponibles para este usuario."</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"La configuración de la red VPN no está disponible para este usuario."</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"La configuración de la conexión no está disponible para este usuario."</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"La configuración del nombre de punto de acceso no está disponible para este usuario."</string>
<string name="enable_adb" msgid="7982306934419797485">"Depuración por USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuración cuando se conecta el USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Revocar autorizaciones de depur. USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca quedará inactiva mientras el dispositivo se esté cargando."</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Registro de búsq. de HCI de Bluetooth"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos los paquetes de HCI de Bluetooth en un archivo"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Tiempo de ejecución"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Tiempo de ejecución"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"¿Reiniciar para cambiar el tiempo de ejecución de <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certificación de pantalla inalámbrica"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Habilitar acceso Wi-Fi detallado"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Wi-Fi potente para transfer. a celular"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Permitir siempre búsqueda de conexión Wi-Fi"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opciones de certificación de pantalla inalámbrica"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Aumentar nivel de acceso Wi-Fi, mostrar por SSID RSSI en selector Wi-Fi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Al habilitar la opción, el Wi-Fi transferirá la conexión de datos al celular con más potencia cuando la señal de Wi-Fi sea débil."</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Permitir/No permitir la búsqueda de conexiones Wi-Fi basada en la cantidad de tráfico de datos de la interfaz"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Tamaños de búfer de Logger"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Sel. tamaños Logger/búfer registro"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones de prueba"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones de prueba"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración por USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Tiempo de ejecución"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Servicios"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duración"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Detalles de la memoria"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Estados de la memoria"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Uso de memoria"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Nativo"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Cachés Kernel"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Intercambio zram"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Libre"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 horas"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 horas"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminar todos los certificados"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Credenciales de confianza"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados de CA de confianza"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Configuración avanzada"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Tipo de almacenamiento"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Copia de seguridad en hardware"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Las credenciales no están disponibles para este usuario."</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Crea tu patrón de desbloqueo."</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Debes crear tu patrón de desbloqueo para confirmar la instalación de las credenciales."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Siguiente"</b>" para continuar con la configuración.\n\nToca "<b>"Volver"</b>" para conectarte a otra red Wi‑Fi."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronización habilitada"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronización inhabilitada"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sincronizando ahora"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronización"</string>
<string name="sync_failed" msgid="1696499856374109647">"Error de sincronización"</string>
<string name="sync_active" msgid="8476943765960863040">"Sincronización activada"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar límites de recortes, márgenes, etc."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forzar diseño der. a izq."</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forzar diseño pantalla der.>izq., cualquier idioma"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Modo de bajo consumo"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Habilitar configuración de ahorro de batería"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar el uso de CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Mostrar superposición en pantalla con uso actual de la CPU"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Forzar representación GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo el contenido de notificaciones"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ocultar contenido confidencial de notificaciones"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"No mostrar notificaciones"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Cuando no molestar está activado"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ocultar notificaciones nuevas de la lista"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Mostrar todas las notificaciones en la lista"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Otros sonidos"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonos del teclado"</string>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index 42cc2cd..eb4e6c4 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Ninguno"</item>
<item msgid="8673874894887358090">"Manual"</item>
+ <item msgid="168893341855953140">"Ajustes automáticos proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Ninguno"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"volumen de la alarma"</item>
<item msgid="785049718065337473">"volumen de las notificaciones"</item>
<item msgid="6700305533746877052">"volumen de Bluetooth"</item>
- <item msgid="2029227495214047094">"mantener activo"</item>
- <item msgid="26109888160231211">"controlar ubicación"</item>
- <item msgid="5753382310468855812">"supervisar ubicación de alta potencia"</item>
+ <item msgid="3810969981743709839">"silenciar/activar micrófono"</item>
+ <item msgid="2627903914574908209">"mantener activo"</item>
+ <item msgid="1395372654968157578">"controlar ubicación"</item>
+ <item msgid="3238451051299611853">"supervisar ubicación de alta potencia"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Ubicación"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Volumen de alarma"</item>
<item msgid="9103719301075748925">"Volumen de notificaciones"</item>
<item msgid="7025966722295861512">"Volumen de Bluetooth"</item>
- <item msgid="4665183401128289653">"Mantener activo"</item>
- <item msgid="8584357129746649222">"Ubicación"</item>
+ <item msgid="2265317984004577529">"Silenciar/activar micrófono"</item>
+ <item msgid="3646325683886507917">"Mantener activo"</item>
<item msgid="7669257279311110599">"Ubicación"</item>
+ <item msgid="7745724368696313169">"Ubicación"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Corto"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Amarillo sobre azul"</item>
<item msgid="7169235156349580064">"Personalizado"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (depuración)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 K"</item>
+ <item msgid="505611754508988476">"256 K"</item>
+ <item msgid="6361286924268716397">"1 M"</item>
+ <item msgid="6405203239560695266">"4 M"</item>
+ <item msgid="3025431211013424097">"16 M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Usar Dalvik"</item>
- <item msgid="5131846588686178907">"Usar ART"</item>
- <item msgid="4530003713865319928">"Usar compilación de depuración de ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 K/búfer registro"</item>
+ <item msgid="2822309747675758628">"256 K/búfer registro"</item>
+ <item msgid="6699306198357496731">"1 M/búfer registro"</item>
+ <item msgid="5748528643937500349">"4 M/búfer registro"</item>
+ <item msgid="1978629051085111592">"16 M/búfer registro"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"No comprobar"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Interrupciones limitadas"</item>
<item msgid="8735337502532332056">"Sin interrupciones"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normal"</item>
+ <item msgid="866544120205026771">"Moderado"</item>
+ <item msgid="7851902244436886890">"Bajo"</item>
+ <item msgid="3022922196817563960">"Crítico"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Persistente"</item>
+ <item msgid="5779398140277006695">"Actividad principal"</item>
+ <item msgid="1439598363694578255">"Importante (en primer plano)"</item>
+ <item msgid="3396458970745718652">"Importante (en segundo plano)"</item>
+ <item msgid="5214825238247511992">"Copia de seguridad"</item>
+ <item msgid="311372689168254967">"Peso pesado"</item>
+ <item msgid="7438189122367820362">"Servicio (en ejecución)"</item>
+ <item msgid="918687422516982498">"Servicio (reiniciando)"</item>
+ <item msgid="6807727069641853029">"Receptor"</item>
+ <item msgid="6782857406100845127">"Inicio"</item>
+ <item msgid="2860945127596974299">"Última actividad"</item>
+ <item msgid="8610560843693675830">"En caché (actividad)"</item>
+ <item msgid="4338089220026248848">"En caché (cliente de actividad)"</item>
+ <item msgid="6652164677254579050">"En caché (vacío)"</item>
+ </string-array>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 4c683d9..1b0b170 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"El campo de puerto debe estar vacío si el campo de host también lo está."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"El puerto que has introducido no es válido."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utiliza el proxy HTTP, pero no puede utilizarlo otras aplicaciones."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL de configuración automática de proxy: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Ubicación:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID anexo"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Información móvil:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar información de perfil en pantalla bloqueo"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Información perfil"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Ubicación"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Cuentas"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
<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>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptando"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Espera mientras se encripta el tablet. <xliff:g id="PERCENT">^1</xliff:g>% completado"</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Espera mientras se encripta el teléfono. <xliff:g id="PERCENT">^1</xliff:g>% completado"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Espera mientras se encripta el tablet. Tiempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Espera mientras se encripta el teléfono. Tiempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Espera <xliff:g id="DELAY">^1</xliff:g> segundos y vuelve a intentarlo."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Escribe tu contraseña"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Error en la encriptación"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"No reproducir sonido al insertar o extraer el tablet de la base"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"No reproducir sonido al insertar o extraer el teléfono de la base"</string>
<string name="account_settings" msgid="6403589284618783461">"Cuentas"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
+ <string name="category_work" msgid="8699184680584175622">"Trabajo"</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="display_settings" msgid="7965901687241669598">"Pantalla"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Opciones de desarrollo"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Establecer opciones de desarrollo de aplicaciones"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Las opciones de desarrollador no están disponibles para este usuario"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Los ajustes de VPN no están disponibles para este usuario"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Los ajustes del anclaje a red no están disponibles para este usuario"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Los ajustes del nombre de punto de acceso no están disponibles para este usuario"</string>
<string name="enable_adb" msgid="7982306934419797485">"Depuración USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Activar el modo de depuración cuando el dispositivo esté conectado por USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Revocar autorizaciones depur. USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"La pantalla nunca entra en modo de suspensión si el dispositivo se está cargando"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Registro de búsqueda de HCI Bluetooth"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos los paquetes de HCI de Bluetooth HCI en un archivo"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Elegir tiempo de ejecución"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Elegir tiempo de ejecución"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"¿Reiniciar para cambiar el tiempo de ejecución de <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certificación de pantalla inalámbrica"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Habilitar registro Wi-Fi detallado"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Wi-Fi potente para transferencia a móvil"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Permitir siempre búsqueda de Wi-Fi"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opciones de certificación de pantalla inalámbrica"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Aumentar nivel registro sesión Wi-Fi, mostrar por SSID RSSI en selector Wi-Fi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Si se habilita, el Wi-Fi será más potente al transferir la conexión de datos al móvil, cuando la señal Wi-Fi sea leve"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Permitir/No permitir búsquedas de Wi-Fi basadas en la cantidad de tráfico de datos presente en la interfaz"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Tamaños de búfer de Logger"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Elegir tamaños Logger/búfer registro"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Ubicaciones simuladas"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir ubicaciones simuladas"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"¿Permitir depuración USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Duración"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Servicios"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duración"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Detalles de la memoria"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Estados de la memoria"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Uso de la memoria"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Nativos"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Cachés del kernel"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Intercambio ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Libre"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 horas"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 horas"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminar todos los certificados"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Certificados de confianza"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados de CA de confianza"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Avanzados"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Tipo de almacenamiento"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Almacenado en hardware"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Las credenciales no están disponibles para este usuario"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dibuja tu patrón de desbloqueo."</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Debes dibujar tu patrón de desbloqueo para confirmar la instalación de las credenciales."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Toca "<b>"Siguiente"</b>" para continuar con el proceso de configuración.\n\nToca "<b>"Atrás"</b>" para conectarte a otra red Wi-Fi."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronización habilitada"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronización inhabilitada"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sincronizando"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Error de sincronización"</string>
<string name="sync_failed" msgid="1696499856374109647">"Error de sincronización"</string>
<string name="sync_active" msgid="8476943765960863040">"Sincronización activa"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar límites de vídeo, márgenes, etc."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forzar dirección diseño RTL"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forzar dirección (RTL) para todas configuraciones"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Modo de baja energía"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Habilitar ajustes de ahorro de batería"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar uso de la CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suporponer el uso de la CPU en la pantalla"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Forzar aceleración GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todas las notificaciones"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ocultar notificaciones de carácter sensible"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"No mostrar notificaciones"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Cuando el modo no molestar esté activado"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ocultar notificaciones nuevas de la lista"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Mostrar todas las notificaciones en la lista"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Notificaciones de aplicaciones"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Otros sonidos"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonos del teclado"</string>
diff --git a/res/values-et-rEE/arrays.xml b/res/values-et-rEE/arrays.xml
index 916b012..8a3eedc 100644
--- a/res/values-et-rEE/arrays.xml
+++ b/res/values-et-rEE/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Puudub"</item>
<item msgid="8673874894887358090">"Käsitsi"</item>
+ <item msgid="168893341855953140">"Puhvers. autom. seadistus"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Puudub"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"äratuse helitugevus"</item>
<item msgid="785049718065337473">"märguande helitugevus"</item>
<item msgid="6700305533746877052">"Bluetoothi helitugevus"</item>
- <item msgid="2029227495214047094">"hoia ärkvel"</item>
- <item msgid="26109888160231211">"monitori asukoht"</item>
- <item msgid="5753382310468855812">"suure võimsusega asukoha jälgimine"</item>
+ <item msgid="3810969981743709839">"mikrofoni vaigistamine või vaigistuse tühistamine"</item>
+ <item msgid="2627903914574908209">"ärkvel hoidmine"</item>
+ <item msgid="1395372654968157578">"asukoha jälgimine"</item>
+ <item msgid="3238451051299611853">"suure võimsusega asukoha jälgimine"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Asukoht"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Alarmi helitugevus"</item>
<item msgid="9103719301075748925">"Märguande helitugevus"</item>
<item msgid="7025966722295861512">"Bluetoothi helitugevus"</item>
- <item msgid="4665183401128289653">"Hoia ärkvel"</item>
- <item msgid="8584357129746649222">"Asukoht"</item>
+ <item msgid="2265317984004577529">"Mikrofoni vaigistamine või vaigistuse tühistamine"</item>
+ <item msgid="3646325683886507917">"Ärkvel hoidmine"</item>
<item msgid="7669257279311110599">"Asukoht"</item>
+ <item msgid="7745724368696313169">"Asukoht"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Lühike"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Kollane sinisel"</item>
<item msgid="7169235156349580064">"Kohandatud"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (silumine)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 000"</item>
+ <item msgid="505611754508988476">"256 000"</item>
+ <item msgid="6361286924268716397">"1 000 000"</item>
+ <item msgid="6405203239560695266">"4 000 000"</item>
+ <item msgid="3025431211013424097">"16 000 000"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Kasuta tarkvara Dalvik"</item>
- <item msgid="5131846588686178907">"Kasuta valikut ART"</item>
- <item msgid="4530003713865319928">"Kasuta valiku ART silumisjärku"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 k / logipuhver"</item>
+ <item msgid="2822309747675758628">"256 k / logipuhver"</item>
+ <item msgid="6699306198357496731">"1 mln / logipuhver"</item>
+ <item msgid="5748528643937500349">"4 mln / logipuhver"</item>
+ <item msgid="1978629051085111592">"16 mln / logipuhver"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Ära kunagi kontrolli"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Piiratud katkestustega"</item>
<item msgid="8735337502532332056">"Katkestusteta"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Tavaline"</item>
+ <item msgid="866544120205026771">"Mõõdukas"</item>
+ <item msgid="7851902244436886890">"Väike"</item>
+ <item msgid="3022922196817563960">"Kriitiline"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Püsiv"</item>
+ <item msgid="5779398140277006695">"Sagedasim tegevus"</item>
+ <item msgid="1439598363694578255">"Oluline (esiplaanil)"</item>
+ <item msgid="3396458970745718652">"Oluline (taustal)"</item>
+ <item msgid="5214825238247511992">"Varundamine"</item>
+ <item msgid="311372689168254967">"Mahukas"</item>
+ <item msgid="7438189122367820362">"Teenus (töötamine)"</item>
+ <item msgid="918687422516982498">"Teenus (taaskäivitamine)"</item>
+ <item msgid="6807727069641853029">"Vastuvõtja"</item>
+ <item msgid="6782857406100845127">"Avakuva"</item>
+ <item msgid="2860945127596974299">"Viimane tegevus"</item>
+ <item msgid="8610560843693675830">"Vahemälus (tegevus)"</item>
+ <item msgid="4338089220026248848">"Vahemälus (tegevuse klient)"</item>
+ <item msgid="6652164677254579050">"Vahemälus (tühi)"</item>
+ </string-array>
</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index d1b4385..370f81f 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pordi väli peab olema tühi, kui hosti väli on tühi."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Sisestatud port on kehtetu."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Brauser kasutab HTTP-puhverserverit, kuid muud rakendused ei tohi seda kasutada."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Asukoht:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Külgnev CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Kärjeinfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Kuva lukustusekraanil profiili teave"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profiili teave"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Asukoht"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Kontod"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Turvalisus"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Määrake Minu asukoht, ekraani avamine, SIM-kaardi lukk, mandaadi talletuslukk"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Määrake oma asukoht, ekraani avamine, mandaadi talletuslukk"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Krüpteerimine"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Oodake, kuni teie tahvelarvutit krüpteeritakse. <xliff:g id="PERCENT">^1</xliff:g>% valmis."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Oodake, kuni teie telefon krüpteeritakse. <xliff:g id="PERCENT">^1</xliff:g>% valmis."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Oodake, kuni teie tahvelarvuti krüpteeritakse. Aega on jäänud: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Oodake, kuni teie telefon krüpteeritakse. Aega on jäänud: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Proovige uuesti <xliff:g id="DELAY">^1</xliff:g> sekundi pärast."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Sisestage parool"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Krüptimine ebaõnnestus"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ära esita heli tahvelarvuti sisestamisel dokki või sellest eemaldamisel"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ära esita heli telefoni sisestamisel dokki või sellest eemaldamisel"</string>
<string name="account_settings" msgid="6403589284618783461">"Kontod"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Isiklik"</string>
+ <string name="category_work" msgid="8699184680584175622">"Töö"</string>
<string name="search_settings" msgid="1910951467596035063">"Otsing"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Otsinguseadete ja -ajaloo haldamine"</string>
<string name="display_settings" msgid="7965901687241669598">"Kuva"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Arendaja valikud"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Rakenduse arenduse valikute määramine"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Arendaja valikud pole selle kasutaja jaoks saadaval"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN-i seaded pole selle kasutaja jaoks saadaval"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Vahendamisseaded pole selle kasutaja jaoks saadaval"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Pääsupunkti nime seaded pole selle kasutaja jaoks saadaval"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB silumine"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Silumisrežiim, kui USB on ühendatud"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Tühista USB silumisvolitused"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekraan ei lähe kunagi laadimise ajal unerežiimi"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Luba Bluetoothi HCI jälgimise logi"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Hõiva kõik faili Bluetoothi HCI paketid"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Käitusaja valimine"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Käitusaja valimine"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Taaskäivitage, et käitusaeg oleks <xliff:g id="OLD">%1$s</xliff:g>, mitte <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Juhtmeta ekraaniühenduse sertifitseerimine"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Luba WiFi paljusõnaline logimine"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"WiFi agressiivne üleminek mobiilsideühendusele"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Luba alati WiFi rändluse skannimine"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Juhtmeta ekraaniühenduse sertifitseerimisvalikute kuvamine"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Suurenda Wifi logimise taset, kuva iga SSID RSSI kohta WiFi valijas"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Kui seade on lubatud, asendatakse nõrga signaaliga WiFi-ühendus agressiivsemalt mobiilsideühendusega"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Lubage/keelake WiFi rändluse skannimine liideses oleva andmete liikluse koguse alusel"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Logija puhvri suurused"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Vali logija suur. logipuhvri kohta"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Luba võltsasukohti"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Luba võltsasukohti"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Luban USB silumise?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Tööaeg"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Teenused"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Kestus"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Mälu üksikasjad"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Mälu olekud"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Mälu kasutamine"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Tuum"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Kohalikud"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Tuuma vahemälud"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRami vahetus"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Tasuta"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Kokku"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 tundi"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 tundi"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 tundi"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Kõikide sertifikaatide eemaldamine"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Usaldusväärsed mandaadid"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Usaldusväärsete CA-sertifikaatide kuvamine"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Täpsemad"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Salvestusruumi tüüp"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Riistvaratoega"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Ainult tarkvara"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Mandaadid pole selle kasutaja jaoks saadaval"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Joonistage oma luku avamise muster"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Mandaadi installimise kinnitamiseks tuleb teil joonistada luku avamise muster."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Seadistamise jätkamiseks puudutage nuppu "<b>"Edasi"</b>".\n\nTeise WiFi-võrguga ühenduse loomiseks puudutage valikut "<b>"Tagasi"</b>"."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sünkroonimine lubatud"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sünkroonimine keelatud"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Kohe sünkroonimine"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Sünkroonimise viga"</string>
<string name="sync_failed" msgid="1696499856374109647">"Sünkroonimine ebaõnnestus"</string>
<string name="sync_active" msgid="8476943765960863040">"Sünkroonimine on aktiivne"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Kuva klipi piirid, veerised jms"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Paremalt vasakule paig."</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Määra lokaatides ekraanipaig. paremalt vasakule"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Energiasäästurežiim"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Aku säästmise seadete lubamine"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"CPU-kasutuse kuvamine"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Praegust CPU-kasutust kuvav ekraani ülekate"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Jõusta GPU renderdamine"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Märguande kogu sisu kuvamine"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Märguande tundliku sisu peitmine"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Ära kuva märguandeid üldse"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Juhul kui valik „Mitte segada” on sisse lülitatud"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Peida loendis uued märguanded"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Kuva loendis kõik märguanded"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Rakenduse märguanded"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Muud helid"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Valimisklahvistiku toonid"</string>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index bc0ce3b..16820ab 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"هیچکدام"</item>
<item msgid="8673874894887358090">"دستی"</item>
+ <item msgid="168893341855953140">"پیکربندی خودکار پروکسی"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"هیچکدام"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"میزان صدای زنگ هشدار"</item>
<item msgid="785049718065337473">"میزان صدای اعلان"</item>
<item msgid="6700305533746877052">"میزان صدای بلوتوث"</item>
- <item msgid="2029227495214047094">"بیدار باش"</item>
- <item msgid="26109888160231211">"کنترل موقعیت مکانی"</item>
- <item msgid="5753382310468855812">"کنترل مکان پرقدرت"</item>
+ <item msgid="3810969981743709839">"صدادار/بیصداکردن میکروفون"</item>
+ <item msgid="2627903914574908209">"بیدارباش"</item>
+ <item msgid="1395372654968157578">"کنترل موقعیت مکانی"</item>
+ <item msgid="3238451051299611853">"کنترل مکان پرقدرت"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"موقعیت مکانی"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"میزان صدای زنگ هشدار"</item>
<item msgid="9103719301075748925">"میزان صدای اعلان"</item>
<item msgid="7025966722295861512">"میزان صدای بلوتوث"</item>
- <item msgid="4665183401128289653">"بیدار باش"</item>
- <item msgid="8584357129746649222">"موقعیت مکانی"</item>
+ <item msgid="2265317984004577529">"صدادار/بیصداکردن میکروفون"</item>
+ <item msgid="3646325683886507917">"بیدار باش"</item>
<item msgid="7669257279311110599">"مکان"</item>
+ <item msgid="7745724368696313169">"مکان"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"کوتاه"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"زرد در آبی"</item>
<item msgid="7169235156349580064">"سفارشی"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (اشکالزدایی)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"۶۴ کیلوبایت"</item>
+ <item msgid="505611754508988476">"۲۵۶ کیلوبایت"</item>
+ <item msgid="6361286924268716397">"۱ مگابایت"</item>
+ <item msgid="6405203239560695266">"۴ مگابایت"</item>
+ <item msgid="3025431211013424097">"۱۶ مگابایت"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"استفاده از Dalvik"</item>
- <item msgid="5131846588686178907">"استفاده از ART"</item>
- <item msgid="4530003713865319928">"استفاده از نسخه اشکالزدایی ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"۶۴K در حافظه موقت ثبت"</item>
+ <item msgid="2822309747675758628">"۲۵۶Kدر حافظه موقت ثبت"</item>
+ <item msgid="6699306198357496731">"۱Mدر حافظه موقت ثبت"</item>
+ <item msgid="5748528643937500349">"۴M در حافظه موقت ثبت"</item>
+ <item msgid="1978629051085111592">"۱۶M در حافظه موقت ثبت"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"هرگز بررسی نشود"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"وقفههای محدود"</item>
<item msgid="8735337502532332056">"بدون وقفه"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"عادی"</item>
+ <item msgid="866544120205026771">"متوسط"</item>
+ <item msgid="7851902244436886890">"کم"</item>
+ <item msgid="3022922196817563960">"خیلی کم"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"دائمی"</item>
+ <item msgid="5779398140277006695">"فعالیت برتر"</item>
+ <item msgid="1439598363694578255">"مهم (پیشزمینه)"</item>
+ <item msgid="3396458970745718652">"مهم (پسزمینه)"</item>
+ <item msgid="5214825238247511992">"پشتیبانگیری"</item>
+ <item msgid="311372689168254967">"سنگین وزن"</item>
+ <item msgid="7438189122367820362">"سرویس (در حال اجرا)"</item>
+ <item msgid="918687422516982498">"سرویس (در حال شروع مجدد)"</item>
+ <item msgid="6807727069641853029">"دریافتکننده"</item>
+ <item msgid="6782857406100845127">"صفحه اصلی"</item>
+ <item msgid="2860945127596974299">"آخرین فعالیت"</item>
+ <item msgid="8610560843693675830">"قرار داده شده در حافظه پنهان (فعالیت)"</item>
+ <item msgid="4338089220026248848">"قرار داده شده در حافظه پنهان (کلاینت فعالیت)"</item>
+ <item msgid="6652164677254579050">"قرار داده شده در حافظه پنهان (خالی)"</item>
+ </string-array>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0278e97..4a365a2 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"اگر قسمت میزبان خالی است، قسمت درگاه باید خالی باشد."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"درگاهی که وارد کردید معتبر نیست."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"از پروکسی HTTP توسط مرورگرها استفاده میشود اما ممکن است توسط برنامههای دیگر استفاده نشود."</string>
- <string name="proxy_url" msgid="2523518669129974654">"نشانی اینترنتی PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"نشانی اینترنتی PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"مکان:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID مجاور:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"نمایش اطلاعات نمایه در صفحه قفل"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"اطلاعات نمایه"</string>
<string name="location_settings_title" msgid="1369675479310751735">"مکان"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"حسابها"</string>
<string name="security_settings_title" msgid="7945465324818485460">"امنیت"</string>
<string name="security_settings_summary" msgid="967393342537986570">"تنظیم مکان من، قفل صفحه، قفل سیم کارت، قفل محل ذخیره اطلاعات کاربری"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"تنظیم مکان من، بازگشایی قفل صفحه، قفل محل ذخیره اطلاعات کاربری"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"رمزگذاری"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"هنگام رمزگذاری رایانهٔ لوحی خود، منتظر بمانید. <xliff:g id="PERCENT">^1</xliff:g> کامل شد."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"هنگام رمزگذاری گوشی خود، منتظر بمانید. <xliff:g id="PERCENT">^1</xliff:g>% کامل شد."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"وقتی رایانه لوحیتان رمزگذاری میشود، منتظر بمانید. مدت زمان باقیمانده: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"وقتی تلفنتان رمزگذاری میشود، منتظر بمانید. مدت زمان باقیمانده: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"پس از <xliff:g id="DELAY">^1</xliff:g> ثانیه دوباره امتحان کنید."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"گذرواژهٔ خود را تایپ کنید"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"رمزگذاری ناموفق"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"هنگام اتصال یا جدا کردن رایانهٔ لوحی از جایگاه، صدا پخش نشود"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"هنگام اتصال یا جدا کردن گوشی از دستگاه، صدا پخش نشود"</string>
<string name="account_settings" msgid="6403589284618783461">"حسابها"</string>
+ <string name="category_personal" msgid="1299663247844969448">"شخصی"</string>
+ <string name="category_work" msgid="8699184680584175622">"محل کار"</string>
<string name="search_settings" msgid="1910951467596035063">"جستجو"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"مدیریت تنظیمات جستجو و سابقه"</string>
<string name="display_settings" msgid="7965901687241669598">"صفحهٔ نمایش"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"گزینههای برنامهنویسان"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"تنظیم گزینههای مربوط به طراحی برنامه"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"گزینههای برنامهنویس برای این کاربر موجود نیست"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"تنظیمات VPN برای این کاربر در دسترس نیست"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"تنظیمات تترینگ برای این کاربر در دسترس نیست"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"تنظیمات نام تقطه دسترسی برای این کاربر در دسترس نیست"</string>
<string name="enable_adb" msgid="7982306934419797485">"رفع عیب USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"با اتصال USB حالت رفع عیب فعال شود"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"لغو مجوزهای اشکالزدایی USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"صفحه هرگز در حین شارژ شدن به حالت خواب نمیرود"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"فعال کردن گزارش تجسس Bluetooth HCI"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ذخیره تمامی بستههای HCI بلوتوث در یک فایل"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"انتخاب زمان اجرا"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"انتخاب زمان اجرا"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"برای تغییر زمان اجرا از <xliff:g id="OLD">%1$s</xliff:g> به <xliff:g id="NEW">%2$s</xliff:g> دوباره راهاندازی شود؟"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"گواهینامه نمایش بدون سیم"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"فعال کردن گزارشگیری طولانی WiFi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Wifi فعال برای واگذاری به شبکه سلولی"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"همواره به اسکنهای رومینگ Wifi اجازه داده شود"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"نمایش گزینهها برای گواهینامه نمایش بدون سیم"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"افزایش سطح گزارشگیری Wifi، نمایش به ازای SSID RSSI در انتخابگر WiFi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"وقتی فعال است، در شرایط پایین بودن سیگنال، Wifi برای واگذار کردن اتصال داده به شبکه سلولی فعالتر خواهد بود."</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"فعال/غیرفعال کردن اسکنهای رومینگ Wifi براساس مقدار داده ترافیک حاضر در واسط"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"اندازههای حافظه موقت ثبتکننده"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"انتخاب اندازه ثبتکننده در حافظه موقت ثبت"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"مکانهای کاذب مجاز هستند"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"مکانهای کاذب مجاز هستند"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"رفع عیب USB انجام شود؟"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"مدت اجرا"</string>
<string name="services_subtitle" msgid="4296402367067266425">"خدمات"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"مدت"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"جزئیات حافظه"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"وضعیتهای حافظه"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"استفاده از حافظه"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"مرکزی"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"حافظه پردازش"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"حافظههای پنهان مرکزی"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"تعویض ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"آزاد"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"مجموع"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"۳ ساعت"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"۶ ساعت"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"۱۲ ساعت"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"حذف تمام گواهیها"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"اطلاعات کاربری قابل اطمینان"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"نمایش گواهیهای CA قابل اطمینان"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"پیشرفته"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"نوع ذخیرهسازی"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"سختافزاری"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"فقط نرمافزاری"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"اطلاعات کاربری این کاربر در دسترس نیست"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"رسم الگوی بازگشایی"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"باید الگوی بازگشایی را رسم کنید تا نصب مدارک صلاحیت تأیید شود."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"برای ادامه تنظیم "<b>"بعدی"</b>" را لمس نمایید.\n\nبرای اتصال به یک شبکه Wi-Fi دیگر "<b>"بازگشت"</b>" را لمس کنید."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"همگامسازی فعال شد"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"همگامسازی غیر فعال شد"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"در حال همگامسازی"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"خطای همگامسازی."</string>
<string name="sync_failed" msgid="1696499856374109647">"همگامسازی انجام نشد"</string>
<string name="sync_active" msgid="8476943765960863040">"همگامسازی فعال"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"نمایش مرزها، حاشیهها و ویژگیهای دیگر کلیپ."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"اجباری کردن چیدمان RTL"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"اجباری کردن چیدمان RTL صفحه برای همه زبانها"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"حالت کم مصرف"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"فعال کردن تنظیمات صرفهجویی در مصرف باتری"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"نمایش میزان استفاده از CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"همپوشانی صفحهٔ نمایش میزان استفاده از CPU فعلی"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"اجبار به تفسیر و اجرای GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"نمایش همه محتوای اعلان"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"پنهان کردن محتوای حساس اعلان"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"هرگز اعلان نشان داده نشود"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"وقتی حالت «مزاحم نشوید» روشن است"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"پنهان کردن اعلانهای جدید از لیست"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"نمایش همه اعلانها در لیست"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"اعلانهای برنامه"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"سایر صداها"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"آهنگهای صفحه شمارهگیری"</string>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index afec3a9..ff84bc2 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Ei mitään"</item>
<item msgid="8673874894887358090">"Manuaalinen"</item>
+ <item msgid="168893341855953140">"Välitysp. autom. määritys"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Ei mitään"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"hälytyksen äänenvoimakkuus"</item>
<item msgid="785049718065337473">"ilmoituksen äänenvoimakkuus"</item>
<item msgid="6700305533746877052">"bluetooth-äänenvoimakkuus"</item>
- <item msgid="2029227495214047094">"ei virransäästötilaa"</item>
- <item msgid="26109888160231211">"sijainnin seuranta"</item>
- <item msgid="5753382310468855812">"seuraa suuritehoista sijaintia"</item>
+ <item msgid="3810969981743709839">"mykistä mikrofoni / poista mykistys"</item>
+ <item msgid="2627903914574908209">"ei virransäästötilaa"</item>
+ <item msgid="1395372654968157578">"sijainnin seuranta"</item>
+ <item msgid="3238451051299611853">"suuritehoinen sijainnin seuranta"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Sijainti"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Hälytyksen voimakkuus"</item>
<item msgid="9103719301075748925">"Ilmoituksen äänenvoimakkuus"</item>
<item msgid="7025966722295861512">"Bluetooth-äänenvoimakkuus"</item>
- <item msgid="4665183401128289653">"Ei virransäästötilaa"</item>
- <item msgid="8584357129746649222">"Sijainti"</item>
+ <item msgid="2265317984004577529">"Mykistä mikrofoni / poista mykistys"</item>
+ <item msgid="3646325683886507917">"Ei virransäästötilaa"</item>
<item msgid="7669257279311110599">"Sijainti"</item>
+ <item msgid="7745724368696313169">"Sijainti"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Lyhyt"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Keltainen sinisellä"</item>
<item msgid="7169235156349580064">"Muokattu"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (virheenkorjaus)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 kt"</item>
+ <item msgid="505611754508988476">"256 kt"</item>
+ <item msgid="6361286924268716397">"1 Mt"</item>
+ <item msgid="6405203239560695266">"4 Mt"</item>
+ <item msgid="3025431211013424097">"16 Mt"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Käytä Dalvik-ympäristöä"</item>
- <item msgid="5131846588686178907">"Käytä ART-ympäristöä"</item>
- <item msgid="4530003713865319928">"Käytä ART-virheenkorjauskoontiversiota"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 kt / lokipuskuri"</item>
+ <item msgid="2822309747675758628">"256 kt / lokipusk."</item>
+ <item msgid="6699306198357496731">"1 Mt / lokipuskuri"</item>
+ <item msgid="5748528643937500349">"4 Mt / lokipuskuri"</item>
+ <item msgid="1978629051085111592">"16 Mt / lokipuskuri"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Älä tarkista koskaan"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Mahdollisimman vähän häiriöitä"</item>
<item msgid="8735337502532332056">"Ei häiriöitä"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normaali"</item>
+ <item msgid="866544120205026771">"Keskitaso"</item>
+ <item msgid="7851902244436886890">"Matala"</item>
+ <item msgid="3022922196817563960">"Kriittinen"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Pysyvä"</item>
+ <item msgid="5779398140277006695">"Tärkein toiminta"</item>
+ <item msgid="1439598363694578255">"Tärkeä (etualalla)"</item>
+ <item msgid="3396458970745718652">"Tärkeä (taustalla)"</item>
+ <item msgid="5214825238247511992">"Varmuuskopio"</item>
+ <item msgid="311372689168254967">"Resursseja kuluttava"</item>
+ <item msgid="7438189122367820362">"Palvelu (käynnissä)"</item>
+ <item msgid="918687422516982498">"Palvelu (käynnistyy uudelleen)"</item>
+ <item msgid="6807727069641853029">"Vastaanottaja"</item>
+ <item msgid="6782857406100845127">"Aloitusruutu"</item>
+ <item msgid="2860945127596974299">"Viimeinen toiminta"</item>
+ <item msgid="8610560843693675830">"Välimuistissa (toiminta)"</item>
+ <item msgid="4338089220026248848">"Välimuistissa (toiminnan suorittaja)"</item>
+ <item msgid="6652164677254579050">"Välimuistissa (tyhjä)"</item>
+ </string-array>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 174734a..7fe222a 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portti-kentän täytyy olla tyhjä, jos isäntä-kenttä on tyhjä."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Antamasi portti on virheellinen."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Selain saa käyttää HTTP-välityspalvelinta mutta muut sovellukset eivät."</string>
- <string name="proxy_url" msgid="2523518669129974654">"Välityspalvelimen automaattisen määrityksen URL-osoite: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"Välitysp. aut. määr. URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Sijainti:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naapuri-CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Näytä profiilin tiedot lukitusruudulla"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profiilin tiedot"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Sijainti"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Tilit"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Suojaus"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Aseta Oma sijainti, näytön lukituksen poisto, SIM-kortin lukitus, käyttöoikeustietojen tallennustilan lukitus"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Aseta Oma sijainti, näytön lukituksen poisto, käyttöoikeustietojen tallennustilan lukitus"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Salaus käynnissä"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Odota, tablet-laitetta salataan. <xliff:g id="PERCENT">^1</xliff:g> % valmiina."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Odota, puhelinta salataan. <xliff:g id="PERCENT">^1</xliff:g> % valmiina."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Odota, tablet-laitteesi salataan. Aikaa jäljellä: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Odota, puhelimesi salataan. Aikaa jäljellä: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Yritä uudelleen <xliff:g id="DELAY">^1</xliff:g> sekunnin kuluttua."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Kirjoita salasana"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Salaus epäonnistui"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Älä toista ääntä, kun tablet-laite asetetaan telakkaan tai poistetaan telakasta"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Älä toista ääntä, kun puhelinta liitetään telakkaan tai irrotetaan telakasta"</string>
<string name="account_settings" msgid="6403589284618783461">"Tilit"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Henkilökohtainen"</string>
+ <string name="category_work" msgid="8699184680584175622">"Työ"</string>
<string name="search_settings" msgid="1910951467596035063">"Haku"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Hallinnoi hakuasetuksia ja historiaa"</string>
<string name="display_settings" msgid="7965901687241669598">"Ruutu"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Kehittäjävaihtoehdot"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Valitse sovellusten kehittämisasetukset"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Tämä käyttäjä ei voi käyttää kehittäjäasetuksia"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Tämä käyttäjä ei voi käyttää VPN-asetuksia"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Tämä käyttäjä ei voi käyttää yhteyden jakamisasetuksia"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Tämä käyttäjä ei voi käyttää APN-asetuksia"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB-vianetsintä"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Vianetsintätila USB-liitännän ollessa käytössä"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Peruuta USB-vianetsinnän käyttöoikeudet"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Näyttö ei sammu puhelimen latautuessa"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ota Bluetoothin HCI-tarkkailuloki käyttöön"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tallenna kaikki Bluetoothin HCl-paketit tiedostoon"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Valitse suoritusympäristö"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Valitse suoritusympäristö"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Käynnistetäänkö uudelleen niin, että suoritusympäristö on <xliff:g id="OLD">%1$s</xliff:g> eikä <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Langattoman näytön sertifiointi"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Käytä Wi-Fin laajennettua lokikirjausta"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Aggressiivinen handover: Wi-Fi-matkapuh."</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Salli Wi-Fi-verkkovierailuskannaus aina"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Näytä langattoman näytön sertifiointiin liittyvät asetukset"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Nosta Wi-Fi-lokitasoa, näytä kunkin SSID:n signaalin vahvuus Wi-Fi-valitsimessa"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Kun asetus on käytössä, Wi-Fi siirtää datayhteyden aggressiivisemmin matkapuhelinverkolle, jos Wi-Fi-signaali on heikko."</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Salli/estä Wi-Fi-verkkovierailuskannaus liittymässä esiintyvän dataliikenteen perusteella"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Lokipuskurien koot"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Valitse puskurikohtaiset lokikoot"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Salli sijaintien imitointi"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Salli sijaintien imitointi"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Sallitaanko USB-vianetsintä?"</string>
@@ -1601,6 +1613,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Käyttöaika"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Palvelut"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Kesto"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Muistitiedot"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Muistitilat"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Muistin käyttö"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Natiivi"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Kernel-välimuistit"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam-heittovaihto"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Vapaa"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Yhteensä"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 tuntia"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 tuntia"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 tuntia"</string>
@@ -1698,9 +1719,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Poista kaikki varmenteet"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Luotetut todennustiedot"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Näytä luotetut CA-varmenteet"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Lisäasetukset"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Tallennustilan tyyppi"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Laitteiston tukema"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Vain ohjelmisto"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Kirjautumistunnukset eivät ole tämän käyttäjän käytettävissä"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Piirrä lukituksenpoistokuvio"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Vahvista kirjautumistunnuksien asennus piirtämällä lukituksenpoistokuviosi."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1781,6 +1804,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Jatka asetuksien määrittämistä koskettamalla "<b>"Seuraava"</b>".\n\nMuodosta yhteys eri wifi-verkkoon koskettamalla "<b>"Takaisin"</b>"."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronointi käytössä"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronointi pois käytöstä"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synkronoidaan nyt"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Synkronointivirhe."</string>
<string name="sync_failed" msgid="1696499856374109647">"Synkronointi epäonnistui"</string>
<string name="sync_active" msgid="8476943765960863040">"Synkronointi käytössä"</string>
@@ -1873,8 +1897,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Näytä leikkeiden rajat, marginaalit jne."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Pakota RTL-ulkoasun suunta"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Pakota kaikkien kielten näytön ulkoasun suunnaksi RTL"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Virransäästötila"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Ota virransäästöasetukset käyttöön"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Näytä suorittimen käyttö"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Näytön peittokuva näyttää nykyisen suoritinkäytön"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Pakota GPU-hahmonnus"</string>
@@ -2151,9 +2173,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Näytä ilmoitusten koko sisältö"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Piilota henkilökohtainen ilmoitussisältö"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Älä näytä ilmoituksia lainkaan"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Kun älä häiritse -tila on käytössä"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Piilota uudet ilmoitukset luettelosta"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Näytä kaikki ilmoitukset luettelossa"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Sovellusilmoitukset"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Muut äänet"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Näppäimistön näppäinäänet"</string>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 61275ff..c7016df 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Aucun"</item>
<item msgid="8673874894887358090">"Manuel"</item>
+ <item msgid="168893341855953140">"Config. auto du mandataire"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Aucun"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"volume des alarmes"</item>
<item msgid="785049718065337473">"volume des notifications"</item>
<item msgid="6700305533746877052">"volume Bluetooth"</item>
- <item msgid="2029227495214047094">"maintenir activé"</item>
- <item msgid="26109888160231211">"suivre la position"</item>
- <item msgid="5753382310468855812">"surveiller les lieux de grande puissance"</item>
+ <item msgid="3810969981743709839">"activer/désactiver le micro"</item>
+ <item msgid="2627903914574908209">"maintenir activé"</item>
+ <item msgid="1395372654968157578">"surveiller la position"</item>
+ <item msgid="3238451051299611853">"surveiller les requêtes de localisation qui nécessitent une quantité d\'énergie importante"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Position"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Volume de l\'alarme"</item>
<item msgid="9103719301075748925">"Volume des notifications"</item>
<item msgid="7025966722295861512">"Volume Bluetooth"</item>
- <item msgid="4665183401128289653">"Maintenir activé"</item>
- <item msgid="8584357129746649222">"Lieu"</item>
+ <item msgid="2265317984004577529">"Activer/Désactiver le micro"</item>
+ <item msgid="3646325683886507917">"Maintenir activé"</item>
<item msgid="7669257279311110599">"Position"</item>
+ <item msgid="7745724368696313169">"Lieu"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Court-métrage"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Texte jaune sur fond bleu"</item>
<item msgid="7169235156349580064">"Personnalisé"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (débogage)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 ko"</item>
+ <item msgid="505611754508988476">"256 ko"</item>
+ <item msgid="6361286924268716397">"1 Mo"</item>
+ <item msgid="6405203239560695266">"4 Mo"</item>
+ <item msgid="3025431211013424097">"16 Mo"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Utiliser Dalvik"</item>
- <item msgid="5131846588686178907">"Utiliser ART"</item>
- <item msgid="4530003713865319928">"Utiliser la version de débogage ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"1 ko/tampon journal"</item>
+ <item msgid="2822309747675758628">"256 Ko/tampon journal"</item>
+ <item msgid="6699306198357496731">"1 Mo/tampon journal"</item>
+ <item msgid="5748528643937500349">"4 Mo/tampon journal"</item>
+ <item msgid="1978629051085111592">"16 Mo/tampon journal"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Ne jamais vérifier"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Interruptions limitées"</item>
<item msgid="8735337502532332056">"Aucune interruption"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normale"</item>
+ <item msgid="866544120205026771">"Modérée"</item>
+ <item msgid="7851902244436886890">"Faible"</item>
+ <item msgid="3022922196817563960">"Critique"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Permanent"</item>
+ <item msgid="5779398140277006695">"Activité principale"</item>
+ <item msgid="1439598363694578255">"Important (premier plan)"</item>
+ <item msgid="3396458970745718652">"Important (arrière-plan)"</item>
+ <item msgid="5214825238247511992">"Sauvegarde"</item>
+ <item msgid="311372689168254967">"Poids lourd"</item>
+ <item msgid="7438189122367820362">"Service (en cours)"</item>
+ <item msgid="918687422516982498">"Service (redémarrage)"</item>
+ <item msgid="6807727069641853029">"Récepteur"</item>
+ <item msgid="6782857406100845127">"Accueil"</item>
+ <item msgid="2860945127596974299">"Dernière activité"</item>
+ <item msgid="8610560843693675830">"Mise en cache (activité)"</item>
+ <item msgid="4338089220026248848">"Mise en cache (client d\'activité)"</item>
+ <item msgid="6652164677254579050">"Mise en cache (vide)"</item>
+ </string-array>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 5a8a804..f1e19b2 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Le champ Port doit rester vide si le champ Hôte n\'est pas renseigné."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Le port indiqué n\'est pas valide."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Le serveur mandataire HTTP est utilisé par le navigateur, mais ne peut pas l\'être par les autres applications."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL de configuration automatique de mandataire : "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL de configuration automatique de mandataire : "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Emplacement :"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID voisin :"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Infos sur la cellule :"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Afficher infos de profil sur écran de verrouillage"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Infos de profil"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Position"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Sécurité"</string>
<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 les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Chiffrement en cours"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Veuillez patienter pendant le chiffrement de votre tablette. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Veuillez patienter pendant le chiffrement de votre téléphone. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Veuillez patienter pendant le chiffrement de votre tablette. Temps restant : <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Veuillez patienter pendant le chiffrement de votre téléphone. Temps restant : <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Réessayez dans <xliff:g id="DELAY">^1</xliff:g> secondes."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Saisissez votre mot de passe."</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Échec du chiffrement"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"N\'émettre aucun son lorsque la tablette est insérée dans la station d\'accueil ou retirée de celle-ci"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"N\'émettre aucun son lorsque le téléphone est inséré dans la station d\'accueil ou retiré de celle-ci"</string>
<string name="account_settings" msgid="6403589284618783461">"Comptes"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Personnel"</string>
+ <string name="category_work" msgid="8699184680584175622">"Travail"</string>
<string name="search_settings" msgid="1910951467596035063">"Rechercher"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Configurer les paramètres et l\'historique de recherche"</string>
<string name="display_settings" msgid="7965901687241669598">"Affichage"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Options pour les développeurs"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Définir les options pour le développement de l\'application"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Les options proposées aux développeurs ne sont pas disponibles pour cet utilisateur."</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Les paramètres de RPV ne sont pas disponibles pour cet utilisateur"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Les paramètres de partage de connexion ne sont pas disponibles pour cet utilisateur"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Les paramètres de point d\'accès ne sont pas disponibles pour cet utilisateur"</string>
<string name="enable_adb" msgid="7982306934419797485">"Débogage USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Mode débogage lorsqu\'un câble USB est connecté"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Annuler les autorisations relatives au débogage USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"L\'écran ne se met jamais en veille lors du chargement"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activer le journal HCI Snoop Bluetooth"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturer tous les paquets HCI Bluetooth dans un fichier"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Sélect. moteur d\'exécution"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Sélect. moteur d\'exécution"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Redémarrer pour remplacer le moteur d\'exécution <xliff:g id="OLD">%1$s</xliff:g> par <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certification de l\'affichage sans fil"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Autoriser descr. détaillés journaux Wi-fi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Passage forcé du Wi-Fi aux données cellulaires"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Toujours autoriser la détection de réseaux Wi-Fi pour l\'itinérance"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Afficher les options pour la certification d\'affichage sans fil"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Augmenter détails dans journaux Wi-fi, afficher par SSID RSSI dans sélecteur Wi-fi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Si cette option est activée, le passage du Wi-Fi aux données cellulaires est forcé lorsque le signal Wi-Fi est faible"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Autoriser ou non la détection de réseaux Wi-Fi pour l\'itinérance en fonction de l\'importance du trafic de données dans l\'interface"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Tailles des mémoires tampons d\'enregistreur"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Tailles enreg. par tampon journal"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Autoriser les positions fictives"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Autoriser le débogage USB?"</string>
@@ -1587,6 +1599,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Durée d\'exécution"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durée"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Détails de la mémoire"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"États de la mémoire"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Utilisation de la mémoire"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Noyau"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Natif"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Caches du noyau"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Échange de zRAM"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Disponible"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 heures"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 heures"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 heures"</string>
@@ -1684,9 +1705,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Supprimer tous les certificats"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Certificats de confiance"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Afficher les certificats d\'autorité de confiance"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Avancés"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Type de stockage"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Intégré au matériel"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Uniquement logiciel"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Les identifiants ne sont pas accessibles pour cet utilisateur"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dessinez votre schéma de déverrouillage."</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Pour confirmer l\'installation des certificats, vous devez dessiner votre schéma de déverrouillage."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1767,6 +1790,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Appuyez sur "<b>"Suivant"</b>" pour poursuivre la configuration.\n\nAppuyez sur "<b>"Précédent"</b>" pour vous connecter à un autre réseau Wi-Fi."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisation activée"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronisation désactivée"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synchronisation en cours…"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Erreur de synchronisation."</string>
<string name="sync_failed" msgid="1696499856374109647">"Échec de la synchronisation"</string>
<string name="sync_active" msgid="8476943765960863040">"Synchronisation activée"</string>
@@ -1859,8 +1883,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Afficher les limites, les marges de clip, etc."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forcer orient. : g. à d."</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forcer l\'orientation: g. à droite (toutes langues)"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Mode Économie d\'énergie"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Activer les paramètres d\'économie d\'énergie"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Afficher mém. CPU utilisée"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposition écran indiquant mémoire CPU utilisée"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Forcer le rendu GPU"</string>
@@ -2139,9 +2161,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher l\'intégralité du contenu des notifications"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Masquer le contenu sensible des notifications"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"N\'afficher aucune notification"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Quand la fonction « Ne pas déranger » est activée"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Masquer les nouvelles notifications de la liste"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Afficher toutes les notifications de la liste"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Notifications de l\'application"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Autres sons"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonalités du clavier"</string>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index ae322a3..f0c7f9b 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Aucun"</item>
<item msgid="8673874894887358090">"Manuel"</item>
+ <item msgid="168893341855953140">"Configuration auto du proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Aucune"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"volume des alarmes"</item>
<item msgid="785049718065337473">"volume des notifications"</item>
<item msgid="6700305533746877052">"volume Bluetooth"</item>
- <item msgid="2029227495214047094">"maintenir activé"</item>
- <item msgid="26109888160231211">"suivre la position"</item>
- <item msgid="5753382310468855812">"surveiller les requêtes de localisation qui nécessitent une quantité d\'énergie importante"</item>
+ <item msgid="3810969981743709839">"activer/désactiver le micro"</item>
+ <item msgid="2627903914574908209">"maintenir activé"</item>
+ <item msgid="1395372654968157578">"surveiller la position"</item>
+ <item msgid="3238451051299611853">"surveiller les requêtes de localisation qui utilisent la batterie de manière intensive"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Position"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Volume de l\'alarme"</item>
<item msgid="9103719301075748925">"Volume des notifications"</item>
<item msgid="7025966722295861512">"Volume Bluetooth"</item>
- <item msgid="4665183401128289653">"Maintenir activé"</item>
- <item msgid="8584357129746649222">"Localisation"</item>
+ <item msgid="2265317984004577529">"Activer/Désactiver le micro"</item>
+ <item msgid="3646325683886507917">"Maintenir activé"</item>
<item msgid="7669257279311110599">"Localisation"</item>
+ <item msgid="7745724368696313169">"Position"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Court"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Texte jaune sur fond bleu"</item>
<item msgid="7169235156349580064">"Personnalisé"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (débogage)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 Ko"</item>
+ <item msgid="505611754508988476">"256 Ko"</item>
+ <item msgid="6361286924268716397">"1 Mo"</item>
+ <item msgid="6405203239560695266">"4 Mo"</item>
+ <item msgid="3025431211013424097">"16 Mo"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Utiliser Dalvik"</item>
- <item msgid="5131846588686178907">"Utiliser ART"</item>
- <item msgid="4530003713865319928">"Utiliser le build de débogage ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 Ko/tampon journal"</item>
+ <item msgid="2822309747675758628">"256 Ko/tampon journal"</item>
+ <item msgid="6699306198357496731">"1 Mo/tampon journal"</item>
+ <item msgid="5748528643937500349">"4 Mo/tampon journal"</item>
+ <item msgid="1978629051085111592">"16 Mo/tampon journal"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Ne jamais vérifier"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Interruptions limitées"</item>
<item msgid="8735337502532332056">"Aucune interruption"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normale"</item>
+ <item msgid="866544120205026771">"Moyenne"</item>
+ <item msgid="7851902244436886890">"Faible"</item>
+ <item msgid="3022922196817563960">"Critique"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Permanent"</item>
+ <item msgid="5779398140277006695">"Activité principale"</item>
+ <item msgid="1439598363694578255">"Important (premier plan)"</item>
+ <item msgid="3396458970745718652">"Important (arrière-plan)"</item>
+ <item msgid="5214825238247511992">"Sauvegarde"</item>
+ <item msgid="311372689168254967">"Haute densité"</item>
+ <item msgid="7438189122367820362">"Service (en cours)"</item>
+ <item msgid="918687422516982498">"Service (redémarrage)"</item>
+ <item msgid="6807727069641853029">"Récepteur"</item>
+ <item msgid="6782857406100845127">"Accueil"</item>
+ <item msgid="2860945127596974299">"Dernière activité"</item>
+ <item msgid="8610560843693675830">"Mise en cache (activité)"</item>
+ <item msgid="4338089220026248848">"Mise en cache (client d\'activité)"</item>
+ <item msgid="6652164677254579050">"Mise en cache (vide)"</item>
+ </string-array>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 31bb1cb..8ae6f51 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Le champ Port doit rester vide si le champ Hôte n\'est pas renseigné."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Le port indiqué n\'est pas valide."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Le proxy HTTP est utilisé par le navigateur, mais ne peut pas l\'être par les autres applications."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL de configuration automatique de proxy : "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL config. auto proxy : "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Emplacement :"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID voisin :"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Infos sur la cellule :"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Afficher infos de profil sur écran de verrouillage"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Infos de profil"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Localisation"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Comptes"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Sécurité"</string>
<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 les paramètres de la fonction Ma position, de déverrouillage de l\'écran et de verrouillage du stockage des identifiants"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Chiffrement en cours"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Veuillez patienter pendant le chiffrement de votre tablette. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Veuillez patienter pendant le chiffrement de votre téléphone. <xliff:g id="PERCENT">^1</xliff:g> % effectué(s)."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Veuillez patienter pendant le chiffrement de votre tablette. Temps restant : <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Veuillez patienter pendant le chiffrement de votre téléphone. Temps restant : <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Réessayez dans <xliff:g id="DELAY">^1</xliff:g> secondes."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Saisissez votre mot de passe."</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Échec du chiffrement"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"N\'émettre aucun son lorsque la tablette est insérée dans la station d\'accueil ou retirée de celle-ci"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"N\'émettre aucun son lorsque le téléphone est inséré dans la station d\'accueil ou retiré de celle-ci"</string>
<string name="account_settings" msgid="6403589284618783461">"Comptes"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Personnel"</string>
+ <string name="category_work" msgid="8699184680584175622">"Professionnel"</string>
<string name="search_settings" msgid="1910951467596035063">"Recherche"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Configurer les paramètres et l\'historique de recherche"</string>
<string name="display_settings" msgid="7965901687241669598">"Affichage"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Options pour les développeurs"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Définir les options pour le développement de l\'application"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Les options proposées aux développeurs ne sont pas disponibles pour cet utilisateur."</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Les paramètres VPN ne sont pas disponibles pour cet utilisateur."</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Les paramètres de partage de connexion ne sont pas disponibles pour cet utilisateur."</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Les paramètres de point d\'accès ne sont pas disponibles pour cet utilisateur."</string>
<string name="enable_adb" msgid="7982306934419797485">"Débogage USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Mode débogage lorsqu\'un câble USB est connecté"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Annuler autorisations pour débog. USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"L\'écran ne se met jamais en veille lors du chargement."</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activer journaux HCI Bluetooth"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Enregistrer tous les paquets HCI Bluetooth dans un fichier"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Sélect. moteur d\'exécution"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Sélect. moteur d\'exécution"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Redémarrer pour remplacer le moteur d\'exécution <xliff:g id="OLD">%1$s</xliff:g> par <xliff:g id="NEW">%2$s</xliff:g> ?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certification de l\'affichage sans fil"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Autoriser enreg. infos Wi-Fi détaillées"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Passage forcé du Wi-Fi aux données mobiles"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Toujours autoriser la détection de réseaux Wi-Fi pour l\'itinérance"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Afficher les options de la certification de l\'affichage sans fil"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Détailler davantage les infos Wi-Fi, afficher par SSID RSSI dans sélecteur Wi-Fi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Si cette option est activée, le passage du Wi-Fi aux données mobiles est forcé lorsque le signal Wi-Fi est faible."</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Autoriser ou non la détection de réseaux Wi-Fi pour l\'itinérance en fonction de l\'importance du trafic de données dans l\'interface"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Tailles des mémoires tampons Logger"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Tailles Logger par tampon journal"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Positions fictives"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Autoriser les positions fictives"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Autoriser le débogage USB ?"</string>
@@ -1587,6 +1599,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Durée d\'exécution"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durée"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Détails de la mémoire"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"États de la mémoire"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Utilisation de la mémoire"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Noyau"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Natif"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Caches du noyau"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Échange ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Gratuit"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 heures"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 heures"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 heures"</string>
@@ -1684,9 +1705,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Supprimer tous les certificats"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Certificats de confiance"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Afficher les certificats d\'autorité de confiance"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Paramètres avancés"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Type de stockage"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Intégré au matériel"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Uniquement logiciel"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Les identifiants ne sont pas disponibles pour cet utilisateur."</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dessinez votre schéma de déverrouillage."</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Pour confirmer l\'installation des certificats, vous devez dessiner votre schéma de déverrouillage."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1767,6 +1790,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Appuyez sur "<b>"Suivant"</b>" pour poursuivre la configuration.\n\nAppuyez sur "<b>"Précédent"</b>" pour vous connecter à un autre réseau Wi-Fi."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisation activée"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronisation désactivée"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synchronisation en cours"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Erreur de synchronisation."</string>
<string name="sync_failed" msgid="1696499856374109647">"Échec de la synchronisation"</string>
<string name="sync_active" msgid="8476943765960863040">"Synchronisation activée"</string>
@@ -1859,8 +1883,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Afficher les limites, les marges de clip, etc."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forcer droite à gauche"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forcer orient. droite à gauche pour toutes langues"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Mode Économie d\'énergie"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Activer les paramètres d\'économie d\'énergie"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Afficher mém. CPU utilisée"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Superposition écran indiquant mémoire CPU utilisée"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Forcer le rendu GPU"</string>
@@ -2139,9 +2161,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afficher l\'intégralité du contenu des notifications"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Masquer le contenu sensible des notifications"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"N\'afficher aucune notification"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Lorsque le mode Ne pas déranger est activé"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Masquer les nouvelles notifications dans la liste"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Afficher toutes les notifications dans la liste"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Notifications de l\'application"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Autres sons"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonalités du clavier"</string>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index 2471a8f..51347e5 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"कोई नहीं"</item>
<item msgid="8673874894887358090">"मैन्युअल"</item>
+ <item msgid="168893341855953140">"प्रॉक्सी स्वत: कॉन्फ़िग"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"कोई नहीं"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"अलार्म आवाज़"</item>
<item msgid="785049718065337473">"सूचना वॉल्यूम"</item>
<item msgid="6700305533746877052">"bluetooth आवाज़"</item>
- <item msgid="2029227495214047094">"सचेत रखें"</item>
- <item msgid="26109888160231211">"मॉनिटर का स्थान"</item>
- <item msgid="5753382310468855812">"उच्च पावर वाले स्थान की निगरानी करें"</item>
+ <item msgid="3810969981743709839">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
+ <item msgid="2627903914574908209">"सक्रिय रखें"</item>
+ <item msgid="1395372654968157578">"स्थान की निगरानी करें"</item>
+ <item msgid="3238451051299611853">"उच्च पावर वाले स्थान की निगरानी करें"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"स्थान"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"अलार्म आवाज़"</item>
<item msgid="9103719301075748925">"सूचना वॉल्यूम"</item>
<item msgid="7025966722295861512">"Bluetooth वॉल्यूम"</item>
- <item msgid="4665183401128289653">"सचेत रखें"</item>
- <item msgid="8584357129746649222">"स्थान"</item>
+ <item msgid="2265317984004577529">"माइक्रोफ़ोन म्यूट/अनम्यूट करें"</item>
+ <item msgid="3646325683886507917">"सक्रिय रखें"</item>
<item msgid="7669257279311110599">"स्थान"</item>
+ <item msgid="7745724368696313169">"स्थान"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"कम"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"नीले पर पीला"</item>
<item msgid="7169235156349580064">"कस्टम"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (डीबग)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Dalvik का उपयोग करें"</item>
- <item msgid="5131846588686178907">"ART का उपयोग करें"</item>
- <item msgid="4530003713865319928">"ART डीबग बिल्ड का उपयोग करें"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64K प्रति लॉग बफ़र"</item>
+ <item msgid="2822309747675758628">"256K प्रति लॉग बफ़र"</item>
+ <item msgid="6699306198357496731">"1M प्रति लॉग बफ़र"</item>
+ <item msgid="5748528643937500349">"4M प्रति लॉग बफ़र"</item>
+ <item msgid="1978629051085111592">"16M प्रति लॉग बफ़र"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"कभी न जांचें"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"सीमित रुकावटें"</item>
<item msgid="8735337502532332056">"शून्य रुकावटें"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"सामान्य"</item>
+ <item msgid="866544120205026771">"मध्यम"</item>
+ <item msgid="7851902244436886890">"निम्न"</item>
+ <item msgid="3022922196817563960">"महत्वपूर्ण"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"निरंतर"</item>
+ <item msgid="5779398140277006695">"शीर्ष गतिविधि"</item>
+ <item msgid="1439598363694578255">"महत्वपूर्ण (अग्रभाग)"</item>
+ <item msgid="3396458970745718652">"महत्वपूर्ण (पृष्ठभूमि)"</item>
+ <item msgid="5214825238247511992">"बैकअप"</item>
+ <item msgid="311372689168254967">"अत्यधिक"</item>
+ <item msgid="7438189122367820362">"सेवा (चल रही है)"</item>
+ <item msgid="918687422516982498">"सेवा (पुन: प्रारंभ हो रही है)"</item>
+ <item msgid="6807727069641853029">"प्राप्तकर्ता"</item>
+ <item msgid="6782857406100845127">"घर"</item>
+ <item msgid="2860945127596974299">"अंतिम गतिविधि"</item>
+ <item msgid="8610560843693675830">"संचित (गतिविधि)"</item>
+ <item msgid="4338089220026248848">"संचित (गतिविधि क्लाइंट)"</item>
+ <item msgid="6652164677254579050">"संचित (रिक्त)"</item>
+ </string-array>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index e6fdcfc..4d6a2b4 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"यदि होस्ट फ़ील्ड रिक्त है तो पोर्ट फ़ील्ड को रिक्त होना ही चाहिए."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"आपके द्वारा लिखा गया पोर्ट मान्य नहीं है."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP प्रॉक्सी का उपयोग ब्राउज़र द्वारा किया जाता है लेकिन अन्य ऐप्स द्वारा उपयोग नहीं किया जा सकता."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"स्थान:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"समीपस्थ CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"सेल जानकारी:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"लॉक स्क्रीन पर प्रोफ़ाइल की जानकारी दिखाएं"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"प्रोफ़ाइल की जानकारी"</string>
<string name="location_settings_title" msgid="1369675479310751735">"स्थान"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"खाते"</string>
<string name="security_settings_title" msgid="7945465324818485460">"सुरक्षा"</string>
<string name="security_settings_summary" msgid="967393342537986570">"मेरा स्थान, स्क्रीन अनलॉक, सिम कार्ड लॉक, क्रेडेंशियल संग्रहण लॉक सेट करें"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"मेरा स्थान, स्क्रीन अनलॉक, क्रेडेंशियल संग्रहण लॉक सेट करें"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"एन्क्रिप्ट करना"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"अपना टेबलेट एन्क्रिप्ट होने तक प्रतीक्षा करें. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"अपना फ़ोन एन्क्रिप्ट होने तक प्रतीक्षा करें. <xliff:g id="PERCENT">^1</xliff:g>% पूर्ण."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"जब तक आपका टेबलेट एन्क्रिप्ट किया जा रहा है तब तक प्रतीक्षा करें. शेष समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"जब तक आपका फ़ोन एन्क्रिप्ट किया जा रहा है तब तक प्रतीक्षा करें. शेष समय: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> सेकंड में पुन: प्रयास करें."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"अपना पासवर्ड लिखें"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"एन्क्रिप्शन विफल"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"डॉक में टेबलेट सम्मिलित करते या निकालते समय ध्वनि न चलाएं"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"डॉक में फ़ोन सम्मिलित करते या निकालते समय ध्वनि न चलाएं"</string>
<string name="account_settings" msgid="6403589284618783461">"खाते"</string>
+ <string name="category_personal" msgid="1299663247844969448">"व्यक्तिगत"</string>
+ <string name="category_work" msgid="8699184680584175622">"कार्यालय"</string>
<string name="search_settings" msgid="1910951467596035063">"खोज"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"खोज सेटिंग और इतिहास प्रबंधित करें"</string>
<string name="display_settings" msgid="7965901687241669598">"स्क्रीन सेटिंग"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"डेवलपर विकल्प"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"ऐप्स विकास के लिए विकल्प सेट करें"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"इस उपयोगकर्ता के लिए डेवलपर विकल्प उपलब्ध नहीं हैं"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN सेटिंग इस उपयोगकर्ता के लिए उपलब्ध नहीं हैं"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"टेदरिंग सेटिंग इस उपयोगकर्ता के लिए उपलब्ध नहीं हैं"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"एक्सेस पॉइंट नाम सेटिंग इस उपयोगकर्ता के लिए उपलब्ध नहीं हैं"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB डीबग करना"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"डीबग मोड जब USB कनेक्ट किया गया हो"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"USB डीबगिंग प्राधिकरणों को निरस्त करें"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"चार्ज होने के दौरान स्क्रीन कभी निष्क्रिय नहीं होगी"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI स्नूप लॉग सक्षम करें"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"फ़ाइल के सभी Bluetooth HCI पैकेट कैप्चर करें"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"रनटाइम चुनें"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"रनटाइम चुनें"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"रनटाइम को <xliff:g id="OLD">%1$s</xliff:g> से <xliff:g id="NEW">%2$s</xliff:g> में बदलने के लिए रीबूट करें?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"वायरलेस दिखाई देने के लिए प्रमाणन"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"WiFi वर्बोस लॉगिंग सक्षम करें"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Wifi संकेत कमज़ोर होने पर सेल्यूलर डाटा शुरु करें"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"हमेशा Wifi रोम स्कैन करने दें"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"वायरलेस दिखाई देने के लिए प्रमाणन विकल्प दिखाएं"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Wifi लॉगिंग का स्तर बढ़ाएं, WiFi पिकर में प्रति SSID RSSI दिखाएं"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"इसके सक्षम होने पर, जब Wifi संकेत कमज़ोर हों तो Wifi, डेटा कनेक्शन को सेल्यूलर पर अधिक बलपूर्वक भेजेगा"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"इंटरफ़ेस पर वर्तमान में मौजूद डेटा ट्रैफ़िक के आधार पर Wifi रोम स्कैन करने देता/नहीं देता है"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"लॉगर बफ़र आकार"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"प्रति लॉग बफ़र लॉगर आकार चुनें"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"कृत्रिम स्थानों को अनुमति दें"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"कृत्रिम स्थानों को अनुमति दें"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB डीबग करने की अनुमति दें?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"रन टाइम"</string>
<string name="services_subtitle" msgid="4296402367067266425">"सेवाएं"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"अवधि"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"स्मृति का विवरण"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"स्मृति की स्थितियां"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"स्मृति उपयोग"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"कर्नल"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"स्थानीय"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"कर्नल संचय"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam स्वैप"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"नि:शुल्क"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"कुल"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 घंटे"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 घंटे"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 घंटे"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"सभी प्रमाणपत्र निकालें"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"विश्वस्त क्रेडेंशियल"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"विश्वस्त CA प्रमाणपत्र दिखाएं"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"अतिरिक्त सेटिंग"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"संग्रहण का प्रकार"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"हार्डवेयर-समर्थित"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"केवल सॉफ़्टवेयर"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"इस उपयोगकर्ता के लिए क्रेडेंशियल उपलब्ध नहीं हैं"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"अपना अनलॉक आकार आरेखित करें"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"आपको क्रेडेंशियल इंस्टॉलेशन की पुष्टि करने के लिए अपना अनलॉक आकार बनाना होगा."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"सेटअप जारी रखने के लिए "<b>"अगला"</b>" स्पर्श करें.\n\nकिसी भिन्न Wi‑Fi नेटवर्क से कनेक्ट करने के लिए "<b>"वापस जाएं"</b>" स्पर्श करें."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"समन्वयन सक्षम"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"समन्वयन अक्षम"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"अब समन्वयित हो रहा है"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"समन्वयन त्रुटि."</string>
<string name="sync_failed" msgid="1696499856374109647">"समन्वयन विफल"</string>
<string name="sync_active" msgid="8476943765960863040">"समन्वयन सक्रिय"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"क्लिप सीमाएं, मार्जिन, आदि दिखाएं."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTL लेआउट दिशा लागू करें"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"सभी भाषाओं के लिए स्क्रीन लेआउट दिशा को RTL रखें"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"कम पावर मोड"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"बैटरी की बचत सेटिंग सक्षम करें"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"CPU उपयोग दिखाएं"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"स्क्रीन ओवरले वर्तमान CPU उपयोग को दिखा रहा है"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"बलपूर्वक GPU रेंडर करें"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"सभी सूचना सामग्री दिखाएं"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"संवेदनशील सूचना सामग्री छिपाएं"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"सूचनाएं बिल्कुल न दिखाएं"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"परेशान न करें के चालू होने पर"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"सूची में से नई सूचनाएं छिपाएं"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"सूची में सभी सूचनाएं दिखाएं"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"ऐप्स सूचनाएं"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"अन्य ध्वनियां"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"डायल पैड टोन"</string>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index 4f7b3a1..3639894 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Ništa"</item>
<item msgid="8673874894887358090">"Ručno"</item>
+ <item msgid="168893341855953140">"Automatska konf. proxyja"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Ništa"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"glasnoća alarma"</item>
<item msgid="785049718065337473">"glasnoća obavijesti"</item>
<item msgid="6700305533746877052">"glasnoća Bluetootha"</item>
- <item msgid="2029227495214047094">"zadrži u aktivnom stanju"</item>
- <item msgid="26109888160231211">"praćenje lokacije"</item>
- <item msgid="5753382310468855812">"praćenje lokacije s visokom potrošnjom energije"</item>
+ <item msgid="3810969981743709839">"isključivanje/uključivanje mikrofona"</item>
+ <item msgid="2627903914574908209">"zadrži u aktivnom stanju"</item>
+ <item msgid="1395372654968157578">"praćenje lokacije"</item>
+ <item msgid="3238451051299611853">"praćenje lokacije s visokom potrošnjom energije"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Lokacija"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Glasnoća alarma"</item>
<item msgid="9103719301075748925">"Glasnoća obavijesti"</item>
<item msgid="7025966722295861512">"Glasnoća Bluetootha"</item>
- <item msgid="4665183401128289653">"Zadrži u aktivnom stanju"</item>
- <item msgid="8584357129746649222">"Lokacija"</item>
+ <item msgid="2265317984004577529">"Isključivanje/uključivanje mikrofona"</item>
+ <item msgid="3646325683886507917">"Zadrži u aktivnom stanju"</item>
<item msgid="7669257279311110599">"Lokacija"</item>
+ <item msgid="7745724368696313169">"Lokacija"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Kratko"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Žuto na plavom"</item>
<item msgid="7169235156349580064">"Prilagođeno"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (uklanjanje program. pogrešaka)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 KB"</item>
+ <item msgid="505611754508988476">"256 KB"</item>
+ <item msgid="6361286924268716397">"1 MB"</item>
+ <item msgid="6405203239560695266">"4 MB"</item>
+ <item msgid="3025431211013424097">"16 MB"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Upotrijebi Dalvik"</item>
- <item msgid="5131846588686178907">"Upotrijebi ART"</item>
- <item msgid="4530003713865319928">"Upotrijebi verziju ART-a za uklanjanje programskih pogrešaka"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 KB po međusprem."</item>
+ <item msgid="2822309747675758628">"256 KB po međuspr."</item>
+ <item msgid="6699306198357496731">"1 MB po međusprem."</item>
+ <item msgid="5748528643937500349">"4 MB po međusprem."</item>
+ <item msgid="1978629051085111592">"16 MB po međusprem."</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Nikad ne provjeravaj"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Ograničeni prekidi"</item>
<item msgid="8735337502532332056">"Bez prekida"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Uobičajena"</item>
+ <item msgid="866544120205026771">"Umjerena"</item>
+ <item msgid="7851902244436886890">"Niska"</item>
+ <item msgid="3022922196817563960">"Kritična"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Postojana"</item>
+ <item msgid="5779398140277006695">"Glavna aktivnost"</item>
+ <item msgid="1439598363694578255">"Važna (u prvom planu)"</item>
+ <item msgid="3396458970745718652">"Važna (u pozadini)"</item>
+ <item msgid="5214825238247511992">"Pričuvna"</item>
+ <item msgid="311372689168254967">"Teška"</item>
+ <item msgid="7438189122367820362">"Usluga (izvodi se)"</item>
+ <item msgid="918687422516982498">"Usluga (ponovno pokretanje)"</item>
+ <item msgid="6807727069641853029">"Prijamnik"</item>
+ <item msgid="6782857406100845127">"Kuća"</item>
+ <item msgid="2860945127596974299">"Posljednja aktivnost"</item>
+ <item msgid="8610560843693675830">"Predmemorija (aktivnost)"</item>
+ <item msgid="4338089220026248848">"Predmemorija (klijent aktivnosti)"</item>
+ <item msgid="6652164677254579050">"Predmemorija (prazna)"</item>
+ </string-array>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index acec79f..f7c2c93 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Polje priključka mora biti prazno ako je i polje hosta prazno."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Upisani priključak nije valjan."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Preglednik upotrebljava HTTP proxy poslužitelj, ali druge aplikacije ne mogu ga upotrebljavati."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL za PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL za PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susjedski CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informacije o ćeliji:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Prikaži informacije profila na zaključanom zaslonu"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informacije profila"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Sigurnost"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje SIM kartice, zaključavanje spremnika za vjerodajnice"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Postavi Moju lokaciju, otključavanje zaslona, zaključavanje pohranjivanja vjerodajnica"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Kriptiranje"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Pričekajte dok ne završi kriptiranje vašeg tabletnog računala. <xliff:g id="PERCENT">^1</xliff:g>% dovršeno."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Pričekajte dok ne završi kriptiranje telefona. <xliff:g id="PERCENT">^1</xliff:g>% dovršeno."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Pričekajte dok se vaš tablet kodira. Preostalo vrijeme: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Pričekajte dok se vaš telefon kodira. Preostalo vrijeme: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Pokušajte ponovo za <xliff:g id="DELAY">^1</xliff:g> s."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Unesite svoju zaporku"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripcija neuspješna"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ne reproduciraj zvuk pri umetanju ili uklanjanju tabletnog uređaja iz priključne stanice"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ne reproduciraj zvuk kod umetanja ili uklanjanja telefona s priključne stanice"</string>
<string name="account_settings" msgid="6403589284618783461">"Računi"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Osobno"</string>
+ <string name="category_work" msgid="8699184680584175622">"Posao"</string>
<string name="search_settings" msgid="1910951467596035063">"Pretraži"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Upravljajte postavkama pretraživanja i poviješću"</string>
<string name="display_settings" msgid="7965901687241669598">"Prikaz"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Opcije za razvojne programere"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Postavljanje opcija za razvoj aplikacije"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Opcije razvojnih programera nisu dostupne za ovog korisnika"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Postavke VPN-a nisu dostupne ovom korisniku"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Postavke dijeljenja veze nisu dostupne ovom korisniku"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Postavke pristupne točke nisu dostupne ovom korisniku"</string>
<string name="enable_adb" msgid="7982306934419797485">"Uklanjanje pogreške USB-a"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Uklanjanje pogrešaka s priključenim USB-om"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Opoziv autorizacija za uklanjanje pogrešaka USB-a"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Zaslon nikad neće prijeći u mirovanje tijekom punjenja"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Omogući zapisnik naredbe \"snoop\" za Bluetooth HCI"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Snimi sve Bluetooth HCI pakete u datoteci"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Odabir vremena izvođenja"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Odabir vremena izvođenja"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Želite li pokrenuti ponovo da biste promijenili vrijeme izvođenja s <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certifikacija bežičnog prikaza"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Omogući opsežne zapisnike Wi-Fi-ja"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Aktivni prijelaz s Wi-Fi na mob. mrežu"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Uvijek dopusti slobodno traženje Wi-Fi mreža"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Prikaži opcije za certifikaciju bežičnog prikaza"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Povećaj razinu zapisnika Wi-Fi-ja, prikaži po RSSI-ju SSID-a u biraču Wi-Fi-ja"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Ako je omogućeno, Wi-Fi će aktivno prebacivati podatkovnu vezu mobilnoj mreži kada je Wi-Fi signal slab."</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Dopuštanje/blokiranje slobodnog traženja Wi-Fi mreža na temelju količine podatkovnog prometa u sučelju"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Veličine međuspremnika zapisnika"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Odaberite veličinu međuspr. zapis."</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Dopusti probne lokacije"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Dopusti probne lokacije"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Omogućiti rješavanje programske pogreške na USB-u?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Vrijeme izvođenja"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Usluge"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trajanje"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Informacije o memoriji"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Stanja memorije"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Upotreba memorije"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Jezgra sustava"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Nativni procesi"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Predmemorije jezgre sustava"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Prijelaz na ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Dostupna"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Ukupno"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 sata"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 sati"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 sati"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Uklanjanje svih certifikata"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Pouzdane vjerodajnice"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaz pouzdanih CA certifikata"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Napredno"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Vrsta pohrane"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardverska"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Samo softverska"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Za ovog korisnika nisu dostupne vjerodajnice"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Iscrtajte obrazac za otključavanje"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Da biste potvrdili instalaciju vjerodajnica, trebate nacrtati svoj obrazac za otključavanje."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Dodirnite "<b>"Dalje"</b>" za nastavak postavljanja.\n\nDodirnite "<b>"Natrag"</b>" za povezivanje s nekom drugom Wi-Fi mrežom."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronizacija je omogućena"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Onemogućena je sinkronizacija"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sinkronizacija u tijeku"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Pogreška sinkronizacije"</string>
<string name="sync_failed" msgid="1696499856374109647">"Sinkronizacija nije uspjela"</string>
<string name="sync_active" msgid="8476943765960863040">"Sinkronizacija aktivna"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Za isječak prikaži granice, margine itd."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Nametni zdesna ulijevo"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Nametni smjer zdesna ulijevo za sve zemlje/jezike"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Ekonomični način"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Omogući postavke za štednju baterije"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Prikaži upotrebu procesora"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekrivanje zaslona prikazuje trenutačnu upotrebu procesora"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Prisilno GPU renderiranje"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Prikaži sav sadržaj obavijesti"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sakrij osjetljiv sadržaj obavijesti"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Uopće ne prikazuj obavijesti"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Kada je uključen način Ne ometaj"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Sakrivanje novih obavijesti na popisu"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Prikazivanje svih obavijesti na popisu"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Obavijesti aplikacije"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Ostali zvukovi"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonovi površine za biranje brojeva"</string>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index 3e4d431..fd7266a 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Nincs"</item>
<item msgid="8673874894887358090">"Kézi"</item>
+ <item msgid="168893341855953140">"Proxy auto. beállítása"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Nincs"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"ébresztés hangereje"</item>
<item msgid="785049718065337473">"értesítés hangereje"</item>
<item msgid="6700305533746877052">"bluetooth hangereje"</item>
- <item msgid="2029227495214047094">"ébren tartás"</item>
- <item msgid="26109888160231211">"hely figyelése"</item>
- <item msgid="5753382310468855812">"magas energiaszintű helyek figyelése"</item>
+ <item msgid="3810969981743709839">"mikrofon némítása és a némítás feloldása"</item>
+ <item msgid="2627903914574908209">"ébren tartás"</item>
+ <item msgid="1395372654968157578">"hely figyelése"</item>
+ <item msgid="3238451051299611853">"nagy jelerősségű hely figyelése"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Hely"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Ébresztés hangereje"</item>
<item msgid="9103719301075748925">"Értesítés hangereje"</item>
<item msgid="7025966722295861512">"Bluetooth hangereje"</item>
- <item msgid="4665183401128289653">"Ébren tartás"</item>
- <item msgid="8584357129746649222">"Tartózkodási hely"</item>
+ <item msgid="2265317984004577529">"Mikrofon némítása és a némítás feloldása"</item>
+ <item msgid="3646325683886507917">"Ébren tartás"</item>
<item msgid="7669257279311110599">"Tartózkodási hely"</item>
+ <item msgid="7745724368696313169">"Hely"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Rövid"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Kék alapon sárga"</item>
<item msgid="7169235156349580064">"Egyedi"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (hibakeresési)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 KB"</item>
+ <item msgid="505611754508988476">"256 KB"</item>
+ <item msgid="6361286924268716397">"1 MB"</item>
+ <item msgid="6405203239560695266">"4 MB"</item>
+ <item msgid="3025431211013424097">"16 MB"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"A Dalvik használata"</item>
- <item msgid="5131846588686178907">"Az ART használata"</item>
- <item msgid="4530003713865319928">"Az ART hibakeresési verziójának használata"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 KB/naplópuffer"</item>
+ <item msgid="2822309747675758628">"256 KB/naplópuffer"</item>
+ <item msgid="6699306198357496731">"1 MB/naplópuffer"</item>
+ <item msgid="5748528643937500349">"4 MB/naplópuffer"</item>
+ <item msgid="1978629051085111592">"16 MB/naplópuffer"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Ellenőrzés soha"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Korlátozott megszakítások"</item>
<item msgid="8735337502532332056">"Nincs megszakítás"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normál"</item>
+ <item msgid="866544120205026771">"Mérsékelt"</item>
+ <item msgid="7851902244436886890">"Alacsony"</item>
+ <item msgid="3022922196817563960">"Kritikus"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Állandó"</item>
+ <item msgid="5779398140277006695">"Leggyakoribb tevékenység"</item>
+ <item msgid="1439598363694578255">"Fontos (előtérben)"</item>
+ <item msgid="3396458970745718652">"Fontos (háttérben)"</item>
+ <item msgid="5214825238247511992">"Biztonsági másolat"</item>
+ <item msgid="311372689168254967">"Számottevő"</item>
+ <item msgid="7438189122367820362">"Szolgáltatás (fut)"</item>
+ <item msgid="918687422516982498">"Szolgáltatás (újraindul)"</item>
+ <item msgid="6807727069641853029">"Fogadó"</item>
+ <item msgid="6782857406100845127">"Otthon"</item>
+ <item msgid="2860945127596974299">"Legutóbbi tevékenység"</item>
+ <item msgid="8610560843693675830">"Gyorsítótárazott (tevékenység)"</item>
+ <item msgid="4338089220026248848">"Gyorsítótárazott (tevékenységkliens)"</item>
+ <item msgid="6652164677254579050">"Gyorsítótárazott (üres)"</item>
+ </string-array>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index b3c7e7c..dadc41f 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"A port mezőnek is üresnek kell maradnia, ha a gazdagép mező üres."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"A megadott port nem érvényes."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"A HTTP proxyt a böngésző használja, ám más alkalmazások nem használhatják."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Hely:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Környező CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Cellainformáció:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Profiladatok megjelenítése a lezáró képernyőn"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profiladatok"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Tartózkodási hely"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Fiókok"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Biztonság"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Saját pozíció beállítása, képernyőzár feloldása, SIM-kártya zárolása, hitelesítési adatok tárolójának zárolása"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Saját pozíció beállítása, képernyőzár feloldása, hitelesítési adatok tárolójának zárolása"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Titkosítás"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Kérjük, várjon, amíg a táblagép titkosítása befejeződik. <xliff:g id="PERCENT">^1</xliff:g>% kész."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Kérjük, várjon a telefonja titkosításáig. <xliff:g id="PERCENT">^1</xliff:g>% kész."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Táblagépe titkosítása folyamatban van. Hátralévő idő: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Telefonja titkosítása folyamatban van. Hátralévő idő: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Próbálja újra <xliff:g id="DELAY">^1</xliff:g> másodperc múlva."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Írja be a jelszavát"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"A titkosítás sikertelen"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ne legyen hangjelzés a táblagépnek a dokkba történő behelyezésekor vagy onnan eltávolításakor"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ne játsszon le hangot a telefon dokkolóba helyezésekor és kivételekor"</string>
<string name="account_settings" msgid="6403589284618783461">"Fiókok"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Személyes"</string>
+ <string name="category_work" msgid="8699184680584175622">"Munkahelyi"</string>
<string name="search_settings" msgid="1910951467596035063">"Keresés"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Keresési beállítások és előzmények kezelése"</string>
<string name="display_settings" msgid="7965901687241669598">"Megjelenítés"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Fejlesztői lehetőségek"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Alkalmazásfejlesztési beállítások megadása"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"A fejlesztői lehetőségek nem érhetők el ennél a felhasználónál"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"A VPN-beállítások nem érhetők el ennél a felhasználónál"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Az internetmegosztási beállítások nem érhetők el ennél a felhasználónál"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"A hozzáférési pont nevének beállításai nem érhetők el ennél a felhasználónál"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB hibakeresés"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Hibakeresés mód USB csatlakoztatásakor"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"USB-s hibakeresésre vonatkozó engedélyek visszavonása"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"A képernyő soha nem kapcsol ki töltés során"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI snoop napló engedélyezése"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Az összes Bluetooth HCI-csomag rögzítése egy fájlban"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Futtatási környezet kiválasztása"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Futtatási környezet kiválasztása"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Újraindítja, hogy a futtatási környezet módosuljon <xliff:g id="OLD">%1$s</xliff:g> beállításról <xliff:g id="NEW">%2$s</xliff:g> beállításra?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Vezeték nélküli kijelző tanúsítványa"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Wi-Fi Verbose-naplózás engedélyezése"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Agresszív átadás Wi-Firől mobilhálózatra"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Mindig engedélyezze a Wi-Fi-roaming ellenőrzéseket"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Beállítások megjelenítése a vezeték nélküli kijelző tanúsítványával kapcsolatban"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Nő a Wi-Fi-naplózási szint, SSID RSSI szerinti megjelenítés a Wi-Fi-választóban"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Ha engedélyezi, a Wi-Fi agresszívebben fogja átadni az adatkapcsolatot a mobilhálózatnak gyenge Wi-Fi-jel esetén"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"A Wi-Fi-roaming ellenőrzésének engedélyezése vagy letiltása az interfészen jelen lévő adatforgalom mennyiségétől függően"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Logger pufferméret"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Logger naplópufferméret választása"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Helyutánzatok engedélyezése"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Helyutánzatok engedélyezése"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Engedélyezi az USB hibakeresést?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Futási idő"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Szolgáltatások"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Időtartam"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"A memóriával kapcsolatos részletek"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Memóriaállapotok"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Memóriahasználat"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Natív"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Kernelgyorsítótárak"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam-váltás"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Ingyenes"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Összes"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 óra"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 óra"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 óra"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Összes tanúsítvány eltávolítása"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Megbízható hitelesítő adatok"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Megbízható CA tanúsítványok megjelenítése"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Speciális"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Tárhelytípus"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"hardveresen támogatott"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"kizárólag szoftveres"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"A hitelesítési adatok nem érhetők el ennél a felhasználónál"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Rajzolja le a feloldási mintát"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"A hitelesítési adatok telepítésének megerősítéséhez rajzolja le feloldási mintáját."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Érintse meg a "<b>"Tovább"</b>" lehetőséget a telepítés folytatásához.\n\nÉrintse meg a "<b>"Vissza"</b>" lehetőséget egy másik Wi-Fi-hálózathoz való csatlakozáshoz."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Szinkronizálás engedélyezve"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Szinkronizálás letiltva"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Szinkronizálás folyamatban"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Szinkronizálási hiba"</string>
<string name="sync_failed" msgid="1696499856374109647">"A szinkronizálás nem sikerült"</string>
<string name="sync_active" msgid="8476943765960863040">"Szinkronizálás aktív"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Kliphatárok, margók stb. megjelenítése."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Elrendezés jobbról balra"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Elrendezés jobbról balra minden nyelvnél"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Alacsony energia mód"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Energiatakarékos beállítások engedélyezése"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"CPU-használat mutatása"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Képernyőfedvény a jelenlegi CPU-használattal"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"GPU-megjelenítés"</string>
@@ -2137,9 +2159,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Az összes értesítés megjelenítése"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Bizalmas értesítések elrejtése"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Semmilyen értesítés ne jelenjen meg"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Ha a „Ne zavarjanak” mód aktív"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Új értesítések elrejtése a listából"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Valamennyi értesítés megjelenítése a listában"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Alkalmazásértesítések"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Egyéb hangok"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"A tárcsázó hangjai"</string>
diff --git a/res/values-hy-rAM/arrays.xml b/res/values-hy-rAM/arrays.xml
index cc58018..755f9ae 100644
--- a/res/values-hy-rAM/arrays.xml
+++ b/res/values-hy-rAM/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Ոչ մեկը"</item>
<item msgid="8673874894887358090">"Ձեռքով"</item>
+ <item msgid="168893341855953140">"Պրոքսիի ինքնակարգավորում"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Ոչ մեկը"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"զարթուցիչի ձայնի բարձրություն"</item>
<item msgid="785049718065337473">"ծանուցման ձայնի բարձրություն"</item>
<item msgid="6700305533746877052">"bluetooth-ի ձայնի բարձրություն"</item>
- <item msgid="2029227495214047094">"արթուն պահել"</item>
- <item msgid="26109888160231211">"վերահսկել տեղադրությունը"</item>
- <item msgid="5753382310468855812">"մշտադիտարկել էներգատար տեղանքները"</item>
+ <item msgid="3810969981743709839">"Խոսափողն անջատել/միացնել"</item>
+ <item msgid="2627903914574908209">"արթուն պահել"</item>
+ <item msgid="1395372654968157578">"վերահսկել տեղադրությունը"</item>
+ <item msgid="3238451051299611853">"մշտադիտարկել էներգատար տեղանքները"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Տեղակայում"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Զարթուցիչի ձայնի բարձրություն"</item>
<item msgid="9103719301075748925">"Ծանուցման ձայնի բարձրություն"</item>
<item msgid="7025966722295861512">"Bluetooth-ի ձայնի բարձրություն"</item>
- <item msgid="4665183401128289653">"Արթուն պահել"</item>
- <item msgid="8584357129746649222">"Տեղադրություն"</item>
+ <item msgid="2265317984004577529">"Խոսափողն անջատել/միացնել"</item>
+ <item msgid="3646325683886507917">"Արթուն պահել"</item>
<item msgid="7669257279311110599">"Տեղադրություն"</item>
+ <item msgid="7745724368696313169">"Տեղադրություն"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Կարճաժամկետ"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Դեղինը կապույտի վրա"</item>
<item msgid="7169235156349580064">"Հատուկ"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (վրիպազերծում)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64ԿԲ"</item>
+ <item msgid="505611754508988476">"256ԿԲ"</item>
+ <item msgid="6361286924268716397">"1ՄԲ"</item>
+ <item msgid="6405203239560695266">"4ՄԲ"</item>
+ <item msgid="3025431211013424097">"16ՄԲ"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Օգտագործել Dalvik"</item>
- <item msgid="5131846588686178907">"Օգտագործել ART"</item>
- <item msgid="4530003713865319928">"Օգտագործել ART վրիպազերծման ծրագրատարբերակը"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"Պահնակ՝ առավ. 64ԿԲ"</item>
+ <item msgid="2822309747675758628">"Պահնակ՝ առավ. 256ԿԲ"</item>
+ <item msgid="6699306198357496731">"Պահնակ՝ առավ. 1ՄԲ"</item>
+ <item msgid="5748528643937500349">"Պահնակ՝ առավ. 4ՄԲ"</item>
+ <item msgid="1978629051085111592">"Պահնակ՝ առավ. 16ՄԲ"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Երբեք չստուգել"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Սահմանափակ ընդհատումներ"</item>
<item msgid="8735337502532332056">"Զրոյական ընդհատումներ"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Սովորական"</item>
+ <item msgid="866544120205026771">"Չափավոր"</item>
+ <item msgid="7851902244436886890">"Ցածր"</item>
+ <item msgid="3022922196817563960">"Կրիտիկական"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Կայուն"</item>
+ <item msgid="5779398140277006695">"Առավել հաճախակի կատարվող գործողությունը"</item>
+ <item msgid="1439598363694578255">"Կարևոր (ակտիվ ռեժիմ)"</item>
+ <item msgid="3396458970745718652">"Կարևոր (ֆոնային ռեժիմ)"</item>
+ <item msgid="5214825238247511992">"Պահուստավորում"</item>
+ <item msgid="311372689168254967">"Խիստ ծանրաբեռնվածություն"</item>
+ <item msgid="7438189122367820362">"Ծառայություն (ակտիվ է)"</item>
+ <item msgid="918687422516982498">"Ծառայություն (վերագործարկվում է)"</item>
+ <item msgid="6807727069641853029">"Ստացող"</item>
+ <item msgid="6782857406100845127">"Հիմնական"</item>
+ <item msgid="2860945127596974299">"Վերջին գործողությունը"</item>
+ <item msgid="8610560843693675830">"Քեշավորված (գործողությունը)"</item>
+ <item msgid="4338089220026248848">"Քեշավորված (սպասառուի գործողությունը)"</item>
+ <item msgid="6652164677254579050">"Քեշավորված (դատարկ)"</item>
+ </string-array>
</resources>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml
index 7808432..2db19ff 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy-rAM/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Միացքի դաշտը պետք է ազատ լինի, եթե հանգույցի դաշտը դատարկ է:"</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Ձեր մուտքագրած միացքը վավեր չէ:"</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP պրոքսին օգտագործվում է զննարկչի կողմից, բայց չի կարող օգտագործվել այլ ծրագրերի կողմից:"</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL` "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL` "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Տեղակայում."</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Կից CID՝"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Բջջայինի տեղեկություններ`"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Կողպէկրանին ցույց տալ պրոֆիլի տվյալները"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Պրոֆիլի տեղեկություններ"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Տեղադրություն"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Հաշիվներ"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Անվտանգություն"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Կարգավորել Իմ տեղադրությունը, էկրանի ապակողպումը, SIM քարտի կողպումը, վկայագրերի պահոցի կողպումը"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Կարգավորել իմ տեղադրությունը, էկրանի ապակողպումը, հավատարմագրային պահոցի կողպումը"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Կոդավորում"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Սպասեք մինչ ձեր գրասալիկը կկոդավորվի: <xliff:g id="PERCENT">^1</xliff:g>%-ով ավարտված է:"</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Սպասեք մինչ ձեր հեռախոսը կկոդավորվի: <xliff:g id="PERCENT">^1</xliff:g>%-ով ավարտված է:"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Սպասեք մինչև ձեր գրասալիկը կոդավորվի: Մնաց՝ <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Սպասեք մինչև ձեր հեռախոսը կոդավորվի: Մնաց՝ <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Կրկին փորձեք <xliff:g id="DELAY">^1</xliff:g> վայրկյանից:"</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Մուտքագրեք ձեր գաղտնաբառը"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Կոդավորումը անհաջող էր"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ձայնային ազդանշաններ չհնչեցնել գրասալիկը համակցումից հեռացնելիս կամ ներմուծելիս"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ձայնային ազդանշան չհնչեցնել հեռախոսը համակցումից հեռացնելիս կամ ներմուծելիս"</string>
<string name="account_settings" msgid="6403589284618783461">"Հաշիվներ"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Անձնական"</string>
+ <string name="category_work" msgid="8699184680584175622">"Աշխատանքային"</string>
<string name="search_settings" msgid="1910951467596035063">"Որոնել"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Կառավարել որոնման կարգավորումները և պատմությունը"</string>
<string name="display_settings" msgid="7965901687241669598">"Ցուցադրիչ"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Ծրագրավորման ընտրանքներ"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Կարգավորել ընտրանքները ծրագրի ծրագրավորման համար"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Ծրագրավորման ընտրանքներն այլևս հասանելի չեն այս օգտվողի համար"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN-ի կարգավորումները հասանելի չեն այս օգտվողին"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Միակցման կարգավորումները հասանելի չեն այս օգտվողին"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Մատչման կետի անվան կարգավորումները հասանելի չեն այս օգտվողին"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB վրիպազերծում"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Կարգաբերել ռեժիմը, երբ USB-ն միացված է"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Չեղարկել USB վրիպազերծման լիազորումները"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Էկրանը երբեք չի քնի լիցքավորման ընթացքում"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Միացնել Bluetooth HCI snoop log-ը"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Կորզել բոլոր bluetooth HCI փաթեթները մի ֆայլում"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Ընտրել աշխատաժամանակը"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Ընտրել աշխատաժամանակը"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Վերաբեռնե՞լ՝ աշխատաժամանակը <xliff:g id="OLD">%1$s</xliff:g>-ից <xliff:g id="NEW">%2$s</xliff:g>-ին փոխելու համար:"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Անլար էկրանի վկայագրում"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Միացնել WiFi-ի մանրամասն գրանցամատյանը"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Wifi-ից կտրուկ անցում բջջային ինտերնետի"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Միշտ թույլատրել Wifi ռոումինգի որոնումը"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Ցույց տալ անլար էկրանի վկայագրման ընտրանքները"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Բարձրացնել Wifi-ի գրանցման մակարդակը, WiFi-ի ընտրիչում ցուցադրել RSSI ըստ SSID-ի"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Եթե այս գործառույթը միացված է, Wifi-ի թույլ ազդանշանի դեպքում Wifi ինտերնետից անցումը բջջային ինտերնետին ավելի կտրուկ կլինի"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Թույլատրել/արգելել Wifi ռոումինգի որոնումը՝ կախված միջերեսում տվյալների երթևեկի ծավալից"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Տեղեկամատյանի պահնակի չափերը"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Ընտրեք տեղեկամատյանի չափը մեկ պահնակի համար"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Թույատրել կեղծ տեղադրությունները"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Թույլ տալ կեղծ տեղադրություններ"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Թույլատրե՞լ USB-ի վրիպազերծումը:"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Աշխատաժամանակ"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Ծառայություններ"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Տևողությունը"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Հիշողության վերաբերյալ մանրամասներ"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Հիշողության կարգավիճակը"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Օգտագործվող հիշողություն"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Միջուկ"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Հիմնական գործընթացներ"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Միջուկի քեշերը"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam-ի փոխանակում"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Անվճար"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Ընդհանուր"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 ժամ"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 ժամ"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 ժամ"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Հեռացնել բոլոր վկայագրերը"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Վստահելի վկայագրեր"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Ցույց տալ վստահելի CA վկայագրերը"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Ընդլայնված"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Պահոցի տեսակը"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Պահուստավորված սարք"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Միայն ծրագրային"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Հավատարմագրերը հասանելի չեն այս օգտվողի համար"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Պատկերել էկրանի ապակողպման ձեր կաղապարը"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Պետք է ներկայացնեք ձեր ապակողպման կաղապարը` վկայագրերի տեղադրումը հաստատելու համար:"</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Հպեք "<b>"Հաջորդը"</b>"` կարգավորումը շարունակելու համար: \n\nՀպեք "<b>"Հետ"</b>"` մեկ այլ Wi‑Fi ցանցի միանալու համար:"</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Համաժամեցումն ակտիվացված է"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Համաժամեցումը անջատված է"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Հիմա համաժամեցվում է"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Համաժամեցման սխալ:"</string>
<string name="sync_failed" msgid="1696499856374109647">"Համաժամեցումը ձախողվեց"</string>
<string name="sync_active" msgid="8476943765960863040">"Համաժամեցումն ակտիվ է"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Ցույց տալ կտրվածքի սահմանները, լուսանցքները և այլն"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Փոխել RTL-ի դասավորության ուղղությունը"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Դարձնել էկրանի դասավորության ուղղությունը դեպի RTL բոլոր լեզուների համար"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Էներգախնայողության ռեժիմ"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Միացնել մարտկոցի տնտեսման կարգավորումները"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Ցույց տալ CPU-ի աշխատանքը"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Էկրանի վերադրումը ցույց է տալիս ընթացիկ CPU օգտագործումը"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Ստիպել GPU-ին մատուցել"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ցուցադրել ծանուցման ողջ բովանդակությունը"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Թաքցնել գաղտնի բովանդակությունը"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Ոչ մի ծանուցում ցույց չտալ"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Երբ «Չխանգարել» ռեժիմը միացված է"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Նոր ծանուցումները թաքցնել ցանկից"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Ցուցադրել բոլոր ծանուցումները ցանկում"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Ծրագրերի ծանուցումներ"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Այլ ձայներ"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Թվաշարի հնչերանգները"</string>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index b70dba0..84c30b6 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Tidak Ada"</item>
<item msgid="8673874894887358090">"Manual"</item>
+ <item msgid="168893341855953140">"Auto Konfigurasi Proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Tak Satu Pun"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"volume alarm"</item>
<item msgid="785049718065337473">"volume pemberitahuan"</item>
<item msgid="6700305533746877052">"volume bluetooth"</item>
- <item msgid="2029227495214047094">"tetap aktif"</item>
- <item msgid="26109888160231211">"monitor lokasi"</item>
- <item msgid="5753382310468855812">"memantau lokasi berdaya tinggi"</item>
+ <item msgid="3810969981743709839">"bisukan/suarakan mikrofon"</item>
+ <item msgid="2627903914574908209">"tetap aktif"</item>
+ <item msgid="1395372654968157578">"lokasi monitor"</item>
+ <item msgid="3238451051299611853">"memantau lokasi berdaya tinggi"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Lokasi"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Volume alarm"</item>
<item msgid="9103719301075748925">"Volume pemberitahuan"</item>
<item msgid="7025966722295861512">"Volume bluetooth"</item>
- <item msgid="4665183401128289653">"Tetap aktif"</item>
- <item msgid="8584357129746649222">"Lokasi"</item>
+ <item msgid="2265317984004577529">"Bisukan/suarakan mikrofon"</item>
+ <item msgid="3646325683886507917">"Tetap aktif"</item>
<item msgid="7669257279311110599">"Lokasi"</item>
+ <item msgid="7745724368696313169">"Lokasi"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Singkat"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Kuning berlatar biru"</item>
<item msgid="7169235156349580064">"Khusus"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (debug)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 K"</item>
+ <item msgid="505611754508988476">"256 K"</item>
+ <item msgid="6361286924268716397">"1 M"</item>
+ <item msgid="6405203239560695266">"4 M"</item>
+ <item msgid="3025431211013424097">"16 M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Gunakan Dalvik"</item>
- <item msgid="5131846588686178907">"Gunakan ART"</item>
- <item msgid="4530003713865319928">"Gunakan bentukan debug ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 K/penyangga log"</item>
+ <item msgid="2822309747675758628">"256 K/penyangga log"</item>
+ <item msgid="6699306198357496731">"1 M/penyangga log"</item>
+ <item msgid="5748528643937500349">"4 M/penyangga log"</item>
+ <item msgid="1978629051085111592">"16 M/penyangga log"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Jangan periksa"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Gangguan terbatas"</item>
<item msgid="8735337502532332056">"Tanpa gangguan"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normal"</item>
+ <item msgid="866544120205026771">"Sedang"</item>
+ <item msgid="7851902244436886890">"Rendah"</item>
+ <item msgid="3022922196817563960">"Kritis"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Tetap"</item>
+ <item msgid="5779398140277006695">"Aktivitas teratas"</item>
+ <item msgid="1439598363694578255">"Penting (latar depan)"</item>
+ <item msgid="3396458970745718652">"Penting (latar belakang)"</item>
+ <item msgid="5214825238247511992">"Cadangan"</item>
+ <item msgid="311372689168254967">"Beban berat"</item>
+ <item msgid="7438189122367820362">"Layanan (berjalan)"</item>
+ <item msgid="918687422516982498">"Layanan (memulai ulang)"</item>
+ <item msgid="6807727069641853029">"Penerima"</item>
+ <item msgid="6782857406100845127">"Utama"</item>
+ <item msgid="2860945127596974299">"Aktivitas terakhir"</item>
+ <item msgid="8610560843693675830">"Disimpan dalam cache (aktivitas)"</item>
+ <item msgid="4338089220026248848">"Disimpan dalam cache (klien aktivitas)"</item>
+ <item msgid="6652164677254579050">"Disimpan dalam cache (kosong)"</item>
+ </string-array>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 562fae9..4a0a93b 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Bidang port harus kosong jika bidang host kosong."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Port yang Anda ketik tidak valid."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP digunakan oleh browser, namun tidak boleh digunakan oleh apl lain."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasi:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID bersebelahan:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Tampilkan info profil di layar kunci"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Info profil"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Lokasi"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Akun"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Keamanan"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Setel Lokasiku, pembuka kunci layar, kunci kartu SIM, kunci penyimpanan kredensial"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setel Lokasiku, pembuka kunci layar, kunci penyimpanan kredensial"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Mengenkripsi"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Tunggu sampai tablet selesai dienkripsi. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Tunggu sampai ponsel selesai dienkripsi. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Tunggu, tablet sedang dienkripsi. Sisa waktu: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Tunggu, ponsel sedang dienkripsi. Sisa waktu: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Coba lagi dalam <xliff:g id="DELAY">^1</xliff:g> detik."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ketikkan sandi Anda"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Enkripsi gagal"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Jangan memutar suara saat memasukkan atau melepaskan tablet dari dok"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Jangan putar suara ketika memasang atau melepas ponsel dari dok"</string>
<string name="account_settings" msgid="6403589284618783461">"Akun"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Pribadi"</string>
+ <string name="category_work" msgid="8699184680584175622">"Kantor"</string>
<string name="search_settings" msgid="1910951467596035063">"Telusuri"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Kelola setelan dan riwayat penelusuran"</string>
<string name="display_settings" msgid="7965901687241669598">"Tampilan"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Opsi pengembang"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Menyetel opsi untuk pengembangan apl"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Opsi pengembang tidak tersedia untuk pengguna ini"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Setelan VPN tidak tersedia untuk pengguna ini"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Setelan Penambatan tidak tersedia untuk pengguna ini"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Setelan Nama Titik Akses tidak tersedia untuk pengguna ini"</string>
<string name="enable_adb" msgid="7982306934419797485">"Debugging USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Mode debug ketika USB tersambung"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Cabut otorisasi debug USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Layar tidak akan redup selama mengisi daya"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktifkan log pengintaian HCI Bluetooth"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tangkap semua paket HCI bluetooth di dalam file"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Pilih waktu operasi"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Pilih waktu operasi"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Nyalakan ulang untuk mengubah waktu operasi dari <xliff:g id="OLD">%1$s</xliff:g> ke <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Sertifikasi layar nirkabel"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Aktifkan Pencatatan Log Panjang Wi-Fi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Wifi agresif ke pengalihan Seluler"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Selalu izinkan Pemindaian Roaming Wifi"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Tampilkan opsi untuk sertifikasi layar nirkabel"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Tinggikan level pengelogan Wi-Fi, tampilkan per SSID RSSI di Alat Pilih Wi-Fi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Jika diaktifkan, Wifi akan lebih agresif mengalihkan sambungan data ke Seluler, saat sinyal Wifi lemah"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Izinkan/Larang Pemindaian Roaming Wifi berdasarkan jumlah lalu lintas data yang ada di antarmuka"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Ukuran penyangga pencatat log"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Ukuran Pencatat Log/penyangga log"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Mengizinkan lokasi palsu"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Mengizinkan lokasi palsu"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Izinkan melakukan debug USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Waktu berjalan"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Layanan"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durasi"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Detail memori"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Status memori"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Penggunaan memori"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Asli"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Cache kernel"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Bebas"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 jam"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 jam"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 jam"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Hapus semua sertifikat"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Kredensial tepercaya"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Tampilkan sertifikat CA tepercaya"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Lanjutan"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Jenis penyimpanan"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Menggunakan perangkat keras"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Khusus perangkat lunak"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Kredensial tidak tersedia untuk pengguna ini"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Gambar pola pembuka kunci Anda"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu menggambar pola pembuka kunci untuk mengonfirmasi instalasi kredensial."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Sentuh "<b>"Berikutnya"</b>" untuk melanjutkan penyiapan.\n\nSentuh "<b>"Kembali"</b>" untuk menyambung ke jaringan Wi-Fi lain."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinkronisasi diaktifkan"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinkronisasi dinonaktifkan"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sedang menyinkronkan"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Kesalahan sinkronisasi."</string>
<string name="sync_failed" msgid="1696499856374109647">"Sinkronisasi gagal"</string>
<string name="sync_active" msgid="8476943765960863040">"Sinkronisasi aktif"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Tampilkan batas klip, margin, dll."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Paksa arah tata letak RTL"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Paksa arah tata letak layar RTL untuk semua lokal"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Mode Daya Rendah"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Aktifkan setelan hemat baterai"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Tampilkan penggunaan CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Hamparan layar menampilkan penggunaan CPU saat ini"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Paksa perenderan GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tampilkan semua konten pemberitahuan"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sembunyikan konten pemberitahuan yang sensitif"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Jangan tampilkan pemberitahuan sama sekali"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Saat jangan ganggu diaktifkan"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Sembunyikan pemberitahuan baru dari daftar"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Tampilkan semua pemberitahuan di daftar"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Pemberitahuan aplikasi"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Suara lainnya"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Nada tombol nomor"</string>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index cafafd7..70bda01 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Nessuno"</item>
<item msgid="8673874894887358090">"Manuale"</item>
+ <item msgid="168893341855953140">"Config. automatica proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Nessuno"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"volume allarme"</item>
<item msgid="785049718065337473">"volume notifiche"</item>
<item msgid="6700305533746877052">"volume bluetooth"</item>
- <item msgid="2029227495214047094">"mantieni attivo"</item>
- <item msgid="26109888160231211">"monitora posizione"</item>
- <item msgid="5753382310468855812">"monitora localizzazione a consumo elevato"</item>
+ <item msgid="3810969981743709839">"attiva/disattiva microfono"</item>
+ <item msgid="2627903914574908209">"mantieni attivo"</item>
+ <item msgid="1395372654968157578">"monitora posizione"</item>
+ <item msgid="3238451051299611853">"monitora posizione a consumo elevato"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Posizione"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Volume allarme"</item>
<item msgid="9103719301075748925">"Volume notifiche"</item>
<item msgid="7025966722295861512">"Volume Bluetooth"</item>
- <item msgid="4665183401128289653">"Mantieni attivo"</item>
- <item msgid="8584357129746649222">"Posizione"</item>
+ <item msgid="2265317984004577529">"Attiva/disattiva microfono"</item>
+ <item msgid="3646325683886507917">"Mantieni attivo"</item>
<item msgid="7669257279311110599">"Geolocalizzazione"</item>
+ <item msgid="7745724368696313169">"Posizione"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Breve"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Giallo su blu"</item>
<item msgid="7169235156349580064">"Personalizzato"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (debug)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 kB"</item>
+ <item msgid="505611754508988476">"256 kB"</item>
+ <item msgid="6361286924268716397">"1 MB"</item>
+ <item msgid="6405203239560695266">"4 MB"</item>
+ <item msgid="3025431211013424097">"16 MB"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Usa Dalvik"</item>
- <item msgid="5131846588686178907">"Usa ART"</item>
- <item msgid="4530003713865319928">"Usa la build di debug ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 kB/buffer log"</item>
+ <item msgid="2822309747675758628">"256 kB/buffer log"</item>
+ <item msgid="6699306198357496731">"1 MB/buffer log"</item>
+ <item msgid="5748528643937500349">"4 MB/buffer log"</item>
+ <item msgid="1978629051085111592">"16 MB/buffer log"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Non verificare mai"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Interruzioni limitate"</item>
<item msgid="8735337502532332056">"Zero interruzioni"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normale"</item>
+ <item msgid="866544120205026771">"Moderata"</item>
+ <item msgid="7851902244436886890">"Scarsa"</item>
+ <item msgid="3022922196817563960">"Critica"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Persistente"</item>
+ <item msgid="5779398140277006695">"Prima attività"</item>
+ <item msgid="1439598363694578255">"Importante (in primo piano)"</item>
+ <item msgid="3396458970745718652">"Importante (in background)"</item>
+ <item msgid="5214825238247511992">"Backup"</item>
+ <item msgid="311372689168254967">"Pesante"</item>
+ <item msgid="7438189122367820362">"Servizio (in esecuzione)"</item>
+ <item msgid="918687422516982498">"Service (riavvio)"</item>
+ <item msgid="6807727069641853029">"Ricevitore"</item>
+ <item msgid="6782857406100845127">"Home"</item>
+ <item msgid="2860945127596974299">"Ultima attività"</item>
+ <item msgid="8610560843693675830">"Memorizzata nella cache (attività)"</item>
+ <item msgid="4338089220026248848">"Memorizzata nella cache (client attività)"</item>
+ <item msgid="6652164677254579050">"Memorizzata nella cache (vuoto)"</item>
+ </string-array>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 2d1c202..2014f10 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Il campo Porta deve essere vuoto se il campo Host è vuoto."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"La porta specificata non è valida."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Il proxy HTTP viene utilizzato dal browser ma potrebbe non essere utilizzato da altre applicazioni."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Posizione:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID adiacente:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostra info profilo in schermata di blocco"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informazioni profilo"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Geolocalizzazione"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Account"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Sicurezza"</string>
<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>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Crittografia"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Attendi il termine della crittografia del tablet. <xliff:g id="PERCENT">^1</xliff:g>% completato."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Attendi il termine della crittografia del telefono. <xliff:g id="PERCENT">^1</xliff:g>% completato."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Attendi che il tablet venga crittografato. Tempo rimanente: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Attendi che il telefono venga crittografato. Tempo rimanente: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Riprova tra <xliff:g id="DELAY">^1</xliff:g> secondi."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Digita la password"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Crittografia non riuscita"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Non riprodurre suono all\'inserimento o alla rimozione del tablet dal dock"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Non riprodurre suono all\'inserimento o alla rimozione del telefono dal dock"</string>
<string name="account_settings" msgid="6403589284618783461">"Account"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Personali"</string>
+ <string name="category_work" msgid="8699184680584175622">"Lavoro"</string>
<string name="search_settings" msgid="1910951467596035063">"Ricerca"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Gestisci le impostazioni e la cronologia delle ricerche"</string>
<string name="display_settings" msgid="7965901687241669598">"Display"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Opzioni sviluppatore"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Imposta opzioni per lo sviluppo di applicazioni"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Le opzioni sviluppatore non sono disponibili per questo utente"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Le impostazioni VPN non sono disponibili per questo utente"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Le impostazioni Tethering non sono disponibili per questo utente"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Le impostazioni del nome punto di accesso non sono disponibili per questo utente"</string>
<string name="enable_adb" msgid="7982306934419797485">"Debug USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Modalità debug quando è connesso USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Revoca autorizzazioni debug USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Lo schermo non va mai in stand-by se sotto carica"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Attiva log di esame HCI Bluetooth"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Acquisisci tutti i pacchetti HCI Bluetooth in un file"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Seleziona runtime"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Seleziona runtime"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Riavviare per modificare runtime da <xliff:g id="OLD">%1$s</xliff:g> a <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certificazione display wireless"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Abilita registrazione WiFi dettagliata"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Passaggio aggressivo da Wi-Fi a cellulare"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Consenti sempre scansioni roaming Wi-Fi"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostra opzioni per la certificazione display wireless"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Aumenta livello di registrazione WiFi, mostra in base a SSID RSSI in WiFi Picker"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Quando è attiva, il Wi-Fi è più aggressivo nel passaggio dalla connessione dati alla rete cellulare se segnale Wi-Fi è debole"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Consenti/vieta scansioni roaming Wi-Fi basate sulla quantità di traffico dati presente a livello di interfaccia"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Dimensioni buffer Logger"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Seleziona dim. Logger buffer log"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Posizioni fittizie"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Consenti posizioni fittizie"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Consentire debug USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Run-time"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Servizi"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durata"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Dettagli memoria"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Stati memoria"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Utilizzo memoria"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Nativo"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Cache del kernel"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Swap ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Gratis"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Totale"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 ore"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 ore"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 ore"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Rimuovi tutti i certificati"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Credenziali attendibili"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Visualizza certificati CA attendibili"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Avanzate"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Tipo di archivio"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Basato sull\'hardware"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Solo software"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Le credenziali non sono disponibili per questo utente"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Inserisci la sequenza di sblocco"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Per confermare l\'installazione delle credenziali devi inserire la sequenza di sblocco."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Tocca "<b>"Avanti"</b>" per continuare con la configurazione.\n\nTocca "<b>"Indietro"</b>" per connetterti a un\'altra rete Wi‑Fi."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronizzazione abilitata"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronizzazione disabilata"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sincronizzazione in corso"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Errore di sincronizzazione."</string>
<string name="sync_failed" msgid="1696499856374109647">"Sincronizzazione non riuscita"</string>
<string name="sync_active" msgid="8476943765960863040">"Sincronizzazione attiva"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Mostra limiti, margini dei clip e così via"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forza direzione layout RTL"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Direzione layout schermo RTL per tutte le lingue"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Modalità basso consumo"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Attiva impostazioni di risparmio energetico"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Mostra utilizzo CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Overlay schermo che mostra l\'uso corrente della CPU"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Forza rendering GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostra tutti i contenuti della notifica"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Nascondi contenuti sensibili della notifica"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Non visualizzare del tutto le notifiche"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Quando è attivo Non disturbare"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Nascondi nuove notifiche dall\'elenco"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Visualizza tutte le notifiche nell\'elenco"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Notifiche app"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Altri suoni"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Toni tastierino"</string>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index f2ebfa0..80aeb7f 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"ללא"</item>
<item msgid="8673874894887358090">"ידני"</item>
+ <item msgid="168893341855953140">"הגדרה אוטומטית לשרת proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"ללא"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"עוצמת קול של התרעה"</item>
<item msgid="785049718065337473">"עוצמת קול של התראה"</item>
<item msgid="6700305533746877052">"עוצמת קול של Bluetooth"</item>
- <item msgid="2029227495214047094">"שמור במצב פעיל"</item>
- <item msgid="26109888160231211">"עקוב אחר מיקום"</item>
- <item msgid="5753382310468855812">"מעקב אחר מיקום עם צריכת סוללה גבוהה"</item>
+ <item msgid="3810969981743709839">"השתק/בטל השתקה של המיקרופון"</item>
+ <item msgid="2627903914574908209">"שמור במצב פעיל"</item>
+ <item msgid="1395372654968157578">"עקוב אחר מיקום"</item>
+ <item msgid="3238451051299611853">"מעקב אחר מיקום עם צריכת סוללה גבוהה"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"מיקום"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"עוצמת קול של התראה"</item>
<item msgid="9103719301075748925">"עוצמת קול של התראות"</item>
<item msgid="7025966722295861512">"עוצמת קול של Bluetooth"</item>
- <item msgid="4665183401128289653">"שמור במצב פעיל"</item>
- <item msgid="8584357129746649222">"מיקום"</item>
+ <item msgid="2265317984004577529">"השתק/בטל השתקה של המיקרופון"</item>
+ <item msgid="3646325683886507917">"שמור במצב פעיל"</item>
<item msgid="7669257279311110599">"מיקום"</item>
+ <item msgid="7745724368696313169">"מיקום"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"קצר"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"צהוב על גבי כחול"</item>
<item msgid="7169235156349580064">"מותאם אישית"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (ניקוי באגים)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"השתמש ב-Dalvik"</item>
- <item msgid="5131846588686178907">"השתמש ב-ART"</item>
- <item msgid="4530003713865319928">"השתמש ב-Build ניקוי הבאגים של ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64K לכל מאגר יומן"</item>
+ <item msgid="2822309747675758628">"256K לכל מאגר יומן"</item>
+ <item msgid="6699306198357496731">"1M לכל מאגר יומן"</item>
+ <item msgid="5748528643937500349">"4M לכל מאגר יומן"</item>
+ <item msgid="1978629051085111592">"16M לכל מאגר יומן"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"אל תבדוק לעולם"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"הפרעות מוגבלות"</item>
<item msgid="8735337502532332056">"אפס הפרעות"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"רגיל"</item>
+ <item msgid="866544120205026771">"בינוני"</item>
+ <item msgid="7851902244436886890">"נמוך"</item>
+ <item msgid="3022922196817563960">"קריטי"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"קבוע"</item>
+ <item msgid="5779398140277006695">"פעילות מובילה"</item>
+ <item msgid="1439598363694578255">"חשוב (קדמה)"</item>
+ <item msgid="3396458970745718652">"חשוב (רקע)"</item>
+ <item msgid="5214825238247511992">"גיבוי"</item>
+ <item msgid="311372689168254967">"משקל כבד"</item>
+ <item msgid="7438189122367820362">"שירות (פועל)"</item>
+ <item msgid="918687422516982498">"שירות (מאתחל)"</item>
+ <item msgid="6807727069641853029">"מקבל"</item>
+ <item msgid="6782857406100845127">"דף הבית"</item>
+ <item msgid="2860945127596974299">"פעילות אחרונה"</item>
+ <item msgid="8610560843693675830">"בקובץ שמור (פעילות)"</item>
+ <item msgid="4338089220026248848">"בקובץ שמור (לקוח פעילות)"</item>
+ <item msgid="6652164677254579050">"בקובץ שמור (ריק)"</item>
+ </string-array>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index fc27ff6..219d19f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"שדה היציאה חייב להיות ריק אם שדה המארח ריק."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"היציאה שהקלדת אינה חוקית."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"שרת ה-Proxy של HTTP נמצא בשימוש הדפדפן, אך אפליקציות אחרות לא יכולים להשתמש בו."</string>
- <string name="proxy_url" msgid="2523518669129974654">"כתובת אתר של PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"כתובת אתר של PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"מיקום:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID שכן:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"נתונים:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"הצג פרטי פרופיל במסך הנעילה"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"פרטי פרופיל"</string>
<string name="location_settings_title" msgid="1369675479310751735">"מיקום"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"חשבונות"</string>
<string name="security_settings_title" msgid="7945465324818485460">"אבטחה"</string>
<string name="security_settings_summary" msgid="967393342537986570">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת כרטיס SIM, נעילת אחסון אישורים"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"הגדר את \'המיקום שלי\', ביטול נעילת מסך, נעילת אחסון אישורים"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"מצפין"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"המתן בזמן הצפנת הטאבלט. <xliff:g id="PERCENT">^1</xliff:g> הושלמו."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"המתן בזמן הצפנת הטלפון. <xliff:g id="PERCENT">^1</xliff:g> הושלמו."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"המתן עד להשלמת ההצפנה של הטאבלט. זמן נותר: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"המתן עד להשלמת ההצפנה של הטלפון. זמן נותר: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"נסה שוב בעוד <xliff:g id="DELAY">^1</xliff:g> שניות."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"הקלד את הסיסמה שלך"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ההצפנה נכשלה"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"אל תשמיע צלילים בעת הכנסת הטאבלט לעגינה או הסרתו משם"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"אל תפעיל צליל בעת הכנסת הטלפון לעגינה או הוצאתו מעגינה"</string>
<string name="account_settings" msgid="6403589284618783461">"חשבונות"</string>
+ <string name="category_personal" msgid="1299663247844969448">"אישי"</string>
+ <string name="category_work" msgid="8699184680584175622">"עבודה"</string>
<string name="search_settings" msgid="1910951467596035063">"חיפוש"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"ניהול הגדרות והיסטוריה של חיפוש"</string>
<string name="display_settings" msgid="7965901687241669598">"תצוגה"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"אפשרויות מפתח"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"הגדרת אפשרויות לפיתוח אפליקציות"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"אפשרויות מפתח אינן זמינות עבור משתמש זה"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"הגדרות VPN אינן זמינות עבור המשתמש הזה."</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"הגדרות עבור שיתוף של חיבור אינטרנט אינן זמינות עבור המשתמש הזה"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"הגדרות עבור שם נקודת גישה (APN) אינן זמינות עבור המשתמש הזה"</string>
<string name="enable_adb" msgid="7982306934419797485">"ניקוי באגים ב-USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"מצב תיקון באגים כאשר USB מחובר"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"ביטול הרשאות לניקוי באגים ב-USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"המסך לעולם לא יהיה במצב שינה במהלך טעינה"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"הפעלת Snoop Log של Bluetooth HCI"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"אחד את כל חבילות Bluetooth HCI בקובץ"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"בחירת זמן ריצה"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"בחירת זמן ריצה"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"האם לאתחל על מנת לשנות את זמן הריצה מ-<xliff:g id="OLD">%1$s</xliff:g> ל-<xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"אישור של תצוגת WiFi"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"הפעל רישום מפורט של WiFi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"העברה אגרסיבית מ-Wi-Fi לסלולר"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"התר תמיד סריקות נדידה של Wi-Fi"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"הצג אפשרויות עבור אישור של תצוגת WiFi"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"העלה את רמת הרישום של WiFi, הצג לכל SSID RSSI ב-Wi-Fi Picker"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"כשתכונה זו מופעלת, Wi-Fi יתנהג בצורה אגרסיבית יותר בעת העברת חיבור הנתונים לסלולר כשאות ה-Wi-Fi חלש."</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"התר/מנע סריקות נדידה של Wi-Fi בהתבסס על נפח תנועת הנתונים הקיימת בממשק"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"גדלי מאגר של יוצר יומן"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"בחר גדלים של יוצר יומן לכל מאגר יומן"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"אפשר מיקומים מדומים"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"אפשר מיקומים מדומים"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"לאפשר ניקוי באגים של USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"משך ההפעלה"</string>
<string name="services_subtitle" msgid="4296402367067266425">"שירותים"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"משך זמן"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"פרטי זיכרון"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"מצבי זיכרון"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"שימוש בזיכרון"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"ליבה"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"מקומי"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"קבצים שמורים בליבה"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"החלפת ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"פנוי"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"סה\"כ"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 שעות"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 שעות"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 שעות"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"הסר את כל האישורים"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"אישורים מהימנים"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"הצג אישורי CA מהימנים"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"מתקדם"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"סוג אחסון"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"מגובה באמצעות חומרה"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"תוכנה בלבד"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"פרטי כניסה אינם זמינים עבור המשתמש הזה"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"שרטט את קו ביטול הנעילה"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"עליך לשרטט את קו ביטול הנעילה כדי לאשר התקנת הסמכות."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"גע ב"<b>"הבא"</b>" כדי להמשיך בהגדרה.\n\nגע ב"<b>"הקודם"</b>" כדי להתחבר לרשת Wi-Fi אחרת."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"הסינכרון מופעל"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"הסינכרון מושבת"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"מסנכרן כעת"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"שגיאת סינכרון"</string>
<string name="sync_failed" msgid="1696499856374109647">"הסנכרון נכשל"</string>
<string name="sync_active" msgid="8476943765960863040">"סנכרון פעיל"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"הצג גבולות קליפ, שוליים וכו\'"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"אלץ כיוון פריסה מימין לשמאל"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"אלץ כיוון פריסת מסך מימין לשמאל עבור כל השפות בכל המקומות"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"מצב חיסכון בחשמל"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"הפעל הגדרות לחיסכון בחיי סוללה"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"הצג את השימוש ב-CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"שכבת על של מסך שמציגה את השימוש הנוכחי ב-CPU"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"אלץ עיבוד ב-GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"הצג את כל תוכן ההודעות"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"הסתר תוכן רגיש בהודעות"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"אל תציג הודעות כלל"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"כשמצב \'נא לא להפריע\' פועל"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"אל תציג הודעות חדשות ברשימה"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"הצג את כל ההודעות ברשימה"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"הודעות אפליקציה"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"צלילים אחרים"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"צלילים של לוח חיוג"</string>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index e4cdf89..8449cc4 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"なし"</item>
<item msgid="8673874894887358090">"手動"</item>
+ <item msgid="168893341855953140">"プロキシの自動設定"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"なし"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"アラームの音量"</item>
<item msgid="785049718065337473">"通知音量"</item>
<item msgid="6700305533746877052">"Bluetoothの音量"</item>
- <item msgid="2029227495214047094">"スリープモードにしない"</item>
- <item msgid="26109888160231211">"場所を監視"</item>
- <item msgid="5753382310468855812">"高精度の現在地情報を監視"</item>
+ <item msgid="3810969981743709839">"マイクをミュート/ミュート解除"</item>
+ <item msgid="2627903914574908209">"スリープモードにしない"</item>
+ <item msgid="1395372654968157578">"場所を監視"</item>
+ <item msgid="3238451051299611853">"高精度の現在地情報を監視"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"位置情報"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"アラームの音量"</item>
<item msgid="9103719301075748925">"通知の音量"</item>
<item msgid="7025966722295861512">"Bluetoothの音量"</item>
- <item msgid="4665183401128289653">"スリープモードにしない"</item>
- <item msgid="8584357129746649222">"場所"</item>
+ <item msgid="2265317984004577529">"マイクをミュート/ミュート解除"</item>
+ <item msgid="3646325683886507917">"スリープモードにしない"</item>
<item msgid="7669257279311110599">"現在地"</item>
+ <item msgid="7745724368696313169">"場所"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"短め"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"青地に黄色"</item>
<item msgid="7169235156349580064">"カスタム"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART（デバッグ）"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Dalvikを使用"</item>
- <item msgid="5131846588686178907">"ARTを使用"</item>
- <item msgid="4530003713865319928">"ARTデバッグビルドを使用"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64K/ログバッファ"</item>
+ <item msgid="2822309747675758628">"256K/ログバッファ"</item>
+ <item msgid="6699306198357496731">"1M/ログバッファ"</item>
+ <item msgid="5748528643937500349">"4M/ログバッファ"</item>
+ <item msgid="1978629051085111592">"16M/ログバッファ"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"チェックしない"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"制限付き中断"</item>
<item msgid="8735337502532332056">"中断なし"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"標準"</item>
+ <item msgid="866544120205026771">"やや不足"</item>
+ <item msgid="7851902244436886890">"かなり不足"</item>
+ <item msgid="3022922196817563960">"残りわずか"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"常駐"</item>
+ <item msgid="5779398140277006695">"上位のアクティビティ"</item>
+ <item msgid="1439598363694578255">"重要（フォアグラウンド）"</item>
+ <item msgid="3396458970745718652">"重要（バックグラウンド）"</item>
+ <item msgid="5214825238247511992">"バックアップ"</item>
+ <item msgid="311372689168254967">"大重量"</item>
+ <item msgid="7438189122367820362">"サービス（実行中）"</item>
+ <item msgid="918687422516982498">"サービス（再起動中）"</item>
+ <item msgid="6807727069641853029">"レシーバー"</item>
+ <item msgid="6782857406100845127">"ホーム"</item>
+ <item msgid="2860945127596974299">"前回のアクティビティ"</item>
+ <item msgid="8610560843693675830">"キャッシュ済み（アクティビティ）"</item>
+ <item msgid="4338089220026248848">"キャッシュ済み（アクティビティクライアント）"</item>
+ <item msgid="6652164677254579050">"キャッシュ済み（空）"</item>
+ </string-array>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ddd5f02..c7e4075 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -205,7 +205,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"[ホスト]フィールドが空の場合は、[ポート]フィールドも空にしてください。"</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"入力したポートは無効です。"</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTPプロキシはブラウザで使用されていますが、他のアプリでは使用できません。"</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"ロケーション:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"近くのCID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"セル情報:"</string>
@@ -326,6 +326,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"ロック画面にプロフィール情報を表示"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"プロフィール情報"</string>
<string name="location_settings_title" msgid="1369675479310751735">"位置情報"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"アカウント"</string>
<string name="security_settings_title" msgid="7945465324818485460">"セキュリティ"</string>
<string name="security_settings_summary" msgid="967393342537986570">"現在地、画面ロック、SIMカードロック、認証情報ストレージのロック"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"現在地、画面のロック解除、認証情報ストレージのロックを設定します"</string>
@@ -348,6 +349,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"暗号化しています"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"タブレットを暗号化しています。しばらくお待ちください。<xliff:g id="PERCENT">^1</xliff:g>%完了。"</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"携帯端末を暗号化しています。しばらくお待ちください。<xliff:g id="PERCENT">^1</xliff:g>%完了。"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"タブレットを暗号化していますのでお待ちください。残り時間: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"携帯電話を暗号化していますのでお待ちください。残り時間: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>秒後にやり直してください。"</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"パスワードを入力してください"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"暗号化できませんでした"</string>
@@ -729,6 +732,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"タブレットのホルダー脱着時に音を鳴らさない"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"携帯のホルダー脱着時に音を鳴らさない"</string>
<string name="account_settings" msgid="6403589284618783461">"アカウント"</string>
+ <string name="category_personal" msgid="1299663247844969448">"プライベート"</string>
+ <string name="category_work" msgid="8699184680584175622">"仕事"</string>
<string name="search_settings" msgid="1910951467596035063">"検索"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"検索設定と履歴の管理"</string>
<string name="display_settings" msgid="7965901687241669598">"ディスプレイ"</string>
@@ -1321,6 +1326,9 @@
<string name="development_settings_title" msgid="215179176067683667">"開発者向けオプション"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"アプリ開発オプションを設定する"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"デベロッパー向けオプションはこのユーザーには表示されません"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"このユーザーはVPN設定を利用できません。"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"このユーザーはテザリング設定を利用できません"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"このユーザーはアクセスポイント名設定を利用できません"</string>
<string name="enable_adb" msgid="7982306934419797485">"USBデバッグ"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"USB接続時はデバッグモードにする"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"USBデバッグの許可の取り消し"</string>
@@ -1330,12 +1338,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"充電中に画面をスリープにしない"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCIスヌープログを有効にする"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bluetooth HCIパケットをすべてファイルにキャプチャする"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"ランタイムを選択"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"ランタイムを選択"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"再起動して、ランタイムを<xliff:g id="OLD">%1$s</xliff:g>から<xliff:g id="NEW">%2$s</xliff:g>に変更しますか？"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"ワイヤレスディスプレイ認証"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Wi-Fi詳細ログの有効化"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Wi-Fiを強制的にモバイル接続に切り替える"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Wi-Fiローミングスキャンを常に許可する"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"ワイヤレスディスプレイ認証のオプションを表示"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Wi-Fiログレベルを上げて、Wi-Fi選択ツールでSSID RSSIごとに表示"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"有効にすると、Wi-Fiの電波強度が弱い場合は強制的にモバイルデータ接続に切り替わるようになります"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"インターフェースのデータトラフィック量に基づいたWi-Fiローミングスキャンを許可するかしないかを設定できます"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"ログバッファのサイズ"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"各ログバッファのログサイズを選択"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"擬似ロケーションを許可"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"擬似ロケーションを許可する"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USBデバッグを許可しますか？"</string>
@@ -1587,6 +1599,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"実行時間"</string>
<string name="services_subtitle" msgid="4296402367067266425">"サービス"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"期間"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"メモリ情報"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"メモリのステータス"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"メモリ使用"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"カーネル"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"ネイティブ"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"カーネルキャッシュ"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"zramスワップ"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"未使用"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"合計"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3時間"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6時間"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12時間"</string>
@@ -1688,9 +1709,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"証明書をすべて削除する"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"信頼できる認証情報"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"信頼できるCA証明書を表示する"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"詳細設定"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"ストレージのタイプ"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"ハードウェア式"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"ソフトウェアのみ"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"認証情報はこのユーザーには表示されません"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"ロック解除パターンを入力してください"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"認証情報をインストールするには、ロック解除パターンを入力する必要があります。"</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1771,6 +1794,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"セットアップを続けるには["<b>"次へ"</b>"]をタップします。\n\n別のWi-Fiネットワークに接続するには["<b>"戻る"</b>"]をタップします。"</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"同期が有効です"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"同期は無効になっています"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"同期しています"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"同期エラー。"</string>
<string name="sync_failed" msgid="1696499856374109647">"同期失敗"</string>
<string name="sync_active" msgid="8476943765960863040">"同期有効"</string>
@@ -1863,8 +1887,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"クリップの境界線、マージンなどを表示"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTLレイアウト方向を使用"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"すべての言語/地域で画面レイアウト方向をRTLに設定"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"省電力モード"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"バッテリー節約設定を有効にする"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"CPU使用状況を表示"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"現在のCPU使用状況をオーバーレイ表示する"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"GPUレンダリングを使用"</string>
@@ -2141,9 +2163,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"すべての通知内容を表示します"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"プライベートな通知内容を非表示にします"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"すべての通知を表示しない"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"[通知を非表示]がONのとき"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"リストから新しい通知を隠す"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"リストにすべての通知を表示する"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"アプリの通知"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"その他の音"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"ダイヤルパッドの操作音"</string>
diff --git a/res/values-ka-rGE/arrays.xml b/res/values-ka-rGE/arrays.xml
index fda74d9..f77378a 100644
--- a/res/values-ka-rGE/arrays.xml
+++ b/res/values-ka-rGE/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"არცერთი"</item>
<item msgid="8673874894887358090">"მექანიკურად"</item>
+ <item msgid="168893341855953140">"პროქსის ავტოკონფიგურაცია"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"არც ერთი"</item>
@@ -231,96 +232,13 @@
<item msgid="886742181977884584">"მედია"</item>
<item msgid="7924928667052300589">"მოწყობილობა"</item>
</string-array>
- <string-array name="app_ops_summaries">
- <item msgid="4979188868761515915">"მიახლოებითი მდებარეობა"</item>
- <item msgid="5789673140227507995">"ზუსტი მდებარეობა"</item>
- <item msgid="1061584358377390581">"GPS"</item>
- <item msgid="5387405117297558954">"ვიბრაცია"</item>
- <item msgid="3434165993711230924">"კონტაქტების წაკითხვა"</item>
- <item msgid="616161687718081936">"კონტაქტების შეცვლა"</item>
- <item msgid="7638002295329050091">"ზარების სიის ნახვა"</item>
- <item msgid="6546959730920410907">"ზარების ჟურნალის ჩასწორება"</item>
- <item msgid="446877710771379667">"კალენდრის წაკითხვა"</item>
- <item msgid="7674458294386319722">"კალენდრის ჩასწორება"</item>
- <item msgid="8281201165558093009">"Wi-Fi ქსელის ძებნა"</item>
- <item msgid="8694611243479480497">"შეტყობინება"</item>
- <item msgid="7776439107987345446">"ფიჭური ქსელების ძებნა"</item>
- <item msgid="514615766544675057">"ტელეფონზე დარეკვა"</item>
- <item msgid="8181415497109310680">"SMS-ის წაკითხვა"</item>
- <item msgid="6816551144382117307">"SMS-ის შექმნა"</item>
- <item msgid="4600463921908905030">"SMS-ის მიღება"</item>
- <item msgid="5958926493289432745">"სასწრაფო SMS-ის მიღება"</item>
- <item msgid="4945269495221089540">"MMS-ის მიღება"</item>
- <item msgid="5570472453573929087">"WAP push მიღება"</item>
- <item msgid="7125408150230860501">"SMS-ის გაგზავნა"</item>
- <item msgid="7080337936612188061">"ICC SMS-ის წაკითხვა"</item>
- <item msgid="587124103118495063">"ICC SMS-ის შექმნა"</item>
- <item msgid="2320577158869025503">"პარამეტრების შეცვლა"</item>
- <item msgid="1545733463471924009">"სხვა ერთეულებს ზემოდან ჩვენება"</item>
- <item msgid="3609046903962454582">"შეტყობინებებთან წვდომა"</item>
- <item msgid="4671646036128214513">"კამერა"</item>
- <item msgid="1097324338692486211">"აუდიოს ჩაწერა"</item>
- <item msgid="5031552983987798163">"აუდიოს დაკვრა"</item>
- <item msgid="8374996688066472414">"გაცვლის ბუფერის წაკითხვა"</item>
- <item msgid="3045529469061083747">"გაცვლის ბუფერის ცვლილება"</item>
- <item msgid="5124443975763747838">"მედიის ღილაკები"</item>
- <item msgid="4547883971364273343">"აუდიოს ფოკუსი"</item>
- <item msgid="2603878814882344450">"მასტერ-ხმის სიმძლავრე"</item>
- <item msgid="7136963238377062018">"ხმის სიმძღლავრე"</item>
- <item msgid="4270236897655923007">"ზარის სიმძლავრე"</item>
- <item msgid="6325739889222559394">"მედიის ხმა"</item>
- <item msgid="5762123934816216821">"მაღვიძარას ხმა"</item>
- <item msgid="785049718065337473">"შეტყობინების ხმა"</item>
- <item msgid="6700305533746877052">"Bluetooth-ის ხმა"</item>
- <item msgid="2029227495214047094">"დარჩეს აქტიური"</item>
- <item msgid="26109888160231211">"მდებარეობის მონიტორინგი"</item>
- <item msgid="5753382310468855812">"მაღალი ძაბვის მდებარეობის მონიტორინგი"</item>
- </string-array>
- <string-array name="app_ops_labels">
- <item msgid="6602854600289714121">"მდებარეობა"</item>
- <item msgid="8677040780775113033">"მდებარეობა"</item>
- <item msgid="1660743989948992916">"მდებარეობა"</item>
- <item msgid="8791172739860195290">"ვიბრაცია"</item>
- <item msgid="383413555642128046">"კონტაქტების წაკითხვა"</item>
- <item msgid="3654594895269697313">"კონტაქტების შეცვლა"</item>
- <item msgid="7928393476362362538">"ზარების ჟურნალის ნახვა"</item>
- <item msgid="6248591205254641116">"ზარების ჟურნალის ჩასწორება"</item>
- <item msgid="6093344633066170692">"კალენდრის წაკითხვა"</item>
- <item msgid="1334886368750347692">"კალენდრის ჩასწორება"</item>
- <item msgid="1638204101698708656">"მდებარეობა"</item>
- <item msgid="2154671955760380322">"შეტყობინების გამოქვეყნება"</item>
- <item msgid="4282477730595931828">"მდებარეობა"</item>
- <item msgid="4891423912898525905">"ტელეფონზე დარეკვა"</item>
- <item msgid="2623604824935968113">"SMS/MMS-ის წაკითხვა"</item>
- <item msgid="4420177125221176306">"SMS/MMS-ის დაწერა"</item>
- <item msgid="3986142739951490025">"SMS/MMS-ის მიღება"</item>
- <item msgid="3984213795861739778">"SMS/MMS მიღება"</item>
- <item msgid="3656243523752472788">"SMS/MMS მიღება"</item>
- <item msgid="8105802370238551510">"SMS/MMS-ის მიღება"</item>
- <item msgid="1407766984645388488">"SMS/MMS გაგზავნა"</item>
- <item msgid="3527273606643794973">"SMS/MMS-ის წაკითხვა"</item>
- <item msgid="4370895547001583812">"SMS/MMS-ის დაწერა"</item>
- <item msgid="4218544235221631789">"პარამეტრების შეცვლა"</item>
- <item msgid="736541391767350377">"დახაზვა ზემოთ"</item>
- <item msgid="5530815681721654194">"შეტყობინებებზე წვდომა"</item>
- <item msgid="781213371706962767">"კამერა"</item>
- <item msgid="1720492593061838172">"აუდიოს ჩაწერა"</item>
- <item msgid="3493046322001257041">"აუდიოს დაკვრა"</item>
- <item msgid="136815868796597058">"გაცვლის ბუფერის წაკითხვა"</item>
- <item msgid="5238692940326972503">"გაცვლის ბუფერის შეცვლა"</item>
- <item msgid="5753789168376302997">"მედიის ღილაკები"</item>
- <item msgid="3265262911688671938">"აუდიოს ფოკუსი"</item>
- <item msgid="2098976479485046797">"მასტერ-ხმის სიმძლავრე"</item>
- <item msgid="5660213838861789350">"ხმის სიმძღლავრე"</item>
- <item msgid="7983336752371254444">"ზარის სიმძლავრე"</item>
- <item msgid="7878027809189330917">"მედიის ხმა"</item>
- <item msgid="7260546305036218513">"მაღვიძარას ხმა"</item>
- <item msgid="9103719301075748925">"შეტყობინების ხმა"</item>
- <item msgid="7025966722295861512">"Bluetooth-ის ხმა"</item>
- <item msgid="4665183401128289653">"დარჩეს აქტიური"</item>
- <item msgid="8584357129746649222">"მდებარეობა"</item>
- <item msgid="7669257279311110599">"მდებარეობა"</item>
- </string-array>
+ <!-- no translation found for app_ops_summaries:40 (3810969981743709839) -->
+ <!-- no translation found for app_ops_summaries:41 (2627903914574908209) -->
+ <!-- no translation found for app_ops_summaries:42 (1395372654968157578) -->
+ <!-- no translation found for app_ops_summaries:43 (3238451051299611853) -->
+ <!-- no translation found for app_ops_labels:40 (2265317984004577529) -->
+ <!-- no translation found for app_ops_labels:41 (3646325683886507917) -->
+ <!-- no translation found for app_ops_labels:43 (7745724368696313169) -->
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"მოკლე"</item>
<item msgid="2560532955514699713">"საშუალო"</item>
@@ -365,15 +283,19 @@
<item msgid="6039700130994371612">"ყვითელი ლურჯზე"</item>
<item msgid="7169235156349580064">"მორგებული"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (გამართვა)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Dalvik-ის გამოყენება"</item>
- <item msgid="5131846588686178907">"ART-ის გამოყენება"</item>
- <item msgid="4530003713865319928">"ART გამართვის ანაწყობის გამოყენება"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64K / ჟურნ. ბუფერზე"</item>
+ <item msgid="2822309747675758628">"256K/ჟურნ. ბუფერზე"</item>
+ <item msgid="6699306198357496731">"1M / ჟურნ. ბუფერზე"</item>
+ <item msgid="5748528643937500349">"4M / ჟურნ. ბუფერზე"</item>
+ <item msgid="1978629051085111592">"16M / ჟურნ. ბუფერზე"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"არასდროს შეამოწმო"</item>
@@ -483,4 +405,26 @@
<item msgid="5656544177755411222">"შეზღუდული შეწყვეტები"</item>
<item msgid="8735337502532332056">"შეწყვეტების გარეშე"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"ჩვეულებრივი"</item>
+ <item msgid="866544120205026771">"ზომიერი"</item>
+ <item msgid="7851902244436886890">"დაბალი"</item>
+ <item msgid="3022922196817563960">"კრიტიკული"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"სისტემატური"</item>
+ <item msgid="5779398140277006695">"ტოპ-აქტივობა"</item>
+ <item msgid="1439598363694578255">"მნიშვნელოვანი (წინა პლანზე)"</item>
+ <item msgid="3396458970745718652">"მნიშვნელოვანი (ფონური)"</item>
+ <item msgid="5214825238247511992">"დამარქაფება"</item>
+ <item msgid="311372689168254967">"დიდი დატვირთვა"</item>
+ <item msgid="7438189122367820362">"სერვისი (გაშვებული)"</item>
+ <item msgid="918687422516982498">"სერვისი (გადატვირთვა)"</item>
+ <item msgid="6807727069641853029">"მიმღები"</item>
+ <item msgid="6782857406100845127">"მთავარი"</item>
+ <item msgid="2860945127596974299">"ბოლო აქტივობა"</item>
+ <item msgid="8610560843693675830">"ქეშირებული (აქტივობა)"</item>
+ <item msgid="4338089220026248848">"ქეშირებულია (აქტივობის კლიენტი)"</item>
+ <item msgid="6652164677254579050">"ქეშირებული (ცარიელი)"</item>
+ </string-array>
</resources>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml
index 1a44835..e1d76ec 100644
--- a/res/values-ka-rGE/strings.xml
+++ b/res/values-ka-rGE/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"თუ ჰოსტის ველი ცარიელია, მაშინ პორტის ველიც ცარიელი უნდა იყოს."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"თქვენს მიერ შეყვანილი პორტი არასწორია."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP პროქსი სერვერს იყენებს ბრაუზერი, თუმცა მისი გამოყენება სხვა აპლიკაციების მიერ დაუშვებელია."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"მდებარეობა:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"მეზობელი CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"ქსელის ინფო:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"პროფილის ინფორმაციის დაბლოკილ ეკრანზე ჩვენება"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"ინფორმაცია პროფილზე"</string>
<string name="location_settings_title" msgid="1369675479310751735">"მდებარეობა"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"ანგარიშები"</string>
<string name="security_settings_title" msgid="7945465324818485460">"უსაფრთხოება"</string>
<string name="security_settings_summary" msgid="967393342537986570">"„ჩემი მდებარეობის“ პარამეტრების დაყენება, ეკრანის განბლოკვა და SIM ბარათის დაბლოკვა, ავტორიზაციის მონაცემების საცავის დაბლოკვა"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"დააყენე ჩემი მდებარეობის, ეკრანის განბლოკვისა და ავტორიზაციის მონაცემთა საცავის პარამეტრები"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"დაშიფვრა"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"დაელოდეთ, ვიდრე თქვენი ტაბლეტი დაიშიფრება. <xliff:g id="PERCENT">^1</xliff:g>% შესრულებულია."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"დაელოდეთ, ვიდრე თქვენი ტელეფონი დაიშიფრება. <xliff:g id="PERCENT">^1</xliff:g>% შესრულებულია."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"მოითმინეთ, სანამ თქვენი ტაბლეტი დაიშიფრებოდეს. დარჩენილი დრო: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"მოითმინეთ, სანამ თქვენი ტელეფონი დაიშიფრებოდეს. დარჩენილი დრო: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"სცადეთ ხელახლა <xliff:g id="DELAY">^1</xliff:g> წამში."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"აკრიფეთ თქვენი პაროლი"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"დაშიფვრა ვერ შესრულდა"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"ტაბლეტის სამაგრში დაყენებისას ან მისი სამაგრიდან ამოღებისას არ განხორციელდეს ხმის დაკვრა"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"ტელეფონის დაყენებისას ან ამოღებისას არ განხორციელდეს ხმის დაკვრა"</string>
<string name="account_settings" msgid="6403589284618783461">"ანგარიშები"</string>
+ <string name="category_personal" msgid="1299663247844969448">"პირადი"</string>
+ <string name="category_work" msgid="8699184680584175622">"სამსახური"</string>
<string name="search_settings" msgid="1910951467596035063">"ძიება"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"ძიების პარამეტრებისა და ისტორიის მართვა"</string>
<string name="display_settings" msgid="7965901687241669598">"ეკრანი"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"პარამეტრები დეველოპერებისთვის"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"პარამეტრების დაყენება აპების დეველოპერებისთვის"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"ამ მომხმარებლისთვის დეველოპერის პარამეტრები არ არის ხელმისაწვდომი"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN პარამეტრები ამ მომხმარებლისათვის მიუწვდომელია"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"ტეთერინგის პარამეტრები ამ მომხმარებლისათვის მიუწვდომელია"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"წვდომის წერტილის (APN) პარამეტრები ამ მომხმარებლისათვის მიუწვდომელია"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB გამართვა"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"გამართვის რეჟიმი, როდესაც USB შეერთებულია"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"USB საშუალებით გამართვის შესაძლებლობის გამორთვა"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"დატენვისას ეკრანი არ დაიძინებს"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI snoop ჟურნალის ჩართვა"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ყველა bluetooth HCI პაკეტის ფაილში ჩაწერა"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"აირჩიეთ runtime"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"აირჩიეთ runtime"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"გსურთ გადატვირთოთ, რათა შეიცვალოს runtime <xliff:g id="OLD">%1$s</xliff:g>-დან <xliff:g id="NEW">%2$s</xliff:g>-ზე?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"უსადენო ეკრანის სერტიფიცირება"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"WiFi დაწვრილებითი ჟურნალიზაციის ჩართვა"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Wifi-დან ფიჭურ კავშირზე აქტიური გადართვა"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Wifi Roam სკანირების მუდამ დაშვება"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"უსადენო ეკრანის სერტიფიცირების ვარიანტების ჩვენება"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Wifi ჟურნალიზაციის დონის ამაღლება, WiFi ამომრჩევში ყოველ SSID RSSI-ზე ჩვენება"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"გააქტიურების შემთხვევაში, Wifi უფრო აქტიურად გადაირთვება ფიჭურ კავშირზე, Wifi სიგნალის შესუსტების შემთხვევაში"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Wifi Roam სკანირების დაშვება/აკრძალვა, ინტერფეისზე არსებული მონაცემთა ტრაფიკზე დაფუძნებით"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"ჟურნალიზაციის ბუფერის ზომები"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"აირჩიეთ ჟურნ. ზომა / ჟურნ. ბუფერზე"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"ფიქტიური მდებარეობების დაშვება"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"ფიქტიური მდებარეობების დაშვება"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"ჩავრთო USB გამართვა?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"გაშვების დრო"</string>
<string name="services_subtitle" msgid="4296402367067266425">"სერვისები"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"ხანგრძლივობა"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"მეხსიერების დეტალები"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"მეხსიერების მდგომარეობები"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"გამოყენებული მეხსიერება"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"მკვიდრი"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Kernel-ის ქეშ-მეხსიერებები"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"თავისუფალი"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"სულ"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 საათი"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 საათი"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 საათი"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"წაშალეთ ყველა სერტიფიკატი"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"საიმედო სერტიფიკატები"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"სანდო CA სერტიფიკატის ჩვენება"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"გაფართოებული"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"საცავის ტიპი"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"აპარატურული"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"მხოლოდ პროგრამული"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"ამ მომხმარებლისთვის ავტორიზაციის მონაცემები ხელმისაწვდომი არ არის"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"დახაზეთ თქვენი განბლოკვის ნიმუში"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"ავტორიზაციის დაყენების დასადასტურებლად უნდა დახაზოთ თქვენი განბლოკვის ნიმუში."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"შეეხეთ "<b>"შემდეგს"</b>" პარამეტრების დაყენების გასაგრძელებლად.\n\nშეეხეთ ღილაკს "<b>"უკან"</b>" სხვა Wi‑Fi ქსელთან დასაკავშირებლად."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"სინქრონიზაცია ჩართულია"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"სინქრონიზაცია გამორთულია"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"მიმდინარეობს სინქრონიზაცია…"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"სინქრონიზაციის შეცდომა."</string>
<string name="sync_failed" msgid="1696499856374109647">"სინქრონიზაცია ვერ შესრულდა"</string>
<string name="sync_active" msgid="8476943765960863040">"სინქრონიზაცია გააქტივირებულია"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"კლიპის საზღვრების, მინდვრების ჩვენება და ა.შ."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"მარჯვნიდან მარცხნივ განლაგების მიმართულების იძულება"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"ეკრანის RTL მიმართულებაზე იძულება ყველა ლოკალისათვის"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"დაბალი ელკვების რეჟიმი"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"ბატარეის დაზოგვის პარამეტრების ჩართვა"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"ცენტრალური პროცესორის ჩატვირთვის ჩვენება"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"ეკრანის გადაფარვა აჩვენებს CPU ამჟამინდელ გამოყენებას"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"GPU-აჩქარება"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"შეტყობინების ყველა კონტენტის ჩვენება"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"შეტყობინების სენსიტიური კონტენტის დამალვა"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"არ მაჩვენო არანაირი შეტყობინება"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"როცა ჩართულია „არ შემაწუხოთ“"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"ახალი შეტყობინებების დამალვა სიიდან"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"ყველა შეტყობინების ჩვენება სიაში"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"აპის შეტყობინებები"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"სხვა ხმები"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"ციფერბლატის ტონური რეჟიმი"</string>
diff --git a/res/values-km-rKH/arrays.xml b/res/values-km-rKH/arrays.xml
index c78590ff..cb7f8c8 100644
--- a/res/values-km-rKH/arrays.xml
+++ b/res/values-km-rKH/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"គ្មាន"</item>
<item msgid="8673874894887358090">"ដោយដៃ"</item>
+ <item msgid="168893341855953140">"រចនាសម្ព័ន្ធប្រូកស៊ីស្វ័យប្រវត្តិ"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"គ្មាន"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"កម្រិតសំឡេងរោទ៍"</item>
<item msgid="785049718065337473">"កម្រិតសំឡេងការជូនដំណឹង"</item>
<item msgid="6700305533746877052">"កម្រិតសំឡេងប៊្លូធូស"</item>
- <item msgid="2029227495214047094">"មិនដេក"</item>
- <item msgid="26109888160231211">"តាមដានទីតាំង"</item>
- <item msgid="5753382310468855812">"ពិនិត្យទីតាំងថាមពលខ្ពស់"</item>
+ <item msgid="3810969981743709839">"បិទ/បើកសំឡេងមីក្រូហ្វូន"</item>
+ <item msgid="2627903914574908209">"មិនដេក"</item>
+ <item msgid="1395372654968157578">"ពិនិត្យទីតាំង"</item>
+ <item msgid="3238451051299611853">"ពិនិត្យទីតាំងថាមពលខ្ពស់"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"ទីតាំង"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"កម្រិតសំឡេងរោទ៍"</item>
<item msgid="9103719301075748925">"កម្រិតសំឡេងការជូនដំណឹង"</item>
<item msgid="7025966722295861512">"កម្រិតសំឡេងប៊្លូធូស"</item>
- <item msgid="4665183401128289653">"មិនដេក"</item>
- <item msgid="8584357129746649222">"ទីតាំង"</item>
+ <item msgid="2265317984004577529">"បិទ/បើកសំឡេងមីក្រូហ្វូន"</item>
+ <item msgid="3646325683886507917">"មិនដេក"</item>
<item msgid="7669257279311110599">"ទីតាំង"</item>
+ <item msgid="7745724368696313169">"ទីតាំង"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"ខ្លី"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"ពណ៌លឿងលើពណ៌ខៀវ"</item>
<item msgid="7169235156349580064">"តាមតម្រូវការ"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (កែកំហុស)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"ប្រើ Dalvik"</item>
- <item msgid="5131846588686178907">"ប្រើ ART"</item>
- <item msgid="4530003713865319928">"ប្រើការបង្កើតកែកំហុស ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64K per log buffer"</item>
+ <item msgid="2822309747675758628">"256K per log buffer"</item>
+ <item msgid="6699306198357496731">"1M per log buffer"</item>
+ <item msgid="5748528643937500349">"4M per log buffer"</item>
+ <item msgid="1978629051085111592">"16M per log buffer"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"កុំពិនិត្យមើល"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"ការរំខានបានកំណត់"</item>
<item msgid="8735337502532332056">"ការរំខានសូន្យ"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"ធម្មតា"</item>
+ <item msgid="866544120205026771">"មធ្យម"</item>
+ <item msgid="7851902244436886890">"ទាប"</item>
+ <item msgid="3022922196817563960">"ខ្លាំងមែនទែន"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"ជាប់លាប់"</item>
+ <item msgid="5779398140277006695">"សកម្មភាពលើគេ"</item>
+ <item msgid="1439598363694578255">"សំខាន់ (ផ្ទៃខាងមុខ)"</item>
+ <item msgid="3396458970745718652">"សំខាន់ (ផ្ទៃខាងក្រោយ)"</item>
+ <item msgid="5214825238247511992">"បម្រុងទុក"</item>
+ <item msgid="311372689168254967">"ប្រើច្រើន"</item>
+ <item msgid="7438189122367820362">"សេវាកម្ម (កំពុងដំណើរការ)"</item>
+ <item msgid="918687422516982498">"សេវាកម្ម (ចាប់ផ្ដើមឡើងវិញ)"</item>
+ <item msgid="6807727069641853029">"កម្មវិធីទទួល"</item>
+ <item msgid="6782857406100845127">"ដើម"</item>
+ <item msgid="2860945127596974299">"សកម្មភាពចុងក្រោយ"</item>
+ <item msgid="8610560843693675830">"ទុកក្នុងឃ្លាំងសម្ងាត់ (សកម្មភាព)"</item>
+ <item msgid="4338089220026248848">"ទុកក្នុងឃ្លាំងសម្ងាត់ (ម៉ាស៊ីនកូនសកម្មភាព)"</item>
+ <item msgid="6652164677254579050">"ទុកក្នុងឃ្លាំងសម្ងាត់ (ទទេ)"</item>
+ </string-array>
</resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 9969575..c52592b 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"វាលច្រកត្រូវតែទទេ បើវាលម៉ាស៊ីនទទេ។"</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"ច្រកដែលអ្នកបានបញ្ចូលមិនត្រឹមត្រូវ។"</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"ប្រូកស៊ី HTTP ត្រូវបានប្រើដោយកម្មវិធីអ៊ីនធឺណិត ប៉ុន្តែអាចមិនត្រូវបានប្រើដោយកម្មវិធីផ្សេង។"</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"ទីតាំង៖"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID នៅជិត៖"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"ព័ត៌មានចល័ត៖"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"បង្ហាញព័ត៌មានប្រវត្តិរូបលើអេក្រង់ចាក់សោ"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"ព័ត៌មានប្រវត្តិរូប"</string>
<string name="location_settings_title" msgid="1369675479310751735">"ទីតាំង"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"គណនី"</string>
<string name="security_settings_title" msgid="7945465324818485460">"សុវត្ថិភាព"</string>
<string name="security_settings_summary" msgid="967393342537986570">"កំណត់ទីតាំងរបស់ខ្ញុំ ដោះសោអេក្រង់ ចាក់សោស៊ីមកាត ចាក់សោការផ្ទុកព័ត៌មានសម្ងាត់"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"កំណត់ទីតាំងខ្ញុំ, ការដោះសោអេក្រង់, សោឧបករណ៍ផ្ទុកព័ត៌មានសម្ងាត់"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"ការដាក់លេខកូដ"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"រង់ចាំខណៈដែលកុំព្យូទ័របន្ទះបស់អ្នកកំពុងត្រូវបានដាក់លេខកូដ។ បញ្ចប់ <xliff:g id="PERCENT">^1</xliff:g>% ។"</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"រង់ចាំខណៈដែលទូរស័ព្ទរបស់អ្នកកំពុងត្រូវបានដាក់លេខកូដ។ បញ្ចប់ <xliff:g id="PERCENT">^1</xliff:g>% ។"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"រង់ចាំខណៈពេលដែលឧបករណ៍កុំព្យូទ័របន្ទះរបស់អ្នកកំពុងត្រូវបានអ៊ិនគ្រីប។ ពេលវេលានៅសល់៖ <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"រង់ចាំខណៈពេលដែលទូរស័ព្ទរបស់អ្នកកំពុងត្រូវបានអ៊ិនគ្រីប។ ពេលវេលានៅសល់៖ <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"ព្យាយាមម្ដងទៀតក្នុងរយៈពេល <xliff:g id="DELAY">^1</xliff:g> វិនាទី។"</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"បញ្ចូលពាក្យសម្ងាត់របស់អ្នក"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ការដាក់លេខកូដមិនជោគជ័យ"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"កុំបន្លឺសំឡេងពេលបញ្ចូល ឬដកកុំព្យូទ័របន្ទះពីការភ្ជាប់"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"កុំបន្លឺសំឡេងពេលបញ្ចូល ឬដកទូរស័ព្ទពីការភ្ជាប់"</string>
<string name="account_settings" msgid="6403589284618783461">"គណនី"</string>
+ <string name="category_personal" msgid="1299663247844969448">"ផ្ទាល់ខ្លួន"</string>
+ <string name="category_work" msgid="8699184680584175622">"កន្លែងធ្វើការ"</string>
<string name="search_settings" msgid="1910951467596035063">"ស្វែងរក"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"គ្រប់គ្រងប្រវត្តិ និងការកំណត់ស្វែងរក"</string>
<string name="display_settings" msgid="7965901687241669598">"បង្ហាញ"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"ជម្រើសអ្នកអភិវឌ្ឍ"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"កំណត់ជម្រើសសម្រាប់ការអភិវឌ្ឍកម្មវិធី"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"ជម្រើសអ្នកអភិវឌ្ឍមិនអាចប្រើបានសម្រាប់អ្នកប្រើនេះ"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"ការកំណត់ VPN មិនអាចប្រើបានសម្រាប់អ្នកប្រើនេះ"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"កំណត់ការភ្ជាប់មិនអាចប្រើបានសម្រាប់អ្នកប្រើនេះ"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"ការកំណត់ឈ្មោះចូលដំណើរការមិនអាចប្រើបានសម្រាប់អ្នកប្រើនេះ"</string>
<string name="enable_adb" msgid="7982306934419797485">"ការកែកំហុសតាមយូអេសប៊ី"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"របៀបកែកំហុស ពេលភ្ជាប់យូអេសប៊ី"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"ដកសិទ្ធិកែកំហុសយូអេសប៊ី"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"អេក្រង់នឹងមិនដេកពេលបញ្ចូលថ្ម"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"បើកកំណត់ហេតុ HCI snoop ប៊្លូធូស"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ចាប់យកកញ្ចប់ HCI ប៊្លូធូស ទាំងអស់នៅក្នុងឯកសារ"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"ជ្រើសពេលវេលាដំណើរការ"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"ជ្រើសពេលវេលាដំណើរការ"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"ចាប់ផ្ដើមឡើងវិញ ដើម្បីប្ដូរពេលវេលាដំណើរការពី <xliff:g id="OLD">%1$s</xliff:g> ទៅ <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"បង្ហាញការកំណត់រចនាសម្ព័ន្ធឥតខ្សែ"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"បើកការចុះកំណត់ហេតុបរិយាយវ៉ាយហ្វាយ"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"វ៉ាយហ្វាយបង្ខំទៅការបញ្ជូនចល័ត"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"តែងតែអនុញ្ញាតការវិភាគរ៉ូមវ៉ាយហ្វាយ"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"បង្ហាញជម្រើសសម្រាប់វិញ្ញាបនបត្របង្ហាញឥតខ្សែ"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"បង្កើនកម្រិតកំណត់ហេតុវ៉ាយហ្វាយ បង្ហាញ SSID RSSI ក្នុងកម្មវិធីជ្រើសវ៉ាយហ្វាយ"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"ពេលបានបើក វ៉ាយហ្វាយនឹងកាន់តែបង្ខំក្នុងការបញ្ជូនការភ្ជាប់ទិន្នន័យទៅបណ្ដាញចល័ត នៅពេលសញ្ញាវ៉ាយហ្វាយយឺត"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"អនុញ្ញាត/មិនអនុញ្ញាតការវិភាគរ៉ូមវ៉ាយហ្វាយផ្អែកលើចំនួនការបង្ហាញចរាចរណ៍ទិន្នន័យនៅចំណុចប្រទាក់"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"ទំហំ buffer របស់ Logger"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ជ្រើសទំហំ Logger per log buffer"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"ឲ្យក្លែងទីតាំង"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"អនុញ្ញាតទីតាំងក្លែងក្លាយ"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"អនុញ្ញាតការកែកំហុសយូអេសប៊ី?"</string>
@@ -1593,6 +1605,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"ពេលដំណើរការ"</string>
<string name="services_subtitle" msgid="4296402367067266425">"សេវាកម្ម"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"រយៈពេល"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"ព័ត៌មានលម្អិតអង្គចងចាំ"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"ស្ថានភាពអង្គចងចាំ"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"ការប្រើអង្គចងចាំ"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"ខឺណែល"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"ដើម"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"ឃ្លាំងសម្ងាត់ខឺណែល"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ស្វប ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"ទំនេរ"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"សរុប"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"៣ ម៉ោង"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"៦ ម៉ោង"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"១២ ម៉ោង"</string>
@@ -1690,9 +1711,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"លុបវិញ្ញាបនបត្រទាំងអស់"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"អត្តសញ្ញាណដែលទុកចិត្ត"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"បង្ហាញវិញ្ញាបនបត្រ CA ដែលទុកចិត្ត"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"កម្រិតខ្ពស់"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"ប្រភេទឧបករណ៍ផ្ទុក"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"កន្លែងផ្ទុករបស់ផ្នែករឹង"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"កន្លែងផ្ទុករបស់កម្មវិធី"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"ព័ត៌មានសម្ងាត់មិនមានសម្រាប់អ្នកប្រើនេះទេ"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"គូរលំនាំដោះសោរបស់អ្នក"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"អ្នកត្រូវគូរលំនាំដោះសោរបស់អ្នក ដើម្បីបញ្ជាក់ការដំឡើងព័ត៌មានសម្ងាត់។"</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1773,6 +1796,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"ប៉ះ "<b>"បន្ទាប់"</b>" ដើម្បីបន្តការរៀបចំ។\n\nប៉ះ "<b>"ថយក្រោយ"</b>" ដើម្បីតភ្ជាប់បណ្ដាញវ៉ាយហ្វាយផ្សេង។"</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"បានបើកការធ្វើសមកាលកម្ម"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"បានបិទការធ្វើសមកាលកម្ម"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"ធ្វើសមកាលកម្មឥឡូវ"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"កំហុសការធ្វើសមកាលកម្ម។"</string>
<string name="sync_failed" msgid="1696499856374109647">"ការធ្វើសមកាលកម្មបានបរាជ័យ"</string>
<string name="sync_active" msgid="8476943765960863040">"ការធ្វើសមកាលកម្ម សកម្ម"</string>
@@ -1865,8 +1889,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"បង្ហាញការភ្ជាប់អត្ថបទសម្រង់ រឹម ។ល។"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"បង្ខំទិសប្លង់ RTL"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"បង្ខំទិសប្លង់អេក្រង់ទៅកាន់ RTL សម្រាប់មូលដ្ឋានទាំងអស់"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"របៀបប្រើថ្មតិច"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"បើកការកំណត់សន្សំថ្ម"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"បង្ហាញការប្រើ CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"អេក្រង់ត្រួតគ្នាបង្ហាញការប្រើ CPU បច្ចុប្បន្ន"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"បង្ខំឲ្យបង្ហាញ GPU"</string>
@@ -2143,9 +2165,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"បង្ហាញមាតិកាជូនដំណឹងទាំងអស់"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"លាក់មាតិកាជូនដំណឹងមិនសមរម្យ"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"កុំបង្ហាញការជូនដំណឹង"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"កុំរំខាននៅពេលបើក"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"លាក់ការជូនដំណឹងថ្មីពីបញ្ជី"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"បង្ហាញការជូនដំណឹងទាំងអស់នៅក្នុងបញ្ជី"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"ការជូនដំណឹងកម្មវិធី"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"សំឡេងផ្សេងទៀត"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"សំឡេងបន្ទះលេខ"</string>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index c756c2e..5a2f18a 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"없음"</item>
<item msgid="8673874894887358090">"수동"</item>
+ <item msgid="168893341855953140">"프록시 자동 구성"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"없음"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"알람 볼륨"</item>
<item msgid="785049718065337473">"알림 볼륨"</item>
<item msgid="6700305533746877052">"블루투스 볼륨"</item>
- <item msgid="2029227495214047094">"켜진 상태로 유지"</item>
- <item msgid="26109888160231211">"위치 모니터링"</item>
- <item msgid="5753382310468855812">"고전력 위치 모니터링"</item>
+ <item msgid="3810969981743709839">"마이크 음소거/음소거 해제"</item>
+ <item msgid="2627903914574908209">"켜진 상태로 유지"</item>
+ <item msgid="1395372654968157578">"위치 모니터링"</item>
+ <item msgid="3238451051299611853">"고전력 위치 모니터링"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"위치"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"알람 볼륨"</item>
<item msgid="9103719301075748925">"알림 볼륨"</item>
<item msgid="7025966722295861512">"블루투스 볼륨"</item>
- <item msgid="4665183401128289653">"켜진 상태로 유지"</item>
- <item msgid="8584357129746649222">"위치"</item>
+ <item msgid="2265317984004577529">"마이크 음소거/음소거 해제"</item>
+ <item msgid="3646325683886507917">"켜진 상태로 유지"</item>
<item msgid="7669257279311110599">"위치"</item>
+ <item msgid="7745724368696313169">"위치"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"짧게"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"파란색 바탕에 흰색"</item>
<item msgid="7169235156349580064">"맞춤설정"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART(디버그)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Dalvik 사용"</item>
- <item msgid="5131846588686178907">"ART 사용"</item>
- <item msgid="4530003713865319928">"ART 디버그 빌드 사용"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"로그 버퍼당 64K"</item>
+ <item msgid="2822309747675758628">"로그 버퍼당 256K"</item>
+ <item msgid="6699306198357496731">"로그 버퍼당 1M"</item>
+ <item msgid="5748528643937500349">"로그 버퍼당 4M"</item>
+ <item msgid="1978629051085111592">"로그 버퍼당 16M"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"확인 안함"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"제한적 중단"</item>
<item msgid="8735337502532332056">"중단 없음"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"보통"</item>
+ <item msgid="866544120205026771">"중간"</item>
+ <item msgid="7851902244436886890">"낮음"</item>
+ <item msgid="3022922196817563960">"중요"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"영구"</item>
+ <item msgid="5779398140277006695">"메모리 사용이 가장 많은 활동"</item>
+ <item msgid="1439598363694578255">"중요(포그라운드)"</item>
+ <item msgid="3396458970745718652">"중요(백그라운드)"</item>
+ <item msgid="5214825238247511992">"백업"</item>
+ <item msgid="311372689168254967">"무거운 활동"</item>
+ <item msgid="7438189122367820362">"서비스(운영 중)"</item>
+ <item msgid="918687422516982498">"서비스(다시 시작 중)"</item>
+ <item msgid="6807727069641853029">"수신기"</item>
+ <item msgid="6782857406100845127">"홈"</item>
+ <item msgid="2860945127596974299">"마지막 활동"</item>
+ <item msgid="8610560843693675830">"캐시됨(활동)"</item>
+ <item msgid="4338089220026248848">"캐시됨(활동 클라이언트)"</item>
+ <item msgid="6652164677254579050">"캐시됨(비어 있음)"</item>
+ </string-array>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index c5aa7b4..0cadfc8 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"호스트가 비어 있는 경우 포트를 입력할 수 없습니다."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"입력한 포트가 올바르지 않습니다."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP 프록시는 브라우저에서 사용되며 다른 앱에서는 사용되지 않을 수 있습니다."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"위치:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"인접한 CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"잠금 화면에 프로필 정보 표시"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"프로필 정보"</string>
<string name="location_settings_title" msgid="1369675479310751735">"위치"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"계정"</string>
<string name="security_settings_title" msgid="7945465324818485460">"보안"</string>
<string name="security_settings_summary" msgid="967393342537986570">"내 위치, 화면 잠금해제, SIM 카드 잠금, 자격증명 저장소 잠금 설정"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"내 위치, 화면 잠금해제, 자격증명 저장소 잠금 설정"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"암호화 중"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"태블릿을 암호화하는 동안 잠시 기다려 주세요. <xliff:g id="PERCENT">^1</xliff:g>% 완료되었습니다."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"휴대전화를 암호화하는 동안 잠시 기다려 주세요. <xliff:g id="PERCENT">^1</xliff:g>% 완료되었습니다."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"태블릿을 암호화하는 동안 잠시 기다려 주세요. 남은 시간: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"휴대전화를 암호화하는 동안 잠시 기다려 주세요. 남은 시간: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g>초 후에 다시 시도하세요."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"비밀번호 입력"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"암호화하지 못했습니다."</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"도크에 태블릿을 끼우거나 제거할 때 소리 재생 안함"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"도크에 휴대전화를 끼우거나 제거할 때 소리 재생 안함"</string>
<string name="account_settings" msgid="6403589284618783461">"계정"</string>
+ <string name="category_personal" msgid="1299663247844969448">"개인"</string>
+ <string name="category_work" msgid="8699184680584175622">"직장"</string>
<string name="search_settings" msgid="1910951467596035063">"검색"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"검색 설정 및 기록 관리"</string>
<string name="display_settings" msgid="7965901687241669598">"디스플레이"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"개발자 옵션"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"앱 개발 옵션 설정"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"이 사용자는 개발자 옵션을 사용할 수 없습니다."</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"이 사용자는 VPN 설정을 수정할 수 없습니다."</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"이 사용자는 테더링 설정을 수정할 수 없습니다."</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"이 사용자는 액세스포인트 네임(APN) 설정을 수정할 수 없습니다."</string>
<string name="enable_adb" msgid="7982306934419797485">"USB 디버깅"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"USB가 연결된 경우 디버그 모드 사용"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"USB 디버깅 권한 승인 취소"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"충전하는 동안 화면이 꺼지지 않음"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"블루투스 HCI 스누프 로그 사용"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"모든 블루투스 HCI 패킷을 하나의 파일에 캡처"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"런타임 선택"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"런타임 선택"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"다시 부팅하여 <xliff:g id="OLD">%1$s</xliff:g>에서 <xliff:g id="NEW">%2$s</xliff:g>(으)로 런타임을 변경하시겠습니까?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"무선 디스플레이 인증서"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"WiFi 상세 로깅 사용"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Wi-Fi에서 데이터 네트워크로 적극 전환"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Wi-Fi 로밍 스캔 항상 허용"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"무선 디스플레이 인증서 옵션 표시"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"WiFi 로깅 수준을 높이고 WiFi 선택도구에서 SSID RSSI당 값을 표시"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"사용하도록 설정하면 Wi-Fi 신호가 약할 때 데이터 연결을 Wi-Fi에서 데이터 네트워크로 더욱 적극적으로 전환"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"인터페이스에 표시되는 데이터 트래픽의 양을 기반으로 Wi-Fi 로밍 스캔을 허용/허용 안함"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"로거 버퍼 크기"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"로그 버퍼당 로거 크기 선택"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"모의 위치 허용"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"모의 위치 허용"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB 디버깅을 허용하시겠습니까?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"재생 시간"</string>
<string name="services_subtitle" msgid="4296402367067266425">"서비스"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"기간"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"메모리 세부정보"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"메모리 상태"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"메모리 사용량"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"커널"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"기본"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"커널 캐시"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam 교환"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"사용 가능"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"총 사용량"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3시간"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6시간"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12시간"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"모든 인증서 삭제"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"신뢰할 수 있는 자격증명"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"신뢰할 수 있는 CA 인증서 표시"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"고급"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"저장공간 유형"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"하드웨어 지원"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"소프트웨어 전용"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"이 사용자는 자격증명을 확인하거나 수정할 수 없습니다."</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"잠금해제 패턴을 그리세요."</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"자격증명 설치를 확인하려면 잠금해제 패턴을 그려야 합니다."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"설정을 계속하려면 "<b>"다음"</b>"을 터치하세요.\n\n다른 Wi-Fi 네트워크에 연결하려면 "<b>"뒤로"</b>"를 터치하세요."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"동기화 사용"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"동기화 사용중지됨"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"지금 동기화 중"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"동기화 오류입니다."</string>
<string name="sync_failed" msgid="1696499856374109647">"동기화 실패"</string>
<string name="sync_active" msgid="8476943765960863040">"동기화 사용 중"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"클립 경계, 여백 등을 표시"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTL 레이아웃 방향 강제 적용"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"모든 언어에 대해 화면 레이아웃 방향을 RTL로 강제 적용"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"저전력 모드"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"배터리 절약 설정 사용"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"CPU 사용량 표시"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"현재 CPU 사용량 오버레이 표시"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"GPU 렌더링 강제 설정"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"모든 알림 내용 표시"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"민감한 알림 내용 숨기기"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"알림 표시 안함"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"알림 일시중지 사용 시"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"목록에서 새로운 알림 숨기기"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"목록에 모든 알림 표시"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"앱 알림"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"기타 소리"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"다이얼패드 신호음"</string>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 63550d7..2c8f92d 100755
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -25,7 +25,34 @@
<dimen name="captioning_preview_height">100dp</dimen>
+ <!-- ActionBar height -->
+ <dimen name="actionbar_size">46dip</dimen>
+
+ <!-- Dashboard margins between each tiles within the layout -->
+ <dimen name="dashboard_cell_gap_x">8dp</dimen>
+ <dimen name="dashboard_cell_gap_y">0dp</dimen>
+
+ <!-- Dashboard padding in its container -->
+ <dimen name="dashboard_padding_start">0dp</dimen>
+ <dimen name="dashboard_padding_end">0dp</dimen>
+ <dimen name="dashboard_padding_top">0dp</dimen>
+ <dimen name="dashboard_padding_bottom">0dp</dimen>
+
+ <!-- Dashboard category padding start / end -->
+ <dimen name="dashboard_category_padding_start">4dp</dimen>
+ <dimen name="dashboard_category_padding_end">4dp</dimen>
+
+ <!-- Dashboard category title margin start -->
+ <dimen name="dashboard_category_title_margin_start">12dp</dimen>
+
<!-- Dashboard tile minimum height -->
<dimen name="dashboard_tile_minimum_height">64dp</dimen>
+ <!-- Dashboard tile image margin start / end -->
+ <dimen name="dashboard_tile_image_margin_start">12dp</dimen>
+
+ <!-- Search Results padding in its container -->
+ <dimen name="search_panel_padding_start">4dp</dimen>
+ <dimen name="search_panel_padding_end">4dp</dimen>
+
</resources>
diff --git a/res/values-lo-rLA/arrays.xml b/res/values-lo-rLA/arrays.xml
index 1b944cd..3d3fb62 100644
--- a/res/values-lo-rLA/arrays.xml
+++ b/res/values-lo-rLA/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"ບໍ່ໃຊ້"</item>
<item msgid="8673874894887358090">"ຕັ້ງຄ່າເອງ"</item>
+ <item msgid="168893341855953140">"ຕັ້ງຄ່າພຣັອກຊີອັດຕະໂນມັດ"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"ບໍ່ມີ"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"ລະດັບສຽງໂມງປຸກ"</item>
<item msgid="785049718065337473">"ລະດັບສຽງແຈ້ງເຕືອນ"</item>
<item msgid="6700305533746877052">"ລະດັບສຽງ Bluetooth"</item>
- <item msgid="2029227495214047094">"ເຮັດວຽກຕະຫຼອດເວລາ"</item>
- <item msgid="26109888160231211">"ຕຳແໜ່ງຕິດຕາມ"</item>
- <item msgid="5753382310468855812">"ຕິດຕາມສະຖານທີ່ທີ່ມີພະລັງງານສູງ"</item>
+ <item msgid="3810969981743709839">"ປິດ/ເປີດ ໄມໂຄຣໂຟນ"</item>
+ <item msgid="2627903914574908209">"ເຮັດວຽກຕະຫຼອດເວລາ"</item>
+ <item msgid="1395372654968157578">"ຕຳແໜ່ງຕິດຕາມ"</item>
+ <item msgid="3238451051299611853">"ຕິດຕາມສະຖານທີ່ທີ່ມີພະລັງງານສູງ"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"ຕຳແໜ່ງ"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"ລະດັບສຽງໂມງປຸກ"</item>
<item msgid="9103719301075748925">"ລະດັບສຽງແຈ້ງເຕືອນ"</item>
<item msgid="7025966722295861512">"ລະດັບສຽງ Bluetooth"</item>
- <item msgid="4665183401128289653">"ເຮັດວຽກຕະຫຼອດເວລາ"</item>
- <item msgid="8584357129746649222">"ສະຖານທີ່"</item>
+ <item msgid="2265317984004577529">"ປິດ/ເປີດ ໄມໂຄຣໂຟນ"</item>
+ <item msgid="3646325683886507917">"ເຮັດວຽກຕະຫຼອດເວລາ"</item>
<item msgid="7669257279311110599">"ສະຖານທີ່"</item>
+ <item msgid="7745724368696313169">"ສະຖານທີ່"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"ສັ້ນ"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"ສີເຫຼືອງພື້ນຟ້າ"</item>
<item msgid="7169235156349580064">"ກຳນົດເອງ"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (ແກ້ບັນຫາ)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"ນໍາໃຊ້ Dalvik"</item>
- <item msgid="5131846588686178907">"ນໍາໃຊ້ ART"</item>
- <item msgid="4530003713865319928">"ໃຊ້ໂຕແກ້ບັນຫາ ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"ບັບເຟີ 64K ຕໍ່ລັອກ"</item>
+ <item msgid="2822309747675758628">"ບັບເຟີ 256K ຕໍ່ລັອກ"</item>
+ <item msgid="6699306198357496731">"ບັບເຟີ 1M ຕໍ່ລັອກ"</item>
+ <item msgid="5748528643937500349">"ບັບເຟີ 4M ຕໍ່ລັອກ"</item>
+ <item msgid="1978629051085111592">"ບັບເຟີ 16M ຕໍ່ລັອກ"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"ບໍ່ຕ້ອງກວດ"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"ມີການລົບກວນຈຳກັດ"</item>
<item msgid="8735337502532332056">"ບໍ່ມີການລົບກວນ"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"ປົກກະຕິ"</item>
+ <item msgid="866544120205026771">"ປານກາງ"</item>
+ <item msgid="7851902244436886890">"ຕໍ່າ"</item>
+ <item msgid="3022922196817563960">"ອັນຕະລາຍ"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"ໜຽວແໜ້ນ"</item>
+ <item msgid="5779398140277006695">"ການເຄື່ອນໄຫວສູງສຸດ"</item>
+ <item msgid="1439598363694578255">"ສຳຄັນ (ເບື້ອງໜ້າ)"</item>
+ <item msgid="3396458970745718652">"ສຳຄັນ (ເບື້ອງຫຼັງ)"</item>
+ <item msgid="5214825238247511992">"ສຳຮອງຂໍ້ມູນ"</item>
+ <item msgid="311372689168254967">"ນ້ຳໜັກສູງ"</item>
+ <item msgid="7438189122367820362">"ການບໍລິການ (ກຳລັງເຮັດວຽກ)"</item>
+ <item msgid="918687422516982498">"ການບໍລິການ (ກຳລັງເລີ່ມຕົ້ນໃໝ່)"</item>
+ <item msgid="6807727069641853029">"ຕົວຮັບຂໍ້ມູນ"</item>
+ <item msgid="6782857406100845127">"ໜ້າຫຼັກ"</item>
+ <item msgid="2860945127596974299">"ການເຄື່ອນໄຫວຫຼ້າສຸດ"</item>
+ <item msgid="8610560843693675830">"ແຄສ (ການເຄື່ອນໄຫວ)"</item>
+ <item msgid="4338089220026248848">"ແຄສ (ການເຄື່ອນໄຫວລູກຂ່າຍ)"</item>
+ <item msgid="6652164677254579050">"ແຄສ (ຫວ່າງເປົ່າ)"</item>
+ </string-array>
</resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index 9606880..30d0aae 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"ຊ່ອງຂໍ້ມູນພອດຈະຕ້ອງປ່ອຍຫວ່າງໄວ້ ຫາກວ່າຊ່ອງ host ຫວ່າງຢູ່."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"ພອດທີ່ທ່ານລະບຸນັ້ນບໍ່ຖືກຕ້ອງ."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proxy ນີ້ຖືກໃຊ້ໂດຍໂປຣແກຣມທ່ອງເວັບແລ້ວ ແລະບໍ່ອາດໃຊ້ກັບແອັບຯອື່ນໄດ້."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"ສະຖານທີ່:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ໃກ້ຄຽງ:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"ຂໍ້ມູນ cell:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"ສະແດງຂໍ້ມູນໂປຣໄຟລ໌ໃນໜ້າຈໍລັອກ"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"ຂໍ້ມູນໂປຣໄຟລ໌"</string>
<string name="location_settings_title" msgid="1369675479310751735">"ສະຖານທີ່"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"ບັນຊີ"</string>
<string name="security_settings_title" msgid="7945465324818485460">"ຄວາມປອດໄພ"</string>
<string name="security_settings_summary" msgid="967393342537986570">"ຕັ້ງທີ່ຢູ່ຂອງຂ້ອຍ, ໜ້າຈໍປົດລັອກ, ການລັອກຊິມກາດ, ການລັອກບ່ອນຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"ກຳນົດທີ່ຢູ່ຂອງຂ້ອຍ, ການປົດລັອກໜ້າຈໍ, ການລັອກບ່ອນເຈັດເກັບຂໍ້ມູນຮັບຮອງ"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"ກຳລັງເຂົ້າລະຫັດ"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"ລໍຖ້າລະຫວ່າງທີ່ແທັບເລັດຂອງທ່ານກຳລັງຖືກເຂົ້າລະຫັດ. ສຳເລັດແລ້ວ <xliff:g id="PERCENT">^1</xliff:g>%."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"ລໍຖ້າລະຫວ່າງທີ່ໂທລະສັບຂອງທ່ານກຳລັງຖືກເຂົ້າລະຫັດ. ສຳເລັດແລ້ວ <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"ກະລຸນາລໍຖ້າຂະນະທີ່ແທັບເລັດຂອງທ່ານກຳລັງຖືກເຂົ້າລະຫັດ. ຍັງເຫຼືອອີກ: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"ກະລຸນາລໍຖ້າຂະນະທີ່ໂທລະສັບຂອງທ່ານກຳລັງຖືກເຂົ້າລະຫັດ. ຍັງເຫຼືອອີກ: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"ລອງອີກຄັ້ງໃນ <xliff:g id="DELAY">^1</xliff:g> ວິນາທີ."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"ພິມລະຫັດຜ່ານຂອງທ່ານ"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"ການເຂົ້າລະຫັດບໍ່ສຳເລັດ"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"ບໍ່ຫຼິ້ນສຽງເມື່ອສຽບ ຫຼືຖອດແທັບເລັດອອກຈາກບ່ອນຕັ້ງສາກ"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"ບໍ່ຫຼິ້ນສຽງເມື່ອສຽບ ຫຼືຖອດໂທລະສັບອອກຈາກບ່ອນຕັ້ງສາກ"</string>
<string name="account_settings" msgid="6403589284618783461">"ບັນຊີ"</string>
+ <string name="category_personal" msgid="1299663247844969448">"ສ່ວນໂຕ"</string>
+ <string name="category_work" msgid="8699184680584175622">"ບ່ອນເຮັດວຽກ"</string>
<string name="search_settings" msgid="1910951467596035063">"ຊອກຫາ"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"ຈັດການການຕັ້ງຄ່າຊອກຫາ ແລະປະຫວັດ"</string>
<string name="display_settings" msgid="7965901687241669598">"ການສະແດງຜົນ"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"ໂຕເລືອກນັກພັດທະນາ"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"ຕັ້ງຄ່າໂຕເລືອກສຳລັບການພັດທະນາແອັບຯ"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"ໂຕເລືອກສຳລັບນັກພັດທະນາບໍ່ສາມາດໃຊ້ໄດ້ກັບຜູ່ໃຊ້ນີ້"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"ຜູ່ໃຊ້ນີ້ບໍ່ສາມາດຕັ້ງຄ່າ VPN ໄດ້"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"ຜູ່ໃຊ້ນີ້ບໍ່ສາມາດຕັ້ງຄ່າການປ່ອຍສັນຍານໄດ້"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"ຜູ່ໃຊ້ນີ້ບໍ່ສາມາດຕັ້ງຄ່າຊື່ເອດເຊສພອຍໄດ້"</string>
<string name="enable_adb" msgid="7982306934419797485">"ການດີບັ໊ກຜ່ານ USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"ເປີດໃຊ້ໂໝດດີບັ໊ກເມື່ອເຊື່ອມຕໍ່ USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"ຖອດຖອນການອະນຸຍາດການດີບັ໊ກຜ່ານ USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"ໜ້າຈໍຈະບໍ່ປິດໃນຂະນະທີ່ສາກໄຟຢູ່"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"ເປີດໃຊ້ງານການຊອດແນມ Bluetooth HCI"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"ເກັບກຳທຸກແພັກເກັດໃນໄຟລ໌ bluetooth HCI"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"ເລືອກຣັນທາມ"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"ເລືອກຣັນທາມ"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"ເປີດເຄື່ອງຄືນໃໝ່ເພື່ອປ່ຽນຣັນທາມຈາກ <xliff:g id="OLD">%1$s</xliff:g> ເປັນ <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"ສະແດງການຮັບຮອງຂອງລະບົບໄຮ້ສາຍ"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"ເປີດການບັນທຶກ WiFi Verbose"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"ປ່ຽນໄປໃຊ້ເຄືອຂ່າຍມືຖືເມື່ອສັນຍານ Wi-Fi ອ່ອນ"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"ອະນຸຍາດໃຫ້ໃຊ້ WiFi Roam Scans ທຸກຄັ້ງ"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"ສະແດງໂຕເລືອກສຳລັບການສະແດງການຮັບຮອງລະບົບໄຮ້ສາຍ"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"ເພີ່ມລະດັບການບັນທຶກ Wifi, ສະແດງຕໍ່ SSID RSSI ໃນໂຕເລືອກ WiFi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"ເມື່ອເປີດນຳໃຊ້ແລ້ວ ເຄືອຂ່າຍ WiFi ຈະຖືກປ່ຽນໄປໃຊ້ເຄືອຂ່າຍໂທລະສັບແທນຫາກສັນຍານຈາກ WiFi ອ່ອນ"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"ການອະນຸຍາດ/ບໍ່ອະນຸຍາດ Wifi Roam Scans ໂດຍອ້າງອີງຈາກຈຳນວນຂໍ້ມູນທີ່ເກີດຂຶ້ນໃນລະດັບສ່ວນຕິດຕໍ່"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"ຂະໜາດບັບເຟີໂຕລັອກ"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"ເລືອກຂະໜາດລັອກຕໍ່ບັບເຟີ"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"ອະນຸຍາດໃຫ້ຈຳລອງຕຳແໜ່ງ"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"ອະນຸຍາດໃຫ້ຈຳລອງຕຳແໜ່ງ"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"ອະນຸຍາດໃຫ້ດີບັ໊ກຜ່ານ USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"ເວລາເຮັດວຽກ"</string>
<string name="services_subtitle" msgid="4296402367067266425">"ບໍລິການ"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"ໄລຍະເວລາ"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"ລາຍລະອຽດໜ່ວຍຄວາມຈຳ"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"ສະຖານະໜ່ວຍຄວາມຈຳ"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"ໜ່ວຍຄວາມຈຳທີ່ໃຊ້"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"ເຄີນເນວ"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"ຕິດຕົວ"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"ແຄສເຄີນເນວ"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"ຟຣີ"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"ທັງໝົດ"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 ຊົ່ວໂມງ"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 ຊົ່ວໂມງ"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 ຊົ່ວໂມງ"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"ລຶບໃບຮັບຮອງທັງໝົດ"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"ຂໍ້ມູນລັບທີ່ເຊື່ອຖື"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"ສະແດງໃບຮັບຮອງ CA ທີ່ເຊື່ອຖືໄດ້"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"ຂັ້ນສູງ"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"ປະເພດພື້ນທີ່ຈັດເກັບຂໍ້ມູນ"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"ໃຊ້ຮາດແວ"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"ຊອບແວເທົ່ານັ້ນ"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"ບໍ່ມີຂໍ້ມູນຮັບຮອງໂຕສຳລັບຜູ່ໃຊ້ນີ້"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"ແຕ້ມຮູບແບບປົດລັອກຂອງທ່ານ"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"ທ່ານຕ້ອງແຕ້ມຮູບແບບປົດລັອກຂອງທ່ານ ເພື່ອຢືນຢັນການຕິດຕັ້ງຂໍ້ມູນຮັບຮອງ."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"ແຕະ "<b>"ຕໍ່ໄປ"</b>" ເພື່ອສືບຕໍ່ຂັ້ນຕອນການຕັ້ງຄ່າ.\n\nແຕະ "<b>"ກັບຄືນ"</b>" ເພື່ອເຊື່ອມຕໍ່ກັບເຄືອຂ່າຍ Wi-Fi ອື່ນ."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"ເປີດການຊິ້ງຂໍ້ມູນແລ້ວ"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"ການຊິ້ງຂໍ້ມູນຖືກປິດໄວ້"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"ກຳລັງຊິ້ງຂໍ້ມູນຕອນນີ້"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"ການຊິ້ງຂໍ້ມູນຜິດພາດ."</string>
<string name="sync_failed" msgid="1696499856374109647">"ການຊິ້ງຂໍ້ມູນລົ້ມເຫລວ"</string>
<string name="sync_active" msgid="8476943765960863040">"ເປີດໃຊ້ການຊິ້ງຂໍ້ມູນ"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"ສະແດງໜ້າປົກຄລິບ, ຂອບ ແລະອື່ນໆ."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"ບັງຄັບໃຫ້ຮູບຮ່າງຂຽນຈາກຂວາຫາຊ້າຍ"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"ບັງຄັບໃຫ້ຮູບຮ່າງໜ້າຈໍ ຂຽນຈາກຂວາໄປຊ້າຍ ສຳລັບທຸກພາສາ"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"ໂໝດປະຢັດພະລັງງານ"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"ເປີດນຳໃຊ້ການຕັ້ງຄ່າປະຢັດແບັດເຕີຣີ"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"ສະແດງການນຳໃຊ້ CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"ການວາງຊ້ອນໜ້າຈໍທີ່ສະແດງການນຳໃຊ້ CPU ໃນປັດຈຸບັນ"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"ບັງຄັບໃຊ້ GPU ປະມວນພາບ"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"ສະແດງເນື້ອຫາການແຈ້ງເຕືອນທັງໝົດ"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"ເລືອກເນື້ອຫາການແຈ້ງເຕືອນທີ່ລະອຽດອ່ອນ"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"ບໍ່ສະແດງການແຈ້ງເຕືອນເລີຍ"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"ບໍ່ໃຫ້ແຈ້ງເຕືອນຕອນໃດ"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"ເຊື່ອງການແຈ້ງເຕືອນໃໝ່ຈາກລາຍຊື່"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"ສະແດງການແຈ້ງເຕືອນທັງໝົດຈາກລາຍຊື່"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"ການແຈ້ງເຕືອນແອັບຯ"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"ສຽງອື່ນໆ"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"ສຽງປຸ່ມກົດ"</string>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 0c7e6cf..ec8aa6a 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Nėra"</item>
<item msgid="8673874894887358090">"Rankiniu būdu"</item>
+ <item msgid="168893341855953140">"Aut. tarp. serv. konfig."</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Nėra"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"signalo garsumas"</item>
<item msgid="785049718065337473">"pranešimų garsumas"</item>
<item msgid="6700305533746877052">"„Bluetooth“ garsumas"</item>
- <item msgid="2029227495214047094">"neužmigdyti"</item>
- <item msgid="26109888160231211">"stebėti vietovę"</item>
- <item msgid="5753382310468855812">"stebėti didelė galia vietovė"</item>
+ <item msgid="3810969981743709839">"nutildyti / įjungti mikrofono garsą"</item>
+ <item msgid="2627903914574908209">"neužmigdyti"</item>
+ <item msgid="1395372654968157578">"stebėti vietovę"</item>
+ <item msgid="3238451051299611853">"stebėti didelio efektyvumo vietovę"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Vietovė"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Signalo garsumas"</item>
<item msgid="9103719301075748925">"Pranešimo garsumas"</item>
<item msgid="7025966722295861512">"„Bluetooth“ garsumas"</item>
- <item msgid="4665183401128289653">"Neužmigdyti"</item>
- <item msgid="8584357129746649222">"Vietovė"</item>
+ <item msgid="2265317984004577529">"Nutildyti / įjungti mikrofono garsą"</item>
+ <item msgid="3646325683886507917">"Neužmigdyti"</item>
<item msgid="7669257279311110599">"Vietovė"</item>
+ <item msgid="7745724368696313169">"Vietovė"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Trumpas"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Geltonas ant mėlyno"</item>
<item msgid="7169235156349580064">"Tinkintas"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (derinimas)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 KB"</item>
+ <item msgid="505611754508988476">"256 KB"</item>
+ <item msgid="6361286924268716397">"1 MB"</item>
+ <item msgid="6405203239560695266">"4 MB"</item>
+ <item msgid="3025431211013424097">"16 MB"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Naudoti „Dalvik“"</item>
- <item msgid="5131846588686178907">"Naudoti ART"</item>
- <item msgid="4530003713865319928">"Naudoti ART derinimo versiją"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 KB žurn. bufer."</item>
+ <item msgid="2822309747675758628">"256 KB žurn. bufer."</item>
+ <item msgid="6699306198357496731">"1 MB žurn. bufer."</item>
+ <item msgid="5748528643937500349">"4 MB žurn. bufer."</item>
+ <item msgid="1978629051085111592">"16 MB žurn. bufer."</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Niekada netikrinti"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Ribotos pertraukos"</item>
<item msgid="8735337502532332056">"Nėra pertraukų"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Įprasta"</item>
+ <item msgid="866544120205026771">"Vidutinė"</item>
+ <item msgid="7851902244436886890">"Maža"</item>
+ <item msgid="3022922196817563960">"Kritinė"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Nuolatinė"</item>
+ <item msgid="5779398140277006695">"Populiariausia veikla"</item>
+ <item msgid="1439598363694578255">"Svarbu (priekinis planas)"</item>
+ <item msgid="3396458970745718652">"Svarbu (antrasis planas)"</item>
+ <item msgid="5214825238247511992">"Atsarginė kopija"</item>
+ <item msgid="311372689168254967">"Sunkus"</item>
+ <item msgid="7438189122367820362">"Paslauga (veikia)"</item>
+ <item msgid="918687422516982498">"Paslauga (paleidžiama iš naujo)"</item>
+ <item msgid="6807727069641853029">"Imtuvas"</item>
+ <item msgid="6782857406100845127">"Pagrindinis"</item>
+ <item msgid="2860945127596974299">"Pastaroji veikla"</item>
+ <item msgid="8610560843693675830">"Išsaugota talpykloje (veikla)"</item>
+ <item msgid="4338089220026248848">"Išsaugota talpykloje (veiklos kliento programa)"</item>
+ <item msgid="6652164677254579050">"Išsaugota talpykloje (tuščia)"</item>
+ </string-array>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index f0d2eae..e1c2a2d 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Prievado laukas turi būti tuščias, jei tuščias prieglobos laukas."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Prievadas, kurį įvedėte, netinkamas."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP įgaliotąjį serverį naudoja naršyklė, bet jo negali naudoti kitos programos."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Vieta:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Šalia esantis CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Mob. tel. informacija:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Rodyti profilio informaciją užrakinimo ekrane"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profilio informacija"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Vietovė"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Paskyros"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Sauga"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Nustatyti mano vietą, ekrano atrakinimą, SIM kortelės užraktą, įgaliojimų saugyklos užraktą"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nustatyti mano vietą, ekrano atrakinimą, įgaliojimų saugyklos užraktą"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifruojama"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Palaukite, kol šifruojamas planšetinis kompiuteris. Baigta <xliff:g id="PERCENT">^1</xliff:g> %."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Palaukite, kol šifruojamas telefonas. Baigta <xliff:g id="PERCENT">^1</xliff:g> %."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Palaukite, kol planšetinis kompiuteris bus užšifruotas. Liko laiko: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Palaukite, kol telefonas bus užšifruotas. Liko laiko: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Bandyti dar kartą po <xliff:g id="DELAY">^1</xliff:g> sek."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Įveskite slaptažodį"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifruotė nepavyko"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Nepaleisti garso įdedant planšetinį kompiuterį į doką ar jį pašalinant"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Nepaleisti garso įterpiant ar pašalinant telefoną iš dėklo"</string>
<string name="account_settings" msgid="6403589284618783461">"Paskyros"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Asmeniniai"</string>
+ <string name="category_work" msgid="8699184680584175622">"Darbo"</string>
<string name="search_settings" msgid="1910951467596035063">"Ieškoti"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Valdyti paieškos nustatymus ir istoriją"</string>
<string name="display_settings" msgid="7965901687241669598">"Ekranas"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Kūrėjo parinktis"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Nustatyti programos kūrimo parinktis"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Kūrėjo parinktys negalimos šiam naudotojui"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN nustatymai šiam naudotojui nepasiekiami"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Įrenginio kaip modemo naudojimo nustatymai šiam naudotojui nepasiekiami"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Prieigos taško pavadinimo nustatymai šiam naudotojui nepasiekiami"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB perkrova"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Derinimo režimas, kai prijungtas USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Panaikinti USB derinimo prieigos teises"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Kraunant ekranas niekada neveiks miego režimu"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Įgalinti „Bluetooth“ HCI šnipinėjimo žurnalą"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Užfiksuoti visus faile esančius „Bluetooth“ HCI paketus"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Pasirinkti vykdymo laiką"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Pasirinkti vykdymo laiką"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Įkelti iš naujo, kad vykdymo laikas būtų pakeistas iš <xliff:g id="OLD">%1$s</xliff:g> į <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Belaidžio rodymo sertifikavimas"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Įgal. „Wi-Fi“ daugiaž. įraš. į žurnalą"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Agr. perd. iš „Wi-Fi“ į mob. ryš. tinklą"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Visada leisti „Wi-Fi“ tarptinklinio ryšio nuskaitymą"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Rodyti belaidžio rodymo sertifikavimo parinktis"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Padidinti „Wi-Fi“ įrašymo į žurnalą lygį, rodyti SSID RSSI „Wi-Fi“ rinkiklyje"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Kai ši parinktis įgalinta, „Wi-Fi“ agresyviau perduos duomenų ryšį į mobiliojo ryšio tinklą, kai „Wi-Fi“ signalas bus silpnas"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Leisti / neleisti „Wi-Fi“ tarptinklinio ryšio nuskaitymo, atsižvelgiant į sąsajos duomenų srauto kiekį"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Registruotuvo biuferio dydžiai"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Pasir. registr. dydž. žurn. bufer."</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Leisti imituoti vietas"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Leisti imituoti vietas"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Leisti USB perkrovimą?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Rodymo laikas"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Paslaugos"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trukmė"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Išsami atminties informacija"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Atminties būsenos"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Naudojama atmintis"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Branduolys"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Savoji"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Branduolio talpyklos"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"„ZRam“ sukeitimas"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Nemokama"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Iš viso"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 val."</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 val."</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 val."</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Pašalinti visus sertifikatus"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Patikimi įgaliojimai"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Rodyti patikimus CA sertifikatus"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Išplėstiniai"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Atmintinės tipas"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Atsarginė kopija saugoma įrenginio vidinėje atmintyje"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Saugoma tik programinėje įrangoje"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Kredencialai nepasiekiami šiam naudotojui"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Nubrėžti atrakinimo piešinį"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kad patvirtintumėte kredencialų diegimą, turite nubrėžti atrakinimo piešinį."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Palieskite "<b>"Kitas"</b>", kad tęstumėte sąranką.\n\nPalieskite "<b>"Atgal"</b>", kad prisijungtumėte prie kito „Wi-Fi“ tinklo."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinchronizavimas įgalintas"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinchronizavimas neleidžiamas"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sinchronizuojama dabar"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Sinchronizavimo klaida."</string>
<string name="sync_failed" msgid="1696499856374109647">"Įvyko sinchronizavimo klaida"</string>
<string name="sync_active" msgid="8476943765960863040">"Sinchronizavimas aktyvus"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Rodyti iškarpų ribas, kraštines ir t. t."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Išdėst. iš dešin. į kairę"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Nust. visų lokalių ekran. išdėst. iš deš. į kairę"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Energijos taupymo režimas"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Įgalinti akumuliatoriaus tausojimo nustatymus"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Rodyti centr. proc. naud."</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Ekrano perdanga rodo dabartinį centr. proc. naud."</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Priverst. GPU atvaizd."</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Rodyti visą pranešimo turinį"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Slėpti delikatų pranešimo turinį"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Visiškai nerodyti pranešimų"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Kai įjungtas režimas „Netrukdyti“"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Slėpti naujus sąrašo pranešimus"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Rodyti visus sąrašo pranešimus"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Programų pranešimai"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Kiti garsai"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Skambinimo skydelio tonai"</string>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 3a924a7..25adc37 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Neviens"</item>
<item msgid="8673874894887358090">"Manuāli"</item>
+ <item msgid="168893341855953140">"Starpniekserv. aut. konf."</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Nav"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"signāla skaļums"</item>
<item msgid="785049718065337473">"paziņojumu skaļums"</item>
<item msgid="6700305533746877052">"Bluetooth apjoms"</item>
- <item msgid="2029227495214047094">"neļaut pāriet miega rež."</item>
- <item msgid="26109888160231211">"pārraudzīt atrašanās vietu"</item>
- <item msgid="5753382310468855812">"pārraudzīt lieljaudas atrašanās vietu"</item>
+ <item msgid="3810969981743709839">"izslēgt/ieslēgt mikrofonu"</item>
+ <item msgid="2627903914574908209">"neļaut pāriet miega režīmā"</item>
+ <item msgid="1395372654968157578">"pārraudzīt atrašanās vietu"</item>
+ <item msgid="3238451051299611853">"pārraudzīt lieljaudas atrašanās vietu"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Atrašanās vieta"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Signāla skaļums"</item>
<item msgid="9103719301075748925">"Paziņojumu skaļums"</item>
<item msgid="7025966722295861512">"Bluetooth apjoms"</item>
- <item msgid="4665183401128289653">"Neļaut pāriet miega rež."</item>
- <item msgid="8584357129746649222">"Atrašanās vieta"</item>
+ <item msgid="2265317984004577529">"Izslēgt/ieslēgt mikrofonu"</item>
+ <item msgid="3646325683886507917">"Neļaut pāriet miega režīmā"</item>
<item msgid="7669257279311110599">"Atrašanās vieta"</item>
+ <item msgid="7745724368696313169">"Atrašanās vieta"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Īss"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Dzeltens uz zila"</item>
<item msgid="7169235156349580064">"Pielāgots"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (atkļūdošana)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 KB"</item>
+ <item msgid="505611754508988476">"256 KB"</item>
+ <item msgid="6361286924268716397">"1 MB"</item>
+ <item msgid="6405203239560695266">"4 MB"</item>
+ <item msgid="3025431211013424097">"16 MB"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Izmantot Dalvik"</item>
- <item msgid="5131846588686178907">"Izmantot ART"</item>
- <item msgid="4530003713865319928">"Izmantot ART atkļūdošanas versiju"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 KB žurn. buferis"</item>
+ <item msgid="2822309747675758628">"256 KB žurn. buf."</item>
+ <item msgid="6699306198357496731">"1 MB žurn. buferis"</item>
+ <item msgid="5748528643937500349">"4 MB žurn. buferis"</item>
+ <item msgid="1978629051085111592">"16 MB žurn. buferis"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Nekad nepārbaudīt"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Ierobežoti pārtraukumi"</item>
<item msgid="8735337502532332056">"Nav pārtraukumu"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normāls"</item>
+ <item msgid="866544120205026771">"Vidējs"</item>
+ <item msgid="7851902244436886890">"Zems"</item>
+ <item msgid="3022922196817563960">"Kritisks"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Pastāvīgs"</item>
+ <item msgid="5779398140277006695">"Biežākā darbība"</item>
+ <item msgid="1439598363694578255">"Svarīgi (priekšplānā)"</item>
+ <item msgid="3396458970745718652">"Svarīgi (fonā)"</item>
+ <item msgid="5214825238247511992">"Dublēšana"</item>
+ <item msgid="311372689168254967">"Smagsvars"</item>
+ <item msgid="7438189122367820362">"Pakalpojums (darbojas)"</item>
+ <item msgid="918687422516982498">"Pakalpojums (tiek palaists atkārtoti)"</item>
+ <item msgid="6807727069641853029">"Saņēmējs"</item>
+ <item msgid="6782857406100845127">"Sākums"</item>
+ <item msgid="2860945127596974299">"Pēdējā darbība"</item>
+ <item msgid="8610560843693675830">"Saglabāts kešatmiņā (darbība)"</item>
+ <item msgid="4338089220026248848">"Saglabāts kešatmiņā (darbības klients)"</item>
+ <item msgid="6652164677254579050">"Saglabāts kešatmiņā (tukša)"</item>
+ </string-array>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 78bc73b..c654a58 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ja saimniekdatora lauks ir tukšs, porta laukam jābūt tukšam."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Ierakstītais porta numurs nav derīgs."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP starpniekserveris tiek izmantots pārlūkprogrammā, taču, iespējams, netiek izmantots citās lietotnēs."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Atrašanās vieta:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Tuvējais CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Tālruņa atrašanās vietas informācija:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Rādīt profila informāciju bloķētā ekrānā"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profila informācija"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Atrašanās vieta"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Konti"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Drošība"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Manas atrašanās vietas, ekrāna atbloķēšanas, SIM kartes bloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Manas atrašanās vietas, ekrāna atbloķēšanas, akreditācijas datu krātuves bloķēšanas iestatīšana"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifrēšana"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Uzgaidiet, kamēr tiek šifrēts jūsu planšetdators. Pabeigti <xliff:g id="PERCENT">^1</xliff:g>%."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Uzgaidiet, kamēr tiek šifrēts jūsu tālrunis. Pabeigti <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Uzgaidiet, līdz tiks pabeigta planšetdatora šifrēšana. Atlikušais laiks: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Uzgaidiet, līdz tiks pabeigta tālruņa šifrēšana. Atlikušais laiks: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Mēģiniet vēlreiz pēc <xliff:g id="DELAY">^1</xliff:g> sekundēm."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ierakstiet paroli"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrēšana neizdevās."</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Neatskaņot skaņu, ievietojot planšetdatoru dokā vai noņemot to no doka"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Neatskaņot skaņu, kad tālrunis tiek ievietots dokā vai tiek izņemts no tā"</string>
<string name="account_settings" msgid="6403589284618783461">"Konti"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Privāts"</string>
+ <string name="category_work" msgid="8699184680584175622">"Darba"</string>
<string name="search_settings" msgid="1910951467596035063">"Meklēt"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Meklēšanas iestatījumu un vēstures pārvaldība"</string>
<string name="display_settings" msgid="7965901687241669598">"Attēls"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Izstrādātājiem paredzētas opcijas"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Iestatīt lietotņu izstrādes opcijas"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Šim lietotājam nav pieejamas izstrādātāja opcijas."</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN iestatījumi šim lietotājam nav pieejami."</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Piesaistes iestatījumi šim lietotājam nav pieejami."</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Piekļuves punkta nosaukuma iestatījumi šim lietotājam nav pieejami."</string>
<string name="enable_adb" msgid="7982306934419797485">"USB atkļūdošana"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Atkļūdošanas režīms, kad ir pievienota kopne USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Atsaukt piekļuvi USB atkļūdošanai"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Uzlādes laikā ekrāns nekad nepārslēgsies miega režīmā"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Iespējot Bluetooth HCI analizētāja žurnālu"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tvert visas Bluetooth HCI paketes failā"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Izpildlaika atlase"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Izpildlaika atlase"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vai atsāknēt, lai mainītu izpildlaiku no <xliff:g id="OLD">%1$s</xliff:g> uz <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Bezvadu attēlošanas sertifikācija"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Iespējot Wi-Fi izvērsto reģistrēšanu"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Uzstājīga datu nodošana no Wi-Fi uz mobilo sakaru tīklu"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Wi-Fi datplūsmas skenēšanas atļaušana jebkurā gadījumā"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Rādīt bezvadu attēlošanas sertifikācijas iespējas"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Paaugstināt Wi-Fi reģistrēšanas līmeni, rādīt katram SSID RSSI Wi-Fi atlasītājā"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Iespējojot šo opciju, datu savienojums tiks uzstājīgāk nodots no Wi-Fi tīkla mobilo sakaru tīklam, ja Wi-Fi signāls būs vājš."</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Atļaut/neatļaut Wi-Fi datplūsmas skenēšanu, pamatojoties uz saskarnē rādīto datplūsmas apjomu"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Reģistrētāja buferu lielumi"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Atlasīt reģistrētāja bufera liel."</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Atļaut neīstas vietas"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Atļaut neīstas vietas"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Vai atļaut USB atkļūdošanu?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Ilgums"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Pakalpojumi"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Ilgums"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Informācija par atmiņu"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Atmiņas statusi"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Atmiņas lietojums"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kodols"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Vietējie"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Kodola kešatmiņas"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam mainīšana"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Bezmaksas"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Kopā"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 stundas"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 stundas"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 stundas"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Noņemt visus sertifikātus"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Uzticami akreditācijas dati"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Attēlot uzticamus CA sertifikātus"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Papildu"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Krātuves tips"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Krātuve aparatūrā"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Tikai programmatūrā"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Šim lietotājam nav pieejami akreditācijas dati."</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Norādiet atbloķēšanas kombināciju."</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Lai apstiprinātu akreditācijas datu instalēšanu, norādiet atbloķēšanas kombināciju."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Lai turpinātu iestatīšanu, pieskarieties "<b>"Tālāk"</b>".\n\nLai izveidotu savienojumu ar citu Wi-Fi tīklu, pieskarieties "<b>"Atpakaļ"</b>"."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinhronizācija iespējota"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinhronizācija atspējota"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Notiek sinhronizācija"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Sinhronizācijas kļūda"</string>
<string name="sync_failed" msgid="1696499856374109647">"Sinhronizācija neizdevās"</string>
<string name="sync_active" msgid="8476943765960863040">"Sinhronizācija darbojas"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Rādīt klipu robežas, malas utt."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Virziens no labās uz kreiso (Obligāts) WL: 295"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Obl. izkārt. virz. no labās uz kr. pusi visām lok."</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Jaudas taupīšanas režīms"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Iespējot akumulatora jaudas taupīšanu"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Rādīt CPU lietojumu"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Ekrāna pārklājums ar aktuālo CPU lietojumu"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Piespiedu GPU render."</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Rādīt visu saturu paziņojumos"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Paslēpt sensitīvu saturu paziņojumos"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Nerādīt paziņojumus vispār"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Kad ieslēgts statuss Netraucēt"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Sarakstā nerādīt jaunus paziņojumus"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Sarakstā rādīt visus paziņojumus"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Lietotņu paziņojumi"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Citas skaņas"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Numura sastādīšanas tastatūras skaņas"</string>
diff --git a/res/values-mn-rMN/arrays.xml b/res/values-mn-rMN/arrays.xml
index 54828b1..5e0b88d 100644
--- a/res/values-mn-rMN/arrays.xml
+++ b/res/values-mn-rMN/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Байхгүй"</item>
<item msgid="8673874894887358090">"Гараар"</item>
+ <item msgid="168893341855953140">"Прокси авто-тохируулга"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Байхгүй"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"сэрүүлгийн дууны хэмжээ"</item>
<item msgid="785049718065337473">"мэдэгдлийн дууны хэмжээ"</item>
<item msgid="6700305533746877052">"блютүүтийн хэмжээ"</item>
- <item msgid="2029227495214047094">"сэрүүн байлгах"</item>
- <item msgid="26109888160231211">"байршлыг хянах"</item>
- <item msgid="5753382310468855812">"өндөр чадалтай байршлуудыг хянах"</item>
+ <item msgid="3810969981743709839">"Микрофон хаах/нээх"</item>
+ <item msgid="2627903914574908209">"сэрүүн байлгах"</item>
+ <item msgid="1395372654968157578">"байршлыг хянах"</item>
+ <item msgid="3238451051299611853">"өндөр чадалтай байршлуудыг хянах"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Байршил"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Сэрүүлгийн дууны хэмжээ"</item>
<item msgid="9103719301075748925">"Мэдэгдлийн дууны хэмжээ"</item>
<item msgid="7025966722295861512">"Блютүүтийн хэмжээ"</item>
- <item msgid="4665183401128289653">"Сэрүүн байлгах"</item>
- <item msgid="8584357129746649222">"Байршил"</item>
+ <item msgid="2265317984004577529">"Микрофон хаах/нээх"</item>
+ <item msgid="3646325683886507917">"Сэрүүн байлгах"</item>
<item msgid="7669257279311110599">"Байршил"</item>
+ <item msgid="7745724368696313169">"Байршил"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Богино"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Цэнхэр дээр шар"</item>
<item msgid="7169235156349580064">"Тааруулсан"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (дебаг)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1М"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Dalvik ашиглах"</item>
- <item msgid="5131846588686178907">"ART ашиглах"</item>
- <item msgid="4530003713865319928">"ART дебаг ашиглах"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"лог буфер бүрт 64K"</item>
+ <item msgid="2822309747675758628">"лог буфер бүрт 256K"</item>
+ <item msgid="6699306198357496731">"лог буфер бүрт 1M"</item>
+ <item msgid="5748528643937500349">"лог буфер бүрт 4M"</item>
+ <item msgid="1978629051085111592">"лог буфер бүрт 16M"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Хэзээ ч шалгахгүй"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Хязгаарлагдмал тасалдалтай"</item>
<item msgid="8735337502532332056">"Тасалдал байхгүй"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Хэвийн"</item>
+ <item msgid="866544120205026771">"Дундаж"</item>
+ <item msgid="7851902244436886890">"Бага"</item>
+ <item msgid="3022922196817563960">"Эгзэгтэй"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Тогтвортой"</item>
+ <item msgid="5779398140277006695">"Топ үйлдэл"</item>
+ <item msgid="1439598363694578255">"Чухал (ил)"</item>
+ <item msgid="3396458970745718652">"Чухал (далд)"</item>
+ <item msgid="5214825238247511992">"Нөөшлөлт"</item>
+ <item msgid="311372689168254967">"Хүнд жинтэй"</item>
+ <item msgid="7438189122367820362">"Үйлчилгээ (ажиллаж байгаа)"</item>
+ <item msgid="918687422516982498">"Үйлчилгээ (дахин ачааллалт)"</item>
+ <item msgid="6807727069641853029">"Хүлээн авагч"</item>
+ <item msgid="6782857406100845127">"Нүүр"</item>
+ <item msgid="2860945127596974299">"Сүүлийн үйлдэл"</item>
+ <item msgid="8610560843693675830">"Кеш хийгдсэн (үйлдэл)"</item>
+ <item msgid="4338089220026248848">"Кеш хийгдсэн (үйлдэлийн клиент)"</item>
+ <item msgid="6652164677254579050">"Кеш хийгдсэн (хоосон)"</item>
+ </string-array>
</resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 85310bb..b108985 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Хостын талбар хоосон байгаа бол портын талбар хоосон байх шаардлагатай."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Таны оруулсан порт буруу байна."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP проксиг хөтөч ашиглаж байгаа боловч бусад апп-ууд ашиглахгүй байж магадгүй."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Байршил"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Хөрш CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Үүрийн мэдээлэл:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Дэлгэц түгжигдэхэд профайлын мэдээллийг харуулах"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Профайлын мэдээлэл"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Байршил"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Акаунт"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Аюулгүй байдал"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Миний Байршил, дэлгэц тайлах, SIM картны түгжээ, жуухны сангийн түгжээг тохируулах"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Миний Байршил, дэлгэц тайлах, жуухын сангийн түгжээ зэргийг тохируулах"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифрлэж байна"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Таны таблетыг шифрлэх хооронд хүлээнэ үү. <xliff:g id="PERCENT">^1</xliff:g>% гүйцсэн."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Таны утсыг шифрлэх хооронд хүлээнэ үү. <xliff:g id="PERCENT">^1</xliff:g>% гүйцсэн."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Таны таблетыг шифрлэх зуур хүлээнэ үү. Үлдсэн хугацаа: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Таны утсыг шифрлэх зуур хүлээнэ үү. Үлдсэн хугацаа: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> секундын дараа дахин оролдоно уу."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Өөрийн нууц үгийг оруулна уу"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифрлэлт амжилтгүй"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Таблетыг док-д суурилуулах буюу салгах үед дуу тоглуулахгүй"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Утсыг док-д суурилуулах буюу салгах үед дуу тоглуулахгүй"</string>
<string name="account_settings" msgid="6403589284618783461">"Акаунт"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Хувийн"</string>
+ <string name="category_work" msgid="8699184680584175622">"Ажил"</string>
<string name="search_settings" msgid="1910951467596035063">"Хайх"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Хайлтын тохиргоо болон түүхийг удирдах"</string>
<string name="display_settings" msgid="7965901687241669598">"Дэлгэц"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Хөгжүүлэгчийн тохиргоо"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Апп хөгжүүлэлтэд зориулсан сонголтуудыг тохируулах"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Энэ хэрэглэгч хөгжүүлэгчийн тохиргоог ашиглах боломжгүй"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Энэ хэрэглэгчид VPN тохиргоог ашиглах боломжгүй"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Энэ хэрэглэгчид тетеринг тохиргоог ашиглах боломжгүй"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Энэ хэрэглэгчийн хувьд Хандалтын цэгийн нэрийн тохиргоог ашиглах боломжгүй"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB дебаг"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"USB холбодсон үеийн согог засах горим"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"USB дебагын зөвшөөрлийг хураах"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Цэнэглэж байх үед дэлгэц хэзээ ч амрахгүй"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Блютүүт HCI снүүп логыг идэвхжүүлэх"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Файл доторх бүх блютүүт HCI пакетуудыг унших"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Ажиллах цагийг сонгоно уу"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Ажиллах цагийг сонгоно уу"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Ажиллах цагийг <xliff:g id="OLD">%1$s</xliff:g>-с <xliff:g id="NEW">%2$s</xliff:g> рүү өөрчлөхийн тулд дахин асаах уу?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Утасгүй дэлгэцийн сертификат"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"WiFi Verbose логийг идэвхжүүлэх"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Wifi-с үүрэн рүү дамжуулалт идэвхтэй"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Wifi сканийг байнга зөвшөөрөх"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Утасгүй дэлгэцийн сертификатын сонголтыг харуулах"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Wifi логийн түвшинг нэмэгдүүлж, WiFi сонгогч доторх SSID-д ногдох RSSI-г харуулах"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Идэвхжүүлсэн үед Wifi дохио бага байгаа тохиолдолд дата холболтыг Wifi-с үүрэн рүү илүү идэвхтэй шилжүүлнэ"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Интерфэйс дээрх дата дамжуулалтын хэмжээнээс хамааран Wifi сканийг зөвшөөрөх/үл зөвшөөрөх"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Логгерын буферын хэмжээ"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Лог буфер бүрт ногдох логгерын хэмжээг сонгоно уу"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Хуурамч байршлыг зөвшөөрөх"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Хуурамч байршлыг зөвшөөрөх"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB дебаг хийхийг зөвшөөрөх үү?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Ажилласан хугацаа"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Үйлчилгээнүүд"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Үргэлжлэх хугацаа"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Санах ойн мэдээлэл"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Санах ойн төлөв"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Санах ойн ашиглалт"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Цөмийн"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Үндсэн"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Цөмийн кэшүүд"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam своп"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Чөлөөтэй"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Нийт"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 цаг"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 цаг"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 цаг"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Бүх сертификатыг устгах"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Итгэмжлэгдсэн жуухууд"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Итгэлтэй CA сертификатуудыг харуулах"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Дэлгэрэнгүй"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Хадгалалтын сангийн төрөл"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Техник хангамжаар дэмжигдсэн"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Зөвхөн програм"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Энэ хэрэглэгчид итгэмжлэл байхгүй байна"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Өөрийн тайлах хээг зурна уу"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Та жуухын суулгалтыг баталгаажуулахын тулд өөрийн тайлах хээг зурах шаардлагатай."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Тохируулгыг үргэлжлүүлэхийн тулд "<b>"Дараагийн"</b>" гэсэнд хүрнэ үү.\n\nӨөр Wi‑Fi сүлжээнд холбогдохын тулд "<b>"Буцах"</b>" гэсэнд хүрнэ үү."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Синк идэвхжсэн"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синк идэвхгүйжсэн"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Одоо синк хийж байна"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Синкийн алдаа."</string>
<string name="sync_failed" msgid="1696499856374109647">"Синк амжилтгүй"</string>
<string name="sync_active" msgid="8476943765960863040">"Синк идэвхжүүлсэн"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Клипийн зах, хязгаар зэргийг харуулах"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"RTL байрлалын чиглэлийг хүчээр тогтоох"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Бүх локалын хувьд дэлгэцийн байрлалын чиглэлийг хүчээр RTL болгох"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Цэнэг бага хэрэглэх горим"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Батерей хэмнэх тохиргоог идэвхжүүлэх"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"CPU ашиглалтыг харуулах"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Дэлгэцийн давхцалаар одоогийн CPU ашиглалтыг харуулж байна"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Хүчээр GPU ашиглах"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Бүх мэдэгдлийн агуулгыг харуулах"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Нууц сэдэвтэй мэдэгдлийн агуулгыг нуух"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Мэдэгдлийг огт үзүүлэхгүй"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"\"Бүү саад бол\" идэвхжсэн үед"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Жагсаалтаас шинэ мэдэгдлийг нуух"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Жагсаалтын бүх мэдэгдлийг харуулах"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Aпп мэдэгдлүүд"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Бусад ая"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Диалпадын ая"</string>
diff --git a/res/values-ms-rMY/arrays.xml b/res/values-ms-rMY/arrays.xml
index 1d51d1e..db90141 100644
--- a/res/values-ms-rMY/arrays.xml
+++ b/res/values-ms-rMY/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Tiada"</item>
<item msgid="8673874894887358090">"Manual"</item>
+ <item msgid="168893341855953140">"Auto Konfigurasi Proksi"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Tiada"</item>
@@ -231,96 +232,13 @@
<item msgid="886742181977884584">"Media"</item>
<item msgid="7924928667052300589">"Peranti"</item>
</string-array>
- <string-array name="app_ops_summaries">
- <item msgid="4979188868761515915">"lokasi kasar"</item>
- <item msgid="5789673140227507995">"lokasi terperinci"</item>
- <item msgid="1061584358377390581">"GPS"</item>
- <item msgid="5387405117297558954">"bergetar"</item>
- <item msgid="3434165993711230924">"baca kenalan"</item>
- <item msgid="616161687718081936">"ubah suai kenalan"</item>
- <item msgid="7638002295329050091">"baca log panggilan"</item>
- <item msgid="6546959730920410907">"ubah suai log panggilan"</item>
- <item msgid="446877710771379667">"baca kalendar"</item>
- <item msgid="7674458294386319722">"ubah suai kalendar"</item>
- <item msgid="8281201165558093009">"imbasan wi-fi"</item>
- <item msgid="8694611243479480497">"pemberitahuan"</item>
- <item msgid="7776439107987345446">"imbasan sel"</item>
- <item msgid="514615766544675057">"Hubungi telefon"</item>
- <item msgid="8181415497109310680">"baca SMS"</item>
- <item msgid="6816551144382117307">"tulis SMS"</item>
- <item msgid="4600463921908905030">"terima SMS"</item>
- <item msgid="5958926493289432745">"terima SMS kecemasan"</item>
- <item msgid="4945269495221089540">"terima MMS"</item>
- <item msgid="5570472453573929087">"terima penolakan WAP"</item>
- <item msgid="7125408150230860501">"hantar SMS"</item>
- <item msgid="7080337936612188061">"baca SMS ICC"</item>
- <item msgid="587124103118495063">"tulis SMS ICC"</item>
- <item msgid="2320577158869025503">"ubah suai tetapan"</item>
- <item msgid="1545733463471924009">"lukiskan di atas"</item>
- <item msgid="3609046903962454582">"pemberitahuan akses"</item>
- <item msgid="4671646036128214513">"kamera"</item>
- <item msgid="1097324338692486211">"rakam audio"</item>
- <item msgid="5031552983987798163">"mainkan audio"</item>
- <item msgid="8374996688066472414">"baca papan keratan"</item>
- <item msgid="3045529469061083747">"ubah suai papan keratan"</item>
- <item msgid="5124443975763747838">"butang media"</item>
- <item msgid="4547883971364273343">"tumpuan audio"</item>
- <item msgid="2603878814882344450">"kelantangan induk"</item>
- <item msgid="7136963238377062018">"kelantangan suara"</item>
- <item msgid="4270236897655923007">"kelantangan deringan"</item>
- <item msgid="6325739889222559394">"kelantangan media"</item>
- <item msgid="5762123934816216821">"kelantangan penggera"</item>
- <item msgid="785049718065337473">"kelantangan pemberitahuan"</item>
- <item msgid="6700305533746877052">"kelantangan bluetooth"</item>
- <item msgid="2029227495214047094">"kekal berjaga"</item>
- <item msgid="26109888160231211">"pantau lokasi"</item>
- <item msgid="5753382310468855812">"awasi lokasi kuasa tinggi"</item>
- </string-array>
- <string-array name="app_ops_labels">
- <item msgid="6602854600289714121">"Lokasi"</item>
- <item msgid="8677040780775113033">"Lokasi"</item>
- <item msgid="1660743989948992916">"Lokasi"</item>
- <item msgid="8791172739860195290">"Bergetar"</item>
- <item msgid="383413555642128046">"Baca kenalan"</item>
- <item msgid="3654594895269697313">"Ubah suai kenalan"</item>
- <item msgid="7928393476362362538">"Baca log panggilan"</item>
- <item msgid="6248591205254641116">"Ubah suai log panggilan"</item>
- <item msgid="6093344633066170692">"Baca kalendar"</item>
- <item msgid="1334886368750347692">"Ubah suai kalendar"</item>
- <item msgid="1638204101698708656">"Lokasi"</item>
- <item msgid="2154671955760380322">"Siarkan pemberitahuan"</item>
- <item msgid="4282477730595931828">"Lokasi"</item>
- <item msgid="4891423912898525905">"Hubungi telefon"</item>
- <item msgid="2623604824935968113">"Baca SMS/MMS"</item>
- <item msgid="4420177125221176306">"Tulis SMS/MMS"</item>
- <item msgid="3986142739951490025">"Terima SMS/MMS"</item>
- <item msgid="3984213795861739778">"Terima SMS/MMS"</item>
- <item msgid="3656243523752472788">"Terima SMS/MMS"</item>
- <item msgid="8105802370238551510">"Terima SMS/MMS"</item>
- <item msgid="1407766984645388488">"Hantar SMS/MMS"</item>
- <item msgid="3527273606643794973">"Baca SMS/MMS"</item>
- <item msgid="4370895547001583812">"Tulis SMS/MMS"</item>
- <item msgid="4218544235221631789">"Ubah suai tetapan"</item>
- <item msgid="736541391767350377">"Lukiskan di atas"</item>
- <item msgid="5530815681721654194">"Pemberitahuan akses"</item>
- <item msgid="781213371706962767">"Kamera"</item>
- <item msgid="1720492593061838172">"Rakam audio"</item>
- <item msgid="3493046322001257041">"Mainkan audio"</item>
- <item msgid="136815868796597058">"Baca papan keratan"</item>
- <item msgid="5238692940326972503">"Ubah suai papan keratan"</item>
- <item msgid="5753789168376302997">"Butang media"</item>
- <item msgid="3265262911688671938">"Tumpuan audio"</item>
- <item msgid="2098976479485046797">"Kelantangan utama"</item>
- <item msgid="5660213838861789350">"Kelantangan suara"</item>
- <item msgid="7983336752371254444">"Kelantangan deringan"</item>
- <item msgid="7878027809189330917">"Kelantangan media"</item>
- <item msgid="7260546305036218513">"Kelantangan penggera"</item>
- <item msgid="9103719301075748925">"Kelantangan pemberitahuan"</item>
- <item msgid="7025966722295861512">"Kelantangan Bluetooth"</item>
- <item msgid="4665183401128289653">"Kekal berjaga"</item>
- <item msgid="8584357129746649222">"Lokasi"</item>
- <item msgid="7669257279311110599">"Lokasi"</item>
- </string-array>
+ <!-- no translation found for app_ops_summaries:40 (3810969981743709839) -->
+ <!-- no translation found for app_ops_summaries:41 (2627903914574908209) -->
+ <!-- no translation found for app_ops_summaries:42 (1395372654968157578) -->
+ <!-- no translation found for app_ops_summaries:43 (3238451051299611853) -->
+ <!-- no translation found for app_ops_labels:40 (2265317984004577529) -->
+ <!-- no translation found for app_ops_labels:41 (3646325683886507917) -->
+ <!-- no translation found for app_ops_labels:43 (7745724368696313169) -->
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Pendek"</item>
<item msgid="2560532955514699713">"Sederhana"</item>
@@ -365,15 +283,19 @@
<item msgid="6039700130994371612">"Kuning pada biru"</item>
<item msgid="7169235156349580064">"Peribadi"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (nyahpepijat)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Gunakan Dalvik"</item>
- <item msgid="5131846588686178907">"Gunakan ART"</item>
- <item msgid="4530003713865319928">"Gunakan binaan nyahpepijat ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64K per pnimbal log"</item>
+ <item msgid="2822309747675758628">"256K per pnmbal log"</item>
+ <item msgid="6699306198357496731">"1M per penimbal log"</item>
+ <item msgid="5748528643937500349">"4M per penimbal log"</item>
+ <item msgid="1978629051085111592">"16M per pnimbal log"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Jangan sekali-kali semak"</item>
@@ -483,4 +405,26 @@
<item msgid="5656544177755411222">"Gangguan terhad"</item>
<item msgid="8735337502532332056">"Gangguan sifar"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Biasa"</item>
+ <item msgid="866544120205026771">"Sederhana"</item>
+ <item msgid="7851902244436886890">"Rendah"</item>
+ <item msgid="3022922196817563960">"Kritikal"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Berterusan"</item>
+ <item msgid="5779398140277006695">"Aktiviti popular"</item>
+ <item msgid="1439598363694578255">"Penting (latar depan)"</item>
+ <item msgid="3396458970745718652">"Penting (latar belakang)"</item>
+ <item msgid="5214825238247511992">"Sandaran"</item>
+ <item msgid="311372689168254967">"Berat"</item>
+ <item msgid="7438189122367820362">"Perkhidmatan (berjalan)"</item>
+ <item msgid="918687422516982498">"Perkhidmatan (bermula semula)"</item>
+ <item msgid="6807727069641853029">"Penerima"</item>
+ <item msgid="6782857406100845127">"Laman Utama"</item>
+ <item msgid="2860945127596974299">"Aktiviti terakhir"</item>
+ <item msgid="8610560843693675830">"Cache (aktiviti)"</item>
+ <item msgid="4338089220026248848">"Cache (klien aktiviti)"</item>
+ <item msgid="6652164677254579050">"Cache (kosong)"</item>
+ </string-array>
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml
index e93aa26..2e233d8 100644
--- a/res/values-ms-rMY/strings.xml
+++ b/res/values-ms-rMY/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Medan port haruslah kosong sekiranya medan hos kosong."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Port yang anda taipkan tidak sah."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi HTTP digunakan oleh penyemak imbas tetapi tidak boleh digunakan oleh aplikasi lain."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasi:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID berdekatan:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Info Sel:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Tunjukkan maklumat profil pada skrin kunci"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Maklumat profil"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Lokasi"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Akaun"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Keselamatan"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Tetapkan Lokasi Saya, buka kunci skrin, kunci kad SIM, kunci storan bukti kelayakan"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Tetapkan Lokasi Saya, buka kunci skrin, kunci storan bukti kelayakan"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Penyulitan"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Sila tunggu sementara tablet anda disulitkan. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Sila tunggu sementara telefon anda disulitkan. <xliff:g id="PERCENT">^1</xliff:g>% selesai."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Sila tunggu sementara tablet anda disulitkan. Masa yang tinggal: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Sila tunggu sementara telefon anda disulitkan. Masa yang tinggal: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Cuba lagi dalam <xliff:g id="DELAY">^1</xliff:g> saat."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Taipkan kata laluan anda"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Penyulitan tidak berjaya"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Jangan mainkan bunyi semasa memasukkan atau mengeluarkan tablet dari dok"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Jangan mainkan bunyi semasa memasukkan atau mengeluarkan telefon dari dok"</string>
<string name="account_settings" msgid="6403589284618783461">"Akaun"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Peribadi"</string>
+ <string name="category_work" msgid="8699184680584175622">"Tempat Kerja"</string>
<string name="search_settings" msgid="1910951467596035063">"Carian"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Urus tetapan dan sejarah carian"</string>
<string name="display_settings" msgid="7965901687241669598">"Paparan"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Pilihan pemaju"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Tetapkan pilihan untuk pembangunan aplikasi"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Pilihan Pemaju tidak tersedia untuk pengguna ini"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Tetapan VPN tidak tersedia untuk pengguna ini"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Tetapan penambatan tidak tersedia untuk pengguna ini"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Tetapan Nama Titik Capaian tidak tersedia untuk pengguna ini"</string>
<string name="enable_adb" msgid="7982306934419797485">"Penyahpepijatan USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Mod nyahpepijat apabila USB disambungkan"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Batalkan kebenaran penyahpepijatan USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrin tidak sekali-kali akan tidur semasa pengecasan"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Dayakan log intip HCI Bluetooth"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Tangkap semua paket HCI bluetooth dalam fail"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Pilih waktu jalan"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Pilih waktu jalan"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"But semula untuk menukar waktu jalan daripada <xliff:g id="OLD">%1$s</xliff:g> kepada <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Pensijilan paparan wayarles"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Dayakan Pengelogan Berjela-jela WiFi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Penyerahan Wifi ke Selular agresif"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Sentiasa benarikan Imbasan Perayauan Wifi"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Tunjukkan pilihan untuk pensijilan paparan wayarles"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Tingkatkan tahap pengelogan Wifi, paparkan mengikut SSID RSSI dalam Pemilih WiFi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Apabila diaktifkan, Wifi akan menjadi lebih agresif dalam menyerahkan sambungan data ke Selular, apabila isyarat Wifi rendah."</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Benarkan/Jangan benarkan Imbasan Perayauan Wifi berdasarkan jumlah trafik data yang ada pada antara muka"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Saiz penimbal pengelog"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Pilih saiz Pengelog per pnmbal log"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Benarkan lokasi olokan"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Benarkan lokasi olokan"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Benarkan penyahpepijatan USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Masa berjalan"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Perkhidmatan"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Tempoh"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Butiran memori"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Keadaan memori"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Penggunaan memori"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Inti"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Asli"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Cache inti"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Silih ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Percuma"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Jumlah"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 jam"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 jam"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 jam"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Alih keluar semua sijil"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Bukti kelayakan dipercayai"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Paparkan sijil CA yang dipercayai"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Lanjutan"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Jenis storan"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Bersandarkan perkakasan"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Perisian sahaja"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Bukti kelayakan tidak tersedia untuk pengguna ini"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Lukis corak buka kunci anda"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Anda perlu melukiskan corak buka kunci anda untuk mengesahkan pemasangan bukti kelayakan."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Sentuh "<b>"Seterusnya"</b>" untuk meneruskan dengan persediaan.\n\nSentuh "<b>"Kembali"</b>" untuk menyambung kepada rangkaian Wi-Fi lain."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Segerak didayakan"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Segerak dilumpuhkan"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Menyegerak sekarang"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Ralat penyegerakan."</string>
<string name="sync_failed" msgid="1696499856374109647">"Segerak gagal"</string>
<string name="sync_active" msgid="8476943765960863040">"Segerak aktif"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Tunjukkan batas klip, margin dll."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Paksa arah reka letak RTL"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Paksa arah reka letak skrin RTL bg semua tpt prstwa"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Mod Kuasa Rendah"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Dayakan tetapan penjimatan bateri"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Tunjukkan penggunaan CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Tindihan atas skrin menunjukkan penggunaan semasa CPU"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Paksa penyerahan GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tunjukkan semua kandungan pemberitahuan"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Sembunyikan kandungan pemberitahuan sensitif"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Jangan tunjukkan pemberitahuan sama sekali"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Apabila jangan ganggu dihidupkan"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Sembunyikan pemberitahuan baharu dari senarai"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Tunjukkan semua pemberitahuan dalam senarai"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Pemberitahuan apl"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Bunyi lain"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Nada pad dail"</string>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 46018d6..2015b20 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Ingen"</item>
<item msgid="8673874894887358090">"Manuelt"</item>
+ <item msgid="168893341855953140">"Auto-konfig. av proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Ingen"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"alarmvolum"</item>
<item msgid="785049718065337473">"varselvolum"</item>
<item msgid="6700305533746877052">"bluetooth-volum"</item>
- <item msgid="2029227495214047094">"hold aktiv"</item>
- <item msgid="26109888160231211">"overvåk posisjon"</item>
- <item msgid="5753382310468855812">"overvåk plassering med høyt strømforbruk"</item>
+ <item msgid="3810969981743709839">"slå mikrofonen av eller på"</item>
+ <item msgid="2627903914574908209">"behold aktiv"</item>
+ <item msgid="1395372654968157578">"overvåk posisjon"</item>
+ <item msgid="3238451051299611853">"overvåk posisjon med høyt strømforbruk"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Sted"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Alarmvolum"</item>
<item msgid="9103719301075748925">"Varselvolum"</item>
<item msgid="7025966722295861512">"Bluetooth-volum"</item>
- <item msgid="4665183401128289653">"Hold aktiv"</item>
- <item msgid="8584357129746649222">"Posisjon"</item>
+ <item msgid="2265317984004577529">"Slå mikrofonen av eller på"</item>
+ <item msgid="3646325683886507917">"Hold aktiv"</item>
<item msgid="7669257279311110599">"Sted"</item>
+ <item msgid="7745724368696313169">"Posisjon"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Kort"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Gult på blått"</item>
<item msgid="7169235156349580064">"Egendefinert"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (feilsøking)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 kB"</item>
+ <item msgid="505611754508988476">"256 kB"</item>
+ <item msgid="6361286924268716397">"1 MB"</item>
+ <item msgid="6405203239560695266">"4 MB"</item>
+ <item msgid="3025431211013424097">"16 MB"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Bruk Dalvik"</item>
- <item msgid="5131846588686178907">"Bruk ART"</item>
- <item msgid="4530003713865319928">"Bruk ART-delversjonen for feilsøking"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 kB pr loggbuffer"</item>
+ <item msgid="2822309747675758628">"256 kB pr buffer"</item>
+ <item msgid="6699306198357496731">"1 MB pr loggbuffer"</item>
+ <item msgid="5748528643937500349">"4 MB pr loggbuffer"</item>
+ <item msgid="1978629051085111592">"16 MB pr loggbuffer"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Kontrollér aldri"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Begrensede forstyrrelser"</item>
<item msgid="8735337502532332056">"Ingen forstyrrelser"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normal"</item>
+ <item msgid="866544120205026771">"Moderat"</item>
+ <item msgid="7851902244436886890">"Lav"</item>
+ <item msgid="3022922196817563960">"Kritisk"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Vedvarende"</item>
+ <item msgid="5779398140277006695">"Høyeste aktivitet"</item>
+ <item msgid="1439598363694578255">"Viktig (i forgrunnen)"</item>
+ <item msgid="3396458970745718652">"Viktig (i bakgrunnen)"</item>
+ <item msgid="5214825238247511992">"Sikkerhetskopi"</item>
+ <item msgid="311372689168254967">"Tungvekt"</item>
+ <item msgid="7438189122367820362">"Tjeneste (kjører)"</item>
+ <item msgid="918687422516982498">"Tjeneste (starter på nytt)"</item>
+ <item msgid="6807727069641853029">"Mottaker"</item>
+ <item msgid="6782857406100845127">"Hjemme"</item>
+ <item msgid="2860945127596974299">"Siste aktivitet"</item>
+ <item msgid="8610560843693675830">"Bufret (aktivitet)"</item>
+ <item msgid="4338089220026248848">"Bufret (aktivitetsklient)"</item>
+ <item msgid="6652164677254579050">"Bufret (tom)"</item>
+ </string-array>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 32263fe..f616ebc 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Feltet for portnummer må være tomt om feltet for vertsnavn er tomt."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Angitt port er ikke gyldig."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-mellomtjeneren brukes av nettleseren, men kan ikke brukes av andre apper."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC-nettadresse: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC-nettadresse: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Posisjon:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Nabo-CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Celleinfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Vis profilinformasjon på låseskjermen"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profilinformasjon"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Sted"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Kontoer"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Sikkerhet"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Posisjon, 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>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Kryptering"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Vent mens telefonen krypteres. <xliff:g id="PERCENT">^1</xliff:g> fullført."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Vent mens telefonen krypteres. <xliff:g id="PERCENT">^1</xliff:g> fullført."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Vent mens nettbrettet ditt krypteres. Tid som gjenstår: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Vent mens telefonen din krypteres. Tid som gjenstår: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Prøv på nytt om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Skriv inn passordet"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Kryptering mislykket"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ikke spill av lyd når nettbrettet settes inn eller tas ut av forankringsstasjonen"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ikke spill av lyd når telefonen settes inn eller tas ut av forankringsstasjonen"</string>
<string name="account_settings" msgid="6403589284618783461">"Kontoer"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Personlig"</string>
+ <string name="category_work" msgid="8699184680584175622">"Jobb"</string>
<string name="search_settings" msgid="1910951467596035063">"Søk"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Søkeinnstillinger og -logg"</string>
<string name="display_settings" msgid="7965901687241669598">"Skjerm"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Utvikleralternativer"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Angi alternativer for apputvikling"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Utvikleralternativene er ikke tilgjengelige for denne brukeren"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Innstillingene for VPN er ikke tilgjengelig for denne brukeren"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Innstillingene for tilknytning er ikke tilgjengelig for denne brukeren"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Innstillingene for navn på tilgangspunkt er ikke tilgjengelig for denne brukeren"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB-debugging"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Debug-modus når USB er koblet til"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Tilbakekall autorisasjoner for USB-feilsøking"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Skjermen blir aldri svart under lading"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktiver Bluetooth HCI snoop-logg"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Samle alle Bluetooth HCI-pakker i en fil"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Velg kjøretid"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Velg kjøretid"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vil du starte på nytt for å endre kjøretiden fra <xliff:g id="OLD">%1$s</xliff:g> til <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Trådløs skjermsertifisering"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Aktiver detaljert Wi-Fi-loggføring"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Tvungen overg. fra Wi-Fi til mobilnett"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Tillat alltid skanning for Wi-Fi-roaming"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Vis alternativer for trådløs skjerm-sertifisering"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Øk loggføringsnivået for Wi-Fi. Vis per SSID/RSSI i Wi-Fi-velgeren"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Hvis innstillingen er aktivert, overføres datatilkoblingen fra Wi-Fi til mobilnett mer aggressivt når Wi-Fi-signalet er dårlig"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Tillat eller avvis skanning for Wi-Fi-roaming basert på mengden datatrafikk som brukes i grensesnittet"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Bufferstørrelser for logg"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Velg Loggstørrelser per loggbuffer"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Tillat simulert posisjon"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Tillat bruk av simulerte GPS-koordinater"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Aktiver USB-debugging?"</string>
@@ -1587,6 +1599,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Kjøringstid"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Tjenester"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Varighet"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Minnedetaljer"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Minnetilstand"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Minnebruk"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Innebygd"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Kernel caches"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Ledig"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Totalt"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 timer"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 timer"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 timer"</string>
@@ -1684,9 +1705,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Fjern alle sertifikater"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Pålitelig legitimasjon"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Vis pålitelige CA-sertifikater"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Avansert"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Lagringstype"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Maskinvarebasert"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Bare programvare"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Legitimasjon er ikke tilgjengelig for denne brukeren"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Tegn opplåsingsmønsteret"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du må tegne opplåsingsmønsteret for å bekrefte installasjonen av legitimasjon."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1767,6 +1790,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Trykk på "<b>"Neste"</b>" for å fortsette konfigurasjonen.\n\nTrykk på "<b>"Tilbake"</b>" for å koble til et annet Wi-Fi-nettverk."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktivert"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronisering deaktivert"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synkroniserer nå"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfeil."</string>
<string name="sync_failed" msgid="1696499856374109647">"Synkroniseringen mislyktes"</string>
<string name="sync_active" msgid="8476943765960863040">"Synkroniserer"</string>
@@ -1859,8 +1883,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Vis kanter, marger osv."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Tving layoutretning for RTL"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Tving RTL-formgivningsretning for skjermer"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Batterisparingsmodus"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Aktiver innstillingene for batterisparing"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Vis CPU-bruk"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Skjermoverlegg viser gjeldende CPU-bruk"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Tving GPU-gjengivelse"</string>
@@ -2137,9 +2159,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Vis alt innhold i varslene"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skjul sensitivt innhold i varslene"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Ikke vis varsler i det hele tatt"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Når ikke forstyrr er på"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Skjul nye varsler fra listen"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Vis alle varsler i listen"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Appvarsler"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Andre lyder"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Tastaturtoner"</string>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index c18c5b6..6802731 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Geen"</item>
<item msgid="8673874894887358090">"Handmatig"</item>
+ <item msgid="168893341855953140">"Proxy autom. configuratie"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Geen"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"alarmvolume"</item>
<item msgid="785049718065337473">"meldingsvolume"</item>
<item msgid="6700305533746877052">"bluetooth-volume"</item>
- <item msgid="2029227495214047094">"ingeschakeld houden"</item>
- <item msgid="26109888160231211">"monitorlocatie"</item>
- <item msgid="5753382310468855812">"locatie met hoog energieverbruik controleren"</item>
+ <item msgid="3810969981743709839">"microfoon dempen/dempen opheffen"</item>
+ <item msgid="2627903914574908209">"ingeschakeld houden"</item>
+ <item msgid="1395372654968157578">"monitorlocatie"</item>
+ <item msgid="3238451051299611853">"locatie met hoog energieverbruik controleren"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Locatie"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Alarmvolume"</item>
<item msgid="9103719301075748925">"Meldingsvolume"</item>
<item msgid="7025966722295861512">"Bluetooth-volume"</item>
- <item msgid="4665183401128289653">"Ingeschakeld houden"</item>
- <item msgid="8584357129746649222">"Locatie"</item>
+ <item msgid="2265317984004577529">"Microfoon dempen/dempen opheffen"</item>
+ <item msgid="3646325683886507917">"Ingeschakeld houden"</item>
<item msgid="7669257279311110599">"Locatie"</item>
+ <item msgid="7745724368696313169">"Locatie"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Kort"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Geel op blauw"</item>
<item msgid="7169235156349580064">"Aangepast"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (foutopsporing)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Dalvik gebruiken"</item>
- <item msgid="5131846588686178907">"ART gebruiken"</item>
- <item msgid="4530003713865319928">"ART-foutopsporingsbuild gebruiken"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64K per logbuffer"</item>
+ <item msgid="2822309747675758628">"256K per logbuffer"</item>
+ <item msgid="6699306198357496731">"1M per logbuffer"</item>
+ <item msgid="5748528643937500349">"4M per logbuffer"</item>
+ <item msgid="1978629051085111592">"16M per logbuffer"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Nooit controleren"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Beperkte onderbrekingen"</item>
<item msgid="8735337502532332056">"Geen onderbrekingen"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normaal"</item>
+ <item msgid="866544120205026771">"Gemiddeld"</item>
+ <item msgid="7851902244436886890">"Laag"</item>
+ <item msgid="3022922196817563960">"Kritiek"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Permanent"</item>
+ <item msgid="5779398140277006695">"Topactiviteit"</item>
+ <item msgid="1439598363694578255">"Belangrijk (voorgrond)"</item>
+ <item msgid="3396458970745718652">"Belangrijk (achtergrond)"</item>
+ <item msgid="5214825238247511992">"Back-up"</item>
+ <item msgid="311372689168254967">"Zwaar gewicht"</item>
+ <item msgid="7438189122367820362">"Service (actief)"</item>
+ <item msgid="918687422516982498">"Service (opnieuw starten)"</item>
+ <item msgid="6807727069641853029">"Ontvanger"</item>
+ <item msgid="6782857406100845127">"Thuis"</item>
+ <item msgid="2860945127596974299">"Laatste activiteit"</item>
+ <item msgid="8610560843693675830">"Gecacht (activiteit)"</item>
+ <item msgid="4338089220026248848">"Gecacht (activiteitsclient)"</item>
+ <item msgid="6652164677254579050">"Gecacht (leeg)"</item>
+ </string-array>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index d45880a..53b3950 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Het poortveld moet leeg zijn als het hostveld leeg is."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"De poort die u heeft ingevoerd, is ongeldig."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"De HTTP-proxy wordt gebruikt door de browser, maar mag niet worden gebruikt door de andere apps."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Locatie:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Naburige CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Celinfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Profielinfo weergeven op vergrendelingsscherm"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profielinfo"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Locatie"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Accounts"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Beveiliging"</string>
<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>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Coderen"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Wacht totdat uw tablet is gecodeerd. <xliff:g id="PERCENT">^1</xliff:g> procent voltooid."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Wacht totdat uw telefoon is gecodeerd. <xliff:g id="PERCENT">^1</xliff:g> procent voltooid."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Wacht terwijl uw tablet wordt versleuteld. Resterende tijd: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Wacht terwijl uw telefoon wordt versleuteld. Resterende tijd: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Probeer het over <xliff:g id="DELAY">^1</xliff:g> seconden opnieuw."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Typ uw wachtwoord"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encryptie mislukt"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Geen geluid afspelen wanneer de tablet in het dockstation wordt geplaatst of uit het dockstation wordt verwijderd"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Geen geluid afspelen wanneer de telefoon in het dock wordt geplaatst of uit het dock wordt verwijderd"</string>
<string name="account_settings" msgid="6403589284618783461">"Accounts"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Persoonlijk"</string>
+ <string name="category_work" msgid="8699184680584175622">"Werk"</string>
<string name="search_settings" msgid="1910951467596035063">"Zoeken"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Instellingen voor zoeken en zoekgeschiedenis beheren"</string>
<string name="display_settings" msgid="7965901687241669598">"Weergave"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Opties voor ontwikkelaars"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Opties instellen voor appontwikkeling"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Ontwikkelaarsopties zijn niet beschikbaar voor deze gebruiker"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Instellingen voor VPN zijn niet beschikbaar voor deze gebruiker"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Instellingen voor tethering zijn niet beschikbaar voor deze gebruiker"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Instellingen voor toegangspuntnamen zijn niet beschikbaar voor deze gebruiker"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB-foutopsporing"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Foutopsporingsmodus bij USB-verbinding"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Autorisatie voor USB-foutopsporing intrekken"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Scherm gaat nooit uit tijdens het opladen"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Snoop-logbestand voor Bluetooth-HCI inschakelen"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Alle Bluetooth-HCI-pakketten tot één bestand samenvoegen"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Runtime selecteren"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Runtime selecteren"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Opnieuw opstarten om runtime te wijzigen van <xliff:g id="OLD">%1$s</xliff:g> in <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certificering van draadloze weergave"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Uitgebreide wifi-logboekregistratie aan"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Agressieve overgave van wifi naar mobiel"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Wifi-scans voor roaming altijd toestaan"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Opties weergeven voor certificering van draadloze weergave"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Wifi-logboekregistratieniveau verhogen, weergeven per SSID RSSI in wifi-kiezer"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Indien ingeschakeld, is wifi agressiever bij het overgeven van de gegevensverbinding aan mobiel wanneer het wifi-signaal zwak is"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Wifi-scans voor roaming toestaan/verbieden op basis van de actuele hoeveelheid verkeer in de interface"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Logger-buffergrootten"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Kies Logger-grootten per logbuffer"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Neplocaties toestaan"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Neplocaties toestaan"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB-foutopsporing toestaan?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Uitvoeringstijd"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Services"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duur"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Geheugendetails"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Geheugenstatussen"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Geheugengebruik"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Systeemeigen"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Kernelcaches"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam-swap"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Beschikbaar"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Totaal"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 uur"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 uur"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 uur"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Alle certificaten verwijderen"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Vertrouwde id-gegevens"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Vertrouwde CA-certificaten weergeven"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Geavanceerd"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Opslagtype"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Ondersteund door hardware"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Alleen software"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Er zijn geen inloggegevens beschikbaar voor deze gebruiker"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Teken uw ontgrendelingspatroon"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"U moet uw ontgrendelingspatroon tekenen om de identificatie-installatie te bevestigen."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Tik op "<b>"Volgende"</b>" om door te gaan met de configuratie.\n\nTik op "<b>"Terug"</b>" om verbinding te maken met een ander wifi-netwerk."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronisatie is ingeschakeld"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchroniseren uitgeschakeld"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Nu synchroniseren"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Synchronisatiefout."</string>
<string name="sync_failed" msgid="1696499856374109647">"Synchroniseren mislukt"</string>
<string name="sync_active" msgid="8476943765960863040">"Synchronisatie actief"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Clipgrenzen, marges en meer weergeven."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"V.r.n.l.-indelingsrichting afdwingen"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Schermindelingsrichting geforceerd instellen op V.r.n.l. voor alle talen"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Modus laag energieverbr."</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Instellingen voor accubesparing inschakelen"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"CPU-gebruik weergeven"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Schermoverlay met huidig CPU-gebruik"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"GPU-rendering afdwingen"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Inhoud van alle meldingen weergeven"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Inhoud van gevoelige meldingen verbergen"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Helemaal geen meldingen weergeven"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Wanneer \'Niet storen\' is ingeschakeld"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Nieuwe meldingen verbergen in de lijst"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Alle meldingen weergeven in de lijst"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"App-meldingen"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Andere geluiden"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Toetsenbloktonen"</string>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index c0aebaa..fbc3104 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Brak"</item>
<item msgid="8673874894887358090">"Własne"</item>
+ <item msgid="168893341855953140">"Autokonfiguracja proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Brak"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"głośność alarmu"</item>
<item msgid="785049718065337473">"głośność powiadomień"</item>
<item msgid="6700305533746877052">"głośność Bluetooth"</item>
- <item msgid="2029227495214047094">"utrzymanie aktywności"</item>
- <item msgid="26109888160231211">"monitorowanie lokalizacji"</item>
- <item msgid="5753382310468855812">"monitor wysoki zasilanie lokalizacja"</item>
+ <item msgid="3810969981743709839">"wyciszenie/anulowanie wyciszenia mikrofonu"</item>
+ <item msgid="2627903914574908209">"utrzymanie aktywności"</item>
+ <item msgid="1395372654968157578">"monitorowanie lokalizacji"</item>
+ <item msgid="3238451051299611853">"monitorowanie zwiększonego zużycia energii w związku z lokalizacją"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Lokalizacja"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Głośność alarmu"</item>
<item msgid="9103719301075748925">"Głośność powiadomień"</item>
<item msgid="7025966722295861512">"Głośność Bluetooth"</item>
- <item msgid="4665183401128289653">"Utrzymanie aktywności"</item>
- <item msgid="8584357129746649222">"Lokalizacja"</item>
+ <item msgid="2265317984004577529">"Wyciszenie/anulowanie wyciszenia mikrofonu"</item>
+ <item msgid="3646325683886507917">"Utrzymanie aktywności"</item>
<item msgid="7669257279311110599">"Lokalizacja"</item>
+ <item msgid="7745724368696313169">"Lokalizacja"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Krótkie"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Żółty na niebieskim"</item>
<item msgid="7169235156349580064">"Niestandardowy"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (debugowanie)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 K"</item>
+ <item msgid="505611754508988476">"256 K"</item>
+ <item msgid="6361286924268716397">"1 M"</item>
+ <item msgid="6405203239560695266">"4 M"</item>
+ <item msgid="3025431211013424097">"16 M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Użyj Dalvik"</item>
- <item msgid="5131846588686178907">"Użyj ART"</item>
- <item msgid="4530003713865319928">"Użyj komplikacji debugowania ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 K/bufor dziennika"</item>
+ <item msgid="2822309747675758628">"256 K/bufor dziennika"</item>
+ <item msgid="6699306198357496731">"1 M/bufor dziennika"</item>
+ <item msgid="5748528643937500349">"4 M/bufor dziennika"</item>
+ <item msgid="1978629051085111592">"16 M/bufor dziennika"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Nigdy nie sprawdzaj"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Nieliczne powiadomienia"</item>
<item msgid="8735337502532332056">"Brak powiadomień"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normalny"</item>
+ <item msgid="866544120205026771">"Umiarkowany"</item>
+ <item msgid="7851902244436886890">"Niski"</item>
+ <item msgid="3022922196817563960">"Krytyczny"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Niezmienny"</item>
+ <item msgid="5779398140277006695">"Najczęstsza aktywność"</item>
+ <item msgid="1439598363694578255">"Ważny (pierwszy plan)"</item>
+ <item msgid="3396458970745718652">"Ważny (w tle)"</item>
+ <item msgid="5214825238247511992">"Kopia zapasowa"</item>
+ <item msgid="311372689168254967">"Duże obciążenie"</item>
+ <item msgid="7438189122367820362">"Usługa (uruchomiona)"</item>
+ <item msgid="918687422516982498">"Usługa (ponowne uruchamianie)"</item>
+ <item msgid="6807727069641853029">"Odbiornik"</item>
+ <item msgid="6782857406100845127">"Ekran główny"</item>
+ <item msgid="2860945127596974299">"Ostatnia aktywność"</item>
+ <item msgid="8610560843693675830">"Pamięć podręczna (aktywność)"</item>
+ <item msgid="4338089220026248848">"Pamięć podręczna (klient aktywności)"</item>
+ <item msgid="6652164677254579050">"Pamięć podręczna (pusta)"</item>
+ </string-array>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 5c6b5fc..814de7d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Pole port musi być puste, jeśli pole host jest puste."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Wpisany port jest nieprawidłowy."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Serwer proxy HTTP jest używany przez przeglądarkę, ale inne aplikacje mogą go nie używać."</string>
- <string name="proxy_url" msgid="2523518669129974654">"Adres URL pliku PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL pliku PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokalizacja:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Sąsiadujący CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informacje:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Pokaż informacje o profilu na ekranie blokady"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informacje o profilu"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Lokalizacja"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Konta"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Zabezpieczenia"</string>
<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 logowania"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Szyfrowanie"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Czekaj, trwa szyfrowanie tabletu. Ukończono: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Czekaj, trwa szyfrowanie telefonu. Ukończono: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Poczekaj, aż tablet zostanie zaszyfrowany. Pozostały czas: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Poczekaj, aż telefon zostanie zaszyfrowany. Pozostały czas: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Spróbuj ponownie za <xliff:g id="DELAY">^1</xliff:g> s."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Wpisz swoje hasło."</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Szyfrowanie zakończone niepowodzeniem"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Nie odtwarzaj dźwięku podczas umieszczania tabletu w doku i wyjmowania go"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Nie odtwarzaj dźwięku podczas umieszczania telefonu w podstawce i wyjmowania go"</string>
<string name="account_settings" msgid="6403589284618783461">"Konta"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Osobiste"</string>
+ <string name="category_work" msgid="8699184680584175622">"Praca"</string>
<string name="search_settings" msgid="1910951467596035063">"Wyszukiwanie"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Zarządzaj ustawieniami i historią wyszukiwania"</string>
<string name="display_settings" msgid="7965901687241669598">"Wyświetlacz"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Opcje programistyczne"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Ustaw opcje związane z programowaniem aplikacji."</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Opcje programisty są niedostępne dla tego użytkownika"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Ustawienia VPN są niedostępne dla tego użytkownika"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Ustawienia tetheringu są niedostępne dla tego użytkownika"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Ustawienia nazwy punktu dostępu są niedostępne dla tego użytkownika"</string>
<string name="enable_adb" msgid="7982306934419797485">"Debugowanie USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Tryb debugowania, gdy podłączone jest USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Odwołaj autoryzacje do debugowania USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Ekran nie będzie gaszony podczas ładowania telefonu"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Włącz dziennik analizatora snoop Bluetooth HCI"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Przechwyć wszystkie pakiety Bluetooth HCI do pliku"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Wybierz czas wykonywania"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Wybierz czas wykonywania"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Uruchomić ponownie, by zmienić czas wykonywania z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Wyświetlacz bezprzewodowy"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Włącz szczegółowy zapis danych o Wi-Fi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Agresywne przeł. sieci z W-Fi na komórk."</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Zawsze zezwalaj na skanowanie w celu roamingu Wi-Fi"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Pokaż opcje certyfikacji wyświetlacza bezprzewodowego"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Zwiększ poziom zapisu danych o Wi-Fi, pokaż RSSI przy SSID w selektorze Wi-Fi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Po włączeniu połączenie danych będzie bardziej agresywnie przełączać się z sieci Wi-Fi na komórkową, gdy sygnał Wi-Fi jest słaby"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"W zależności od ruchu danych w interfejsie zezwól na skanowanie w celu roamingu Wi-Fi lub zakaż go"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Rozmiary bufora Rejestratora"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Wybierz rozmiary Rejestratora/bufor dziennika"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Pozorowanie lokalizacji"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Zezwalaj na pozorowanie lokalizacji"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Czy zezwalać na debugowanie USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Czas pracy"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Usługi"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Czas trwania"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Informacje dotyczące pamięci"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Stany pamięci"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Użycie pamięci"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Jądro"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Natywna"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Pamięć podręczna jądra"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Partycja wymiany modułu ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Bezpłatna"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Ogółem"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 godziny"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 godzin"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 godzin"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Usuń wszystkie certyfikaty"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Zaufane dane uwierzytelniające"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Wyświetlanie zaufanych certyfikatów CA"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Zaawansowane"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Typ pamięci"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Wspomagana sprzętowo"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Tylko programowa"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Ten użytkownik nie ma dostępu do poświadczeń"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Narysuj wzór odblokowania"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Aby potwierdzić instalację danych logowania, musisz narysować wzór odblokowania."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Kliknij "<b>"Dalej"</b>", by kontynuować konfigurację.\n\nKliknij "<b>"Wróć"</b>", by połączyć się z inną siecią Wi-Fi."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizacja włączona"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizacja wyłączona"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synchronizacja w toku"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Błąd synchronizacji"</string>
<string name="sync_failed" msgid="1696499856374109647">"Błąd synchronizacji"</string>
<string name="sync_active" msgid="8476943765960863040">"Synchronizacja aktywna"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Pokaż granice przycięcia, marginesy itd."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Wymuś układ od prawej do lewej"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Wymuś wszędzie układ ekranu od prawej do lewej"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Tryb oszczędzania baterii"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Włącz ustawienia oszczędzania baterii"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Pokaż użycie procesora"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Nakładka na ekranie pokazująca użycie procesora"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Renderowanie na GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokaż wszystkie informacje w powiadomieniach"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ukryj poufne informacje w powiadomieniach"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Nie pokazuj żadnych powiadomień"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Po włączeniu „Nie przeszkadzać”"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ukrywaj nowe powiadomienia na liście"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Pokazuj wszystkie powiadomienia na liście"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Powiadomienia aplikacji"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Inne dźwięki"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Dźwięki wybierania numeru"</string>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 1c83611..3ec7032 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Nenhum"</item>
<item msgid="8673874894887358090">"Manual"</item>
+ <item msgid="168893341855953140">"Config. autom. do proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Nenhuma"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"volume de alarme"</item>
<item msgid="785049718065337473">"volume de notificação"</item>
<item msgid="6700305533746877052">"volume de Bluetooth"</item>
- <item msgid="2029227495214047094">"Manter ativo"</item>
- <item msgid="26109888160231211">"monitorizar localização"</item>
- <item msgid="5753382310468855812">"monitorizar localização de potência elevada"</item>
+ <item msgid="3810969981743709839">"desativar/ativar o som do microfone"</item>
+ <item msgid="2627903914574908209">"manter ativo"</item>
+ <item msgid="1395372654968157578">"monitorizar a localização"</item>
+ <item msgid="3238451051299611853">"monitorizar a localização de potência elevada"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Localização"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Volume do alarme"</item>
<item msgid="9103719301075748925">"Volume de notificações"</item>
<item msgid="7025966722295861512">"Volume de Bluetooth"</item>
- <item msgid="4665183401128289653">"Manter ativo"</item>
- <item msgid="8584357129746649222">"Localização"</item>
+ <item msgid="2265317984004577529">"Desativar/ativar o som do microfone"</item>
+ <item msgid="3646325683886507917">"Manter ativo"</item>
<item msgid="7669257279311110599">"Localização"</item>
+ <item msgid="7745724368696313169">"Localização"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Curta"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Amarelo em azul"</item>
<item msgid="7169235156349580064">"Personalizado"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (depurar)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 K"</item>
+ <item msgid="505611754508988476">"256 K"</item>
+ <item msgid="6361286924268716397">"1 M"</item>
+ <item msgid="6405203239560695266">"4 M"</item>
+ <item msgid="3025431211013424097">"16 M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Utilizar Dalvik"</item>
- <item msgid="5131846588686178907">"Utilizar ART"</item>
- <item msgid="4530003713865319928">"Utilizar compilação de depuração ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"Mem. int. 64K p rg."</item>
+ <item msgid="2822309747675758628">"Mem. int. 256K p rg"</item>
+ <item msgid="6699306198357496731">"Mem. int. 1M p reg."</item>
+ <item msgid="5748528643937500349">"Mem. int. 4M p reg."</item>
+ <item msgid="1978629051085111592">"Mem. int. 16M p. rg"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Nunca verificar"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Interrupções limitadas"</item>
<item msgid="8735337502532332056">"Sem interrupções"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normal"</item>
+ <item msgid="866544120205026771">"Moderada"</item>
+ <item msgid="7851902244436886890">"Baixa"</item>
+ <item msgid="3022922196817563960">"Crítica"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Persistente"</item>
+ <item msgid="5779398140277006695">"Principal atividade"</item>
+ <item msgid="1439598363694578255">"Importante (primeiro plano)"</item>
+ <item msgid="3396458970745718652">"Importante (segundo plano)"</item>
+ <item msgid="5214825238247511992">"Cópia de segurança"</item>
+ <item msgid="311372689168254967">"Processos complexos"</item>
+ <item msgid="7438189122367820362">"Serviço (em execução)"</item>
+ <item msgid="918687422516982498">"Serviço (a reiniciar)"</item>
+ <item msgid="6807727069641853029">"Recetor"</item>
+ <item msgid="6782857406100845127">"Início"</item>
+ <item msgid="2860945127596974299">"Última atividade"</item>
+ <item msgid="8610560843693675830">"Em cache (atividade)"</item>
+ <item msgid="4338089220026248848">"Em cache (cliente de atividade)"</item>
+ <item msgid="6652164677254579050">"Em cache (vazio)"</item>
+ </string-array>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 789b0c9..9b10297 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"O campo referente à porta tem de estar vazio se o campo do anfitrião estiver vazio."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"A porta introduzida não é válida."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é utilizado pelo navegador, mas não pode ser utilizado por outras aplicações."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL de PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL do PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Local:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar informação do perfil no ecrã de bloqueio"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informação do perfil"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Segurança"</string>
<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>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Encriptação"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Aguarde enquanto o tablet está a ser encriptado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Aguarde enquanto o telemóvel está a ser encriptado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Aguarde enquanto o tablet está a ser encriptado. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Aguarde enquanto o telemóvel está a ser encriptado. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Tente novamente dentro de <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Introduza a palavra-passe"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Encriptação sem êxito"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Não reproduzir som ao inserir ou remover o tablet da estação de ancoragem"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Não reproduzir som ao inserir ou remover o telefone da estação de ancoragem"</string>
<string name="account_settings" msgid="6403589284618783461">"Contas"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Pessoal"</string>
+ <string name="category_work" msgid="8699184680584175622">"Trabalho"</string>
<string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Gerir definições e histórico de pesquisa"</string>
<string name="display_settings" msgid="7965901687241669598">"Ecrã"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Opções de programador"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Definir opções de desenvolvimento da aplicação"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"As opções de programador não estão disponíveis para este utilizador"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"As definições de VPN não estão disponíveis para este utilizador"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"As definições de ligação via telemóvel não estão disponíveis para este utilizador"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"As definições de Nome do Ponto de Acesso não estão disponíveis para este utilizador"</string>
<string name="enable_adb" msgid="7982306934419797485">"Depuração USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuração com USB ligado"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Revogar autorizações de depur. USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"O ecrã nunca entrará em suspensão durante o carregamento"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ativar registo de monit. Bluetooth HCI"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os pacotes Bluetooth HCI num ficheiro"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Selecionar tempo exec."</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Selecionar tempo exec."</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reiniciar para alterar o tempo de execução de <xliff:g id="OLD">%1$s</xliff:g> para <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certificação de display sem fios"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Ativar o registo detalhado de Wi-Fi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Transm. agressiva de Wi-Fi p/ rede móvel"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Permitir sempre a deteção de Wi-Fi em roaming"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opções da certificação de display sem fios"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Aumentar nível de reg. de Wi-Fi, mostrar por SSID RSSI no selecionador de Wi-Fi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Se estiver ativado, o Wi-Fi será mais agressivo ao transmitir a lig. de dados p/ a rede móvel quando o sinal Wi-Fi estiver fraco"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Permitir/impedir a deteção de Wi-Fi em roaming com base na quantidade de tráfego de dados presente na interface"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Tamanhos da memória intermédia do registo"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Selec. tam. reg. p/ mem. int. reg."</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Permitir depuração USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Tempo de execução"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Serviços"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duração"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Detalhes da memória"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Estados da memória"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Utilização da memória"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Nativa"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Caches do kernel"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Troca de ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Livre"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 horas"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 horas"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Credenciais fiáveis"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados da AC fiáveis"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Avançadas"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Tipo de armazenamento"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Suportado por hardware"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Apenas software"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"As credenciais não estão disponíveis para este utilizador"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenhe a sua sequência de desbloqueio"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário desenhar a sequência de desbloqueio para confirmar a instalação de credenciais."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Toque em "<b>"Seguinte"</b>" para continuar a configuração.\n\nToque em "<b>"Anterior"</b>" para ligar a uma rede Wi‑Fi diferente."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronização ativada"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronização desativada"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"A sincronizar agora"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Erro de sincronização"</string>
<string name="sync_failed" msgid="1696499856374109647">"A sincronização falhou"</string>
<string name="sync_active" msgid="8476943765960863040">"Sincronização ativa"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Apresentar limites de clipes, margens, etc."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forçar dir. do esq. RTL"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forçar dir. do esq. do ecrã p. RTL tds os locais"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Modo de baixo consumo"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Ativar definições de poupança de bateria"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar utilização da CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Sobrep. de ecrã que mostra a utiliz. atual da CPU"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Forçar composição GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o conteúdo de notificação"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ocultar conteúdo de notificação sensível"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Não mostrar qualquer notificação"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Quando não perturbar está ativado"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ocultar novas notificações a partir da lista"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Mostrar todas as notificações na lista"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Notificações da aplicação"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Outros sons"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Sons do teclado"</string>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 57a26e7..a1cc922 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Nenhum"</item>
<item msgid="8673874894887358090">"Manual"</item>
+ <item msgid="168893341855953140">"Autoconfiguração do proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Nenhum"</item>
@@ -231,96 +232,13 @@
<item msgid="886742181977884584">"Mídia"</item>
<item msgid="7924928667052300589">"Dispositivo"</item>
</string-array>
- <string-array name="app_ops_summaries">
- <item msgid="4979188868761515915">"localização aproximada"</item>
- <item msgid="5789673140227507995">"localização precisa"</item>
- <item msgid="1061584358377390581">"GPS"</item>
- <item msgid="5387405117297558954">"vibração"</item>
- <item msgid="3434165993711230924">"ler contatos"</item>
- <item msgid="616161687718081936">"modificar contatos"</item>
- <item msgid="7638002295329050091">"ler registro de chamadas"</item>
- <item msgid="6546959730920410907">"modificar registro de chamadas"</item>
- <item msgid="446877710771379667">"ler agenda"</item>
- <item msgid="7674458294386319722">"modificar agenda"</item>
- <item msgid="8281201165558093009">"verificação de Wi-Fi"</item>
- <item msgid="8694611243479480497">"notificação"</item>
- <item msgid="7776439107987345446">"verificação de celular"</item>
- <item msgid="514615766544675057">"chamar telefone"</item>
- <item msgid="8181415497109310680">"ler SMS"</item>
- <item msgid="6816551144382117307">"gravar SMS"</item>
- <item msgid="4600463921908905030">"receber SMS"</item>
- <item msgid="5958926493289432745">"receber SMS de emergência"</item>
- <item msgid="4945269495221089540">"receber MMS"</item>
- <item msgid="5570472453573929087">"receber WAP push"</item>
- <item msgid="7125408150230860501">"enviar SMS"</item>
- <item msgid="7080337936612188061">"ler SMS ICC"</item>
- <item msgid="587124103118495063">"gravar SMS ICC"</item>
- <item msgid="2320577158869025503">"modificar configurações"</item>
- <item msgid="1545733463471924009">"sobrepor"</item>
- <item msgid="3609046903962454582">"acessar notificações"</item>
- <item msgid="4671646036128214513">"câmera"</item>
- <item msgid="1097324338692486211">"gravar áudio"</item>
- <item msgid="5031552983987798163">"reproduzir áudio"</item>
- <item msgid="8374996688066472414">"ler a área de transferência"</item>
- <item msgid="3045529469061083747">"modificar a área de transferência"</item>
- <item msgid="5124443975763747838">"botões de mídia"</item>
- <item msgid="4547883971364273343">"foco de áudio"</item>
- <item msgid="2603878814882344450">"volume mestre"</item>
- <item msgid="7136963238377062018">"volume da voz"</item>
- <item msgid="4270236897655923007">"volume do toque"</item>
- <item msgid="6325739889222559394">"volume da mídia"</item>
- <item msgid="5762123934816216821">"volume do alarme"</item>
- <item msgid="785049718065337473">"volume da notificação"</item>
- <item msgid="6700305533746877052">"volume do Bluetooth"</item>
- <item msgid="2029227495214047094">"permanecer ativo"</item>
- <item msgid="26109888160231211">"monitorar local"</item>
- <item msgid="5753382310468855812">"monitorar local de alta potência"</item>
- </string-array>
- <string-array name="app_ops_labels">
- <item msgid="6602854600289714121">"Local"</item>
- <item msgid="8677040780775113033">"Local"</item>
- <item msgid="1660743989948992916">"Local"</item>
- <item msgid="8791172739860195290">"Vibração"</item>
- <item msgid="383413555642128046">"Ler contatos"</item>
- <item msgid="3654594895269697313">"Modificar contatos"</item>
- <item msgid="7928393476362362538">"Ler registro de chamadas"</item>
- <item msgid="6248591205254641116">"Modificar registro de chamadas"</item>
- <item msgid="6093344633066170692">"Ler agenda"</item>
- <item msgid="1334886368750347692">"Modificar agenda"</item>
- <item msgid="1638204101698708656">"Local"</item>
- <item msgid="2154671955760380322">"Postar notificação"</item>
- <item msgid="4282477730595931828">"Local"</item>
- <item msgid="4891423912898525905">"Chamar telefone"</item>
- <item msgid="2623604824935968113">"Ler SMS/MMS"</item>
- <item msgid="4420177125221176306">"Escrever SMS/MMS"</item>
- <item msgid="3986142739951490025">"Receber SMS/MMS"</item>
- <item msgid="3984213795861739778">"Receber SMS/MMS"</item>
- <item msgid="3656243523752472788">"Receber SMS/MMS"</item>
- <item msgid="8105802370238551510">"Receber SMS/MMS"</item>
- <item msgid="1407766984645388488">"Enviar SMS/MMS"</item>
- <item msgid="3527273606643794973">"Ler SMS/MMS"</item>
- <item msgid="4370895547001583812">"Escrever SMS/MMS"</item>
- <item msgid="4218544235221631789">"Modificar configurações"</item>
- <item msgid="736541391767350377">"Sobrepor"</item>
- <item msgid="5530815681721654194">"Acessar notificações"</item>
- <item msgid="781213371706962767">"Câmera"</item>
- <item msgid="1720492593061838172">"Gravar áudio"</item>
- <item msgid="3493046322001257041">"Reproduzir áudio"</item>
- <item msgid="136815868796597058">"Ler a área de transferência"</item>
- <item msgid="5238692940326972503">"Modificar a área de transferência"</item>
- <item msgid="5753789168376302997">"Botões de mídia"</item>
- <item msgid="3265262911688671938">"Foco de áudio"</item>
- <item msgid="2098976479485046797">"Volume mestre"</item>
- <item msgid="5660213838861789350">"Volume da voz"</item>
- <item msgid="7983336752371254444">"Volume do toque"</item>
- <item msgid="7878027809189330917">"Volume da mídia"</item>
- <item msgid="7260546305036218513">"Volume do alarme"</item>
- <item msgid="9103719301075748925">"Volume da notificação"</item>
- <item msgid="7025966722295861512">"Volume do Bluetooth"</item>
- <item msgid="4665183401128289653">"Permanecer ativo"</item>
- <item msgid="8584357129746649222">"Local"</item>
- <item msgid="7669257279311110599">"Local"</item>
- </string-array>
+ <!-- no translation found for app_ops_summaries:40 (3810969981743709839) -->
+ <!-- no translation found for app_ops_summaries:41 (2627903914574908209) -->
+ <!-- no translation found for app_ops_summaries:42 (1395372654968157578) -->
+ <!-- no translation found for app_ops_summaries:43 (3238451051299611853) -->
+ <!-- no translation found for app_ops_labels:40 (2265317984004577529) -->
+ <!-- no translation found for app_ops_labels:41 (3646325683886507917) -->
+ <!-- no translation found for app_ops_labels:43 (7745724368696313169) -->
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Curto"</item>
<item msgid="2560532955514699713">"Médio"</item>
@@ -365,15 +283,19 @@
<item msgid="6039700130994371612">"Amarelo em azul"</item>
<item msgid="7169235156349580064">"Personalizado"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (depuração)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 K"</item>
+ <item msgid="505611754508988476">"256 K"</item>
+ <item msgid="6361286924268716397">"1 M"</item>
+ <item msgid="6405203239560695266">"4 M"</item>
+ <item msgid="3025431211013424097">"16 M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Usar Dalvik"</item>
- <item msgid="5131846588686178907">"Usar ART"</item>
- <item msgid="4530003713865319928">"Usar compilação de depuração do ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64K/buffer de log"</item>
+ <item msgid="2822309747675758628">"256K/buffer de log"</item>
+ <item msgid="6699306198357496731">"1M/buffer de log"</item>
+ <item msgid="5748528643937500349">"4M/buffer de log"</item>
+ <item msgid="1978629051085111592">"16M/buffer de log"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Nunca verificar"</item>
@@ -483,4 +405,26 @@
<item msgid="5656544177755411222">"Interrupções limitadas"</item>
<item msgid="8735337502532332056">"Sem interrupções"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normal"</item>
+ <item msgid="866544120205026771">"Moderado"</item>
+ <item msgid="7851902244436886890">"Baixo"</item>
+ <item msgid="3022922196817563960">"Crítico"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Persistente"</item>
+ <item msgid="5779398140277006695">"Principal atividade"</item>
+ <item msgid="1439598363694578255">"Importante (primeiro plano)"</item>
+ <item msgid="3396458970745718652">"Importante (segundo plano)"</item>
+ <item msgid="5214825238247511992">"Backup"</item>
+ <item msgid="311372689168254967">"Uso intenso"</item>
+ <item msgid="7438189122367820362">"Serviço (em execução)"</item>
+ <item msgid="918687422516982498">"Serviço (reiniciando)"</item>
+ <item msgid="6807727069641853029">"Receptor"</item>
+ <item msgid="6782857406100845127">"Início"</item>
+ <item msgid="2860945127596974299">"Última atividade"</item>
+ <item msgid="8610560843693675830">"Em cache (atividade)"</item>
+ <item msgid="4338089220026248848">"Em cache (cliente de atividade)"</item>
+ <item msgid="6652164677254579050">"Em cache (vazio)"</item>
+ </string-array>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e051691..c9ab97e 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"O campo da porta deverá estar vazio se o campo do host estiver vazio."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"A porta digitada não é válida."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"O proxy HTTP é usado pelo navegador, mas não pode ser usado por outros aplicativos."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL do PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL do PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Localização:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vizinho:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Mostrar informações do perfil na tela de bloqueio"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informação do perfil"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Localização"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Contas"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Segurança"</string>
<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>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Criptografando"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Aguarde enquanto seu tablet está sendo criptografado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Aguarde enquanto seu telefone está sendo criptografado. <xliff:g id="PERCENT">^1</xliff:g>% concluído."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Aguarde enquanto seu tablet é criptografado. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Aguarde enquanto seu telefone é criptografado. Tempo restante: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Tente novamente em <xliff:g id="DELAY">^1</xliff:g> segundos."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Digite sua senha"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Falha na criptografia"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Não reproduzir sons ao inserir ou remover o tablet da dock"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Não reproduzir sons ao inserir ou remover o telefone da dock."</string>
<string name="account_settings" msgid="6403589284618783461">"Contas"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Pessoal"</string>
+ <string name="category_work" msgid="8699184680584175622">"Trabalho"</string>
<string name="search_settings" msgid="1910951467596035063">"Pesquisar"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Gerenciar configurações e histórico de pesquisa"</string>
<string name="display_settings" msgid="7965901687241669598">"Tela"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Opções do desenvolvedor"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Define as opções para o desenvolvimento do aplicativo"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"As opções do desenvolvedor não estão disponíveis para este usuário"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"As configurações de VPN não estão disponíveis para este usuário"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"As configurações de tethering não estão disponíveis para este usuário"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"As configurações do Nome do ponto de acesso não estão disponíveis para este usuário"</string>
<string name="enable_adb" msgid="7982306934419797485">"Depuração USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Modo de depuração quando o USB estiver conectado"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Revogar autorizações de depuração USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"A tela nunca entrará em inatividade enquanto estiver carregando."</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Ativar log de rastr. Bluetooth HCI"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Capturar todos os pacotes Bluetooth HCI em um arquivo"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Selecionar tempo de execução"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Selecionar tempo de execução"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reiniciar para mudar tempo de execução de <xliff:g id="OLD">%1$s</xliff:g> para <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certificação de Display sem fio"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Ativar registro extenso de Wi-Fi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Troca agressiva de Wi-Fi para celular"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Sempre permitir verificações de roaming Wi-Fi"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Mostrar opções de certificação de Display sem fio"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Aumentar nível de reg. de Wi-Fi, mostrar por SSID RSSI no selecionador de Wi-Fi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Quando ativa, o Wi-Fi será mais agressivo em passar a conexão de dados para celular, quando o sinal de Wi-Fi estiver baixo"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Ativar/desativar as verificações de roaming Wi-Fi com base no volume do tráfego de dados presente na interface"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Tamanhos de buffer de logger"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Sel. tam. de logger/buffer de log"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Permitir locais fictícios"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permitir locais fictícios"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Permitir a depuração USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Tempo de execução"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Serviços"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Duração"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Detalhes da memória"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Estados da memória"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Uso da memória"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Nativo"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Caches do kernel"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Troca de zRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Livre"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 horas"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 horas"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 horas"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Remover todos os certificados"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Credenciais confiáveis"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Mostrar certificados CA de confiança"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Avançadas"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Tipo de armazenamento"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Suportado por hardware"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Somente software"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"As credenciais não estão disponíveis para este usuário"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenhe seu padrão de desbloqueio"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"É necessário que você desenhe seu padrão de desbloqueio para confirmar a instalação de credenciais."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Toque em "<b>"Próximo"</b>" para continuar a configuração.\n\nToque em "<b>"Voltar"</b>" para conectar-se a outra rede Wi-Fi."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronização ativada"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronização desativada"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sincronizando agora"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Erro de sincronização."</string>
<string name="sync_failed" msgid="1696499856374109647">"Falha na sincronização"</string>
<string name="sync_active" msgid="8476943765960863040">"Sincronização ativa"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Mostrar limites de corte, margens, etc."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Forçar dir. layout (RTL)"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Forçar direção do layout (RTL) p/ todas as local."</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Modo de baixa energia"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Ativar configurações de economia de bateria"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Mostrar o uso da CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Sobreposição de tela que mostra o uso da CPU atual"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Forçar renderização GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Mostrar todo o conteúdo de notificações"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ocultar o conteúdo confidencial de notificações"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Não mostrar notificações"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Quando \"Não perturbe\" estiver ativado"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ocultar novas notificações da lista"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Mostrar todas as notificações na lista"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Notificações de aplicativos"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Outros sons"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Tons do teclado"</string>
diff --git a/res/values-rm/arrays.xml b/res/values-rm/arrays.xml
index 1caf004..776408c 100644
--- a/res/values-rm/arrays.xml
+++ b/res/values-rm/arrays.xml
@@ -129,6 +129,7 @@
<!-- no translation found for wifi_ip_settings:1 (628395202971532382) -->
<!-- no translation found for wifi_proxy_settings:0 (4473276491748503377) -->
<!-- no translation found for wifi_proxy_settings:1 (8673874894887358090) -->
+ <!-- no translation found for wifi_proxy_settings:2 (168893341855953140) -->
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Nagins"</item>
<item msgid="5756844015743664882">"PAP"</item>
@@ -195,9 +196,10 @@
<!-- no translation found for app_ops_summaries:37 (5762123934816216821) -->
<!-- no translation found for app_ops_summaries:38 (785049718065337473) -->
<!-- no translation found for app_ops_summaries:39 (6700305533746877052) -->
- <!-- no translation found for app_ops_summaries:40 (2029227495214047094) -->
- <!-- no translation found for app_ops_summaries:41 (26109888160231211) -->
- <!-- no translation found for app_ops_summaries:42 (5753382310468855812) -->
+ <!-- no translation found for app_ops_summaries:40 (3810969981743709839) -->
+ <!-- no translation found for app_ops_summaries:41 (2627903914574908209) -->
+ <!-- no translation found for app_ops_summaries:42 (1395372654968157578) -->
+ <!-- no translation found for app_ops_summaries:43 (3238451051299611853) -->
<!-- no translation found for app_ops_labels:0 (6602854600289714121) -->
<!-- no translation found for app_ops_labels:1 (8677040780775113033) -->
<!-- no translation found for app_ops_labels:2 (1660743989948992916) -->
@@ -238,9 +240,10 @@
<!-- no translation found for app_ops_labels:37 (7260546305036218513) -->
<!-- no translation found for app_ops_labels:38 (9103719301075748925) -->
<!-- no translation found for app_ops_labels:39 (7025966722295861512) -->
- <!-- no translation found for app_ops_labels:40 (4665183401128289653) -->
- <!-- no translation found for app_ops_labels:41 (8584357129746649222) -->
+ <!-- no translation found for app_ops_labels:40 (2265317984004577529) -->
+ <!-- no translation found for app_ops_labels:41 (3646325683886507917) -->
<!-- no translation found for app_ops_labels:42 (7669257279311110599) -->
+ <!-- no translation found for app_ops_labels:43 (7745724368696313169) -->
<!-- no translation found for long_press_timeout_selector_titles:0 (3511504869290423954) -->
<!-- no translation found for long_press_timeout_selector_titles:1 (2560532955514699713) -->
<!-- no translation found for long_press_timeout_selector_titles:2 (2372711992605524591) -->
@@ -273,12 +276,16 @@
<!-- no translation found for captioning_preset_selector_titles:3 (1495307195241623402) -->
<!-- no translation found for captioning_preset_selector_titles:4 (6039700130994371612) -->
<!-- no translation found for captioning_preset_selector_titles:5 (7169235156349580064) -->
- <!-- no translation found for select_runtime_titles:0 (3574453009229338122) -->
- <!-- no translation found for select_runtime_titles:1 (8978402910750533864) -->
- <!-- no translation found for select_runtime_titles:2 (7839859333977894115) -->
- <!-- no translation found for select_runtime_summaries:0 (6412880178297884701) -->
- <!-- no translation found for select_runtime_summaries:1 (5131846588686178907) -->
- <!-- no translation found for select_runtime_summaries:2 (4530003713865319928) -->
+ <!-- no translation found for select_logd_size_titles:0 (3100534874529240291) -->
+ <!-- no translation found for select_logd_size_titles:1 (505611754508988476) -->
+ <!-- no translation found for select_logd_size_titles:2 (6361286924268716397) -->
+ <!-- no translation found for select_logd_size_titles:3 (6405203239560695266) -->
+ <!-- no translation found for select_logd_size_titles:4 (3025431211013424097) -->
+ <!-- no translation found for select_logd_size_summaries:0 (7346595473588765019) -->
+ <!-- no translation found for select_logd_size_summaries:1 (2822309747675758628) -->
+ <!-- no translation found for select_logd_size_summaries:2 (6699306198357496731) -->
+ <!-- no translation found for select_logd_size_summaries:3 (5748528643937500349) -->
+ <!-- no translation found for select_logd_size_summaries:4 (1978629051085111592) -->
<!-- no translation found for hdcp_checking_titles:0 (441827799230089869) -->
<!-- no translation found for hdcp_checking_titles:1 (6042769699089883931) -->
<!-- no translation found for hdcp_checking_titles:2 (9174900380056846820) -->
@@ -355,4 +362,22 @@
<!-- no translation found for entries_zen_mode:0 (816404936744485190) -->
<!-- no translation found for entries_zen_mode:1 (5656544177755411222) -->
<!-- no translation found for entries_zen_mode:2 (8735337502532332056) -->
+ <!-- no translation found for proc_stats_memory_states:0 (8845855295876909468) -->
+ <!-- no translation found for proc_stats_memory_states:1 (866544120205026771) -->
+ <!-- no translation found for proc_stats_memory_states:2 (7851902244436886890) -->
+ <!-- no translation found for proc_stats_memory_states:3 (3022922196817563960) -->
+ <!-- no translation found for proc_stats_process_states:0 (5069825997142785829) -->
+ <!-- no translation found for proc_stats_process_states:1 (5779398140277006695) -->
+ <!-- no translation found for proc_stats_process_states:2 (1439598363694578255) -->
+ <!-- no translation found for proc_stats_process_states:3 (3396458970745718652) -->
+ <!-- no translation found for proc_stats_process_states:4 (5214825238247511992) -->
+ <!-- no translation found for proc_stats_process_states:5 (311372689168254967) -->
+ <!-- no translation found for proc_stats_process_states:6 (7438189122367820362) -->
+ <!-- no translation found for proc_stats_process_states:7 (918687422516982498) -->
+ <!-- no translation found for proc_stats_process_states:8 (6807727069641853029) -->
+ <!-- no translation found for proc_stats_process_states:9 (6782857406100845127) -->
+ <!-- no translation found for proc_stats_process_states:10 (2860945127596974299) -->
+ <!-- no translation found for proc_stats_process_states:11 (8610560843693675830) -->
+ <!-- no translation found for proc_stats_process_states:12 (4338089220026248848) -->
+ <!-- no translation found for proc_stats_process_states:13 (6652164677254579050) -->
</resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 1d83bac..76a57cd 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -288,7 +288,7 @@
<skip />
<!-- no translation found for proxy_warning_limited_support (7229337138062837422) -->
<skip />
- <!-- no translation found for proxy_url (2523518669129974654) -->
+ <!-- no translation found for proxy_url_title (7185282894936042359) -->
<skip />
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Posiziun:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vischin:"</string>
@@ -465,6 +465,8 @@
<skip />
<!-- no translation found for location_settings_title (1369675479310751735) -->
<skip />
+ <!-- no translation found for account_settings_title (626177544686329806) -->
+ <skip />
<!-- no translation found for security_settings_title (7945465324818485460) -->
<skip />
<string name="security_settings_summary" msgid="967393342537986570">"Definir ils parameters da Mia posiziun, da la debloccada dal visur, da la bloccada da la carta SIM e da la bloccada da la memoria da las infurmaziuns d\'annunzia"</string>
@@ -506,6 +508,10 @@
<skip />
<!-- no translation found for crypt_keeper_setup_description (951918761585534875) -->
<skip />
+ <!-- no translation found for crypt_keeper_setup_time_remaining (1655047311546745695) -->
+ <skip />
+ <!-- no translation found for crypt_keeper_setup_time_remaining (1862964662304683072) -->
+ <skip />
<!-- no translation found for crypt_keeper_cooldown (685210918307862395) -->
<skip />
<!-- no translation found for crypt_keeper_enter_password (2223340178473871064) -->
@@ -1123,6 +1129,10 @@
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Betg sunar in tun cun attatgar il telefonin a la basa u cun separar el da la tala"</string>
<!-- no translation found for account_settings (6403589284618783461) -->
<skip />
+ <!-- no translation found for category_personal (1299663247844969448) -->
+ <skip />
+ <!-- no translation found for category_work (8699184680584175622) -->
+ <skip />
<string name="search_settings" msgid="1910951467596035063">"Tschertgar"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Configurar ils parameters e la cronologia da tschertga"</string>
<!-- no translation found for display_settings (7965901687241669598) -->
@@ -2051,6 +2061,12 @@
<skip />
<!-- no translation found for development_settings_not_available (4308569041701535607) -->
<skip />
+ <!-- no translation found for vpn_settings_not_available (956841430176985598) -->
+ <skip />
+ <!-- no translation found for tethering_settings_not_available (6765770438438291012) -->
+ <skip />
+ <!-- no translation found for apn_settings_not_available (7873729032165324000) -->
+ <skip />
<string name="enable_adb" msgid="7982306934419797485">"Debugar USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Modus da debugar sch\'in apparat periferic USB è connectà"</string>
<!-- no translation found for clear_adb_keys (4038889221503122743) -->
@@ -2065,18 +2081,26 @@
<skip />
<!-- no translation found for bt_hci_snoop_log_summary (730247028210113851) -->
<skip />
- <!-- no translation found for select_runtime_title (649783802363155346) -->
- <skip />
- <!-- no translation found for select_runtime_dialog_title (5314872813037493958) -->
- <skip />
- <!-- no translation found for select_runtime_warning_message (1937574953265648165) -->
- <skip />
<!-- no translation found for wifi_display_certification (8611569543791307533) -->
<skip />
<!-- no translation found for wifi_verbose_logging (4770164061102202747) -->
<skip />
+ <!-- no translation found for wifi_aggressive_handover (5398429853675035444) -->
+ <skip />
+ <!-- no translation found for wifi_allow_scan_with_traffic (1390236299223668977) -->
+ <skip />
<!-- no translation found for wifi_display_certification_summary (1155182309166746973) -->
<skip />
+ <!-- no translation found for wifi_verbose_logging_summary (4393610458474552685) -->
+ <skip />
+ <!-- no translation found for wifi_aggressive_handover_summary (1000996694927825958) -->
+ <skip />
+ <!-- no translation found for wifi_allow_scan_with_traffic_summary (4586928675773406679) -->
+ <skip />
+ <!-- no translation found for select_logd_size_title (7433137108348553508) -->
+ <skip />
+ <!-- no translation found for select_logd_size_dialog_title (1206769310236476760) -->
+ <skip />
<string name="allow_mock_location" msgid="2787962564578664888">"Posiziuns faussas"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permetter posiziuns faussas"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Permetter da debugar USB?"</string>
@@ -2520,6 +2544,24 @@
<skip />
<!-- no translation found for menu_proc_stats_duration (2323483592994720196) -->
<skip />
+ <!-- no translation found for mem_details_title (6548392825497290498) -->
+ <skip />
+ <!-- no translation found for mem_state_subtitle (2407238869781011933) -->
+ <skip />
+ <!-- no translation found for mem_use_subtitle (7319468770222422412) -->
+ <skip />
+ <!-- no translation found for mem_use_kernel_type (8698327165935012484) -->
+ <skip />
+ <!-- no translation found for mem_use_native_type (5976704902328347400) -->
+ <skip />
+ <!-- no translation found for mem_use_kernel_cache_type (6411475064463957513) -->
+ <skip />
+ <!-- no translation found for mem_use_zram_type (9087217476795358232) -->
+ <skip />
+ <!-- no translation found for mem_use_free_type (717708548454880840) -->
+ <skip />
+ <!-- no translation found for mem_use_total (6308786055749777934) -->
+ <skip />
<!-- no translation found for menu_duration_3h (4714866438374738385) -->
<skip />
<!-- no translation found for menu_duration_6h (1940846763432184132) -->
@@ -2679,12 +2721,16 @@
<skip />
<!-- no translation found for trusted_credentials_summary (6735221351155686632) -->
<skip />
+ <!-- no translation found for advanced_security_title (2434776238010578865) -->
+ <skip />
<!-- no translation found for credential_storage_type (8629968543494001364) -->
<skip />
<!-- no translation found for credential_storage_type_hardware (6077193544333904427) -->
<skip />
<!-- no translation found for credential_storage_type_software (4403117271207715378) -->
<skip />
+ <!-- no translation found for credentials_settings_not_available (7968275634486624215) -->
+ <skip />
<!-- no translation found for credentials_install_gesture_prompt (2207390278112395082) -->
<skip />
<!-- no translation found for credentials_install_gesture_explanation (7408921172253634829) -->
@@ -2825,6 +2871,8 @@
<skip />
<!-- no translation found for accessibility_sync_disabled (1741194106479011384) -->
<skip />
+ <!-- no translation found for accessibility_sync_in_progress (4501160520879902723) -->
+ <skip />
<!-- no translation found for accessibility_sync_error (8703299118794272041) -->
<skip />
<!-- no translation found for sync_failed (1696499856374109647) -->
@@ -3005,10 +3053,6 @@
<skip />
<!-- no translation found for force_rtl_layout_all_locales_summary (9192797796616132534) -->
<skip />
- <!-- no translation found for low_power_mode (8400119155107987979) -->
- <skip />
- <!-- no translation found for low_power_mode_summary (8895619424568660204) -->
- <skip />
<!-- no translation found for show_cpu_usage (2389212910758076024) -->
<skip />
<!-- no translation found for show_cpu_usage_summary (2113341923988958266) -->
@@ -3557,12 +3601,6 @@
<skip />
<!-- no translation found for lock_screen_notifications_summary_disable (3001013816427963576) -->
<skip />
- <!-- no translation found for zen_mode_notifications_title (8216258729654184425) -->
- <skip />
- <!-- no translation found for zen_mode_notifications_summary_hide (1442445640095117354) -->
- <skip />
- <!-- no translation found for zen_mode_notifications_summary_show (4043422218595387460) -->
- <skip />
<!-- no translation found for app_notifications_title (5810577805218003760) -->
<skip />
<!-- no translation found for other_sound_settings (3151004537006844718) -->
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index bfa7563..a94faf0 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Niciuna"</item>
<item msgid="8673874894887358090">"Manual"</item>
+ <item msgid="168893341855953140">"Config. automată proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Niciunul"</item>
@@ -231,96 +232,13 @@
<item msgid="886742181977884584">"Media"</item>
<item msgid="7924928667052300589">"Dispozitiv"</item>
</string-array>
- <string-array name="app_ops_summaries">
- <item msgid="4979188868761515915">"locație imprecisă"</item>
- <item msgid="5789673140227507995">"locație exactă"</item>
- <item msgid="1061584358377390581">"GPS"</item>
- <item msgid="5387405117297558954">"vibrează"</item>
- <item msgid="3434165993711230924">"citește agenda"</item>
- <item msgid="616161687718081936">"modifică agenda"</item>
- <item msgid="7638002295329050091">"citește jurnalul de apeluri"</item>
- <item msgid="6546959730920410907">"modifică jurnalul de apeluri"</item>
- <item msgid="446877710771379667">"citește calendarul"</item>
- <item msgid="7674458294386319722">"modifică calendarul"</item>
- <item msgid="8281201165558093009">"scanează Wi-Fi"</item>
- <item msgid="8694611243479480497">"notificare"</item>
- <item msgid="7776439107987345446">"scanează semnal mobil"</item>
- <item msgid="514615766544675057">"apelează un telefon"</item>
- <item msgid="8181415497109310680">"citește mesaje SMS"</item>
- <item msgid="6816551144382117307">"scrie mesaje SMS"</item>
- <item msgid="4600463921908905030">"primește mesaje SMS"</item>
- <item msgid="5958926493289432745">"primește mesaje SMS de urgență"</item>
- <item msgid="4945269495221089540">"primește mesaje MMS"</item>
- <item msgid="5570472453573929087">"primește mesaje WAP push"</item>
- <item msgid="7125408150230860501">"trimite mesaje SMS"</item>
- <item msgid="7080337936612188061">"citește mesaje ICC SMS"</item>
- <item msgid="587124103118495063">"scrie mesaje ICC SMS"</item>
- <item msgid="2320577158869025503">"modifică setările"</item>
- <item msgid="1545733463471924009">"desenează deasupra"</item>
- <item msgid="3609046903962454582">"accesează notificări"</item>
- <item msgid="4671646036128214513">"cameră foto"</item>
- <item msgid="1097324338692486211">"înregistrează conținut audio"</item>
- <item msgid="5031552983987798163">"redă conținut audio"</item>
- <item msgid="8374996688066472414">"citește clipboardul"</item>
- <item msgid="3045529469061083747">"modifică clipboardul"</item>
- <item msgid="5124443975763747838">"butoane media"</item>
- <item msgid="4547883971364273343">"focalizare audio"</item>
- <item msgid="2603878814882344450">"volum principal"</item>
- <item msgid="7136963238377062018">"volum voce"</item>
- <item msgid="4270236897655923007">"volum sonerie"</item>
- <item msgid="6325739889222559394">"volum media"</item>
- <item msgid="5762123934816216821">"volum alarmă"</item>
- <item msgid="785049718065337473">"volum notificări"</item>
- <item msgid="6700305533746877052">"volumul Bluetooth"</item>
- <item msgid="2029227495214047094">"mențineți activ"</item>
- <item msgid="26109888160231211">"monitorizarea locației"</item>
- <item msgid="5753382310468855812">"monitorizarea localizării cu consum ridicat de energie"</item>
- </string-array>
- <string-array name="app_ops_labels">
- <item msgid="6602854600289714121">"Locație"</item>
- <item msgid="8677040780775113033">"Locație"</item>
- <item msgid="1660743989948992916">"Locație"</item>
- <item msgid="8791172739860195290">"Vibrează"</item>
- <item msgid="383413555642128046">"Citește agenda"</item>
- <item msgid="3654594895269697313">"Modifică agenda"</item>
- <item msgid="7928393476362362538">"Citește jurnalul de apeluri"</item>
- <item msgid="6248591205254641116">"Modifică jurnalul de apeluri"</item>
- <item msgid="6093344633066170692">"Citește calendarul"</item>
- <item msgid="1334886368750347692">"Modifică calendarul"</item>
- <item msgid="1638204101698708656">"Locație"</item>
- <item msgid="2154671955760380322">"Postează o notificare"</item>
- <item msgid="4282477730595931828">"Locație"</item>
- <item msgid="4891423912898525905">"Apelează un telefon"</item>
- <item msgid="2623604824935968113">"Citiți mesaje SMS/MMS"</item>
- <item msgid="4420177125221176306">"Scrieți mesaje SMS/MMS"</item>
- <item msgid="3986142739951490025">"Primește mesaje SMS/MMS"</item>
- <item msgid="3984213795861739778">"Primește mesaje SMS/MMS"</item>
- <item msgid="3656243523752472788">"Primește mesaje SMS/MMS"</item>
- <item msgid="8105802370238551510">"Primește mesaje SMS/MMS"</item>
- <item msgid="1407766984645388488">"Trimite mesaje SMS/MMS"</item>
- <item msgid="3527273606643794973">"Citiți mesaje SMS/MMS"</item>
- <item msgid="4370895547001583812">"Scrieți mesaje SMS/MMS"</item>
- <item msgid="4218544235221631789">"Modifică setările"</item>
- <item msgid="736541391767350377">"Desenează deasupra"</item>
- <item msgid="5530815681721654194">"Accesează notificări"</item>
- <item msgid="781213371706962767">"Cameră foto"</item>
- <item msgid="1720492593061838172">"Înregistrează conținut audio"</item>
- <item msgid="3493046322001257041">"Redă conținut audio"</item>
- <item msgid="136815868796597058">"Citește clipboardul"</item>
- <item msgid="5238692940326972503">"Modifică clipboardul"</item>
- <item msgid="5753789168376302997">"Butoane media"</item>
- <item msgid="3265262911688671938">"Focalizare audio"</item>
- <item msgid="2098976479485046797">"Volum principal"</item>
- <item msgid="5660213838861789350">"Volum voce"</item>
- <item msgid="7983336752371254444">"Volum sonerie"</item>
- <item msgid="7878027809189330917">"Volum media"</item>
- <item msgid="7260546305036218513">"Volum alarmă"</item>
- <item msgid="9103719301075748925">"Volum notificări"</item>
- <item msgid="7025966722295861512">"Volum Bluetooth"</item>
- <item msgid="4665183401128289653">"Păstrare în activitate"</item>
- <item msgid="8584357129746649222">"Locație"</item>
- <item msgid="7669257279311110599">"Locație"</item>
- </string-array>
+ <!-- no translation found for app_ops_summaries:40 (3810969981743709839) -->
+ <!-- no translation found for app_ops_summaries:41 (2627903914574908209) -->
+ <!-- no translation found for app_ops_summaries:42 (1395372654968157578) -->
+ <!-- no translation found for app_ops_summaries:43 (3238451051299611853) -->
+ <!-- no translation found for app_ops_labels:40 (2265317984004577529) -->
+ <!-- no translation found for app_ops_labels:41 (3646325683886507917) -->
+ <!-- no translation found for app_ops_labels:43 (7745724368696313169) -->
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Scurtă"</item>
<item msgid="2560532955514699713">"Medie"</item>
@@ -365,15 +283,19 @@
<item msgid="6039700130994371612">"Galben pe albastru"</item>
<item msgid="7169235156349580064">"Personalizată"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (depanare)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Utilizați Dalvik"</item>
- <item msgid="5131846588686178907">"Utilizați ART"</item>
- <item msgid="4530003713865319928">"Utilizați ART, versiunea de depanare"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64K/tampon jurnal"</item>
+ <item msgid="2822309747675758628">"256K/tampon jurnal"</item>
+ <item msgid="6699306198357496731">"1M/tampon jurnal"</item>
+ <item msgid="5748528643937500349">"4M/tampon jurnal"</item>
+ <item msgid="1978629051085111592">"16M/tampon jurnal"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Nu verifica niciodată"</item>
@@ -483,4 +405,26 @@
<item msgid="5656544177755411222">"Întreruperi limitate"</item>
<item msgid="8735337502532332056">"Zero întreruperi"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normală"</item>
+ <item msgid="866544120205026771">"Moderată"</item>
+ <item msgid="7851902244436886890">"Scăzută"</item>
+ <item msgid="3022922196817563960">"Critică"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Permanent"</item>
+ <item msgid="5779398140277006695">"Activitate principală"</item>
+ <item msgid="1439598363694578255">"Important (în prim-plan)"</item>
+ <item msgid="3396458970745718652">"Important (în fundal)"</item>
+ <item msgid="5214825238247511992">"Backup"</item>
+ <item msgid="311372689168254967">"Complex"</item>
+ <item msgid="7438189122367820362">"Serviciu (în curs)"</item>
+ <item msgid="918687422516982498">"Serviciu (repornește)"</item>
+ <item msgid="6807727069641853029">"Receptor"</item>
+ <item msgid="6782857406100845127">"Pornire"</item>
+ <item msgid="2860945127596974299">"Ultima activitate"</item>
+ <item msgid="8610560843693675830">"În cache (activitate)"</item>
+ <item msgid="4338089220026248848">"În cache (client de activitate)"</item>
+ <item msgid="6652164677254579050">"În cache (gol)"</item>
+ </string-array>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 3005a79..695c537 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Câmpul pentru port trebuie să fie necompletat în situaţia în care câmpul pentru gazdă este necompletat."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Portul introdus nu este valid."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy-ul HTTP este utilizat de browser, dar nu poate fi utilizat de alte aplicaţii."</string>
- <string name="proxy_url" msgid="2523518669129974654">"Adresa URL a fișierului PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"Adresă URL fișier PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Locaţie:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vecin:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Informaţii celulă:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Afișați informații profil la blocarea ecranului"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informații profil"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Locație"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Conturi"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Securitate"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Setaţi Locaţia mea, deblocarea ecranului, blocarea cardului SIM, blocarea stocării acreditărilor"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setaţi Locaţia mea, deblocarea ecranului, blocarea stocării acreditărilor"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Criptare"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Aşteptaţi criptarea tabletei. Finalizat <xliff:g id="PERCENT">^1</xliff:g>%."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Aşteptaţi criptarea telefonului. Finalizat <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Așteptați criptarea tabletei. Finalizat: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Așteptați criptarea telefonului. Finalizat: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Încercaţi din nou peste <xliff:g id="DELAY">^1</xliff:g> (de) secunde."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Introduceţi parola"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Criptare nereuşită"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Nu doresc să se redea sunet la inserarea sau scoaterea tabletei din dispozitivul de andocare"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Nu redaţi sunetul la introducerea şi la scoaterea telefonului din dispozitivul de andocare"</string>
<string name="account_settings" msgid="6403589284618783461">"Conturi"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
+ <string name="category_work" msgid="8699184680584175622">"Serviciu"</string>
<string name="search_settings" msgid="1910951467596035063">"Căutaţi"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Gestionaţi setările şi istoricul căutărilor"</string>
<string name="display_settings" msgid="7965901687241669598">"Afişare"</string>
@@ -1320,6 +1325,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Opţiuni dezvoltator"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Setaţi opţiuni pentru dezvoltarea aplicaţiei"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Opțiunile de dezvoltator nu sunt disponibile pentru acest utilizator"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Setările VPN nu sunt disponibile pentru acest utilizator"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Setările pentru tethering nu sunt disponibile pentru acest utilizator"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Setările pentru „Nume puncte de acces” nu sunt disponibile pentru acest utilizator"</string>
<string name="enable_adb" msgid="7982306934419797485">"Depanare USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Mod de depanare când este conectat USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Revoc autorizații depanare USB"</string>
@@ -1329,12 +1337,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Ecranul nu va fi inactiv pe durata încărcării"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Activați jurnalul de examinare HCI Bluetooth"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Înregistrați toate pachetele HCI Bluetooth într-un fișier"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Select. mediul de execuție"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Select. mediul de execuție"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Reporniți pentru a schimba mediul de execuție de la <xliff:g id="OLD">%1$s</xliff:g> la <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certificare Ecran wireless"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Activare înscriere detaliată jurnal WiFi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Înlocuire WiFi cu mobil agresivă"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Se permite întotdeauna scanarea traficului WiFi"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Afișați opțiunile pentru certificarea Ecran wireless"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Creștere nivel de înscriere în jurnal Wifi, afișare SSID RSSI în Selector WiFi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Când este activată, conexiunea WiFi va fi mai agresivă la predarea conexiunii de date către mobil când semnalul WiFi este slab"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Permiteți/Nu permiteți scanarea traficului WiFi în funcție de traficul de date din interfață"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Dimensiunile tamponului Logger"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Sel. dimens. Logger/tampon jurnal"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Permiteţi locaţiile fictive"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Permiteţi locaţiile fictive"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Permiteţi depanarea USB?"</string>
@@ -1586,6 +1598,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Durată de rulare"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Servicii"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Durată"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Detalii despre memorie"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Stările memoriei"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Utilizarea memoriei"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Nucleu"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Nativă"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Cache-urile nucleului"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Schimb ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Disponibilă"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Total"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 ore"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 ore"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 ore"</string>
@@ -1683,9 +1704,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Eliminaţi toate certificatele"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Acreditări de încredere"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Afişaţi certificatele CA de încredere"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Setări avansate"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Tip de stocare"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Stocare hardware"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Stocare software"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Datele de conectare nu sunt disponibile pentru acest utilizator"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Desenaţi modelul pentru deblocare"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Trebuie să desenaţi modelul pentru deblocare pentru a confirma instalarea acreditării."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1766,6 +1789,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Atingeți "<b>"Înainte"</b>" pentru a continua configurarea.\n\nAtingeți "<b>"Înapoi"</b>" pentru a vă conecta la altă rețea Wi-Fi."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sincronizare activată"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sincronizare dezactivată"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Se sincronizează acum…"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Eroare de sincronizare."</string>
<string name="sync_failed" msgid="1696499856374109647">"Sincronizare eşuată"</string>
<string name="sync_active" msgid="8476943765960863040">"Sincronizare activă"</string>
@@ -1858,8 +1882,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Afişaţi limitele clipului, marginile etc."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Direcție aspect dr. - st."</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Direcție obligatorie aspect ecran dreapta - stânga"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Modul Consum scăzut"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Activați setările de economisire a bateriei"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Afişaţi utiliz. procesor."</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Suprap. pe ecran indic. util. curentă a procesor."</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Forţaţi redarea cu GPU"</string>
@@ -2136,9 +2158,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Afișați integral conținutul notificărilor"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ascundeți conținutul confidențial din notificări"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Nu afișați nicio notificare"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Când este activată setarea „Nu deranjați”"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ascundeți notificările noi din listă"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Afișați toate notificările din listă"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Notificări despre aplicații"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Alte sunete"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Tonuri pentru tastatura numerică"</string>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index 4846449..edf0161 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Нет"</item>
<item msgid="8673874894887358090">"Вручную"</item>
+ <item msgid="168893341855953140">"Автоконфигурация прокси"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Нет"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"громкость будильника"</item>
<item msgid="785049718065337473">"громкость уведомлений"</item>
<item msgid="6700305533746877052">"громкость Bluetooth-устройств"</item>
- <item msgid="2029227495214047094">"не отключать"</item>
- <item msgid="26109888160231211">"Отслеживать местоположение"</item>
- <item msgid="5753382310468855812">"контролировать использование энергии при определении местоположения"</item>
+ <item msgid="3810969981743709839">"включить/отключить микрофон"</item>
+ <item msgid="2627903914574908209">"не отключать"</item>
+ <item msgid="1395372654968157578">"отслеживать местоположение"</item>
+ <item msgid="3238451051299611853">"контролировать использование заряда батареи при определении местоположения"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Местоположение"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Громкость будильника"</item>
<item msgid="9103719301075748925">"Громкость уведомлений"</item>
<item msgid="7025966722295861512">"Громкость Bluetooth-устройств"</item>
- <item msgid="4665183401128289653">"Не отключать"</item>
- <item msgid="8584357129746649222">"Местоположение"</item>
+ <item msgid="2265317984004577529">"Включить/отключить микрофон"</item>
+ <item msgid="3646325683886507917">"Не отключать"</item>
<item msgid="7669257279311110599">"Определение местоположения"</item>
+ <item msgid="7745724368696313169">"Местоположение"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Небольшая"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Желтый на синем"</item>
<item msgid="7169235156349580064">"Специальный"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (отладка)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 КБ"</item>
+ <item msgid="505611754508988476">"256 КБ"</item>
+ <item msgid="6361286924268716397">"1 МБ"</item>
+ <item msgid="6405203239560695266">"4 МБ"</item>
+ <item msgid="3025431211013424097">"16 МБ"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Использовать Dalvik"</item>
- <item msgid="5131846588686178907">"Использовать ART"</item>
- <item msgid="4530003713865319928">"Использовать отладочную версию ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"Буфер: макс. 64 КБ"</item>
+ <item msgid="2822309747675758628">"Буфер: макс. 256 КБ"</item>
+ <item msgid="6699306198357496731">"Буфер: макс. 1 МБ"</item>
+ <item msgid="5748528643937500349">"Буфер: макс. 4 МБ"</item>
+ <item msgid="1978629051085111592">"Буфер: макс. 16 МБ"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Никогда не проверять"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Ограниченное число прерываний"</item>
<item msgid="8735337502532332056">"Без прерываний"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Нормальное"</item>
+ <item msgid="866544120205026771">"Умеренное"</item>
+ <item msgid="7851902244436886890">"Низкое"</item>
+ <item msgid="3022922196817563960">"Высокое"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Стабильное"</item>
+ <item msgid="5779398140277006695">"Наиболее частое действие"</item>
+ <item msgid="1439598363694578255">"Важное (активный режим)"</item>
+ <item msgid="3396458970745718652">"Важное (фоновый режим)"</item>
+ <item msgid="5214825238247511992">"Резервное копирование"</item>
+ <item msgid="311372689168254967">"Большой объем данных"</item>
+ <item msgid="7438189122367820362">"Служба (работает)"</item>
+ <item msgid="918687422516982498">"Служба (перезапуск)"</item>
+ <item msgid="6807727069641853029">"Получатель"</item>
+ <item msgid="6782857406100845127">"Главная"</item>
+ <item msgid="2860945127596974299">"Последнее действие"</item>
+ <item msgid="8610560843693675830">"Кешировано (действие)"</item>
+ <item msgid="4338089220026248848">"Кешировано (клиент)"</item>
+ <item msgid="6652164677254579050">"Кешировано (пусто)"</item>
+ </string-array>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8ea4a01..8a919ec 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Если поле хоста не заполнено, поле порта также следует оставить пустым."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Указанный порт недействителен."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Прокси-сервер HTTP используется браузером, но недоступен для других приложений."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL файла автоконфигурации прокси-сервера: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL автоконфигурации прокси "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Местоположение:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Соседний CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Индекс сети:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Показывать информацию профиля на заблокированном экране"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Информация профиля"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Местоположение"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Аккаунты"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Безопасность"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Настройка функции \"Мое местоположение\", разблокировка экрана и блокировка хранилища регистрационных данных"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифрование"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Дождитесь завершения шифрования планшета. Выполнено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Дождитесь завершения шифрования телефона. Выполнено: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Шифрование завершится через <xliff:g id="DURATION">^1</xliff:g>."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Шифрование завершится через <xliff:g id="DURATION">^1</xliff:g>."</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Повторите попытку через <xliff:g id="DELAY">^1</xliff:g> с."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Введите пароль"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Сбой шифрования"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Не воспроизводить звук при установке или извлечении планшетного ПК из док-станции"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Не воспроизводить звук при установке или извлечении телефона"</string>
<string name="account_settings" msgid="6403589284618783461">"Аккаунты"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Личные данные"</string>
+ <string name="category_work" msgid="8699184680584175622">"Работа"</string>
<string name="search_settings" msgid="1910951467596035063">"Поиск"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Настроить параметры и управлять историей поиска"</string>
<string name="display_settings" msgid="7965901687241669598">"Экран"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Для разработчиков"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Настройка параметров для разработчиков"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Этому пользователю недоступны возможности разработчика"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Этот пользователь не может изменять настройки VPN"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Этот пользователь не может изменять настройки режима модема"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Этот пользователь не может изменять настройки точки доступа"</string>
<string name="enable_adb" msgid="7982306934419797485">"Отладка по USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Включить режим отладки при подключении к компьютеру по USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Запретить доступ для USB-отладки"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Во время зарядки экран будет всегда включен"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Включить журнал трансляции операций HCI Bluetooth"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сохранять все пакеты HCI Bluetooth в файле"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Выбрать среду выполнения"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Среда выполнения"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Перезагрузить устройство, чтобы сменить среду выполнения с <xliff:g id="OLD">%1$s</xliff:g> на <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Серт. беспроводн. мониторов"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Подробный журнал Wi-Fi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Переключать сигнал с Wi-Fi на моб. сеть"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Всегда разрешать поиск сетей Wi-Fi во время передачи данных"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Показывать параметры сертификации беспроводных мониторов"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Вести подробный журнал Wi-Fi (показывать значение RSSI для каждой сети)"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Принудительно переключаться на мобильную сеть, если сигнал Wi-Fi слабый"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Включать или отключать поиск сетей Wi-Fi во время передачи данных в зависимости от объема трафика"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Размер буфера журнала"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Выберите размер буфера журнала"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Фиктивные местоположения"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Разрешить использование фиктивных местоположений"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Разрешить отладку USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Время работы"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Сервисы"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Период"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Подробности"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Состояние памяти"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Использование памяти"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Ядро"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Собственные процессы"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Кеш ядра"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Замена ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Свободно"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Итого"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 ч."</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 ч."</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 ч."</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Удалить все сертификаты"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Надежные сертификаты"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Показывать надежные сертификаты ЦС"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Дополнительные настройки"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Тип хранилища"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Аппаратное"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Только программное"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Этот пользователь не может изменять учетные данные"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Начертите графический ключ"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Чтобы подтвердить установку учетных данных, начертите графический ключ."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Нажмите "<b>"Далее"</b>", чтобы продолжить настройку.\n\nНажмите "<b>"Назад"</b>", чтобы подключиться к другой сети Wi‑Fi."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизация включена"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизация отключена"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Идет синхронизация."</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Ошибка синхронизации."</string>
<string name="sync_failed" msgid="1696499856374109647">"Ошибка синхронизации"</string>
<string name="sync_active" msgid="8476943765960863040">"Синхронизация активна"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Показывать границы клипа, поля и т. д."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Написание справа налево"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Включить написание справа налево для всех языков"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Энергосберегающий режим"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Экономный расход заряда батареи"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Показывать загрузку ЦП"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Экран, показывающий текущую загрузку ЦП"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"GPU-ускорение"</string>
@@ -2137,9 +2159,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показывать все уведомления"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Не показывать конфиденциальные данные"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Не показывать уведомления"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"В режиме \"Не беспокоить\""</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Скрывать новые уведомления"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Показывать все уведомления"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Уведомления приложений"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Другие звуки"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Звук клавиш"</string>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index 6f85f7d..ed6303e 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Žiadne"</item>
<item msgid="8673874894887358090">"Ručne"</item>
+ <item msgid="168893341855953140">"Auto. konfig. serv. proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Žiadne"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"hlasitosť budíka"</item>
<item msgid="785049718065337473">"hlasitosť upozornení"</item>
<item msgid="6700305533746877052">"hlasitosť bluetooth"</item>
- <item msgid="2029227495214047094">"zakázať režim spánku"</item>
- <item msgid="26109888160231211">"sledovať polohu"</item>
- <item msgid="5753382310468855812">"sledovanie polohy s vysokým výkonnom"</item>
+ <item msgid="3810969981743709839">"stlmenie alebo zrušenie stlmenia mikrofónu"</item>
+ <item msgid="2627903914574908209">"zakázanie režimu spánku"</item>
+ <item msgid="1395372654968157578">"sledovanie polohy"</item>
+ <item msgid="3238451051299611853">"sledovanie polohy s vysokým výkonnom"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Poloha"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Hlasitosť budíka"</item>
<item msgid="9103719301075748925">"Hlasitosť upozornení"</item>
<item msgid="7025966722295861512">"Hlasitosť zariadenia Bluetooth"</item>
- <item msgid="4665183401128289653">"Zakázať režim spánku"</item>
- <item msgid="8584357129746649222">"Poloha"</item>
+ <item msgid="2265317984004577529">"Stlmenie alebo zrušenie stlmenia mikrofónu"</item>
+ <item msgid="3646325683886507917">"Zakázanie režimu spánku"</item>
<item msgid="7669257279311110599">"Poloha"</item>
+ <item msgid="7745724368696313169">"Poloha"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Krátka"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Žlté na modrom"</item>
<item msgid="7169235156349580064">"Vlastné"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (ladenie)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 kB"</item>
+ <item msgid="505611754508988476">"256 kB"</item>
+ <item msgid="6361286924268716397">"1 MB"</item>
+ <item msgid="6405203239560695266">"4 MB"</item>
+ <item msgid="3025431211013424097">"16 MB"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Použiť nástroj Dalvik"</item>
- <item msgid="5131846588686178907">"Použiť nástroj ART"</item>
- <item msgid="4530003713865319928">"Použiť zostavu na ladenie programu ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 kB na vyrovn. pamäť denníka"</item>
+ <item msgid="2822309747675758628">"256 kB na vyrovn. pamäť denníka"</item>
+ <item msgid="6699306198357496731">"1 MB na vyrovn. pamäť denníka"</item>
+ <item msgid="5748528643937500349">"4 MB na vyrovn. pamäť denníka"</item>
+ <item msgid="1978629051085111592">"16 MB na vyrovn. pamäť denníka"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Nikdy nekontrolovať"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Obmedzený počet prerušení"</item>
<item msgid="8735337502532332056">"Žiadne prerušenia"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normálny"</item>
+ <item msgid="866544120205026771">"Stredný"</item>
+ <item msgid="7851902244436886890">"Nízky"</item>
+ <item msgid="3022922196817563960">"Kritický"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Pretrvávajúci"</item>
+ <item msgid="5779398140277006695">"Najčastejšia aktivita"</item>
+ <item msgid="1439598363694578255">"Dôležitý (v popredí)"</item>
+ <item msgid="3396458970745718652">"Dôležitý (v pozadí)"</item>
+ <item msgid="5214825238247511992">"Záloha"</item>
+ <item msgid="311372689168254967">"Vysoké vyťaženie"</item>
+ <item msgid="7438189122367820362">"Služba (spustená)"</item>
+ <item msgid="918687422516982498">"Služba (reštartuje sa)"</item>
+ <item msgid="6807727069641853029">"Prijímač"</item>
+ <item msgid="6782857406100845127">"Plocha"</item>
+ <item msgid="2860945127596974299">"Posledná aktivita"</item>
+ <item msgid="8610560843693675830">"Vo vyrovnávacej pamäti (aktivita)"</item>
+ <item msgid="4338089220026248848">"Vo vyrovnávacej pamäti (klient aktivity)"</item>
+ <item msgid="6652164677254579050">"Vo vyrovnávacej pamäti (prázdne)"</item>
+ </string-array>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 71a9314..007532d 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ak je pole hostiteľ prázdne, musí byť prázdne aj pole port."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Zadaný port nie je platný."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Prehliadač používa server proxy pre protokol HTTP, ale ostatné aplikácie ho používať nemusia."</string>
- <string name="proxy_url" msgid="2523518669129974654">"Adresa URL PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"Adresa URL PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Poloha:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Susedný identifikátor CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Zobraziť inform. o profile na uzamknutej obrazovke"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Informácie o profile"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Poloha"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Účty"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Zabezpečenie"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Moja poloha, odomknutie obrazovky, zámok SIM, zámok ukladacieho priestoru poverení"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavenie funkcie Moje poloha, odomknutie obrazovky a zamknutie úložiska poverení"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifrovanie"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Čakajte na dokončenie procesu šifrovania tabletu. Dokončené: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Čakajte na dokončenie šifrovania telefónu. Dokončené: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Počkajte na dokončenie šifrovania tabletu. Zostávajúci čas: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Počkajte na dokončenie šifrovania telefónu. Zostávajúci čas: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Počet sekúnd zostávajúcich do ďalšieho pokusu: <xliff:g id="DELAY">^1</xliff:g>."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Zadajte svoje heslo"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifrovanie bolo neúspešné"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Neprehrávať zvuk pri vkladaní alebo odstraňovaní tabletu z doku"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Neprehrávať zvuk pri vkladaní alebo odstraňovaní telefónu z doku"</string>
<string name="account_settings" msgid="6403589284618783461">"Účty"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Osobné"</string>
+ <string name="category_work" msgid="8699184680584175622">"Práca"</string>
<string name="search_settings" msgid="1910951467596035063">"Hľadať"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Správa nastavení a histórie vyhľadávaní"</string>
<string name="display_settings" msgid="7965901687241669598">"Zobrazenie"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Možnosti pre vývojárov"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Možnosti nastavenia vývoja aplikácií"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Pre tohto používateľa sú možnosti vývojára nedostupné"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Nastavenia vzdialeného pripojenia VPN nie sú dostupné pre tohto používateľa"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Nastavenia zdieľania dátového pripojenia nie sú dostupné pre tohto používateľa"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Nastavenia názvu prístupového bodu (APN) nie sú dostupné pre tohto používateľa"</string>
<string name="enable_adb" msgid="7982306934419797485">"Ladenie USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Režim ladenia behom pripojenia cez USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Odvolanie autorizácií na ladenie USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Obrazovka sa pri nabíjaní neprepne do režimu spánku"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Povoliť sledovanie Bluetooth HCI"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zaznamenať všetky pakety Bluetooth HCI do súboru"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Výber modulu spustenia"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Výber modulu spustenia"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Chcete vykonať reštart a zmeniť čas spustenia z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certifikácia bezdrôtového displeja"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Povoliť zapis. do denníka prostr. Wi-Fi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Agres. odovzdávať Wi-Fi na mobilnú sieť"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Vždy povoliť funkciu Wifi Roam Scans"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Zobraziť možnosti certifikácie bezdrôtového displeja"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Zvýšiť úroveň zapis. do denníka prostr. Wi-Fi, zobraziť vo výbere Wi-Fi RSSI pre SSID"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Keď túto možnosť povolíte, sieť Wi-Fi bude agresívnejšie odovzdávať dátové pripojenie na mobilnú sieť vtedy, keď bude slabý signál Wi-Fi"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Povoľte alebo zakážte funkciu Wifi Roam Scans na základe objemu prenosu údajov v rozhraní"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Veľkosti vyrovnávacej pamäte denníka"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Veľkosti den. na vyrov. pamäť den."</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Povoliť simulované polohy"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Povoliť simulované polohy"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Povoliť ladenie USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Spustené"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Služby"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trvanie"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Podrobnosti o pamäti"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Stavy pamäte"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Využitie pamäte"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Natívne"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Vyrovnávacie pamäte jadra Kernel"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Zadarmo"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Celkové"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 hodiny"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 hodín"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 hodín"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Odstrániť všetky certifikáty"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Dôveryhodné poverenia"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Zobraziť dôveryhodné certifikáty CA"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Rozšírené"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Typ úložiska"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardvérové"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Iba softvérový"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Poverenia nie sú pre tohto používateľa k dispozícii"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Nakreslite bezpečnostný vzor"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Inštaláciu poverení je potrebné potvrdiť nakreslením bezpečnostného vzoru."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Ak chcete pokračovať v nastavovaní, dotknite sa možnosti "<b>"Ďalej"</b>".\n\nAk sa chcete pripojiť k inej sieti Wi-Fi, dotknite sa možnosti "<b>"Späť"</b>"."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Synchronizácia je povolená"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synchronizácia bola zakázaná"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Prebieha synchronizácia"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Chyba synchronizácie"</string>
<string name="sync_failed" msgid="1696499856374109647">"Synchronizácia zlyhala"</string>
<string name="sync_active" msgid="8476943765960863040">"Synchronizácia je aktívna"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Zobraziť v klipe ohraničenie, okraje a pod."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Rozloženia sprava doľava"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Vynútiť pre všetky jazyky rozloženie obrazovky sprava doľava"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Režim nízkej spotreby"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Povoliť nastavenia úspory batérie"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Zobraziť využitie CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekryvná vrstva s aktuálnym využitím procesora"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Vykresľovat pomocou GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Zobraziť všetok obsah upozornení"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skryť citlivý obsah upozornení"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Nezobrazovať upozornenia"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Keď je zapnutý stav Nerušiť"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Nezobrazovať nové upozornenia v zozname"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Zobraziť všetky upozornenia v zozname"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Upozornenia aplikácií"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Iné zvuky"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Zvuky číselnej klávesnice"</string>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index 4288fec..257e376 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Brez"</item>
<item msgid="8673874894887358090">"Ročno"</item>
+ <item msgid="168893341855953140">"Sam. kon. strežnika proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Brez"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"glasnost alarma"</item>
<item msgid="785049718065337473">"glasnost obvestila"</item>
<item msgid="6700305533746877052">"glasnost za Bluetooth"</item>
- <item msgid="2029227495214047094">"ohrani odklenjen zaslon"</item>
- <item msgid="26109888160231211">"spremljanje lokacije"</item>
- <item msgid="5753382310468855812">"nadzor natančno določene lokacije"</item>
+ <item msgid="3810969981743709839">"izklop/vklop mikrofona"</item>
+ <item msgid="2627903914574908209">"ohranjanje odklenjenega zaslona"</item>
+ <item msgid="1395372654968157578">"nadzor lokacije"</item>
+ <item msgid="3238451051299611853">"nadzor natančno določene lokacije"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Lokacija"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Glasnost alarma"</item>
<item msgid="9103719301075748925">"Glasnost obvestila"</item>
<item msgid="7025966722295861512">"Glasnost Bluetootha"</item>
- <item msgid="4665183401128289653">"Ohrani odklenjen zaslon"</item>
- <item msgid="8584357129746649222">"Lokacija"</item>
+ <item msgid="2265317984004577529">"Izklop/vklop mikrofona"</item>
+ <item msgid="3646325683886507917">"Ohranjanje odklenjenega zaslona"</item>
<item msgid="7669257279311110599">"Lokacija"</item>
+ <item msgid="7745724368696313169">"Lokacija"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Kratko"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Rumeno na modrem"</item>
<item msgid="7169235156349580064">"Po meri"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (iskanje napak)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 K"</item>
+ <item msgid="505611754508988476">"256 K"</item>
+ <item msgid="6361286924268716397">"1 M"</item>
+ <item msgid="6405203239560695266">"4 M"</item>
+ <item msgid="3025431211013424097">"16 M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Uporabi Dalvik"</item>
- <item msgid="5131846588686178907">"Uporabi ART"</item>
- <item msgid="4530003713865319928">"Uporabi različico za iskanje napak ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 K/medpom. dnevn."</item>
+ <item msgid="2822309747675758628">"256 K/medpom. dnev."</item>
+ <item msgid="6699306198357496731">"1 M/medpom. dnevn."</item>
+ <item msgid="5748528643937500349">"4 M/medpom. dnevn."</item>
+ <item msgid="1978629051085111592">"16 M/medpom. dnevn."</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Nikoli ne preveri"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Omejene prekinitve"</item>
<item msgid="8735337502532332056">"Nič prekinitev"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Običajno"</item>
+ <item msgid="866544120205026771">"Zmerno"</item>
+ <item msgid="7851902244436886890">"Nizko"</item>
+ <item msgid="3022922196817563960">"Resno"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Trajno"</item>
+ <item msgid="5779398140277006695">"Najpogostejša dejavnost"</item>
+ <item msgid="1439598363694578255">"Pomembno (v ospredju)"</item>
+ <item msgid="3396458970745718652">"Pomembno (v ozadju)"</item>
+ <item msgid="5214825238247511992">"Varnostno kopiranje"</item>
+ <item msgid="311372689168254967">"Zahtevno"</item>
+ <item msgid="7438189122367820362">"Storitev (izvajanje)"</item>
+ <item msgid="918687422516982498">"Storitev (vnovičen zagon)"</item>
+ <item msgid="6807727069641853029">"Sprejemnik"</item>
+ <item msgid="6782857406100845127">"Začetni zaslon"</item>
+ <item msgid="2860945127596974299">"Zadnja dejavnost"</item>
+ <item msgid="8610560843693675830">"Predpomnjeno (dejavnost)"</item>
+ <item msgid="4338089220026248848">"Predpomnjeno (odjemalec dejavnosti)"</item>
+ <item msgid="6652164677254579050">"Predpomnjeno (prazno)"</item>
+ </string-array>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index f77f24e..1a7012c 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Če je polje za gostitelja prazno, mora biti prazno tudi polje za vrata."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Vtipkana številka vrat je neveljavna."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP lahko uporablja brskalnik, drugi programi pa ne."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL datoteke PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL datoteke PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokacija:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID v bližini:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Podatki o celici:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Pokaži podatke o profilu na zaklenjenem zaslonu"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Podatki o profilu"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Lokacija"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Računi"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Varnost"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Nastavi Mojo lokacijo, odklepanje zaslona, zaklepanje kartice SIM, zaklepanje shrambe poverilnic"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Nastavitev Moje lokacije, odklepanja zaslona, zaklepanja shrambe poverilnic"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Šifriranje"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Počakajte, tablični računalnik se šifrira. Dokončano: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Počakajte, telefon se šifrira. Dokončano: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Počakajte, poteka šifriranje tabličnega računalnika. Preostane še: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Počakajte, poteka šifriranje telefona. Preostane še: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Poskusite znova čez <xliff:g id="DELAY">^1</xliff:g> sekund."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Vnesite geslo"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Šifriranje ni uspelo"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ne predvajaj zvoka med vstavljanjem tabličnega računalnika v stojalo ali odstranjevanjem iz njega"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ne predvajaj zvoka pri vstavitvi telefona v stojalo ali odstranitvi iz njega"</string>
<string name="account_settings" msgid="6403589284618783461">"Računi"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Osebno"</string>
+ <string name="category_work" msgid="8699184680584175622">"Služba"</string>
<string name="search_settings" msgid="1910951467596035063">"Iskanje"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Upravljaj nastavitve iskanja in zgodovine"</string>
<string name="display_settings" msgid="7965901687241669598">"Prikaz"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Možnosti za razvijalce"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Nastavi možnosti za razvoj programov"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Možnosti razvijalca niso na voljo za tega uporabnika"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Nastavitve VPN niso na voljo za tega uporabnika"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Nastavitve za povezavo z internetom prek mobilne naprave niso na voljo za tega uporabnika"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Nastavitve imena dostopne točke niso na voljo za tega uporabnika"</string>
<string name="enable_adb" msgid="7982306934419797485">"Odpravljanje težav s povezavo USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Način za odpravljanje težav, ko je vzpostavljena povezava USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Preklic dovoljenj za odpravljanje težav prek povezave USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Med polnjenjem se zaslon ne bo nikoli zaklenil"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Omogoči dnevnik vohljanja Bluetooth HCI"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Zajemi vse pakete Bluetooth HCI v datoteko"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Izbira izvajalnika"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Izbira izvajalnika"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Želite napravo znova zagnati, da se različica izvajalnika spremeni z <xliff:g id="OLD">%1$s</xliff:g> na <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Potrdilo brezžičnega zaslona"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Omogoči podr. zapis. dnevnika za Wi-Fi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Odločna predaja Wi-Fi-ja mobil. omrežju"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Vedno omogoči iskanje omrežij Wi-Fi za gostovanje"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Pokaži možnosti za potrdilo brezžičnega zaslona"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Povečaj raven zapis. dnevn. za Wi-Fi; v izbirniku za Wi-Fi prikaži po SSID RSSI"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Če je omogočeno, Wi-Fi odločneje predaja podatkovno povezavo mobilnemu omrežju, ko je signal Wi-Fi šibek"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Omogoči/onemogoči iskanje omrežij Wi-Fi za gostovanje glede na količino podatkovnega prometa pri vmesniku"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Velikosti medpomnilnikov zapisovalnika dnevnika"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Velik. zap. dnev. za medpom. dnev."</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Dovoli lažne lokacije"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Dovoli lažne lokacije"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Ali dovolite odpravljanje težav s povezavo USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Trajanje izvajanja"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Storitve"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Trajanje"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Podrobnosti pomnilnika"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Stanja pomnilnika"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Uporaba pomnilnika"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Jedro"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Izvorno"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Predpomnjeno v jedru"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Zamenjava pomnilnika ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Prosto"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Skupaj"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 ure"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 ur"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 ur"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Odstrani vsa potrdila"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Preverjene poverilnice"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Prikaži zaupanja vredna potrdila overiteljev"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Dodatno"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Vrsta shrambe"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Strojna"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Samo programska"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Za tega uporabnika niso na voljo poverilnice"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Narišite vzorec za odklepanje"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Če želite potrditi ponastavitev na tovarniške nastavitve, morate narisati vzorec za odklepanje."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Če želite nadaljevati namestitev, se dotaknite "<b>"Naprej"</b>".\n\nČe se želite povezati z drugim omrežjem Wi-Fi, se dotaknite "<b>"Nazaj"</b>"."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Sinhronizacija omogočena"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Sinhronizacija onemogočena"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Sinhronizacija poteka"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Napaka pri sinhronizaciji"</string>
<string name="sync_failed" msgid="1696499856374109647">"Sinhronizacija ni uspela"</string>
<string name="sync_active" msgid="8476943765960863040">"Sinhronizacija je aktivna"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Pokaži meje obrezovanja, obrobe ipd."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Vsili od desne proti levi"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Vsili smer postavitve na zaslonu od desne proti levi za vse jezike"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Način nizke porabe"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Omogoči nast. varčevanja z energijo akumulatorja"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Prikaži uporabo CPE-ja"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Prekrivanje zaslona prikazuje tren. uporabo CPE-ja"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Vsili upodabljanje z GPU-jem"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Pokaži vso vsebino obvestil"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Skrij občutljivo vsebino obvestil"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Ne prikazuj obvestil"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Ko je vklopljena funkcija »Ne moti«"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Skrij nova obvestila na seznamu"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Prikaži vsa obvestila na seznamu"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Obvestila aplikacij"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Drugi zvoki"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Toni tipkovnice"</string>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 3e569d9..3fe8f5d 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Ништа"</item>
<item msgid="8673874894887358090">"Ручно"</item>
+ <item msgid="168893341855953140">"Аутом. конфиг. проксија"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Ништа"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"јачина звука аларма"</item>
<item msgid="785049718065337473">"јачина звука обавештења"</item>
<item msgid="6700305533746877052">"јачина звука Bluetooth-а"</item>
- <item msgid="2029227495214047094">"задржавање ван стања спавања"</item>
- <item msgid="26109888160231211">"праћење локације"</item>
- <item msgid="5753382310468855812">"надгледање локације са високим напоном"</item>
+ <item msgid="3810969981743709839">"искључи/укључи звук микрофона"</item>
+ <item msgid="2627903914574908209">"задржи ван стања спавања"</item>
+ <item msgid="1395372654968157578">"прати локацију"</item>
+ <item msgid="3238451051299611853">"прати локацију са високим напоном"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Локација"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Јачина звука аларма"</item>
<item msgid="9103719301075748925">"Јачина звука обавештења"</item>
<item msgid="7025966722295861512">"Јачина звука Bluetooth-а"</item>
- <item msgid="4665183401128289653">"Задржи ван стања спавања"</item>
- <item msgid="8584357129746649222">"Локација"</item>
+ <item msgid="2265317984004577529">"Искључи/укључи звук микрофона"</item>
+ <item msgid="3646325683886507917">"Задржи ван стања спавања"</item>
<item msgid="7669257279311110599">"Локација"</item>
+ <item msgid="7745724368696313169">"Локација"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Кратко"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Жуто на плаво"</item>
<item msgid="7169235156349580064">"Прилагођена"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (отклањање грешака)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 kB"</item>
+ <item msgid="505611754508988476">"256 kB"</item>
+ <item msgid="6361286924268716397">"1 MB"</item>
+ <item msgid="6405203239560695266">"4 MB"</item>
+ <item msgid="3025431211013424097">"16 MB"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Коришћење Dalvik-а"</item>
- <item msgid="5131846588686178907">"Коришћење ART-а"</item>
- <item msgid="4530003713865319928">"Коришћење ART верзије за отклањање грешака"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 kB по баферу евиденције"</item>
+ <item msgid="2822309747675758628">"256 kB по баферу евиденције"</item>
+ <item msgid="6699306198357496731">"1 MB по баферу евиденције"</item>
+ <item msgid="5748528643937500349">"4 MB по баферу евиденције"</item>
+ <item msgid="1978629051085111592">"16 MB по баферу евиденције"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Никад не проверавај"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Ограничен број прекида"</item>
<item msgid="8735337502532332056">"Без прекида"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Нормална"</item>
+ <item msgid="866544120205026771">"Умерена"</item>
+ <item msgid="7851902244436886890">"Ниска"</item>
+ <item msgid="3022922196817563960">"Критична"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Непрекидна"</item>
+ <item msgid="5779398140277006695">"Највећа активност"</item>
+ <item msgid="1439598363694578255">"Важна (први план)"</item>
+ <item msgid="3396458970745718652">"Важна (други план)"</item>
+ <item msgid="5214825238247511992">"Резервна копија"</item>
+ <item msgid="311372689168254967">"Тешка"</item>
+ <item msgid="7438189122367820362">"Услуга (активна)"</item>
+ <item msgid="918687422516982498">"Услуга (поново се покреће)"</item>
+ <item msgid="6807727069641853029">"Пријемник"</item>
+ <item msgid="6782857406100845127">"Почетна"</item>
+ <item msgid="2860945127596974299">"Последња активност"</item>
+ <item msgid="8610560843693675830">"Кеширана (активност)"</item>
+ <item msgid="4338089220026248848">"Кеширана (клијент активности)"</item>
+ <item msgid="6652164677254579050">"Кеширана (празно)"</item>
+ </string-array>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index b278cbd..6eeea38 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Поље за порт мора да буде празно ако је поље за назив хоста празно."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Унели сте неважећи порт."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Прегледач користи HTTP прокси, али друге апликације не могу да га користе."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Локација:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Суседни ИД клијента:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Информације о ћелији:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Прикажи податке о профилу на закључаном екрану"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Подаци о профилу"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Локација"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Налози"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Безбедност"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Подешавање Моје локације, откључавања екрана, закључавања SIM картице и закључавања акредитива складишта"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Подешавање Моје локације, откључавања екрана, закључавања складишта акредитива"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифровање"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Сачекајте да се таблет шифрује. Довршено је <xliff:g id="PERCENT">^1</xliff:g>%."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Сачекајте да се телефон шифрује. Довршено је <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Сачекајте док се таблет шифрује. Преостало време: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Сачекајте док се телефон шифрује. Преостало време: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Покушајте поново за <xliff:g id="DELAY">^1</xliff:g> секунди."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Унесите лозинку"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифровање није успело"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Не репродукуј звук приликом постављања таблета на базну станицу или уклањања са ње"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Не пуштај звук приликом уметања телефона на постоље или уклањања са њега"</string>
<string name="account_settings" msgid="6403589284618783461">"Налози"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Лично"</string>
+ <string name="category_work" msgid="8699184680584175622">"Посао"</string>
<string name="search_settings" msgid="1910951467596035063">"Претрага"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Управљање подешавањима претраге и историјом"</string>
<string name="display_settings" msgid="7965901687241669598">"Приказ"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Опције за програмера"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Подешавање опција за програмирање апликације"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Опције за програмере нису доступне за овог корисника"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Подешавања VPN-а нису доступна за овог корисника"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Подешавања привезивања нису доступна за овог корисника"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Подешавања назива приступне тачке нису доступна за овог корисника"</string>
<string name="enable_adb" msgid="7982306934419797485">"Отклањање USB грешака"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Режим отклањања грешака када је USB повезан"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Опозивање одобрења за уклањање USB грешака"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Екран неће бити у режиму спавања током пуњења"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Омогући snoop евиденцију за Bluetooth HCI"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Сними све Bluetooth HCI пакете у датотеци"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Избор времена извршавања"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Избор времена извршавања"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Желите ли да поново покренете уређај да бисте променили време извршавања из <xliff:g id="OLD">%1$s</xliff:g> у <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Сертификација бежичног екрана"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Омогући опширно пријављивање преко WiFi-ја"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Агресивна предаја са Wi-Fi-ја на мобилни"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Увек дозвољавај скенирање Wi-Fi-ја у ромингу"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Приказ опција за сертификацију бежичног екрана"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Повећај ниво пријављивања преко Wifi-ја, прикажи према SSID RSSI у WiFi Picker-у"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Када се омогући, Wi-Fi ће много агресивније предавати везу мобилној мрежи ако је Wi-Fi сигнал слаб"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Дозволи/забрани скенирање Wi-Fi-ја у ромингу на основу присутног протока података на интерфејсу."</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Величине бафера података у програму за евидентирање"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Изаберите величине по баферу евиденције"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Дозволи лажне локације"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Дозволи лажне локације"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Дозволи отклањање USB грешака?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Трајање"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Услуге"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Трајање"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Детаљи меморије"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Стања меморије"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Искоришћеност меморије"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Језгро"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Изворна"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Кешеви језгра"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Прелаз на ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Слободна"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Укупно"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 сата"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 сати"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 сати"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Уклањање свих сертификата"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Поуздани акредитиви"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Прикажи поуздане CA сертификате"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Напредна"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Тип складишног простора"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Подржан хардвером"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Само софтверски"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Акредитиви нису доступни за овог корисника"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Нацртајте шаблон за откључавање"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Потребно је да нацртате шаблон за откључавање да бисте потврдили инсталацију акредитива."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Додирните "<b>"Даље"</b>" да бисте наставили са подешавањем.\n\nДодирните "<b>"Назад"</b>" да бисте се повезали са другом Wi‑Fi мрежом."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронизација је омогућена"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронизација је онемогућена"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Синхронизација је у току"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Грешка при синхронизацији."</string>
<string name="sync_failed" msgid="1696499856374109647">"Синхронизација није успела"</string>
<string name="sync_active" msgid="8476943765960863040">"Синхронизација је активна"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Прикажи границе клипа, маргине итд."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Наметни смер распореда здесна налево"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Наметни смер распореда екрана здесна налево за све локалитете"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Режим ниског напајања"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Омогући подешавања уштеде батерије"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Прик. употребу процесора"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Постав. елемент са тренутном употребом процесора"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Принудни приказ пом. GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Прикажи сав садржај обавештења"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Сакриј осетљив садржај обавештења"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Не приказуј никаква обавештења"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Када је укључена опција „не узнемиравај“"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Сакриј нова обавештења са листе"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Приказуј сва обавештења на листи"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Обавештења апликација"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Други звукови"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Тонови нумеричке тастатуре"</string>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index 89365ae..5493d79 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Ingen"</item>
<item msgid="8673874894887358090">"Manuell"</item>
+ <item msgid="168893341855953140">"Autokonfig. av proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Inga"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"alarmvolym"</item>
<item msgid="785049718065337473">"meddelandevolym"</item>
<item msgid="6700305533746877052">"bluetooth-volym"</item>
- <item msgid="2029227495214047094">"behåll aktiv"</item>
- <item msgid="26109888160231211">"övervaka plats"</item>
- <item msgid="5753382310468855812">"övervaka batterikrävande plats"</item>
+ <item msgid="3810969981743709839">"stäng av/slå på mikrofonen"</item>
+ <item msgid="2627903914574908209">"behåll aktiv"</item>
+ <item msgid="1395372654968157578">"övervaka plats"</item>
+ <item msgid="3238451051299611853">"övervaka batterikrävande plats"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Plats"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Alarmvolym"</item>
<item msgid="9103719301075748925">"Meddelandevolym"</item>
<item msgid="7025966722295861512">"Bluetooth-volym"</item>
- <item msgid="4665183401128289653">"Behåll aktiv"</item>
- <item msgid="8584357129746649222">"Plats"</item>
+ <item msgid="2265317984004577529">"Stäng av/slå på mikrofonen"</item>
+ <item msgid="3646325683886507917">"Behåll aktiv"</item>
<item msgid="7669257279311110599">"Plats"</item>
+ <item msgid="7745724368696313169">"Plats"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Kort"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Gult på blått"</item>
<item msgid="7169235156349580064">"Anpassat"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (felsökning)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 kB"</item>
+ <item msgid="505611754508988476">"256 kB"</item>
+ <item msgid="6361286924268716397">"1 MB"</item>
+ <item msgid="6405203239560695266">"4 MB"</item>
+ <item msgid="3025431211013424097">"16 MB"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Använd Dalvik"</item>
- <item msgid="5131846588686178907">"Använd ART"</item>
- <item msgid="4530003713865319928">"Använd felsökningsversionen av ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 kB/loggbuffert"</item>
+ <item msgid="2822309747675758628">"256 kB/loggbuffert"</item>
+ <item msgid="6699306198357496731">"1 MB/loggbuffert"</item>
+ <item msgid="5748528643937500349">"4 MB/loggbuffert"</item>
+ <item msgid="1978629051085111592">"16 MB/loggbuffert"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Kontrollera aldrig"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Begränsade avbrott"</item>
<item msgid="8735337502532332056">"Inga avbrott"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normal"</item>
+ <item msgid="866544120205026771">"Måttlig"</item>
+ <item msgid="7851902244436886890">"Låg"</item>
+ <item msgid="3022922196817563960">"Kritisk"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Ihållande"</item>
+ <item msgid="5779398140277006695">"Toppaktivitet"</item>
+ <item msgid="1439598363694578255">"Viktig (förgrund)"</item>
+ <item msgid="3396458970745718652">"Viktig (bakgrund)"</item>
+ <item msgid="5214825238247511992">"Säkerhetskopia"</item>
+ <item msgid="311372689168254967">"Tungvikt"</item>
+ <item msgid="7438189122367820362">"Service (pågående)"</item>
+ <item msgid="918687422516982498">"Service (startar om)"</item>
+ <item msgid="6807727069641853029">"Mottagare"</item>
+ <item msgid="6782857406100845127">"Hem"</item>
+ <item msgid="2860945127596974299">"Senaste aktivitet"</item>
+ <item msgid="8610560843693675830">"Cachelagrad (aktivitet)"</item>
+ <item msgid="4338089220026248848">"Cachelagrad (aktivitetsklient)"</item>
+ <item msgid="6652164677254579050">"Cachelagrad (tom)"</item>
+ </string-array>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 90f420d..078a073 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Portfältet måste vara tomt om värdfältet är tomt."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Porten som du har angett är inte giltig."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyn används av webbläsaren men får inte användas av de andra apparna."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC-webbadress: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Plats:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Närliggande CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Cellinfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Visa profilinfo på den låsta skärmen"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profilinfo"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Plats"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Konton"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Säkerhet"</string>
<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>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Krypterar"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Vänta medan surfplattan krypteras. <xliff:g id="PERCENT">^1</xliff:g> % klart."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Vänta medan mobilen krypteras. <xliff:g id="PERCENT">^1</xliff:g> % klart."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Vänta tills surfplattan har krypterats. Återstående tid: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Vänta tills mobilen har krypterats. Återstående tid: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Försök igen om <xliff:g id="DELAY">^1</xliff:g> sekunder."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Ange ditt lösenord"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Krypteringen misslyckades"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Spela inte upp ljud när surfplattan placeras i eller tas bort från dockningsstation"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Spela inte upp ljud när telefonen placeras i eller tas bort från dockningsstation"</string>
<string name="account_settings" msgid="6403589284618783461">"Konton"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Personligt"</string>
+ <string name="category_work" msgid="8699184680584175622">"Arbetet"</string>
<string name="search_settings" msgid="1910951467596035063">"Sök"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Hantera sökinställningar och historik"</string>
<string name="display_settings" msgid="7965901687241669598">"Skärm"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Utvecklaralternativ"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Ange alternativ för apputveckling"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Utvecklaralternativ är inte tillgängliga för den här användaren"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN-inställningarna är inte tillgängliga för den här användaren"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Internetdelningsinställningarna är inte tillgängliga för den här användaren"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Inställningarna för åtkomstpunktnamn är inte tillgängliga för den här användaren"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB-felsökning"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Felsökningsläge när USB har anslutits"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Återkalla åtkomst till USB-felsökning"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Skärmen vilar aldrig när laddning pågår"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Aktivera HCI snoop-logg för Bluetooth"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Samla alla HCI-paket för Bluetooth i en fil"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Välj exekveringsmiljö"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Välj exekveringsmiljö"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Vill du starta om och ändra körningstiden från <xliff:g id="OLD">%1$s</xliff:g> till <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certifiering för Wi-Fi-skärmdelning"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Aktivera utförlig loggning för Wi-Fi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Aggressiv överlämning fr. Wi-Fi t. mobil"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Tillåt alltid sökning efter Wi-Fi-roaming"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Visa certifieringsalternativ för Wi-Fi-skärmdelning"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Utöka loggningsnivån för Wi-Fi och visa per SSID RSSI i Wi-Fi-väljaren"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"När funktionen har aktiverats blir överlämningen av dataanslutningen från Wi-Fi till mobil aggressivare när Wi-Fi-signalen är svag"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Tillåt/tillåt inte sökning efter Wi-Fi-roaming utifrån mängden datatrafik i gränssnittet"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Buffertstorlekar för logg"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Välj loggstorlekar per loggbuffert"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Tillåt skenplatser"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Tillåt skenplatser"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Ska USB-felsökning tillåtas?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Speltid"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Tjänster"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Längd"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Minnesinformation"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Minneslägen"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Minnesanvändning"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kärna"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Inbyggt"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Cacheminne (kärna)"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam-växling"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Gratis"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Totalt"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 timmar"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 timmar"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 timmar"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Ta bort alla certifikat"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Tillförlitlig autentisering"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Visa tillförlitliga CA-certifikat"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Avancerat"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Lagringstyp"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Maskinvarustöd"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Endast programvara"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Användaruppgifter är inte tillgängliga för den här användaren"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Rita ditt grafiska lösenord"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Du måste rita ditt grafiska lösenord för att bekräfta uppgifterna."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Tryck på "<b>"Nästa"</b>" om du vill fortsätta med installationen.\n\nTryck på "<b>"Tillbaka"</b>" om du vill ansluta till ett annat Wi-Fi-nätverk."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Synkronisering aktiverad"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Synkronisering inaktiverad"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Synkroniserar nu"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Synkroniseringsfel."</string>
<string name="sync_failed" msgid="1696499856374109647">"Det gick inte att synkronisera"</string>
<string name="sync_active" msgid="8476943765960863040">"Synkronisering är aktiverad"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Visa gränser för videoklipp, marginaler m.m."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Tvinga fram RTL-layout"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Tvinga fram RTL-skärmlayout (hö–vä) för alla språk"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Energisparläge"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Aktivera inställningar för energisparläge"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Visa CPU-användning"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Överlägg på skärmen med aktuell CPU-användning"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Framtvinga GPU-rendering"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Visa allt aviseringsinnehåll"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Dölj känsligt aviseringsinnehåll"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Visa inga aviseringar alls"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"När Stör ej har aktiverats"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Dölj nya aviseringar i listan"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Visa alla aviseringar i listan"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Appaviseringar"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Andra ljud"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Knappsatsljud"</string>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index b7e9371..cfdae49 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Hamna"</item>
<item msgid="8673874894887358090">"Mwongozo"</item>
+ <item msgid="168893341855953140">"Usanidi Kiotomatiki wa Seva Mbadala"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Hamna"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"sauti ya kengele"</item>
<item msgid="785049718065337473">"sauti ya arifa"</item>
<item msgid="6700305533746877052">"sauti ya bluetooth"</item>
- <item msgid="2029227495214047094">"kaa chonjo"</item>
- <item msgid="26109888160231211">"fuatilia eneo"</item>
- <item msgid="5753382310468855812">"fuatilia eneo kuu"</item>
+ <item msgid="3810969981743709839">"zima au uwashe sauti ya maikrofoni"</item>
+ <item msgid="2627903914574908209">"kaa chonjo"</item>
+ <item msgid="1395372654968157578">"fuatilia mahali"</item>
+ <item msgid="3238451051299611853">"fuatilia mahali pakuu"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Eneo"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Sauti ya kengele"</item>
<item msgid="9103719301075748925">"Sauti ya arifa"</item>
<item msgid="7025966722295861512">"Sauti ya Bluetooth"</item>
- <item msgid="4665183401128289653">"Kaa chonjo"</item>
- <item msgid="8584357129746649222">"Eneo"</item>
+ <item msgid="2265317984004577529">"Zima ama uwashe sauti ya maikrofoni"</item>
+ <item msgid="3646325683886507917">"Kaa chonjo"</item>
<item msgid="7669257279311110599">"Eneo"</item>
+ <item msgid="7745724368696313169">"Mahali"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Fupi"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Manjano kwenye samawati"</item>
<item msgid="7169235156349580064">"Maalum"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (rekebisha hitilafu)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"K64"</item>
+ <item msgid="505611754508988476">"K256"</item>
+ <item msgid="6361286924268716397">"M1"</item>
+ <item msgid="6405203239560695266">"M4"</item>
+ <item msgid="3025431211013424097">"M16"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Tumia Dalvik"</item>
- <item msgid="5131846588686178907">"Tumia ART"</item>
- <item msgid="4530003713865319928">"Tumia ART kurekebisha muundo"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"K64 kwa kumbukumbu"</item>
+ <item msgid="2822309747675758628">"K256 kwa kumbukumbu"</item>
+ <item msgid="6699306198357496731">"M1 kwa kumbukumbu"</item>
+ <item msgid="5748528643937500349">"M4 kwa kumbukumbu"</item>
+ <item msgid="1978629051085111592">"M16 kwa kumbukumbu"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Katu usikague"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Ukatizwaji mdogo"</item>
<item msgid="8735337502532332056">"Haikatizwi kabisa"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Kawaida"</item>
+ <item msgid="866544120205026771">"Wastani"</item>
+ <item msgid="7851902244436886890">"Chini"</item>
+ <item msgid="3022922196817563960">"Imepungua sana"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Endelevu"</item>
+ <item msgid="5779398140277006695">"Shughuli maarufu"</item>
+ <item msgid="1439598363694578255">"Muhimu (inatumika sasa)"</item>
+ <item msgid="3396458970745718652">"Muhimu (chinichini)"</item>
+ <item msgid="5214825238247511992">"Hifadhi nakala rufudu"</item>
+ <item msgid="311372689168254967">"Uzito mkubwa"</item>
+ <item msgid="7438189122367820362">"Huduma (inaendesha)"</item>
+ <item msgid="918687422516982498">"Huduma (inaanzisha tena)"</item>
+ <item msgid="6807727069641853029">"Kipokezi"</item>
+ <item msgid="6782857406100845127">"Mwanzo"</item>
+ <item msgid="2860945127596974299">"Shughuli ya mwisho"</item>
+ <item msgid="8610560843693675830">"Imewekwa akiba (shughuli)"</item>
+ <item msgid="4338089220026248848">"Imewekwa akiba (kiteja cha shughuli)"</item>
+ <item msgid="6652164677254579050">"Imewekwa akiba (tupu)"</item>
+ </string-array>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index f50e6fd..50a4618 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -205,7 +205,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Sehemu ya mlango sharti iwe wazi iwapo sehemu ya mpangishaji haina chochote"</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Lango uliloandika si halali."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi ya HTTP inayotumiwa na kivinjari lakini haiwezi kutumika na programu zingine."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL ya PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL ya PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Mahali:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ya ujirani:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Maelezo ya Simu:"</string>
@@ -326,6 +326,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Onyesha maelezo ya wasifu kwenye skrini iliyofungwa"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Maelezo ya wasifu"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Kutambua Eneo"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Akaunti"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Usalama"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Weka Mahali Pangu, fungua skrini, funga SIM kadi, funga hifadhi ya hati-tambulishi"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Weka Mahali Pangu, fungua skrini, funga hifadhi ya hati-tambulishi"</string>
@@ -348,6 +349,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Inasimba fiche"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Tafadhali subiri wakati huku kompyuta yako inasimba.Asilimia <xliff:g id="PERCENT">^1</xliff:g> imekamilika."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Tafadhali subiri wakati simu yako inasimba. Asilimia <xliff:g id="PERCENT">^1</xliff:g> imekamilika."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Tafadhali subiri wakati kompyuta yako kibao inasimbwa kwa njia fiche. Muda uliosalia: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Tafadhali subiri wakati simu yako inasimbwa kwa njia fiche. Muda uliosalia: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Jaribu tena baada ya sekunde <xliff:g id="DELAY">^1</xliff:g>."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Andika nenosiri yako"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Usimbaji fiche haujafanikiwa"</string>
@@ -719,6 +722,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Usicheze sauti wakati unaingiza au kuondoa kompyuta ndogo kutoka kwa gati"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Usichezeshe sauti wakati unapoingiza au kuondoa simu kutoka kwa gati"</string>
<string name="account_settings" msgid="6403589284618783461">"Akaunti"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Ya Kibinafsi"</string>
+ <string name="category_work" msgid="8699184680584175622">"Kazini"</string>
<string name="search_settings" msgid="1910951467596035063">"Tafuta"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Simamia mipangilio ya utafutaji na historia"</string>
<string name="display_settings" msgid="7965901687241669598">"Onyesho"</string>
@@ -1313,6 +1318,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Chaguo za wasanidi"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Weka chaguo kwa ajili ya maendeleo ya programu"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Chaguo la Wasanidi programu halipatikani kwa mtumiaji huyu"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Mipangilio ya VPN haipatikani kwa mtumiaji huyu"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Mipangilio ya kusambaza mtandao haipatikani kwa mtumiaji huyu"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Mipangilio ya Jina la Lango la Mtandao (APN) haipatikani kwa mtumiaji huyu"</string>
<string name="enable_adb" msgid="7982306934419797485">"Utatuzi wa USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Muundo wa kurekebisha wakati USB imeunganishwa"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Batilisha idhini za kurekebisha USB"</string>
@@ -1322,12 +1330,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Skrini haitawahi kuzima wakati unachaji"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Washa kumbukumbu ya Bluetooth HCI Snoop"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Nasa pakiti zote za Bluetooth HCI katika faili"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Chagua muda wa kuendesha"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Chagua muda wa kuendesha"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Fungua upya na ubadilishe muda wa kuendesha kutoka <xliff:g id="OLD">%1$s</xliff:g> hadi <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Chaguo za cheti cha kuonyesha pasiwaya"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Washa Uwekaji kumbukumbu za WiFi kutumia Sauti"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Ukabidhi kutoka Wifi kwenda Mtandao wa Simu"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Ruhusu Uchanganuzi wa Matumizi ya Mitandao mingine ya Wifi kila wakati"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Onyesha chaguo za cheti cha kuonyesha pasiwaya"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Ongeza kiwango cha uwekaji kumbukumbu za Wifi, onyesha kwa kila SSID RSSI katika Kichumaji cha WiFi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Ikiwashwa, Wifi itakabidhi kwa hima muunganisho wa data kwa mtandao wa Simu za Mkononi, mawimbi ya Wifi yanapokuwa hafifu"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Ruhusu au Zuia Uchanganuzi wa Matumizi ya Mitandao mingine ya Wifi kulingana na kiasi cha trafiki ya data kilicho kwenye kiolesura"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Ukubwa wa kiweka bafa ya kumbukumbu"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Chagua ukubwa wa kila Kumbukumbu"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Ruhusu maeneo ya jaribio"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Ruhusu maeneo ya majaribio"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Ruhusu utatuaji USB?"</string>
@@ -1579,6 +1591,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Muda wa kuendesha"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Huduma"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Muda"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Maelezo ya kumbukumbu"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Hali za kumbukumbu"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Kumbukumbu iliyotumika"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Asili"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Akiba za Kernel"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Mabadiliko ya ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Isiyolipiwa"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Jumla"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"Saa 3"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"Saa 6"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"Saa 12"</string>
@@ -1676,9 +1697,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Ondoa vyeti vyote"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Stakabadhi zinazoaminika"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Onyesha vyeti vya CA vinavyoaminika"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Mipangilio Ya Kina"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Aina ya hifadhi"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Inaweza kutumiwa na maunzi"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Programu pekee"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Kitambulisho hakipatikani kwa mtumiaji huyu"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Chora mchoro wako wa kufungua"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Unahitaji kuweka mchoro wako wa kufungua ili uthibitishe usakinishaji wa hati tambulishi."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1759,6 +1782,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Gusa"<b>"Inayofuata"</b>" ili kuendelea na usanidi.\n\nGusa"<b>"Nyuma"</b>" ili kuunganisha kwenye mtandao tofauti wa Wi-Fi."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Kusawazisha kumelemazwa"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Kusawazisha kumelemazwa"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Inasawazisha sasa"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Hitilafu ya usawazishaji."</string>
<string name="sync_failed" msgid="1696499856374109647">"Usawazishaji haukuwezekana"</string>
<string name="sync_active" msgid="8476943765960863040">"Usawazishaji amilifu"</string>
@@ -1851,8 +1875,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Onyesha mipaka ya picha, kingo, nk."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Lazimisha uelekezaji wa muundo wa RTL"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Lazimisha uelekezaji wa muundo wa skrini kwa RTL kwa lugha zote"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Hali ya Nishati Kidogo"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Washa mipangilio ya kuokoa betri"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Onyesha matumizi ya CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Kuegeshwa kwa skrini ikionyesha matumizi ya sasa ya CPU"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Lazimisha kutungiliza GPU"</string>
@@ -2129,9 +2151,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Onyesha arifa za maudhui yote"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ficha arifa za maudhui nyeti"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Usionyeshe arifa kabisa"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Wakati usinisumbue imewashwa"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ficha arifa mpya kwenye orodha"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Onyesha arifa zote katika orodha"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Arifa za programu"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Sauti nyingine"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Sauti za vitufe vya kupiga simu"</string>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index dcf75e7..f70b4dc 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -39,15 +39,31 @@
<dimen name="keyguard_appwidget_picker_margin_right">2dip</dimen>
<integer name="keyguard_appwidget_picker_cols">2</integer>
+ <dimen name="settings_side_margin">8dip</dimen>
+
<!-- ActionBar contentInsetStart -->
<dimen name="actionbar_contentInsetStart">24dp</dimen>
<dimen name="actionbar_subsettings_contentInsetStart">80dp</dimen>
+ <!-- Dashboard margins between each tiles within the layout -->
+ <dimen name="dashboard_cell_gap_x">16dp</dimen>
+ <dimen name="dashboard_cell_gap_y">0dp</dimen>
+
+ <!-- Dashboard padding in its container -->
+ <dimen name="dashboard_padding_start">0dp</dimen>
+ <dimen name="dashboard_padding_end">0dp</dimen>
+ <dimen name="dashboard_padding_top">0dp</dimen>
+ <dimen name="dashboard_padding_bottom">0dp</dimen>
+
+ <!-- Dashboard category padding start / end -->
+ <dimen name="dashboard_category_padding_start">16dp</dimen>
+ <dimen name="dashboard_category_padding_end">24dp</dimen>
+
<!-- Dashboard category title margin start -->
- <dimen name="dashboard_category_title_margin_start">23dp</dimen>
+ <dimen name="dashboard_category_title_margin_start">8dp</dimen>
<!-- Dashboard tile image padding start / end -->
- <dimen name="dashboard_tile_image_margin_start">24dp</dimen>
+ <dimen name="dashboard_tile_image_margin_start">8dp</dimen>
<dimen name="dashboard_tile_image_margin_end">32dp</dimen>
<!-- SwitchBar margin start / end -->
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
index 05914df..21fb4bb 100644
--- a/res/values-sw720dp-land/dimens.xml
+++ b/res/values-sw720dp-land/dimens.xml
@@ -15,5 +15,17 @@
-->
<resources>
- <dimen name="settings_side_margin">150dp</dimen>
+ <dimen name="settings_side_margin">112dp</dimen>
+
+ <!-- Dashboard side margins (left and right) -->
+ <dimen name="dashboard_side_margin">128dp</dimen>
+
+ <!-- ActionBar contentInsetStart -->
+ <dimen name="actionbar_contentInsetStart">128dp</dimen>
+ <dimen name="actionbar_subsettings_contentInsetStart">128dp</dimen>
+
+ <!-- SwitchBar sub settings margin start / end -->
+ <dimen name="switchbar_subsettings_margin_start">128dp</dimen>
+ <dimen name="switchbar_subsettings_margin_end">128dp</dimen>
+
</resources>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 06a7197..c75a2bd 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -19,10 +19,40 @@
<dimen name="appwidget_preview_height">80dip</dimen>
<integer name="keyguard_appwidget_picker_cols">2</integer>
<dimen name="keyguard_appwidget_picker_width">720dip</dimen>
- <dimen name="settings_side_margin">32dp</dimen>
+
+ <dimen name="settings_side_margin">64dp</dimen>
<!-- Weight of the left pane in a multi-pane preference layout. -->
<integer name="preferences_left_pane_weight">1</integer>
<!-- Weight of the right pane in a multi-pane preference layout. So the split is 1:2 -->
<integer name="preferences_right_pane_weight">2</integer>
+
+ <!-- ActionBar height -->
+ <dimen name="actionbar_size">64dip</dimen>
+
+ <!-- ActionBar contentInsetStart -->
+ <dimen name="actionbar_contentInsetStart">80dp</dimen>
+ <dimen name="actionbar_subsettings_contentInsetStart">80dp</dimen>
+
+ <!-- Dashboard side margins (left and right) -->
+ <dimen name="dashboard_side_margin">80dp</dimen>
+
+ <!-- Dashboard margins between each tiles within the layout -->
+ <dimen name="dashboard_cell_gap_x">24dp</dimen>
+ <dimen name="dashboard_cell_gap_y">0dp</dimen>
+
+ <!-- Dashboard padding in its container -->
+ <dimen name="dashboard_padding_start">0dp</dimen>
+ <dimen name="dashboard_padding_end">0dp</dimen>
+ <dimen name="dashboard_padding_top">0dp</dimen>
+ <dimen name="dashboard_padding_bottom">0dp</dimen>
+
+ <!-- Dashboard category padding start / end -->
+ <dimen name="dashboard_category_padding_start">24dp</dimen>
+ <dimen name="dashboard_category_padding_end">24dp</dimen>
+
+ <!-- SwitchBar sub settings margin start / end -->
+ <dimen name="switchbar_subsettings_margin_start">80dp</dimen>
+ <dimen name="switchbar_subsettings_margin_end">80dp</dimen>
+
</resources>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index 29f663c..552ea8a 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"ไม่มี"</item>
<item msgid="8673874894887358090">"ด้วยตนเอง"</item>
+ <item msgid="168893341855953140">"กำหนดค่าพร็อกซีอัตโนมัติ"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"ไม่มี"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"ระดับเสียงปลุก"</item>
<item msgid="785049718065337473">"ระดับเสียงการแจ้งเตือน"</item>
<item msgid="6700305533746877052">"ระดับเสียงบลูทูธ"</item>
- <item msgid="2029227495214047094">"ทำงานตลอดเวลา"</item>
- <item msgid="26109888160231211">"ตำแหน่งจอภาพ"</item>
- <item msgid="5753382310468855812">"ติดตามตำแหน่งโดยใช้พลังงานมาก"</item>
+ <item msgid="3810969981743709839">"ปิด/เปิดเสียงไมโครโฟน"</item>
+ <item msgid="2627903914574908209">"ทำงานตลอดเวลา"</item>
+ <item msgid="1395372654968157578">"ตำแหน่งจอภาพ"</item>
+ <item msgid="3238451051299611853">"ตรวจติดตามตำแหน่งพลังงานสู"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"ตำแหน่ง"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"ระดับเสียงปลุก"</item>
<item msgid="9103719301075748925">"ระดับเสียงของการแจ้งเตือน"</item>
<item msgid="7025966722295861512">"ระดับบลูทูธ"</item>
- <item msgid="4665183401128289653">"ทำงานตลอดเวลา"</item>
- <item msgid="8584357129746649222">"ตำแหน่ง"</item>
+ <item msgid="2265317984004577529">"ปิด/เปิดเสียงไมโครโฟน"</item>
+ <item msgid="3646325683886507917">"ทำงานตลอดเวลา"</item>
<item msgid="7669257279311110599">"ตำแหน่ง"</item>
+ <item msgid="7745724368696313169">"ตำแหน่ง"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"สั้น"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"สีเหลืองบนพื้นสีน้ำเงิน"</item>
<item msgid="7169235156349580064">"กำหนดเอง"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (ดีบัก)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 K"</item>
+ <item msgid="505611754508988476">"256 K"</item>
+ <item msgid="6361286924268716397">"1 M"</item>
+ <item msgid="6405203239560695266">"4 M"</item>
+ <item msgid="3025431211013424097">"16 M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"ใช้ Dalvik"</item>
- <item msgid="5131846588686178907">"ใช้ ART"</item>
- <item msgid="4530003713865319928">"ใช้บิวด์ดีบัก ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64 K ต่อบัฟเฟอร์ไฟล์บันทึก"</item>
+ <item msgid="2822309747675758628">"256 K ต่อบัฟเฟอร์ไฟล์บันทึก"</item>
+ <item msgid="6699306198357496731">"1 M ต่อบัฟเฟอร์ไฟล์บันทึก"</item>
+ <item msgid="5748528643937500349">"4 M ต่อบัฟเฟอร์ไฟล์บันทึก"</item>
+ <item msgid="1978629051085111592">"16 M ต่อบัฟเฟอร์ไฟล์บันทึก"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"ไม่ต้องตรวจสอบ"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"การรบกวนที่จำกัด"</item>
<item msgid="8735337502532332056">"การรบกวนเป็นศูนย์"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"ปกติ"</item>
+ <item msgid="866544120205026771">"ปานกลาง"</item>
+ <item msgid="7851902244436886890">"ต่ำ"</item>
+ <item msgid="3022922196817563960">"วิกฤต"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"ต่อเนื่อง"</item>
+ <item msgid="5779398140277006695">"กิจกรรมแรก"</item>
+ <item msgid="1439598363694578255">"สำคัญ (พื้นหน้า)"</item>
+ <item msgid="3396458970745718652">"สำคัญ (พื้นหลัง)"</item>
+ <item msgid="5214825238247511992">"การสำรองข้อมูล"</item>
+ <item msgid="311372689168254967">"ใช้หน่วยความจำมาก"</item>
+ <item msgid="7438189122367820362">"บริการ (กำลังทำงาน)"</item>
+ <item msgid="918687422516982498">"บริการ (กำลังรีสตาร์ท)"</item>
+ <item msgid="6807727069641853029">"ผู้รับ"</item>
+ <item msgid="6782857406100845127">"หน้าแรก"</item>
+ <item msgid="2860945127596974299">"กิจกรรมสุดท้าย"</item>
+ <item msgid="8610560843693675830">"แคชไว้ (กิจกรรม)"</item>
+ <item msgid="4338089220026248848">"แคชไว้ (ไคลเอ็นต์กิจกรรม)"</item>
+ <item msgid="6652164677254579050">"แคชไว้ (ว่างเปล่า)"</item>
+ </string-array>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 86c88ab..5122806 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"ฟิลด์พอร์ตจะต้องว่างถ้าไม่ได้ใส่ข้อมูลฟิลด์โฮสต์"</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"พอร์ตที่คุณพิมพ์ไม่ถูกต้อง"</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"พร็อกซี HTTP มีการใช้งานโดยเบราว์เซอร์ แต่อาจไม่มีการใช้งานโดยแอปพลิเคชันอื่น"</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"ตำแหน่ง:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID ใกล้เคียง:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"ข้อมูลเซลล์:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"แสดงข้อมูลโปรไฟล์บนหน้าจอล็อก"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"ข้อมูลโปรไฟล์"</string>
<string name="location_settings_title" msgid="1369675479310751735">"ตำแหน่ง"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"บัญชี"</string>
<string name="security_settings_title" msgid="7945465324818485460">"ความปลอดภัย"</string>
<string name="security_settings_summary" msgid="967393342537986570">"ตั้งค่าตำแหน่งของฉัน ปลดล็อกหน้าจอ ล็อกซิมการ์ด ล็อกที่จัดเก็บข้อมูลรับรอง"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"ตั้งค่าตำแหน่งของฉัน การปลดล็อกหน้าจอ การล็อกที่จัดเก็บข้อมูลรับรอง"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"กำลังเข้ารหัส"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"รอสักครู่ขณะกำลังเข้ารหัสแท็บเล็ตของคุณ เสร็จสมบูรณ์ <xliff:g id="PERCENT">^1</xliff:g>"</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"รอสักครู่ขณะกำลังเข้ารหัสโทรศัพท์ของคุณ เสร็จสมบูรณ์ <xliff:g id="PERCENT">^1</xliff:g>%"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"โปรดรอสักครู่ขณะเข้ารหัสแท็บเล็ต เหลืออีก <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"โปรดรอสักครู่ขณะเข้ารหัสโทรศัพท์ เหลืออีก <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"ลองใหม่อีกครั้งใน <xliff:g id="DELAY">^1</xliff:g> วินาที"</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"พิมพ์รหัสผ่านของคุณ"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"การเข้ารหัสไม่สำเร็จ"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"ไม่ต้องเล่นเสียงเมื่อใส่หรือนำแท็บเล็ตออกจากฐานรอง"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"ไม่เล่นเสียงเมื่อใส่หรือถอดโทรศัพท์ออกจากแท่นชาร์จ"</string>
<string name="account_settings" msgid="6403589284618783461">"บัญชี"</string>
+ <string name="category_personal" msgid="1299663247844969448">"ส่วนตัว"</string>
+ <string name="category_work" msgid="8699184680584175622">"ที่ทำงาน"</string>
<string name="search_settings" msgid="1910951467596035063">"ค้นหา"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"จัดการการตั้งค่าและประวัติการค้นหา"</string>
<string name="display_settings" msgid="7965901687241669598">"การแสดงผล"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"สำหรับนักพัฒนาซอฟต์แวร์"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"ตั้งค่าตัวเลือกสำหรับการพัฒนาแอปพลิเคชัน"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"ตัวเลือกสำหรับนักพัฒนาซอฟต์แวร์ไม่สามารถใช้ได้สำหรับผู้ใช้นี้"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"การตั้งค่า VPN ไม่สามารถใช้ได้สำหรับผู้ใช้รายนี้"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"การตั้งค่าการปล่อยสัญญาณไม่สามารถใช้ได้สำหรับผู้ใช้รายนี้"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"การตั้งค่าจุดเข้าใช้งานไม่สามารถใช้ได้สำหรับผู้ใช้รายนี้"</string>
<string name="enable_adb" msgid="7982306934419797485">"การแก้ไขข้อบกพร่อง USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"โหมดแก้ไขข้อบกพร่องเมื่อเชื่อมต่อ USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"ยกเลิกการให้สิทธิ์การแก้ปัญหา USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"หน้าจอจะไม่เข้าสู่โหมดสลีปขณะชาร์จ"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"เปิดใช้งานบันทึกสอดแนมบลูทูธ HCI"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"บันทึกแพ็คเก็ตบลูทูธ HCI ทั้งหมดในไฟล์"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"เลือกรันไทม์"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"เลือกรันไทม์"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"รีบูตเพื่อเปลี่ยนรันไทม์จาก <xliff:g id="OLD">%1$s</xliff:g> เป็น <xliff:g id="NEW">%2$s</xliff:g> ไหม"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"การรับรองการแสดงผลแบบไร้สาย"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"เปิดใช้การบันทึกรายละเอียด WiFi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"เปลี่ยนการเชื่อมต่อจาก Wi-Fi เป็นเครือข่ายมือถือเมื่อสัญญานอ่อน"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"ใช้การสแกน Wi-Fi ข้ามเครือข่ายเสมอ"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"แสดงตัวเลือกสำหรับการรับรองการแสดงผล แบบไร้สาย"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"เพิ่มระดับการบันทึก WiFi แสดงตาม SSID RSSI ในเครื่องมือเลือก WiFi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"เมื่อเปิดใช้แล้ว Wi-Fi จะเปลี่ยนการเชื่อมต่อข้อมูลไปยังเครือข่ายมือถือในทันทีที่พบสัญญาณ Wi-Fi อ่อน"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"อนุญาต/ไม่อนุญาตการสแกน Wi-Fi ข้ามเครือข่าย ตามปริมาณข้อมูลการเข้าชมที่ปรากฏในอินเทอร์เฟซ"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"ขนาดบัฟเฟอร์ของ Logger"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"เลือกขนาด Logger ต่อบัฟเฟอร์ไฟล์บันทึก"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"อนุญาตให้จำลองตำแหน่ง"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"อนุญาตให้จำลองตำแหน่ง"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"อนุญาตให้แก้ไขข้อบกพร่อง USB หรือไม่"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"เวลาที่แสดง"</string>
<string name="services_subtitle" msgid="4296402367067266425">"บริการ"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"ระยะเวลา"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"รายละเอียดหน่วยความจำ"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"สถานะหน่วยความจำ"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"การใช้หน่วยความจำ"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"เคอร์เนล"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"ในเครื่อง"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"แคชของเคอร์เนล"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"การสลับ ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"ว่าง"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"รวม"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 ชั่วโมง"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 ชั่วโมง"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 ชั่วโมง"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"นำใบรับรองทั้งหมดออก"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"ข้อมูลรับรองที่เชื่อถือได้"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"แสดงใบรับรอง CA ที่เชื่อถือได้"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"ขั้นสูง"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"ประเภทพื้นที่เก็บข้อมูล"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"ใช้ฮาร์ดแวร์"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"ซอฟต์แวร์เท่านั้น"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"ข้อมูลรับรองไม่พร้อมใช้งานสำหรับผู้ใช้รายนี้"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"วาดรูปแบบการปลดล็อกของคุณ"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"คุณจำเป็นต้องวาดรูปแบบการปลดล็อกของคุณเพื่อยืนยันการติดตั้งข้อมูลรับรอง"</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"แตะ "<b>"ถัดไป"</b>" เพื่อตั้งค่าต่อไป\n\nแตะ "<b>"ย้อนกลับ"</b>" เพื่อเชื่อมต่อกับเครือข่าย WiFi อื่น"</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"เปิดใช้งานการซิงค์แล้ว"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"ปิดใช้งานการซิงค์แล้ว"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"กำลังซิงค์อยู่ในขณะนี้"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"ข้อผิดพลาดในการซิงค์"</string>
<string name="sync_failed" msgid="1696499856374109647">"การซิงค์ล้มเหลว"</string>
<string name="sync_active" msgid="8476943765960863040">"เปิดใช้งานการซิงค์"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"แสดงหน้าปกคลิป ขอบ ฯลฯ"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"บังคับทิศทางการจัดวาง RTL"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"บังคับทิศทางการจัดวางหน้าจอเป็น RTL สำหรับทุกภาษา"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"โหมดใช้พลังงานต่ำ"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"เปิดใช้การตั้งค่าประหยัดแบตเตอรี่"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"แสดงการใช้ CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"การวางซ้อนหน้าจอที่แสดงการใช้ CPU ในปัจจุบัน"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"เร่งการแสดงผลของ GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"แสดงเนื้อหาการแจ้งเตือนทั้งหมด"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"ซ่อนเนื้อหาการแจ้งเตือนที่ละเอียดอ่อน"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"ไม่ต้องแสดงการแจ้งเตือนใดๆ"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"เมื่อเปิดโหมดห้ามรบกวน"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"ซ่อนการแจ้งเตือนใหม่ๆ ในรายการ"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"แสดงการแจ้งเตือนทั้งหมดในรายการ"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"การแจ้งเตือนของแอป"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"เสียงอื่นๆ"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"เสียงแป้นหมายเลข"</string>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index dce1e36..0810c27 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Wala"</item>
<item msgid="8673874894887358090">"Manual"</item>
+ <item msgid="168893341855953140">"Auto-Config ng Proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Wala"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"volume ng alarma"</item>
<item msgid="785049718065337473">"volume ng notification"</item>
<item msgid="6700305533746877052">"volume ng bluetooth"</item>
- <item msgid="2029227495214047094">"panatilihing bukas"</item>
- <item msgid="26109888160231211">"subaybayan ang lokasyon"</item>
- <item msgid="5753382310468855812">"subaybayan ang lokasyon na gumagamit ng maraming power"</item>
+ <item msgid="3810969981743709839">"i-mute/i-unmute ang mikropono"</item>
+ <item msgid="2627903914574908209">"panatilihing bukas"</item>
+ <item msgid="1395372654968157578">"subaybayan ang lokasyon"</item>
+ <item msgid="3238451051299611853">"subaybayan ang lokasyon na gumagamit ng maraming power"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Lokasyon"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Volume ng alarm"</item>
<item msgid="9103719301075748925">"Volume ng notification"</item>
<item msgid="7025966722295861512">"Volume ng Bluetooth"</item>
- <item msgid="4665183401128289653">"Panatilihing bukas"</item>
- <item msgid="8584357129746649222">"Lokasyon"</item>
+ <item msgid="2265317984004577529">"I-mute/i-unmute ang mikropono"</item>
+ <item msgid="3646325683886507917">"Panatilihing bukas"</item>
<item msgid="7669257279311110599">"Lokasyon"</item>
+ <item msgid="7745724368696313169">"Lokasyon"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Maikli"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Dilaw sa asul"</item>
<item msgid="7169235156349580064">"Custom"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (debug)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Gamitin ang Dalvik"</item>
- <item msgid="5131846588686178907">"Gamitin ang ART"</item>
- <item msgid="4530003713865319928">"Gamitin ang build sa pag-debug ng ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64K kada log buffer"</item>
+ <item msgid="2822309747675758628">"256K kada log buffer"</item>
+ <item msgid="6699306198357496731">"1M kada log buffer"</item>
+ <item msgid="5748528643937500349">"4M kada log buffer"</item>
+ <item msgid="1978629051085111592">"16M kada log buffer"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Huwag kailanman suriin"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Mga limitadong pagkagambala"</item>
<item msgid="8735337502532332056">"Zero na pagkagambala"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normal"</item>
+ <item msgid="866544120205026771">"Katamtaman"</item>
+ <item msgid="7851902244436886890">"Mababa"</item>
+ <item msgid="3022922196817563960">"Kritikal"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Tuluy-tuloy"</item>
+ <item msgid="5779398140277006695">"Nangungunang gawain"</item>
+ <item msgid="1439598363694578255">"Mahalaga (foreground)"</item>
+ <item msgid="3396458970745718652">"Mahalaga (background)"</item>
+ <item msgid="5214825238247511992">"Backup"</item>
+ <item msgid="311372689168254967">"Mabigat na timbang"</item>
+ <item msgid="7438189122367820362">"Serbisyo (gumagana)"</item>
+ <item msgid="918687422516982498">"Serbisyo (nagre-restart)"</item>
+ <item msgid="6807727069641853029">"Receiver"</item>
+ <item msgid="6782857406100845127">"Home"</item>
+ <item msgid="2860945127596974299">"Huling gawain"</item>
+ <item msgid="8610560843693675830">"Naka-cache (gawain)"</item>
+ <item msgid="4338089220026248848">"Naka-cache (client ng gawain)"</item>
+ <item msgid="6652164677254579050">"Naka-cache (walang laman)"</item>
+ </string-array>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index ef9af94..b15a8b5 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Dapat na walang laman ang field ng port kung walang laman ang field ng host."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Hindi wasto ang port na iyong na-type."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Ang HTTP proxy ay ginagamit ng browser ngunit hindi maaaring gamitin ng iba pang apps."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Lokasyon:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Katabing CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Ipakita ang impormasyon ng profile sa lock screen"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Info ng profile"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Lokasyon"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Mga Account"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Seguridad"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng SIM card, lock ng imbakan ng kredensyal"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Itakda ang Aking Lokasyon, pag-unlock ng screen, lock ng imbakan ng kredensyal"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Pag-encrypt"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Maghintay habang ine-encrypt ang iyong tablet. <xliff:g id="PERCENT">^1</xliff:g>% (na) kumpleto."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Maghintay habang ine-encrypt ang iyong telepono. <xliff:g id="PERCENT">^1</xliff:g>% (na) kumpleto."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Maghintay habang ine-encrypt ang iyong tablet. Natitirang oras: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Maghintay habang ine-encrypt ang iyong telepono. Natitirang oras: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Subukang muli sa loob ng <xliff:g id="DELAY">^1</xliff:g> (na) segundo."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"I-type ang iyong password"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Hindi matagumpay ang pag-encrypt"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Huwag mag-play ng tunog kapag ipinapasok o inaalis ang tablet mula sa dock"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Huwag mag-play ng tunog kapag inilalagay o inaalis ang telepono mula sa dock"</string>
<string name="account_settings" msgid="6403589284618783461">"Mga Account"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Personal"</string>
+ <string name="category_work" msgid="8699184680584175622">"Trabaho"</string>
<string name="search_settings" msgid="1910951467596035063">"Paghahanap"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Pamahalaan ang mga setting at kasaysayan ng paghahanap"</string>
<string name="display_settings" msgid="7965901687241669598">"Pagpapakita"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Mga opsyon ng nag-develop"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Magtakda ng mga pagpipilian para sa pagbuo ng app"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Hindi available ang mga pagpipilian ng developer para sa user na ito"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Hindi available ang mga setting ng VPN para sa user na ito"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Hindi available ang mga setting ng pagte-theter para sa user na ito"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Hindi available ang mga setting ng Access Point Name para sa user na ito"</string>
<string name="enable_adb" msgid="7982306934419797485">"Debugging ng USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Debug mode kapag nakakonekta ang USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Bawiin ang mga pahintulot sa pag-debug ng USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Hindi kailanman hihinto ang screen kapag kinakargahan"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"I-enable ang Bluetooth HCI snoop log"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"I-capture ang lahat ng bluetooth HCI packet sa isang file"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Piliin ang runtime"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Piliin ang runtime"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"I-reboot upang baguhin ang runtime mula sa <xliff:g id="OLD">%1$s</xliff:g> patungo sa <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Certification ng wireless display"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"I-enable ang WiFi Verbose Logging"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Agresibong paglipat ng Wifi sa Cellular"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Palaging payagan ang mga Pag-scan sa Roaming ng Wifi"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Ipakita ang mga opsyon para sa certification ng wireless display"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Taasan ang antas ng pagla-log sa Wifi, ipakita sa bawat SSID RSSI sa WiFi Picker"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Kapag naka-enable, mas magiging agresibo ang Wifi sa paglipat ng koneksyon ng data sa Cellular, kapag mahina ang signal ng Wifi"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Payagan/Huwag payagan ang mga Pag-scan sa Roaming ng Wifi batay sa dami ng data ng trapiko na mayroon sa interface"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Mga laki ng buffer ng Logger"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Pumili laki Logger kada log buffer"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Payagan ang mga kunwaring lokasyon"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Payagan ang mga kunwaring lokasyon"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Payagan ang pag-debug ng USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Oras ng paggana"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Mga Serbisyo"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Tagal"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Mga detalye ng memory"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Mga estado ng memory"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Paggamit ng memory"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Native"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Mga kernel cache"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam swap"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Libre"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Kabuuan"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 oras"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 na oras"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 oras"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Alisin ang lahat ng certificate"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Pinagkakatiwalaang kredensyal"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Ipakita ang mga pinagkakatiwalaang mga CA certificate"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Advanced"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Uri ng storage"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Hardware-backed"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Software lang"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Hindi available ang mga kredensyal para sa user na ito"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Iguhit ang iyong pattern sa pag-unlock"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kailangan mong iguhit ang iyong pattern sa pag-unlock upang kumpirmahin ang pag-install ng kredensyal."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Pindutin ang "<b>"Susunod"</b>" upang magpatuloy sa pag-setup.\n\nPindutin ang "<b>"Bumalik"</b>" upang kumonekta sa ibang Wi-Fi network."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Pinapagana ang sync"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Hindi pinapagana ang pag-sync"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Nagsi-sync ngayon"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Error sa pag-sync."</string>
<string name="sync_failed" msgid="1696499856374109647">"Nabigo ang pag-sync"</string>
<string name="sync_active" msgid="8476943765960863040">"Aktibo ang pag-sync"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Ipakita ang mga hangganan ng clip, margin, atbp."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Force RTL layout dir."</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Force screen layout dir. sa RTL sa lahat ng lokal"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Low Power Mode"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"I-enable ang mga setting ng pagtitipid ng baterya"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Ipakita paggamit ng CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Overlay ng screen pakita paggamit ngayon ng CPU"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Ipilit ang pag-render ng GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Ipakita ang lahat ng nilalaman ng notification"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Itago ang sensitibong nilalaman ng notification"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Ganap na huwag magpakita ng mga notification"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Kapag naka-on ang huwag abalahin"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Itago ang mga bagong notification mula sa listahan"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Ipakita ang lahat ng notification sa listahan"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Mga notification sa app"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Iba pang mga tunog"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Mga tono ng dial pad"</string>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index e5242dc..55f5c28 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Yok"</item>
<item msgid="8673874894887358090">"El ile"</item>
+ <item msgid="168893341855953140">"Proxy Otomatik Yapılandırması"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Yok"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"alarm sesi düzeyi"</item>
<item msgid="785049718065337473">"bildirim sesi düzeyi"</item>
<item msgid="6700305533746877052">"Bluetooth sesi düzeyi"</item>
- <item msgid="2029227495214047094">"uyanık tut"</item>
- <item msgid="26109888160231211">"konumu izle"</item>
- <item msgid="5753382310468855812">"yüksek güç tüketen konum hizmetlerini izle"</item>
+ <item msgid="3810969981743709839">"mikrofonu kapat/aç"</item>
+ <item msgid="2627903914574908209">"uyanık tut"</item>
+ <item msgid="1395372654968157578">"konumu izle"</item>
+ <item msgid="3238451051299611853">"yüksek güç tüketen konum hizmetlerini izle"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Konum"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Alarm sesi düzeyi"</item>
<item msgid="9103719301075748925">"Bildirim sesi düzeyi"</item>
<item msgid="7025966722295861512">"Bluetooth ses düzeyi"</item>
- <item msgid="4665183401128289653">"Uyanık tut"</item>
- <item msgid="8584357129746649222">"Konum"</item>
+ <item msgid="2265317984004577529">"Mikrofonu kapat/aç"</item>
+ <item msgid="3646325683886507917">"Uyanık tut"</item>
<item msgid="7669257279311110599">"Konum"</item>
+ <item msgid="7745724368696313169">"Konum"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Kısa"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Mavi üzerine sarı"</item>
<item msgid="7169235156349580064">"Özel"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (hata ayıklama)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 K"</item>
+ <item msgid="505611754508988476">"256 K"</item>
+ <item msgid="6361286924268716397">"1 M"</item>
+ <item msgid="6405203239560695266">"4 M"</item>
+ <item msgid="3025431211013424097">"16 M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Dalvik\'i kullan"</item>
- <item msgid="5131846588686178907">"ART\'yi kullan"</item>
- <item msgid="4530003713865319928">"ART hata ayıklama derlemesini kullan"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"Günlük arabelleği başına 64 K"</item>
+ <item msgid="2822309747675758628">"Günlük arabelleği başına 256 K"</item>
+ <item msgid="6699306198357496731">"Günlük arabelleği başına 1 M"</item>
+ <item msgid="5748528643937500349">"Günlük arabelleği başına 4 M"</item>
+ <item msgid="1978629051085111592">"Günlük arabelleği başına 16 M"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Hiçbir zaman denetleme"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Sınırlı kesilme"</item>
<item msgid="8735337502532332056">"Sıfır kesilme"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Normal"</item>
+ <item msgid="866544120205026771">"Orta"</item>
+ <item msgid="7851902244436886890">"Düşük"</item>
+ <item msgid="3022922196817563960">"Kritik düzeyde"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Kalıcı"</item>
+ <item msgid="5779398140277006695">"En üstteki etkinlik"</item>
+ <item msgid="1439598363694578255">"Önemli (ön plan)"</item>
+ <item msgid="3396458970745718652">"Önemli (arka plan)"</item>
+ <item msgid="5214825238247511992">"Yedek"</item>
+ <item msgid="311372689168254967">"Ağır"</item>
+ <item msgid="7438189122367820362">"Hizmet (çalışıyor)"</item>
+ <item msgid="918687422516982498">"Hizmet (yeniden başlatılıyor)"</item>
+ <item msgid="6807727069641853029">"Alıcı"</item>
+ <item msgid="6782857406100845127">"Ana ekran"</item>
+ <item msgid="2860945127596974299">"En sondaki etkinlik"</item>
+ <item msgid="8610560843693675830">"Önbelleğe alındı (etkinlik)"</item>
+ <item msgid="4338089220026248848">"Önbelleğe alındı (etkinlik istemcisi)"</item>
+ <item msgid="6652164677254579050">"Önbelleğe alındı (boş)"</item>
+ </string-array>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index b49f91b..9b21954 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Ana makine alanı boşsa, bağlantı noktası alanı boş olmalıdır."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Yazdığınız bağlantı noktası geçerli değil."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP proxy\'yi tarayıcı kullanıyor, ancak diğer uygulamalar tarafından kullanılamayabilir."</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC URL\'si: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC URL\'si: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Konum:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Komşu CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Hücre Bilgileri:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Kilit ekranında profil bilgisini göster"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Profil bilgisi"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Konum"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Hesaplar"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Güvenlik"</string>
<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>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Şifreleniyor"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Tabletiniz şifrelenirken lütfen bekleyin. %<xliff:g id="PERCENT">^1</xliff:g> tamamlandı."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Telefonunuz şifrelenirken lütfen bekleyin. %<xliff:g id="PERCENT">^1</xliff:g> tamamlandı."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Tabletiniz şifrelenirken bekleyin. Kalan süre: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Telefonunuz şifrelenirken bekleyin. Kalan süre: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> saniye içinde yeniden deneyin."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Şifrenizi yazın"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Şifreleme başarısız oldu"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Tablet yuvaya yerleştirilirken veya yuvadan çıkarılırken ses çalma"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Telefon yuvaya yerleştirilirken veya yuvadan çıkarılırken ses çalma"</string>
<string name="account_settings" msgid="6403589284618783461">"Hesaplar"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Kişisel"</string>
+ <string name="category_work" msgid="8699184680584175622">"İş"</string>
<string name="search_settings" msgid="1910951467596035063">"Ara"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Arama ayarlarını ve geçmişi yönet"</string>
<string name="display_settings" msgid="7965901687241669598">"Ekran"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Geliştirici seçenekleri"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Uygulama geliştirme için seçenekleri ayarla"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Bu kullanıcı, geliştirici seçeneklerini kullanamaz"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"VPN ayarları bu kullanıcı için kullanılamıyor"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Tethering ayarları bu kullanıcı için kullanılamıyor"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Erişim Noktası Adı ayarları bu kullanıcı için kullanılamıyor"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB hata ayıklaması"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"USB bağlandığında hata ayıklama modu"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"USB hata ayıklama yetkilerini kaldır"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Şarj edilirken ekran hiçbir zaman uykuya geçmez"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bluetooth HCI araştırmayı etkinleştir"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Bir dosyadaki tüm Bluetooth HCI paketlerini yakala"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Çalışma zamanını seçin"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Çalışma zamanını seçin"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Çalışma zamanını <xliff:g id="OLD">%1$s</xliff:g> yerine <xliff:g id="NEW">%2$s</xliff:g> olarak değiştirmek için yeniden başlatılsın mı?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Kablosuz ekran sertifikası"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Kablosuz Ayrıntılı Günlük Kaydını Etkinleştir"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Kablosuz\'dan Hücresel\'e geçişte agresif"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Kablosuz Dolaşım Taramalarına her zaman izin ver"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Kablosuz ekran sertifikası seçeneklerini göster"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Kablosuz günlük kaydı düzeyini artır, Kablosuz Seçici\'deki her bir SSID RSSI için göster"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Etkinleştirildiğinde, Kablosuz sinyali düşükken veri bağlantısını Hücresel bağlantıya bırakmada daha agresif olunur."</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Arayüzde mevcut veri trafiğin miktarına bağlı olarak Kablosuz Dolaşım Taramalarına İzin Ver/İzin Verme"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Günlük Kaydedici arabellek boyutları"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Günlük arabelleği başına Günlük Kaydedici boyutlarını seçin"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Sahte konumlara izin ver"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Sahte konumlara izin ver"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"USB hata ayıklamasına izin verilsin mi?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Çalışma süresi"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Hizmetler"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Süre"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Bellek ayrıntıları"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Bellek durumları"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Bellek kullanımı"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Çekirdek"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Yerel"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Çekirdek önbellekleri"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam değiştirme"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Boş"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Toplam"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 saat"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 saat"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 saat"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Tüm sertifikaları kaldır"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Güvenilir kimlik bilgisi"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Güvenilir CA sertifikalarını görüntüle"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Gelişmiş"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Depolama türü"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Donanım destekli"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Yalnızca yazılım"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Bu kullanıcı için kimlik bilgileri kullanılamıyor"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Kilit açma deseninizi çizin"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Kimlik bilgisi yüklemesini onaylamak için kilit açma desenini çizmeniz gerekiyor."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Kuruluma devam etmek için "<b>"İleri"</b>"\'ye dokunun.\n\nFarklı bir Kablosuz ağa bağlanmak için "<b>"Geri"</b>"\'ye dokunun."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Senkronizasyon etkinleştirildi"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Senkronizasyon devre dışı"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Şimdi senkronize ediliyor"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Senkronizasyon hatası"</string>
<string name="sync_failed" msgid="1696499856374109647">"Senkronizasyon başarısız oldu"</string>
<string name="sync_active" msgid="8476943765960863040">"Senkronizasyon etkin"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Klip sınırlarını, kenar boşluklarını vb. göster"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Sağdan sola düzenini zorla"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Tüm yerel ayarlar için sağdan sola ekran düzenini zorlar"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Düşük Güç Modu"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Pil tasarrufu ayarlarını etkinleştir"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"CPU kullanımını göster"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Mevcut CPU kullanımını gösteren yer paylaşımı"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"GPU oluşturmayı zorla"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Tüm bildirim içeriklerini göster"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Hassas içerikli bildirimleri gizle"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Bildirimleri hiç gösterme"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Rahatsız etmeme ayarı açık olduğunda"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Yeni bildirimleri listede gizle"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Tüm bildirimleri listede göster"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Uygulama bildirimleri"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Diğer sesler"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Tuş takımı sesleri"</string>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 28c051e..80e12be 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Немає"</item>
<item msgid="8673874894887358090">"Вручну"</item>
+ <item msgid="168893341855953140">"Автоконфігурація проксі"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Немає"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"гучність сигналу"</item>
<item msgid="785049718065337473">"гучність сповіщення"</item>
<item msgid="6700305533746877052">"гучність Bluetooth"</item>
- <item msgid="2029227495214047094">"залишати активним"</item>
- <item msgid="26109888160231211">"відстежувати місцезнаходження"</item>
- <item msgid="5753382310468855812">"відстежувати енергозатратні місцезнаходження"</item>
+ <item msgid="3810969981743709839">"вимкнути або ввімкнути мікрофон"</item>
+ <item msgid="2627903914574908209">"залишати активним"</item>
+ <item msgid="1395372654968157578">"відстежувати місця"</item>
+ <item msgid="3238451051299611853">"відстежувати енерговитратні місця"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Місцезнаходження"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Гучність сигналу"</item>
<item msgid="9103719301075748925">"Гучність сповіщення"</item>
<item msgid="7025966722295861512">"Гучність Bluetooth"</item>
- <item msgid="4665183401128289653">"Залишати активним"</item>
- <item msgid="8584357129746649222">"Місцезнаходження"</item>
+ <item msgid="2265317984004577529">"Вимкнути або ввімкнути мікрофон"</item>
+ <item msgid="3646325683886507917">"Залишати активним"</item>
<item msgid="7669257279311110599">"Місцезнаходження"</item>
+ <item msgid="7745724368696313169">"Місце"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Коротка"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Жовтий на синьому"</item>
<item msgid="7169235156349580064">"Спеціальний"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (налагодження)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64 Кб"</item>
+ <item msgid="505611754508988476">"256 Кб"</item>
+ <item msgid="6361286924268716397">"1 Мб"</item>
+ <item msgid="6405203239560695266">"4 Мб"</item>
+ <item msgid="3025431211013424097">"16 Мб"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Використовувати Dalvik"</item>
- <item msgid="5131846588686178907">"Використовувати ART"</item>
- <item msgid="4530003713865319928">"Використовувати складання ART для налагодження"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"Буфер: макс. 64 Кб"</item>
+ <item msgid="2822309747675758628">"Буфер: макс. 256 Кб"</item>
+ <item msgid="6699306198357496731">"Буфер: макс. 1 Мб"</item>
+ <item msgid="5748528643937500349">"Буфер: макс. 4 Мб"</item>
+ <item msgid="1978629051085111592">"Буфер: макс. 16 Мб"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Ніколи не перевіряти"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Обмежені перешкоди"</item>
<item msgid="8735337502532332056">"Нульові перешкоди"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Нормальний"</item>
+ <item msgid="866544120205026771">"Середній"</item>
+ <item msgid="7851902244436886890">"Низький"</item>
+ <item msgid="3022922196817563960">"Критичний"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Постійний"</item>
+ <item msgid="5779398140277006695">"Перші дії"</item>
+ <item msgid="1439598363694578255">"Важливо (активний додаток)"</item>
+ <item msgid="3396458970745718652">"Важливо (фоновий додаток)"</item>
+ <item msgid="5214825238247511992">"Резервне копіювання"</item>
+ <item msgid="311372689168254967">"Інтенсивний"</item>
+ <item msgid="7438189122367820362">"Служба (запущено)"</item>
+ <item msgid="918687422516982498">"Служба (перезапуск)"</item>
+ <item msgid="6807727069641853029">"Приймач"</item>
+ <item msgid="6782857406100845127">"Головний екран"</item>
+ <item msgid="2860945127596974299">"Останні дії"</item>
+ <item msgid="8610560843693675830">"Кеш (дії)"</item>
+ <item msgid="4338089220026248848">"Кеш (дії клієнта)"</item>
+ <item msgid="6652164677254579050">"Кеш (порожньо)"</item>
+ </string-array>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 3cf463d..2fc50f5 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Поле порту має бути порожнім, якщо поле хосту порожнє."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Введений порт не дійсний."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Проксі-сервер HTTP використовується веб-переглядачем, але не може використовуватися ін. програмами."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL-адреса файлу PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL-адреса PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Місцезнах.:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"Сусідній CID:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Інформація про телефон:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Показувати інформацію профілю на екрані блокування"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Інформація профілю"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Місцезнаходження"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Облікові записи"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Безпека"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Устан. Моє місцезн., розблок. екрана, блок. SIM-карти, сховища обл. даних"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Устан. Моє місцезн., розбл. екрана, блок. схов. обл. даних"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Шифрування"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Зачекайте, поки ваш планшетний ПК зашифрується. Виконано: <xliff:g id="PERCENT">^1</xliff:g>%."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Зачекайте, поки ваш телефон зашифрується. Виконано <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Зачекайте, поки ваш планшет буде зашифровано. Залишилося часу: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Зачекайте, поки ваш телефон буде зашифровано. Залишилося часу: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Спробуйте ще через <xliff:g id="DELAY">^1</xliff:g> сек."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Введіть пароль"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Шифрування не виконано"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Не грати звук під час вставл. чи виймання пристрою зі станції"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Не грати звук під час вставл. чи виймання тел. зі станції"</string>
<string name="account_settings" msgid="6403589284618783461">"Облікові записи"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Особисте"</string>
+ <string name="category_work" msgid="8699184680584175622">"Робота"</string>
<string name="search_settings" msgid="1910951467596035063">"Пошук"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Керуйте налаштув. пошуку та історією"</string>
<string name="display_settings" msgid="7965901687241669598">"Екран"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Параметри розробника"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Установити параметри для розробки програми"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Параметри розробника не доступні для цього користувача"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Цей користувач не може налаштовувати мережу VPN"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Цей користувач не може налаштовувати режим модема"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Цей користувач не може налаштовувати назву точки доступу"</string>
<string name="enable_adb" msgid="7982306934419797485">"Налагодження USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Реж. налагодж., коли підкл. ч-з USB"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Скасувати доступ до налагодження USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Екран не засинатиме під час заряджання"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Увімкнути журнал відстеження інтерфейсу Bluetooth"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Робити знімки всіх пакетів інтерфейсу Bluetooth у файлі"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Вибрати робочий цикл"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Вибрати робочий цикл"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Перезавантажити, щоб змінити робочий цикл із <xliff:g id="OLD">%1$s</xliff:g> на <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Сертифікація бездротового екрана"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Увімкнути докладну реєстрацію Wi-Fi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Перемик. сигнал із Wi-Fi на моб. мережу"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Завжди дозволяти Wi-Fi шукати роумінг"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Показати параметри сертифікації бездротового екрана"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Збільшити рівень реєстрації Wi-Fi, показувати за RSSI SSID під час вибору Wi-Fi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Примусово перемикатися на мобільну мережу, коли сигнал Wi-Fi слабкий"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Дозволити чи заборонити Wi-Fi шукати роумінг на основі обсягу трафіку даних в інтерфейсі"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Розміри буфера журналу"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Виберіть розміри буфера журналу"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Фіктивні місцезнаходження"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Дозв. фіктивні місцезн."</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Дозвол. налагодж. USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Час виконання"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Служби"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Тривалість"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Деталі пам’яті"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Стани пам’яті"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Використання пам’яті"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Ядро"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Рідні процеси"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Кеші ядра"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Заміна модуля ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Безкоштовно"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Усього"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 години"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 годин"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 годин"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Видалити всі сертифікати"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Надійні облікові дані"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Показати надійні сертифікати ЦС"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Додатково"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Тип сховища"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Апаратне забезпечення"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Лише програмне забезпечення"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Облікові дані недоступні для цього користувача"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Намалюйте ключ розблокування"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Щоб підтвердити встановлення облікових даних, потрібно намалювати ключ розблокування."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Торкніться опції "<b>"Далі"</b>", щоб продовжити налаштування.\n\nТоркніться опції "<b>"Назад"</b>", щоб під’єднатися до іншої мережі Wi‑Fi."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Синхронізацію ввімкнено"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Синхронізацію вимкнено"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Синхронізація"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Помилка синхронізації"</string>
<string name="sync_failed" msgid="1696499856374109647">"Помилка синхронізації"</string>
<string name="sync_active" msgid="8476943765960863040">"Синхронізація активна"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Показувати межі роликів, поля тощо"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Макет письма справа наліво"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Застосовувати макет письма справа наліво для всіх мов"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Енергоекономний режим"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Увімкнути налаштування економії заряду акумулятора"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Показати використання ЦП"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Наклад-ня на екрані, яке показ.поточне використ.ЦП"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Примусова візуалізація GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Показувати весь вміст сповіщень"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ховати конфіденційний вміст сповіщень"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Узагалі не показувати сповіщення"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Коли ввімкнено опцію \"Не турбувати\""</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ховати нові сповіщення в списку"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Показувати всі сповіщення в списку"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Сповіщення з додатків"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Інші звуки"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Звуки цифрової клавіатури"</string>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index b0cc1d1..1902cba 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Không chọn"</item>
<item msgid="8673874894887358090">"Thủ công"</item>
+ <item msgid="168893341855953140">"Tự động định cấu hình proxy"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Không"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"âm lượng báo thức"</item>
<item msgid="785049718065337473">"âm lượng thông báo"</item>
<item msgid="6700305533746877052">"âm lượng bluetooth"</item>
- <item msgid="2029227495214047094">"không khóa màn hình"</item>
- <item msgid="26109888160231211">"giám sát vị trí"</item>
- <item msgid="5753382310468855812">"theo dõi vị trí dùng điện năng cao"</item>
+ <item msgid="3810969981743709839">"tắt/bật micrô"</item>
+ <item msgid="2627903914574908209">"không khóa màn hình"</item>
+ <item msgid="1395372654968157578">"theo dõi vị trí"</item>
+ <item msgid="3238451051299611853">"theo dõi vị trí dùng điện năng cao"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Vị trí"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Âm lượng báo thức"</item>
<item msgid="9103719301075748925">"Âm lượng thông báo"</item>
<item msgid="7025966722295861512">"Âm lượng bluetooth"</item>
- <item msgid="4665183401128289653">"Không khóa màn hình"</item>
- <item msgid="8584357129746649222">"Vị trí"</item>
+ <item msgid="2265317984004577529">"Tắt/bật micrô"</item>
+ <item msgid="3646325683886507917">"Không khóa màn hình"</item>
<item msgid="7669257279311110599">"Vị trí"</item>
+ <item msgid="7745724368696313169">"Vị trí"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Ngắn"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Chữ vàng trên nền xanh lam"</item>
<item msgid="7169235156349580064">"Tùy chỉnh"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (gỡ lỗi)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Sử dụng Dalvik"</item>
- <item msgid="5131846588686178907">"Sử dụng ART"</item>
- <item msgid="4530003713865319928">"Sử dụng bản dựng gỡ lỗi ART"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64K/lần tải nhật ký"</item>
+ <item msgid="2822309747675758628">"256K/lần tải n.ký"</item>
+ <item msgid="6699306198357496731">"1M/lần tải nhật ký"</item>
+ <item msgid="5748528643937500349">"4M/lần tải nhật ký"</item>
+ <item msgid="1978629051085111592">"16M/lần tải nhật ký"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Không bao giờ kiểm tra"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Gián đoạn hạn chế"</item>
<item msgid="8735337502532332056">"Gián đoạn bằng 0"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Bình thường"</item>
+ <item msgid="866544120205026771">"Trung bình"</item>
+ <item msgid="7851902244436886890">"Thấp"</item>
+ <item msgid="3022922196817563960">"Quan trọng"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Liên tục"</item>
+ <item msgid="5779398140277006695">"Hoạt động hàng đầu"</item>
+ <item msgid="1439598363694578255">"Quan trọng (nền trước)"</item>
+ <item msgid="3396458970745718652">"Quan trọng (nền sau)"</item>
+ <item msgid="5214825238247511992">"Sao lưu"</item>
+ <item msgid="311372689168254967">"Hạng nặng"</item>
+ <item msgid="7438189122367820362">"Dịch vụ (đang chạy)"</item>
+ <item msgid="918687422516982498">"Dịch vụ (đang khởi động lại)"</item>
+ <item msgid="6807727069641853029">"Người nhận"</item>
+ <item msgid="6782857406100845127">"Màn hình chính"</item>
+ <item msgid="2860945127596974299">"Hoạt động sau cùng"</item>
+ <item msgid="8610560843693675830">"Được lưu trong bộ nhớ cache (hoạt động)"</item>
+ <item msgid="4338089220026248848">"Được lưu trong bộ nhớ cache (máy khách hoạt động)"</item>
+ <item msgid="6652164677254579050">"Được lưu trong bộ nhớ cache (trống)"</item>
+ </string-array>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 348edc8..d2a978b 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Trường cổng phải trống nếu trường máy chủ lưu trữ trống."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Cổng bạn đã nhập không hợp lệ."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP được sử dụng bởi trình duyệt nhưng có thể không được sử dụng bởi các ứng dụng khác."</string>
- <string name="proxy_url" msgid="2523518669129974654">"URL PAC: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"URL PAC: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Vị trí:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID lân cận:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"CellInfo:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Hiển thị thông tin tiểu sử trên màn hình khóa"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Thông tin tiểu sử"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Vị trí"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Tài khoản"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Bảo mật"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Đặt Vị trí của tôi, mở khóa màn hình, khóa thẻ SIM, khóa bộ nhớ thông tin xác thực"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Đặt Vị trí của tôi, mở khóa màn hình, khóa bộ nhớ thông tin xác thực"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Đang mã hóa"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Vui lòng đợi trong khi máy tính bảng của bạn được mã hóa. Hoàn tất <xliff:g id="PERCENT">^1</xliff:g>%."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Vui lòng đợi trong khi điện thoại của bạn được mã hóa. Hoàn tất <xliff:g id="PERCENT">^1</xliff:g>%."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Chờ trong khi máy tính bảng của bạn đang được mã hóa. Thời gian còn lại: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Chờ trong khi điện thoại của bạn đang được mã hóa. Thời gian còn lại: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Hãy thử lại sau <xliff:g id="DELAY">^1</xliff:g> giây."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Nhập mật khẩu của bạn"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Mã hóa không thành công"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Không phát âm thanh khi lắp hoặc tháo máy tính bảng khỏi đế"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Không phát âm thanh khi lắp hoặc tháo điện thoại khỏi đế"</string>
<string name="account_settings" msgid="6403589284618783461">"Tài khoản"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Cá nhân"</string>
+ <string name="category_work" msgid="8699184680584175622">"Cơ quan"</string>
<string name="search_settings" msgid="1910951467596035063">"Tìm kiếm"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Quản lý cài đặt và lịch sử tìm kiếm"</string>
<string name="display_settings" msgid="7965901687241669598">"Hiển thị"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Tùy chọn nhà phát triển"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Đặt tùy chọn cho phát triển ứng dụng"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Tùy chọn dành cho nhà phát triển không khả dụng cho người dùng này"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Cài đặt VPN không khả dụng cho người dùng này"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Cài đặt chia sẻ kết nối không khả dụng cho người dùng này"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Cài đặt tên điểm truy cập không khả dụng cho người dùng này"</string>
<string name="enable_adb" msgid="7982306934419797485">"Gỡ lỗi USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Chế độ gỡ lỗi khi USB được kết nối"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Thu hồi ủy quyền gỡ lỗi USB"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Màn hình sẽ không bao giờ chuyển sang chế độ nghỉ khi sạc"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Bật nhật ký theo dõi HCI Bluetooth"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Giữ tất cả các gói HCI bluetooth trong một tệp"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Chọn thời gian chạy"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Chọn thời gian chạy"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Khởi động lại để thay đổi thời gian chạy từ <xliff:g id="OLD">%1$s</xliff:g> sang <xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Chứng nhận hiển thị không dây"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Bật ghi nhật ký chi tiết WiFi"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Chuyển vùng wifi tích cực sang mạng di động"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Luôn cho phép quét chuyển vùng Wifi"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Hiển thị tùy chọn chứng nhận hiển thị không dây"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Tăng mức ghi nhật ký Wifi, hiển thị mỗi SSID RSSI trong bộ chọn WiFi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Khi được bật, Wifi sẽ tích cực hơn trong việc chuyển vùng kết nối dữ liệu sang mạng di động khi tín hiệu Wifi yếu"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Cho phép/Không cho phép quét chuyển vùng Wifi dựa trên lưu lượng truy cập dữ liệu có tại giao diện"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Kích cỡ tải trình ghi"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Chọn k.cỡ Trình ghi/lần tải n.ký"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Cho phép vị trí mô phỏng"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Cho phép vị trí mô phỏng"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Cho phép gỡ lỗi USB?"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Thời gian chạy"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Dịch vụ"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Thời lượng"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Chi tiết bộ nhớ"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Trạng thái bộ nhớ"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Mức sử dụng bộ nhớ"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Gốc"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Bộ nhớ cache Kernel"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Hoán đổi ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Miễn phí"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Tổng số"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 giờ"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 giờ"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 giờ"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Xóa tất cả chứng chỉ"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Thông tin đăng nhập tin cậy"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Hiển thị chứng chỉ CA tin cậy"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Nâng cao"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Loại lưu trữ"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Dựa trên phần cứng"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Chỉ phần mềm"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Không có thông tin đăng nhập cho người dùng này"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Vẽ hình mở khóa của bạn"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Bạn cần vẽ hình mở khóa của mình để xác nhận cài đặt thông tin xác thực."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Chạm "<b>"Tiếp theo"</b>" để tiếp tục thiết lập.\n\nChạm "<b>"Quay lại"</b>" để kết nối với mạng Wi‑Fi khác."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Đồng bộ hóa đã được bật"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Đồng bộ hóa đã bị tắt"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Đang đồng bộ hóa"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Lỗi đồng bộ hóa"</string>
<string name="sync_failed" msgid="1696499856374109647">"Đồng bộ hóa không thành công"</string>
<string name="sync_active" msgid="8476943765960863040">"Đồng bộ hóa hoạt động"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Hiển thị viền đoạn video, lề, v.v.."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Buộc hướng bố cục RTL"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Buộc hướng bố cục màn hình RTL cho tất cả ngôn ngữ"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Chế độ tiết kiệm pin"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Bật cài đặt tiết kiệm pin"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Hiển thị mức sử dụng CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Lớp phủ màn hình hiển thị mức sử dụng CPU hiện tại"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Bắt buộc kết xuất GPU"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Hiển thị tất cả nội dung thông báo"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Ẩn nội dung thông báo nhạy cảm"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Không hiển thị thông báo nào"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Khi đang bật chế độ không làm phiền"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Ẩn thông báo mới khỏi danh sách"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Hiển thị tất cả thông báo trong danh sách"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Thông báo ứng dụng"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Âm thanh khác"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Âm bàn phím số"</string>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 320337c..ea9eae6 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"无"</item>
<item msgid="8673874894887358090">"手动"</item>
+ <item msgid="168893341855953140">"代理自动配置"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"无"</item>
@@ -231,96 +232,13 @@
<item msgid="886742181977884584">"媒体"</item>
<item msgid="7924928667052300589">"设备"</item>
</string-array>
- <string-array name="app_ops_summaries">
- <item msgid="4979188868761515915">"粗略位置"</item>
- <item msgid="5789673140227507995">"精准位置"</item>
- <item msgid="1061584358377390581">"GPS"</item>
- <item msgid="5387405117297558954">"振动"</item>
- <item msgid="3434165993711230924">"读取联系人"</item>
- <item msgid="616161687718081936">"修改联系人"</item>
- <item msgid="7638002295329050091">"读取通话记录"</item>
- <item msgid="6546959730920410907">"修改通话记录"</item>
- <item msgid="446877710771379667">"读取日历"</item>
- <item msgid="7674458294386319722">"修改日历"</item>
- <item msgid="8281201165558093009">"WLAN 扫描"</item>
- <item msgid="8694611243479480497">"通知"</item>
- <item msgid="7776439107987345446">"手机网络扫描"</item>
- <item msgid="514615766544675057">"拨打电话"</item>
- <item msgid="8181415497109310680">"读取短信"</item>
- <item msgid="6816551144382117307">"编写短信"</item>
- <item msgid="4600463921908905030">"接收短信"</item>
- <item msgid="5958926493289432745">"接收紧急短信"</item>
- <item msgid="4945269495221089540">"接收彩信"</item>
- <item msgid="5570472453573929087">"接收 WAP PUSH 消息"</item>
- <item msgid="7125408150230860501">"发送短信"</item>
- <item msgid="7080337936612188061">"读取 ICC 短信"</item>
- <item msgid="587124103118495063">"写入 ICC 短信"</item>
- <item msgid="2320577158869025503">"修改设置"</item>
- <item msgid="1545733463471924009">"在顶部绘制"</item>
- <item msgid="3609046903962454582">"访问通知"</item>
- <item msgid="4671646036128214513">"相机"</item>
- <item msgid="1097324338692486211">"录制音频"</item>
- <item msgid="5031552983987798163">"播放音频"</item>
- <item msgid="8374996688066472414">"读取剪贴板内容"</item>
- <item msgid="3045529469061083747">"修改剪贴板内容"</item>
- <item msgid="5124443975763747838">"媒体按钮"</item>
- <item msgid="4547883971364273343">"音频焦点"</item>
- <item msgid="2603878814882344450">"主音量"</item>
- <item msgid="7136963238377062018">"语音音量"</item>
- <item msgid="4270236897655923007">"铃声音量"</item>
- <item msgid="6325739889222559394">"媒体音量"</item>
- <item msgid="5762123934816216821">"闹钟音量"</item>
- <item msgid="785049718065337473">"通知音量"</item>
- <item msgid="6700305533746877052">"蓝牙音量"</item>
- <item msgid="2029227495214047094">"保持唤醒状态"</item>
- <item msgid="26109888160231211">"监测位置"</item>
- <item msgid="5753382310468855812">"监控高电耗位置信息服务"</item>
- </string-array>
- <string-array name="app_ops_labels">
- <item msgid="6602854600289714121">"位置"</item>
- <item msgid="8677040780775113033">"位置"</item>
- <item msgid="1660743989948992916">"位置"</item>
- <item msgid="8791172739860195290">"振动"</item>
- <item msgid="383413555642128046">"读取联系人"</item>
- <item msgid="3654594895269697313">"修改联系人"</item>
- <item msgid="7928393476362362538">"读取通话记录"</item>
- <item msgid="6248591205254641116">"修改通话记录"</item>
- <item msgid="6093344633066170692">"读取日历"</item>
- <item msgid="1334886368750347692">"修改日历"</item>
- <item msgid="1638204101698708656">"位置"</item>
- <item msgid="2154671955760380322">"发布通知"</item>
- <item msgid="4282477730595931828">"位置"</item>
- <item msgid="4891423912898525905">"拨打电话"</item>
- <item msgid="2623604824935968113">"读取短信/彩信"</item>
- <item msgid="4420177125221176306">"编写短信/彩信"</item>
- <item msgid="3986142739951490025">"接收短信/彩信"</item>
- <item msgid="3984213795861739778">"接收短信/彩信"</item>
- <item msgid="3656243523752472788">"接收短信/彩信"</item>
- <item msgid="8105802370238551510">"接收短信/彩信"</item>
- <item msgid="1407766984645388488">"发送短信/彩信"</item>
- <item msgid="3527273606643794973">"读取短信/彩信"</item>
- <item msgid="4370895547001583812">"编写短信/彩信"</item>
- <item msgid="4218544235221631789">"修改设置"</item>
- <item msgid="736541391767350377">"在顶部绘制"</item>
- <item msgid="5530815681721654194">"访问通知"</item>
- <item msgid="781213371706962767">"相机"</item>
- <item msgid="1720492593061838172">"录制音频"</item>
- <item msgid="3493046322001257041">"播放音频"</item>
- <item msgid="136815868796597058">"读取剪贴板内容"</item>
- <item msgid="5238692940326972503">"修改剪贴板内容"</item>
- <item msgid="5753789168376302997">"媒体按钮"</item>
- <item msgid="3265262911688671938">"音频焦点"</item>
- <item msgid="2098976479485046797">"主音量"</item>
- <item msgid="5660213838861789350">"语音音量"</item>
- <item msgid="7983336752371254444">"铃声音量"</item>
- <item msgid="7878027809189330917">"媒体音量"</item>
- <item msgid="7260546305036218513">"闹钟音量"</item>
- <item msgid="9103719301075748925">"通知音量"</item>
- <item msgid="7025966722295861512">"蓝牙音量"</item>
- <item msgid="4665183401128289653">"保持唤醒状态"</item>
- <item msgid="8584357129746649222">"位置"</item>
- <item msgid="7669257279311110599">"位置信息"</item>
- </string-array>
+ <!-- no translation found for app_ops_summaries:40 (3810969981743709839) -->
+ <!-- no translation found for app_ops_summaries:41 (2627903914574908209) -->
+ <!-- no translation found for app_ops_summaries:42 (1395372654968157578) -->
+ <!-- no translation found for app_ops_summaries:43 (3238451051299611853) -->
+ <!-- no translation found for app_ops_labels:40 (2265317984004577529) -->
+ <!-- no translation found for app_ops_labels:41 (3646325683886507917) -->
+ <!-- no translation found for app_ops_labels:43 (7745724368696313169) -->
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"短"</item>
<item msgid="2560532955514699713">"中"</item>
@@ -365,15 +283,19 @@
<item msgid="6039700130994371612">"蓝底黄字"</item>
<item msgid="7169235156349580064">"自定义"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART（调试）"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"使用 Dalvik"</item>
- <item msgid="5131846588686178907">"使用 ART"</item>
- <item msgid="4530003713865319928">"使用 ART 调试版本"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"每个日志缓冲区64K"</item>
+ <item msgid="2822309747675758628">"每个日志缓冲区256K"</item>
+ <item msgid="6699306198357496731">"每个日志缓冲区1M"</item>
+ <item msgid="5748528643937500349">"每个日志缓冲区4M"</item>
+ <item msgid="1978629051085111592">"每个日志缓冲区16M"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"永不检查"</item>
@@ -483,4 +405,26 @@
<item msgid="5656544177755411222">"有限打扰"</item>
<item msgid="8735337502532332056">"零打扰"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"正常"</item>
+ <item msgid="866544120205026771">"中等"</item>
+ <item msgid="7851902244436886890">"不足"</item>
+ <item msgid="3022922196817563960">"严重不足"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"常驻"</item>
+ <item msgid="5779398140277006695">"顶层活动"</item>
+ <item msgid="1439598363694578255">"重要（前台）"</item>
+ <item msgid="3396458970745718652">"重要（后台）"</item>
+ <item msgid="5214825238247511992">"备份"</item>
+ <item msgid="311372689168254967">"重量级"</item>
+ <item msgid="7438189122367820362">"服务（运行中）"</item>
+ <item msgid="918687422516982498">"服务（重新启动中）"</item>
+ <item msgid="6807727069641853029">"接收器"</item>
+ <item msgid="6782857406100845127">"主屏幕"</item>
+ <item msgid="2860945127596974299">"前一个活动"</item>
+ <item msgid="8610560843693675830">"已缓存（活动）"</item>
+ <item msgid="4338089220026248848">"已缓存（活动客户端）"</item>
+ <item msgid="6652164677254579050">"已缓存（空）"</item>
+ </string-array>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 39b52ab..7029431 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"如果主机字段为空，则端口字段必须为空。"</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"您键入的端口无效。"</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"浏览器会使用 HTTP 代理，但其他应用可能不会使用。"</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC 网址： "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC网址： "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"地点："</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相邻的 CID："</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"小区信息："</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"在锁定屏幕上显示个人资料信息"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"个人资料信息"</string>
<string name="location_settings_title" msgid="1369675479310751735">"位置信息"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"帐户"</string>
<string name="security_settings_title" msgid="7945465324818485460">"安全"</string>
<string name="security_settings_summary" msgid="967393342537986570">"设置我的位置、屏幕解锁、SIM 卡锁定和凭据存储锁定"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"设置我的位置、屏幕解锁和凭据存储锁定"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"正在加密"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"正在加密您的平板电脑（已完成 <xliff:g id="PERCENT">^1</xliff:g>%），请耐心等待。"</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"正在加密您的手机（已完成 <xliff:g id="PERCENT">^1</xliff:g>%），请耐心等待。"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"您的平板电脑正在加密，请耐心等待。剩余时间：<xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"您的手机正在加密，请耐心等待。剩余时间：<xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> 秒后重试。"</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"键入密码"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失败"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"平板电脑插入基座或拔出时不发出声音"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"手机插入基座或拔出时不发出声音"</string>
<string name="account_settings" msgid="6403589284618783461">"帐户"</string>
+ <string name="category_personal" msgid="1299663247844969448">"个人"</string>
+ <string name="category_work" msgid="8699184680584175622">"工作"</string>
<string name="search_settings" msgid="1910951467596035063">"搜索"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"管理搜索设置和历史记录"</string>
<string name="display_settings" msgid="7965901687241669598">"显示"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"开发者选项"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"设置应用开发选项"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"此用户无法使用开发者选项"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"此用户无权修改VPN设置"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"此用户无权修改网络共享设置"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"此用户无权修改接入点名称设置"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB 调试"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"连接 USB 后启用调试模式"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"撤消 USB 调试授权"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"充电时屏幕不会休眠"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"启用蓝牙 HCI 信息收集日志"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"捕获单个文件中的所有蓝牙 HCI 包"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"选择运行环境"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"选择运行环境"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"要重新启动以将运行环境从“<xliff:g id="OLD">%1$s</xliff:g>”改为“<xliff:g id="NEW">%2$s</xliff:g>”吗？"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"无线显示认证"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"启用WLAN详细日志记录功能"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"主动从WLAN网络切换到移动数据网络"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"一律允许WLAN漫游扫描"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"显示无线显示认证选项"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"提升WLAN日志记录级别（在WLAN选择器中显示每个SSID的RSSI）"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"启用此功能后，系统会在WLAN信号较弱时，主动将网络模式从WLAN网络切换到移动数据网络"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"根据接口中目前的数据流量允许/禁止WLAN漫游扫描"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"日志记录器缓冲区大小"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"选择每个日志缓冲区的日志记录器大小"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"允许模拟位置"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"允许模拟位置"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"是否允许 USB 调试？"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"运行时间"</string>
<string name="services_subtitle" msgid="4296402367067266425">"服务"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"时间长度"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"内存详情"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"内存状态"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"内存使用量"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"内核"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"本地"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"内核缓存"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRAM交换分区"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"可用"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"总使用量"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3小时"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6小时"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12小时"</string>
@@ -1682,9 +1703,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"删除所有证书"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"信任的凭据"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"显示信任的CA证书"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"高级"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"存储类型"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"硬件支持"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"仅限软件"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"此用户无法查看或修改凭据"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"绘制您的解锁图案"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您需要绘制解锁图案，以确认凭据安装操作。"</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1765,6 +1788,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"触摸"<b>"下一步"</b>"可继续进行设置。\n\n触摸"<b>"返回"</b>"可连接到其他 WLAN 网络。"</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"同步功能已启用"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"未启用同步功能"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"正在同步"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"同步错误。"</string>
<string name="sync_failed" msgid="1696499856374109647">"同步失败"</string>
<string name="sync_active" msgid="8476943765960863040">"正在同步"</string>
@@ -1857,8 +1881,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"显示剪辑边界、边距等。"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"强制使用从右到左的布局方向"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"强制将所有语言区域的屏幕布局方向改为从右到左"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"低电耗模式"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"开启省电设置"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"显示 CPU 使用情况"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"屏幕叠加层显示当前 CPU 使用情况"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"强制进行 GPU 渲染"</string>
@@ -2135,9 +2157,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"显示所有通知内容"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"隐藏敏感通知内容"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"完全不显示通知"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"开启勿扰模式时"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"在列表中隐藏新通知"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"在列表中显示所有通知"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"应用通知"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"其他提示音"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"拨号键盘音效"</string>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 014923b..0d18937 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"無"</item>
<item msgid="8673874894887358090">"手動"</item>
+ <item msgid="168893341855953140">"Proxy 自動設定"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"沒有"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"鬧鐘音量"</item>
<item msgid="785049718065337473">"通知音量"</item>
<item msgid="6700305533746877052">"藍牙音量"</item>
- <item msgid="2029227495214047094">"保持啟用"</item>
- <item msgid="26109888160231211">"監控位置"</item>
- <item msgid="5753382310468855812">"監控高功率位置"</item>
+ <item msgid="3810969981743709839">"關閉/開啟麥克風"</item>
+ <item msgid="2627903914574908209">"保持啟用"</item>
+ <item msgid="1395372654968157578">"監控位置"</item>
+ <item msgid="3238451051299611853">"監控高功率位置"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"位置"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"鬧鐘音量"</item>
<item msgid="9103719301075748925">"通知音量"</item>
<item msgid="7025966722295861512">"藍牙音量"</item>
- <item msgid="4665183401128289653">"保持啟用"</item>
- <item msgid="8584357129746649222">"位置"</item>
+ <item msgid="2265317984004577529">"關閉/開啟麥克風"</item>
+ <item msgid="3646325683886507917">"保持啟用"</item>
<item msgid="7669257279311110599">"位置"</item>
+ <item msgid="7745724368696313169">"位置"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"短"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"藍底黃字"</item>
<item msgid="7169235156349580064">"自訂"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (偵錯)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"使用 Dalvik"</item>
- <item msgid="5131846588686178907">"使用 ART"</item>
- <item msgid="4530003713865319928">"使用 ART 偵錯版本"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"每個記錄緩衝區 64K"</item>
+ <item msgid="2822309747675758628">"每個記錄緩衝區 256K"</item>
+ <item msgid="6699306198357496731">"每個記錄緩衝區 1M"</item>
+ <item msgid="5748528643937500349">"每個記錄緩衝區 4M"</item>
+ <item msgid="1978629051085111592">"每個記錄緩衝區 16M"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"不要檢查"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"有限度干擾"</item>
<item msgid="8735337502532332056">"零干擾"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"正常"</item>
+ <item msgid="866544120205026771">"中"</item>
+ <item msgid="7851902244436886890">"低"</item>
+ <item msgid="3022922196817563960">"嚴重不足"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"持續"</item>
+ <item msgid="5779398140277006695">"重大活動"</item>
+ <item msgid="1439598363694578255">"重要 (前景)"</item>
+ <item msgid="3396458970745718652">"重要 (背景)"</item>
+ <item msgid="5214825238247511992">"備份"</item>
+ <item msgid="311372689168254967">"高負載"</item>
+ <item msgid="7438189122367820362">"服務 (執行中)"</item>
+ <item msgid="918687422516982498">"服務 (重新啟動中)"</item>
+ <item msgid="6807727069641853029">"接收器"</item>
+ <item msgid="6782857406100845127">"首頁"</item>
+ <item msgid="2860945127596974299">"最近活動"</item>
+ <item msgid="8610560843693675830">"快取 (活動)"</item>
+ <item msgid="4338089220026248848">"快取 (活動用戶端)"</item>
+ <item msgid="6652164677254579050">"快取 (清空)"</item>
+ </string-array>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 7bc1847..3bc46e4 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"如果主機欄位留空，則通訊埠欄位也必須留空。"</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"您所輸入的通訊埠無效。"</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"瀏覽器會使用 HTTP Proxy，但其他應用程式不一定會採用這項設定"</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC 網址： "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC 網址： "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"位置："</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相鄰的客戶編號："</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"手機資訊："</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"在上鎖畫面上顯示個人檔案資料"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"個人檔案資料"</string>
<string name="location_settings_title" msgid="1369675479310751735">"位置"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"帳戶"</string>
<string name="security_settings_title" msgid="7945465324818485460">"安全"</string>
<string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、螢幕解鎖及認證儲存空間鎖定"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"加密中"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"平板電腦正在進行加密，請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"手機正在進行加密，請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"平板電腦加密作業正在進行中，請稍候 (剩餘時間：<xliff:g id="DURATION">^1</xliff:g>)"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"手機加密作業正在進行中，請稍候 (剩餘時間：<xliff:g id="DURATION">^1</xliff:g>)"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> 秒後再試一次。"</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"輸入密碼"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失敗"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"將平板電腦置入座架或移出座架時，不要播放音效"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"手機插入底座或離開底座時，不要播放音效"</string>
<string name="account_settings" msgid="6403589284618783461">"帳戶"</string>
+ <string name="category_personal" msgid="1299663247844969448">"個人"</string>
+ <string name="category_work" msgid="8699184680584175622">"公司"</string>
<string name="search_settings" msgid="1910951467596035063">"搜尋"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"管理搜尋設定和記錄"</string>
<string name="display_settings" msgid="7965901687241669598">"顯示"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"開發人員選項"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"設定應用程式開發選項"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"這位使用者無法使用開發人員選項"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"這位使用者無法修改 VPN 設定"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"這位使用者無法修改網絡共享設定"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"這位使用者無法修改接入點名稱設定"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB 偵錯"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"連接 USB 時進入偵錯模式"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"撤銷 USB 偵錯授權"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"充電時屏幕一律不進入休眠狀態"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"啟用藍牙 HCI 窺探記錄"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"擷取單一檔案內的所有藍牙 HCI 封包"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"選取執行階段"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"選取執行階段"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"要重新啟動裝置，將執行階段從 <xliff:g id="OLD">%1$s</xliff:g> 變更為 <xliff:g id="NEW">%2$s</xliff:g> 嗎？"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"無線螢幕分享認證"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"啟用 Wi-Fi 詳細記錄功能"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"加強 WiFi 至流動數據轉換"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"一律允許 WiFi 漫遊掃描"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"顯示無線螢幕分享認證的選項"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"提升 Wi-Fi 記錄功能等級 (在「Wi-Fi 挑選器」中根據 SSID RSSI 顯示)"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"啟用時，WiFi 連線在訊號不穩的情況下會更積極轉換成流動數據連線"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"根據介面中目前的數據流量允許/禁止 WiFi 漫遊掃描"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"記錄器緩衝區空間"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"選取每個記錄緩衝區的記錄器空間"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"允許 USB 偵錯嗎？"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"執行時間"</string>
<string name="services_subtitle" msgid="4296402367067266425">"服務"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"持續時間"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"記憶體詳情"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"記憶體狀態"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"記憶體用量"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"核心"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"本機"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"核心快取"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRAM 切換"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"可用"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"總計"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 小時"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 小時"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 小時"</string>
@@ -1686,9 +1707,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"移除所有憑證"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"可信的憑證"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"顯示可信的 CA 憑證"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"進階"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"儲存空間類型"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"硬件支援"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"只限軟件"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"這位使用者無法存取憑證"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"畫出解鎖圖案"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您必須畫出解鎖圖案，才能確認安裝憑證。"</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1769,6 +1792,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"輕觸 [下一步]"<b></b>" 即可繼續安裝；\n\n輕觸 [返回]"<b></b>" 則可連接其他 Wi-Fi 網絡。"</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"同步已啟用"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"同步已停用"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"目前正在同步處理"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"同步處理錯誤"</string>
<string name="sync_failed" msgid="1696499856374109647">"同步失敗"</string>
<string name="sync_active" msgid="8476943765960863040">"同步啟用中"</string>
@@ -1861,8 +1885,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"顯示剪輯範圍、邊界等"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"強制使用從右至左的版面配置方向"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"強制將所有語言代碼的畫面配置方向改為從右至左"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"低耗電量模式"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"啟用節約電池用量設定"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"顯示 CPU 使用量"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"在屏幕上重疊顯示目前的 CPU 使用量"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"強制使用 GPU 轉譯"</string>
@@ -2139,9 +2161,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"隱藏敏感通知內容"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"完全不顯示通知"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"當請勿騷擾開啟時"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"從清單中隱藏新通知"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"在清單中顯示所有通知"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"其他音效"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"撥號盤音效"</string>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index e973b93..1b8ce9c 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"無"</item>
<item msgid="8673874894887358090">"手動"</item>
+ <item msgid="168893341855953140">"Proxy 自動設定"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"無"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"鬧鐘音量"</item>
<item msgid="785049718065337473">"通知音量"</item>
<item msgid="6700305533746877052">"藍牙音量"</item>
- <item msgid="2029227495214047094">"停用休眠"</item>
- <item msgid="26109888160231211">"監控位置"</item>
- <item msgid="5753382310468855812">"監控高耗電定位功能"</item>
+ <item msgid="3810969981743709839">"關閉/開啟麥克風"</item>
+ <item msgid="2627903914574908209">"停用休眠"</item>
+ <item msgid="1395372654968157578">"監控位置"</item>
+ <item msgid="3238451051299611853">"監控高耗電定位功能"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"位置"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"鬧鐘音量"</item>
<item msgid="9103719301075748925">"通知音量"</item>
<item msgid="7025966722295861512">"藍牙音量"</item>
- <item msgid="4665183401128289653">"停用休眠"</item>
- <item msgid="8584357129746649222">"定位"</item>
+ <item msgid="2265317984004577529">"關閉/開啟麥克風"</item>
+ <item msgid="3646325683886507917">"停用休眠"</item>
<item msgid="7669257279311110599">"定位"</item>
+ <item msgid="7745724368696313169">"定位"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"短"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"藍底黃字"</item>
<item msgid="7169235156349580064">"自訂"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"Dalvik"</item>
- <item msgid="8978402910750533864">"ART"</item>
- <item msgid="7839859333977894115">"ART (偵錯)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"使用 Dalvik"</item>
- <item msgid="5131846588686178907">"使用 ART"</item>
- <item msgid="4530003713865319928">"使用 ART 偵錯版本"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"每個紀錄緩衝區 64K"</item>
+ <item msgid="2822309747675758628">"每個紀錄緩衝區 256K"</item>
+ <item msgid="6699306198357496731">"每個紀錄緩衝區 1M"</item>
+ <item msgid="5748528643937500349">"每個紀錄緩衝區 4M"</item>
+ <item msgid="1978629051085111592">"每個紀錄緩衝區 16M"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"不要檢查"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"有限干擾"</item>
<item msgid="8735337502532332056">"零干擾"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"正常"</item>
+ <item msgid="866544120205026771">"中"</item>
+ <item msgid="7851902244436886890">"低"</item>
+ <item msgid="3022922196817563960">"嚴重不足"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"持續"</item>
+ <item msgid="5779398140277006695">"重大活動"</item>
+ <item msgid="1439598363694578255">"重要 (前景)"</item>
+ <item msgid="3396458970745718652">"重要 (背景)"</item>
+ <item msgid="5214825238247511992">"備份"</item>
+ <item msgid="311372689168254967">"高負載"</item>
+ <item msgid="7438189122367820362">"服務 (執行中)"</item>
+ <item msgid="918687422516982498">"服務 (重新啟動中)"</item>
+ <item msgid="6807727069641853029">"接收器"</item>
+ <item msgid="6782857406100845127">"主螢幕"</item>
+ <item msgid="2860945127596974299">"最近活動"</item>
+ <item msgid="8610560843693675830">"快取 (活動)"</item>
+ <item msgid="4338089220026248848">"快取 (活動用戶端)"</item>
+ <item msgid="6652164677254579050">"快取 (清空)"</item>
+ </string-array>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 7131e06..c17f9ca 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"若主機欄位空白，連接埠欄位也須空白。"</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"您所輸入的通訊埠無效。"</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"瀏覽器會使用 HTTP Proxy，但其他應用程式不一定會採用這項設定。"</string>
- <string name="proxy_url" msgid="2523518669129974654">"PAC 網址： "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"PAC 網址： "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"位置："</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"相鄰的客戶編號："</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"儲存格資訊："</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"在鎖定畫面上顯示個人資料資訊"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"個人資料資訊"</string>
<string name="location_settings_title" msgid="1369675479310751735">"定位"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"帳戶"</string>
<string name="security_settings_title" msgid="7945465324818485460">"安全性"</string>
<string name="security_settings_summary" msgid="967393342537986570">"設定我的位置、畫面解鎖、SIM 卡鎖定、認證儲存空間鎖定"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"設定我的位置、解除鎖定畫面及鎖定認證儲存空間"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"加密中"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"平板電腦正在進行加密，請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"正在對手機加密，請稍候 (已完成 <xliff:g id="PERCENT">^1</xliff:g>%)。"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"平板電腦加密作業正在進行中，請稍候 (剩餘時間：<xliff:g id="DURATION">^1</xliff:g>)"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"手機加密作業正在進行中，請稍候 (剩餘時間：<xliff:g id="DURATION">^1</xliff:g>)"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"<xliff:g id="DELAY">^1</xliff:g> 秒內再試一次。"</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"輸入密碼"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"加密失敗"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"將平板電腦置入座架或移出座架時，不要播放音效"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"手機插入底座或離開底座時，不要播放音效"</string>
<string name="account_settings" msgid="6403589284618783461">"帳戶"</string>
+ <string name="category_personal" msgid="1299663247844969448">"個人"</string>
+ <string name="category_work" msgid="8699184680584175622">"公司"</string>
<string name="search_settings" msgid="1910951467596035063">"搜尋"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"管理搜尋設定和記錄"</string>
<string name="display_settings" msgid="7965901687241669598">"顯示"</string>
@@ -1319,6 +1324,9 @@
<string name="development_settings_title" msgid="215179176067683667">"開發人員選項"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"設定應用程式開發選項"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"這位使用者無法使用開發人員選項"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"這位使用者無法修改 VPN 設定"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"這位使用者無法修改網路共用設定"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"這位使用者無法修改存取點名稱設定"</string>
<string name="enable_adb" msgid="7982306934419797485">"USB 偵錯"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"連接 USB 時進入偵錯模式"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"撤銷 USB 偵錯授權"</string>
@@ -1328,12 +1336,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"充電時螢幕不會進入休眠"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"啟用藍牙 HCI 窺探紀錄"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"擷取單一檔案內的所有藍牙 HCI 封包"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"選取執行階段"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"選取執行階段"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"要重新啟動裝置，將執行階段從 <xliff:g id="OLD">%1$s</xliff:g> 變更為 <xliff:g id="NEW">%2$s</xliff:g> 嗎？"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"無線螢幕分享認證"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"啟用 Wi-Fi 詳細資訊記錄功能"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"加強 WiFi 至行動數據轉換"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"一律允許 WiFi 漫遊掃描"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"顯示無線螢幕分享認證的選項"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"提升 Wi-Fi 記錄功能等級 (在 Wi-Fi 選擇工具中依 SSID RSSI 顯示)"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"啟用時，WiFi 連線在訊號不穩的情況下會更積極轉換成行動數據連線"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"根據介面中目前的數據流量允許/禁止 WiFi 漫遊掃描"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"紀錄器緩衝區空間"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"選取每個紀錄緩衝區的紀錄器空間"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"允許模擬位置"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"允許模擬位置"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"允許 USB 偵錯嗎？"</string>
@@ -1585,6 +1597,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"執行時間"</string>
<string name="services_subtitle" msgid="4296402367067266425">"服務"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"時間長度"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"記憶體詳細資料"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"記憶體狀態"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"記憶體用量"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"核心"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"本機"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"核心快取"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"ZRam 切換"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"可用"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"總計"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 小時"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 小時"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 小時"</string>
@@ -1686,9 +1707,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"移除所有憑證"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"信任的憑證"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"顯示信任的 CA 憑證"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"進階"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"儲存空間類型"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"硬體備份"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"僅限軟體"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"這位使用者無法存取憑證"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"畫出解鎖圖形"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"您必須畫出解鎖圖形，才能確認安裝憑證。"</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1769,6 +1792,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"輕觸 [下一步]"<b></b>" 即可繼續設定程序；\n\n輕觸 [返回]"<b></b>" 則可連線至其他 Wi-Fi 網路。"</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"同步處理已啟用"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"同步處理已停用"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"目前正在同步處理"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"同步處理錯誤。"</string>
<string name="sync_failed" msgid="1696499856374109647">"同步處理失敗"</string>
<string name="sync_active" msgid="8476943765960863040">"同步處理已啟用"</string>
@@ -1861,8 +1885,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"顯示剪輯範圍、邊界等。"</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"強制使用從右至左版面配置方向"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"強制將所有語言代碼的畫面配置方向改為從右至左"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"低耗電模式"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"啟用省電設定"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"顯示 CPU 使用量"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"在螢幕上方顯示目前的 CPU 使用量"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"強制使用 GPU 轉譯"</string>
@@ -2139,9 +2161,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"顯示所有通知內容"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"隱藏機密通知內容"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"完全不顯示通知"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"開啟請勿打擾模式時"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"在清單中隱藏新通知"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"在清單中顯示所有通知"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"應用程式通知"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"其他音效"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"撥號鍵盤音效"</string>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index 8f01e4e..e4b9744 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -196,6 +196,7 @@
<string-array name="wifi_proxy_settings">
<item msgid="4473276491748503377">"Lutho"</item>
<item msgid="8673874894887358090">"Ngokulawulwa"</item>
+ <item msgid="168893341855953140">"Ukulungiselela ngokuzenzakalela kwephroksi"</item>
</string-array>
<string-array name="apn_auth_entries">
<item msgid="3856896061242872146">"Lutho"</item>
@@ -272,9 +273,10 @@
<item msgid="5762123934816216821">"ivolumu ye-alamu"</item>
<item msgid="785049718065337473">"ivolumu yesaziso"</item>
<item msgid="6700305533746877052">"ivolumu ye-bluetooth"</item>
- <item msgid="2029227495214047094">"gcina kuphapheme"</item>
- <item msgid="26109888160231211">"ngamela indawo"</item>
- <item msgid="5753382310468855812">"yongamela indawo yamandla aphezulu"</item>
+ <item msgid="3810969981743709839">"thulisa/yekisa ukuthulisa imakrofoni"</item>
+ <item msgid="2627903914574908209">"gcina kuphapheme"</item>
+ <item msgid="1395372654968157578">"qaphela indawo"</item>
+ <item msgid="3238451051299611853">"qapha indawo yamandla aphezulu"</item>
</string-array>
<string-array name="app_ops_labels">
<item msgid="6602854600289714121">"Indawo"</item>
@@ -317,9 +319,10 @@
<item msgid="7260546305036218513">"Ivolumu ye-alamu"</item>
<item msgid="9103719301075748925">"Ivolumu yesaziso"</item>
<item msgid="7025966722295861512">"Ivolumu ye-Bluetooth"</item>
- <item msgid="4665183401128289653">"Gcina kuphapheme"</item>
- <item msgid="8584357129746649222">"Indawo"</item>
+ <item msgid="2265317984004577529">"Thulisa/yekisa ukuthulisa imakrofoni"</item>
+ <item msgid="3646325683886507917">"Gcina kuphapheme"</item>
<item msgid="7669257279311110599">"Indawo"</item>
+ <item msgid="7745724368696313169">"Indawo"</item>
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Kufushane"</item>
@@ -365,15 +368,19 @@
<item msgid="6039700130994371612">"Okuliphuzi kokuluhlaza"</item>
<item msgid="7169235156349580064">"Ngokwezifiso"</item>
</string-array>
- <string-array name="select_runtime_titles">
- <item msgid="3574453009229338122">"I-Dalvik"</item>
- <item msgid="8978402910750533864">"UBUCIKO"</item>
- <item msgid="7839859333977894115">"UBUCIKO (ukulungisa iphutha)"</item>
+ <string-array name="select_logd_size_titles">
+ <item msgid="3100534874529240291">"64K"</item>
+ <item msgid="505611754508988476">"256K"</item>
+ <item msgid="6361286924268716397">"1M"</item>
+ <item msgid="6405203239560695266">"4M"</item>
+ <item msgid="3025431211013424097">"16M"</item>
</string-array>
- <string-array name="select_runtime_summaries">
- <item msgid="6412880178297884701">"Sebenzisa i-Dalvik"</item>
- <item msgid="5131846588686178907">"Sebenzisa UBUCIKO"</item>
- <item msgid="4530003713865319928">"Sebenzisa ukwakha kokulungisa iphutha LOBUCIKO"</item>
+ <string-array name="select_logd_size_summaries">
+ <item msgid="7346595473588765019">"64K ngebhafa yelogu ngayinye"</item>
+ <item msgid="2822309747675758628">"256K ngebhafa yelogu ngayinye"</item>
+ <item msgid="6699306198357496731">"1M ngebhafa yelogu ngayinye"</item>
+ <item msgid="5748528643937500349">"4M ngebhafa yelogu ngayinye"</item>
+ <item msgid="1978629051085111592">"16M ngebhafa yelogu ngayinye"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Akusoze kuhlole"</item>
@@ -483,4 +490,26 @@
<item msgid="5656544177755411222">"Iziphazamiso ezinomkhawulo"</item>
<item msgid="8735337502532332056">"Iziphazamiso ezingekho"</item>
</string-array>
+ <string-array name="proc_stats_memory_states">
+ <item msgid="8845855295876909468">"Okujwayelekile"</item>
+ <item msgid="866544120205026771">"Maphakathi"</item>
+ <item msgid="7851902244436886890">"Phansi"</item>
+ <item msgid="3022922196817563960">"Bucayi"</item>
+ </string-array>
+ <string-array name="proc_stats_process_states">
+ <item msgid="5069825997142785829">"Qhubekayo"</item>
+ <item msgid="5779398140277006695">"Umsebenzi ophezulu"</item>
+ <item msgid="1439598363694578255">"Kubalulekile (okungaphambili)"</item>
+ <item msgid="3396458970745718652">"Kubalulekile (okungemuva)"</item>
+ <item msgid="5214825238247511992">"Yenza isipele"</item>
+ <item msgid="311372689168254967">"Isisindo esikhulu"</item>
+ <item msgid="7438189122367820362">"Isevisi (iyenzakala)"</item>
+ <item msgid="918687422516982498">"Isevisi (iqala kabusha)"</item>
+ <item msgid="6807727069641853029">"Isamukeli"</item>
+ <item msgid="6782857406100845127">"Ikhaya"</item>
+ <item msgid="2860945127596974299">"Umsebenzi wokugcina"</item>
+ <item msgid="8610560843693675830">"Kulondoloziwe (umsebenzi)"</item>
+ <item msgid="4338089220026248848">"Kulondoloziwe (iklayenti lomsebenzi)"</item>
+ <item msgid="6652164677254579050">"Kulondoloziwe (lutho)"</item>
+ </string-array>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 9010d4f..6b19af7 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -203,7 +203,7 @@
<string name="proxy_error_empty_host_set_port" msgid="2451694104858226781">"Inkundla yembobo kumelwe ingabi nalutho uma inkundla yesikhungo ingenalutho."</string>
<string name="proxy_error_invalid_port" msgid="2671425042711054494">"Imbobo oyithayiphile ayilungile."</string>
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Iphrokzi ye-HTTP isetshenziswa isiphequluli kodwa kungenzeka ingasetshenziswa ezinye izinhlelo zokusebenza"</string>
- <string name="proxy_url" msgid="2523518669129974654">"I-PAC URL: "</string>
+ <string name="proxy_url_title" msgid="7185282894936042359">"I-PAC URL: "</string>
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Indawo:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"I-CID Yokwakhelana:"</string>
<string name="radio_info_cellinfo_label" msgid="1300937728020622362">"Ulwazi leseli:"</string>
@@ -324,6 +324,7 @@
<string name="show_profile_info_on_lockscreen_label" msgid="2741208907263877990">"Bonisa ulwazi lwephrofayela ekukhiyeni isikrini"</string>
<string name="profile_info_settings_title" msgid="3518603215935346604">"Ulwazi lwephrofayela"</string>
<string name="location_settings_title" msgid="1369675479310751735">"Indawo"</string>
+ <string name="account_settings_title" msgid="626177544686329806">"Ama-akhawunti"</string>
<string name="security_settings_title" msgid="7945465324818485460">"Ukuphepha"</string>
<string name="security_settings_summary" msgid="967393342537986570">"Setha Indawo Yami, ukuvula isikrini, ukuvala ikhadi le-SIM, ukuvala isitoreji sokuqinisekisa"</string>
<string name="cdma_security_settings_summary" msgid="6068799952798901542">"Setha Indawo Yami, ukuvula isikrini, ukuvala isitoreji seziqinisekiso"</string>
@@ -346,6 +347,8 @@
<string name="crypt_keeper_setup_title" msgid="1783951453124244969">"Iyabethelwa"</string>
<string name="crypt_keeper_setup_description" product="tablet" msgid="6689952371032099350">"Sicela ulinde ngenkathi ithebhulethi yakho ibhalwa ngemfihlo. <xliff:g id="PERCENT">^1</xliff:g>% okuphelile."</string>
<string name="crypt_keeper_setup_description" product="default" msgid="951918761585534875">"Sicela ulinde ngenkathi ifoni ihlelwa ngokubhala ngokufihlekileyo <xliff:g id="PERCENT">^1</xliff:g> % iqedile."</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet" msgid="1655047311546745695">"Linda ngenkathi ithebulethi yakho ibhalwa ngekhodi. Isikhathi esisele: <xliff:g id="DURATION">^1</xliff:g>"</string>
+ <string name="crypt_keeper_setup_time_remaining" product="default" msgid="1862964662304683072">"Linda ngenkathi ifoni yakho ibhalwa ngekhodi. Isikhathi esisele: <xliff:g id="DURATION">^1</xliff:g>"</string>
<string name="crypt_keeper_cooldown" msgid="685210918307862395">"Zama futhi emasekhondini angu-<xliff:g id="DELAY">^1</xliff:g>."</string>
<string name="crypt_keeper_enter_password" msgid="2223340178473871064">"Thayipha iphasiwedi yakho"</string>
<string name="crypt_keeper_failed_title" msgid="7133499413023075961">"Ubhala ngokufihlekileyo akuphumelelanga"</string>
@@ -727,6 +730,8 @@
<string name="dock_sounds_enable_summary_off" product="tablet" msgid="5077843049805652363">"Ungadlali umsindo lapho ufaka noma ukhipha ithebhulethi kwidokhi"</string>
<string name="dock_sounds_enable_summary_off" product="default" msgid="3151046599205265919">"Ungadlali umsindo lapho ufaka noma ukhipha ifoni ekubekeni ingxenye"</string>
<string name="account_settings" msgid="6403589284618783461">"Ama-akhawunti"</string>
+ <string name="category_personal" msgid="1299663247844969448">"Okomuntu siqu"</string>
+ <string name="category_work" msgid="8699184680584175622">"Umsebenzi"</string>
<string name="search_settings" msgid="1910951467596035063">"Sesha"</string>
<string name="search_settings_summary" msgid="9205656546570654169">"Phatha izilungiselelo zokusesha nomlando"</string>
<string name="display_settings" msgid="7965901687241669598">"Ukubukeka"</string>
@@ -1326,6 +1331,9 @@
<string name="development_settings_title" msgid="215179176067683667">"Izinketho Zonjiniyela"</string>
<string name="development_settings_summary" msgid="1815795401632854041">"Setha okukhethwayo kwentuthuko yohlelo lokusebenza"</string>
<string name="development_settings_not_available" msgid="4308569041701535607">"Izinketho zonjiniyela azitholakali kulo msebenzisi"</string>
+ <string name="vpn_settings_not_available" msgid="956841430176985598">"Izilungiselelo ze-VPN azitholakaleli lo msebenzisi"</string>
+ <string name="tethering_settings_not_available" msgid="6765770438438291012">"Izilungiselelo zokusebenzisa njengemodemu azitholakaleli lo msebenzisi"</string>
+ <string name="apn_settings_not_available" msgid="7873729032165324000">"Izilungiselelo ze-Igama Lephoyinti Lokufinyelela azitholakaleli lo msebenzisi"</string>
<string name="enable_adb" msgid="7982306934419797485">"Ukulungisa iphutha le-USB"</string>
<string name="enable_adb_summary" msgid="4881186971746056635">"Lungisa iphutha lemodi lapho i-USB ixhunyiwe"</string>
<string name="clear_adb_keys" msgid="4038889221503122743">"Buyisa ukugunyaza kokususa iphutha le-USB"</string>
@@ -1335,12 +1343,16 @@
<string name="keep_screen_on_summary" msgid="2173114350754293009">"Isikrini asisoze salala ngenkathi sishaja"</string>
<string name="bt_hci_snoop_log" msgid="3340699311158865670">"Nika amandla i-Bluetooth HCI yelogu lokuhlola"</string>
<string name="bt_hci_snoop_log_summary" msgid="730247028210113851">"Shutha wonke amaphakethe we-bluetooth HCI kufayela"</string>
- <string name="select_runtime_title" msgid="649783802363155346">"Khetha isikhathi sokusebenza"</string>
- <string name="select_runtime_dialog_title" msgid="5314872813037493958">"Khetha isikhathi sokusebenza"</string>
- <string name="select_runtime_warning_message" msgid="1937574953265648165">"Qalisa kabusha ukuze ushintshe isikhathi sokusebenza kusukela ku-<xliff:g id="OLD">%1$s</xliff:g> ngu-<xliff:g id="NEW">%2$s</xliff:g>?"</string>
<string name="wifi_display_certification" msgid="8611569543791307533">"Ukunikezwa isitifiketi sokubukeka okungenantambo"</string>
<string name="wifi_verbose_logging" msgid="4770164061102202747">"Nika amandla ukungena kwe-WiFi Verbose"</string>
+ <string name="wifi_aggressive_handover" msgid="5398429853675035444">"Ukudluliselwa kwe-Wifi kuya kuselula"</string>
+ <string name="wifi_allow_scan_with_traffic" msgid="1390236299223668977">"Njalo vumela ama-Wifi Roam Scan"</string>
<string name="wifi_display_certification_summary" msgid="1155182309166746973">"Bonisa izinketho zokunikeza isitifiketi ukubukeka okungenantambo"</string>
+ <string name="wifi_verbose_logging_summary" msgid="4393610458474552685">"Khuphula izinga lokungena kwe-Wifi, bonisa nge-SSID RSSI ngayinye kusikhethi se-WiFi"</string>
+ <string name="wifi_aggressive_handover_summary" msgid="1000996694927825958">"Uma kunikwe amandla, i-Wifi izoba nodlame kakhulu ukunikeza uxhumo lwedatha kuselula, uma isignali ye-Wifi iphansi"</string>
+ <string name="wifi_allow_scan_with_traffic_summary" msgid="4586928675773406679">"Vumela/ungavumeli ama-Wifi Roam Scan ngokususelwe kwinani lethrafikhi yedatha elikhona kusibonisi"</string>
+ <string name="select_logd_size_title" msgid="7433137108348553508">"Amasayizi weloga ngebhafa"</string>
+ <string name="select_logd_size_dialog_title" msgid="1206769310236476760">"Khetha amasayizi weloga ngebhafa ngayinye yelogu"</string>
<string name="allow_mock_location" msgid="2787962564578664888">"Vumela izindawo mbumbulu"</string>
<string name="allow_mock_location_summary" msgid="317615105156345626">"Vumela izindawo mbumbulu"</string>
<string name="adb_warning_title" msgid="6234463310896563253">"Vumela ukulungisa iphutha le-USB?"</string>
@@ -1592,6 +1604,15 @@
<string name="process_stats_run_time" msgid="6520628955709369115">"Isikhathi sokuqalisa"</string>
<string name="services_subtitle" msgid="4296402367067266425">"Amasevisi"</string>
<string name="menu_proc_stats_duration" msgid="2323483592994720196">"Ubude besikhathi"</string>
+ <string name="mem_details_title" msgid="6548392825497290498">"Imininingwane yememori"</string>
+ <string name="mem_state_subtitle" msgid="2407238869781011933">"Izimo zememori"</string>
+ <string name="mem_use_subtitle" msgid="7319468770222422412">"Ukusetshenziswa kwememori"</string>
+ <string name="mem_use_kernel_type" msgid="8698327165935012484">"I-Kernel"</string>
+ <string name="mem_use_native_type" msgid="5976704902328347400">"Okwemvelo"</string>
+ <string name="mem_use_kernel_cache_type" msgid="6411475064463957513">"Ukulondolozwa kwe-Kernel"</string>
+ <string name="mem_use_zram_type" msgid="9087217476795358232">"Ukushintshwa kwe-ZRam"</string>
+ <string name="mem_use_free_type" msgid="717708548454880840">"Khululekile"</string>
+ <string name="mem_use_total" msgid="6308786055749777934">"Inani"</string>
<string name="menu_duration_3h" msgid="4714866438374738385">"3 amahora"</string>
<string name="menu_duration_6h" msgid="1940846763432184132">"6 amahora"</string>
<string name="menu_duration_12h" msgid="7890465404584356294">"12 amahora"</string>
@@ -1689,9 +1710,11 @@
<string name="credentials_reset_summary" msgid="3369361230171260282">"Susa zonke izitifiketi"</string>
<string name="trusted_credentials" msgid="4266945289534242402">"Izifakazeli ezithenjwayo"</string>
<string name="trusted_credentials_summary" msgid="6735221351155686632">"Bonisa izitifiketi ze-CA ezithenjwayo"</string>
+ <string name="advanced_security_title" msgid="2434776238010578865">"Ithuthukisiwe"</string>
<string name="credential_storage_type" msgid="8629968543494001364">"Uhlobo lwesitoreji"</string>
<string name="credential_storage_type_hardware" msgid="6077193544333904427">"Izingxenyekazi zekhompyutha zisekelwe ngokulondoloza"</string>
<string name="credential_storage_type_software" msgid="4403117271207715378">"Isofthiwe kuphela"</string>
+ <string name="credentials_settings_not_available" msgid="7968275634486624215">"Izifakazo azitholakaleli lo msebenzisi"</string>
<string name="credentials_install_gesture_prompt" msgid="2207390278112395082">"Dweba iphethini yakho yokuvula"</string>
<string name="credentials_install_gesture_explanation" msgid="7408921172253634829">"Udinga ukudweba iphethini yakho yokuvula ukuze uqinisekise ukufakwa kwezincwadi ezichaza ngomuntu."</string>
<string name="credentials_unlock" msgid="385427939577366499"></string>
@@ -1772,6 +1795,7 @@
<string name="wifi_setup_description_connected" msgid="736032046548460779">"Thinta"<b>"Okulandelayo"</b>" ukuqhubeka nokusetha.\n\nThinta"<b>"Emuva"</b>" ukuxhuma kuhleloxhumano olwehlukile."</string>
<string name="accessibility_sync_enabled" msgid="558480439730263116">"Ukunika amandla kuvumelanisiwe"</string>
<string name="accessibility_sync_disabled" msgid="1741194106479011384">"Ukuvumelanisa kukhubaziwe"</string>
+ <string name="accessibility_sync_in_progress" msgid="4501160520879902723">"Iyavumelanisa manje"</string>
<string name="accessibility_sync_error" msgid="8703299118794272041">"Iphutha lokuvumelanisa."</string>
<string name="sync_failed" msgid="1696499856374109647">"Ukuvumelanisa kwehlulekile"</string>
<string name="sync_active" msgid="8476943765960863040">"Ukuvumelanisa kuyasebenza"</string>
@@ -1864,8 +1888,6 @@
<string name="debug_layout_summary" msgid="2001775315258637682">"Bonisa imikhawulo, imiphetho, njll, yesiqeshana."</string>
<string name="force_rtl_layout_all_locales" msgid="2259906643093138978">"Phoqelela isikhombisi-ndlela sesakhiwo se-RTL"</string>
<string name="force_rtl_layout_all_locales_summary" msgid="9192797796616132534">"Phoqelela isikhombisi-ndlela sesikrini ku-RTL kuzo zonke izifunda"</string>
- <string name="low_power_mode" msgid="8400119155107987979">"Imodi Yamandla Aphansi"</string>
- <string name="low_power_mode_summary" msgid="8895619424568660204">"Nika amandla izilungiselelo zokulondoloza ibhethri"</string>
<string name="show_cpu_usage" msgid="2389212910758076024">"Bonisa ukusebenzisa i-CPU"</string>
<string name="show_cpu_usage_summary" msgid="2113341923988958266">"Imbondela yesikrini ibonisa ukusetshenziswa kwe-CPU okwamanje"</string>
<string name="force_hw_ui" msgid="6426383462520888732">"Phoqa ukunikeza i-GPU"</string>
@@ -2142,9 +2164,6 @@
<string name="lock_screen_notifications_summary_show" msgid="6407527697810672847">"Bonisa konke okuqukethwe kwesaziso"</string>
<string name="lock_screen_notifications_summary_hide" msgid="7891552853357258782">"Fihla okuqukethwe kwesaziso esizwelayo"</string>
<string name="lock_screen_notifications_summary_disable" msgid="3001013816427963576">"Ungabonisi izaziso sanhlobo"</string>
- <string name="zen_mode_notifications_title" msgid="8216258729654184425">"Lapho ukungaphazamiseki kuvuliwe"</string>
- <string name="zen_mode_notifications_summary_hide" msgid="1442445640095117354">"Fihla izaziso ezintsha kusuka kuhlu"</string>
- <string name="zen_mode_notifications_summary_show" msgid="4043422218595387460">"Bonisa zonke izaziso ohlwini"</string>
<string name="app_notifications_title" msgid="5810577805218003760">"Izaziso zohlelo lokusebenza"</string>
<string name="other_sound_settings" msgid="3151004537006844718">"Eminye imisindo"</string>
<string name="dial_pad_tones_title" msgid="1999293510400911558">"Amathoni wephedi yokudayela"</string>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 200bacf..b35a5a1 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -469,6 +469,8 @@
<item>None</item>
<!-- Manual HTTP proxy settings are used for the current wifi network [CHAR LIMIT=25] -->
<item>Manual</item>
+ <!-- Proxy Auto-Config URL that is used for the current wifi network [CHAR LIMIT=25] -->
+ <item>Proxy Auto-Config</item>
</string-array>
<!-- Locales in this list are displayed with the corresponding
@@ -623,6 +625,7 @@
<item>alarm volume</item>
<item>notification volume</item>
<item>bluetooth volume</item>
+ <item>mute/unmute microphone</item>
<item>keep awake</item>
<item>monitor location</item>
<item>monitor high power location</item>
@@ -670,6 +673,7 @@
<item>Alarm volume</item>
<item>Notification volume</item>
<item>Bluetooth volume</item>
+ <item>Mute/unmute microphone</item>
<item>Keep awake</item>
<item>Location</item>
<item>Location</item>
@@ -872,25 +876,31 @@
<item>-1</item>
</integer-array>
- <!-- Titles for runtime selection preference. [CHAR LIMIT=35] -->
- <string-array name="select_runtime_titles">
- <item>Dalvik</item>
- <item>ART</item>
- <item>ART (debug)</item>
+ <!-- Titles for logd limit size selection preference. [CHAR LIMIT=14] -->
+ <string-array name="select_logd_size_titles">
+ <item>64K</item>
+ <item>256K</item>
+ <item>1M</item>
+ <item>4M</item>
+ <item>16M</item>
</string-array>
- <!-- Values for runtime selection preference. -->
- <string-array name="select_runtime_values" translatable="false" >
- <item>libdvm.so</item>
- <item>libart.so</item>
- <item>libartd.so</item>
+ <!-- Values for logd limit size selection preference. -->
+ <string-array name="select_logd_size_values" translatable="false" >
+ <item>65536</item>
+ <item>262144</item>
+ <item>1048576</item>
+ <item>4194304</item>
+ <item>16777216</item>
</string-array>
- <!-- Summaries for runtime selection preference. [CHAR LIMIT=100]-->
- <string-array name="select_runtime_summaries" >
- <item>Use Dalvik</item>
- <item>Use ART</item>
- <item>Use ART debug build</item>
+ <!-- Summaries for logd limit size selection preference. [CHAR LIMIT=30]-->
+ <string-array name="select_logd_size_summaries" >
+ <item>64K per log buffer</item>
+ <item>256K per log buffer</item>
+ <item>1M per log buffer</item>
+ <item>4M per log buffer</item>
+ <item>16M per log buffer</item>
</string-array>
<!-- Titles for HDCP checking preference. [CHAR LIMIT=35] -->
@@ -1227,4 +1237,30 @@
<item>15</item>
<item>20</item>
</integer-array>
+
+ <!-- Process stats memory use details: labels for memory states -->
+ <string-array name="proc_stats_memory_states" >
+ <item>Normal</item>
+ <item>Moderate</item>
+ <item>Low</item>
+ <item>Critical</item>
+ </string-array>
+
+ <!-- Process stats memory use details: labels for process -->
+ <string-array name="proc_stats_process_states" >
+ <item>Persistent</item>
+ <item>Top activity</item>
+ <item>Important (foreground)</item>
+ <item>Important (background)</item>
+ <item>Backup</item>
+ <item>Heavy weight</item>
+ <item>Service (running)</item>
+ <item>Service (restarting)</item>
+ <item>Receiver</item>
+ <item>Home</item>
+ <item>Last activity</item>
+ <item>Cached (activity)</item>
+ <item>Cached (activity client)</item>
+ <item>Cached (empty)</item>
+ </string-array>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b835add..f46a800 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -18,8 +18,10 @@
<color name="black">#000</color>
<color name="red">#F00</color>
+ <color name="material_empty_color_light">#FFCED7DB</color>
+
<color name="memory_used">#F00</color>
- <color name="memory_avail">#333333</color>
+ <color name="memory_avail">@color/material_empty_color_light</color>
<color name="memory_apps_usage">#77831A</color>
<color name="memory_downloads">#476093</color>
<color name="memory_dcim">#793A7F</color>
@@ -44,11 +46,9 @@
<color name="lock_pattern_background">#00000000</color>
<color name="lock_pattern_view_regular_color">#ff37474f</color>
- <color name="lock_pattern_view_success_color">#ff009688</color>
+ <color name="lock_pattern_view_success_color">@color/theme_accent</color>
<color name="lock_pattern_view_error_color">#fff4511e</color>
- <color name="material_empty_color_light">#FFCED7DB</color>
-
<!-- Palette colors referenced by top-level themes. -->
<color name="theme_primary">#ff263238</color>
<color name="theme_primary_dark">#ff21272b</color>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index eef43a7..e3c27b8 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -90,23 +90,38 @@
<!-- Default text size for caption preview samples. Uses dp rather than sp because captions are not scaled. -->
<dimen name="caption_preview_text_size">48dp</dimen>
+ <!-- ActionBar height -->
+ <dimen name="actionbar_size">56dip</dimen>
+
<!-- ActionBar contentInsetStart -->
<dimen name="actionbar_contentInsetStart">16dp</dimen>
<dimen name="actionbar_subsettings_contentInsetStart">72dp</dimen>
- <!-- Dashboard padding between each tiles within the layout -->
- <dimen name="dashboard_cell_gap">1dp</dimen>
+ <!-- Dashboard side margins (left and right) -->
+ <dimen name="dashboard_side_margin">0dp</dimen>
+
+ <!-- Dashboard margins between each tiles within the layout -->
+ <dimen name="dashboard_cell_gap_x">0dp</dimen>
+ <dimen name="dashboard_cell_gap_y">0dp</dimen>
<!-- Dashboard padding in its container -->
- <dimen name="dashboard_padding_start">1dp</dimen>
- <dimen name="dashboard_padding_end">1dp</dimen>
- <dimen name="dashboard_padding_bottom">1dp</dimen>
+ <dimen name="dashboard_padding_start">0dp</dimen>
+ <dimen name="dashboard_padding_end">0dp</dimen>
+ <dimen name="dashboard_padding_top">0dp</dimen>
+ <dimen name="dashboard_padding_bottom">0dp</dimen>
+
+ <!-- Dashboard category padding start / end -->
+ <dimen name="dashboard_category_padding_start">0dp</dimen>
+ <dimen name="dashboard_category_padding_end">0dp</dimen>
+
+ <!-- Dashboard category panel elevation -->
+ <dimen name="dashboard_category_elevation">4dp</dimen>
<!-- Dashboard category title layout height -->
<dimen name="dashboard_category_title_height">48dp</dimen>
<!-- Dashboard category title margin start -->
- <dimen name="dashboard_category_title_margin_start">15dp</dimen>
+ <dimen name="dashboard_category_title_margin_start">16dp</dimen>
<!-- Dashboard tile minimum height -->
<dimen name="dashboard_tile_minimum_height">72dp</dimen>
@@ -126,18 +141,21 @@
<dimen name="switchbar_subsettings_margin_start">72dp</dimen>
<dimen name="switchbar_subsettings_margin_end">16dp</dimen>
- <!-- Search Results padding in its container -->
- <dimen name="search_results_padding_start">1dp</dimen>
- <dimen name="search_results_padding_end">1dp</dimen>
+ <!-- Search Panel elevation -->
+ <dimen name="search_panel_elevation">4dp</dimen>
+
+ <!-- Search Panel padding in its container -->
+ <dimen name="search_panel_padding_start">4dp</dimen>
+ <dimen name="search_panel_padding_end">4dp</dimen>
<!-- Search title (recent / results) padding start -->
- <dimen name="search_title_padding_start">16dp</dimen>
+ <dimen name="search_title_padding_start">12dp</dimen>
<!-- Result item image size -->
<dimen name="search_result_item_image_size">24dp</dimen>
<!-- Result item image margin start / end -->
- <dimen name="search_result_item_image_margin_start">16dp</dimen>
+ <dimen name="search_result_item_image_margin_start">12dp</dimen>
<dimen name="search_result_item_image_margin_end">32dp</dimen>
<!-- Suggestion item image size -->
@@ -147,4 +165,7 @@
<dimen name="search_suggestion_item_image_margin_start">32dp</dimen>
<dimen name="search_suggestion_item_image_margin_end">16dp</dimen>
+ <!-- Lock-to-app textview paddings -->
+ <dimen name="lock_to_app_textview_padding">16dp</dimen>
+
</resources>
diff --git a/res/values/ids.xml b/res/values/ids.xml
new file mode 100644
index 0000000..2fbf70b
--- /dev/null
+++ b/res/values/ids.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2014, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources>
+ <item type="id" name="preference_highlight_key" />
+</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ef3976d..ea6ece6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -445,8 +445,10 @@
<!-- HTTP proxy settings. Warning message about limited application support [CHAR LIMIT=100]-->
<string name="proxy_warning_limited_support">The HTTP proxy is used by the browser but may not be used by the other apps.</string>
- <!-- HTTP proxy settings. Title for Proxy-Auto Config URL. [CHAR LIMIT=NONE]-->
- <string name="proxy_url">"PAC URL: "</string>
+ <!-- HTTP proxy settings. Title for Proxy-Auto Config URL. [CHAR LIMIT=25] -->
+ <string name="proxy_url_title">"PAC URL: "</string>
+ <!-- HTTP proxy settings. Hint for Proxy-Auto Config URL. -->
+ <string name="proxy_url_hint" translatable="false">https://www.example.com/proxy.pac</string>
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radio_info_signal_location_label">Location:</string>
@@ -716,6 +718,8 @@
<string name="profile_info_settings_title">Profile info</string>
<!-- Main Settings screen setting option title for the item to take you to the location screen -->
<string name="location_settings_title">Location</string>
+ <!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
+ <string name="account_settings_title">Accounts</string>
<!-- Main Settings screen setting option title for the item to take you to the security screen -->
<string name="security_settings_title">Security</string>
<!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->
@@ -793,6 +797,10 @@
<!-- Informational text on the progress screen while encrypting the device -->
<string name="crypt_keeper_setup_description" product="default">Wait while your phone
is being encrypted. <xliff:g id="percent" example="50">^1</xliff:g>% complete.</string>
+ <string name="crypt_keeper_setup_time_remaining" product="tablet">Wait while your tablet
+ is being encrypted. Time remaining: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
+ <string name="crypt_keeper_setup_time_remaining" product="default">Wait while your phone
+ is being encrypted. Time remaining: <xliff:g id="duration" example="1:23">^1</xliff:g></string>
<!-- Informational text on the password entry screen when password entry fails-->
<string name="crypt_keeper_cooldown">Try again in <xliff:g id="delay" example="15">^1</xliff:g> seconds.</string>
@@ -1247,6 +1255,11 @@
<string name="wifi_display_listen_channel" translatable="false">Listen channel</string>
<!-- Wifi Display settings. The dropdown menu title for choosing operating channel during certification process. [CHAR LIMIT=40] -->
<string name="wifi_display_operating_channel" translatable="false">Operating channel</string>
+ <!-- Wifi 2.4GHz is used as an universal itendifier for 2.4GHz band -->
+ <string name="wifi_band_24ghz" translatable="false">2.4GHz</string>
+ <!-- Wifi Internal 5GHz as an universal itendifier for 5GHz band -->
+ <string name="wifi_band_5ghz" translatable="false">5GHz</string>
+
<!-- NFC settings -->
<!-- Used in the 1st-level settings screen to turn on NFC -->
@@ -1602,7 +1615,7 @@
<string name="wifi_p2p_delete_group_message">Forget this group?</string>
<!-- Wifi AP settings-->
- <!-- Label for wifi tether checkbox. Toggles Access Point on/off -->
+ <!-- Label for Wifi tether checkbox. Toggles Access Point on/off -->
<string name="wifi_tether_checkbox_text">Portable Wi\u2011Fi hotspot</string>
<!-- Summary text when turning hotspot on -->
<string name="wifi_tether_starting">Turning hotspot on\u2026</string>
@@ -1802,6 +1815,10 @@
<!-- Account settings header. [CHAR LIMIT=30] -->
<string name="account_settings">Accounts</string>
+ <!-- Header for items under the personal user [CHAR LIMIT=30] -->
+ <string name="category_personal">Personal</string>
+ <!-- Header for items under the work user [CHAR LIMIT=30] -->
+ <string name="category_work">Work</string>
<!-- Main Settings screen, setting option name to go into search settings -->
<string name="search_settings">Search</string>
@@ -2263,6 +2280,8 @@
<string name="master_clear_failed">No reset was performed because the System Clear service isn\'t available.</string>
<!-- Master clear confirmation screen title [CHAR LIMIT=30] -->
<string name="master_clear_confirm_title">Reset?</string>
+ <!-- Error message for users that aren't allowed to factory reset [CHAR LIMIT=none] -->
+ <string name="master_clear_not_available">Factory reset is not available for this user</string>
<!-- Media Format -->
<!-- SD card & phone storage settings screen, setting option name under Internal phone storage heading [CHAR LIMIT=25] -->
@@ -3124,6 +3143,12 @@
<!-- Setting checkbox title for Whether to enable USB debugging support on the phone. -->
<!-- Error message for users that aren't allowed to modify developer options [CHAR LIMIT=none] -->
<string name="development_settings_not_available">Developer options are not available for this user</string>
+ <!-- Error message for users that aren't allowed to modify VPN settings [CHAR LIMIT=none] -->
+ <string name="vpn_settings_not_available">VPN settings are not available for this user</string>
+ <!-- Error message for users that aren't allowed to modify Tethering settings [CHAR LIMIT=none] -->
+ <string name="tethering_settings_not_available">Tethering settings are not available for this user</string>
+ <!-- Error message for users that aren't allowed to modify Access Point Names settings [CHAR LIMIT=none] -->
+ <string name="apn_settings_not_available">Access Point Name settings are not available for this user</string>
<string name="enable_adb">USB debugging</string>
<!-- Setting checkbox summary for Whether to enable USB debugging support on the phone -->
<string name="enable_adb_summary">Debug mode when USB is connected</string>
@@ -3142,19 +3167,26 @@
<!-- setting Checkbox summary whether to capture all bluetooth HCI packets in a file -->
<string name="bt_hci_snoop_log_summary">Capture all bluetooth HCI packets in a file</string>
- <!-- Runtime selection title, used for debug purposes only. [CHAR LIMIT=25] -->
- <string name="select_runtime_title">Select runtime </string>
- <!-- Runtime selection dialog title, used for debug purposes only. [CHAR LIMIT=25] -->
- <string name="select_runtime_dialog_title">Select runtime</string>
- <!-- Message of dialog confirming that user wants to restart their device with a new runtime -->
- <string name="select_runtime_warning_message">Reboot to change runtime from <xliff:g id="old" example="libdvm.so">%1$s</xliff:g> to <xliff:g id="new" example="libart.so">%2$s</xliff:g>?</string>
-
<!-- Setting Checkbox title whether to show options for wireless display certification -->
<string name="wifi_display_certification">Wireless display certification</string>
- <!-- Setting Checkbox title whether to show options for WiFi Verbose Logging -->
- <string name="wifi_verbose_logging">Enable WiFi Verbose Logging</string>
+ <!-- Setting Checkbox title whether to enable WiFi Verbose Logging. [CHAR LIMIT=40] -->
+ <string name="wifi_verbose_logging">Enable Wi\u2011Fi Verbose Logging</string>
+ <!-- Setting Checkbox title whether to enable WiFi Aggressive Handover. [CHAR LIMIT=40] -->
+ <string name="wifi_aggressive_handover">Aggressive Wi\u2011Fi to Cellular handover</string>
+ <!-- Setting Checkbox title whether to enable WiFi Scanning in the presence of traffic. [CHAR LIMIT=80] -->
+ <string name="wifi_allow_scan_with_traffic">Always allow Wi\u2011Fi Roam Scans</string>
<!-- setting Checkbox summary whether to show options for wireless display certification -->
<string name="wifi_display_certification_summary">Show options for wireless display certification</string>
+ <!-- Setting Checkbox summary whether to enable Wifi verbose Logging [CHAR LIMIT=80] -->
+ <string name="wifi_verbose_logging_summary">Increase Wi\u2011Fi logging level, show per SSID RSSI in Wi\u2011Fi Picker</string>
+ <!-- Setting Checkbox summary whether to enable Wifi aggressive handover [CHAR LIMIT=130] -->
+ <string name="wifi_aggressive_handover_summary">When enabled, Wi\u2011Fi will be more aggressive in handing over the data connection to Cellular, when Wi\u2011Fi signal is low</string>
+ <!-- Setting Checkbox summary whether to always allow WiFi Roam Scans [CHAR LIMIT=130] -->
+ <string name="wifi_allow_scan_with_traffic_summary">Allow/Disallow Wi\u2011Fi Roam Scans based on the amount of data traffic present at the interface</string>
+ <!-- UI debug setting: limit size of Android logger buffers -->
+ <string name="select_logd_size_title">Logger buffer sizes</string>
+ <!-- UI debug setting: limit size of Android logger buffers [CHAR LIMIT=59] -->
+ <string name="select_logd_size_dialog_title">Select Logger sizes per log buffer</string>
<!-- Setting Checkbox title whether to allow mock locations -->
<string name="allow_mock_location">Allow mock locations</string>
<!-- setting Checkbox summary whether to allow mock locations -->
@@ -3771,6 +3803,24 @@
<string name="services_subtitle">Services</string>
<!-- [CHAR LIMIT=NONE] Menu for process stats to select duration of stats to show -->
<string name="menu_proc_stats_duration">Duration</string>
+ <!-- [CHAR LIMIT=NONE] Activity title for process stats details on overall memory state -->
+ <string name="mem_details_title">Memory details</string>
+ <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory states -->
+ <string name="mem_state_subtitle">Memory states</string>
+ <!-- [CHAR LIMIT=NONE] Subtitle for process stats memory state details for list of memory use -->
+ <string name="mem_use_subtitle">Memory use</string>
+ <!-- [CHAR LIMIT=NONE] Type of memory use associated with the kernel -->
+ <string name="mem_use_kernel_type">Kernel</string>
+ <!-- [CHAR LIMIT=NONE] Type of memory use associated with native processes -->
+ <string name="mem_use_native_type">Native</string>
+ <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel caches -->
+ <string name="mem_use_kernel_cache_type">Kernel caches</string>
+ <!-- [CHAR LIMIT=NONE] Type of memory use associated with kernel zram swap -->
+ <string name="mem_use_zram_type">ZRam swap</string>
+ <!-- [CHAR LIMIT=NONE] Type of memory use that is available/free -->
+ <string name="mem_use_free_type">Free</string>
+ <!-- [CHAR LIMIT=NONE] Total of all memory use -->
+ <string name="mem_use_total">Total</string>
<!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
<string name="menu_duration_3h">3 hours</string>
<!-- [CHAR LIMIT=NONE] Menu for process stats to show 3 hours of data -->
@@ -3995,12 +4045,16 @@
<string name="trusted_credentials">Trusted credentials</string>
<!-- Summary of preference to display trusted credentials (aka CA certificates) [CHAR LIMIT=NONE] -->
<string name="trusted_credentials_summary">Display trusted CA certificates</string>
+ <!-- Title of preference group for advance security settings [CHAR LIMIT=30] -->
+ <string name="advanced_security_title">Advanced</string>
<!-- Title of preference of what type of credential storage this device has: hardware or software [CHAR LIMIT=30] -->
<string name="credential_storage_type">Storage type</string>
<!-- Summary text for preference showing what type of credential storage this device has when it is stored in a hardware-backed storage (as opposed to "software only") [CHAR LIMIT=NONE] -->
<string name="credential_storage_type_hardware">Hardware-backed</string>
<!-- Summary text for preference showing what type of credential storage this device has when it is stored in software only (as opposed to "hardware-backed") [CHAR LIMIT=NONE] -->
<string name="credential_storage_type_software">Software only</string>
+ <!-- Error message for users that aren't allowed to see or modify credentials [CHAR LIMIT=none] -->
+ <string name="credentials_settings_not_available">Credentials are not available for this user</string>
<!-- Message to draw an unlock pattern when installing credentials -->
<string name="credentials_install_gesture_prompt">Draw your unlock pattern</string>
@@ -4227,6 +4281,8 @@
<string name="accessibility_sync_enabled">Sync enabled</string>
<!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
<string name="accessibility_sync_disabled">Sync disabled</string>
+ <!-- Content description of the in progress sync icon for accessibility. [CHAR LIMIT=NONE] -->
+ <string name="accessibility_sync_in_progress">Syncing now</string>
<!-- Content description of the disabled sync icon for accessibility. [CHAR LIMIT=NONE] -->
<string name="accessibility_sync_error">Sync error.</string>
<!-- Image description for the sync failed icon. -->
@@ -4442,11 +4498,6 @@
<!-- UI debug setting: force right to left layout summary [CHAR LIMIT=100] -->
<string name="force_rtl_layout_all_locales_summary">Force screen layout direction to RTL for all locales</string>
- <!-- UI debug setting: start low power mode [CHAR LIMIT=25] -->
- <string name="low_power_mode">Low Power Mode</string>
- <!-- UI debug setting: start low power mode summary[CHAR LIMIT=50] -->
- <string name="low_power_mode_summary">Enable battery saving settings</string>
-
<!-- UI debug setting: show how CPU is being used? [CHAR LIMIT=25] -->
<string name="show_cpu_usage">Show CPU usage</string>
<!-- UI debug setting: show cpu usage summary [CHAR LIMIT=50] -->
@@ -5142,15 +5193,6 @@
[CHAR LIMIT=50] -->
<string name="lock_screen_notifications_summary_disable">Don\'t show notifications at all</string>
- <!-- Sound & notifications > Showing notifications: Title for the option managing notification display in zen mode. [CHAR LIMIT=30] -->
- <string name="zen_mode_notifications_title">When do not disturb is on</string>
-
- <!-- Sound & notifications > Showing notifications: Value for zen mode notifications: notifications will be suppressed in zen mode [CHAR LIMIT=50] -->
- <string name="zen_mode_notifications_summary_hide">Hide new notifications from the list</string>
-
- <!-- Sound & notifications > Showing notifications: Value for zen mode notifications: notifications will be displayed in zen mode [CHAR LIMIT=50] -->
- <string name="zen_mode_notifications_summary_show">Show all notifications in the list</string>
-
<!-- Sound & notifications > Showing notifications: Title for the option managing notifications per application. [CHAR LIMIT=30] -->
<string name="app_notifications_title">App notifications</string>
@@ -5349,4 +5391,18 @@
<!-- Switch On/Off -->
<string name="switch_on_text">On</string>
<string name="switch_off_text">Off</string>
+
+ <!-- Lock-to-app title [CHAR LIMIT=24] -->
+ <string name="lock_to_app_title">Lock-to-app</string>
+ <!-- Description of lock-to-app feature [CHAR LIMIT=105] -->
+ <string name="lock_to_app_description">Lock-to-app locks the display in a single app.\n\n\nTo start Lock-to-app</string>
+ <!-- Lock-to-app starting instruction 1. [CHAR LIMIT=45] -->
+ <string name="lock_to_app_start_step1">1\t\tTurn the setting on</string>
+ <!-- Lock-to-app starting instruction 2. [CHAR LIMIT=55] -->
+ <string name="lock_to_app_start_step2">2\t\tStart an app you want</string>
+ <!-- Lock-to-app starting instruction 3. The $ is not actually shown or
+ translated, it is a marker of where the recents icon shows up. [CHAR LIMIT=60] -->
+ <string name="lock_to_app_start_step3">3\t\tPress and hold the recent apps button $</string>
+ <!-- Label for whether should use screen lock or not. [CHAR LIMIT=30]-->
+ <string name="lock_to_app_screen_lock">Use screen lock</string>
</resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 26b0ef3..99a203a 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -265,7 +265,8 @@
</style>
<style name="TextAppearance.CategoryTitle" parent="@android:style/TextAppearance.Material.Small">
- <item name="android:textColor">#FF009688</item>
+ <item name="android:textColor">@color/theme_accent</item>
+ <item name="android:textStyle">bold</item>
</style>
<style name="TextAppearance.TileTitle" parent="@android:style/TextAppearance.Material.Medium">
diff --git a/res/values/themes.xml b/res/values/themes.xml
index e23b300..ee02768 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -79,7 +79,9 @@
<item name="ic_menu_add">@drawable/ic_menu_add_dark</item>
<item name="ic_menu_moreoverflow">@*android:drawable/ic_menu_moreoverflow_holo_dark</item>
<item name="ic_wps">@drawable/ic_wps_dark</item>
- <item name="wifi_signal">@drawable/wifi_signal_dark</item>
+ <item name="wifi_signal">@drawable/wifi_signal_light</item>
+
+ <item name="@*android:actionBarSize">@dimen/actionbar_size</item>
<item name="switchBarMarginStart">@dimen/switchbar_margin_start</item>
<item name="switchBarMarginEnd">@dimen/switchbar_margin_end</item>
diff --git a/res/xml/account_settings.xml b/res/xml/account_settings.xml
new file mode 100644
index 0000000..236a26d
--- /dev/null
+++ b/res/xml/account_settings.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:key="account"
+ android:title="@string/account_settings_title">
+
+ <Preference
+ android:key="add_account"
+ android:title="@string/add_account_label"
+ android:icon="@drawable/ic_menu_add_dark"
+ android:order="2147483648" />
+
+ <PreferenceCategory
+ android:key="account_personal"
+ android:title="@string/category_personal" >
+
+ <Preference
+ android:key="add_account_personal"
+ android:title="@string/add_account_label"
+ android:icon="@drawable/ic_menu_add_dark"
+ android:order="2147483648" />
+
+ </PreferenceCategory>
+
+ <PreferenceCategory
+ android:key="account_work"
+ android:title="@string/category_work" >
+
+ <Preference
+ android:key="add_account_work"
+ android:title="@string/add_account_label"
+ android:icon="@drawable/ic_menu_add_dark"
+ android:order="2147483648" />
+
+ </PreferenceCategory>
+
+</PreferenceScreen>
diff --git a/res/xml/dashboard_categories.xml b/res/xml/dashboard_categories.xml
index 44ec960..f5df4a2 100644
--- a/res/xml/dashboard_categories.xml
+++ b/res/xml/dashboard_categories.xml
@@ -162,6 +162,14 @@
android:icon="@drawable/ic_settings_security"
/>
+ <!-- Account -->
+ <dashboard-tile
+ android:id="@+id/account_settings"
+ android:title="@string/account_settings_title"
+ android:fragment="com.android.settings.accounts.AccountSettings"
+ android:icon="@drawable/ic_settings_accounts"
+ />
+
<!-- Language -->
<dashboard-tile
android:id="@+id/language_settings"
diff --git a/res/xml/data_usage_metered_prefs.xml b/res/xml/data_usage_metered_prefs.xml
index a0c6df4..5026a35 100644
--- a/res/xml/data_usage_metered_prefs.xml
+++ b/res/xml/data_usage_metered_prefs.xml
@@ -14,7 +14,8 @@
limitations under the License.
-->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/display_settings">
<Preference
android:summary="@string/data_usage_metered_body"
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 1d7d967..ba93c7a 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -38,13 +38,6 @@
android:summary="@string/keep_screen_on_summary"/>
<ListPreference
- android:key="select_runtime"
- android:title="@string/select_runtime_title"
- android:dialogTitle="@string/select_runtime_dialog_title"
- android:entries="@array/select_runtime_titles"
- android:entryValues="@array/select_runtime_values" />
-
- <ListPreference
android:key="hdcp_checking"
android:title="@string/hdcp_checking_title"
android:dialogTitle="@string/hdcp_checking_dialog_title"
@@ -109,6 +102,24 @@
<CheckBoxPreference
android:key="wifi_verbose_logging"
android:title="@string/wifi_verbose_logging" />
+ android:summary="@string/wifi_verbose_logging_summary"/>
+
+ <CheckBoxPreference
+ android:key="wifi_aggressive_handover"
+ android:title="@string/wifi_aggressive_handover" />
+ android:summary="@string/wifi_aggressive_handover_summary"/>
+
+ <CheckBoxPreference
+ android:key="wifi_allow_scan_with_traffic"
+ android:title="@string/wifi_allow_scan_with_traffic" />
+ android:summary="@string/wifi_allow_scan_with_traffic_summary"/>
+
+ <ListPreference
+ android:key="select_logd_size"
+ android:title="@string/select_logd_size_title"
+ android:dialogTitle="@string/select_logd_size_dialog_title"
+ android:entries="@array/select_logd_size_titles"
+ android:entryValues="@array/select_logd_size_values" />
</PreferenceCategory>
@@ -246,11 +257,6 @@
android:summary="@string/strict_mode_summary"/>
<CheckBoxPreference
- android:key="low_power_mode"
- android:title="@string/low_power_mode"
- android:summary="@string/low_power_mode_summary"/>
-
- <CheckBoxPreference
android:key="show_cpu_usage"
android:title="@string/show_cpu_usage"
android:summary="@string/show_cpu_usage_summary"/>
diff --git a/res/xml/display_settings.xml b/res/xml/display_settings.xml
index c145938..4a8211f 100644
--- a/res/xml/display_settings.xml
+++ b/res/xml/display_settings.xml
@@ -19,6 +19,7 @@
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
<com.android.settings.BrightnessPreference
+ android:key="brightness"
android:title="@string/brightness"
android:persistent="false"/>
diff --git a/res/xml/lock_to_app_settings.xml b/res/xml/lock_to_app_settings.xml
new file mode 100644
index 0000000..f9a0b6c
--- /dev/null
+++ b/res/xml/lock_to_app_settings.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+ android:title="@string/lock_to_app_title"
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
+
+ <SwitchPreference
+ android:key="use_screen_lock"
+ android:title="@string/lock_to_app_screen_lock"
+ android:persistent="false" />
+
+</PreferenceScreen>
diff --git a/res/xml/notification_display_settings.xml b/res/xml/notification_display_settings.xml
index d5cade1..2dbe4b3 100644
--- a/res/xml/notification_display_settings.xml
+++ b/res/xml/notification_display_settings.xml
@@ -33,12 +33,6 @@
android:title="@string/lock_screen_notifications_title"
android:persistent="false" />
- <!-- When do not disturb is on -->
- <com.android.settings.notification.DropDownPreference
- android:key="zen_mode_notifications"
- android:title="@string/zen_mode_notifications_title"
- android:persistent="false" />
-
<!-- App notifications -->
<PreferenceScreen
android:key="app_notifications"
diff --git a/res/xml/privacy_settings.xml b/res/xml/privacy_settings.xml
index 57ad514..20aa68e 100644
--- a/res/xml/privacy_settings.xml
+++ b/res/xml/privacy_settings.xml
@@ -4,9 +4,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -40,12 +40,13 @@
android:persistent="false" />
</PreferenceCategory>
- <PreferenceCategory
- android:title="@string/personal_data_section_title"/>
+ <PreferenceCategory android:key="personal_data_category"
+ android:title="@string/personal_data_section_title">
<!-- Factory reset -->
- <PreferenceScreen
- android:title="@string/master_clear_title"
- android:summary="@string/master_clear_summary"
- android:fragment="com.android.settings.MasterClear" />
+ <PreferenceScreen
+ android:title="@string/master_clear_title"
+ android:summary="@string/master_clear_summary"
+ android:fragment="com.android.settings.MasterClear" />
+ </PreferenceCategory>
</PreferenceScreen>
diff --git a/res/xml/security_settings_misc.xml b/res/xml/security_settings_misc.xml
index 84ce96c..0dbddea 100644
--- a/res/xml/security_settings_misc.xml
+++ b/res/xml/security_settings_misc.xml
@@ -47,12 +47,6 @@
android:persistent="false"
android:fragment="com.android.settings.DeviceAdminSettings"/>
- <Preference android:key="manage_trust_agents"
- android:title="@string/manage_trust_agents"
- android:summary="@string/manage_trust_agents_summary"
- android:persistent="false"
- android:fragment="com.android.settings.TrustAgentSettings"/>
-
<CheckBoxPreference android:key="toggle_install_applications"
android:title="@string/install_applications"
android:summaryOff="@string/install_unknown_applications"
@@ -64,7 +58,6 @@
android:summaryOff="@string/verify_applications_summary"
android:summaryOn="@string/verify_applications_summary"
android:persistent="false" />
-
</PreferenceCategory>
<PreferenceCategory android:key="credentials_management"
@@ -99,4 +92,20 @@
android:targetClass="com.android.settings.CredentialStorage"/>
</Preference>
</PreferenceCategory>
+
+ <PreferenceCategory android:key="advanced_security"
+ android:title="@string/advanced_security_title"
+ android:persistent="false">
+ <Preference android:key="manage_trust_agents"
+ android:title="@string/manage_trust_agents"
+ android:summary="@string/manage_trust_agents_summary"
+ android:persistent="false"
+ android:fragment="com.android.settings.AdvancedSecuritySettings"/>
+ </PreferenceCategory>
+
+ <PreferenceScreen
+ android:key="lock_to_app_settings"
+ android:fragment="com.android.settings.LockToAppSettings"
+ android:title="@string/lock_to_app_title"/>
+
</PreferenceScreen>
diff --git a/res/xml/wifi_advanced_settings.xml b/res/xml/wifi_advanced_settings.xml
index d250585..efa94b2 100644
--- a/res/xml/wifi_advanced_settings.xml
+++ b/res/xml/wifi_advanced_settings.xml
@@ -58,6 +58,16 @@
android:title="@string/wifi_install_credentials"
android:persistent="false" />
+ <Preference
+ android:key="wifi_direct"
+ android:title="@string/wifi_menu_p2p"
+ android:persistent="false" />
+
+ <Preference
+ android:key="wps_push_button"
+ android:title="@string/wifi_menu_wps_pbc"
+ android:persistent="false" />
+
<CheckBoxPreference
android:key="suspend_optimizations"
android:title="@string/wifi_suspend_optimizations"
diff --git a/src/com/android/settings/AccountPreference.java b/src/com/android/settings/AccountPreference.java
index 2cc013c..7547721 100644
--- a/src/com/android/settings/AccountPreference.java
+++ b/src/com/android/settings/AccountPreference.java
@@ -140,6 +140,8 @@
return getContext().getString(R.string.accessibility_sync_disabled);
case SYNC_ERROR:
return getContext().getString(R.string.accessibility_sync_error);
+ case SYNC_IN_PROGRESS:
+ return getContext().getString(R.string.accessibility_sync_in_progress);
default:
Log.e(TAG, "Unknown sync status: " + status);
return getContext().getString(R.string.accessibility_sync_error);
diff --git a/src/com/android/settings/ActiveNetworkScorerDialog.java b/src/com/android/settings/ActiveNetworkScorerDialog.java
index 35d35d1..020549f 100644
--- a/src/com/android/settings/ActiveNetworkScorerDialog.java
+++ b/src/com/android/settings/ActiveNetworkScorerDialog.java
@@ -19,17 +19,15 @@
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.content.pm.PackageManager.NameNotFoundException;
import android.net.NetworkScoreManager;
import android.net.NetworkScorerAppManager;
+import android.net.NetworkScorerAppManager.NetworkScorerAppData;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import com.android.internal.app.AlertActivity;
import com.android.internal.app.AlertController;
-import com.android.settings.R;
/**
* Dialog to allow a user to select a new network scorer.
@@ -71,13 +69,14 @@
}
private boolean buildDialog() {
- if (!NetworkScorerAppManager.isPackageValidScorer(this, mNewPackageName)) {
+ NetworkScorerAppData newScorer = NetworkScorerAppManager.getScorer(this, mNewPackageName);
+ if (newScorer == null) {
Log.e(TAG, "New package " + mNewPackageName + " is not a valid scorer.");
return false;
}
- String oldPackageName = NetworkScorerAppManager.getActiveScorer(this);
- if (TextUtils.equals(oldPackageName, mNewPackageName)) {
+ NetworkScorerAppData oldScorer = NetworkScorerAppManager.getActiveScorer(this);
+ if (oldScorer != null && TextUtils.equals(oldScorer.mPackageName, mNewPackageName)) {
Log.i(TAG, "New package " + mNewPackageName + " is already the active scorer.");
// Set RESULT_OK to indicate to the caller that the "switch" was successful.
setResult(RESULT_OK);
@@ -85,24 +84,12 @@
}
// Compose dialog.
- PackageManager pm = getPackageManager();
- CharSequence oldName = null;
- CharSequence newName;
- try {
- if (oldPackageName != null) {
- oldName = pm.getApplicationInfo(oldPackageName, 0).loadLabel(pm);
- }
- newName = pm.getApplicationInfo(mNewPackageName, 0).loadLabel(pm);
- } catch (NameNotFoundException e) {
- Log.e(TAG, "Unable to find package info for scorers", e);
- return false;
- }
-
+ CharSequence newName = newScorer.mScorerName;
final AlertController.AlertParams p = mAlertParams;
p.mTitle = getString(R.string.network_scorer_change_active_dialog_title);
- if (oldPackageName != null) {
+ if (oldScorer != null) {
p.mMessage = getString(R.string.network_scorer_change_active_dialog_text, newName,
- oldName);
+ oldScorer.mScorerName);
} else {
p.mMessage = getString(R.string.network_scorer_change_active_no_previous_dialog_text,
newName);
diff --git a/src/com/android/settings/TrustAgentSettings.java b/src/com/android/settings/AdvancedSecuritySettings.java
similarity index 66%
rename from src/com/android/settings/TrustAgentSettings.java
rename to src/com/android/settings/AdvancedSecuritySettings.java
index 79cccae..2a8c623 100644
--- a/src/com/android/settings/TrustAgentSettings.java
+++ b/src/com/android/settings/AdvancedSecuritySettings.java
@@ -18,28 +18,17 @@
import com.android.internal.widget.LockPatternUtils;
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.Manifest;
import android.app.ListFragment;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
-import android.content.res.TypedArray;
-import android.content.res.XmlResourceParser;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.service.trust.TrustAgentService;
import android.util.ArrayMap;
import android.util.ArraySet;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.util.Slog;
-import android.util.Xml;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -48,17 +37,12 @@
import android.widget.ImageView;
import android.widget.TextView;
-import java.io.IOException;
import java.util.List;
-public class TrustAgentSettings extends ListFragment implements View.OnClickListener {
- static final String TAG = "TrustAgentSettings";
+public class AdvancedSecuritySettings extends ListFragment implements View.OnClickListener {
+ static final String TAG = "AdvancedSecuritySettings";
private static final String SERVICE_INTERFACE = TrustAgentService.SERVICE_INTERFACE;
- private static final String TRUST_AGENT_META_DATA = TrustAgentService.TRUST_AGENT_META_DATA;
-
- private static final String PERMISSION_PROVIDE_AGENT = Manifest.permission.PROVIDE_TRUST_AGENT;
-
private final ArraySet<ComponentName> mActiveAgents = new ArraySet<ComponentName>();
private final ArrayMap<ComponentName, AgentInfo> mAvailableAgents
@@ -98,7 +82,7 @@
container.getContext().getApplicationContext());
}
setListAdapter(new AgentListAdapter());
- return inflater.inflate(R.layout.trust_agent_settings, container, false);
+ return inflater.inflate(R.layout.advanced_security_settings, container, false);
}
@Override
@@ -125,79 +109,22 @@
for (ResolveInfo resolveInfo : resolveInfos) {
if (resolveInfo.serviceInfo == null) continue;
-
- String packageName = resolveInfo.serviceInfo.packageName;
- if (pm.checkPermission(PERMISSION_PROVIDE_AGENT, packageName)
- != PackageManager.PERMISSION_GRANTED) {
- Log.w(TAG, "Skipping agent because package " + packageName
- + " does not have permission " + PERMISSION_PROVIDE_AGENT + ".");
- continue;
- }
-
- ComponentName name = getComponentName(resolveInfo);
+ if (!TrustAgentUtils.checkProvidePermission(resolveInfo, pm)) continue;
+ ComponentName name = TrustAgentUtils.getComponentName(resolveInfo);
if (!mAvailableAgents.containsKey(name)) {
AgentInfo agentInfo = new AgentInfo();
agentInfo.label = resolveInfo.loadLabel(pm);
agentInfo.icon = resolveInfo.loadIcon(pm);
agentInfo.component = name;
- agentInfo.settings = getSettingsComponentName(pm, resolveInfo);
+ TrustAgentUtils.TrustAgentComponentInfo trustAgentComponentInfo =
+ TrustAgentUtils.getSettingsComponent(pm, resolveInfo);
+ agentInfo.settings = trustAgentComponentInfo.componentName;
mAvailableAgents.put(name, agentInfo);
}
}
((BaseAdapter) getListAdapter()).notifyDataSetChanged();
}
- private ComponentName getComponentName(ResolveInfo resolveInfo) {
- if (resolveInfo == null || resolveInfo.serviceInfo == null) return null;
- return new ComponentName(resolveInfo.serviceInfo.packageName, resolveInfo.serviceInfo.name);
- }
-
- private ComponentName getSettingsComponentName(PackageManager pm, ResolveInfo resolveInfo) {
- if (resolveInfo == null || resolveInfo.serviceInfo == null
- || resolveInfo.serviceInfo.metaData == null) return null;
- String cn = null;
- XmlResourceParser parser = null;
- Exception caughtException = null;
- try {
- parser = resolveInfo.serviceInfo.loadXmlMetaData(pm, TRUST_AGENT_META_DATA);
- if (parser == null) {
- Slog.w(TAG, "Can't find " + TRUST_AGENT_META_DATA + " meta-data");
- return null;
- }
- Resources res = pm.getResourcesForApplication(resolveInfo.serviceInfo.applicationInfo);
- AttributeSet attrs = Xml.asAttributeSet(parser);
- int type;
- while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
- && type != XmlPullParser.START_TAG) {
- }
- String nodeName = parser.getName();
- if (!"trust-agent".equals(nodeName)) {
- Slog.w(TAG, "Meta-data does not start with trust-agent tag");
- return null;
- }
- TypedArray sa = res
- .obtainAttributes(attrs, com.android.internal.R.styleable.TrustAgent);
- cn = sa.getString(com.android.internal.R.styleable.TrustAgent_settingsActivity);
- sa.recycle();
- } catch (PackageManager.NameNotFoundException e) {
- caughtException = e;
- } catch (IOException e) {
- caughtException = e;
- } catch (XmlPullParserException e) {
- caughtException = e;
- } finally {
- if (parser != null) parser.close();
- }
- if (caughtException != null) {
- Slog.w(TAG, "Error parsing : " + resolveInfo.serviceInfo.packageName, caughtException);
- return null;
- }
- if (cn != null && cn.indexOf('/') < 0) {
- cn = resolveInfo.serviceInfo.packageName + "/" + cn;
- }
- return cn == null ? null : ComponentName.unflattenFromString(cn);
- }
-
@Override
public void onClick(View view) {
ViewHolder h = (ViewHolder) view.getTag();
@@ -295,10 +222,10 @@
h.name = (TextView)v.findViewById(R.id.name);
h.checkbox = (CheckBox)v.findViewById(R.id.checkbox);
h.clickable = v.findViewById(R.id.clickable);
- h.clickable.setOnClickListener(TrustAgentSettings.this);
+ h.clickable.setOnClickListener(AdvancedSecuritySettings.this);
h.description = (TextView)v.findViewById(R.id.description);
h.settings = v.findViewById(R.id.settings);
- h.settings.setOnClickListener(TrustAgentSettings.this);
+ h.settings.setOnClickListener(AdvancedSecuritySettings.this);
v.setTag(h);
h.settings.setTag(h);
h.clickable.setTag(h);
diff --git a/src/com/android/settings/ApnSettings.java b/src/com/android/settings/ApnSettings.java
index 3fbb5e3..ef79f2b 100644
--- a/src/com/android/settings/ApnSettings.java
+++ b/src/com/android/settings/ApnSettings.java
@@ -32,6 +32,7 @@
import android.os.HandlerThread;
import android.os.Looper;
import android.os.Message;
+import android.os.UserManager;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.preference.PreferenceGroup;
@@ -83,10 +84,14 @@
private RestoreApnProcessHandler mRestoreApnProcessHandler;
private HandlerThread mRestoreDefaultApnThread;
+ private UserManager mUm;
+
private String mSelectedKey;
private IntentFilter mMobileStateFilter;
+ private boolean mUnavailable;
+
private final BroadcastReceiver mMobileStateReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
@@ -119,6 +124,14 @@
protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
+ mUm = (UserManager) getSystemService(Context.USER_SERVICE);
+
+ if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
+ mUnavailable = true;
+ setContentView(R.layout.apn_disallowed_preference_screen);
+ return;
+ }
+
addPreferencesFromResource(R.xml.apn_settings);
getListView().setItemsCanFocus(true);
@@ -130,6 +143,10 @@
protected void onResume() {
super.onResume();
+ if (mUnavailable) {
+ return;
+ }
+
registerReceiver(mMobileStateReceiver, mMobileStateFilter);
if (!mRestoreDefaultApnMode) {
@@ -143,6 +160,10 @@
protected void onPause() {
super.onPause();
+ if (mUnavailable) {
+ return;
+ }
+
unregisterReceiver(mMobileStateReceiver);
}
diff --git a/src/com/android/settings/CredentialStorage.java b/src/com/android/settings/CredentialStorage.java
index 44e966c..f515b36 100644
--- a/src/com/android/settings/CredentialStorage.java
+++ b/src/com/android/settings/CredentialStorage.java
@@ -19,6 +19,7 @@
import android.app.Activity;
import android.app.AlertDialog;
import android.app.admin.DevicePolicyManager;
+import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.res.Resources;
@@ -26,6 +27,7 @@
import android.os.Bundle;
import android.os.RemoteException;
import android.os.Process;
+import android.os.UserManager;
import android.security.Credentials;
import android.security.KeyChain.KeyChainConnection;
import android.security.KeyChain;
@@ -38,8 +40,8 @@
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
-import com.android.internal.widget.LockPatternUtils;
+import com.android.internal.widget.LockPatternUtils;
import com.android.org.bouncycastle.asn1.ASN1InputStream;
import com.android.org.bouncycastle.asn1.pkcs.PrivateKeyInfo;
@@ -119,16 +121,20 @@
Intent intent = getIntent();
String action = intent.getAction();
-
- if (ACTION_RESET.equals(action)) {
- new ResetDialog();
- } else {
- if (ACTION_INSTALL.equals(action)
- && "com.android.certinstaller".equals(getCallingPackage())) {
- mInstallBundle = intent.getExtras();
+ UserManager userManager = (UserManager) getSystemService(Context.USER_SERVICE);
+ if (!userManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
+ if (ACTION_RESET.equals(action)) {
+ new ResetDialog();
+ } else {
+ if (ACTION_INSTALL.equals(action)
+ && "com.android.certinstaller".equals(getCallingPackage())) {
+ mInstallBundle = intent.getExtras();
+ }
+ // ACTION_UNLOCK also handled here in addition to ACTION_INSTALL
+ handleUnlockOrInstall();
}
- // ACTION_UNLOCK also handled here in addition to ACTION_INSTALL
- handleUnlockOrInstall();
+ } else {
+ finish();
}
}
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index f819755..e9fed4f 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -40,6 +40,7 @@
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
+import android.text.format.DateUtils;
import android.util.Log;
import android.view.KeyEvent;
import android.view.MotionEvent;
@@ -64,6 +65,8 @@
import com.android.internal.widget.LockPatternView;
import com.android.internal.widget.LockPatternView.Cell;
+import static com.android.internal.widget.LockPatternView.DisplayMode;
+
import java.util.List;
/**
@@ -121,6 +124,16 @@
private int mNotificationCountdown = 0;
/** Number of calls to {@link #notifyUser()} before we release the wakelock */
private int mReleaseWakeLockCountdown = 0;
+ private int mStatusString = R.string.enter_password;
+
+ // how long we wait to clear a wrong pattern
+ private static final int WRONG_PATTERN_CLEAR_TIMEOUT_MS = 1500;
+
+ private Runnable mClearPatternRunnable = new Runnable() {
+ public void run() {
+ mLockPatternView.clearPattern();
+ }
+ };
/**
* Used to propagate state through configuration changes (e.g. screen rotation)
@@ -174,21 +187,32 @@
} else if (failedAttempts == MAX_FAILED_ATTEMPTS) {
// Factory reset the device.
sendBroadcast(new Intent("android.intent.action.MASTER_CLEAR"));
- } else if ((failedAttempts % COOL_DOWN_ATTEMPTS) == 0) {
- if (mLockPatternView != null) {
- mLockPatternView.clearPattern();
- }
- mCooldown = COOL_DOWN_INTERVAL;
- cooldown();
} else {
- final TextView status = (TextView) findViewById(R.id.status);
- status.setText(R.string.try_again);
- // Reenable the password entry
- if (mPasswordEntry != null) {
- mPasswordEntry.setEnabled(true);
- }
+ // Wrong entry. Handle pattern case.
if (mLockPatternView != null) {
- mLockPatternView.setEnabled(true);
+ mLockPatternView.setDisplayMode(DisplayMode.Wrong);
+ mLockPatternView.removeCallbacks(mClearPatternRunnable);
+ mLockPatternView.postDelayed(mClearPatternRunnable, WRONG_PATTERN_CLEAR_TIMEOUT_MS);
+ }
+ if ((failedAttempts % COOL_DOWN_ATTEMPTS) == 0) {
+ mCooldown = COOL_DOWN_INTERVAL;
+ cooldown();
+ } else {
+ final TextView status = (TextView) findViewById(R.id.status);
+ status.setText(R.string.try_again);
+ if (mLockPatternView != null) {
+ mLockPatternView.setDisplayMode(DisplayMode.Wrong);
+ }
+ // Reenable the password entry
+ if (mPasswordEntry != null) {
+ mPasswordEntry.setEnabled(true);
+ final InputMethodManager imm = (InputMethodManager) getSystemService(
+ Context.INPUT_METHOD_SERVICE);
+ imm.showSoftInput(mPasswordEntry, 0);
+ }
+ if (mLockPatternView != null) {
+ mLockPatternView.setEnabled(true);
+ }
}
}
}
@@ -397,18 +421,28 @@
public void onPostExecute(java.lang.Void v) {
if(type == StorageManager.CRYPT_TYPE_PIN) {
setContentView(R.layout.crypt_keeper_pin_entry);
- ((TextView)findViewById(R.id.status)).setText(R.string.enter_pin);
+ mStatusString = R.string.enter_pin;
} else if (type == StorageManager.CRYPT_TYPE_PATTERN) {
setContentView(R.layout.crypt_keeper_pattern_entry);
setBackFunctionality(false);
- ((TextView)findViewById(R.id.status)).setText(R.string.enter_pattern);
+ mStatusString = R.string.enter_pattern;
} else {
setContentView(R.layout.crypt_keeper_password_entry);
+ mStatusString = R.string.enter_password;
}
+ final TextView status = (TextView) findViewById(R.id.status);
+ status.setText(mStatusString);
- final TextView status = (TextView) findViewById(R.id.owner_info);
- status.setText(owner_info);
+ final TextView ownerInfo = (TextView) findViewById(R.id.owner_info);
+ ownerInfo.setText(owner_info);
+ ownerInfo.setSelected(true); // Required for marquee'ing to work
+
passwordEntryInit();
+
+ if (mCooldown > 0) {
+ setBackFunctionality(false);
+ cooldown(); // in case we are cooling down and coming back from emergency dialler
+ }
}
}.execute();
} else if (!mValidationRequested) {
@@ -507,23 +541,40 @@
return;
}
- int progress = 0;
+ // Get status as percentage first
+ CharSequence status = getText(R.string.crypt_keeper_setup_description);
+ int percent = 0;
try {
// Force a 50% progress state when debugging the view.
- progress = isDebugView() ? 50 : Integer.parseInt(state);
+ percent = isDebugView() ? 50 : Integer.parseInt(state);
} catch (Exception e) {
Log.w(TAG, "Error parsing progress: " + e.toString());
}
+ String progress = Integer.toString(percent);
- final CharSequence status = getText(R.string.crypt_keeper_setup_description);
+ // Now try to get status as time remaining and replace as appropriate
Log.v(TAG, "Encryption progress: " + progress);
+ try {
+ final String timeProperty = SystemProperties.get("vold.encrypt_time_remaining");
+ int time = Integer.parseInt(timeProperty);
+ if (time >= 0) {
+ // Round up to multiple of 10 - this way display is less jerky
+ time = (time + 9) / 10 * 10;
+ progress = DateUtils.formatElapsedTime(time);
+ status = getText(R.string.crypt_keeper_setup_time_remaining);
+ }
+ } catch (Exception e) {
+ // Will happen if no time etc - show percentage
+ }
+
final TextView tv = (TextView) findViewById(R.id.status);
if (tv != null) {
- tv.setText(TextUtils.expandTemplate(status, Integer.toString(progress)));
+ tv.setText(TextUtils.expandTemplate(status, progress));
}
- // Check the progress every 5 seconds
+
+ // Check the progress every 1 seconds
mHandler.removeMessages(MESSAGE_UPDATE_PROGRESS);
- mHandler.sendEmptyMessageDelayed(MESSAGE_UPDATE_PROGRESS, 5000);
+ mHandler.sendEmptyMessageDelayed(MESSAGE_UPDATE_PROGRESS, 1000);
}
/** Disable password input for a while to force the user to waste time between retries */
@@ -534,13 +585,24 @@
// Re-enable the password entry and back presses.
if (mPasswordEntry != null) {
mPasswordEntry.setEnabled(true);
+ final InputMethodManager imm = (InputMethodManager) getSystemService(
+ Context.INPUT_METHOD_SERVICE);
+ imm.showSoftInput(mPasswordEntry, 0);
setBackFunctionality(true);
}
if (mLockPatternView != null) {
mLockPatternView.setEnabled(true);
}
- status.setText(R.string.enter_password);
+ status.setText(mStatusString);
} else {
+ // Disable the password entry and back presses.
+ if (mPasswordEntry != null) {
+ mPasswordEntry.setEnabled(false);
+ }
+ if (mLockPatternView != null) {
+ mLockPatternView.setEnabled(false);
+ }
+
CharSequence template = getText(R.string.crypt_keeper_cooldown);
status.setText(TextUtils.expandTemplate(template, Integer.toString(mCooldown)));
@@ -564,25 +626,26 @@
}
protected LockPatternView.OnPatternListener mChooseNewLockPatternListener =
- new LockPatternView.OnPatternListener() {
+ new LockPatternView.OnPatternListener() {
- @Override
- public void onPatternStart() {
- }
+ @Override
+ public void onPatternStart() {
+ mLockPatternView.removeCallbacks(mClearPatternRunnable);
+ }
- @Override
- public void onPatternCleared() {
- }
+ @Override
+ public void onPatternCleared() {
+ }
- @Override
- public void onPatternDetected(List<LockPatternView.Cell> pattern) {
- mLockPatternView.setEnabled(false);
- new DecryptTask().execute(LockPatternUtils.patternToString(pattern));
- }
+ @Override
+ public void onPatternDetected(List<LockPatternView.Cell> pattern) {
+ mLockPatternView.setEnabled(false);
+ new DecryptTask().execute(LockPatternUtils.patternToString(pattern));
+ }
- @Override
- public void onPatternCellAdded(List<Cell> pattern) {
- }
+ @Override
+ public void onPatternCellAdded(List<Cell> pattern) {
+ }
};
private void passwordEntryInit() {
@@ -636,13 +699,13 @@
mWakeLock.acquire();
// Keep awake for 10 minutes - if the user hasn't been alerted by then
// best not to just drain their battery
- mReleaseWakeLockCountdown = 96; // 96 * 5 + 120 = 600
+ mReleaseWakeLockCountdown = 96; // 96 * 5 secs per click + 120 secs before we show this = 600
}
}
// Asynchronously throw up the IME, since there are issues with requesting it to be shown
// immediately.
- if (mLockPatternView == null) {
+ if (mLockPatternView == null && mCooldown <= 0) {
mHandler.postDelayed(new Runnable() {
@Override public void run() {
imm.showSoftInputUnchecked(0, null);
@@ -827,6 +890,7 @@
final Intent intent = new Intent(ACTION_EMERGENCY_DIAL);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK
| Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS);
+ setBackFunctionality(true);
startActivity(intent);
}
diff --git a/src/com/android/settings/DataUsageSummary.java b/src/com/android/settings/DataUsageSummary.java
index 86a73c2..dbef6cb 100644
--- a/src/com/android/settings/DataUsageSummary.java
+++ b/src/com/android/settings/DataUsageSummary.java
@@ -189,6 +189,9 @@
private static final int LOADER_CHART_DATA = 2;
private static final int LOADER_SUMMARY = 3;
+ private static final int FOREGROUND_BYTES_COLOR = 0xff009688;
+ private static final int DEFAULT_BYTES_COLOR = 0xffced7db;
+
private INetworkManagementService mNetworkService;
private INetworkStatsService mStatsService;
private NetworkPolicyManager mPolicyManager;
@@ -357,7 +360,8 @@
mDataEnabled = new Switch(inflater.getContext());
mDataEnabledView = inflatePreference(inflater, mNetworkSwitches, mDataEnabled);
- mDataEnabledView.setTag(DATA_USAGE_ENABLE_MOBILE_KEY);
+ mDataEnabledView.setTag(R.id.preference_highlight_key,
+ DATA_USAGE_ENABLE_MOBILE_KEY);
mDataEnabled.setOnCheckedChangeListener(mDataEnabledListener);
mNetworkSwitches.addView(mDataEnabledView);
@@ -365,7 +369,8 @@
mDisableAtLimit.setClickable(false);
mDisableAtLimit.setFocusable(false);
mDisableAtLimitView = inflatePreference(inflater, mNetworkSwitches, mDisableAtLimit);
- mDisableAtLimitView.setTag(DATA_USAGE_DISABLE_MOBILE_LIMIT_KEY);
+ mDisableAtLimitView.setTag(R.id.preference_highlight_key,
+ DATA_USAGE_DISABLE_MOBILE_LIMIT_KEY);
mDisableAtLimitView.setClickable(true);
mDisableAtLimitView.setFocusable(true);
mDisableAtLimitView.setOnClickListener(mDisableAtLimitListener);
@@ -374,7 +379,7 @@
// bind cycle dropdown
mCycleView = mHeader.findViewById(R.id.cycles);
- mCycleView.setTag(DATA_USAGE_CYCLE_KEY);
+ mCycleView.setTag(R.id.preference_highlight_key, DATA_USAGE_CYCLE_KEY);
mCycleSpinner = (Spinner) mCycleView.findViewById(R.id.cycles_spinner);
mCycleAdapter = new CycleAdapter(context);
mCycleSpinner.setAdapter(mCycleAdapter);
@@ -1176,8 +1181,8 @@
mAppPieChart.setOriginAngle(175);
mAppPieChart.removeAllSlices();
- mAppPieChart.addSlice(foregroundBytes, Color.parseColor("#d88d3a"));
- mAppPieChart.addSlice(defaultBytes, Color.parseColor("#666666"));
+ mAppPieChart.addSlice(foregroundBytes, FOREGROUND_BYTES_COLOR);
+ mAppPieChart.addSlice(defaultBytes, DEFAULT_BYTES_COLOR);
mAppPieChart.generatePath();
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index 5e5113b..00a0b92 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -16,7 +16,6 @@
package com.android.settings;
-import android.app.ActionBar;
import android.app.Activity;
import android.app.ActivityManagerNative;
import android.app.AlertDialog;
@@ -57,13 +56,11 @@
import android.provider.Settings;
import android.text.TextUtils;
import android.util.Log;
-import android.view.Gravity;
import android.view.HardwareRenderer;
import android.view.IWindowManager;
import android.view.View;
import android.view.accessibility.AccessibilityManager;
import android.webkit.WebView;
-import android.widget.CompoundButton;
import android.widget.Switch;
import android.widget.TextView;
@@ -98,8 +95,6 @@
private static final String ENABLE_TERMINAL = "enable_terminal";
private static final String KEEP_SCREEN_ON = "keep_screen_on";
private static final String BT_HCI_SNOOP_LOG = "bt_hci_snoop_log";
- private static final String SELECT_RUNTIME_KEY = "select_runtime";
- private static final String SELECT_RUNTIME_PROPERTY = "persist.sys.dalvik.vm.lib.2";
private static final String ALLOW_MOCK_LOCATION = "allow_mock_location";
private static final String HDCP_CHECKING_KEY = "hdcp_checking";
private static final String HDCP_CHECKING_PROPERTY = "persist.sys.hdcp_checking";
@@ -139,6 +134,11 @@
private static final String DEBUG_APPLICATIONS_CATEGORY_KEY = "debug_applications_category";
private static final String WIFI_DISPLAY_CERTIFICATION_KEY = "wifi_display_certification";
private static final String WIFI_VERBOSE_LOGGING_KEY = "wifi_verbose_logging";
+ private static final String WIFI_AGGRESSIVE_HANDOVER_KEY = "wifi_aggressive_handover";
+ private static final String WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY = "wifi_allow_scan_with_traffic";
+ private static final String SELECT_LOGD_SIZE_KEY = "select_logd_size";
+ private static final String SELECT_LOGD_SIZE_PROPERTY = "persist.logd.size";
+ private static final String SELECT_LOGD_DEFAULT_SIZE_PROPERTY = "ro.logd.size";
private static final String OPENGL_TRACES_KEY = "enable_opengl_traces";
@@ -160,6 +160,8 @@
private static final int RESULT_DEBUG_APP = 1000;
+ private static String DEFAULT_LOG_RING_BUFFER_SIZE_IN_BYTES = "262144"; // 256K
+
private IWindowManager mWindowManager;
private IBackupManager mBackupManager;
private DevicePolicyManager mDpm;
@@ -187,6 +189,8 @@
private CheckBoxPreference mVerifyAppsOverUsb;
private CheckBoxPreference mWifiDisplayCertification;
private CheckBoxPreference mWifiVerboseLogging;
+ private CheckBoxPreference mWifiAggressiveHandover;
+ private CheckBoxPreference mWifiAllowScansWithTraffic;
private CheckBoxPreference mStrictMode;
private CheckBoxPreference mPointerLocation;
@@ -201,6 +205,7 @@
private CheckBoxPreference mDebugLayout;
private CheckBoxPreference mForceRtlLayout;
private ListPreference mDebugHwOverdraw;
+ private ListPreference mLogdSize;
private ListPreference mTrackFrameTime;
private ListPreference mShowNonRectClip;
private ListPreference mWindowAnimationScale;
@@ -316,6 +321,10 @@
mDebugHwOverdraw = addListPreference(DEBUG_HW_OVERDRAW_KEY);
mWifiDisplayCertification = findAndInitCheckboxPref(WIFI_DISPLAY_CERTIFICATION_KEY);
mWifiVerboseLogging = findAndInitCheckboxPref(WIFI_VERBOSE_LOGGING_KEY);
+ mWifiAggressiveHandover = findAndInitCheckboxPref(WIFI_AGGRESSIVE_HANDOVER_KEY);
+ mWifiAllowScansWithTraffic = findAndInitCheckboxPref(WIFI_ALLOW_SCAN_WITH_TRAFFIC_KEY);
+ mLogdSize = addListPreference(SELECT_LOGD_SIZE_KEY);
+
mWindowAnimationScale = addListPreference(WINDOW_ANIMATION_SCALE_KEY);
mTransitionAnimationScale = addListPreference(TRANSITION_ANIMATION_SCALE_KEY);
mAnimatorDurationScale = addListPreference(ANIMATOR_DURATION_SCALE_KEY);
@@ -336,12 +345,6 @@
mAllPrefs.add(mShowAllANRs);
mResetCbPrefs.add(mShowAllANRs);
- Preference selectRuntime = findPreference(SELECT_RUNTIME_KEY);
- if (selectRuntime != null) {
- mAllPrefs.add(selectRuntime);
- filterRuntimeOptions(selectRuntime);
- }
-
Preference hdcpChecking = findPreference(HDCP_CHECKING_KEY);
if (hdcpChecking != null) {
mAllPrefs.add(hdcpChecking);
@@ -352,6 +355,12 @@
mAllPrefs.add(mProcessStats);
mWebViewDataReductionProxy = findAndInitCheckboxPref(WEBVIEW_DATA_REDUCTION_PROXY_KEY);
+ String key = Settings.Global.getString(getActivity().getContentResolver(),
+ Settings.Global.WEBVIEW_DATA_REDUCTION_PROXY_KEY);
+ // Disable the selection if the key is not available for some reason.
+ if (key == null || key.isEmpty()) {
+ disableForUser(mWebViewDataReductionProxy);
+ }
}
private ListPreference addListPreference(String prefKey) {
@@ -462,6 +471,9 @@
public void onDestroyView() {
super.onDestroyView();
+ if (mUnavailable) {
+ return;
+ }
mSwitchBar.removeOnSwitchChangeListener(this);
mSwitchBar.hide();
}
@@ -490,7 +502,6 @@
Settings.Secure.BLUETOOTH_HCI_LOG, 0) != 0);
updateCheckBox(mAllowMockLocation, Settings.Secure.getInt(cr,
Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0);
- updateRuntimeValue();
updateHdcpValues();
updatePasswordSummary();
updateDebuggerOptions();
@@ -517,8 +528,11 @@
updateVerifyAppsOverUsbOptions();
updateBugreportOptions();
updateForceRtlOptions();
+ updateLogdSizeValues();
updateWifiDisplayCertificationOptions();
updateWifiVerboseLoggingOptions();
+ updateWifiAggressiveHandoverOptions();
+ updateWifiAllowScansWithTrafficOptions();
updateSimulateColorSpace();
updateUseNuplayerOptions();
}
@@ -533,6 +547,7 @@
}
}
resetDebuggerOptions();
+ writeLogdSizeOption(null);
writeAnimationScaleOption(0, mWindowAnimationScale, null);
writeAnimationScaleOption(1, mTransitionAnimationScale, null);
writeAnimationScaleOption(2, mAnimatorDurationScale, null);
@@ -544,53 +559,6 @@
pokeSystemProperties();
}
- void filterRuntimeOptions(Preference selectRuntime) {
- ListPreference pref = (ListPreference) selectRuntime;
- ArrayList<String> validValues = new ArrayList<String>();
- ArrayList<String> validSummaries = new ArrayList<String>();
- String[] values = getResources().getStringArray(R.array.select_runtime_values);
- String[] summaries = getResources().getStringArray(R.array.select_runtime_summaries);
- for (int i = 0; i < values.length; i++) {
- String value = values[i];
- String summary = summaries[i];
- if (new File("/system/lib/" + value).exists()) {
- validValues.add(value);
- validSummaries.add(summary);
- }
- }
- int count = validValues.size();
- if (count <= 1) {
- // no choices, so remove preference
- removePreference(selectRuntime);
- } else {
- pref.setEntryValues(validValues.toArray(new String[count]));
- pref.setEntries(validSummaries.toArray(new String[count]));
- }
- }
-
- private String currentRuntimeValue() {
- return SystemProperties.get(SELECT_RUNTIME_PROPERTY, VMRuntime.getRuntime().vmLibrary());
- }
-
- private void updateRuntimeValue() {
- ListPreference selectRuntime = (ListPreference) findPreference(SELECT_RUNTIME_KEY);
- if (selectRuntime != null) {
- String currentValue = currentRuntimeValue();
- String[] values = getResources().getStringArray(R.array.select_runtime_values);
- String[] summaries = getResources().getStringArray(R.array.select_runtime_summaries);
- int index = 0;
- for (int i = 0; i < values.length; i++) {
- if (currentValue.equals(values[i])) {
- index = i;
- break;
- }
- }
- selectRuntime.setValue(values[index]);
- selectRuntime.setSummary(summaries[index]);
- selectRuntime.setOnPreferenceChangeListener(this);
- }
- }
-
private void updateHdcpValues() {
ListPreference hdcpChecking = (ListPreference) findPreference(HDCP_CHECKING_KEY);
if (hdcpChecking != null) {
@@ -1034,6 +1002,65 @@
mWifiManager.enableVerboseLogging(mWifiVerboseLogging.isChecked() ? 1 : 0);
}
+ private void updateWifiAggressiveHandoverOptions() {
+ boolean enabled = mWifiManager.getAggressiveHandover() > 0;
+ updateCheckBox(mWifiAggressiveHandover, enabled);
+ }
+
+ private void writeWifiAggressiveHandoverOptions() {
+ mWifiManager.enableAggressiveHandover(mWifiAggressiveHandover.isChecked() ? 1 : 0);
+ }
+
+ private void updateWifiAllowScansWithTrafficOptions() {
+ boolean enabled = mWifiManager.getAllowScansWithTraffic() > 0;
+ updateCheckBox(mWifiAllowScansWithTraffic, enabled);
+ }
+
+ private void writeWifiAllowScansWithTrafficOptions() {
+ mWifiManager.setAllowScansWithTraffic(mWifiAllowScansWithTraffic.isChecked() ? 1 : 0);
+ }
+
+ private void updateLogdSizeValues() {
+ if (mLogdSize != null) {
+ String currentValue = SystemProperties.get(SELECT_LOGD_SIZE_PROPERTY);
+ if (currentValue == null) {
+ currentValue = SystemProperties.get(SELECT_LOGD_DEFAULT_SIZE_PROPERTY);
+ if (currentValue == null) {
+ currentValue = "256K";
+ }
+ }
+ String[] values = getResources().getStringArray(R.array.select_logd_size_values);
+ String[] titles = getResources().getStringArray(R.array.select_logd_size_titles);
+ String[] summaries = getResources().getStringArray(R.array.select_logd_size_summaries);
+ int index = 1; // punt to second entry if not found
+ for (int i = 0; i < values.length; i++) {
+ if (currentValue.equals(values[i])
+ || currentValue.equals(titles[i])) {
+ index = i;
+ break;
+ }
+ }
+ mLogdSize.setValue(values[index]);
+ mLogdSize.setSummary(summaries[index]);
+ mLogdSize.setOnPreferenceChangeListener(this);
+ }
+ }
+
+ private void writeLogdSizeOption(Object newValue) {
+ final String size = (newValue != null) ?
+ newValue.toString() : DEFAULT_LOG_RING_BUFFER_SIZE_IN_BYTES;
+ SystemProperties.set(SELECT_LOGD_SIZE_PROPERTY, size);
+ pokeSystemProperties();
+ try {
+ Process p = Runtime.getRuntime().exec("logcat -b all -G " + size);
+ p.waitFor();
+ Log.i(TAG, "Logcat ring buffer sizes set to: " + size);
+ } catch (Exception e) {
+ Log.w(TAG, "Cannot set logcat ring buffer sizes", e);
+ }
+ updateLogdSizeValues();
+ }
+
private void updateCpuUsageOptions() {
updateCheckBox(mShowCpuUsage, Settings.Global.getInt(getActivity().getContentResolver(),
Settings.Global.SHOW_PROCESSES, 0) != 0);
@@ -1202,8 +1229,8 @@
private void updateWebViewDataReductionProxyOptions() {
updateCheckBox(mWebViewDataReductionProxy, Settings.Secure.getInt(
- getActivity().getContentResolver(),
- Settings.Secure.WEBVIEW_DATA_REDUCTION_PROXY, 0) != 0);
+ getActivity().getContentResolver(),
+ Settings.Secure.WEBVIEW_DATA_REDUCTION_PROXY, 0) != 0);
}
@Override
@@ -1337,6 +1364,10 @@
writeWifiDisplayCertificationOptions();
} else if (preference == mWifiVerboseLogging) {
writeWifiVerboseLoggingOptions();
+ } else if (preference == mWifiAggressiveHandover) {
+ writeWifiAggressiveHandoverOptions();
+ } else if (preference == mWifiAllowScansWithTraffic) {
+ writeWifiAllowScansWithTrafficOptions();
} else if (preference == mUseNuplayer) {
writeUseNuplayerOptions();
} else {
@@ -1348,38 +1379,14 @@
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (SELECT_RUNTIME_KEY.equals(preference.getKey())) {
- final String oldRuntimeValue = VMRuntime.getRuntime().vmLibrary();
- final String newRuntimeValue = newValue.toString();
- if (!newRuntimeValue.equals(oldRuntimeValue)) {
- final Context context = getActivity();
- final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
- builder.setMessage(context.getResources().getString(R.string.select_runtime_warning_message,
- oldRuntimeValue, newRuntimeValue));
- builder.setPositiveButton(android.R.string.ok, new OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- SystemProperties.set(SELECT_RUNTIME_PROPERTY, newRuntimeValue);
- pokeSystemProperties();
- PowerManager pm = (PowerManager)
- context.getSystemService(Context.POWER_SERVICE);
- pm.reboot(null);
- }
- });
- builder.setNegativeButton(android.R.string.cancel, new OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int which) {
- updateRuntimeValue();
- }
- });
- builder.show();
- }
- return true;
- } else if (HDCP_CHECKING_KEY.equals(preference.getKey())) {
+ if (HDCP_CHECKING_KEY.equals(preference.getKey())) {
SystemProperties.set(HDCP_CHECKING_PROPERTY, newValue.toString());
updateHdcpValues();
pokeSystemProperties();
return true;
+ } else if (preference == mLogdSize) {
+ writeLogdSizeOption(newValue);
+ return true;
} else if (preference == mWindowAnimationScale) {
writeAnimationScaleOption(0, mWindowAnimationScale, newValue);
return true;
diff --git a/src/com/android/settings/HighlightingFragment.java b/src/com/android/settings/HighlightingFragment.java
index 1424abd..4a233b4 100644
--- a/src/com/android/settings/HighlightingFragment.java
+++ b/src/com/android/settings/HighlightingFragment.java
@@ -116,7 +116,7 @@
}
private boolean checkTag(View view, String key) {
- final Object tag = view.getTag();
+ final Object tag = view.getTag(R.id.preference_highlight_key);
if (tag == null || !(tag instanceof String)) {
return false;
}
diff --git a/src/com/android/settings/LockToAppSettings.java b/src/com/android/settings/LockToAppSettings.java
new file mode 100644
index 0000000..2679728
--- /dev/null
+++ b/src/com/android/settings/LockToAppSettings.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings;
+
+import android.app.admin.DevicePolicyManager;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Resources;
+import android.graphics.BitmapFactory;
+import android.os.Bundle;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceChangeListener;
+import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
+import android.provider.Settings;
+import android.provider.Settings.SettingNotFoundException;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.DynamicDrawableSpan;
+import android.text.style.ImageSpan;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Switch;
+import android.widget.TextView;
+
+import com.android.internal.widget.LockPatternUtils;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
+import com.android.settings.widget.SwitchBar;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Location access settings.
+ */
+public class LockToAppSettings extends SettingsPreferenceFragment
+ implements SwitchBar.OnSwitchChangeListener, Indexable {
+ private static final String TAG = "LockToAppSettings";
+
+ private static final CharSequence KEY_USE_SCREEN_LOCK = "use_screen_lock";
+ private static final int CHANGE_LOCK_METHOD_REQUEST = 123;
+
+ private SwitchBar mSwitchBar;
+ private SwitchPreference mUseScreenLock;
+
+ @Override
+ public void onActivityCreated(Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+
+ final SettingsActivity activity = (SettingsActivity) getActivity();
+
+ mSwitchBar = activity.getSwitchBar();
+ mSwitchBar.addOnSwitchChangeListener(this);
+ mSwitchBar.show();
+ }
+
+ @Override
+ public void onDestroyView() {
+ super.onDestroyView();
+
+ mSwitchBar.removeOnSwitchChangeListener(this);
+ mSwitchBar.hide();
+ }
+
+ @Override
+ public void onStop() {
+ super.onStop();
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ if (isLockToAppEnabled()) {
+ mSwitchBar.setChecked(true);
+ createPreferenceHierarchy();
+ } else {
+ mSwitchBar.setChecked(false);
+ createSetupInstructions();
+ }
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ return inflater.inflate(R.layout.lock_to_app_instructions, null);
+ }
+
+ private boolean isLockToAppEnabled() {
+ try {
+ return Settings.System.getInt(getContentResolver(), Settings.System.LOCK_TO_APP_ENABLED)
+ != 0;
+ } catch (SettingNotFoundException e) {
+ return false;
+ }
+ }
+
+ private boolean isLockScreenEnabled() {
+ try {
+ return Settings.System.getInt(getContentResolver(),
+ Settings.System.LOCK_TO_APP_EXIT_LOCKED) != 0;
+ } catch (SettingNotFoundException e) {
+ return false;
+ }
+ }
+
+ private void setLockToAppEnabled(boolean isEnabled) {
+ Settings.System.putInt(getContentResolver(), Settings.System.LOCK_TO_APP_ENABLED,
+ isEnabled ? 1 : 0);
+ }
+
+ private void setUseLockScreen(boolean useLockScreen) {
+ if (useLockScreen) {
+ LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
+ if (lockPatternUtils.getKeyguardStoredPasswordQuality()
+ == DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED) {
+ Intent chooseLockIntent = new Intent(DevicePolicyManager.ACTION_SET_NEW_PASSWORD);
+ chooseLockIntent.putExtra(
+ ChooseLockGeneric.ChooseLockGenericFragment.MINIMUM_QUALITY_KEY,
+ DevicePolicyManager.PASSWORD_QUALITY_SOMETHING);
+ startActivityForResult(chooseLockIntent, CHANGE_LOCK_METHOD_REQUEST);
+ return;
+ }
+ }
+ setUseLockScreenSetting(useLockScreen);
+ }
+
+ private void setUseLockScreenSetting(boolean useLockScreen) {
+ mUseScreenLock.setChecked(useLockScreen);
+ Settings.System.putInt(getContentResolver(), Settings.System.LOCK_TO_APP_EXIT_LOCKED,
+ useLockScreen ? 1 : 0);
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ super.onActivityResult(requestCode, resultCode, data);
+ if (requestCode == CHANGE_LOCK_METHOD_REQUEST) {
+ LockPatternUtils lockPatternUtils = new LockPatternUtils(getActivity());
+ setUseLockScreenSetting(lockPatternUtils.getKeyguardStoredPasswordQuality()
+ != DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED);
+ }
+ }
+
+ private PreferenceScreen createPreferenceHierarchy() {
+ PreferenceScreen root = getPreferenceScreen();
+ if (root != null) {
+ root.removeAll();
+ }
+ getView().findViewById(R.id.instructions_area).setVisibility(View.INVISIBLE);
+ addPreferencesFromResource(R.xml.lock_to_app_settings);
+ root = getPreferenceScreen();
+
+ mUseScreenLock = (SwitchPreference) root.findPreference(KEY_USE_SCREEN_LOCK);
+ mUseScreenLock.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+ @Override
+ public boolean onPreferenceChange(Preference preference, Object newValue) {
+ setUseLockScreen((boolean) newValue);
+ return true;
+ }
+ });
+ mUseScreenLock.setChecked(isLockScreenEnabled());
+
+ return root;
+ }
+
+ private void createSetupInstructions() {
+ PreferenceScreen root = getPreferenceScreen();
+ if (root != null) {
+ root.removeAll();
+ }
+ final View view = getView();
+ view.findViewById(R.id.instructions_area).setVisibility(View.VISIBLE);
+
+ final Resources r = Resources.getSystem();
+ TextView tv = (TextView) view.findViewById(R.id.lock_to_app_start_step3);
+ ImageSpan imageSpan = new ImageSpan(getActivity(),
+ BitmapFactory.decodeResource(r, com.android.internal.R.drawable.ic_recent),
+ DynamicDrawableSpan.ALIGN_BOTTOM);
+
+ String descriptionString = getResources().getString(R.string.lock_to_app_start_step3);
+ SpannableString description =
+ new SpannableString(descriptionString.replace('$', ' '));
+ int index = descriptionString.indexOf('$');
+ if (index >= 0) {
+ description.setSpan(imageSpan, index, index + 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+ }
+
+ // Make icon fit.
+ float width = imageSpan.getDrawable().getIntrinsicWidth();
+ float height = imageSpan.getDrawable().getIntrinsicHeight();
+ int lineHeight = tv.getLineHeight();
+ imageSpan.getDrawable().setBounds(0, 0, (int) (lineHeight * width / height), lineHeight);
+
+ tv.setText(description);
+ }
+
+ /**
+ * Listens to the state change of the lock-to-app master switch.
+ */
+ @Override
+ public void onSwitchChanged(Switch switchView, boolean isChecked) {
+ setLockToAppEnabled(isChecked);
+ if (isChecked) {
+ createPreferenceHierarchy();
+ } else {
+ createSetupInstructions();
+ }
+ }
+
+ /**
+ * For search
+ */
+ public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
+ final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
+
+ final Resources res = context.getResources();
+
+ // Add fragment title
+ SearchIndexableRaw data = new SearchIndexableRaw(context);
+ data.title = res.getString(R.string.lock_to_app_title);
+ data.screenTitle = res.getString(R.string.lock_to_app_title);
+ result.add(data);
+
+ // Lock-to-app description.
+ data = new SearchIndexableRaw(context);
+ data.title = res.getString(R.string.lock_to_app_description);
+ data.screenTitle = res.getString(R.string.lock_to_app_title);
+ result.add(data);
+
+ // Lock-to-app use screen lock.
+ data = new SearchIndexableRaw(context);
+ data.title = res.getString(R.string.lock_to_app_screen_lock);
+ data.screenTitle = res.getString(R.string.lock_to_app_title);
+ result.add(data);
+
+ return result;
+ }
+ };
+}
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index eaf29c6..bbd98fb 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -54,7 +54,6 @@
private static final String TAG = "MasterClear";
private static final int KEYGUARD_REQUEST = 55;
- private static final int PIN_REQUEST = 56;
static final String ERASE_EXTERNAL_EXTRA = "erase_sd";
@@ -62,7 +61,6 @@
private Button mInitiateButton;
private View mExternalStorageContainer;
private CheckBox mExternalStorage;
- private boolean mPinConfirmed;
/**
* Keyguard validation is run using the standard {@link ConfirmLockPattern}
@@ -78,25 +76,11 @@
res.getText(R.string.master_clear_gesture_explanation));
}
- private boolean runRestrictionsChallenge() {
- if (UserManager.get(getActivity()).hasRestrictionsChallenge()) {
- startActivityForResult(
- new Intent(Intent.ACTION_RESTRICTIONS_CHALLENGE), PIN_REQUEST);
- return true;
- }
- return false;
- }
-
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
- if (requestCode == PIN_REQUEST) {
- if (resultCode == Activity.RESULT_OK) {
- mPinConfirmed = true;
- }
- return;
- } else if (requestCode != KEYGUARD_REQUEST) {
+ if (requestCode != KEYGUARD_REQUEST) {
return;
}
@@ -125,10 +109,6 @@
private final Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
public void onClick(View v) {
- mPinConfirmed = false;
- if (runRestrictionsChallenge()) {
- return;
- }
if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
showFinalConfirmation();
}
@@ -254,22 +234,14 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
+ if (UserManager.get(getActivity()).hasUserRestriction(
+ UserManager.DISALLOW_FACTORY_RESET)) {
+ return inflater.inflate(R.layout.master_clear_disallowed_screen, null);
+ }
+
mContentView = inflater.inflate(R.layout.master_clear, null);
establishInitialState();
return mContentView;
}
-
- @Override
- public void onResume() {
- super.onResume();
-
- // If this is the second step after restrictions pin challenge
- if (mPinConfirmed) {
- mPinConfirmed = false;
- if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
- showFinalConfirmation();
- }
- }
- }
}
diff --git a/src/com/android/settings/MasterClearConfirm.java b/src/com/android/settings/MasterClearConfirm.java
index 9c15c73..4ee17b8 100644
--- a/src/com/android/settings/MasterClearConfirm.java
+++ b/src/com/android/settings/MasterClearConfirm.java
@@ -24,6 +24,7 @@
import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle;
+import android.os.UserManager;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
@@ -80,6 +81,10 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
+ if (UserManager.get(getActivity()).hasUserRestriction(
+ UserManager.DISALLOW_FACTORY_RESET)) {
+ return inflater.inflate(R.layout.master_clear_disallowed_screen, null);
+ }
mContentView = inflater.inflate(R.layout.master_clear_confirm, null);
establishFinalConfirmationState();
return mContentView;
diff --git a/src/com/android/settings/PrivacySettings.java b/src/com/android/settings/PrivacySettings.java
index 7f699c5..aac7638 100644
--- a/src/com/android/settings/PrivacySettings.java
+++ b/src/com/android/settings/PrivacySettings.java
@@ -26,6 +26,7 @@
import android.os.Bundle;
import android.os.RemoteException;
import android.os.ServiceManager;
+import android.os.UserManager;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.preference.PreferenceScreen;
@@ -43,6 +44,7 @@
private static final String BACKUP_DATA = "backup_data";
private static final String AUTO_RESTORE = "auto_restore";
private static final String CONFIGURE_ACCOUNT = "configure_account";
+ private static final String PERSONAL_DATA_CATEGORY = "personal_data_category";
private IBackupManager mBackupManager;
private CheckBoxPreference mBackup;
private CheckBoxPreference mAutoRestore;
@@ -65,6 +67,11 @@
mAutoRestore = (CheckBoxPreference) screen.findPreference(AUTO_RESTORE);
mConfigure = (PreferenceScreen) screen.findPreference(CONFIGURE_ACCOUNT);
+ if (UserManager.get(getActivity()).hasUserRestriction(
+ UserManager.DISALLOW_FACTORY_RESET)) {
+ screen.removePreference(findPreference(PERSONAL_DATA_CATEGORY));
+ }
+
// Vendor specific
if (getActivity().getPackageManager().
resolveContentProvider(GSETTINGS_PROVIDER, 0) == null) {
diff --git a/src/com/android/settings/ProgressCategory.java b/src/com/android/settings/ProgressCategory.java
index 6fe34bf..c85dd0b 100644
--- a/src/com/android/settings/ProgressCategory.java
+++ b/src/com/android/settings/ProgressCategory.java
@@ -21,17 +21,35 @@
import android.util.AttributeSet;
import android.view.View;
+/**
+ * A category with a progress spinner
+ */
public class ProgressCategory extends ProgressCategoryBase {
- private final int mEmptyTextRes;
+ private int mEmptyTextRes;
private boolean mProgress = false;
private Preference mNoDeviceFoundPreference;
private boolean mNoDeviceFoundAdded;
+ public ProgressCategory(Context context) {
+ this(context, null);
+ }
+
+ public ProgressCategory(Context context, AttributeSet attrs) {
+ super(context, attrs, 0);
+ }
+
public ProgressCategory(Context context, AttributeSet attrs,
- int emptyTextRes) {
- super(context, attrs);
+ int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public ProgressCategory(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
setLayoutResource(R.layout.preference_progress_category);
+ }
+
+ public void setEmptyTextRes(int emptyTextRes) {
mEmptyTextRes = emptyTextRes;
}
diff --git a/src/com/android/settings/ProgressCategoryBase.java b/src/com/android/settings/ProgressCategoryBase.java
index d120b94..c08806c 100644
--- a/src/com/android/settings/ProgressCategoryBase.java
+++ b/src/com/android/settings/ProgressCategoryBase.java
@@ -21,8 +21,21 @@
import android.util.AttributeSet;
public abstract class ProgressCategoryBase extends PreferenceCategory {
+ public ProgressCategoryBase(Context context) {
+ this(context, null);
+ }
+
public ProgressCategoryBase(Context context, AttributeSet attrs) {
- super(context, attrs);
+ this(context, attrs, 0);
+ }
+
+ public ProgressCategoryBase(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr, 0);
+ }
+
+ public ProgressCategoryBase(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
}
/**
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index 00d1d89..fd8bfaf 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -22,6 +22,7 @@
import android.app.Activity;
import android.app.AlertDialog;
import android.app.admin.DevicePolicyManager;
+import android.content.ComponentName;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
@@ -41,7 +42,9 @@
import android.provider.SearchIndexableResource;
import android.provider.Settings;
import android.security.KeyStore;
+import android.service.trust.TrustAgentService;
import android.telephony.TelephonyManager;
+import android.text.TextUtils;
import android.util.Log;
import com.android.internal.widget.LockPatternUtils;
@@ -55,9 +58,11 @@
/**
* Gesture lock pattern settings.
*/
-public class SecuritySettings extends RestrictedSettingsFragment
+public class SecuritySettings extends SettingsPreferenceFragment
implements OnPreferenceChangeListener, DialogInterface.OnClickListener, Indexable {
static final String TAG = "SecuritySettings";
+ private static final Intent TRUST_AGENT_INTENT =
+ new Intent(TrustAgentService.SERVICE_INTERFACE);
// Lock Settings
private static final String KEY_UNLOCK_SET_OR_CHANGE = "unlock_set_or_change";
@@ -74,6 +79,7 @@
private static final int SET_OR_CHANGE_LOCK_METHOD_REQUEST = 123;
private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_IMPROVE_REQUEST = 124;
private static final int CONFIRM_EXISTING_FOR_BIOMETRIC_WEAK_LIVELINESS_OFF = 125;
+ private static final int CHANGE_TRUST_AGENT_SETTINGS = 126;
// Misc Settings
private static final String KEY_SIM_LOCK = "sim_lock";
@@ -86,6 +92,7 @@
private static final String KEY_POWER_INSTANTLY_LOCKS = "power_button_instantly_locks";
private static final String KEY_CREDENTIALS_MANAGER = "credentials_management";
private static final String PACKAGE_MIME_TYPE = "application/vnd.android.package-archive";
+ private static final String KEY_TRUST_AGENT = "trust_agent";
private DevicePolicyManager mDPM;
@@ -108,10 +115,6 @@
private boolean mIsPrimary;
- public SecuritySettings() {
- super(null /* Don't ask for restrictions pin on creation. */);
- }
-
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -161,7 +164,7 @@
/**
* Important!
*
- * Dont forget to update the SecuritySearchIndexProvider if you are doing any change in the
+ * Don't forget to update the SecuritySearchIndexProvider if you are doing any change in the
* logic or adding/removing preferences here.
*/
private PreferenceScreen createPreferenceHierarchy() {
@@ -267,17 +270,21 @@
} else {
removePreference(KEY_CREDENTIALS_MANAGER);
+ removePreference(KEY_CREDENTIALS_INSTALL);
}
// Application install
- PreferenceGroup deviceAdminCategory= (PreferenceGroup)
+ PreferenceGroup deviceAdminCategory = (PreferenceGroup)
root.findPreference(KEY_DEVICE_ADMIN_CATEGORY);
mToggleAppInstallation = (CheckBoxPreference) findPreference(
KEY_TOGGLE_INSTALL_APPLICATIONS);
mToggleAppInstallation.setChecked(isNonMarketAppsAllowed());
-
// Side loading of apps.
mToggleAppInstallation.setEnabled(mIsPrimary);
+ if (um.hasUserRestriction(UserManager.DISALLOW_INSTALL_UNKNOWN_SOURCES)
+ || um.hasUserRestriction(UserManager.DISALLOW_INSTALL_APPS)) {
+ mToggleAppInstallation.setEnabled(false);
+ }
// Package verification, only visible to primary user and if enabled
mToggleVerifyApps = (CheckBoxPreference) findPreference(KEY_TOGGLE_VERIFY_APPLICATIONS);
@@ -295,12 +302,43 @@
mToggleVerifyApps.setEnabled(false);
}
}
+ if (um.hasUserRestriction(UserManager.ENSURE_VERIFY_APPS)) {
+ mToggleVerifyApps.setEnabled(false);
+ }
- if (shouldBePinProtected(RESTRICTIONS_PIN_SET)) {
- protectByRestrictions(mToggleAppInstallation);
- protectByRestrictions(mToggleVerifyApps);
- protectByRestrictions(mResetCredentials);
- protectByRestrictions(root.findPreference(KEY_CREDENTIALS_INSTALL));
+ // Trust Agent preferences
+ PreferenceGroup securityCategory = (PreferenceGroup)
+ root.findPreference(KEY_SECURITY_CATEGORY);
+ if (securityCategory != null) {
+ PackageManager pm = getPackageManager();
+ List<ResolveInfo> resolveInfos = pm.queryIntentServices(TRUST_AGENT_INTENT,
+ PackageManager.GET_META_DATA);
+ List<ComponentName> enabledTrustAgents = mLockPatternUtils.getEnabledTrustAgents();
+ if (enabledTrustAgents != null && !enabledTrustAgents.isEmpty()) {
+ for (ResolveInfo resolveInfo : resolveInfos) {
+ if (resolveInfo.serviceInfo == null) continue;
+ if (!TrustAgentUtils.checkProvidePermission(resolveInfo, pm)) continue;
+ TrustAgentUtils.TrustAgentComponentInfo trustAgentComponentInfo =
+ TrustAgentUtils.getSettingsComponent(pm, resolveInfo);
+ if (trustAgentComponentInfo.componentName == null ||
+ !enabledTrustAgents.contains(
+ TrustAgentUtils.getComponentName(resolveInfo)) ||
+ TextUtils.isEmpty(trustAgentComponentInfo.title)) continue;
+ Preference trustAgentPreference =
+ new Preference(securityCategory.getContext());
+ trustAgentPreference.setKey(KEY_TRUST_AGENT);
+ trustAgentPreference.setTitle(trustAgentComponentInfo.title);
+ trustAgentPreference.setSummary(trustAgentComponentInfo.summary);
+ // Create intent for this preference.
+ Intent intent = new Intent();
+ intent.setComponent(trustAgentComponentInfo.componentName);
+ intent.setAction(Intent.ACTION_MAIN);
+ trustAgentPreference.setIntent(intent);
+ // Add preference to the settings menu.
+ securityCategory.addPreference(trustAgentPreference);
+ break; // Only render the first one.
+ }
+ }
}
return root;
@@ -463,9 +501,6 @@
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
- if (ensurePinRestrictedPreference(preference)) {
- return true;
- }
final String key = preference.getKey();
final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
@@ -522,6 +557,13 @@
} else if (KEY_TOGGLE_VERIFY_APPLICATIONS.equals(key)) {
Settings.Global.putInt(getContentResolver(), Settings.Global.PACKAGE_VERIFIER_ENABLE,
mToggleVerifyApps.isChecked() ? 1 : 0);
+ } else if (KEY_TRUST_AGENT.equals(key)) {
+ ChooseLockSettingsHelper helper =
+ new ChooseLockSettingsHelper(this.getActivity(), this);
+ if (!helper.launchConfirmationActivity(CHANGE_TRUST_AGENT_SETTINGS, null, null)) {
+ // If this returns false, it means no password confirmation is required.
+ startActivity(preference.getIntent());
+ }
} else {
// If we didn't handle it, let preferences handle it.
return super.onPreferenceTreeClick(preferenceScreen, preference);
@@ -552,6 +594,14 @@
// is called by grabbing the value from lockPatternUtils. We can't set it here
// because mBiometricWeakLiveliness could be null
return;
+ } else if (requestCode == CHANGE_TRUST_AGENT_SETTINGS && resultCode == Activity.RESULT_OK) {
+ Preference preference = getPreferenceScreen().findPreference(KEY_TRUST_AGENT);
+ if (preference != null) {
+ Intent intent = preference.getIntent();
+ if (intent != null) {
+ startActivity(intent);
+ }
+ }
}
createPreferenceHierarchy();
}
diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java
index 9cce9a1..f98669f 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -118,6 +118,7 @@
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import java.util.Set;
import static com.android.settings.dashboard.DashboardTile.TILE_ID_UNDEFINED;
@@ -126,7 +127,8 @@
PreferenceFragment.OnPreferenceStartFragmentCallback,
ButtonBarHandler, OnAccountsUpdateListener, FragmentManager.OnBackStackChangedListener,
SearchView.OnQueryTextListener, SearchView.OnCloseListener,
- MenuItem.OnActionExpandListener {
+ MenuItem.OnActionExpandListener,
+ AuthenticatorHelper.OnAccountsUpdateListener {
private static final String LOG_TAG = "Settings";
@@ -182,6 +184,7 @@
*/
public static final String EXTRA_SHOW_FRAGMENT_TITLE = ":settings:show_fragment_title";
public static final String EXTRA_SHOW_FRAGMENT_TITLE_RESID = ":settings:show_fragment_title_resid";
+ public static final String EXTRA_SHOW_FRAGMENT_AS_SHORTCUT = ":settings:show_fragment_as_shortcut";
private static final String META_DATA_KEY_FRAGMENT_CLASS =
"com.android.settings.FRAGMENT_CLASS";
@@ -317,6 +320,7 @@
private boolean mDisplaySearch;
private boolean mIsShowingDashboard;
+ private boolean mIsShortcut;
private ViewGroup mContent;
@@ -442,34 +446,52 @@
return true;
}
+ private static boolean isShortCutIntent(final Intent intent) {
+ Set<String> categories = intent.getCategories();
+ return (categories != null) && categories.contains("com.android.settings.SHORTCUT");
+ }
+
+ private static boolean isAppInfoIntent(final Intent intent) {
+ String action = intent.getAction();
+ return (action != null) && action.equals("android.settings.APPLICATION_DETAILS_SETTINGS");
+ }
+
@Override
protected void onCreate(Bundle savedState) {
- if (getIntent().hasExtra(EXTRA_UI_OPTIONS)) {
- getWindow().setUiOptions(getIntent().getIntExtra(EXTRA_UI_OPTIONS, 0));
- }
+ super.onCreate(savedState);
- mAuthenticatorHelper = new AuthenticatorHelper();
+ // Should happen before any call to getIntent()
+ getMetaData();
+
+ final Intent intent = getIntent();
+ if (intent.hasExtra(EXTRA_UI_OPTIONS)) {
+ getWindow().setUiOptions(intent.getIntExtra(EXTRA_UI_OPTIONS, 0));
+ }
+ // TODO: Delete accounts tile once we have the new screen working
+ // See: http://b/15815948
+ final UserManager um = (UserManager) getSystemService(Context.USER_SERVICE);
+ mAuthenticatorHelper = new AuthenticatorHelper(
+ this, UserHandle.getCallingUserHandle(), um, this);
mAuthenticatorHelper.updateAuthDescriptions(this);
- mAuthenticatorHelper.onAccountsUpdated(this, null);
+ mAuthenticatorHelper.onAccountsUpdated(null);
mDevelopmentPreferences = getSharedPreferences(DevelopmentSettings.PREF_FILE,
Context.MODE_PRIVATE);
- getMetaData();
-
- super.onCreate(savedState);
-
// Getting Intent properties can only be done after the super.onCreate(...)
- final String initialFragmentName = getIntent().getStringExtra(EXTRA_SHOW_FRAGMENT);
+ final String initialFragmentName = intent.getStringExtra(EXTRA_SHOW_FRAGMENT);
- mIsShowingDashboard = (initialFragmentName == null);
+ mIsShortcut = isShortCutIntent(intent) || isAppInfoIntent(intent) ||
+ intent.getBooleanExtra(EXTRA_SHOW_FRAGMENT_AS_SHORTCUT, false);
+
+ mIsShowingDashboard = (initialFragmentName == null) && !mIsShortcut;
final ComponentName cn = getIntent().getComponent();
- final boolean isShortcut = !cn.getClassName().equals(SubSettings.class.getName());
+ final boolean isSubSettings = cn.getClassName().equals(SubSettings.class.getName());
- // If this is a subsettings (but not a Shortcut) then apply the correct theme for
- // the ActionBar content inset
- if (!mIsShowingDashboard && !isShortcut) {
+ // If this is a sub settings or not the main Dashboard and not a Shortcut then apply the
+ // correct theme for the ActionBar content inset
+ if (isSubSettings || (!mIsShowingDashboard && !mIsShortcut)) {
setTheme(R.style.Theme_SubSettings);
}
@@ -492,7 +514,7 @@
mSearchMenuItemExpanded = savedState.getBoolean(SAVE_KEY_SEARCH_MENU_EXPANDED);
mSearchQuery = savedState.getString(SAVE_KEY_SEARCH_QUERY);
- setTitleFromIntent(getIntent());
+ setTitleFromIntent(intent);
ArrayList<DashboardCategory> categories =
savedState.getParcelableArrayList(SAVE_KEY_CATEGORIES);
@@ -506,14 +528,15 @@
mDisplaySearch = savedState.getBoolean(SAVE_KEY_SHOW_SEARCH);
} else {
if (!mIsShowingDashboard) {
- // No UP nor Search is shown we are launched thru a Settings "shortcut"
- if (isShortcut) {
- mDisplayHomeAsUpEnabled = false;
+ // Search is shown we are launched thru a Settings "shortcut". UP will be shown
+ // only if it is a sub settings
+ if (mIsShortcut) {
+ mDisplayHomeAsUpEnabled = isSubSettings;
mDisplaySearch = false;
}
- setTitleFromIntent(getIntent());
+ setTitleFromIntent(intent);
- Bundle initialArguments = getIntent().getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
+ Bundle initialArguments = intent.getBundleExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS);
switchToFragment(initialFragmentName, initialArguments, true, false,
mInitialTitleResId, mInitialTitle, false);
} else {
@@ -533,7 +556,6 @@
mSwitchBar = (SwitchBar) findViewById(R.id.switch_bar);
// see if we should show Back/Next buttons
- Intent intent = getIntent();
if (intent.getBooleanExtra(EXTRA_PREFS_SHOW_BUTTON_BAR, false)) {
View buttonBar = findViewById(R.id.button_bar);
@@ -733,7 +755,7 @@
args = new Bundle();
}
args.putParcelable("intent", superIntent);
- modIntent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, superIntent.getExtras());
+ modIntent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
return modIntent;
}
return superIntent;
@@ -776,7 +798,7 @@
* preference panel is done. The launched panel must use
* {@link #finishPreferencePanel(Fragment, int, Intent)} when done.
* @param resultRequestCode If resultTo is non-null, this is the caller's
- * request code to be received with the resut.
+ * request code to be received with the result.
*/
public void startPreferencePanel(String fragmentClass, Bundle args, int titleRes,
CharSequence titleText, Fragment resultTo, int resultRequestCode) {
@@ -790,7 +812,7 @@
}
}
Utils.startWithFragment(this, fragmentClass, args, resultTo, resultRequestCode,
- titleRes, title);
+ titleRes, title, mIsShortcut);
}
/**
@@ -804,6 +826,7 @@
*/
public void finishPreferencePanel(Fragment caller, int resultCode, Intent resultData) {
setResult(resultCode, resultData);
+ finish();
}
/**
@@ -1245,7 +1268,11 @@
public void onAccountsUpdated(Account[] accounts) {
// TODO: watch for package upgrades to invalidate cache; see 7206643
mAuthenticatorHelper.updateAuthDescriptions(this);
- mAuthenticatorHelper.onAccountsUpdated(this, accounts);
+ invalidateCategories();
+ }
+
+ @Override
+ public void onAccountsUpdate(UserHandle userHandle) {
invalidateCategories();
}
diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index 67432c0..eb2bea9 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -204,19 +204,6 @@
}, DELAY_HIGHLIGHT_DURATION_MILLIS);
}
});
- } else {
- // Try locating the Preference View thru its tag
- View preferenceView = findPreferenceViewForKey(getView(), key);
- if (preferenceView != null ) {
- mPreferenceHighlighted = true;
-
- preferenceView.setBackground(highlight);
- final int centerX = preferenceView.getWidth() / 2;
- final int centerY = preferenceView.getHeight() / 2;
- highlight.setHotspot(centerX, centerY);
- preferenceView.setPressed(true);
- preferenceView.setPressed(false);
- }
}
}
@@ -235,33 +222,6 @@
return -1;
}
- private View findPreferenceViewForKey(View root, String key) {
- if (checkTag(root, key)) {
- return root;
- }
- if (root instanceof ViewGroup) {
- final ViewGroup group = (ViewGroup) root;
- final int count = group.getChildCount();
- for (int n = 0; n < count; n++) {
- final View child = group.getChildAt(n);
- final View view = findPreferenceViewForKey(child, key);
- if (view != null) {
- return view;
- }
- }
- }
- return null;
- }
-
- private boolean checkTag(View view, String key) {
- final Object tag = view.getTag();
- if (tag == null || !(tag instanceof String)) {
- return false;
- }
- final String prefKey = (String) tag;
- return (!TextUtils.isEmpty(prefKey) && prefKey.equals(key));
- }
-
protected void removePreference(String key) {
Preference pref = findPreference(key);
if (pref != null) {
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 4e0933d..d960ce6 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -47,6 +47,7 @@
import android.view.ViewGroup;
import android.view.ViewParent;
import android.webkit.WebView;
+import android.widget.TextView;
import java.io.InputStream;
import java.util.ArrayList;
@@ -92,6 +93,7 @@
private WifiApDialog mDialog;
private WifiManager mWifiManager;
private WifiConfiguration mWifiConfig = null;
+ private UserManager mUm;
private boolean mUsbConnected;
private boolean mMassStorageActive;
@@ -110,11 +112,21 @@
private String[] mProvisionApp;
private static final int PROVISION_REQUEST = 0;
+ private boolean mUnavailable;
+
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
addPreferencesFromResource(R.xml.tether_prefs);
+ mUm = (UserManager) getSystemService(Context.USER_SERVICE);
+
+ if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)) {
+ mUnavailable = true;
+ setPreferenceScreen(new PreferenceScreen(getActivity(), null));
+ return;
+ }
+
final Activity activity = getActivity();
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
if (adapter != null) {
@@ -264,6 +276,15 @@
public void onStart() {
super.onStart();
+ if (mUnavailable) {
+ TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
+ getListView().setEmptyView(emptyView);
+ if (emptyView != null) {
+ emptyView.setText(R.string.tethering_settings_not_available);
+ }
+ return;
+ }
+
final Activity activity = getActivity();
mMassStorageActive = Environment.MEDIA_SHARED.equals(Environment.getExternalStorageState());
@@ -297,6 +318,10 @@
@Override
public void onStop() {
super.onStop();
+
+ if (mUnavailable) {
+ return;
+ }
getActivity().unregisterReceiver(mTetherChangeReceiver);
mTetherChangeReceiver = null;
if (mWifiApEnabler != null) {
diff --git a/src/com/android/settings/TrustAgentUtils.java b/src/com/android/settings/TrustAgentUtils.java
new file mode 100644
index 0000000..31a073c
--- /dev/null
+++ b/src/com/android/settings/TrustAgentUtils.java
@@ -0,0 +1,119 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
+ */
+
+package com.android.settings;
+
+import android.content.ComponentName;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.content.res.XmlResourceParser;
+import android.service.trust.TrustAgentService;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.util.Slog;
+import android.util.Xml;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+
+public class TrustAgentUtils {
+ static final String TAG = "TrustAgentUtils";
+
+ private static final String TRUST_AGENT_META_DATA = TrustAgentService.TRUST_AGENT_META_DATA;
+ private static final String PERMISSION_PROVIDE_AGENT = android.Manifest.permission.PROVIDE_TRUST_AGENT;
+
+ /**
+ * @return true, if the service in resolveInfo has the permission to provide a trust agent.
+ */
+ public static boolean checkProvidePermission(ResolveInfo resolveInfo, PackageManager pm) {
+ String packageName = resolveInfo.serviceInfo.packageName;
+ if (pm.checkPermission(PERMISSION_PROVIDE_AGENT, packageName)
+ != PackageManager.PERMISSION_GRANTED) {
+ Log.w(TAG, "Skipping agent because package " + packageName
+ + " does not have permission " + PERMISSION_PROVIDE_AGENT + ".");
+ return false;
+ }
+ return true;
+ }
+
+ public static class TrustAgentComponentInfo {
+ ComponentName componentName;
+ String title;
+ String summary;
+ }
+
+ public static ComponentName getComponentName(ResolveInfo resolveInfo) {
+ if (resolveInfo == null || resolveInfo.serviceInfo == null) return null;
+ return new ComponentName(resolveInfo.serviceInfo.packageName, resolveInfo.serviceInfo.name);
+ }
+
+ public static TrustAgentComponentInfo getSettingsComponent(
+ PackageManager pm, ResolveInfo resolveInfo) {
+ if (resolveInfo == null || resolveInfo.serviceInfo == null
+ || resolveInfo.serviceInfo.metaData == null) return null;
+ String cn = null;
+ TrustAgentComponentInfo trustAgentComponentInfo = new TrustAgentComponentInfo();
+ XmlResourceParser parser = null;
+ Exception caughtException = null;
+ try {
+ parser = resolveInfo.serviceInfo.loadXmlMetaData(pm, TRUST_AGENT_META_DATA);
+ if (parser == null) {
+ Slog.w(TAG, "Can't find " + TRUST_AGENT_META_DATA + " meta-data");
+ return null;
+ }
+ Resources res = pm.getResourcesForApplication(resolveInfo.serviceInfo.applicationInfo);
+ AttributeSet attrs = Xml.asAttributeSet(parser);
+ int type;
+ while ((type = parser.next()) != XmlPullParser.END_DOCUMENT
+ && type != XmlPullParser.START_TAG) {
+ }
+ String nodeName = parser.getName();
+ if (!"trust-agent".equals(nodeName)) {
+ Slog.w(TAG, "Meta-data does not start with trust-agent tag");
+ return null;
+ }
+ TypedArray sa =
+ res.obtainAttributes(attrs, com.android.internal.R.styleable.TrustAgent);
+ trustAgentComponentInfo.summary =
+ sa.getString(com.android.internal.R.styleable.TrustAgent_summary);
+ trustAgentComponentInfo.title =
+ sa.getString(com.android.internal.R.styleable.TrustAgent_title);
+ cn = sa.getString(com.android.internal.R.styleable.TrustAgent_settingsActivity);
+ sa.recycle();
+ } catch (PackageManager.NameNotFoundException e) {
+ caughtException = e;
+ } catch (IOException e) {
+ caughtException = e;
+ } catch (XmlPullParserException e) {
+ caughtException = e;
+ } finally {
+ if (parser != null) parser.close();
+ }
+ if (caughtException != null) {
+ Slog.w(TAG, "Error parsing : " + resolveInfo.serviceInfo.packageName, caughtException);
+ return null;
+ }
+ if (cn != null && cn.indexOf('/') < 0) {
+ cn = resolveInfo.serviceInfo.packageName + "/" + cn;
+ }
+ trustAgentComponentInfo.componentName = (cn == null) ? null : ComponentName.unflattenFromString(cn);
+ return trustAgentComponentInfo;
+ }
+}
diff --git a/src/com/android/settings/TrustedCredentialsSettings.java b/src/com/android/settings/TrustedCredentialsSettings.java
index 65d0934..eb7b142 100644
--- a/src/com/android/settings/TrustedCredentialsSettings.java
+++ b/src/com/android/settings/TrustedCredentialsSettings.java
@@ -47,6 +47,7 @@
import android.widget.Spinner;
import android.widget.TabHost;
import android.widget.TextView;
+
import java.security.cert.CertificateEncodingException;
import java.security.cert.CertificateException;
import java.security.cert.X509Certificate;
@@ -170,6 +171,10 @@
@Override public View onCreateView(
LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
+ if (mUserManager.hasUserRestriction(UserManager.DISALLOW_CONFIG_CREDENTIALS)) {
+ return inflater.inflate(R.layout.credentials_disallowed_preference_screen,
+ parent, false);
+ }
mTabHost = (TabHost) inflater.inflate(R.layout.trusted_credentials, parent, false);
mTabHost.setup();
addTab(Tab.SYSTEM);
diff --git a/src/com/android/settings/Utils.java b/src/com/android/settings/Utils.java
index 59a137e..26750e7 100644
--- a/src/com/android/settings/Utils.java
+++ b/src/com/android/settings/Utils.java
@@ -56,17 +56,19 @@
import android.view.ViewGroup;
import android.widget.ListView;
import android.widget.TabWidget;
+
import com.android.settings.dashboard.DashboardCategory;
import com.android.settings.dashboard.DashboardTile;
import java.io.IOException;
import java.io.InputStream;
import java.net.InetAddress;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
-public class Utils {
+public final class Utils {
/**
* Set the preference's title to the matching activity's label.
@@ -79,6 +81,15 @@
public static final float DISABLED_ALPHA = 0.4f;
/**
+ * Color spectrum to use to indicate badness. 0 is completely transparent (no data),
+ * 1 is most bad (red), the last value is least bad (green).
+ */
+ public static final int[] BADNESS_COLORS = new int[] {
+ 0x00000000, 0xffc43828, 0xffe54918, 0xfff47b00,
+ 0xfffabf2c, 0xff679e37, 0xff0a7f42
+ };
+
+ /**
* Name of the meta-data item that should be set in the AndroidManifest.xml
* to specify the icon that should be displayed for the preference.
*/
@@ -528,7 +539,15 @@
*/
public static void startWithFragment(Context context, String fragmentName, Bundle args,
Fragment resultTo, int resultRequestCode, int titleResId, CharSequence title) {
- Intent intent = onBuildStartFragmentIntent(context, fragmentName, args, titleResId, title);
+ startWithFragment(context, fragmentName, args, resultTo, resultRequestCode,
+ titleResId, title, false /* not a shortcut */);
+ }
+
+ public static void startWithFragment(Context context, String fragmentName, Bundle args,
+ Fragment resultTo, int resultRequestCode, int titleResId, CharSequence title,
+ boolean isShortcut) {
+ Intent intent = onBuildStartFragmentIntent(context, fragmentName, args, titleResId,
+ title, isShortcut);
if (resultTo == null) {
context.startActivity(intent);
} else {
@@ -541,22 +560,52 @@
* The implementation constructs an Intent that re-launches the current activity with the
* appropriate arguments to display the fragment.
*
+ *
* @param context The Context.
* @param fragmentName The name of the fragment to display.
* @param args Optional arguments to supply to the fragment.
* @param titleResId Optional title resource id to show for this item.
* @param title Optional title to show for this item.
+ * @param isShortcut tell if this is a Launcher Shortcut or not
* @return Returns an Intent that can be launched to display the given
* fragment.
*/
public static Intent onBuildStartFragmentIntent(Context context, String fragmentName,
- Bundle args, int titleResId, CharSequence title) {
+ Bundle args, int titleResId, CharSequence title, boolean isShortcut) {
Intent intent = new Intent(Intent.ACTION_MAIN);
intent.setClass(context, SubSettings.class);
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT, fragmentName);
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, titleResId);
intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE, title);
+ intent.putExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_AS_SHORTCUT, isShortcut);
return intent;
}
+
+ /**
+ * Returns the managed profile of the current user or null if none found.
+ */
+ public static UserHandle getManagedProfile(UserManager userManager) {
+ List<UserHandle> userProfiles = userManager.getUserProfiles();
+ final int count = userProfiles.size();
+ for (int i = 0; i < count; i++) {
+ final UserHandle profile = userProfiles.get(i);
+ if (profile.getIdentifier() == userManager.getUserHandle()) {
+ continue;
+ }
+ final UserInfo userInfo = userManager.getUserInfo(profile.getIdentifier());
+ if (userInfo.isManagedProfile()) {
+ return profile;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Returns true if the current profile is a managed one.
+ */
+ public static boolean isManagedProfile(UserManager userManager) {
+ UserInfo currentUser = userManager.getUserInfo(userManager.getUserHandle());
+ return currentUser.isManagedProfile();
+ }
}
diff --git a/src/com/android/settings/WirelessSettings.java b/src/com/android/settings/WirelessSettings.java
index 7aaa0a6..39d0f4c 100644
--- a/src/com/android/settings/WirelessSettings.java
+++ b/src/com/android/settings/WirelessSettings.java
@@ -34,6 +34,7 @@
import android.os.Bundle;
import android.os.SystemProperties;
import android.os.UserHandle;
+import android.os.UserManager;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceChangeListener;
@@ -57,7 +58,7 @@
import java.util.Collection;
import java.util.List;
-public class WirelessSettings extends RestrictedSettingsFragment
+public class WirelessSettings extends SettingsPreferenceFragment
implements OnPreferenceChangeListener, Indexable {
private static final String TAG = "WirelessSettings";
@@ -86,15 +87,13 @@
private ConnectivityManager mCm;
private TelephonyManager mTm;
private PackageManager mPm;
+ private UserManager mUm;
private static final int MANAGE_MOBILE_PLAN_DIALOG_ID = 1;
private static final String SAVED_MANAGE_MOBILE_PLAN_MSG = "mManageMobilePlanMessage";
private AppListPreference mSmsApplicationPreference;
- public WirelessSettings() {
- super(null);
- }
/**
* Invoked on each preference click in this hierarchy, overrides
* PreferenceFragment's implementation. Used to make sure we track the
@@ -102,9 +101,6 @@
*/
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
- if (ensurePinRestrictedPreference(preference)) {
- return true;
- }
log("onPreferenceTreeClick: preference=" + preference);
if (preference == mAirplaneModePreference && Boolean.parseBoolean(
SystemProperties.get(TelephonyProperties.PROPERTY_INECM_MODE))) {
@@ -251,6 +247,7 @@
mCm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
mTm = (TelephonyManager) getSystemService(Context.TELEPHONY_SERVICE);
mPm = getPackageManager();
+ mUm = (UserManager) getSystemService(Context.USER_SERVICE);
addPreferencesFromResource(R.xml.wireless_settings);
@@ -279,7 +276,8 @@
//enable/disable wimax depending on the value in config.xml
final boolean isWimaxEnabled = !isSecondaryUser && this.getResources().getBoolean(
com.android.internal.R.bool.config_wimaxEnabled);
- if (!isWimaxEnabled) {
+ if (!isWimaxEnabled
+ || mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
PreferenceScreen root = getPreferenceScreen();
Preference ps = (Preference) findPreference(KEY_WIMAX_SETTINGS);
if (ps != null) root.removePreference(ps);
@@ -290,16 +288,16 @@
ps.setDependency(KEY_TOGGLE_AIRPLANE);
}
}
- protectByRestrictions(KEY_WIMAX_SETTINGS);
// Manually set dependencies for Wifi when not toggleable.
if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_WIFI)) {
findPreference(KEY_VPN_SETTINGS).setDependency(KEY_TOGGLE_AIRPLANE);
}
- if (isSecondaryUser) { // Disable VPN
+ // Disable VPN.
+ if (isSecondaryUser || mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {
removePreference(KEY_VPN_SETTINGS);
}
- protectByRestrictions(KEY_VPN_SETTINGS);
+
// Manually set dependencies for Bluetooth when not toggleable.
if (toggleable == null || !toggleable.contains(Settings.Global.RADIO_BLUETOOTH)) {
// No bluetooth-dependent items in the list. Code kept in case one is added later.
@@ -319,8 +317,10 @@
mNfcEnabler = null;
}
- // Remove Mobile Network Settings and Manage Mobile Plan if it's a wifi-only device.
- if (isSecondaryUser || Utils.isWifiOnly(getActivity())) {
+ // Remove Mobile Network Settings and Manage Mobile Plan for secondary users,
+ // if it's a wifi-only device, or if the settings are restricted.
+ if (isSecondaryUser || Utils.isWifiOnly(getActivity())
+ || mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
removePreference(KEY_MOBILE_NETWORK_SETTINGS);
removePreference(KEY_MANAGE_MOBILE_PLAN);
}
@@ -334,8 +334,6 @@
removePreference(KEY_MANAGE_MOBILE_PLAN);
}
}
- protectByRestrictions(KEY_MOBILE_NETWORK_SETTINGS);
- protectByRestrictions(KEY_MANAGE_MOBILE_PLAN);
// Remove SMS Application if the device does not support SMS
if (!isSmsSupported()) {
@@ -358,13 +356,13 @@
// Disable Tethering if it's not allowed or if it's a wifi-only device
final ConnectivityManager cm =
(ConnectivityManager) activity.getSystemService(Context.CONNECTIVITY_SERVICE);
- if (isSecondaryUser || !cm.isTetheringSupported()) {
+ if (isSecondaryUser || !cm.isTetheringSupported()
+ || mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_TETHERING)) {
getPreferenceScreen().removePreference(findPreference(KEY_TETHER_SETTINGS));
} else {
Preference p = findPreference(KEY_TETHER_SETTINGS);
p.setTitle(Utils.getTetheringLabel(cm));
}
- protectByRestrictions(KEY_TETHER_SETTINGS);
// Enable link to CMAS app settings depending on the value in config.xml.
boolean isCellBroadcastAppLinkEnabled = this.getResources().getBoolean(
@@ -379,12 +377,12 @@
} catch (IllegalArgumentException ignored) {
isCellBroadcastAppLinkEnabled = false; // CMAS app not installed
}
- if (isSecondaryUser || !isCellBroadcastAppLinkEnabled) {
+ if (isSecondaryUser || !isCellBroadcastAppLinkEnabled
+ || mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_CELL_BROADCASTS)) {
PreferenceScreen root = getPreferenceScreen();
Preference ps = findPreference(KEY_CELL_BROADCAST_SETTINGS);
if (ps != null) root.removePreference(ps);
}
- protectByRestrictions(KEY_CELL_BROADCAST_SETTINGS);
}
@Override
@@ -473,10 +471,12 @@
result.add(KEY_TOGGLE_NSD);
+ final UserManager um = (UserManager) context.getSystemService(Context.USER_SERVICE);
final boolean isSecondaryUser = UserHandle.myUserId() != UserHandle.USER_OWNER;
final boolean isWimaxEnabled = !isSecondaryUser && context.getResources().getBoolean(
com.android.internal.R.bool.config_wimaxEnabled);
- if (!isWimaxEnabled) {
+ if (!isWimaxEnabled
+ || um.hasUserRestriction(UserManager.DISALLOW_CONFIG_MOBILE_NETWORKS)) {
result.add(KEY_WIMAX_SETTINGS);
}
diff --git a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
index 53d614d..fa664bb 100644
--- a/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
+++ b/src/com/android/settings/accessibility/CaptionPropertiesFragment.java
@@ -151,9 +151,8 @@
final boolean enabled = mCaptioningManager.isEnabled();
SettingsActivity activity = (SettingsActivity) getActivity();
mSwitchBar = activity.getSwitchBar();
- mSwitchBar.setTextViewLabel(enabled);
+ mSwitchBar.setCheckedInternal(enabled);
mToggleSwitch = mSwitchBar.getSwitch();
- mToggleSwitch.setCheckedInternal(enabled);
getPreferenceScreen().setEnabled(enabled);
@@ -228,7 +227,7 @@
mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
@Override
public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
- toggleSwitch.setCheckedInternal(checked);
+ mSwitchBar.setCheckedInternal(checked);
Settings.Secure.putInt(getActivity().getContentResolver(),
Settings.Secure.ACCESSIBILITY_CAPTIONING_ENABLED, checked ? 1 : 0);
getPreferenceScreen().setEnabled(checked);
diff --git a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
index cb7699e..f4b85f3 100644
--- a/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleAccessibilityServicePreferenceFragment.java
@@ -58,7 +58,7 @@
String settingValue = Settings.Secure.getString(getContentResolver(),
Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES);
final boolean enabled = settingValue.contains(mComponentName.flattenToString());
- mToggleSwitch.setCheckedInternal(enabled);
+ mSwitchBar.setCheckedInternal(enabled);
}
};
@@ -263,13 +263,13 @@
switch (which) {
case DialogInterface.BUTTON_POSITIVE:
checked = (mShownDialogId == DIALOG_ID_ENABLE_WARNING);
- mToggleSwitch.setCheckedInternal(checked);
+ mSwitchBar.setCheckedInternal(checked);
getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);
onPreferenceToggled(mPreferenceKey, checked);
break;
case DialogInterface.BUTTON_NEGATIVE:
checked = (mShownDialogId == DIALOG_ID_DISABLE_WARNING);
- mToggleSwitch.setCheckedInternal(checked);
+ mSwitchBar.setCheckedInternal(checked);
getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);
onPreferenceToggled(mPreferenceKey, checked);
break;
@@ -285,11 +285,11 @@
@Override
public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
if (checked) {
- toggleSwitch.setCheckedInternal(false);
+ mSwitchBar.setCheckedInternal(false);
getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, false);
showDialog(DIALOG_ID_ENABLE_WARNING);
} else {
- toggleSwitch.setCheckedInternal(true);
+ mSwitchBar.setCheckedInternal(true);
getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, true);
showDialog(DIALOG_ID_DISABLE_WARNING);
}
diff --git a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
index 54a34f2..1f7ecf7 100644
--- a/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleDaltonizerPreferenceFragment.java
@@ -72,7 +72,7 @@
protected void onInstallSwitchBarToggleSwitch() {
super.onInstallSwitchBarToggleSwitch();
- mToggleSwitch.setCheckedInternal(
+ mSwitchBar.setCheckedInternal(
Settings.Secure.getInt(getContentResolver(), ENABLED, 0) == 1);
mSwitchBar.addOnSwitchChangeListener(this);
}
diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
index bc21759..9fe70df 100644
--- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java
@@ -153,7 +153,7 @@
// Enabled.
if (arguments.containsKey(AccessibilitySettings.EXTRA_CHECKED)) {
final boolean enabled = arguments.getBoolean(AccessibilitySettings.EXTRA_CHECKED);
- mToggleSwitch.setCheckedInternal(enabled);
+ mSwitchBar.setCheckedInternal(enabled);
}
// Title.
diff --git a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
index 782e7a5..7fb1625 100644
--- a/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleGlobalGesturePreferenceFragment.java
@@ -35,7 +35,7 @@
mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
@Override
public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
- toggleSwitch.setCheckedInternal(checked);
+ mSwitchBar.setCheckedInternal(checked);
getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);
onPreferenceToggled(mPreferenceKey, checked);
return false;
diff --git a/src/com/android/settings/accessibility/ToggleInversionPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleInversionPreferenceFragment.java
index b6d5569..a7bc0b3 100644
--- a/src/com/android/settings/accessibility/ToggleInversionPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleInversionPreferenceFragment.java
@@ -71,7 +71,7 @@
protected void onInstallSwitchBarToggleSwitch() {
super.onInstallSwitchBarToggleSwitch();
- mToggleSwitch.setCheckedInternal(
+ mSwitchBar.setCheckedInternal(
Settings.Secure.getInt(getContentResolver(), ENABLED, 0) == 1);
mSwitchBar.addOnSwitchChangeListener(this);
}
diff --git a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
index 8202a2a..4650c06 100644
--- a/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
+++ b/src/com/android/settings/accessibility/ToggleScreenMagnificationPreferenceFragment.java
@@ -35,7 +35,7 @@
mToggleSwitch.setOnBeforeCheckedChangeListener(new OnBeforeCheckedChangeListener() {
@Override
public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
- toggleSwitch.setCheckedInternal(checked);
+ mSwitchBar.setCheckedInternal(checked);
getArguments().putBoolean(AccessibilitySettings.EXTRA_CHECKED, checked);
onPreferenceToggled(mPreferenceKey, checked);
return false;
diff --git a/src/com/android/settings/accounts/AccountPreferenceBase.java b/src/com/android/settings/accounts/AccountPreferenceBase.java
index 37dffca..c25831d 100644
--- a/src/com/android/settings/accounts/AccountPreferenceBase.java
+++ b/src/com/android/settings/accounts/AccountPreferenceBase.java
@@ -16,19 +16,9 @@
package com.android.settings.accounts;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.android.settings.SettingsPreferenceFragment;
-
import com.google.android.collect.Maps;
-import android.accounts.Account;
-import android.accounts.AccountManager;
import android.accounts.AuthenticatorDescription;
-import android.accounts.OnAccountsUpdateListener;
import android.app.Activity;
import android.content.ContentResolver;
import android.content.Context;
@@ -40,28 +30,47 @@
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.Handler;
+import android.os.UserHandle;
+import android.os.UserManager;
import android.preference.PreferenceScreen;
import android.text.format.DateFormat;
import android.util.Log;
import android.view.ContextThemeWrapper;
+import com.android.settings.SettingsPreferenceFragment;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+
class AccountPreferenceBase extends SettingsPreferenceFragment
- implements OnAccountsUpdateListener {
+ implements AuthenticatorHelper.OnAccountsUpdateListener {
protected static final String TAG = "AccountSettings";
public static final String AUTHORITIES_FILTER_KEY = "authorities";
public static final String ACCOUNT_TYPES_FILTER_KEY = "account_types";
private final Handler mHandler = new Handler();
+ private UserManager mUm;
private Object mStatusChangeListenerHandle;
private HashMap<String, ArrayList<String>> mAccountTypeToAuthorities = null;
- private AuthenticatorHelper mAuthenticatorHelper = new AuthenticatorHelper();
+ protected AuthenticatorHelper mAuthenticatorHelper;
private java.text.DateFormat mDateFormat;
private java.text.DateFormat mTimeFormat;
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ // TODO: This needs to handle different users, get the user id from the intent
+ mUm = (UserManager) getSystemService(Context.USER_SERVICE);
+ mAuthenticatorHelper = new AuthenticatorHelper(
+ getActivity(), UserHandle.getCallingUserHandle(), mUm, this);
+ }
+
/**
* Overload to handle account updates.
*/
- public void onAccountsUpdated(Account[] accounts) {
+ @Override
+ public void onAccountsUpdate(UserHandle userHandle) {
}
diff --git a/src/com/android/settings/accounts/AccountSettings.java b/src/com/android/settings/accounts/AccountSettings.java
new file mode 100644
index 0000000..e60bed9
--- /dev/null
+++ b/src/com/android/settings/accounts/AccountSettings.java
@@ -0,0 +1,344 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.accounts;
+
+import android.accounts.Account;
+import android.accounts.AccountManager;
+import android.accounts.OnAccountsUpdateListener;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.pm.UserInfo;
+import android.graphics.drawable.Drawable;
+import android.os.Bundle;
+import android.os.UserHandle;
+import android.os.UserManager;
+import android.util.Log;
+import android.util.SparseArray;
+import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
+import android.preference.PreferenceGroup;
+
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.Utils;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
+
+/**
+ * Settings screen for the account types on the device.
+ * This shows all account types available for personal and work profiles.
+ */
+public class AccountSettings extends SettingsPreferenceFragment
+ implements AuthenticatorHelper.OnAccountsUpdateListener,
+ OnPreferenceClickListener {
+ public static final String TAG = "AccountSettings";
+
+ private static final String KEY_ACCOUNT = "account";
+ private static final String KEY_ADD_ACCOUNT = "add_account";
+
+ private static final String KEY_CATEGORY_PERSONAL = "account_personal";
+ private static final String KEY_ADD_ACCOUNT_PERSONAL = "add_account_personal";
+ private static final String KEY_CATEGORY_WORK = "account_work";
+ private static final String KEY_ADD_ACCOUNT_WORK = "add_account_work";
+
+ private static final String ADD_ACCOUNT_ACTION = "android.settings.ADD_ACCOUNT_SETTINGS";
+
+ private UserManager mUm;
+ private SparseArray<ProfileData> mProfiles;
+ private ManagedProfileBroadcastReceiver mManagedProfileBroadcastReceiver;
+
+ /**
+ * Holds data related to the accounts belonging to one profile.
+ */
+ private static class ProfileData {
+ /**
+ * The preference that displays the accounts.
+ */
+ public PreferenceGroup preferenceGroup;
+ /**
+ * The preference that displays the add account button.
+ */
+ public Preference addAccountPreference;
+ /**
+ * The user handle of the user that these accounts belong to.
+ */
+ public UserHandle userHandle;
+ /**
+ * The {@link AuthenticatorHelper} that holds accounts data for this profile.
+ */
+ public AuthenticatorHelper authenticatorHelper;
+ }
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ mUm = (UserManager) getSystemService(Context.USER_SERVICE);
+ mProfiles = new SparseArray<ProfileData>(2);
+ updateUi();
+ }
+
+ void updateUi() {
+ // Load the preferences from an XML resource
+ addPreferencesFromResource(R.xml.account_settings);
+
+ if(mUm.isLinkedUser()) {
+ // Restricted user or similar
+ updateSingleProfileUi();
+ } else {
+ if (Utils.isManagedProfile(mUm)) {
+ // This should not happen
+ Log.w(TAG, "We should not be showing settings for a managed profile");
+ updateSingleProfileUi();
+ }
+ final UserHandle currentProfile = UserHandle.getCallingUserHandle();
+ final UserHandle managedProfile = Utils.getManagedProfile(mUm);
+ if (managedProfile == null) {
+ updateSingleProfileUi();
+ } else {
+ updateProfileUi(currentProfile,
+ KEY_CATEGORY_PERSONAL, KEY_ADD_ACCOUNT_PERSONAL, new ArrayList<String>());
+ final ArrayList<String> unusedPreferences = new ArrayList<String>(1);
+ unusedPreferences.add(KEY_ADD_ACCOUNT);
+ updateProfileUi(managedProfile,
+ KEY_CATEGORY_WORK, KEY_ADD_ACCOUNT_WORK, unusedPreferences);
+ mManagedProfileBroadcastReceiver = new ManagedProfileBroadcastReceiver();
+ mManagedProfileBroadcastReceiver.register(getActivity());
+ }
+ }
+ final int count = mProfiles.size();
+ for (int i = 0; i < count; i++) {
+ updateAccountTypes(mProfiles.valueAt(i));
+ }
+ }
+
+ private void updateSingleProfileUi() {
+ final ArrayList<String> unusedPreferences = new ArrayList<String>(2);
+ unusedPreferences.add(KEY_CATEGORY_PERSONAL);
+ unusedPreferences.add(KEY_CATEGORY_WORK);
+ updateProfileUi(UserHandle.getCallingUserHandle(), KEY_ACCOUNT, KEY_ADD_ACCOUNT,
+ unusedPreferences);
+ }
+
+ private void updateProfileUi(UserHandle userHandle, String categoryKey, String addAccountKey,
+ ArrayList<String> unusedPreferences) {
+ final int count = unusedPreferences.size();
+ for (int i = 0; i < count; i++) {
+ removePreference(unusedPreferences.get(i));
+ }
+ final ProfileData profileData = new ProfileData();
+ profileData.preferenceGroup = (PreferenceGroup) findPreference(categoryKey);
+ if (mUm.hasUserRestriction(UserManager.DISALLOW_MODIFY_ACCOUNTS)) {
+ removePreference(addAccountKey);
+ } else {
+ profileData.addAccountPreference = findPreference(addAccountKey);
+ profileData.addAccountPreference.setOnPreferenceClickListener(this);
+ }
+ profileData.userHandle = userHandle;
+ profileData.authenticatorHelper = new AuthenticatorHelper(
+ getActivity(), userHandle, mUm, this);
+ mProfiles.put(userHandle.getIdentifier(), profileData);
+
+ profileData.authenticatorHelper.listenToAccountUpdates();
+ }
+
+ @Override
+ public void onDestroy() {
+ super.onDestroy();
+ cleanUp();
+ }
+
+ void cleanUp() {
+ if (mManagedProfileBroadcastReceiver != null) {
+ mManagedProfileBroadcastReceiver.unregister(getActivity());
+ }
+ final int count = mProfiles.size();
+ for (int i = 0; i < count; i++) {
+ mProfiles.valueAt(i).authenticatorHelper.stopListeningToAccountUpdates();
+ }
+ }
+
+ @Override
+ public void onAccountsUpdate(UserHandle userHandle) {
+ final ProfileData profileData = mProfiles.get(userHandle.getIdentifier());
+ if (profileData != null) {
+ updateAccountTypes(profileData);
+ } else {
+ Log.w(TAG, "Missing Settings screen for: " + userHandle.getIdentifier());
+ }
+ }
+
+ private void updateAccountTypes(ProfileData profileData) {
+ profileData.preferenceGroup.removeAll();
+ final ArrayList<AccountPreference> preferences = getAccountTypePreferences(
+ profileData.authenticatorHelper);
+ final int count = preferences.size();
+ for (int i = 0; i < count; i++) {
+ profileData.preferenceGroup.addPreference(preferences.get(i));
+ }
+ if (profileData.addAccountPreference != null) {
+ profileData.preferenceGroup.addPreference(profileData.addAccountPreference);
+ }
+ }
+
+ private ArrayList<AccountPreference> getAccountTypePreferences(AuthenticatorHelper helper) {
+ final String[] accountTypes = helper.getEnabledAccountTypes();
+ final ArrayList<AccountPreference> accountTypePreferences =
+ new ArrayList<AccountPreference>(accountTypes.length);
+
+ for (int i = 0; i < accountTypes.length; i++) {
+ final String accountType = accountTypes[i];
+ final CharSequence label = helper.getLabelForType(getActivity(), accountType);
+ if (label == null) {
+ continue;
+ }
+
+ final Account[] accounts = AccountManager.get(getActivity())
+ .getAccountsByType(accountType);
+ final boolean skipToAccount = accounts.length == 1
+ && !helper.hasAccountPreferences(accountType);
+
+ if (skipToAccount) {
+ final Bundle fragmentArguments = new Bundle();
+ fragmentArguments.putParcelable(AccountSyncSettings.ACCOUNT_KEY,
+ accounts[0]);
+
+ accountTypePreferences.add(new AccountPreference(getActivity(), label,
+ AccountSyncSettings.class.getName(), fragmentArguments,
+ helper.getDrawableForType(getActivity(), accountType)));
+ } else {
+ final Bundle fragmentArguments = new Bundle();
+ fragmentArguments.putString(ManageAccountsSettings.KEY_ACCOUNT_TYPE, accountType);
+ fragmentArguments.putString(ManageAccountsSettings.KEY_ACCOUNT_LABEL,
+ label.toString());
+
+ accountTypePreferences.add(new AccountPreference(getActivity(), label,
+ ManageAccountsSettings.class.getName(), fragmentArguments,
+ helper.getDrawableForType(getActivity(), accountType)));
+ }
+ helper.preloadDrawableForType(getActivity(), accountType);
+ }
+ // Sort by label
+ Collections.sort(accountTypePreferences, new Comparator<AccountPreference>() {
+ @Override
+ public int compare(AccountPreference t1, AccountPreference t2) {
+ return t1.mTitle.toString().compareTo(t2.mTitle.toString());
+ }
+ });
+ return accountTypePreferences;
+ }
+
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ // Check the preference
+ final int count = mProfiles.size();
+ for (int i = 0; i < count; i++) {
+ ProfileData profileData = mProfiles.valueAt(i);
+ if (preference == profileData.addAccountPreference) {
+ Intent intent = new Intent(ADD_ACCOUNT_ACTION);
+ intent.putExtra(Intent.EXTRA_USER_HANDLE, profileData.userHandle);
+ startActivity(intent);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private class AccountPreference extends Preference implements OnPreferenceClickListener {
+ /**
+ * Title of the tile that is shown to the user.
+ * @attr ref android.R.styleable#PreferenceHeader_title
+ */
+ private final CharSequence mTitle;
+
+ /**
+ * Full class name of the fragment to display when this tile is
+ * selected.
+ * @attr ref android.R.styleable#PreferenceHeader_fragment
+ */
+ private final String mFragment;
+
+ /**
+ * Optional arguments to supply to the fragment when it is
+ * instantiated.
+ */
+ private final Bundle mFragmentArguments;
+
+ public AccountPreference(Context context, CharSequence title, String fragment,
+ Bundle fragmentArguments, Drawable icon) {
+ super(context);
+ mTitle = title;
+ mFragment = fragment;
+ mFragmentArguments = fragmentArguments;
+ setWidgetLayoutResource(R.layout.account_type_preference);
+
+ setTitle(title);
+ setIcon(icon);
+
+ setOnPreferenceClickListener(this);
+ }
+
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ if (mFragment != null) {
+ Utils.startWithFragment(
+ getContext(), mFragment, mFragmentArguments, null, 0, 0, mTitle);
+ return true;
+ }
+ return false;
+ }
+ }
+
+ private class ManagedProfileBroadcastReceiver extends BroadcastReceiver {
+ private boolean listeningToManagedProfileEvents;
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (intent.getAction().equals(Intent.ACTION_MANAGED_PROFILE_REMOVED)
+ || intent.getAction().equals(Intent.ACTION_MANAGED_PROFILE_ADDED)) {
+ Log.v(TAG, "Received broadcast: " + intent.getAction());
+ cleanUp();
+ updateUi();
+ return;
+ }
+ Log.w(TAG, "Cannot handle received broadcast: " + intent.getAction());
+ }
+
+ public void register(Context context) {
+ if (!listeningToManagedProfileEvents) {
+ IntentFilter intentFilter = new IntentFilter();
+ intentFilter.addAction(Intent.ACTION_MANAGED_PROFILE_REMOVED);
+ intentFilter.addAction(Intent.ACTION_MANAGED_PROFILE_ADDED);
+ context.registerReceiver(this, intentFilter);
+ listeningToManagedProfileEvents = true;
+ }
+ }
+
+ public void unregister(Context context) {
+ if (listeningToManagedProfileEvents) {
+ context.unregisterReceiver(this);
+ listeningToManagedProfileEvents = false;
+ }
+ }
+ }
+ // TODO Implement a {@link SearchIndexProvider} to allow Indexing and Search of account types
+ // See http://b/15403806
+}
diff --git a/src/com/android/settings/accounts/AccountSyncSettings.java b/src/com/android/settings/accounts/AccountSyncSettings.java
index c14dbbe..e33e37a 100644
--- a/src/com/android/settings/accounts/AccountSyncSettings.java
+++ b/src/com/android/settings/accounts/AccountSyncSettings.java
@@ -16,13 +16,15 @@
package com.android.settings.accounts;
+import com.google.android.collect.Lists;
+import com.google.android.collect.Maps;
+
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AccountManagerCallback;
import android.accounts.AccountManagerFuture;
import android.accounts.AuthenticatorException;
import android.accounts.OperationCanceledException;
-import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.ContentResolver;
@@ -34,6 +36,7 @@
import android.content.pm.ProviderInfo;
import android.net.ConnectivityManager;
import android.os.Bundle;
+import android.os.UserHandle;
import android.os.UserManager;
import android.preference.Preference;
import android.preference.PreferenceScreen;
@@ -51,8 +54,6 @@
import com.android.settings.R;
import com.android.settings.Utils;
-import com.google.android.collect.Lists;
-import com.google.android.collect.Maps;
import java.io.IOException;
import java.util.ArrayList;
@@ -193,10 +194,9 @@
@Override
public void onResume() {
- final Activity activity = getActivity();
- AccountManager.get(activity).addOnAccountsUpdatedListener(this, null, false);
+ mAuthenticatorHelper.listenToAccountUpdates();
updateAuthDescriptions();
- onAccountsUpdated(AccountManager.get(activity).getAccounts());
+ onAccountsUpdate(UserHandle.getCallingUserHandle());
super.onResume();
}
@@ -204,7 +204,7 @@
@Override
public void onPause() {
super.onPause();
- AccountManager.get(getActivity()).removeOnAccountsUpdatedListener(this);
+ mAuthenticatorHelper.stopListeningToAccountUpdates();
}
private void addSyncStateCheckBox(Account account, String authority) {
@@ -436,10 +436,10 @@
}
@Override
- public void onAccountsUpdated(Account[] accounts) {
- super.onAccountsUpdated(accounts);
- mAccounts = accounts;
- updateAccountCheckboxes(accounts);
+ public void onAccountsUpdate(final UserHandle userHandle) {
+ super.onAccountsUpdate(userHandle);
+ mAccounts = AccountManager.get(getActivity()).getAccounts();
+ updateAccountCheckboxes(mAccounts);
onSyncStateUpdated();
}
diff --git a/src/com/android/settings/accounts/AuthenticatorHelper.java b/src/com/android/settings/accounts/AuthenticatorHelper.java
index a164b8b..0ecf438 100644
--- a/src/com/android/settings/accounts/AuthenticatorHelper.java
+++ b/src/com/android/settings/accounts/AuthenticatorHelper.java
@@ -19,27 +19,58 @@
import android.accounts.Account;
import android.accounts.AccountManager;
import android.accounts.AuthenticatorDescription;
+import android.content.BroadcastReceiver;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.AsyncTask;
+import android.os.UserHandle;
+import android.os.UserManager;
import android.util.Log;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-public class AuthenticatorHelper {
-
+/**
+ * Helper class for monitoring accounts on the device for a given user.
+ *
+ * Classes using this helper should implement {@link OnAccountsUpdateListener}.
+ * {@link OnAccountsUpdateListener#onAccountsUpdate(UserHandle)} will then be
+ * called once accounts get updated. For setting up listening for account
+ * updates, {@link #listenToAccountUpdates()} and
+ * {@link #stopListeningToAccountUpdates()} should be used.
+ */
+final public class AuthenticatorHelper extends BroadcastReceiver {
private static final String TAG = "AuthenticatorHelper";
+
private Map<String, AuthenticatorDescription> mTypeToAuthDescription
= new HashMap<String, AuthenticatorDescription>();
private AuthenticatorDescription[] mAuthDescs;
private ArrayList<String> mEnabledAccountTypes = new ArrayList<String>();
private Map<String, Drawable> mAccTypeIconCache = new HashMap<String, Drawable>();
- public AuthenticatorHelper() {
+ private final UserHandle mUserHandle;
+ private final UserManager mUm;
+ private final Context mContext;
+ private final OnAccountsUpdateListener mListener;
+ private boolean mListeningToAccountUpdates;
+
+ public interface OnAccountsUpdateListener {
+ void onAccountsUpdate(UserHandle userHandle);
+ }
+
+ public AuthenticatorHelper(Context context, UserHandle userHandle, UserManager userManager,
+ OnAccountsUpdateListener listener) {
+ mContext = context;
+ mUm = userManager;
+ mUserHandle = userHandle;
+ mListener = listener;
+ // This guarantees that the helper is ready to use once constructed
+ onAccountsUpdated(null);
}
public String[] getEnabledAccountTypes() {
@@ -72,7 +103,8 @@
try {
AuthenticatorDescription desc = mTypeToAuthDescription.get(accountType);
Context authContext = context.createPackageContext(desc.packageName, 0);
- icon = authContext.getResources().getDrawable(desc.iconId);
+ icon = mUm.getBadgedDrawableForUser(
+ authContext.getResources().getDrawable(desc.iconId), mUserHandle);
synchronized (mAccTypeIconCache) {
mAccTypeIconCache.put(accountType, icon);
}
@@ -112,25 +144,13 @@
* and update any UI that depends on AuthenticatorDescriptions in onAuthDescriptionsUpdated().
*/
public void updateAuthDescriptions(Context context) {
- mAuthDescs = AccountManager.get(context).getAuthenticatorTypes();
+ mAuthDescs = AccountManager.get(context)
+ .getAuthenticatorTypesAsUser(mUserHandle.getIdentifier());
for (int i = 0; i < mAuthDescs.length; i++) {
mTypeToAuthDescription.put(mAuthDescs[i].type, mAuthDescs[i]);
}
}
- public void onAccountsUpdated(Context context, Account[] accounts) {
- if (accounts == null) {
- accounts = AccountManager.get(context).getAccounts();
- }
- mEnabledAccountTypes.clear();
- mAccTypeIconCache.clear();
- for (Account account: accounts) {
- if (!mEnabledAccountTypes.contains(account.type)) {
- mEnabledAccountTypes.add(account.type);
- }
- }
- }
-
public boolean containsAccountType(String accountType) {
return mTypeToAuthDescription.containsKey(accountType);
}
@@ -148,4 +168,50 @@
}
return false;
}
+
+ public void onAccountsUpdated(Account[] accounts) {
+ // TODO: Revert to non-public once no longer needed in SettingsActivity
+ // See http://b/15819268
+ updateAuthDescriptions(mContext);
+ if (accounts == null) {
+ accounts = AccountManager.get(mContext).getAccounts();
+ }
+ mEnabledAccountTypes.clear();
+ mAccTypeIconCache.clear();
+ for (int i = 0; i < accounts.length; i++) {
+ final Account account = accounts[i];
+ if (!mEnabledAccountTypes.contains(account.type)) {
+ mEnabledAccountTypes.add(account.type);
+ }
+ }
+ if (mListeningToAccountUpdates) {
+ mListener.onAccountsUpdate(mUserHandle);
+ }
+ }
+
+ @Override
+ public void onReceive(final Context context, final Intent intent) {
+ final Account[] accounts = AccountManager.get(mContext)
+ .getAccountsAsUser(mUserHandle.getIdentifier());
+ onAccountsUpdated(accounts);
+ }
+
+ public void listenToAccountUpdates() {
+ if (!mListeningToAccountUpdates) {
+ IntentFilter intentFilter = new IntentFilter();
+ intentFilter.addAction(AccountManager.LOGIN_ACCOUNTS_CHANGED_ACTION);
+ // At disk full, certain actions are blocked (such as writing the accounts to storage).
+ // It is useful to also listen for recovery from disk full to avoid bugs.
+ intentFilter.addAction(Intent.ACTION_DEVICE_STORAGE_OK);
+ mContext.registerReceiverAsUser(this, mUserHandle, intentFilter, null, null);
+ mListeningToAccountUpdates = true;
+ }
+ }
+
+ public void stopListeningToAccountUpdates() {
+ if (mListeningToAccountUpdates) {
+ mContext.unregisterReceiver(this);
+ mListeningToAccountUpdates = false;
+ }
+ }
}
diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index c396479..4ef5ef2 100644
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -166,7 +166,8 @@
AppOpsManager.OP_AUDIO_MEDIA_VOLUME,
AppOpsManager.OP_AUDIO_ALARM_VOLUME,
AppOpsManager.OP_AUDIO_NOTIFICATION_VOLUME,
- AppOpsManager.OP_AUDIO_BLUETOOTH_VOLUME, },
+ AppOpsManager.OP_AUDIO_BLUETOOTH_VOLUME,
+ AppOpsManager.OP_MUTE_MICROPHONE},
new boolean[] { false,
true,
true,
diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java
index 92515ac..3401c99 100644
--- a/src/com/android/settings/applications/AppOpsSummary.java
+++ b/src/com/android/settings/applications/AppOpsSummary.java
@@ -103,7 +103,7 @@
mViewPager.setAdapter(adapter);
mViewPager.setOnPageChangeListener(adapter);
PagerTabStrip tabs = (PagerTabStrip) rootView.findViewById(R.id.tabs);
- tabs.setTabIndicatorColorResource(android.R.color.holo_blue_light);
+ tabs.setTabIndicatorColorResource(R.color.theme_accent);
// We have to do this now because PreferenceFrameLayout looks at it
// only when the view is added.
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index 6ed517f..aa1c010 100755
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -126,6 +126,7 @@
private CheckBox mAskCompatibilityCB;
private CheckBox mEnableCompatibilityCB;
private boolean mCanClearData = true;
+ private boolean mAppControlRestricted = false;
private TextView mAppVersion;
private TextView mTotalSize;
private TextView mAppSize;
@@ -264,6 +265,10 @@
}
mClearDataButton.setOnClickListener(this);
}
+
+ if (mAppControlRestricted) {
+ mClearDataButton.setEnabled(false);
+ }
}
private CharSequence getMoveErrMsg(int errCode) {
@@ -303,7 +308,7 @@
mCanBeOnSdCardChecker.init();
moveDisable = !mCanBeOnSdCardChecker.check(mAppEntry.info);
}
- if (moveDisable) {
+ if (moveDisable || mAppControlRestricted) {
mMoveAppButton.setEnabled(false);
} else {
mMoveAppButton.setOnClickListener(this);
@@ -388,6 +393,10 @@
}
}
+ if (mAppControlRestricted) {
+ enabled = false;
+ }
+
mUninstallButton.setEnabled(enabled);
if (enabled) {
// Register listener
@@ -580,6 +589,7 @@
public void onResume() {
super.onResume();
+ mAppControlRestricted = mUserManager.hasUserRestriction(UserManager.DISALLOW_APPS_CONTROL);
mSession.resume();
if (!refreshUi()) {
setIntentAndFinish(true, true);
@@ -1008,6 +1018,10 @@
mClearCacheButton.setOnClickListener(this);
}
}
+ if (mAppControlRestricted) {
+ mClearCacheButton.setEnabled(false);
+ mClearDataButton.setEnabled(false);
+ }
}
/*
@@ -1261,8 +1275,12 @@
};
private void updateForceStopButton(boolean enabled) {
- mForceStopButton.setEnabled(enabled);
- mForceStopButton.setOnClickListener(InstalledAppDetails.this);
+ if (mAppControlRestricted) {
+ mForceStopButton.setEnabled(false);
+ } else {
+ mForceStopButton.setEnabled(enabled);
+ mForceStopButton.setOnClickListener(InstalledAppDetails.this);
+ }
}
private void checkForceStop() {
diff --git a/src/com/android/settings/applications/LinearColorBar.java b/src/com/android/settings/applications/LinearColorBar.java
index f374c29..158a625 100644
--- a/src/com/android/settings/applications/LinearColorBar.java
+++ b/src/com/android/settings/applications/LinearColorBar.java
@@ -16,9 +16,9 @@
import android.widget.LinearLayout;
public class LinearColorBar extends LinearLayout {
- static final int LEFT_COLOR = 0xff0099cc;
- static final int MIDDLE_COLOR = 0xff0099cc;
- static final int RIGHT_COLOR = 0xff888888;
+ static final int LEFT_COLOR = 0xff009688;
+ static final int MIDDLE_COLOR = 0xff009688;
+ static final int RIGHT_COLOR = 0xffced7db;
static final int GRAY_COLOR = 0xff555555;
static final int WHITE_COLOR = 0xffffffff;
diff --git a/src/com/android/settings/applications/LinearColorPreference.java b/src/com/android/settings/applications/LinearColorPreference.java
index 8d9fb72..b5f707e 100644
--- a/src/com/android/settings/applications/LinearColorPreference.java
+++ b/src/com/android/settings/applications/LinearColorPreference.java
@@ -25,6 +25,9 @@
float mRedRatio;
float mYellowRatio;
float mGreenRatio;
+ int mRedColor = 0xffaa5030;
+ int mYellowColor = 0xffaaaa30;
+ int mGreenColor = 0xff30aa50;
int mColoredRegions = LinearColorBar.REGION_ALL;
LinearColorBar.OnRegionTappedListener mOnRegionTappedListener;
@@ -40,6 +43,13 @@
notifyChanged();
}
+ public void setColors(int red, int yellow, int green) {
+ mRedColor = red;
+ mYellowColor = yellow;
+ mGreenColor = green;
+ notifyChanged();
+ }
+
public void setOnRegionTappedListener(LinearColorBar.OnRegionTappedListener listener) {
mOnRegionTappedListener = listener;
notifyChanged();
@@ -57,7 +67,7 @@
LinearColorBar colors = (LinearColorBar)view.findViewById(
R.id.linear_color_bar);
colors.setShowIndicator(false);
- colors.setColors(0xffaa5030, 0xffaaaa30, 0xff30aa50);
+ colors.setColors(mRedColor, mYellowColor, mGreenColor);
colors.setRatios(mRedRatio, mYellowRatio, mGreenRatio);
colors.setColoredRegions(mColoredRegions);
colors.setOnRegionTappedListener(mOnRegionTappedListener);
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index d68b6a9..48e2d5e 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -919,7 +919,7 @@
mViewPager.setAdapter(adapter);
mViewPager.setOnPageChangeListener(adapter);
PagerTabStrip tabs = (PagerTabStrip) rootView.findViewById(R.id.tabs);
- tabs.setTabIndicatorColorResource(android.R.color.holo_blue_light);
+ tabs.setTabIndicatorColorResource(R.color.theme_accent);
// We have to do this now because PreferenceFrameLayout looks at it
// only when the view is added.
diff --git a/src/com/android/settings/applications/ProcessStatsMemDetail.java b/src/com/android/settings/applications/ProcessStatsMemDetail.java
new file mode 100644
index 0000000..ab7dbdb
--- /dev/null
+++ b/src/com/android/settings/applications/ProcessStatsMemDetail.java
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.applications;
+
+import android.app.Fragment;
+import android.os.Bundle;
+import android.text.format.Formatter;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+import com.android.internal.app.ProcessStats;
+import com.android.settings.R;
+
+import static com.android.settings.Utils.prepareCustomPreferencesList;
+
+public class ProcessStatsMemDetail extends Fragment {
+ public static final String EXTRA_MEM_TIMES = "mem_times";
+ public static final String EXTRA_MEM_STATE_WEIGHTS = "mem_state_weights";
+ public static final String EXTRA_MEM_CACHED_WEIGHT = "mem_cached_weight";
+ public static final String EXTRA_MEM_FREE_WEIGHT = "mem_free_weight";
+ public static final String EXTRA_MEM_ZRAM_WEIGHT = "mem_zram_weight";
+ public static final String EXTRA_MEM_KERNEL_WEIGHT = "mem_kernel_weight";
+ public static final String EXTRA_MEM_NATIVE_WEIGHT = "mem_native_weight";
+ public static final String EXTRA_MEM_TOTAL_WEIGHT = "mem_total_weight";
+ public static final String EXTRA_USE_USS = "use_uss";
+ public static final String EXTRA_TOTAL_TIME = "total_time";
+
+ long[] mMemTimes;
+ double[] mMemStateWeights;
+ double mMemCachedWeight;
+ double mMemFreeWeight;
+ double mMemZRamWeight;
+ double mMemKernelWeight;
+ double mMemNativeWeight;
+ double mMemTotalWeight;
+ boolean mUseUss;
+ long mTotalTime;
+
+ private View mRootView;
+ private ViewGroup mMemStateParent;
+ private ViewGroup mMemUseParent;
+
+ @Override
+ public void onCreate(Bundle icicle) {
+ super.onCreate(icicle);
+ final Bundle args = getArguments();
+ mMemTimes = args.getLongArray(EXTRA_MEM_TIMES);
+ mMemStateWeights = args.getDoubleArray(EXTRA_MEM_STATE_WEIGHTS);
+ mMemCachedWeight = args.getDouble(EXTRA_MEM_CACHED_WEIGHT);
+ mMemFreeWeight = args.getDouble(EXTRA_MEM_FREE_WEIGHT);
+ mMemZRamWeight = args.getDouble(EXTRA_MEM_ZRAM_WEIGHT);
+ mMemKernelWeight = args.getDouble(EXTRA_MEM_KERNEL_WEIGHT);
+ mMemNativeWeight = args.getDouble(EXTRA_MEM_NATIVE_WEIGHT);
+ mMemTotalWeight = args.getDouble(EXTRA_MEM_TOTAL_WEIGHT);
+ mUseUss = args.getBoolean(EXTRA_USE_USS);
+ mTotalTime = args.getLong(EXTRA_TOTAL_TIME);
+ }
+
+ @Override
+ public View onCreateView(
+ LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ final View view = inflater.inflate(R.layout.process_stats_mem_details, container, false);
+ prepareCustomPreferencesList(container, view, view, false);
+
+ mRootView = view;
+ createDetails();
+ return view;
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ }
+
+ private void createDetails() {
+ mMemStateParent = (ViewGroup)mRootView.findViewById(R.id.mem_state);
+ mMemUseParent = (ViewGroup)mRootView.findViewById(R.id.mem_use);
+
+ fillMemStateSection();
+ fillMemUseSection();
+ }
+
+ private void addDetailsItem(ViewGroup parent, CharSequence title,
+ float level, CharSequence value) {
+ LayoutInflater inflater = getActivity().getLayoutInflater();
+ ViewGroup item = (ViewGroup) inflater.inflate(R.layout.app_percentage_item,
+ null);
+ parent.addView(item);
+ item.findViewById(android.R.id.icon).setVisibility(View.GONE);
+ TextView titleView = (TextView) item.findViewById(android.R.id.title);
+ TextView valueView = (TextView) item.findViewById(android.R.id.text1);
+ titleView.setText(title);
+ valueView.setText(value);
+ ProgressBar progress = (ProgressBar) item.findViewById(android.R.id.progress);
+ progress.setProgress(Math.round(level*100));
+ }
+
+ private void fillMemStateSection() {
+ CharSequence[] labels = getResources().getTextArray(R.array.proc_stats_memory_states);
+ for (int i=0; i<ProcessStats.ADJ_MEM_FACTOR_COUNT; i++) {
+ if (mMemTimes[i] > 0) {
+ float level = ((float)mMemTimes[i])/mTotalTime;
+ addDetailsItem(mMemStateParent, labels[i], level,
+ Formatter.formatShortElapsedTime(getActivity(), mMemTimes[i]));
+ }
+ }
+ }
+
+ private void addMemUseDetailsItem(ViewGroup parent, CharSequence title, double weight) {
+ if (weight > 0) {
+ float level = (float)(weight/mMemTotalWeight);
+ String value = Formatter.formatShortFileSize(getActivity(),
+ (long)((weight * 1024) / mTotalTime));
+ addDetailsItem(parent, title, level, value);
+ }
+ }
+
+ private void fillMemUseSection() {
+ CharSequence[] labels = getResources().getTextArray(R.array.proc_stats_process_states);
+ addMemUseDetailsItem(mMemUseParent,
+ getResources().getText(R.string.mem_use_kernel_type), mMemKernelWeight);
+ addMemUseDetailsItem(mMemUseParent,
+ getResources().getText(R.string.mem_use_zram_type), mMemZRamWeight);
+ addMemUseDetailsItem(mMemUseParent,
+ getResources().getText(R.string.mem_use_native_type), mMemNativeWeight);
+ for (int i=0; i<ProcessStats.STATE_COUNT; i++) {
+ addMemUseDetailsItem(mMemUseParent, labels[i], mMemStateWeights[i]);
+ }
+ addMemUseDetailsItem(mMemUseParent,
+ getResources().getText(R.string.mem_use_kernel_cache_type), mMemCachedWeight);
+ addMemUseDetailsItem(mMemUseParent,
+ getResources().getText(R.string.mem_use_free_type), mMemFreeWeight);
+ addMemUseDetailsItem(mMemUseParent,
+ getResources().getText(R.string.mem_use_total), mMemTotalWeight);
+ }
+}
diff --git a/src/com/android/settings/applications/ProcessStatsPreference.java b/src/com/android/settings/applications/ProcessStatsPreference.java
index bf2676d..197f00a 100644
--- a/src/com/android/settings/applications/ProcessStatsPreference.java
+++ b/src/com/android/settings/applications/ProcessStatsPreference.java
@@ -21,20 +21,37 @@
import android.graphics.drawable.Drawable;
import android.preference.Preference;
import android.text.format.Formatter;
+import android.util.AttributeSet;
import android.view.View;
import android.widget.ProgressBar;
import android.widget.TextView;
import com.android.settings.R;
public class ProcessStatsPreference extends Preference {
- private final ProcStatsEntry mEntry;
+ private ProcStatsEntry mEntry;
private int mProgress;
private CharSequence mProgressText;
- public ProcessStatsPreference(Context context, Drawable icon, ProcStatsEntry entry) {
- super(context);
+ public ProcessStatsPreference(Context context) {
+ this(context, null);
+ }
+
+ public ProcessStatsPreference(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ }
+
+ public ProcessStatsPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public ProcessStatsPreference(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ setLayoutResource(R.layout.preference_app_percentage);
+ }
+
+ public void init(Drawable icon, ProcStatsEntry entry) {
mEntry = entry;
- setLayoutResource(R.layout.app_percentage_item);
setIcon(icon != null ? icon : new ColorDrawable(0));
}
diff --git a/src/com/android/settings/applications/ProcessStatsUi.java b/src/com/android/settings/applications/ProcessStatsUi.java
index 9deb22d..269ff39 100644
--- a/src/com/android/settings/applications/ProcessStatsUi.java
+++ b/src/com/android/settings/applications/ProcessStatsUi.java
@@ -16,6 +16,7 @@
package com.android.settings.applications;
+import android.app.ActivityManager;
import android.content.Context;
import android.content.pm.PackageManager;
import android.os.Bundle;
@@ -28,6 +29,7 @@
import android.preference.PreferenceFragment;
import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
+import android.text.format.Formatter;
import android.util.Log;
import android.util.SparseArray;
import android.util.TimeUtils;
@@ -38,6 +40,7 @@
import com.android.internal.app.IProcessStats;
import com.android.internal.app.ProcessMap;
import com.android.internal.app.ProcessStats;
+import com.android.internal.util.MemInfoReader;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.fuelgauge.Utils;
@@ -112,6 +115,15 @@
long mMaxWeight;
long mTotalTime;
+ long[] mMemTimes = new long[ProcessStats.ADJ_MEM_FACTOR_COUNT];
+ double[] mMemStateWeights = new double[ProcessStats.STATE_COUNT];
+ double mMemCachedWeight;
+ double mMemFreeWeight;
+ double mMemZRamWeight;
+ double mMemKernelWeight;
+ double mMemNativeWeight;
+ double mMemTotalWeight;
+
// The actual duration value to use for each duration option. Note these
// are lower than the actual duration, since our durations are computed in
// batches of 3 hours so we want to allow the time we use to be slightly
@@ -182,6 +194,24 @@
@Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
+ if (preference instanceof LinearColorPreference) {
+ Bundle args = new Bundle();
+ args.putLongArray(ProcessStatsMemDetail.EXTRA_MEM_TIMES, mMemTimes);
+ args.putDoubleArray(ProcessStatsMemDetail.EXTRA_MEM_STATE_WEIGHTS, mMemStateWeights);
+ args.putDouble(ProcessStatsMemDetail.EXTRA_MEM_CACHED_WEIGHT, mMemCachedWeight);
+ args.putDouble(ProcessStatsMemDetail.EXTRA_MEM_FREE_WEIGHT, mMemFreeWeight);
+ args.putDouble(ProcessStatsMemDetail.EXTRA_MEM_ZRAM_WEIGHT, mMemZRamWeight);
+ args.putDouble(ProcessStatsMemDetail.EXTRA_MEM_KERNEL_WEIGHT, mMemKernelWeight);
+ args.putDouble(ProcessStatsMemDetail.EXTRA_MEM_NATIVE_WEIGHT, mMemNativeWeight);
+ args.putDouble(ProcessStatsMemDetail.EXTRA_MEM_TOTAL_WEIGHT, mMemTotalWeight);
+ args.putBoolean(ProcessStatsMemDetail.EXTRA_USE_USS, mUseUss);
+ args.putLong(ProcessStatsMemDetail.EXTRA_TOTAL_TIME, mTotalTime);
+ ((SettingsActivity) getActivity()).startPreferencePanel(
+ ProcessStatsMemDetail.class.getName(), args, R.string.mem_details_title,
+ null, null, 0);
+ return true;
+ }
+
if (!(preference instanceof ProcessStatsPreference)) {
return false;
}
@@ -408,11 +438,13 @@
mStats.mMemFactor, mStats.mStartTime, now);
if (DEBUG) Log.d(TAG, "Total time of stats: " + makeDuration(mTotalTime));
- long[] memTimes = new long[ProcessStats.ADJ_MEM_FACTOR_COUNT];
+ for (int i=0; i<mMemTimes.length; i++) {
+ mMemTimes[i] = 0;
+ }
for (int iscreen=0; iscreen<ProcessStats.ADJ_COUNT; iscreen+=ProcessStats.ADJ_SCREEN_MOD) {
for (int imem=0; imem<ProcessStats.ADJ_MEM_FACTOR_COUNT; imem++) {
int state = imem+iscreen;
- memTimes[imem] += mStats.mMemFactorDurations[state];
+ mMemTimes[imem] += mStats.mMemFactorDurations[state];
}
}
@@ -421,31 +453,146 @@
LinearColorPreference colors = new LinearColorPreference(getActivity());
colors.setOrder(-1);
- colors.setOnRegionTappedListener(this);
switch (mMemRegion) {
case LinearColorBar.REGION_RED:
- colors.setColoredRegions(LinearColorBar.REGION_RED);
- memTotalTime = memTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL];
+ memTotalTime = mMemTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL];
memStates = RED_MEM_STATES;
break;
case LinearColorBar.REGION_YELLOW:
- colors.setColoredRegions(LinearColorBar.REGION_RED
- | LinearColorBar.REGION_YELLOW);
- memTotalTime = memTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL]
- + memTimes[ProcessStats.ADJ_MEM_FACTOR_LOW]
- + memTimes[ProcessStats.ADJ_MEM_FACTOR_MODERATE];
+ memTotalTime = mMemTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL]
+ + mMemTimes[ProcessStats.ADJ_MEM_FACTOR_LOW]
+ + mMemTimes[ProcessStats.ADJ_MEM_FACTOR_MODERATE];
memStates = YELLOW_MEM_STATES;
break;
default:
- colors.setColoredRegions(LinearColorBar.REGION_ALL);
memTotalTime = mTotalTime;
memStates = ProcessStats.ALL_MEM_ADJ;
break;
}
- colors.setRatios(memTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL] / (float)mTotalTime,
- (memTimes[ProcessStats.ADJ_MEM_FACTOR_LOW]
- + memTimes[ProcessStats.ADJ_MEM_FACTOR_MODERATE]) / (float)mTotalTime,
- memTimes[ProcessStats.ADJ_MEM_FACTOR_NORMAL] / (float)mTotalTime);
+ colors.setColoredRegions(LinearColorBar.REGION_RED);
+
+ // Compute memory badness for chart color.
+ int[] badColors = com.android.settings.Utils.BADNESS_COLORS;
+ long timeGood = mMemTimes[ProcessStats.ADJ_MEM_FACTOR_NORMAL];
+ timeGood += (mMemTimes[ProcessStats.ADJ_MEM_FACTOR_MODERATE]*2)/3;
+ timeGood += mMemTimes[ProcessStats.ADJ_MEM_FACTOR_LOW]/3;
+ float memBadness = ((float)timeGood)/mTotalTime;
+ int badnessColor = badColors[1 + Math.round(memBadness*(badColors.length-2))];
+ colors.setColors(badnessColor, badnessColor, badnessColor);
+
+ ProcessStats.TotalMemoryUseCollection totalMem = new ProcessStats.TotalMemoryUseCollection(
+ ProcessStats.ALL_SCREEN_ADJ, memStates);
+ mStats.computeTotalMemoryUse(totalMem, now);
+ double freeWeight = totalMem.sysMemFreeWeight + totalMem.sysMemCachedWeight;
+ double usedWeight = totalMem.sysMemKernelWeight + totalMem.sysMemNativeWeight
+ + totalMem.sysMemZRamWeight;
+ double backgroundWeight = 0, persBackgroundWeight = 0;
+ mMemCachedWeight = totalMem.sysMemCachedWeight;
+ mMemFreeWeight = totalMem.sysMemFreeWeight;
+ mMemZRamWeight = totalMem.sysMemZRamWeight;
+ mMemKernelWeight = totalMem.sysMemKernelWeight;
+ mMemNativeWeight = totalMem.sysMemNativeWeight;
+ for (int i=0; i<ProcessStats.STATE_COUNT; i++) {
+ if (i == ProcessStats.STATE_SERVICE_RESTARTING) {
+ // These don't really run.
+ mMemStateWeights[i] = 0;
+ } else {
+ mMemStateWeights[i] = totalMem.processStateWeight[i];
+ if (i >= ProcessStats.STATE_HOME) {
+ freeWeight += totalMem.processStateWeight[i];
+ } else {
+ usedWeight += totalMem.processStateWeight[i];
+ }
+ if (i >= ProcessStats.STATE_IMPORTANT_FOREGROUND) {
+ backgroundWeight += totalMem.processStateWeight[i];
+ persBackgroundWeight += totalMem.processStateWeight[i];
+ }
+ if (i == ProcessStats.STATE_PERSISTENT) {
+ persBackgroundWeight += totalMem.processStateWeight[i];
+ }
+ }
+ }
+ if (DEBUG) {
+ Log.i(TAG, "Used RAM: " + Formatter.formatShortFileSize(getActivity(),
+ (long)((usedWeight * 1024) / memTotalTime)));
+ Log.i(TAG, "Free RAM: " + Formatter.formatShortFileSize(getActivity(),
+ (long)((freeWeight * 1024) / memTotalTime)));
+ Log.i(TAG, "Total RAM: " + Formatter.formatShortFileSize(getActivity(),
+ (long)(((freeWeight+usedWeight) * 1024) / memTotalTime)));
+ Log.i(TAG, "Background+Cached RAM: " + Formatter.formatShortFileSize(getActivity(),
+ (long)((backgroundWeight * 1024) / memTotalTime)));
+ }
+ mMemTotalWeight = freeWeight + usedWeight;
+
+ // For computing the ratio to show, we want to count the baseline cached RAM we
+ // need (at which point we start killing processes) as used RAM, so that if we
+ // reach the point of thrashing due to no RAM for any background processes we
+ // report that as RAM being full. To do this, we need to first convert the weights
+ // back to actual RAM... and since the RAM values we compute here won't exactly
+ // match the real physical RAM, scale those to the actual physical RAM. No problem!
+ double usedRam = (usedWeight*1024)/memTotalTime;
+ double freeRam = (freeWeight*1024)/memTotalTime;
+ double totalRam = usedRam + freeRam;
+ MemInfoReader memReader = new MemInfoReader();
+ memReader.readMemInfo();
+ double realTotalRam = memReader.getTotalSize();
+ double totalScale = realTotalRam / totalRam;
+ double realUsedRam = usedRam * totalScale;
+ double realFreeRam = freeRam * totalScale;
+ if (DEBUG) {
+ Log.i(TAG, "Scaled Used RAM: " + Formatter.formatShortFileSize(getActivity(),
+ (long)realUsedRam));
+ Log.i(TAG, "Scaled Free RAM: " + Formatter.formatShortFileSize(getActivity(),
+ (long)realFreeRam));
+ }
+ ActivityManager.MemoryInfo memInfo = new ActivityManager.MemoryInfo();
+ ((ActivityManager)getActivity().getSystemService(Context.ACTIVITY_SERVICE)).getMemoryInfo(
+ memInfo);
+ if (memInfo.hiddenAppThreshold >= realFreeRam) {
+ realUsedRam = realFreeRam;
+ realFreeRam = 0;
+ } else {
+ realUsedRam += memInfo.hiddenAppThreshold;
+ realFreeRam -= memInfo.hiddenAppThreshold;
+ }
+ if (DEBUG) {
+ Log.i(TAG, "Adj Scaled Used RAM: " + Formatter.formatShortFileSize(getActivity(),
+ (long)realUsedRam));
+ Log.i(TAG, "Adj Scaled Free RAM: " + Formatter.formatShortFileSize(getActivity(),
+ (long)realFreeRam));
+ }
+
+ float usedRatio = (float)(realUsedRam/(realFreeRam+realUsedRam));
+ colors.setRatios(usedRatio, 0, 1-usedRatio);
+
+ if (false) {
+ colors.setOnRegionTappedListener(this);
+ switch (mMemRegion) {
+ case LinearColorBar.REGION_RED:
+ colors.setColoredRegions(LinearColorBar.REGION_RED);
+ memTotalTime = mMemTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL];
+ memStates = RED_MEM_STATES;
+ break;
+ case LinearColorBar.REGION_YELLOW:
+ colors.setColoredRegions(LinearColorBar.REGION_RED
+ | LinearColorBar.REGION_YELLOW);
+ memTotalTime = mMemTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL]
+ + mMemTimes[ProcessStats.ADJ_MEM_FACTOR_LOW]
+ + mMemTimes[ProcessStats.ADJ_MEM_FACTOR_MODERATE];
+ memStates = YELLOW_MEM_STATES;
+ break;
+ default:
+ colors.setColoredRegions(LinearColorBar.REGION_ALL);
+ memTotalTime = mTotalTime;
+ memStates = ProcessStats.ALL_MEM_ADJ;
+ break;
+ }
+ colors.setRatios(mMemTimes[ProcessStats.ADJ_MEM_FACTOR_CRITICAL] / (float)mTotalTime,
+ (mMemTimes[ProcessStats.ADJ_MEM_FACTOR_LOW]
+ + mMemTimes[ProcessStats.ADJ_MEM_FACTOR_MODERATE]) / (float)mTotalTime,
+ mMemTimes[ProcessStats.ADJ_MEM_FACTOR_NORMAL] / (float)mTotalTime);
+ }
+
mAppListGroup.addPreference(colors);
ProcessStats.ProcessDataCollection totals = new ProcessStats.ProcessDataCollection(
@@ -566,20 +713,32 @@
maxWeight = proc.mWeight;
}
}
- mMaxWeight = maxWeight;
+ if (mStatsType == MENU_TYPE_BACKGROUND) {
+ mMaxWeight = (long)(mShowSystem ? persBackgroundWeight : backgroundWeight);
+ if (mMaxWeight < maxWeight) {
+ mMaxWeight = maxWeight;
+ }
+ if (DEBUG) {
+ Log.i(TAG, "Bar max RAM: " + Formatter.formatShortFileSize(getActivity(),
+ (mMaxWeight * 1024) / memTotalTime));
+ }
+ } else {
+ mMaxWeight = maxWeight;
+ }
if (DEBUG) Log.d(TAG, "-------------------- BUILDING UI");
for (int i=0, N=(entries != null ? entries.size() : 0); i<N; i++) {
ProcStatsEntry proc = entries.get(i);
- final double percentOfWeight = (((double)proc.mWeight) / maxWeight) * 100;
+ final double percentOfWeight = (((double)proc.mWeight) / mMaxWeight) * 100;
final double percentOfTime = (((double)proc.mDuration) / memTotalTime) * 100;
if (percentOfWeight < 1 && percentOfTime < 33) {
if (DEBUG) Log.d(TAG, "Skipping " + proc.mName + " weight=" + percentOfWeight
+ " time=" + percentOfTime);
continue;
}
- ProcessStatsPreference pref = new ProcessStatsPreference(getActivity(), null, proc);
+ ProcessStatsPreference pref = new ProcessStatsPreference(getActivity());
+ pref.init(null, proc);
proc.evaluateTargetPackage(pm, mStats, totals, sEntryCompare, mUseUss,
mStatsType == MENU_TYPE_BACKGROUND);
proc.retrieveUiData(pm);
@@ -590,6 +749,16 @@
pref.setOrder(i);
pref.setPercent(percentOfWeight, percentOfTime);
mAppListGroup.addPreference(pref);
+ if (mStatsType == MENU_TYPE_BACKGROUND) {
+ if (DEBUG) {
+ Log.i(TAG, "App " + proc.mUiLabel + ": weightedRam="
+ + Formatter.formatShortFileSize(getActivity(),
+ (proc.mWeight * 1024) / memTotalTime)
+ + ", avgRam=" + Formatter.formatShortFileSize(getActivity(),
+ (proc.mAvgPss*1024)));
+ }
+
+ }
if (mAppListGroup.getPreferenceCount() > (MAX_ITEMS_TO_LIST+1)) {
if (DEBUG) Log.d(TAG, "Done with UI, hit item limit!");
break;
diff --git a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
index 330b9b8..e8bad0c 100644
--- a/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
+++ b/src/com/android/settings/bluetooth/BluetoothDevicePreference.java
@@ -133,10 +133,10 @@
if (mCachedDevice.getBondState() == BluetoothDevice.BOND_BONDED) {
ImageView deviceDetails = (ImageView) view.findViewById(R.id.deviceDetails);
+
if (deviceDetails != null) {
deviceDetails.setOnClickListener(this);
deviceDetails.setTag(mCachedDevice);
- deviceDetails.setAlpha(isEnabled() ? 255 : sDimAlpha);
}
}
diff --git a/src/com/android/settings/bluetooth/BluetoothProgressCategory.java b/src/com/android/settings/bluetooth/BluetoothProgressCategory.java
index 1c81360..9f64f9d 100644
--- a/src/com/android/settings/bluetooth/BluetoothProgressCategory.java
+++ b/src/com/android/settings/bluetooth/BluetoothProgressCategory.java
@@ -22,8 +22,26 @@
import android.content.Context;
import android.util.AttributeSet;
+/**
+ * A Bluetooth discovery progress category
+ */
public class BluetoothProgressCategory extends ProgressCategory {
+ public BluetoothProgressCategory(Context context) {
+ this(context, null);
+ }
+
public BluetoothProgressCategory(Context context, AttributeSet attrs) {
- super(context, attrs, R.string.bluetooth_no_devices_found);
+ this(context, attrs, 0);
+ }
+
+ public BluetoothProgressCategory(Context context, AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public BluetoothProgressCategory(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+
+ setEmptyTextRes(R.string.bluetooth_no_devices_found);
}
}
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index eb318cd..f329c3d 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -292,7 +292,7 @@
// Available devices category
if (mAvailableDevicesCategory == null) {
- mAvailableDevicesCategory = new BluetoothProgressCategory(getActivity(), null);
+ mAvailableDevicesCategory = new BluetoothProgressCategory(getActivity());
} else {
mAvailableDevicesCategory.removeAll();
}
diff --git a/src/com/android/settings/dashboard/DashboardContainerView.java b/src/com/android/settings/dashboard/DashboardContainerView.java
index d4512e6..f009891 100644
--- a/src/com/android/settings/dashboard/DashboardContainerView.java
+++ b/src/com/android/settings/dashboard/DashboardContainerView.java
@@ -25,14 +25,18 @@
public class DashboardContainerView extends ViewGroup {
+ private float mCellGapX;
+ private float mCellGapY;
+
+ private int mNumRows;
private int mNumColumns;
- private float mCellGap;
public DashboardContainerView(Context context, AttributeSet attrs) {
super(context, attrs);
final Resources res = context.getResources();
- mCellGap = res.getDimension(R.dimen.dashboard_cell_gap);
+ mCellGapX = res.getDimension(R.dimen.dashboard_cell_gap_x);
+ mCellGapY = res.getDimension(R.dimen.dashboard_cell_gap_y);
mNumColumns = res.getInteger(R.integer.dashboard_num_columns);
}
@@ -40,7 +44,7 @@
protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
final int width = MeasureSpec.getSize(widthMeasureSpec);
final int availableWidth = (int) (width - getPaddingLeft() - getPaddingRight() -
- (mNumColumns - 1) * mCellGap);
+ (mNumColumns - 1) * mCellGapX);
float cellWidth = (float) Math.ceil(((float) availableWidth) / mNumColumns);
final int N = getChildCount();
@@ -55,7 +59,7 @@
ViewGroup.LayoutParams lp = v.getLayoutParams();
int colSpan = v.getColumnSpan();
- lp.width = (int) ((colSpan * cellWidth) + (colSpan - 1) * mCellGap);
+ lp.width = (int) ((colSpan * cellWidth) + (colSpan - 1) * mCellGapX);
// Measure the child
int newWidthSpec = getChildMeasureSpec(widthMeasureSpec, 0, lp.width);
@@ -72,8 +76,8 @@
cursor += colSpan;
}
- final int numRows = (int) Math.ceil((float) cursor / mNumColumns);
- final int newHeight = (int) ((numRows * cellHeight) + ((numRows - 1) * mCellGap)) +
+ mNumRows = (int) Math.ceil((float) cursor / mNumColumns);
+ final int newHeight = (int) ((mNumRows * cellHeight) + ((mNumRows - 1) * mCellGapY)) +
getPaddingTop() + getPaddingBottom();
setMeasuredDimension(width, newHeight);
@@ -104,10 +108,14 @@
int row = cursor / mNumColumns;
+ if (row == mNumRows - 1) {
+ child.setDividerVisibility(false);
+ }
+
// Push the item to the next row if it can't fit on this one
if ((col + colSpan) > mNumColumns) {
x = getPaddingStart();
- y += childHeight + mCellGap;
+ y += childHeight + mCellGapY;
row++;
}
@@ -124,10 +132,10 @@
// reach the end of the row
cursor += child.getColumnSpan();
if (cursor < (((row + 1) * mNumColumns))) {
- x += childWidth + mCellGap;
+ x += childWidth + mCellGapX;
} else {
x = getPaddingStart();
- y += childHeight + mCellGap;
+ y += childHeight + mCellGapY;
}
}
}
diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java
index 4aee7be..ece32f6 100644
--- a/src/com/android/settings/dashboard/DashboardSummary.java
+++ b/src/com/android/settings/dashboard/DashboardSummary.java
@@ -44,7 +44,6 @@
private static final String LOG_TAG = "DashboardSummary";
private LayoutInflater mLayoutInflater;
- private ViewGroup mContainer;
private ViewGroup mDashboard;
private AuthenticatorHelper mAuthHelper;
private boolean mAccountListenerAdded;
@@ -69,7 +68,6 @@
final Context context = getActivity();
mLayoutInflater = inflater;
- mContainer = container;
final View rootView = inflater.inflate(R.layout.dashboard, container, false);
mDashboard = (ViewGroup) rootView.findViewById(R.id.dashboard_container);
@@ -98,7 +96,7 @@
for (int n = 0; n < count; n++) {
DashboardCategory category = categories.get(n);
- View categoryView = mLayoutInflater.inflate(R.layout.dashboard_category, mContainer,
+ View categoryView = mLayoutInflater.inflate(R.layout.dashboard_category, mDashboard,
false);
TextView categoryLabel = (TextView) categoryView.findViewById(R.id.category_title);
diff --git a/src/com/android/settings/dashboard/DashboardTileView.java b/src/com/android/settings/dashboard/DashboardTileView.java
index 099459c..a54217b 100644
--- a/src/com/android/settings/dashboard/DashboardTileView.java
+++ b/src/com/android/settings/dashboard/DashboardTileView.java
@@ -34,6 +34,7 @@
private ImageView mImageView;
private TextView mTitleTextView;
private TextView mStatusTextView;
+ private View mDivider;
private int mColSpan = DEFAULT_COL_SPAN;
@@ -51,6 +52,7 @@
mImageView = (ImageView) view.findViewById(R.id.icon);
mTitleTextView = (TextView) view.findViewById(R.id.title);
mStatusTextView = (TextView) view.findViewById(R.id.status);
+ mDivider = view.findViewById(R.id.tile_divider);
setOnClickListener(this);
setBackgroundResource(R.drawable.dashboard_tile_background);
@@ -73,6 +75,10 @@
mTile = tile;
}
+ public void setDividerVisibility(boolean visible) {
+ mDivider.setVisibility(visible ? View.VISIBLE : View.GONE);
+ }
+
void setColumnSpan(int span) {
mColSpan = span;
}
diff --git a/src/com/android/settings/dashboard/SearchResultsSummary.java b/src/com/android/settings/dashboard/SearchResultsSummary.java
index 6981634..9e84357 100644
--- a/src/com/android/settings/dashboard/SearchResultsSummary.java
+++ b/src/com/android/settings/dashboard/SearchResultsSummary.java
@@ -169,6 +169,12 @@
// We have a header, so we need to decrement the position by one
position--;
+ // Some Monkeys could create a case where they were probably clicking on the
+ // List Header and thus the position passed was "0" and then by decrement was "-1"
+ if (position < 0) {
+ return;
+ }
+
final Cursor cursor = mResultsAdapter.mCursor;
cursor.moveToPosition(position);
@@ -207,7 +213,8 @@
});
mResultsListView.addHeaderView(
LayoutInflater.from(getActivity()).inflate(
- R.layout.search_panel_results_header, mResultsListView, false));
+ R.layout.search_panel_results_header, mResultsListView, false),
+ null, false);
mSuggestionsListView = (ListView) view.findViewById(R.id.list_suggestions);
mSuggestionsListView.setAdapter(mSuggestionsAdapter);
@@ -216,6 +223,11 @@
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
// We have a header, so we need to decrement the position by one
position--;
+ // Some Monkeys could create a case where they were probably clicking on the
+ // List Header and thus the position passed was "0" and then by decrement was "-1"
+ if (position < 0) {
+ return;
+ }
final Cursor cursor = mSuggestionsAdapter.mCursor;
cursor.moveToPosition(position);
@@ -226,7 +238,8 @@
});
mSuggestionsListView.addHeaderView(
LayoutInflater.from(getActivity()).inflate(
- R.layout.search_panel_suggestions_header, mSuggestionsListView, false));
+ R.layout.search_panel_suggestions_header, mSuggestionsListView, false),
+ null, false);
return view;
}
diff --git a/src/com/android/settings/deviceinfo/UsageBarPreference.java b/src/com/android/settings/deviceinfo/UsageBarPreference.java
index 371c772..4763b79 100644
--- a/src/com/android/settings/deviceinfo/UsageBarPreference.java
+++ b/src/com/android/settings/deviceinfo/UsageBarPreference.java
@@ -35,18 +35,21 @@
private final List<PercentageBarChart.Entry> mEntries = Lists.newArrayList();
- public UsageBarPreference(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- setLayoutResource(R.layout.preference_memoryusage);
- }
-
public UsageBarPreference(Context context) {
- super(context);
- setLayoutResource(R.layout.preference_memoryusage);
+ this(context, null);
}
public UsageBarPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
+ this(context, attrs, 0);
+ }
+
+ public UsageBarPreference(Context context, AttributeSet attrs, int defStyle) {
+ this(context, attrs, defStyle, 0);
+ }
+
+ public UsageBarPreference(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
setLayoutResource(R.layout.preference_memoryusage);
}
diff --git a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
index 85047ce..daff7ea 100644
--- a/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
+++ b/src/com/android/settings/fuelgauge/BatteryHistoryChart.java
@@ -362,10 +362,7 @@
mGpsOnPaint.setStyle(Paint.Style.STROKE);
mWifiRunningPaint.setStyle(Paint.Style.STROKE);
mCpuRunningPaint.setStyle(Paint.Style.STROKE);
- mPhoneSignalChart.setColors(new int[] {
- 0x00000000, 0xffc43828, 0xffe54918, 0xfff47b00,
- 0xfffabf2c, 0xff679e37, 0xff0a7f42
- });
+ mPhoneSignalChart.setColors(com.android.settings.Utils.BADNESS_COLORS);
mDebugRectPaint.setARGB(255, 255, 0, 0);
mDebugRectPaint.setStyle(Paint.Style.STROKE);
mScreenOnPaint.setColor(0xFF009688);
@@ -548,6 +545,7 @@
long lastWallTime = 0;
long lastRealtime = 0;
int aggrStates = 0;
+ int aggrStates2 = 0;
boolean first = true;
if (stats.startIteratingHistoryLocked()) {
final HistoryItem rec = new HistoryItem();
@@ -572,6 +570,7 @@
lastInteresting = pos;
mHistDataEnd = rec.time;
aggrStates |= rec.states;
+ aggrStates2 |= rec.states2;
}
}
}
@@ -580,7 +579,10 @@
mEndWallTime = mEndDataWallTime + (remainingTimeUs/1000);
mNumHist = lastInteresting;
mHaveGps = (aggrStates&HistoryItem.STATE_GPS_ON_FLAG) != 0;
- mHaveWifi = (aggrStates&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
+ mHaveWifi = (aggrStates2&HistoryItem.STATE2_WIFI_RUNNING_FLAG) != 0
+ || (aggrStates&(HistoryItem.STATE_WIFI_FULL_LOCK_FLAG
+ |HistoryItem.STATE_WIFI_MULTICAST_ON_FLAG
+ |HistoryItem.STATE_WIFI_SCAN_FLAG)) != 0;
if (!com.android.settings.Utils.isWifiOnly(getContext())) {
mHavePhoneSignal = true;
}
@@ -777,7 +779,8 @@
Path curLevelPath = null;
Path lastLinePath = null;
boolean lastCharging = false, lastScreenOn = false, lastGpsOn = false;
- boolean lastWifiRunning = false, lastCpuRunning = false;
+ boolean lastWifiRunning = false, lastWifiSupplRunning = false, lastCpuRunning = false;
+ int lastWifiSupplState = BatteryStats.WIFI_SUPPL_STATE_INVALID;
final int N = mNumHist;
if (mStats.startIteratingHistoryLocked()) {
final HistoryItem rec = new HistoryItem();
@@ -871,8 +874,33 @@
lastGpsOn = gpsOn;
}
- final boolean wifiRunning =
- (rec.states&HistoryItem.STATE_WIFI_RUNNING_FLAG) != 0;
+ final int wifiSupplState =
+ ((rec.states2&HistoryItem.STATE2_WIFI_SUPPL_STATE_MASK)
+ >> HistoryItem.STATE2_WIFI_SUPPL_STATE_SHIFT);
+ boolean wifiRunning;
+ if (lastWifiSupplState != wifiSupplState) {
+ lastWifiSupplState = wifiSupplState;
+ switch (wifiSupplState) {
+ case BatteryStats.WIFI_SUPPL_STATE_DISCONNECTED:
+ case BatteryStats.WIFI_SUPPL_STATE_DORMANT:
+ case BatteryStats.WIFI_SUPPL_STATE_INACTIVE:
+ case BatteryStats.WIFI_SUPPL_STATE_INTERFACE_DISABLED:
+ case BatteryStats.WIFI_SUPPL_STATE_INVALID:
+ case BatteryStats.WIFI_SUPPL_STATE_UNINITIALIZED:
+ wifiRunning = lastWifiSupplRunning = false;
+ break;
+ default:
+ wifiRunning = lastWifiSupplRunning = true;
+ break;
+ }
+ } else {
+ wifiRunning = lastWifiSupplRunning;
+ }
+ if ((rec.states&(HistoryItem.STATE_WIFI_FULL_LOCK_FLAG
+ |HistoryItem.STATE_WIFI_MULTICAST_ON_FLAG
+ |HistoryItem.STATE_WIFI_SCAN_FLAG)) != 0) {
+ wifiRunning = true;
+ }
if (wifiRunning != lastWifiRunning) {
if (wifiRunning) {
mWifiRunningPath.moveTo(x, h-mWifiRunningOffset);
@@ -902,8 +930,8 @@
} else if ((rec.states&HistoryItem.STATE_PHONE_SCANNING_FLAG) != 0) {
bin = 1;
} else {
- bin = (rec.states&HistoryItem.STATE_SIGNAL_STRENGTH_MASK)
- >> HistoryItem.STATE_SIGNAL_STRENGTH_SHIFT;
+ bin = (rec.states&HistoryItem.STATE_PHONE_SIGNAL_STRENGTH_MASK)
+ >> HistoryItem.STATE_PHONE_SIGNAL_STRENGTH_SHIFT;
bin += 2;
}
mPhoneSignalChart.addTick(x, bin);
diff --git a/src/com/android/settings/fuelgauge/PowerGaugePreference.java b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
index a028adf..990b654 100644
--- a/src/com/android/settings/fuelgauge/PowerGaugePreference.java
+++ b/src/com/android/settings/fuelgauge/PowerGaugePreference.java
@@ -24,7 +24,6 @@
import android.widget.ProgressBar;
import android.widget.TextView;
-import com.android.internal.os.BatterySipper;
import com.android.settings.R;
/**
@@ -38,7 +37,7 @@
public PowerGaugePreference(Context context, Drawable icon, BatteryEntry info) {
super(context);
- setLayoutResource(R.layout.app_percentage_item);
+ setLayoutResource(R.layout.preference_app_percentage);
setIcon(icon != null ? icon : new ColorDrawable(0));
mInfo = info;
}
diff --git a/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java b/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
index f440bc8..375bee7 100644
--- a/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
+++ b/src/com/android/settings/inputmethod/CheckBoxAndSettingsPreference.java
@@ -37,8 +37,22 @@
private ImageView mSettingsButton;
private Intent mSettingsIntent;
+ public CheckBoxAndSettingsPreference(Context context) {
+ this(context, null);
+ }
+
public CheckBoxAndSettingsPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
+ this(context, attrs, 0);
+ }
+
+ public CheckBoxAndSettingsPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public CheckBoxAndSettingsPreference(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+
setLayoutResource(R.layout.preference_inputmethod);
setWidgetLayoutResource(R.layout.preference_inputmethod_widget);
}
diff --git a/src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java b/src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java
index 5ea8bd7..bc79b42 100644
--- a/src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java
+++ b/src/com/android/settings/inputmethod/SingleSpellCheckerPreference.java
@@ -57,8 +57,8 @@
private Intent mSettingsIntent;
private boolean mSelected;
- public SingleSpellCheckerPreference(SpellCheckersSettings fragment, Intent settingsIntent,
- SpellCheckerInfo sci, TextServicesManager tsm) {
+ public SingleSpellCheckerPreference(SpellCheckersSettings fragment, SpellCheckerInfo sci,
+ TextServicesManager tsm) {
super(fragment.getActivity(), null, 0);
mFragment = fragment;
mRes = fragment.getActivity().getResources();
diff --git a/src/com/android/settings/inputmethod/SpellCheckersPreference.java b/src/com/android/settings/inputmethod/SpellCheckersPreference.java
index 5e4ebba..9e68604 100644
--- a/src/com/android/settings/inputmethod/SpellCheckersPreference.java
+++ b/src/com/android/settings/inputmethod/SpellCheckersPreference.java
@@ -21,10 +21,24 @@
import android.view.textservice.TextServicesManager;
public class SpellCheckersPreference extends CheckBoxAndSettingsPreference {
- private final TextServicesManager mTsm;
+ private TextServicesManager mTsm;
+
+ public SpellCheckersPreference(Context context) {
+ this(context, null);
+ }
public SpellCheckersPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
+ this(context, attrs, 0);
+ }
+
+ public SpellCheckersPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
+ public SpellCheckersPreference(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+
mTsm = (TextServicesManager) context.getSystemService(
Context.TEXT_SERVICES_MANAGER_SERVICE);
setChecked(mTsm.isSpellCheckerEnabled());
diff --git a/src/com/android/settings/inputmethod/SpellCheckersSettings.java b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
index 03867c7..bef5789 100644
--- a/src/com/android/settings/inputmethod/SpellCheckersSettings.java
+++ b/src/com/android/settings/inputmethod/SpellCheckersSettings.java
@@ -90,7 +90,7 @@
for (int i = 0; i < mEnabledScis.length; ++i) {
final SpellCheckerInfo sci = mEnabledScis[i];
final SingleSpellCheckerPreference scPref = new SingleSpellCheckerPreference(
- this, null, sci, mTsm);
+ this, sci, mTsm);
mSpellCheckers.add(scPref);
scPref.setTitle(sci.loadLabel(pm));
scPref.setSelected(mCurrentSci != null && mCurrentSci.getId().equals(sci.getId()));
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
index d81703e..638818a 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordContents.java
@@ -146,7 +146,9 @@
// should not insert, because either A. the word exists with no shortcut, in which
// case the exact same thing we want to insert is already there, or B. the word
// exists with at least one shortcut, in which case it has priority on our word.
- if (hasWord(newWord, context)) return UserDictionaryAddWordActivity.CODE_ALREADY_PRESENT;
+ if (TextUtils.isEmpty(newShortcut) && hasWord(newWord, context)) {
+ return UserDictionaryAddWordActivity.CODE_ALREADY_PRESENT;
+ }
// Disallow duplicates. If the same word with no shortcut is defined, remove it; if
// the same word with the same shortcut is defined, remove it; but we don't mind if
diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java
index b10d4b6..184c387 100644
--- a/src/com/android/settings/location/LocationSettings.java
+++ b/src/com/android/settings/location/LocationSettings.java
@@ -227,7 +227,9 @@
// corner cases, the location might still be enabled. In such case the master switch should
// be disabled but checked.
boolean enabled = (mode != android.provider.Settings.Secure.LOCATION_MODE_OFF);
- mSwitch.setEnabled(!restricted);
+ // Disable the whole switch bar instead of the switch itself. If we disabled the switch
+ // only, it would be re-enabled again if the switch bar is not disabled.
+ mSwitchBar.setEnabled(!restricted);
mLocationMode.setEnabled(enabled && !restricted);
mCategoryRecentLocationRequests.setEnabled(enabled);
diff --git a/src/com/android/settings/net/DataUsageMeteredSettings.java b/src/com/android/settings/net/DataUsageMeteredSettings.java
index fb000db..87358f6 100644
--- a/src/com/android/settings/net/DataUsageMeteredSettings.java
+++ b/src/com/android/settings/net/DataUsageMeteredSettings.java
@@ -22,6 +22,7 @@
import static com.android.settings.DataUsageSummary.hasWifiRadio;
import android.content.Context;
+import android.content.res.Resources;
import android.net.NetworkPolicy;
import android.net.NetworkPolicyManager;
import android.net.NetworkTemplate;
@@ -31,15 +32,23 @@
import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.preference.PreferenceCategory;
+import android.provider.SearchIndexableResource;
import android.telephony.TelephonyManager;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
+import com.android.settings.search.BaseSearchIndexProvider;
+import com.android.settings.search.Indexable;
+import com.android.settings.search.SearchIndexableRaw;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
/**
* Panel to configure {@link NetworkPolicy#metered} for networks.
*/
-public class DataUsageMeteredSettings extends SettingsPreferenceFragment {
+public class DataUsageMeteredSettings extends SettingsPreferenceFragment implements Indexable {
private static final boolean SHOW_MOBILE_CATEGORY = false;
@@ -141,4 +150,82 @@
}
}
}
+
+ /**
+ * For search
+ */
+ public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
+ new BaseSearchIndexProvider() {
+ @Override
+ public List<SearchIndexableRaw> getRawDataToIndex(Context context, boolean enabled) {
+ final List<SearchIndexableRaw> result = new ArrayList<SearchIndexableRaw>();
+ final Resources res = context.getResources();
+
+ // Add fragment title
+ SearchIndexableRaw data = new SearchIndexableRaw(context);
+ data.title = res.getString(R.string.data_usage_menu_metered);
+ data.screenTitle = res.getString(R.string.data_usage_menu_metered);
+ result.add(data);
+
+ // Body
+ data = new SearchIndexableRaw(context);
+ data.title = res.getString(R.string.data_usage_metered_body);
+ data.screenTitle = res.getString(R.string.data_usage_menu_metered);
+ result.add(data);
+
+ if (SHOW_MOBILE_CATEGORY && hasReadyMobileRadio(context)) {
+ // Mobile networks category
+ data = new SearchIndexableRaw(context);
+ data.title = res.getString(R.string.data_usage_metered_mobile);
+ data.screenTitle = res.getString(R.string.data_usage_menu_metered);
+ result.add(data);
+
+ final TelephonyManager tele = TelephonyManager.from(context);
+
+ data = new SearchIndexableRaw(context);
+ data.title = tele.getNetworkOperatorName();
+ data.screenTitle = res.getString(R.string.data_usage_menu_metered);
+ result.add(data);
+ }
+
+ // Wi-Fi networks category
+ data = new SearchIndexableRaw(context);
+ data.title = res.getString(R.string.data_usage_metered_wifi);
+ data.screenTitle = res.getString(R.string.data_usage_menu_metered);
+ result.add(data);
+
+ final WifiManager wifiManager =
+ (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+ if (hasWifiRadio(context) && wifiManager.isWifiEnabled()) {
+ for (WifiConfiguration config : wifiManager.getConfiguredNetworks()) {
+ if (config.SSID != null) {
+ final String networkId = config.SSID;
+
+ data = new SearchIndexableRaw(context);
+ data.title = removeDoubleQuotes(networkId);
+ data.screenTitle = res.getString(R.string.data_usage_menu_metered);
+ result.add(data);
+ }
+ }
+ } else {
+ data = new SearchIndexableRaw(context);
+ data.title = res.getString(R.string.data_usage_metered_wifi_disabled);
+ data.screenTitle = res.getString(R.string.data_usage_menu_metered);
+ result.add(data);
+ }
+
+ return result;
+ }
+
+ @Override
+ public List<String> getNonIndexableKeys(Context context) {
+ final ArrayList<String> result = new ArrayList<String>();
+ if (!SHOW_MOBILE_CATEGORY || !hasReadyMobileRadio(context)) {
+ result.add("mobile");
+ }
+
+ return result;
+ }
+ };
+
}
diff --git a/src/com/android/settings/notification/NotificationDisplaySettings.java b/src/com/android/settings/notification/NotificationDisplaySettings.java
index 7842cad..54406f0 100644
--- a/src/com/android/settings/notification/NotificationDisplaySettings.java
+++ b/src/com/android/settings/notification/NotificationDisplaySettings.java
@@ -36,14 +36,12 @@
private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
private static final String KEY_LOCK_SCREEN_NOTIFICATIONS = "lock_screen_notifications";
- private static final String KEY_ZEN_MODE_NOTIFICATIONS = "zen_mode_notifications";
private final Handler mHandler = new Handler();
private final SettingsObserver mSettingsObserver = new SettingsObserver();
private TwoStatePreference mNotificationPulse;
private DropDownPreference mLockscreen;
- private DropDownPreference mZenModeNotifications;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -54,7 +52,6 @@
final PreferenceScreen root = getPreferenceScreen();
initPulse(root);
initLockscreenNotifications(root);
- initZenModeNotifications(root);
}
@Override
@@ -148,32 +145,6 @@
Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS, 0) != 0;
}
- // === Zen mode notifications ===
-
- private void initZenModeNotifications(PreferenceScreen parent) {
- mZenModeNotifications = (DropDownPreference)
- parent.findPreference(KEY_ZEN_MODE_NOTIFICATIONS);
- if (mZenModeNotifications == null) return;
- mZenModeNotifications.addItem(R.string.zen_mode_notifications_summary_hide, 0);
- mZenModeNotifications.addItem(R.string.zen_mode_notifications_summary_show, 1);
- updateZenModeNotifications();
- mZenModeNotifications.setCallback(new DropDownPreference.Callback() {
- @Override
- public boolean onItemSelected(int pos, Object value) {
- final int val = (Integer) value;
- Settings.Secure.putInt(getContentResolver(),
- Settings.Secure.DISPLAY_INTERCEPTED_NOTIFICATIONS, val);
- return true;
- }
- });
- }
-
- private void updateZenModeNotifications() {
- if (mZenModeNotifications == null) return;
- mZenModeNotifications.setSelectedValue(Settings.Secure.getInt(getContentResolver(),
- Settings.Secure.DISPLAY_INTERCEPTED_NOTIFICATIONS, 0));
- }
-
// === Callbacks ===
private final class SettingsObserver extends ContentObserver {
@@ -183,8 +154,6 @@
Settings.Secure.getUriFor(Settings.Secure.LOCK_SCREEN_ALLOW_PRIVATE_NOTIFICATIONS);
private final Uri LOCK_SCREEN_SHOW_URI =
Settings.Global.getUriFor(Settings.Global.LOCK_SCREEN_SHOW_NOTIFICATIONS);
- private final Uri DISPLAY_INTERCEPTED_NOTIFICATIONS_URI =
- Settings.Secure.getUriFor(Settings.Secure.DISPLAY_INTERCEPTED_NOTIFICATIONS);
public SettingsObserver() {
super(mHandler);
@@ -196,7 +165,6 @@
cr.registerContentObserver(NOTIFICATION_LIGHT_PULSE_URI, false, this);
cr.registerContentObserver(LOCK_SCREEN_PRIVATE_URI, false, this);
cr.registerContentObserver(LOCK_SCREEN_SHOW_URI, false, this);
- cr.registerContentObserver(DISPLAY_INTERCEPTED_NOTIFICATIONS_URI, false, this);
} else {
cr.unregisterContentObserver(this);
}
@@ -211,9 +179,6 @@
if (LOCK_SCREEN_PRIVATE_URI.equals(uri) || LOCK_SCREEN_SHOW_URI.equals(uri)) {
updateLockscreenNotifications();
}
- if (DISPLAY_INTERCEPTED_NOTIFICATIONS_URI.equals(uri)) {
- updateZenModeNotifications();
- }
}
}
}
diff --git a/src/com/android/settings/notification/VolumeSeekBarPreference.java b/src/com/android/settings/notification/VolumeSeekBarPreference.java
index 9889123..11a83a7 100644
--- a/src/com/android/settings/notification/VolumeSeekBarPreference.java
+++ b/src/com/android/settings/notification/VolumeSeekBarPreference.java
@@ -34,16 +34,27 @@
public class VolumeSeekBarPreference extends SeekBarPreference
implements PreferenceManager.OnActivityStopListener {
private static final String TAG = "VolumeSeekBarPreference";
- private final Context mContext;
private int mStream;
private SeekBar mSeekBar;
private SeekBarVolumizer mVolumizer;
private Callback mCallback;
+ public VolumeSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr,
+ int defStyleRes) {
+ super(context, attrs, defStyleAttr, defStyleRes);
+ }
+
+ public VolumeSeekBarPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+ this(context, attrs, defStyleAttr, 0);
+ }
+
public VolumeSeekBarPreference(Context context, AttributeSet attrs) {
- super(context, attrs);
- mContext = context;
+ this(context, attrs, 0);
+ }
+
+ public VolumeSeekBarPreference(Context context) {
+ this(context, null);
}
public void setStream(int stream) {
@@ -82,14 +93,14 @@
};
final Uri sampleUri = mStream == AudioManager.STREAM_MUSIC ? getMediaVolumeUri() : null;
if (mVolumizer == null) {
- mVolumizer = new SeekBarVolumizer(mContext, mStream, sampleUri, sbvc);
+ mVolumizer = new SeekBarVolumizer(getContext(), mStream, sampleUri, sbvc);
}
mVolumizer.setSeekBar(mSeekBar);
}
private Uri getMediaVolumeUri() {
return Uri.parse(ContentResolver.SCHEME_ANDROID_RESOURCE + "://"
- + mContext.getPackageName()
+ + getContext().getPackageName()
+ "/" + R.raw.media_volume);
}
diff --git a/src/com/android/settings/print/PrintServiceSettingsFragment.java b/src/com/android/settings/print/PrintServiceSettingsFragment.java
index c68f131..49fd6df 100644
--- a/src/com/android/settings/print/PrintServiceSettingsFragment.java
+++ b/src/com/android/settings/print/PrintServiceSettingsFragment.java
@@ -206,13 +206,13 @@
switch (which) {
case DialogInterface.BUTTON_POSITIVE:
checked = true;
- mToggleSwitch.setCheckedInternal(checked);
+ mSwitchBar.setCheckedInternal(checked);
getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, checked);
onPreferenceToggled(mPreferenceKey, checked);
break;
case DialogInterface.BUTTON_NEGATIVE:
checked = false;
- mToggleSwitch.setCheckedInternal(checked);
+ mSwitchBar.setCheckedInternal(checked);
getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, checked);
onPreferenceToggled(mPreferenceKey, checked);
break;
@@ -274,10 +274,10 @@
List<ComponentName> services = PrintSettingsUtils.readEnabledPrintServices(getActivity());
mServiceEnabled = services.contains(mComponentName);
if (mServiceEnabled) {
- mToggleSwitch.setCheckedInternal(true);
+ mSwitchBar.setCheckedInternal(true);
mPrintersAdapter.enable();
} else {
- mToggleSwitch.setCheckedInternal(false);
+ mSwitchBar.setCheckedInternal(false);
mPrintersAdapter.disable();
}
getActivity().invalidateOptionsMenu();
@@ -299,7 +299,7 @@
public boolean onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked) {
if (checked) {
if (!TextUtils.isEmpty(mEnableWarningMessage)) {
- toggleSwitch.setCheckedInternal(false);
+ mSwitchBar.setCheckedInternal(false);
getArguments().putBoolean(PrintSettingsFragment.EXTRA_CHECKED, false);
showDialog(DIALOG_ID_ENABLE_WARNING);
return true;
@@ -330,7 +330,7 @@
// Enabled.
final boolean enabled = arguments.getBoolean(PrintSettingsFragment.EXTRA_CHECKED);
- mToggleSwitch.setCheckedInternal(enabled);
+ mSwitchBar.setCheckedInternal(enabled);
// Settings title and intent.
String settingsTitle = arguments.getString(PrintSettingsFragment.EXTRA_SETTINGS_TITLE);
@@ -739,7 +739,7 @@
}
});
}
- mDiscoverySession.startPrinterDisovery(null);
+ mDiscoverySession.startPrinterDiscovery(null);
}
}
}
diff --git a/src/com/android/settings/search/Index.java b/src/com/android/settings/search/Index.java
index bcc6ca4..9723fbf 100644
--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -45,6 +45,7 @@
import java.io.IOException;
import java.lang.reflect.Field;
+import java.text.Normalizer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -54,6 +55,7 @@
import java.util.Map;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.regex.Pattern;
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_NON_INDEXABLE_KEYS_KEY_VALUE;
import static android.provider.SearchIndexablesContract.COLUMN_INDEX_RAW_RANK;
@@ -153,6 +155,10 @@
private static final List<String> EMPTY_LIST = Collections.<String>emptyList();
private static Index sInstance;
+
+ private static final Pattern REMOVE_DIACRITICALS_PATTERN
+ = Pattern.compile("\\p{InCombiningDiacriticalMarks}+");
+
private final AtomicBoolean mIsAvailable = new AtomicBoolean(false);
private final UpdateData mDataToProcess = new UpdateData();
private Context mContext;
@@ -924,31 +930,13 @@
String intentAction, String intentTargetPackage, String intentTargetClass,
boolean enabled, String key) {
- String updatedTitle;
- if (title != null) {
- updatedTitle = title.replaceAll(NON_BREAKING_HYPHEN, HYPHEN);
- }
- else {
- updatedTitle = EMPTY;
- }
+ final String updatedTitle = normalizeHyphen(title);
+ final String updatedSummaryOn = normalizeHyphen(summaryOn);
+ final String updatedSummaryOff = normalizeHyphen(summaryOff);
- String updatedSummaryOn;
- if (summaryOn != null) {
- updatedSummaryOn = summaryOn.replaceAll(NON_BREAKING_HYPHEN, HYPHEN);
- } else {
- updatedSummaryOn = EMPTY;
- }
-
- String updatedSummaryOff;
- if (summaryOff != null) {
- updatedSummaryOff = summaryOff.replaceAll(NON_BREAKING_HYPHEN, HYPHEN);
- } else {
- updatedSummaryOff = EMPTY;
- }
-
- String normalizedTitle = updatedTitle.replaceAll(HYPHEN, EMPTY);
- String normalizedSummaryOn = updatedSummaryOn.replaceAll(HYPHEN, EMPTY);
- String normalizedSummaryOff = updatedSummaryOff.replaceAll(HYPHEN, EMPTY);
+ final String normalizedTitle = normalizeString(updatedTitle);
+ final String normalizedSummaryOn = normalizeString(updatedSummaryOn);
+ final String normalizedSummaryOff = normalizeString(updatedSummaryOff);
updateOneRow(database, locale,
updatedTitle, normalizedTitle, updatedSummaryOn, normalizedSummaryOn,
@@ -957,6 +945,17 @@
rank, keywords, intentAction, intentTargetPackage, intentTargetClass, enabled, key);
}
+ private static String normalizeHyphen(String input) {
+ return (input != null) ? input.replaceAll(NON_BREAKING_HYPHEN, HYPHEN) : EMPTY;
+ }
+
+ private static String normalizeString(String input) {
+ final String nohyphen = (input != null) ? input.replaceAll(HYPHEN, EMPTY) : EMPTY;
+ final String normalized = Normalizer.normalize(nohyphen, Normalizer.Form.NFD);
+
+ return REMOVE_DIACRITICALS_PATTERN.matcher(normalized).replaceAll("").toLowerCase();
+ }
+
private void updateOneRow(SQLiteDatabase database, String locale,
String updatedTitle, String normalizedTitle,
String updatedSummaryOn, String normalizedSummaryOn,
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index 80ea83a..d8f69c3 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -23,6 +23,7 @@
import com.android.settings.DeviceInfoSettings;
import com.android.settings.DisplaySettings;
import com.android.settings.HomeSettings;
+import com.android.settings.LockToAppSettings;
import com.android.settings.PrivacySettings;
import com.android.settings.SecuritySettings;
import com.android.settings.WallpaperTypeSettings;
@@ -34,6 +35,7 @@
import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
import com.android.settings.location.LocationSettings;
+import com.android.settings.net.DataUsageMeteredSettings;
import com.android.settings.notification.NotificationDisplaySettings;
import com.android.settings.notification.NotificationSettings;
import com.android.settings.notification.OtherSoundSettings;
@@ -81,50 +83,72 @@
private static HashMap<String, Integer> sBaseRankMap = new HashMap<String, Integer>();
static {
+ // Wi-Fi
sRankMap.put(WifiSettings.class.getName(), RANK_WIFI);
sRankMap.put(AdvancedWifiSettings.class.getName(), RANK_WIFI);
+ // BT
sRankMap.put(BluetoothSettings.class.getName(), RANK_BT);
+ // DataUsage
sRankMap.put(DataUsageSummary.class.getName(), RANK_DATA_USAGE);
+ sRankMap.put(DataUsageMeteredSettings.class.getName(), RANK_DATA_USAGE);
+ // Other wireless settinfs
sRankMap.put(WirelessSettings.class.getName(), RANK_WIRELESS);
+ // Home
sRankMap.put(HomeSettings.class.getName(), RANK_HOME);
+ // Display
sRankMap.put(DisplaySettings.class.getName(), RANK_DISPLAY);
+ // Wallpapers
sRankMap.put(WallpaperTypeSettings.class.getName(), RANK_WALLPAPER);
+ // Notifications
sRankMap.put(NotificationSettings.class.getName(), RANK_NOTIFICATIONS);
sRankMap.put(NotificationDisplaySettings.class.getName(), RANK_NOTIFICATIONS);
sRankMap.put(OtherSoundSettings.class.getName(), RANK_NOTIFICATIONS);
sRankMap.put(ZenModeSettings.class.getName(), RANK_NOTIFICATIONS);
+ // Memory
sRankMap.put(Memory.class.getName(), RANK_MEMORY);
+ // Battery
sRankMap.put(PowerUsageSummary.class.getName(), RANK_POWER_USAGE);
sRankMap.put(BatterySaverSettings.class.getName(), RANK_POWER_USAGE);
+ // Users
sRankMap.put(UserSettings.class.getName(), RANK_USERS);
+ // Location
sRankMap.put(LocationSettings.class.getName(), RANK_LOCATION);
+ // Security
sRankMap.put(SecuritySettings.class.getName(), RANK_SECURITY);
sRankMap.put(ChooseLockGeneric.ChooseLockGenericFragment.class.getName(), RANK_SECURITY);
+ sRankMap.put(LockToAppSettings.class.getName(), RANK_SECURITY);
+ // IMEs
sRankMap.put(InputMethodAndLanguageSettings.class.getName(), RANK_IME);
+ // Privacy
sRankMap.put(PrivacySettings.class.getName(), RANK_PRIVACY);
+ // Date / Time
sRankMap.put(DateTimeSettings.class.getName(), RANK_DATE_TIME);
+ // Accessibility
sRankMap.put(AccessibilitySettings.class.getName(), RANK_ACCESSIBILITY);
+ // Print
sRankMap.put(PrintSettingsFragment.class.getName(), RANK_PRINTING);
+ // Development
sRankMap.put(DevelopmentSettings.class.getName(), RANK_DEVELOPEMENT);
+ // Device infos
sRankMap.put(DeviceInfoSettings.class.getName(), RANK_DEVICE_INFO);
sBaseRankMap.put("com.android.settings", 0);
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index 086ebfc..6d43f97 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -25,6 +25,7 @@
import com.android.settings.DeviceInfoSettings;
import com.android.settings.DisplaySettings;
import com.android.settings.HomeSettings;
+import com.android.settings.LockToAppSettings;
import com.android.settings.PrivacySettings;
import com.android.settings.R;
import com.android.settings.SecuritySettings;
@@ -37,6 +38,7 @@
import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
import com.android.settings.location.LocationSettings;
+import com.android.settings.net.DataUsageMeteredSettings;
import com.android.settings.notification.NotificationDisplaySettings;
import com.android.settings.notification.NotificationSettings;
import com.android.settings.notification.OtherSoundSettings;
@@ -64,7 +66,7 @@
WifiSettings.class.getName(),
R.drawable.ic_settings_wireless));
- sResMap.put(WifiSettings.class.getName(),
+ sResMap.put(AdvancedWifiSettings.class.getName(),
new SearchIndexableResource(
Ranking.getRankForClassName(AdvancedWifiSettings.class.getName()),
R.xml.wifi_advanced_settings,
@@ -85,6 +87,13 @@
DataUsageSummary.class.getName(),
R.drawable.ic_settings_data_usage));
+ sResMap.put(DataUsageMeteredSettings.class.getName(),
+ new SearchIndexableResource(
+ Ranking.getRankForClassName(DataUsageMeteredSettings.class.getName()),
+ NO_DATA_RES_ID,
+ DataUsageMeteredSettings.class.getName(),
+ R.drawable.ic_settings_data_usage));
+
sResMap.put(WirelessSettings.class.getName(),
new SearchIndexableResource(
Ranking.getRankForClassName(WirelessSettings.class.getName()),
@@ -191,6 +200,13 @@
ChooseLockGeneric.ChooseLockGenericFragment.class.getName(),
R.drawable.ic_settings_security));
+ sResMap.put(LockToAppSettings.class.getName(),
+ new SearchIndexableResource(
+ Ranking.getRankForClassName(LockToAppSettings.class.getName()),
+ NO_DATA_RES_ID,
+ LockToAppSettings.class.getName(),
+ R.drawable.ic_settings_security));
+
sResMap.put(InputMethodAndLanguageSettings.class.getName(),
new SearchIndexableResource(
Ranking.getRankForClassName(InputMethodAndLanguageSettings.class.getName()),
diff --git a/src/com/android/settings/tts/TextToSpeechSettings.java b/src/com/android/settings/tts/TextToSpeechSettings.java
index 009b3b7..8417cfd 100644
--- a/src/com/android/settings/tts/TextToSpeechSettings.java
+++ b/src/com/android/settings/tts/TextToSpeechSettings.java
@@ -28,6 +28,7 @@
import android.content.ActivityNotFoundException;
import android.content.ContentResolver;
import android.content.Intent;
+import android.os.AsyncTask;
import android.os.Bundle;
import android.preference.ListPreference;
import android.preference.Preference;
@@ -164,6 +165,9 @@
setTtsUtteranceProgressListener();
initSettings();
+
+ // Prevent restarting the TTS connection on rotation
+ setRetainInstance(true);
}
@Override
@@ -264,7 +268,9 @@
return;
}
- mCurrentDefaultLocale = defaultLocale;
+ // ISO-3166 alpha 3 country codes are out of spec. If we won't normalize,
+ // we may end up with English (USA)and German (DEU).
+ mCurrentDefaultLocale = mEnginesHelper.parseLocaleString(defaultLocale.toString());
int defaultAvailable = mTts.setLanguage(defaultLocale);
if (evaluateDefaultLocale()) {
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index 47493fb..15824cf 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -233,34 +233,25 @@
mLocalePreference.setEnabled(false);
return;
}
- String currentLocale = "";
+ Locale currentLocale = null;
if (!mEnginesHelper.isLocaleSetToDefaultForEngine(getEngineName())) {
currentLocale = mEnginesHelper.getLocalePrefForEngine(getEngineName());
}
- ArrayList<Pair<String, String>> entryPairs =
- new ArrayList<Pair<String, String>>(availableLangs.size());
+ ArrayList<Pair<String, Locale>> entryPairs =
+ new ArrayList<Pair<String, Locale>>(availableLangs.size());
for (int i = 0; i < availableLangs.size(); i++) {
- String[] langCountryVariant = availableLangs.get(i).split("-");
- Locale loc = null;
- if (langCountryVariant.length == 1){
- loc = new Locale(langCountryVariant[0]);
- } else if (langCountryVariant.length == 2){
- loc = new Locale(langCountryVariant[0], langCountryVariant[1]);
- } else if (langCountryVariant.length == 3){
- loc = new Locale(langCountryVariant[0], langCountryVariant[1],
- langCountryVariant[2]);
- }
- if (loc != null){
- entryPairs.add(new Pair<String, String>(
- loc.getDisplayName(), availableLangs.get(i)));
+ Locale locale = mEnginesHelper.parseLocaleString(availableLangs.get(i));
+ if (locale != null){
+ entryPairs.add(new Pair<String, Locale>(
+ locale.getDisplayName(), locale));
}
}
// Sort it
- Collections.sort(entryPairs, new Comparator<Pair<String, String>>() {
+ Collections.sort(entryPairs, new Comparator<Pair<String, Locale>>() {
@Override
- public int compare(Pair<String, String> lhs, Pair<String, String> rhs) {
+ public int compare(Pair<String, Locale> lhs, Pair<String, Locale> rhs) {
return lhs.first.compareToIgnoreCase(rhs.first);
}
});
@@ -274,12 +265,12 @@
entryValues[0] = "";
int i = 1;
- for (Pair<String, String> entry : entryPairs) {
- if (entry.second.equalsIgnoreCase(currentLocale)) {
+ for (Pair<String, Locale> entry : entryPairs) {
+ if (entry.second.equals(currentLocale)) {
mSelectedLocaleIndex = i;
}
entries[i] = entry.first;
- entryValues[i++] = entry.second;
+ entryValues[i++] = entry.second.toString();
}
mLocalePreference.setEntries(entries);
@@ -332,16 +323,19 @@
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
if (preference == mLocalePreference) {
- updateLanguageTo((String) newValue);
+ String localeString = (String) newValue;
+ updateLanguageTo((!TextUtils.isEmpty(localeString) ?
+ mEnginesHelper.parseLocaleString(localeString) : null));
return true;
}
return false;
}
- private void updateLanguageTo(String locale) {
+ private void updateLanguageTo(Locale locale) {
int selectedLocaleIndex = -1;
+ String localeString = (locale != null) ? locale.toString() : "";
for (int i=0; i < mLocalePreference.getEntryValues().length; i++) {
- if (locale.equalsIgnoreCase(mLocalePreference.getEntryValues()[i].toString())) {
+ if (localeString.equalsIgnoreCase(mLocalePreference.getEntryValues()[i].toString())) {
selectedLocaleIndex = i;
break;
}
@@ -357,15 +351,8 @@
mEnginesHelper.updateLocalePrefForEngine(getEngineName(), locale);
if (getEngineName().equals(mTts.getCurrentEngine())) {
- if (!locale.isEmpty()) {
- String[] localeArray = TtsEngines.parseLocalePref(locale);
- if (localeArray != null) {
- mTts.setLanguage(new Locale(localeArray[0], localeArray[1], localeArray[2]));
- }
- } else {
- // Empty locale means "use system default"
- mTts.setLanguage(Locale.getDefault());
- }
+ // Null locale means "use system default"
+ mTts.setLanguage((locale != null) ? locale : Locale.getDefault());
}
}
diff --git a/src/com/android/settings/users/UserPreference.java b/src/com/android/settings/users/UserPreference.java
index 9f53aa5..56ca114 100644
--- a/src/com/android/settings/users/UserPreference.java
+++ b/src/com/android/settings/users/UserPreference.java
@@ -58,11 +58,13 @@
@Override
protected void onBindView(View view) {
+ UserManager um = (UserManager) getContext().getSystemService(Context.USER_SERVICE);
View deleteDividerView = view.findViewById(R.id.divider_delete);
View manageDividerView = view.findViewById(R.id.divider_manage);
View deleteView = view.findViewById(R.id.trash_user);
if (deleteView != null) {
- if (mDeleteClickListener != null) {
+ if (mDeleteClickListener != null
+ && !um.hasUserRestriction(UserManager.DISALLOW_REMOVE_USER)) {
deleteView.setOnClickListener(mDeleteClickListener);
deleteView.setTag(this);
} else {
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 901ee50..8d27c65 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -64,12 +64,12 @@
import com.android.settings.ChooseLockGeneric;
import com.android.settings.OwnerInfoSettings;
import com.android.settings.R;
-import com.android.settings.RestrictedSettingsFragment;
import com.android.settings.SelectableEditTextPreference;
import com.android.settings.SettingsActivity;
+import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
-public class UserSettings extends RestrictedSettingsFragment
+public class UserSettings extends SettingsPreferenceFragment
implements OnPreferenceClickListener, OnClickListener, DialogInterface.OnDismissListener,
Preference.OnPreferenceChangeListener {
@@ -136,10 +136,6 @@
private SparseArray<Bitmap> mUserIcons = new SparseArray<Bitmap>();
private boolean mIsOwner = UserHandle.myUserId() == UserHandle.USER_OWNER;
- public UserSettings() {
- super(RestrictedSettingsFragment.RESTRICTIONS_PIN_SET);
- }
-
private Handler mHandler = new Handler() {
@Override
public void handleMessage(Message msg) {
@@ -204,7 +200,8 @@
}
mAddUser = findPreference(KEY_ADD_USER);
if (!mIsOwner || UserManager.getMaxSupportedUsers() < 2
- || !UserManager.supportsMultipleUsers()) {
+ || !UserManager.supportsMultipleUsers()
+ || mUserManager.hasUserRestriction(UserManager.DISALLOW_ADD_USER)) {
removePreference(KEY_ADD_USER);
} else {
mAddUser.setOnPreferenceClickListener(this);
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index 73aae99..ea6325e 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -29,8 +29,10 @@
import android.os.Message;
import android.os.ServiceManager;
import android.os.SystemProperties;
+import android.os.UserManager;
import android.preference.Preference;
import android.preference.PreferenceGroup;
+import android.preference.PreferenceScreen;
import android.security.Credentials;
import android.security.KeyStore;
import android.text.TextUtils;
@@ -45,6 +47,7 @@
import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.ArrayAdapter;
import android.widget.ListView;
+import android.widget.TextView;
import android.widget.Toast;
import com.android.internal.net.LegacyVpnInfo;
@@ -80,14 +83,25 @@
private Handler mUpdater;
private LegacyVpnInfo mInfo;
+ private UserManager mUm;
// The key of the profile for the current ContextMenu.
private String mSelectedKey;
+ private boolean mUnavailable;
+
@Override
public void onCreate(Bundle savedState) {
super.onCreate(savedState);
+ mUm = (UserManager) getSystemService(Context.USER_SERVICE);
+
+ if (mUm.hasUserRestriction(UserManager.DISALLOW_CONFIG_VPN)) {
+ mUnavailable = true;
+ setPreferenceScreen(new PreferenceScreen(getActivity(), null));
+ return;
+ }
+
setHasOptionsMenu(true);
addPreferencesFromResource(R.xml.vpn_settings2);
@@ -156,6 +170,15 @@
public void onResume() {
super.onResume();
+ if (mUnavailable) {
+ TextView emptyView = (TextView) getView().findViewById(android.R.id.empty);
+ getListView().setEmptyView(emptyView);
+ if (emptyView != null) {
+ emptyView.setText(R.string.vpn_settings_not_available);
+ }
+ return;
+ }
+
final boolean pickLockdown = getActivity()
.getIntent().getBooleanExtra(EXTRA_PICK_LOCKDOWN, false);
if (pickLockdown) {
@@ -214,6 +237,10 @@
public void onPause() {
super.onPause();
+ if (mUnavailable) {
+ return;
+ }
+
// Hide the dialog if there is one.
if (mDialog != null) {
mDialog.setOnDismissListener(null);
diff --git a/src/com/android/settings/widget/ProportionalOuterFrame.java b/src/com/android/settings/widget/ProportionalOuterFrame.java
new file mode 100644
index 0000000..d23d2c4
--- /dev/null
+++ b/src/com/android/settings/widget/ProportionalOuterFrame.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2011 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.widget;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.RelativeLayout;
+
+import com.android.settings.R;
+
+/**
+ * Used as the outer frame of all setup wizard pages that need to adjust their margins based
+ * on the total size of the available display. (e.g. side margins set to 10% of total width.)
+ */
+public class ProportionalOuterFrame extends RelativeLayout {
+ public ProportionalOuterFrame(Context context) {
+ super(context);
+ }
+
+ public ProportionalOuterFrame(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ }
+
+ public ProportionalOuterFrame(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ }
+
+ /**
+ * Set our margins and title area height proportionally to the available display size
+ */
+ @Override
+ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+ final int parentWidth = MeasureSpec.getSize(widthMeasureSpec);
+ final int parentHeight = MeasureSpec.getSize(heightMeasureSpec);
+ final Resources res = getContext().getResources();
+ final float titleHeight = res.getFraction(R.dimen.setup_title_height, 1, 1);
+ final float sideMargin = res.getFraction(R.dimen.setup_border_width, 1, 1);
+ final int bottom = res.getDimensionPixelSize(R.dimen.setup_margin_bottom);
+ setPaddingRelative((int) (parentWidth * sideMargin), 0,
+ (int) (parentWidth * sideMargin), bottom);
+ final View title = findViewById(R.id.title_area);
+ if (title != null) {
+ title.setMinimumHeight((int) (parentHeight * titleHeight));
+ }
+ super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+ }
+}
diff --git a/src/com/android/settings/widget/SwitchBar.java b/src/com/android/settings/widget/SwitchBar.java
index b503cf6..c8afa1c 100644
--- a/src/com/android/settings/widget/SwitchBar.java
+++ b/src/com/android/settings/widget/SwitchBar.java
@@ -19,11 +19,9 @@
import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
-import android.transition.TransitionManager;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;
-import android.view.ViewGroup;
import android.widget.CompoundButton;
import android.widget.LinearLayout;
@@ -73,6 +71,9 @@
mTextView.setText(R.string.switch_off_text);
mSwitch = (ToggleSwitch) findViewById(R.id.switch_widget);
+ // Prevent onSaveInstanceState() to be called as we are managing the state of the Switch
+ // on our own
+ mSwitch.setSaveEnabled(false);
addOnSwitchChangeListener(new OnSwitchChangeListener() {
@Override
@@ -99,6 +100,11 @@
mSwitch.setChecked(checked);
}
+ public void setCheckedInternal(boolean checked) {
+ setTextViewLabel(checked);
+ mSwitch.setCheckedInternal(checked);
+ }
+
public boolean isChecked() {
return mSwitch.isChecked();
}
@@ -134,7 +140,7 @@
@Override
public void onClick(View v) {
final boolean isChecked = !mSwitch.isChecked();
- mSwitch.setChecked(isChecked);
+ setChecked(isChecked);
}
public void propagateChecked(boolean isChecked) {
@@ -222,9 +228,12 @@
SavedState ss = (SavedState) state;
super.onRestoreInstanceState(ss.getSuperState());
- mSwitch.setChecked(ss.checked);
+
+ mSwitch.setCheckedInternal(ss.checked);
setTextViewLabel(ss.checked);
setVisibility(ss.visible ? View.VISIBLE : View.GONE);
+ mSwitch.setOnCheckedChangeListener(ss.visible ? this : null);
+
requestLayout();
}
}
diff --git a/src/com/android/settings/wifi/AccessPoint.java b/src/com/android/settings/wifi/AccessPoint.java
index a504284..0fe5f81 100644
--- a/src/com/android/settings/wifi/AccessPoint.java
+++ b/src/com/android/settings/wifi/AccessPoint.java
@@ -29,12 +29,44 @@
import android.os.Bundle;
import android.preference.Preference;
import android.util.Log;
+import android.util.LruCache;
import android.view.View;
import android.widget.ImageView;
+import java.util.Map;
+
+
class AccessPoint extends Preference {
static final String TAG = "Settings.AccessPoint";
+ /**
+ * Lower bound on the 2.4 GHz (802.11b/g/n) WLAN channels
+ */
+ public static final int LOWER_FREQ_24GHZ = 2400;
+
+ /**
+ * Upper bound on the 2.4 GHz (802.11b/g/n) WLAN channels
+ */
+ public static final int HIGHER_FREQ_24GHZ = 2500;
+
+ /**
+ * Lower bound on the 5.0 GHz (802.11a/h/j/n/ac) WLAN channels
+ */
+ public static final int LOWER_FREQ_5GHZ = 4900;
+
+ /**
+ * Upper bound on the 5.0 GHz (802.11a/h/j/n/ac) WLAN channels
+ */
+ public static final int HIGHER_FREQ_5GHZ = 5900;
+
+ /** Experimental: we should be able to show the user the list of BSSIDs and bands
+ * for that SSID.
+ * For now this data is used only with Verbose Logging so as to show the band and number
+ * of BSSIDs on which that network is seen.
+ */
+ public LruCache<String, ScanResult> mScanResultCache;
+
+
private static final String KEY_DETAILEDSTATE = "key_detailedstate";
private static final String KEY_WIFIINFO = "key_wifiinfo";
private static final String KEY_SCANRESULT = "key_scanresult";
@@ -77,6 +109,10 @@
private WifiInfo mInfo;
private DetailedState mState;
+ private static final int VISIBILITY_MAX_AGE_IN_MILLI = 1000000;
+ private static final int VISIBILITY_OUTDATED_AGE_IN_MILLI = 20000;
+ private static final int SECOND_TO_MILLI = 1000;
+
static int getSecurity(WifiConfiguration config) {
if (config.allowedKeyManagement.get(KeyMgmt.WPA_PSK)) {
return SECURITY_PSK;
@@ -201,33 +237,37 @@
pskType = getPskType(result);
mRssi = result.level;
mScanResult = result;
+ if (result.seen > mSeen) {
+ mSeen = result.seen;
+ }
}
@Override
protected void onBindView(View view) {
super.onBindView(view);
- updateIcon(getLevel());
+ updateIcon(getLevel(), getContext());
notifyChanged();
}
- protected void updateIcon(int level) {
+ protected void updateIcon(int level, Context context) {
if (level == -1) {
setIcon(null);
} else {
Drawable drawable = getIcon();
if (drawable == null) {
- drawable = getContext().getTheme().obtainStyledAttributes(
+ drawable = context.getTheme().obtainStyledAttributes(
wifi_signal_attributes).getDrawable(0);
setIcon(drawable);
}
- drawable.setLevel(level);
- drawable.setState((security != SECURITY_NONE) ? STATE_SECURED : STATE_NONE);
+ if (drawable != null) {
+ drawable.setLevel(level);
+ drawable.setState((security != SECURITY_NONE) ? STATE_SECURED : STATE_NONE);
+ }
}
}
-
@Override
public int compareTo(Preference preference) {
if (!(preference instanceof AccessPoint)) {
@@ -278,6 +318,13 @@
if (result.seen > mSeen) {
mSeen = result.seen;
}
+ if (WifiSettings.mVerboseLogging > 0) {
+ if (mScanResultCache == null) {
+ mScanResultCache = new LruCache<String, ScanResult>(32);
+ }
+ mScanResultCache.put(result.BSSID, result);
+ }
+
if (ssid.equals(result.SSID) && security == getSecurity(result)) {
if (WifiManager.compareSignalLevel(result.level, mRssi) > 0) {
int oldLevel = getLevel();
@@ -350,39 +397,113 @@
}
/** visibility status of the WifiConfiguration
- * @return RSSI and update indicator
- * TODO: indicate both 2.4 and 5GHz RSSI as well as number of results
+ * @return autojoin debugging information
+ * TODO: use a string formatter
* ["rssi 5Ghz", "num results on 5GHz" / "rssi 5Ghz", "num results on 5GHz"]
* For instance [-40,5/-30,2]
*/
private String getVisibilityStatus() {
- String visibility ;
+ StringBuilder visibility = new StringBuilder();
+
long now = System.currentTimeMillis();
long age = (now - mSeen);
- if (age < 1000000) {
+ if (age < VISIBILITY_MAX_AGE_IN_MILLI) {
//show age in seconds, in the form xx
- visibility = Long.toString((age / 1000) % 1000);
+ visibility.append(Long.toString((age / SECOND_TO_MILLI) % SECOND_TO_MILLI))
+ .append("s");
} else {
//not seen for more than 1000 seconds
- visibility = "!";
+ visibility.append("!");
}
- if (mRssi != Integer.MAX_VALUE) {
- visibility = visibility + ", " + Integer.toString(mRssi);
+
+ if (mInfo != null) {
+ visibility.append(" sc=").append(Integer.toString(mInfo.score));
+ visibility.append(" ");
+ visibility.append(String.format("tx=%.1f,", mInfo.txSuccessRate));
+ visibility.append(String.format("%.1f,", mInfo.txRetriesRate));
+ visibility.append(String.format("%.1f ", mInfo.txBadRate));
+ visibility.append(String.format("rx=%.1f", mInfo.rxSuccessRate));
}
- return visibility;
+
+ if (mScanResultCache != null) {
+ int rssi5 = WifiConfiguration.INVALID_RSSI;
+ int rssi24 = WifiConfiguration.INVALID_RSSI;
+ int num5 = 0;
+ int num24 = 0;
+ Map<String, ScanResult> list = mScanResultCache.snapshot();
+ for (ScanResult result : list.values()) {
+ if (result.seen == 0)
+ continue;
+
+ if (result.frequency > LOWER_FREQ_5GHZ
+ && result.frequency < HIGHER_FREQ_5GHZ) {
+ //strictly speaking: [4915, 5825]
+ //number of known BSSID on 5GHz band
+ num5 = num5 + 1;
+ } else if (result.frequency > LOWER_FREQ_24GHZ
+ && result.frequency < HIGHER_FREQ_24GHZ) {
+ //strictly speaking: [2412, 2482]
+ //number of known BSSID on 2.4Ghz band
+ num24 = num24 + 1;
+ }
+
+ //ignore results seen, older than 20 seconds
+ if (now - result.seen > VISIBILITY_OUTDATED_AGE_IN_MILLI) continue;
+
+ if (result.frequency > LOWER_FREQ_5GHZ
+ &&result.frequency < HIGHER_FREQ_5GHZ) {
+ if (result.level > rssi5) {
+ rssi5 = result.level;
+ }
+ } else if (result.frequency > LOWER_FREQ_24GHZ
+ && result.frequency < HIGHER_FREQ_24GHZ) {
+ if (result.level > rssi24) {
+ rssi24 = result.level;
+ }
+ }
+ }
+ visibility.append(" [");
+ if (num24 > 0 || rssi24 > WifiConfiguration.INVALID_RSSI) {
+ visibility.append(Integer.toString(rssi24));
+ visibility.append(",");
+ visibility.append(Integer.toString(num24));
+ }
+ visibility.append(";");
+ if (num5 > 0 || rssi5 > WifiConfiguration.INVALID_RSSI) {
+ visibility.append(Integer.toString(rssi5));
+ visibility.append(",");
+ visibility.append(Integer.toString(num5));
+ }
+ visibility.append("]");
+ } else {
+ if (mRssi != Integer.MAX_VALUE) {
+ visibility.append(", ss=");
+ visibility.append(Integer.toString(mRssi));
+ if (mScanResult != null) {
+ visibility.append(", ");
+ visibility.append(Integer.toString(mScanResult.frequency));
+ }
+ }
+ }
+
+ return visibility.toString();
}
/** Updates the title and summary; may indirectly call notifyChanged() */
private void refresh() {
setTitle(ssid);
- updateIcon(getLevel());
+
+ final Context context = getContext();
+ updateIcon(getLevel(), context);
StringBuilder summary = new StringBuilder();
- Context context = getContext();
- if (mConfig != null && (mConfig.status == WifiConfiguration.Status.DISABLED
- || mConfig.autoJoinStatus != WifiConfiguration.AUTO_JOIN_ENABLED)) {
- if (mConfig.autoJoinStatus != WifiConfiguration.AUTO_JOIN_ENABLED) {
+ if (mState != null) { // This is the active connection
+ summary.append(Summary.get(context, mState));
+ } else if (mConfig != null && ((mConfig.status == WifiConfiguration.Status.DISABLED &&
+ mConfig.disableReason != WifiConfiguration.DISABLED_UNKNOWN_REASON)
+ || mConfig.autoJoinStatus >= WifiConfiguration.AUTO_JOIN_DISABLED_ON_AUTH_FAILURE)) {
+ if (mConfig.autoJoinStatus >= WifiConfiguration.AUTO_JOIN_DISABLED_ON_AUTH_FAILURE) {
summary.append(context.getString(R.string.wifi_disabled_password_failure));
} else {
switch (mConfig.disableReason) {
@@ -394,13 +515,13 @@
summary.append(context.getString(R.string.wifi_disabled_network_failure));
break;
case WifiConfiguration.DISABLED_UNKNOWN_REASON:
+ //this state is not useful anymore as auto-join may attempt joining
+ //those networks
summary.append(context.getString(R.string.wifi_disabled_generic));
}
}
} else if (mRssi == Integer.MAX_VALUE) { // Wifi out of range
summary.append(context.getString(R.string.wifi_not_in_range));
- } else if (mState != null) { // This is the active connection
- summary.append(Summary.get(context, mState));
} else { // In range, not disabled.
if (mConfig != null) { // Is saved network
summary.append(context.getString(R.string.wifi_remembered));
@@ -413,21 +534,31 @@
} else {
securityStrFormat = context.getString(R.string.wifi_secured_second_item);
}
- summary.append(String.format(securityStrFormat, getSecurityString(true)));
}
- if (mConfig == null && wpsAvailable) { // Only list WPS available for unsaved networks
- if (summary.length() == 0) {
- summary.append(context.getString(R.string.wifi_wps_available_first_item));
- } else {
- summary.append(context.getString(R.string.wifi_wps_available_second_item));
- }
- }
}
if (WifiSettings.mVerboseLogging > 0) {
//add RSSI/band information for this config, what was seen up to 6 seconds ago
//verbose WiFi Logging is only turned on thru developers settings
+ if (mInfo != null && mState != null) { // This is the active connection
+ summary.append(" (f=" + Integer.toString(mInfo.getFrequency()) + ")");
+ }
summary.append(" " + getVisibilityStatus());
+ if (mConfig != null && mConfig.autoJoinStatus > 0) {
+ summary.append(" (" + mConfig.autoJoinStatus);
+ if (mConfig.blackListTimestamp > 0) {
+ long now = System.currentTimeMillis();
+ long diff = (now - mConfig.blackListTimestamp)/1000;
+ long sec = diff%60; //seconds
+ long min = (diff/60)%60; //minutes
+ long hour = (min/60)%60; //hours
+ summary.append(", ");
+ if (hour > 0) summary.append(Long.toString(hour) + "h ");
+ summary.append( Long.toString(min) + "m ");
+ summary.append( Long.toString(sec) + "s ");
+ }
+ summary.append(")");
+ }
}
setSummary(summary.toString());
}
diff --git a/src/com/android/settings/wifi/AccessPointCategoryForSetupWizardXL.java b/src/com/android/settings/wifi/AccessPointCategoryForSetupWizardXL.java
deleted file mode 100644
index 7a1623b..0000000
--- a/src/com/android/settings/wifi/AccessPointCategoryForSetupWizardXL.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.android.settings.wifi;
-
-import com.android.settings.ProgressCategoryBase;
-import com.android.settings.R;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-public class AccessPointCategoryForSetupWizardXL extends ProgressCategoryBase {
- public AccessPointCategoryForSetupWizardXL(Context context, AttributeSet attrs) {
- super(context, attrs);
- setLayoutResource(R.layout.access_point_category_for_setup_wizard_xl);
- }
-
- @Override
- public void setProgress(boolean progressOn) {
- notifyChanged();
- }
-}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/AdvancedWifiSettings.java b/src/com/android/settings/wifi/AdvancedWifiSettings.java
index 4accb04..aa4c185 100644
--- a/src/com/android/settings/wifi/AdvancedWifiSettings.java
+++ b/src/com/android/settings/wifi/AdvancedWifiSettings.java
@@ -22,10 +22,12 @@
import android.content.IntentFilter;
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
+import android.net.wifi.WpsInfo;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.ListPreference;
import android.preference.Preference;
+import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceScreen;
import android.provider.Settings;
import android.provider.Settings.Global;
@@ -50,6 +52,8 @@
private static final String KEY_POOR_NETWORK_DETECTION = "wifi_poor_network_detection";
private static final String KEY_SCAN_ALWAYS_AVAILABLE = "wifi_scan_always_available";
private static final String KEY_INSTALL_CREDENTIALS = "install_credentials";
+ private static final String KEY_WIFI_DIRECT = "wifi_direct";
+ private static final String KEY_WPS_PUSH = "wps_push_button";
private static final String KEY_SUSPEND_OPTIMIZATIONS = "suspend_optimizations";
private WifiManager mWifiManager;
@@ -121,13 +125,28 @@
scanAlwaysAvailable.setChecked(Global.getInt(getContentResolver(),
Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1);
- Intent intent=new Intent(Credentials.INSTALL_AS_USER_ACTION);
+ Intent intent = new Intent(Credentials.INSTALL_AS_USER_ACTION);
intent.setClassName("com.android.certinstaller",
"com.android.certinstaller.CertInstallerMain");
intent.putExtra(Credentials.EXTRA_INSTALL_AS_UID, android.os.Process.WIFI_UID);
Preference pref = findPreference(KEY_INSTALL_CREDENTIALS);
pref.setIntent(intent);
+ Intent wifiDirectIntent = new Intent(getActivity(),
+ com.android.settings.Settings.WifiP2pSettingsActivity.class);
+ Preference wifiDirectPref = findPreference(KEY_WIFI_DIRECT);
+ wifiDirectPref.setIntent(wifiDirectIntent);
+
+ // WpsDialog: Create the dialog like WifiSettings does.
+ Preference wpsPushPref = findPreference(KEY_WPS_PUSH);
+ wpsPushPref.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+ public boolean onPreferenceClick(Preference arg0) {
+ WpsDialog wpsDialog = new WpsDialog(getActivity(), WpsInfo.PBC);
+ wpsDialog.show();
+ return true;
+ }
+ });
+
CheckBoxPreference suspendOptimizations =
(CheckBoxPreference) findPreference(KEY_SUSPEND_OPTIMIZATIONS);
suspendOptimizations.setChecked(Global.getInt(getContentResolver(),
diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java
index 6304997..96bb5d6 100644
--- a/src/com/android/settings/wifi/WifiConfigController.java
+++ b/src/com/android/settings/wifi/WifiConfigController.java
@@ -29,6 +29,7 @@
import android.net.NetworkUtils;
import android.net.ProxyInfo;
import android.net.RouteInfo;
+import android.net.Uri;
import android.net.wifi.WifiConfiguration;
import android.net.wifi.WifiConfiguration.AuthAlgorithm;
import android.net.wifi.WifiConfiguration.KeyMgmt;
@@ -68,36 +69,12 @@
*/
public class WifiConfigController implements TextWatcher,
AdapterView.OnItemSelectedListener, OnCheckedChangeListener {
+ private static final String TAG = "WifiConfigController";
+
private final WifiConfigUiBase mConfigUi;
private final View mView;
private final AccessPoint mAccessPoint;
- private boolean mEdit;
-
- private TextView mSsidView;
-
- // e.g. AccessPoint.SECURITY_NONE
- private int mAccessPointSecurity;
- private TextView mPasswordView;
-
- private String unspecifiedCert = "unspecified";
- private static final int unspecifiedCertIndex = 0;
-
- /* Phase2 methods supported by PEAP are limited */
- private final ArrayAdapter<String> PHASE2_PEAP_ADAPTER;
- /* Full list of phase2 methods */
- private final ArrayAdapter<String> PHASE2_FULL_ADAPTER;
-
- private Spinner mSecuritySpinner;
- private Spinner mEapMethodSpinner;
- private Spinner mEapCaCertSpinner;
- private Spinner mPhase2Spinner;
- // Associated with mPhase2Spinner, one of PHASE2_FULL_ADAPTER or PHASE2_PEAP_ADAPTER
- private ArrayAdapter<String> mPhase2Adapter;
- private Spinner mEapUserCertSpinner;
- private TextView mEapIdentityView;
- private TextView mEapAnonymousView;
-
/* This value comes from "wifi_ip_settings" resource array */
private static final int DHCP = 0;
private static final int STATIC_IP = 1;
@@ -105,6 +82,7 @@
/* These values come from "wifi_proxy_settings" resource array */
public static final int PROXY_NONE = 0;
public static final int PROXY_STATIC = 1;
+ public static final int PROXY_PAC = 2;
/* These values come from "wifi_eap_method" resource array */
public static final int WIFI_EAP_METHOD_PEAP = 0;
@@ -117,7 +95,32 @@
public static final int WIFI_PEAP_PHASE2_MSCHAPV2 = 1;
public static final int WIFI_PEAP_PHASE2_GTC = 2;
- private static final String TAG = "WifiConfigController";
+ /* Phase2 methods supported by PEAP are limited */
+ private final ArrayAdapter<String> PHASE2_PEAP_ADAPTER;
+ /* Full list of phase2 methods */
+ private final ArrayAdapter<String> PHASE2_FULL_ADAPTER;
+
+ // True when this instance is used in SetupWizard XL context.
+ private final boolean mInXlSetupWizard;
+
+ private final Handler mTextViewChangedHandler;
+
+ // e.g. AccessPoint.SECURITY_NONE
+ private int mAccessPointSecurity;
+ private TextView mPasswordView;
+
+ private String unspecifiedCert = "unspecified";
+ private static final int unspecifiedCertIndex = 0;
+
+ private Spinner mSecuritySpinner;
+ private Spinner mEapMethodSpinner;
+ private Spinner mEapCaCertSpinner;
+ private Spinner mPhase2Spinner;
+ // Associated with mPhase2Spinner, one of PHASE2_FULL_ADAPTER or PHASE2_PEAP_ADAPTER
+ private ArrayAdapter<String> mPhase2Adapter;
+ private Spinner mEapUserCertSpinner;
+ private TextView mEapIdentityView;
+ private TextView mEapAnonymousView;
private Spinner mIpSettingsSpinner;
private TextView mIpAddressView;
@@ -130,15 +133,17 @@
private TextView mProxyHostView;
private TextView mProxyPortView;
private TextView mProxyExclusionListView;
+ private TextView mProxyPacView;
private IpAssignment mIpAssignment = IpAssignment.UNASSIGNED;
private ProxySettings mProxySettings = ProxySettings.UNASSIGNED;
private LinkProperties mLinkProperties = new LinkProperties();
- // True when this instance is used in SetupWizard XL context.
- private final boolean mInXlSetupWizard;
+ private String[] mLevels;
+ private boolean mEdit;
+ private TextView mSsidView;
- private final Handler mTextViewChangedHandler;
+ private Context mContext;
public WifiConfigController(
WifiConfigUiBase parent, View view, AccessPoint accessPoint, boolean edit) {
@@ -152,20 +157,21 @@
mEdit = edit;
mTextViewChangedHandler = new Handler();
- final Context context = mConfigUi.getContext();
- final Resources resources = context.getResources();
+ mContext = mConfigUi.getContext();
+ final Resources res = mContext.getResources();
+ mLevels = res.getStringArray(R.array.wifi_signal);
PHASE2_PEAP_ADAPTER = new ArrayAdapter<String>(
- context, android.R.layout.simple_spinner_item,
- context.getResources().getStringArray(R.array.wifi_peap_phase2_entries));
+ mContext, android.R.layout.simple_spinner_item,
+ res.getStringArray(R.array.wifi_peap_phase2_entries));
PHASE2_PEAP_ADAPTER.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
PHASE2_FULL_ADAPTER = new ArrayAdapter<String>(
- context, android.R.layout.simple_spinner_item,
- context.getResources().getStringArray(R.array.wifi_phase2_entries));
+ mContext, android.R.layout.simple_spinner_item,
+ res.getStringArray(R.array.wifi_phase2_entries));
PHASE2_FULL_ADAPTER.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
- unspecifiedCert = context.getString(R.string.wifi_unspecified);
+ unspecifiedCert = mContext.getString(R.string.wifi_unspecified);
mIpSettingsSpinner = (Spinner) mView.findViewById(R.id.ip_settings);
mIpSettingsSpinner.setOnItemSelectedListener(this);
mProxySettingsSpinner = (Spinner) mView.findViewById(R.id.proxy_settings);
@@ -183,9 +189,9 @@
mView.findViewById(R.id.type_security).setVisibility(View.VISIBLE);
// We want custom layout. The content must be same as the other cases.
- ArrayAdapter<String> adapter = new ArrayAdapter<String>(context,
+ ArrayAdapter<String> adapter = new ArrayAdapter<String>(mContext,
R.layout.wifi_setup_custom_list_item_1, android.R.id.text1,
- context.getResources().getStringArray(R.array.wifi_security_no_eap));
+ res.getStringArray(R.array.wifi_security_no_eap));
mSecuritySpinner.setAdapter(adapter);
} else {
mView.findViewById(R.id.type).setVisibility(View.VISIBLE);
@@ -198,46 +204,12 @@
.setOnCheckedChangeListener(this);
- mConfigUi.setSubmitButton(context.getString(R.string.wifi_save));
+ mConfigUi.setSubmitButton(res.getString(R.string.wifi_save));
} else {
mConfigUi.setTitle(mAccessPoint.ssid);
ViewGroup group = (ViewGroup) mView.findViewById(R.id.info);
- DetailedState state = mAccessPoint.getState();
- if (state != null) {
- addRow(group, R.string.wifi_status, Summary.get(mConfigUi.getContext(), state));
- }
-
- int level = mAccessPoint.getLevel();
- if (level != -1) {
- String[] signal = resources.getStringArray(R.array.wifi_signal);
- addRow(group, R.string.wifi_signal, signal[level]);
- }
-
- WifiInfo info = mAccessPoint.getInfo();
- if (info != null && info.getLinkSpeed() != -1) {
- addRow(group, R.string.wifi_speed, info.getLinkSpeed() + WifiInfo.LINK_SPEED_UNITS);
- }
- if (info != null && info.getFrequency() != -1) {
- // Since the frequency is defined on MHz, we need to simplify it
- // to just 2.4GHz (regardless of the locale) or 5GHz.
- int frequency = info.getFrequency();
- String band = null;
- if (frequency >= 2400 && frequency < 2500) {
- band = "2.4GHz";
- } else if (frequency >= 5000 && frequency < 6000) {
- band = "5GHz";
- } else {
- Log.e(TAG, "Unexpected frequency " + frequency);
- }
- if (band != null) {
- addRow(group, R.string.wifi_frequency, band);
- }
- }
-
- addRow(group, R.string.wifi_security, mAccessPoint.getSecurityString(false));
-
boolean showAdvancedFields = false;
if (mAccessPoint.networkId != INVALID_NETWORK_ID) {
WifiConfiguration config = mAccessPoint.getConfig();
@@ -257,11 +229,7 @@
mProxySettingsSpinner.setSelection(PROXY_STATIC);
showAdvancedFields = true;
} else if (config.getProxySettings() == ProxySettings.PAC) {
- mProxySettingsSpinner.setVisibility(View.GONE);
- TextView textView = (TextView)mView.findViewById(R.id.proxy_pac_info);
- textView.setVisibility(View.VISIBLE);
- textView.setText(context.getString(R.string.proxy_url) +
- config.getLinkProperties().getHttpProxy().getPacFileUrl());
+ mProxySettingsSpinner.setSelection(PROXY_PAC);
showAdvancedFields = true;
} else {
mProxySettingsSpinner.setSelection(PROXY_NONE);
@@ -282,21 +250,62 @@
}
if (mEdit) {
- mConfigUi.setSubmitButton(context.getString(R.string.wifi_save));
+ mConfigUi.setSubmitButton(res.getString(R.string.wifi_save));
} else {
- if (state == null && level != -1) {
- mConfigUi.setSubmitButton(context.getString(R.string.wifi_connect));
+ final DetailedState state = mAccessPoint.getState();
+ final String signalLevel = getSignalString();
+
+ if (state == null && signalLevel != null) {
+ mConfigUi.setSubmitButton(res.getString(R.string.wifi_connect));
} else {
+ if (state != null) {
+ addRow(group, R.string.wifi_status, Summary.get(mConfigUi.getContext(),
+ state));
+ }
+
+ if (signalLevel != null) {
+ addRow(group, R.string.wifi_signal, signalLevel);
+ }
+
+ WifiInfo info = mAccessPoint.getInfo();
+ if (info != null && info.getLinkSpeed() != -1) {
+ addRow(group, R.string.wifi_speed, info.getLinkSpeed()
+ + WifiInfo.LINK_SPEED_UNITS);
+ }
+
+ if (info != null && info.getFrequency() != -1) {
+ final int frequency = info.getFrequency();
+ String band = null;
+
+ if (frequency >= AccessPoint.LOWER_FREQ_24GHZ
+ && frequency < AccessPoint.HIGHER_FREQ_24GHZ) {
+ band = res.getString(R.string.wifi_band_24ghz);
+ } else if (frequency >= AccessPoint.LOWER_FREQ_5GHZ
+ && frequency < AccessPoint.HIGHER_FREQ_5GHZ) {
+ band = res.getString(R.string.wifi_band_5ghz);
+ } else {
+ Log.e(TAG, "Unexpected frequency " + frequency);
+ }
+ if (band != null) {
+ addRow(group, R.string.wifi_frequency, band);
+ }
+ }
+
+ addRow(group, R.string.wifi_security, mAccessPoint.getSecurityString(false));
mView.findViewById(R.id.ip_fields).setVisibility(View.GONE);
}
if (mAccessPoint.networkId != INVALID_NETWORK_ID) {
- mConfigUi.setForgetButton(context.getString(R.string.wifi_forget));
+ mConfigUi.setForgetButton(res.getString(R.string.wifi_forget));
}
}
}
- mConfigUi.setCancelButton(context.getString(R.string.wifi_cancel));
+ if (mEdit || (mAccessPoint.getState() == null && mAccessPoint.getLevel() != -1)){
+ mConfigUi.setCancelButton(res.getString(R.string.wifi_cancel));
+ }else{
+ mConfigUi.setCancelButton(res.getString(R.string.wifi_display_options_done));
+ }
if (mConfigUi.getSubmitButton() != null) {
enableSubmitIfAppropriate();
}
@@ -309,6 +318,12 @@
group.addView(row);
}
+ private String getSignalString(){
+ final int level = mAccessPoint.getLevel();
+
+ return (level > -1 && level < mLevels.length) ? mLevels[level] : null;
+ }
+
/* show submit button if password, ip and proxy settings are valid */
void enableSubmitIfAppropriate() {
Button submit = mConfigUi.getSubmitButton();
@@ -466,11 +481,10 @@
}
}
- mProxySettings = (mProxySettingsSpinner != null &&
- mProxySettingsSpinner.getSelectedItemPosition() == PROXY_STATIC) ?
- ProxySettings.STATIC : ProxySettings.NONE;
-
- if (mProxySettings == ProxySettings.STATIC && mProxyHostView != null) {
+ final int selectedPosition = mProxySettingsSpinner.getSelectedItemPosition();
+ mProxySettings = ProxySettings.NONE;
+ if (selectedPosition == PROXY_STATIC && mProxyHostView != null) {
+ mProxySettings = ProxySettings.STATIC;
String host = mProxyHostView.getText().toString();
String portStr = mProxyPortView.getText().toString();
String exclusionList = mProxyExclusionListView.getText().toString();
@@ -488,6 +502,18 @@
} else {
return false;
}
+ } else if (selectedPosition == PROXY_PAC && mProxyPacView != null) {
+ mProxySettings = ProxySettings.PAC;
+ CharSequence uriSequence = mProxyPacView.getText();
+ if (TextUtils.isEmpty(uriSequence)) {
+ return false;
+ }
+ Uri uri = Uri.parse(uriSequence.toString());
+ if (uri == null) {
+ return false;
+ }
+ ProxyInfo proxyInfo = new ProxyInfo(uri);
+ mLinkProperties.setHttpProxy(proxyInfo);
}
return true;
}
@@ -811,8 +837,9 @@
}
if (mProxySettingsSpinner.getSelectedItemPosition() == PROXY_STATIC) {
- mView.findViewById(R.id.proxy_warning_limited_support).setVisibility(View.VISIBLE);
- mView.findViewById(R.id.proxy_fields).setVisibility(View.VISIBLE);
+ setVisibility(R.id.proxy_warning_limited_support, View.VISIBLE);
+ setVisibility(R.id.proxy_fields, View.VISIBLE);
+ setVisibility(R.id.proxy_pac_field, View.GONE);
if (mProxyHostView == null) {
mProxyHostView = (TextView) mView.findViewById(R.id.proxy_hostname);
mProxyHostView.addTextChangedListener(this);
@@ -829,13 +856,34 @@
mProxyExclusionListView.setText(proxyProperties.getExclusionListAsString());
}
}
+ } else if (mProxySettingsSpinner.getSelectedItemPosition() == PROXY_PAC) {
+ setVisibility(R.id.proxy_warning_limited_support, View.GONE);
+ setVisibility(R.id.proxy_fields, View.GONE);
+ setVisibility(R.id.proxy_pac_field, View.VISIBLE);
+
+ if (mProxyPacView == null) {
+ mProxyPacView = (TextView) mView.findViewById(R.id.proxy_pac);
+ mProxyPacView.addTextChangedListener(this);
+ }
+ if (config != null) {
+ ProxyInfo proxyInfo = config.getLinkProperties().getHttpProxy();
+ if (proxyInfo != null) {
+ mProxyPacView.setText(proxyInfo.getPacFileUrl().toString());
+ }
+ }
} else {
- mView.findViewById(R.id.proxy_warning_limited_support).setVisibility(View.GONE);
- mView.findViewById(R.id.proxy_fields).setVisibility(View.GONE);
+ setVisibility(R.id.proxy_warning_limited_support, View.GONE);
+ setVisibility(R.id.proxy_fields, View.GONE);
+ setVisibility(R.id.proxy_pac_field, View.GONE);
}
}
-
+ private void setVisibility(int id, int visibility) {
+ final View v = mView.findViewById(id);
+ if (v != null) {
+ v.setVisibility(visibility);
+ }
+ }
private void loadCertificates(Spinner spinner, String prefix) {
final Context context = mConfigUi.getContext();
diff --git a/src/com/android/settings/wifi/WifiEnabler.java b/src/com/android/settings/wifi/WifiEnabler.java
index a48598e..dc3974e 100644
--- a/src/com/android/settings/wifi/WifiEnabler.java
+++ b/src/com/android/settings/wifi/WifiEnabler.java
@@ -27,6 +27,7 @@
import android.os.Handler;
import android.os.Message;
import android.provider.Settings;
+import android.view.View;
import android.widget.CompoundButton;
import android.widget.Switch;
import android.widget.Toast;
@@ -88,12 +89,18 @@
mContext = context;
mSwitchBar = switchBar;
mSwitch = switchBar.getSwitch();
+ // This is a trick: as the Wi-Fi initial state is asynchronously coming from the
+ // BroadcastReceiver we cannot have the Switch visible at first otherwise you will notice
+ // its state change later on. So start it as VIEW.GONE and make it View.VISIBLE later
+ // when its state is defined.
+ mSwitch.setVisibility(View.GONE);
mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
mIntentFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
// The order matters! We really should not depend on this. :(
mIntentFilter.addAction(WifiManager.SUPPLICANT_STATE_CHANGED_ACTION);
mIntentFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+ setupSwitchBar();
}
public void setupSwitchBar() {
@@ -139,6 +146,7 @@
mSwitch.setEnabled(true);
updateSearchIndex(false);
}
+ mSwitch.setVisibility(View.VISIBLE);
}
private void updateSearchIndex(boolean isWiFiOn) {
diff --git a/src/com/android/settings/wifi/WifiPickerActivity.java b/src/com/android/settings/wifi/WifiPickerActivity.java
index 6dea82e..eec9963 100644
--- a/src/com/android/settings/wifi/WifiPickerActivity.java
+++ b/src/com/android/settings/wifi/WifiPickerActivity.java
@@ -20,6 +20,9 @@
import com.android.settings.wifi.p2p.WifiP2pSettings;
import android.content.Intent;
+import android.preference.PreferenceFragment;
+
+import java.lang.Class;
public class WifiPickerActivity extends SettingsActivity implements ButtonBarHandler {
@@ -27,7 +30,7 @@
public Intent getIntent() {
Intent modIntent = new Intent(super.getIntent());
if (!modIntent.hasExtra(EXTRA_SHOW_FRAGMENT)) {
- modIntent.putExtra(EXTRA_SHOW_FRAGMENT, WifiSettings.class.getName());
+ modIntent.putExtra(EXTRA_SHOW_FRAGMENT, getWifiSettingsClass().getName());
}
return modIntent;
}
@@ -39,4 +42,8 @@
|| AdvancedWifiSettings.class.getName().equals(fragmentName)) return true;
return false;
}
+
+ /* package */ Class<? extends PreferenceFragment> getWifiSettingsClass() {
+ return WifiSettings.class;
+ }
}
\ No newline at end of file
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index b374fb7..cc63f77 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -29,7 +29,6 @@
import com.android.settings.wifi.p2p.WifiP2pSettings;
import android.app.Activity;
-import android.app.AlertDialog;
import android.app.Dialog;
import android.content.BroadcastReceiver;
import android.content.Context;
@@ -54,23 +53,14 @@
import android.os.Message;
import android.preference.Preference;
import android.preference.PreferenceScreen;
-import android.util.AttributeSet;
import android.util.Log;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
-import android.view.LayoutInflater;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.ViewGroup;
import android.widget.AdapterView.AdapterContextMenuInfo;
-import android.widget.Button;
-import android.widget.ImageButton;
-import android.widget.PopupMenu;
-import android.widget.PopupMenu.OnMenuItemClickListener;
-import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
@@ -93,10 +83,10 @@
implements DialogInterface.OnClickListener, Indexable {
private static final String TAG = "WifiSettings";
- private static final int MENU_ID_WPS_PBC = Menu.FIRST;
+ /* package */ static final int MENU_ID_WPS_PBC = Menu.FIRST;
private static final int MENU_ID_WPS_PIN = Menu.FIRST + 1;
private static final int MENU_ID_P2P = Menu.FIRST + 2;
- private static final int MENU_ID_ADD_NETWORK = Menu.FIRST + 3;
+ /* package */ static final int MENU_ID_ADD_NETWORK = Menu.FIRST + 3;
private static final int MENU_ID_ADVANCED = Menu.FIRST + 4;
private static final int MENU_ID_SCAN = Menu.FIRST + 5;
private static final int MENU_ID_CONNECT = Menu.FIRST + 6;
@@ -105,10 +95,8 @@
private static final int MENU_ID_WRITE_NFC = Menu.FIRST + 9;
private static final int WIFI_DIALOG_ID = 1;
- private static final int WPS_PBC_DIALOG_ID = 2;
+ /* package */ static final int WPS_PBC_DIALOG_ID = 2;
private static final int WPS_PIN_DIALOG_ID = 3;
- private static final int WIFI_SKIPPED_DIALOG_ID = 4;
- private static final int WIFI_AND_MOBILE_SKIPPED_DIALOG_ID = 5;
private static final int WRITE_NFC_DIALOG_ID = 6;
// Combo scans can take 5-6s to complete - set to 10s.
@@ -118,14 +106,11 @@
private static final String SAVE_DIALOG_EDIT_MODE = "edit_mode";
private static final String SAVE_DIALOG_ACCESS_POINT_STATE = "wifi_ap_state";
- // Activity result when pressing the Skip button
- private static final int RESULT_SKIP = Activity.RESULT_FIRST_USER;
-
private final IntentFilter mFilter;
private final BroadcastReceiver mReceiver;
private final Scanner mScanner;
- private WifiManager mWifiManager;
+ /* package */ WifiManager mWifiManager;
private WifiManager.ActionListener mConnectListener;
private WifiManager.ActionListener mSaveListener;
private WifiManager.ActionListener mForgetListener;
@@ -145,38 +130,21 @@
private TextView mEmptyView;
- /* Used in Wifi Setup context */
-
- // this boolean extra specifies whether to disable the Next button when not connected
+ // this boolean extra specifies whether to disable the Next button when not connected. Used by
+ // account creation outside of setup wizard.
private static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
- // this boolean extra specifies whether to auto finish when connection is established
- private static final String EXTRA_AUTO_FINISH_ON_CONNECT = "wifi_auto_finish_on_connect";
-
- // this boolean extra shows a custom button that we can control
- protected static final String EXTRA_SHOW_CUSTOM_BUTTON = "wifi_show_custom_button";
-
- // show a text regarding data charges when wifi connection is required during setup wizard
- protected static final String EXTRA_SHOW_WIFI_REQUIRED_INFO = "wifi_show_wifi_required_info";
-
- // this boolean extra is set if we are being invoked by the Setup Wizard
- private static final String EXTRA_IS_FIRST_RUN = "firstRun";
-
// should Next button only be enabled when we have a connection?
private boolean mEnableNextOnConnection;
- // should activity finish once we have a connection?
- private boolean mAutoFinishOnConnection;
-
// Save the dialog details
private boolean mDlgEdit;
private AccessPoint mDlgAccessPoint;
private Bundle mAccessPointSavedState;
- // the action bar uses a different set of controls for Setup Wizard
- private boolean mSetupWizardMode;
-
- private SwitchBar mSwitchBar;
+ /** verbose logging flag. this flag is set thru developer debugging options
+ * and used so as to assist with in-the-field WiFi connectivity debugging */
+ public static int mVerboseLogging = 0;
/* End of "used in Wifi Setup context" */
@@ -203,93 +171,6 @@
}
@Override
- public void onCreate(Bundle icicle) {
- // Set this flag early, as it's needed by getHelpResource(), which is called by super
- mSetupWizardMode = getActivity().getIntent().getBooleanExtra(EXTRA_IS_FIRST_RUN, false);
- super.onCreate(icicle);
- }
-
- @Override
- public View onCreateView(final LayoutInflater inflater, ViewGroup container,
- Bundle savedInstanceState) {
-
- if (mSetupWizardMode) {
- View view = inflater.inflate(R.layout.setup_preference, container, false);
- View other = view.findViewById(R.id.other_network);
- other.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- if (mWifiManager.isWifiEnabled()) {
- onAddNetworkPressed();
- }
- }
- });
- final ImageButton b = (ImageButton) view.findViewById(R.id.more);
- if (b != null) {
- b.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- if (mWifiManager.isWifiEnabled()) {
- PopupMenu pm = new PopupMenu(inflater.getContext(), b);
- pm.inflate(R.menu.wifi_setup);
- pm.setOnMenuItemClickListener(new OnMenuItemClickListener() {
- @Override
- public boolean onMenuItemClick(MenuItem item) {
- if (R.id.wifi_wps == item.getItemId()) {
- showDialog(WPS_PBC_DIALOG_ID);
- return true;
- }
- return false;
- }
- });
- pm.show();
- }
- }
- });
- }
-
- Intent intent = getActivity().getIntent();
- if (intent.getBooleanExtra(EXTRA_SHOW_CUSTOM_BUTTON, false)) {
- view.findViewById(R.id.button_bar).setVisibility(View.VISIBLE);
- view.findViewById(R.id.back_button).setVisibility(View.INVISIBLE);
- view.findViewById(R.id.skip_button).setVisibility(View.INVISIBLE);
- view.findViewById(R.id.next_button).setVisibility(View.INVISIBLE);
-
- Button customButton = (Button) view.findViewById(R.id.custom_button);
- customButton.setVisibility(View.VISIBLE);
- customButton.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View v) {
- boolean isConnected = false;
- Activity activity = getActivity();
- final ConnectivityManager connectivity = (ConnectivityManager)
- activity.getSystemService(Context.CONNECTIVITY_SERVICE);
- if (connectivity != null) {
- final NetworkInfo info = connectivity.getActiveNetworkInfo();
- isConnected = (info != null) && info.isConnected();
- }
- if (isConnected) {
- // Warn of possible data charges
- showDialog(WIFI_SKIPPED_DIALOG_ID);
- } else {
- // Warn of lack of updates
- showDialog(WIFI_AND_MOBILE_SKIPPED_DIALOG_ID);
- }
- }
- });
- }
-
- if (intent.getBooleanExtra(EXTRA_SHOW_WIFI_REQUIRED_INFO, false)) {
- view.findViewById(R.id.wifi_required_info).setVisibility(View.VISIBLE);
- }
-
- return view;
- } else {
- return super.onCreateView(inflater, container, savedInstanceState);
- }
- }
-
- @Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
@@ -347,36 +228,15 @@
mAccessPointSavedState = savedInstanceState.getBundle(SAVE_DIALOG_ACCESS_POINT_STATE);
}
- final Activity activity = getActivity();
- final Intent intent = activity.getIntent();
-
- // first if we're supposed to finish once we have a connection
- mAutoFinishOnConnection = intent.getBooleanExtra(EXTRA_AUTO_FINISH_ON_CONNECT, false);
-
- if (mAutoFinishOnConnection) {
- // Hide the next button
- if (hasNextButton()) {
- getNextButton().setVisibility(View.GONE);
- }
-
- final ConnectivityManager connectivity = (ConnectivityManager)
- activity.getSystemService(Context.CONNECTIVITY_SERVICE);
- if (connectivity != null
- && connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) {
- activity.setResult(Activity.RESULT_OK);
- activity.finish();
- return;
- }
- }
-
// if we're supposed to enable/disable the Next button based on our current connection
// state, start it off in the right state
+ Intent intent = getActivity().getIntent();
mEnableNextOnConnection = intent.getBooleanExtra(EXTRA_ENABLE_NEXT_ON_CONNECT, false);
if (mEnableNextOnConnection) {
if (hasNextButton()) {
final ConnectivityManager connectivity = (ConnectivityManager)
- activity.getSystemService(Context.CONNECTIVITY_SERVICE);
+ getActivity().getSystemService(Context.CONNECTIVITY_SERVICE);
if (connectivity != null) {
NetworkInfo info = connectivity.getNetworkInfo(
ConnectivityManager.TYPE_WIFI);
@@ -387,20 +247,9 @@
addPreferencesFromResource(R.xml.wifi_settings);
- if (mSetupWizardMode) {
- getView().setSystemUiVisibility(
- View.STATUS_BAR_DISABLE_HOME |
- View.STATUS_BAR_DISABLE_RECENT |
- View.STATUS_BAR_DISABLE_NOTIFICATION_ALERTS |
- View.STATUS_BAR_DISABLE_CLOCK);
- }
-
mEmptyView = (TextView) getView().findViewById(android.R.id.empty);
getListView().setEmptyView(mEmptyView);
-
- if (!mSetupWizardMode) {
- registerForContextMenu(getListView());
- }
+ registerForContextMenu(getListView());
setHasOptionsMenu(true);
}
@@ -417,14 +266,16 @@
public void onStart() {
super.onStart();
- // On/off switch is hidden for Setup Wizard
- if (!mSetupWizardMode) {
- final SettingsActivity activity = (SettingsActivity) getActivity();
+ // On/off switch is hidden for Setup Wizard (returns null)
+ mWifiEnabler = createWifiEnabler();
+ }
- mSwitchBar = activity.getSwitchBar();
- mWifiEnabler = new WifiEnabler(activity, mSwitchBar);
- mWifiEnabler.setupSwitchBar();
- }
+ /**
+ * @return new WifiEnabler or null (as overridden by WifiSettingsForSetupWizard)
+ */
+ /* package */ WifiEnabler createWifiEnabler() {
+ final SettingsActivity activity = (SettingsActivity) getActivity();
+ return new WifiEnabler(activity, activity.getSwitchBar());
}
@Override
@@ -455,44 +306,32 @@
// If the user is not allowed to configure wifi, do not show the menu.
if (isRestrictedAndNotPinProtected()) return;
+ addOptionsMenuItems(menu);
+ super.onCreateOptionsMenu(menu, inflater);
+ }
+
+ /**
+ * @param menu
+ */
+ void addOptionsMenuItems(Menu menu) {
final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
TypedArray ta = getActivity().getTheme().obtainStyledAttributes(
new int[] {R.attr.ic_menu_add, R.attr.ic_wps});
- if (mSetupWizardMode) {
- menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
- .setIcon(ta.getDrawable(1))
- .setEnabled(wifiIsEnabled)
- .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
- menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
- .setEnabled(wifiIsEnabled)
- .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
- } else {
- menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
- .setIcon(ta.getDrawable(1))
- .setEnabled(wifiIsEnabled)
- .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
- .setIcon(ta.getDrawable(0))
- .setEnabled(wifiIsEnabled)
- .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.wifi_menu_scan)
- //.setIcon(R.drawable.ic_menu_scan_network)
- .setEnabled(wifiIsEnabled)
- .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- menu.add(Menu.NONE, MENU_ID_WPS_PIN, 0, R.string.wifi_menu_wps_pin)
- .setEnabled(wifiIsEnabled)
- .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- if (mP2pSupported) {
- menu.add(Menu.NONE, MENU_ID_P2P, 0, R.string.wifi_menu_p2p)
- .setEnabled(wifiIsEnabled)
- .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- }
- menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)
- //.setIcon(android.R.drawable.ic_menu_manage)
- .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
- }
+ menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
+ .setIcon(ta.getDrawable(0))
+ .setEnabled(wifiIsEnabled)
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+ menu.add(Menu.NONE, MENU_ID_SCAN, 0, R.string.wifi_menu_scan)
+ //.setIcon(R.drawable.ic_menu_scan_network)
+ .setEnabled(wifiIsEnabled)
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+ menu.add(Menu.NONE, MENU_ID_WPS_PIN, 0, R.string.wifi_menu_wps_pin)
+ .setEnabled(wifiIsEnabled)
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+ menu.add(Menu.NONE, MENU_ID_ADVANCED, 0, R.string.wifi_menu_advanced)
+ //.setIcon(android.R.drawable.ic_menu_manage)
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
ta.recycle();
- super.onCreateOptionsMenu(menu, inflater);
}
@Override
@@ -673,44 +512,6 @@
return new WpsDialog(getActivity(), WpsInfo.PBC);
case WPS_PIN_DIALOG_ID:
return new WpsDialog(getActivity(), WpsInfo.DISPLAY);
- case WIFI_SKIPPED_DIALOG_ID:
- return new AlertDialog.Builder(getActivity())
- .setMessage(R.string.wifi_skipped_message)
- .setCancelable(false)
- .setNegativeButton(R.string.wifi_skip_anyway,
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- getActivity().setResult(RESULT_SKIP);
- getActivity().finish();
- }
- })
- .setPositiveButton(R.string.wifi_dont_skip,
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- }
- })
- .create();
- case WIFI_AND_MOBILE_SKIPPED_DIALOG_ID:
- return new AlertDialog.Builder(getActivity())
- .setMessage(R.string.wifi_and_mobile_skipped_message)
- .setCancelable(false)
- .setNegativeButton(R.string.wifi_skip_anyway,
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- getActivity().setResult(RESULT_SKIP);
- getActivity().finish();
- }
- })
- .setPositiveButton(R.string.wifi_dont_skip,
- new DialogInterface.OnClickListener() {
- @Override
- public void onClick(DialogInterface dialog, int id) {
- }
- })
- .create();
case WRITE_NFC_DIALOG_ID:
if (mSelectedAccessPoint != null) {
mWifiToNfcDialog = new WriteWifiConfigToNfcDialog(
@@ -722,10 +523,8 @@
return super.onCreateDialog(dialogId);
}
- /** verbose logging flag is set only thru developer debugging options */
- public static int mVerboseLogging = 0;
/**
- * Shows the latest access points available with supplimental information like
+ * Shows the latest access points available with supplemental information like
* the strength of network and the security for it.
*/
private void updateAccessPoints() {
@@ -738,7 +537,7 @@
}
final int wifiState = mWifiManager.getWifiState();
- //check if verbose logging has been turned on or off
+ //when we update the screen, check if verbose logging has been turned on or off
mVerboseLogging = mWifiManager.getVerboseLoggingLevel();
switch (wifiState) {
@@ -771,6 +570,8 @@
private void setOffMessage() {
if (mEmptyView != null) {
+ mEmptyView.setCompoundDrawablesWithIntrinsicBounds(0,
+ R.drawable.ic_wifi_emptystate, 0, 0);
mEmptyView.setText(R.string.wifi_empty_list_wifi_off);
if (android.provider.Settings.Global.getInt(getActivity().getContentResolver(),
android.provider.Settings.Global.WIFI_SCAN_ALWAYS_AVAILABLE, 0) == 1) {
@@ -893,14 +694,6 @@
changeNextButtonState(info.isConnected());
updateAccessPoints();
updateConnectionState(info.getDetailedState());
- if (mAutoFinishOnConnection && info.isConnected()) {
- Activity activity = getActivity();
- if (activity != null) {
- activity.setResult(Activity.RESULT_OK);
- activity.finish();
- }
- return;
- }
} else if (WifiManager.RSSI_CHANGED_ACTION.equals(action)) {
updateConnectionState(null);
}
@@ -998,11 +791,11 @@
* Renames/replaces "Next" button when appropriate. "Next" button usually exists in
* Wifi setup screens, not in usual wifi settings screen.
*
- * @param connected true when the device is connected to a wifi network.
+ * @param enabled true when the device is connected to a wifi network.
*/
- private void changeNextButtonState(boolean connected) {
+ private void changeNextButtonState(boolean enabled) {
if (mEnableNextOnConnection && hasNextButton()) {
- getNextButton().setEnabled(connected);
+ getNextButton().setEnabled(enabled);
}
}
@@ -1047,7 +840,7 @@
/* package */ void forget() {
if (mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
- // Should not happen, but a monkey seems to triger it
+ // Should not happen, but a monkey seems to trigger it
Log.e(TAG, "Failed to forget invalid network " + mSelectedAccessPoint.getConfig());
return;
}
@@ -1112,51 +905,9 @@
@Override
protected int getHelpResource() {
- if (mSetupWizardMode) {
- return 0;
- }
return R.string.help_url_wifi;
}
- /**
- * Used as the outer frame of all setup wizard pages that need to adjust their margins based
- * on the total size of the available display. (e.g. side margins set to 10% of total width.)
- */
- public static class ProportionalOuterFrame extends RelativeLayout {
- public ProportionalOuterFrame(Context context) {
- super(context);
- }
- public ProportionalOuterFrame(Context context, AttributeSet attrs) {
- super(context, attrs);
- }
- public ProportionalOuterFrame(Context context, AttributeSet attrs, int defStyle) {
- super(context, attrs, defStyle);
- }
-
- /**
- * Set our margins and title area height proportionally to the available display size
- */
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
- int parentWidth = MeasureSpec.getSize(widthMeasureSpec);
- int parentHeight = MeasureSpec.getSize(heightMeasureSpec);
- final Resources res = getContext().getResources();
- float titleHeight = res.getFraction(R.dimen.setup_title_height, 1, 1);
- float sideMargin = res.getFraction(R.dimen.setup_border_width, 1, 1);
- int bottom = res.getDimensionPixelSize(R.dimen.setup_margin_bottom);
- setPaddingRelative(
- (int) (parentWidth * sideMargin),
- 0,
- (int) (parentWidth * sideMargin),
- bottom);
- View title = findViewById(R.id.title_area);
- if (title != null) {
- title.setMinimumHeight((int) (parentHeight * titleHeight));
- }
- super.onMeasure(widthMeasureSpec, heightMeasureSpec);
- }
- }
-
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider() {
@Override
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
new file mode 100644
index 0000000..b64e781
--- /dev/null
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizard.java
@@ -0,0 +1,210 @@
+/*
+ * Copyright (C) 2014 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.wifi;
+
+import android.app.Activity;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.res.TypedArray;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
+import android.widget.PopupMenu;
+import android.widget.PopupMenu.OnMenuItemClickListener;
+
+import com.android.settings.R;
+
+/**
+ * This customized version of WifiSettings is shown to the user only during Setup Wizard. Menu
+ * selections are limited, clicking on an access point will auto-advance to the next screen (once
+ * connected), and, if the user opts to skip ahead without a wifi connection, a warning message
+ * alerts of possible carrier data charges or missing software updates.
+ */
+public class WifiSettingsForSetupWizard extends WifiSettings {
+
+ private static final String TAG = "WifiSettingsForSetupWizard";
+
+ /* Used in Wifi Setup context */
+
+ // this boolean extra specifies whether to auto finish when connection is established
+ private static final String EXTRA_AUTO_FINISH_ON_CONNECT = "wifi_auto_finish_on_connect";
+
+ // show a text regarding data charges when wifi connection is required during setup wizard
+ protected static final String EXTRA_SHOW_WIFI_REQUIRED_INFO = "wifi_show_wifi_required_info";
+
+ // should activity finish once we have a connection?
+ private boolean mAutoFinishOnConnection;
+
+ private final IntentFilter mFilter;
+ private final BroadcastReceiver mReceiver;
+
+ public WifiSettingsForSetupWizard() {
+ super();
+
+ mFilter = new IntentFilter();
+ mFilter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
+
+ mReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ NetworkInfo info = (NetworkInfo) intent.getParcelableExtra(
+ WifiManager.EXTRA_NETWORK_INFO);
+ if (mAutoFinishOnConnection && info.isConnected()) {
+ Log.d(TAG, "mReceiver.onReceive context=" + context + " intent=" + intent);
+ WifiSetupActivity activity = (WifiSetupActivity) getActivity();
+ activity.finishOrNext(Activity.RESULT_OK);
+ }
+ }
+ };
+ }
+
+ @Override
+ public View onCreateView(final LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+
+ final View view = inflater.inflate(R.layout.setup_preference, container, false);
+ final View other = view.findViewById(R.id.other_network);
+ other.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (mWifiManager.isWifiEnabled()) {
+ onAddNetworkPressed();
+ }
+ }
+ });
+ final ImageButton b = (ImageButton) view.findViewById(R.id.more);
+ if (b != null) {
+ b.setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (mWifiManager.isWifiEnabled()) {
+ PopupMenu pm = new PopupMenu(inflater.getContext(), b);
+ pm.inflate(R.menu.wifi_setup);
+ pm.setOnMenuItemClickListener(new OnMenuItemClickListener() {
+ @Override
+ public boolean onMenuItemClick(MenuItem item) {
+ if (R.id.wifi_wps == item.getItemId()) {
+ showDialog(WPS_PBC_DIALOG_ID);
+ return true;
+ }
+ return false;
+ }
+ });
+ pm.show();
+ }
+ }
+ });
+ }
+
+ final Intent intent = getActivity().getIntent();
+ if (intent.getBooleanExtra(EXTRA_SHOW_WIFI_REQUIRED_INFO, false)) {
+ view.findViewById(R.id.wifi_required_info).setVisibility(View.VISIBLE);
+ }
+
+ return view;
+ }
+
+ @Override
+ public void onActivityCreated(Bundle savedInstanceState) {
+ super.onActivityCreated(savedInstanceState);
+
+ getView().setSystemUiVisibility(
+ View.STATUS_BAR_DISABLE_HOME |
+ View.STATUS_BAR_DISABLE_RECENT |
+ View.STATUS_BAR_DISABLE_NOTIFICATION_ALERTS |
+ View.STATUS_BAR_DISABLE_CLOCK);
+
+ final WifiSetupActivity activity = (WifiSetupActivity) getActivity();
+ final Intent intent = activity.getIntent();
+
+ // first if we're supposed to finish once we have a connection
+ mAutoFinishOnConnection = intent.getBooleanExtra(EXTRA_AUTO_FINISH_ON_CONNECT, false);
+
+ if (mAutoFinishOnConnection) {
+ // Hide the next button
+ if (hasNextButton()) {
+ getNextButton().setVisibility(View.GONE);
+ }
+
+ /*
+ * When entering with a savedInstanceState, we may be returning from a later activity in
+ * the setup flow. It's not clear yet if there are other possible circumstances. It's
+ * not appropriate to refire our activity results, so we skip that here.
+ */
+ if (savedInstanceState == null) {
+ final ConnectivityManager connectivity = (ConnectivityManager)
+ activity.getSystemService(Context.CONNECTIVITY_SERVICE);
+ if (connectivity != null &&
+ connectivity.getNetworkInfo(ConnectivityManager.TYPE_WIFI).isConnected()) {
+ Log.d(TAG, "onActivityCreated Auto-finishing");
+ activity.finishOrNext(Activity.RESULT_OK);
+ return;
+ }
+ }
+ }
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+ getActivity().registerReceiver(mReceiver, mFilter);
+ }
+
+ @Override
+ public void onPause() {
+ super.onPause();
+ getActivity().unregisterReceiver(mReceiver);
+ }
+
+ @Override
+ public void registerForContextMenu(View view) {
+ // Suppressed during setup wizard
+ }
+
+ @Override
+ /* package */ WifiEnabler createWifiEnabler() {
+ // Not shown during setup wizard
+ return null;
+ }
+
+ @Override
+ /* package */ void addOptionsMenuItems(Menu menu) {
+ final boolean wifiIsEnabled = mWifiManager.isWifiEnabled();
+ final TypedArray ta = getActivity().getTheme()
+ .obtainStyledAttributes(new int[] {R.attr.ic_wps});
+ menu.add(Menu.NONE, MENU_ID_WPS_PBC, 0, R.string.wifi_menu_wps_pbc)
+ .setIcon(ta.getDrawable(0))
+ .setEnabled(wifiIsEnabled)
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ menu.add(Menu.NONE, MENU_ID_ADD_NETWORK, 0, R.string.wifi_add_network)
+ .setEnabled(wifiIsEnabled)
+ .setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ ta.recycle();
+ }
+
+}
diff --git a/src/com/android/settings/wifi/WifiSetupActivity.java b/src/com/android/settings/wifi/WifiSetupActivity.java
index 70ee56d..d92e81f 100644
--- a/src/com/android/settings/wifi/WifiSetupActivity.java
+++ b/src/com/android/settings/wifi/WifiSetupActivity.java
@@ -15,30 +15,206 @@
*/
package com.android.settings.wifi;
-import com.android.settings.ButtonBarHandler;
-
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
import android.content.res.Resources;
+import android.graphics.Color;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.wifi.WifiConfiguration;
+import android.net.wifi.WifiInfo;
+import android.net.wifi.WifiManager;
+import android.os.Bundle;
+import android.preference.PreferenceFragment;
+import android.util.Log;
-public class WifiSetupActivity extends WifiPickerActivity implements ButtonBarHandler {
+import com.android.settings.ButtonBarHandler;
+import com.android.settings.R;
+import com.android.setupwizard.navigationbar.SetupWizardNavBar;
+import com.android.setupwizard.navigationbar.SetupWizardNavBar.NavigationBarListener;
+
+public class WifiSetupActivity extends WifiPickerActivity
+ implements ButtonBarHandler, NavigationBarListener {
+ private static final String TAG = "WifiSetupActivity";
+
+ private static final String EXTRA_ALLOW_SKIP = "allowSkip";
+ private static final String EXTRA_USE_IMMERSIVE_MODE = "useImmersiveMode";
+
// Extra containing the resource name of the theme to be used
private static final String EXTRA_THEME = "theme";
private static final String THEME_HOLO = "holo";
private static final String THEME_HOLO_LIGHT = "holo_light";
+ private static final String THEME_MATERIAL = "material";
+ private static final String THEME_MATERIAL_LIGHT = "material_light";
- // Style resources containing theme settings
- private static final String RESOURCE_THEME_DARK = "SetupWizardWifiTheme";
- private static final String RESOURCE_THEME_LIGHT = "SetupWizardWifiTheme.Light";
+ // Activity result when pressing the Skip button
+ private static final int RESULT_SKIP = Activity.RESULT_FIRST_USER;
+
+ // From WizardManager (must match constants maintained there)
+ private static final String ACTION_NEXT = "com.android.wizard.NEXT";
+ private static final String EXTRA_SCRIPT_URI = "scriptUri";
+ private static final String EXTRA_ACTION_ID = "actionId";
+ private static final String EXTRA_RESULT_CODE = "com.android.setupwizard.ResultCode";
+ private static final int NEXT_REQUEST = 10000;
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
String themeName = getIntent().getStringExtra(EXTRA_THEME);
- if (THEME_HOLO_LIGHT.equalsIgnoreCase(themeName)) {
- resid = getResources().getIdentifier(RESOURCE_THEME_LIGHT, "style",
- getPackageName());
- } else if (THEME_HOLO.equalsIgnoreCase(themeName)) {
- resid = getResources().getIdentifier(RESOURCE_THEME_DARK, "style",
- getPackageName());
+ if (THEME_HOLO_LIGHT.equalsIgnoreCase(themeName) ||
+ THEME_MATERIAL_LIGHT.equalsIgnoreCase(themeName)) {
+ resid = R.style.SetupWizardWifiTheme_Light;
+ } else if (THEME_HOLO.equalsIgnoreCase(themeName) ||
+ THEME_MATERIAL.equalsIgnoreCase(themeName)) {
+ resid = R.style.SetupWizardWifiTheme;
}
super.onApplyThemeResource(theme, resid, first);
}
+
+ @Override
+ protected boolean isValidFragment(String fragmentName) {
+ return WifiSettingsForSetupWizard.class.getName().equals(fragmentName);
+ }
+
+ @Override
+ /* package */ Class<? extends PreferenceFragment> getWifiSettingsClass() {
+ return WifiSettingsForSetupWizard.class;
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (resultCode == Activity.RESULT_CANCELED) {
+ // Before returning to the settings panel, forget any current access point so it will
+ // not attempt to automatically reconnect and advance
+ // FIXME: when coming back, it would be better to keep the current connection and
+ // override the auto-advance feature
+ final WifiManager wifiManager = (WifiManager)(getSystemService(Context.WIFI_SERVICE));
+ if (wifiManager != null) {
+ final WifiInfo info = wifiManager.getConnectionInfo();
+ if (info != null) {
+ int netId = info.getNetworkId();
+ if (netId != WifiConfiguration.INVALID_NETWORK_ID) {
+ wifiManager.forget(netId, null);
+ }
+ }
+ }
+ }
+ super.onActivityResult(requestCode, resultCode, data);
+ }
+
+ /**
+ * Complete this activity and return the results to the caller. If using WizardManager, this
+ * will invoke the next scripted action; otherwise, we simply finish.
+ */
+ public void finishOrNext(int resultCode) {
+ Log.d(TAG, "finishOrNext resultCode=" + resultCode
+ + " isUsingWizardManager=" + isUsingWizardManager());
+ if (isUsingWizardManager()) {
+ sendResultsToSetupWizard(resultCode);
+ } else {
+ setResult(resultCode);
+ finish();
+ }
+ }
+
+ private boolean isUsingWizardManager() {
+ return getIntent().hasExtra(EXTRA_SCRIPT_URI);
+ }
+
+ /**
+ * Send the results of this activity to WizardManager, which will then send out the next
+ * scripted activity. WizardManager does not actually return an activity result, but if we
+ * invoke WizardManager without requesting a result, the framework will choose not to issue a
+ * call to onActivityResult with RESULT_CANCELED when navigating backward.
+ */
+ private void sendResultsToSetupWizard(int resultCode) {
+ final Intent intent = getIntent();
+ final Intent nextIntent = new Intent(ACTION_NEXT);
+ nextIntent.putExtra(EXTRA_SCRIPT_URI, intent.getStringExtra(EXTRA_SCRIPT_URI));
+ nextIntent.putExtra(EXTRA_ACTION_ID, intent.getStringExtra(EXTRA_ACTION_ID));
+ nextIntent.putExtra(EXTRA_RESULT_CODE, resultCode);
+ startActivityForResult(nextIntent, NEXT_REQUEST);
+ }
+
+ @Override
+ public void onNavigationBarCreated(final SetupWizardNavBar bar) {
+ final boolean useImmersiveMode =
+ getIntent().getBooleanExtra(EXTRA_USE_IMMERSIVE_MODE, false);
+ bar.setUseImmersiveMode(useImmersiveMode);
+ if (useImmersiveMode) {
+ getWindow().setNavigationBarColor(Color.TRANSPARENT);
+ getWindow().setStatusBarColor(Color.TRANSPARENT);
+ }
+ bar.getNextButton().setText(R.string.skip_label);
+
+ if (!getIntent().getBooleanExtra(EXTRA_ALLOW_SKIP, true)) {
+ bar.getNextButton().setEnabled(false);
+ }
+ }
+
+ @Override
+ public void onNavigateBack() {
+ onBackPressed();
+ }
+
+ @Override
+ public void onNavigateNext() {
+ boolean isConnected = false;
+ final ConnectivityManager connectivity = (ConnectivityManager)
+ getSystemService(Context.CONNECTIVITY_SERVICE);
+ if (connectivity != null) {
+ final NetworkInfo info = connectivity.getActiveNetworkInfo();
+ isConnected = (info != null) && info.isConnected();
+ }
+ if (isConnected) {
+ // Warn of possible data charges
+ WifiSkipDialog.newInstance(R.string.wifi_skipped_message)
+ .show(getFragmentManager(), "dialog");
+ } else {
+ // Warn of lack of updates
+ WifiSkipDialog.newInstance(R.string.wifi_and_mobile_skipped_message)
+ .show(getFragmentManager(), "dialog");
+ }
+ }
+
+ public static class WifiSkipDialog extends DialogFragment {
+ public static WifiSkipDialog newInstance(int messageRes) {
+ final Bundle args = new Bundle();
+ args.putInt("messageRes", messageRes);
+ final WifiSkipDialog dialog = new WifiSkipDialog();
+ dialog.setArguments(args);
+ return dialog;
+ }
+
+ public WifiSkipDialog() {
+ // no-arg constructor for fragment
+ }
+
+ @Override
+ public Dialog onCreateDialog(Bundle savedInstanceState) {
+ int messageRes = getArguments().getInt("messageRes");
+ return new AlertDialog.Builder(getActivity())
+ .setMessage(messageRes)
+ .setCancelable(false)
+ .setNegativeButton(R.string.wifi_skip_anyway,
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int id) {
+ WifiSetupActivity activity = (WifiSetupActivity) getActivity();
+ activity.finishOrNext(RESULT_SKIP);
+ }
+ })
+ .setPositiveButton(R.string.wifi_dont_skip,
+ new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int id) {
+ }
+ })
+ .create();
+ }
+ }
}
