am 75266364: am 5d72b272: Merge "Add support for SE Android to the Settings app."
* commit '7526636406087666d005d389ddc0cdacd79499fd':
Add support for SE Android to the Settings app.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index cf1f888..c4900fd 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,6 +6,7 @@
<original-package android:name="com.android.settings" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+ <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS" />
<uses-permission android:name="android.permission.DEVICE_POWER" />
@@ -61,7 +62,8 @@
android:taskAffinity=""
android:theme="@android:style/Theme.Holo"
android:uiOptions="splitActionBarWhenNarrow"
- android:hardwareAccelerated="true">
+ android:hardwareAccelerated="true"
+ android:supportsRtl="true">
<!-- Settings -->
@@ -93,6 +95,7 @@
<!-- Wireless Controls -->
<activity android:name="Settings$WirelessSettingsActivity"
+ android:taskAffinity="com.android.settings"
android:label="@string/wireless_networks_settings_title"
android:parentActivityName="Settings">
<intent-filter>
@@ -113,9 +116,9 @@
<!-- Top-level settings -->
<activity android:name="Settings$WifiSettingsActivity"
+ android:taskAffinity="com.android.settings"
android:label="@string/wifi_settings"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:clearTaskOnLaunch="true"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -132,11 +135,11 @@
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name=".wifi.WifiSettings"
+ android:taskAffinity="com.android.settings"
android:label="@string/wifi_settings"
android:targetActivity="Settings$WifiSettingsActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:exported="true"
- android:clearTaskOnLaunch="true">
+ android:exported="true">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.wifi.WifiSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
@@ -144,8 +147,8 @@
</activity-alias>
<activity android:name=".wifi.WifiPickerActivity"
- android:parentActivityName="Settings"
- android:clearTaskOnLaunch="true">
+ android:taskAffinity="com.android.settings"
+ android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.net.wifi.PICK_WIFI_NETWORK" />
@@ -173,9 +176,9 @@
android:exported="true" />
<activity android:name="Settings$AdvancedWifiSettingsActivity"
+ android:taskAffinity="com.android.settings"
android:label="@string/wifi_advanced_settings_label"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:clearTaskOnLaunch="true"
android:parentActivityName="Settings$WifiSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -195,6 +198,7 @@
<activity android:name=".wifi.WifiInfo"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$WifiSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -205,6 +209,7 @@
<activity android:name=".wifi.WifiConfigInfo"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$WifiSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
@@ -243,8 +248,7 @@
<activity android:name="ApnSettings" android:label="@string/apn_settings"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:launchMode="singleTask"
- android:parentActivityName="Settings$WirelessSettingsActivity">
+ android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.settings.APN_SETTINGS" />
@@ -255,7 +259,7 @@
<activity android:name="Settings$BluetoothSettingsActivity"
android:label="@string/bluetooth_settings_title"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -285,8 +289,7 @@
<activity android:name=".bluetooth.DevicePickerActivity"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"
android:label="@string/device_picker"
- android:clearTaskOnLaunch="true"
- android:parentActivityName="Settings">
+ android:clearTaskOnLaunch="true">
<intent-filter>
<action android:name="android.bluetooth.devicepicker.action.LAUNCH" />
<category android:name="android.intent.category.DEFAULT" />
@@ -295,7 +298,7 @@
<activity android:name="Settings$TetherSettingsActivity"
android:label="@string/tether_settings_title_all"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$WirelessSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -330,7 +333,7 @@
</activity-alias>
<activity android:name="Settings$WifiP2pSettingsActivity"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$WifiSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -350,7 +353,7 @@
<activity android:name="Settings$VpnSettingsActivity"
android:label="@string/vpn_settings_title"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$WirelessSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -395,7 +398,7 @@
<activity android:name="Settings$LocalePickerActivity"
android:label="@string/language_picker_title"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -411,7 +414,7 @@
<activity android:name="Settings$InputMethodAndLanguageSettingsActivity"
android:label="@string/language_keyboard_settings_title"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -452,7 +455,7 @@
<activity android:name="Settings$SpellCheckersSettingsActivity"
android:label="@string/spellcheckers_settings_title"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -489,7 +492,7 @@
<activity android:name="Settings$UserDictionarySettingsActivity"
android:label="@string/user_dict_settings_titlebar"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:uiOptions="none"
android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
<intent-filter>
@@ -525,7 +528,6 @@
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="UserDictionarySettings"
android:label="@string/user_dict_settings_titlebar"
- android:clearTaskOnLaunch="true"
android:exported="true"
android:targetActivity="Settings$UserDictionarySettingsActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -540,7 +542,7 @@
<activity android:name="Settings$SoundSettingsActivity"
android:label="@string/sound_settings"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -559,7 +561,6 @@
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="SoundSettings"
android:label="@string/sound_settings"
- android:clearTaskOnLaunch="true"
android:exported="true"
android:targetActivity="Settings$SoundSettingsActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -570,7 +571,7 @@
<activity android:name="Settings$DisplaySettingsActivity"
android:label="@string/display_settings"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -589,7 +590,6 @@
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="DisplaySettings"
android:label="@string/display_settings"
- android:clearTaskOnLaunch="true"
android:exported="true"
android:targetActivity="Settings$DisplaySettingsActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -601,7 +601,7 @@
<activity android:name="Settings$DockSettingsActivity"
android:label="@string/dock_settings_title"
android:enabled="@bool/has_dock_settings"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -619,7 +619,6 @@
<activity-alias android:name="DockSettings"
android:label="@string/dock_settings_title"
android:enabled="@bool/has_dock_settings"
- android:clearTaskOnLaunch="true"
android:exported="true"
android:targetActivity="Settings$DockSettingsActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -631,6 +630,7 @@
<activity android:name="Settings$DeviceInfoSettingsActivity"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"
android:label="@string/device_info_settings"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -665,7 +665,7 @@
<activity android:name="Settings$ManageApplicationsActivity"
android:label="@string/applications_settings"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"
android:uiOptions="none">
<intent-filter>
@@ -686,7 +686,6 @@
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name=".applications.ManageApplications"
android:label="@string/applications_settings"
- android:clearTaskOnLaunch="true"
android:exported="true"
android:targetActivity="Settings$ManageApplicationsActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -698,7 +697,6 @@
<!-- Keep compatibility with old shortcuts. Pre-gingerbread. -->
<activity-alias android:name=".ManageApplications"
android:label="@string/manageapplications_settings_title"
- android:clearTaskOnLaunch="true"
android:exported="true"
android:targetActivity="Settings$ManageApplicationsActivity">
</activity-alias>
@@ -707,7 +705,6 @@
This is for compatibility with old shortcuts. -->
<activity-alias android:name=".RunningServices"
android:label="@string/runningservices_settings_title"
- android:clearTaskOnLaunch="true"
android:exported="true"
android:targetActivity="Settings$ManageApplicationsActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -720,7 +717,6 @@
This is for compatibility with old shortcuts. -->
<activity-alias android:name=".applications.StorageUse"
android:label="@string/storageuse_settings_title"
- android:clearTaskOnLaunch="true"
android:exported="true"
android:targetActivity="Settings$ManageApplicationsActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -735,6 +731,7 @@
<activity android:name=".applications.InstalledAppDetailsTop"
android:label="@string/application_info_label"
android:exported="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$ManageApplicationsActivity">
</activity>
@@ -753,6 +750,7 @@
<!-- Provide direct entry into manage apps showing running services. -->
<activity android:name="Settings$RunningServicesActivity"
android:label="@string/runningservices_settings_title"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -769,6 +767,7 @@
<!-- Provide direct entry into manage apps showing storage usage of apps. -->
<activity android:name="Settings$StorageUseActivity"
android:label="@string/storageuse_settings_title"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -786,7 +785,7 @@
<activity android:name="Settings$LocationSettingsActivity"
android:label="@string/location_settings_title"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -805,7 +804,7 @@
<activity android:name="Settings$SecuritySettingsActivity"
android:label="@string/security_settings_title"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -824,7 +823,6 @@
<activity-alias android:name="SecuritySettings"
android:label="@string/security_settings_title"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:clearTaskOnLaunch="true"
android:exported="true"
android:targetActivity="Settings$SecuritySettingsActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -836,7 +834,7 @@
<activity android:name="Settings$PrivacySettingsActivity"
android:label="@string/privacy_settings_title"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -870,7 +868,7 @@
<activity android:name="Settings$DeviceAdminSettingsActivity"
android:label="@string/device_admin_settings_title"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$SecuritySettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -890,7 +888,6 @@
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="DeviceAdminSettings"
android:label="@string/device_admin_settings_title"
- android:clearTaskOnLaunch="true"
android:exported="true"
android:targetActivity="Settings$DeviceAdminSettingsActivity">
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
@@ -916,8 +913,7 @@
<activity android:name="IccLockSettings"
android:label="@string/sim_lock_settings"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"
- android:process="com.android.phone"
- android:parentActivityName="Settings$SecuritySettingsActivity">
+ android:process="com.android.phone">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
@@ -928,7 +924,7 @@
<activity android:name="Settings$AccessibilitySettingsActivity"
android:label="@string/accessibility_settings"
android:configChanges="orientation|keyboardHidden|screenSize"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -945,6 +941,7 @@
<activity android:name="Settings$TextToSpeechSettingsActivity"
android:label="@string/tts_settings"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$InputMethodAndLanguageSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -986,8 +983,7 @@
<activity android:name=".deviceinfo.Status"
android:label="@string/device_status_activity_title"
android:theme="@android:style/Theme.Holo.DialogWhenLarge"
- android:process="com.android.phone"
- android:parentActivityName="Settings$DeviceInfoSettingsActivity">
+ android:process="com.android.phone">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
@@ -998,6 +994,7 @@
<activity android:name="Settings$StorageSettingsActivity"
android:label="@string/storage_settings_title"
android:uiOptions="none"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1058,7 +1055,7 @@
<activity android:name="Settings$DevelopmentSettingsActivity"
android:label="@string/development_settings_title"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1074,7 +1071,6 @@
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="DevelopmentSettings"
- android:clearTaskOnLaunch="true"
android:exported="true"
android:label="@string/development_settings_title"
android:targetActivity="Settings$DevelopmentSettingsActivity">
@@ -1089,7 +1085,7 @@
<activity android:name="Settings$UsbSettingsActivity"
android:label="@string/storage_title_usb"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$StorageSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1109,7 +1105,6 @@
<!-- Keep compatibility with old shortcuts. -->
<activity-alias android:name="UsbSettings"
- android:clearTaskOnLaunch="true"
android:exported="true"
android:label="@string/storage_title_usb"
android:targetActivity="Settings$DevelopmentSettingsActivity">
@@ -1216,7 +1211,7 @@
<!-- NFC settings -->
<activity android:name="Settings$AndroidBeamSettingsActivity"
android:label="@string/android_beam_settings_title"
- android:clearTaskOnLaunch="true"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$WirelessSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1247,6 +1242,7 @@
</receiver>
<activity android:name="BatteryInfo" android:label="@string/battery_info_label"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1257,6 +1253,7 @@
<activity android:name="Display" android:label="@string/display_label"
android:configChanges="fontScale"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1330,6 +1327,7 @@
</activity>
<activity android:name="UsageStats" android:label="@string/usage_stats_label"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1340,6 +1338,7 @@
<activity android:name="Settings$PowerUsageSummaryActivity"
android:label="@string/power_usage_summary_title"
android:uiOptions="none"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1366,6 +1365,7 @@
<activity android:name="Settings$AccountSyncSettingsActivity"
android:label="@string/account_sync_settings_title"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings"
android:uiOptions="none">
<intent-filter>
@@ -1393,6 +1393,7 @@
android:theme="@android:style/Theme.Translucent.NoTitleBar"
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/header_add_an_account"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings$ManageAccountsSettingsActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1449,6 +1450,7 @@
<activity android:name="Settings$DataUsageSummaryActivity"
android:label="@string/data_usage_summary_title"
android:uiOptions="none"
+ android:taskAffinity="com.android.settings"
android:parentActivityName="Settings">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -1463,7 +1465,7 @@
<receiver android:name=".widget.SettingsAppWidgetProvider"
android:label="@string/gadget_title"
- android:exported="false"
+ android:exported="true"
android:enabled="@bool/has_powercontrol_widget">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -1478,5 +1480,11 @@
<meta-data android:name="android.appwidget.provider" android:resource="@xml/appwidget_info" />
</receiver>
+ <receiver android:name=".bluetooth.BluetoothDiscoverableTimeoutReceiver">
+ <intent-filter>
+ <action android:name="android.bluetooth.intent.DISCOVERABLE_TIMEOUT" />
+ </intent-filter>
+ </receiver>
+
</application>
</manifest>
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml
index ade6f25..08dcf64 100644
--- a/res/layout-land/choose_lock_password.xml
+++ b/res/layout-land/choose_lock_password.xml
@@ -33,11 +33,11 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"
- android:layout_marginRight="6dip"
- android:layout_marginLeft="6dip"
+ android:layout_marginEnd="6dip"
+ android:layout_marginStart="6dip"
android:layout_marginTop="10dip"
android:layout_marginBottom="10dip"
- android:gravity="left"
+ android:gravity="start"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
@@ -79,7 +79,7 @@
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
android:orientation="horizontal"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true">
<!-- left : cancel -->
diff --git a/res/layout-land/choose_lock_pattern_tutorial.xml b/res/layout-land/choose_lock_pattern_tutorial.xml
index ac693cc..362853b 100644
--- a/res/layout-land/choose_lock_pattern_tutorial.xml
+++ b/res/layout-land/choose_lock_pattern_tutorial.xml
@@ -40,7 +40,7 @@
android:layout_width="0dip"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:layout_marginLeft="25dip">
+ android:layout_marginStart="25dip">
<LinearLayout
android:layout_width="match_parent"
diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml
index a9b5640..4130a48 100644
--- a/res/layout-land/confirm_lock_password.xml
+++ b/res/layout-land/confirm_lock_password.xml
@@ -34,11 +34,11 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"
- android:layout_marginRight="6dip"
- android:layout_marginLeft="6dip"
+ android:layout_marginEnd="6dip"
+ android:layout_marginStart="6dip"
android:layout_marginTop="10dip"
android:layout_marginBottom="10dip"
- android:gravity="left"
+ android:gravity="start"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
@@ -89,7 +89,7 @@
android:layout_width="150dip"
android:layout_height="wrap_content"
android:layout_margin="5dip"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:text="@string/lockpassword_cancel_label"
/>
@@ -97,8 +97,8 @@
android:layout_width="150dip"
android:layout_height="wrap_content"
android:layout_margin="5dip"
- android:layout_alignParentRight="true"
- android:drawableRight="@drawable/ic_btn_next"
+ android:layout_alignParentEnd="true"
+ android:drawableEnd="@drawable/ic_btn_next"
android:drawablePadding="10dip"
android:text="@string/lockpassword_continue_label"
/>
diff --git a/res/layout-land/crypt_keeper_password_entry.xml b/res/layout-land/crypt_keeper_password_entry.xml
index 094434e..57cfbed 100644
--- a/res/layout-land/crypt_keeper_password_entry.xml
+++ b/res/layout-land/crypt_keeper_password_entry.xml
@@ -50,8 +50,8 @@
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginLeft="8dip"
- android:layout_marginRight="8dip"
+ android:layout_marginStart="8dip"
+ android:layout_marginEnd="8dip"
android:orientation="horizontal"
>
<include layout="@layout/crypt_keeper_password_field" />
diff --git a/res/layout-land/crypt_keeper_progress.xml b/res/layout-land/crypt_keeper_progress.xml
index f8a939f..c2fe2f7 100644
--- a/res/layout-land/crypt_keeper_progress.xml
+++ b/res/layout-land/crypt_keeper_progress.xml
@@ -27,7 +27,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="48dip"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:textSize="30dip"
android:textColor="@color/title_color"
diff --git a/res/layout-sw600dp-land/choose_lock_password.xml b/res/layout-sw600dp-land/choose_lock_password.xml
index 3895529..05d4a24 100644
--- a/res/layout-sw600dp-land/choose_lock_password.xml
+++ b/res/layout-sw600dp-land/choose_lock_password.xml
@@ -34,11 +34,11 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"
- android:layout_marginRight="6dip"
- android:layout_marginLeft="6dip"
+ android:layout_marginEnd="6dip"
+ android:layout_marginStart="6dip"
android:layout_marginTop="10dip"
android:layout_marginBottom="10dip"
- android:gravity="left"
+ android:gravity="start"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceLarge"
/>
@@ -66,7 +66,7 @@
<!-- confirm / restart buttons -->
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
diff --git a/res/layout-sw600dp-land/choose_lock_pattern.xml b/res/layout-sw600dp-land/choose_lock_pattern.xml
index a32a5fb..506570d 100644
--- a/res/layout-sw600dp-land/choose_lock_pattern.xml
+++ b/res/layout-sw600dp-land/choose_lock_pattern.xml
@@ -49,15 +49,15 @@
android:layout_height="wrap_content"
android:layout_below="@id/headerText"
android:layout_marginTop="16dip"
- android:layout_toRightOf="@id/lockPattern"
- android:layout_marginLeft="100dip"
+ android:layout_toEndOf="@id/lockPattern"
+ android:layout_marginStart="100dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:visibility="gone"/>
<!-- confirm / restart buttons -->
<LinearLayout android:id="@+id/buttonContainer"
style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
@@ -79,7 +79,7 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="20dip"
- android:layout_marginLeft="20dip"
+ android:layout_marginStart="20dip"
android:layout_above="@id/buttonContainer"
android:gravity="center_vertical|center_horizontal">
diff --git a/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml b/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
index 1320ba0..00ef039 100644
--- a/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
+++ b/res/layout-sw600dp-land/choose_lock_pattern_tutorial.xml
@@ -46,7 +46,7 @@
<!-- navigation buttons -->
<LinearLayout android:id="@+id/buttonContainer"
style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
@@ -68,7 +68,7 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="20dip"
- android:layout_marginLeft="20dip"
+ android:layout_marginStart="20dip"
android:gravity="center_vertical|center_horizontal"
android:layout_above="@id/buttonContainer">
diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml
index c4472db..5844a60 100644
--- a/res/layout-sw600dp-land/confirm_lock_password.xml
+++ b/res/layout-sw600dp-land/confirm_lock_password.xml
@@ -35,11 +35,11 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"
- android:layout_marginRight="6dip"
- android:layout_marginLeft="6dip"
+ android:layout_marginEnd="6dip"
+ android:layout_marginStart="6dip"
android:layout_marginTop="10dip"
android:layout_marginBottom="10dip"
- android:gravity="left"
+ android:gravity="start"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceLarge"
/>
@@ -67,7 +67,7 @@
<!-- confirm / restart buttons -->
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
diff --git a/res/layout-sw600dp-land/confirm_lock_pattern.xml b/res/layout-sw600dp-land/confirm_lock_pattern.xml
index 3e642d5..627ff02 100644
--- a/res/layout-sw600dp-land/confirm_lock_pattern.xml
+++ b/res/layout-sw600dp-land/confirm_lock_pattern.xml
@@ -45,7 +45,7 @@
<!-- confirm / restart buttons -->
<LinearLayout android:id="@+id/buttonContainer"
style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:orientation="horizontal"
android:visibility="invisible">
@@ -76,7 +76,7 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_marginTop="20dip"
- android:layout_marginLeft="20dip"
+ android:layout_marginStart="20dip"
android:layout_above="@id/footerText"
android:gravity="center_vertical|center_horizontal">
diff --git a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
index a8f5651..81222cc 100644
--- a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml
@@ -43,9 +43,9 @@
<TextView android:id="@+id/passwordLabel"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_toRightOf="@+id/encroid"
+ android:layout_toEndOf="@+id/encroid"
android:layout_centerVertical="true"
- android:paddingRight="17dip"
+ android:paddingEnd="17dip"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/crypt_keeper_enter_password"
@@ -55,7 +55,7 @@
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="320dip"
- android:layout_toRightOf="@+id/passwordLabel"
+ android:layout_toEndOf="@+id/passwordLabel"
android:layout_centerVertical="true"
android:orientation="horizontal"
>
diff --git a/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml
index 8094b74..70d868a 100644
--- a/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-sw600dp-land/wifi_settings_for_setup_wizard_xl.xml
@@ -21,8 +21,8 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingTop="60dip"
- android:paddingLeft="@dimen/screen_margin_sides"
- android:paddingRight="@dimen/screen_margin_sides"
+ android:paddingStart="@dimen/screen_margin_sides"
+ android:paddingEnd="@dimen/screen_margin_sides"
android:paddingBottom="0dip" >
<FrameLayout
@@ -42,9 +42,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="48dip"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_centerVertical="true"
- android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:layout_below="@id/top_padding_layout"
android:textSize="32dip"
android:textColor="@color/title_color"
@@ -88,7 +88,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/top_divider"
- android:layout_alignLeft="@id/dummy_for_left_edge"
+ android:layout_alignStart="@id/dummy_for_left_edge"
android:layout_centerHorizontal="true">
<!-- Padding for @id/content shown when keyboard isn't available -->
@@ -115,7 +115,7 @@
android:layout_height="wrap_content"
android:minHeight="160dip"
android:layout_marginTop="10dip"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:visibility="gone" />
<LinearLayout
android:id="@+id/connecting_status_layout"
@@ -174,7 +174,7 @@
android:layout_height="3dip"
android:layout_marginBottom="16dip"
android:layout_below="@id/bottom_padding_layout"
- android:layout_alignLeft="@id/content"
+ android:layout_alignStart="@id/content"
android:background="@color/divider_color" /> <!-- TODO: fix this -->
<RelativeLayout
@@ -182,21 +182,21 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/bottom_divider"
- android:layout_alignLeft="@id/bottom_divider"
- android:layout_alignParentRight="true"
+ android:layout_alignStart="@id/bottom_divider"
+ android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true">
<Button
android:id="@+id/wifi_setup_add_network"
style="@style/setup_wizard_button"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:text="@string/wifi_setup_add_network"
android:enabled="false" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:orientation="horizontal">
<!-- This misleading name is for keeping consistency between non-XL
@@ -208,20 +208,20 @@
<Button android:id="@+id/wifi_setup_connect"
style="@style/setup_wizard_button"
- android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:text="@string/wifi_setup_connect"
android:enabled="false"
android:visibility="gone" />
<Button android:id="@+id/wifi_setup_refresh_list"
style="@style/setup_wizard_button"
- android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:text="@string/wifi_setup_refresh_list"
android:enabled="false" />
<Button android:id="@+id/wifi_setup_skip_or_next"
style="@style/setup_wizard_button"
- android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:text="@string/wifi_setup_skip" />
</LinearLayout>
</RelativeLayout>
diff --git a/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml b/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
index 4d52deb..1777eda 100644
--- a/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
+++ b/res/layout-sw600dp/access_point_category_for_setup_wizard_xl.xml
@@ -18,7 +18,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:paddingRight="?android:attr/scrollbarSize">
+ android:paddingEnd="?android:attr/scrollbarSize">
<LinearLayout android:id="@+android:id/widget_frame"
android:layout_width="wrap_content"
diff --git a/res/layout-sw600dp/choose_lock_password.xml b/res/layout-sw600dp/choose_lock_password.xml
index df53f68..43be032 100644
--- a/res/layout-sw600dp/choose_lock_password.xml
+++ b/res/layout-sw600dp/choose_lock_password.xml
@@ -51,8 +51,8 @@
android:layout_gravity="center"
android:textSize="32sp"
android:layout_marginTop="15dip"
- android:layout_marginLeft="30dip"
- android:layout_marginRight="30dip"
+ android:layout_marginStart="30dip"
+ android:layout_marginEnd="30dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default"
android:textColor="#ffffffff"
@@ -86,7 +86,7 @@
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:orientation="horizontal">
<Button android:id="@+id/cancel_button"
diff --git a/res/layout-sw600dp/choose_lock_pattern.xml b/res/layout-sw600dp/choose_lock_pattern.xml
index d8f85cc..b0efa8c 100644
--- a/res/layout-sw600dp/choose_lock_pattern.xml
+++ b/res/layout-sw600dp/choose_lock_pattern.xml
@@ -62,7 +62,7 @@
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:orientation="horizontal">
<!-- left / top button: skip, or re-try -->
diff --git a/res/layout-sw600dp/choose_lock_pattern_tutorial.xml b/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
index 2a61666..e0221bf 100644
--- a/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
+++ b/res/layout-sw600dp/choose_lock_pattern_tutorial.xml
@@ -54,7 +54,7 @@
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:orientation="horizontal">
<!-- left / top button: skip, or re-try -->
diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml
index 722153d..cb6fafd 100644
--- a/res/layout-sw600dp/confirm_lock_password.xml
+++ b/res/layout-sw600dp/confirm_lock_password.xml
@@ -54,8 +54,8 @@
android:layout_gravity="center"
android:textSize="32sp"
android:layout_marginTop="15dip"
- android:layout_marginLeft="30dip"
- android:layout_marginRight="30dip"
+ android:layout_marginStart="30dip"
+ android:layout_marginEnd="30dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default"
android:textColor="#ffffffff"
@@ -89,7 +89,7 @@
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:orientation="horizontal">
<Button android:id="@+id/cancel_button"
diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml
index 1e33230c..731fb22 100644
--- a/res/layout-sw600dp/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml
@@ -40,10 +40,10 @@
<TextView android:id="@+id/passwordLabel"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_toRightOf="@+id/encroid"
+ android:layout_toEndOf="@+id/encroid"
android:layout_marginTop="37dip"
- android:paddingLeft="17dip"
- android:paddingRight="17dip"
+ android:paddingStart="17dip"
+ android:paddingEnd="17dip"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/crypt_keeper_enter_password"
@@ -53,7 +53,7 @@
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="320dip"
- android:layout_toRightOf="@+id/passwordLabel"
+ android:layout_toEndOf="@+id/passwordLabel"
android:layout_marginTop="26dip"
android:layout_centerVertical="true"
android:orientation="horizontal"
diff --git a/res/layout-sw600dp/crypt_keeper_progress.xml b/res/layout-sw600dp/crypt_keeper_progress.xml
index 176c9fb..a2e32d7 100644
--- a/res/layout-sw600dp/crypt_keeper_progress.xml
+++ b/res/layout-sw600dp/crypt_keeper_progress.xml
@@ -29,9 +29,9 @@
android:id="@+id/encroid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
- android:paddingRight="65dip"
+ android:paddingEnd="65dip"
android:src="@drawable/encroid_waiting"
android:contentDescription="@null"
/>
@@ -42,9 +42,9 @@
android:layout_height="wrap_content"
android:minHeight="48dip"
android:layout_alignParentTop="true"
- android:layout_alignParentLeft="true"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
+ android:layout_alignParentStart="true"
+ android:layout_marginStart="16dip"
+ android:layout_marginEnd="16dip"
android:textSize="30dip"
android:textColor="@color/title_color"
android:text="@string/crypt_keeper_setup_title"
@@ -72,8 +72,8 @@
android:layout_height="wrap_content"
android:layout_below="@+id/top_divider"
android:paddingTop="21dip"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
+ android:layout_marginStart="16dip"
+ android:layout_marginEnd="16dip"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
@@ -96,10 +96,10 @@
android:id="@+id/factory_reset"
android:layout_width="208dip"
android:layout_height="48dip"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="80dip"
- android:layout_marginRight="16dip"
+ android:layout_marginEnd="16dip"
android:text="@string/master_clear_button_text"
android:visibility="gone"
/>
diff --git a/res/layout-sw600dp/date_time_settings_setupwizard.xml b/res/layout-sw600dp/date_time_settings_setupwizard.xml
index e37a4a6..41e3021 100644
--- a/res/layout-sw600dp/date_time_settings_setupwizard.xml
+++ b/res/layout-sw600dp/date_time_settings_setupwizard.xml
@@ -19,16 +19,16 @@
android:layout_height="match_parent"
android:layout_width="match_parent"
android:paddingTop="96dip"
- android:paddingLeft="40dip"
- android:paddingRight="40dip"
+ android:paddingStart="40dip"
+ android:paddingEnd="40dip"
android:paddingBottom="96dip"
android:orientation="vertical">
<FrameLayout android:id="@+id/timezone_dropdown_anchor"
android:layout_height="0px"
android:layout_width="match_parent"
- android:layout_marginLeft="40dip"
- android:layout_marginRight="40dip"/>
+ android:layout_marginStart="40dip"
+ android:layout_marginEnd="40dip"/>
<LinearLayout android:layout_height="0px"
android:layout_weight="1"
@@ -60,7 +60,7 @@
android:minWidth="208dip"
android:layout_height="48dip"
android:layout_marginTop="10dip"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:text="@string/next_label"/>
</RelativeLayout>
diff --git a/res/layout-sw600dp/preference_inputmethod.xml b/res/layout-sw600dp/preference_inputmethod.xml
index 326e2af..c10d718 100644
--- a/res/layout-sw600dp/preference_inputmethod.xml
+++ b/res/layout-sw600dp/preference_inputmethod.xml
@@ -33,14 +33,14 @@
android:id="@android:id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_marginLeft="10dip"
+ android:layout_marginStart="10dip"
android:gravity="center_vertical"
android:orientation="vertical" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="15dip"
- android:layout_marginRight="6dip"
+ android:layout_marginStart="15dip"
+ android:layout_marginEnd="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
@@ -57,7 +57,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
- android:layout_alignLeft="@android:id/title"
+ android:layout_alignStart="@android:id/title"
android:paddingBottom="3dip"
android:visibility="gone"
android:textAppearance="?android:attr/textAppearanceSmall"
@@ -77,8 +77,8 @@
android:id="@+id/inputmethod_settings"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:paddingLeft="15dip"
- android:paddingRight="?android:attr/scrollbarSize"
+ 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-sw600dp/settings_top_level.xml b/res/layout-sw600dp/settings_top_level.xml
index 09590b1..ff53c1b 100644
--- a/res/layout-sw600dp/settings_top_level.xml
+++ b/res/layout-sw600dp/settings_top_level.xml
@@ -25,7 +25,7 @@
android:layout_width="0px"
android:layout_height="match_parent"
android:layout_weight=".4"
- android:layout_marginRight="10dp"/>
+ android:layout_marginEnd="10dp"/>
<FrameLayout android:id="@+id/prefs"
android:layout_width="0px"
android:layout_height="match_parent"
diff --git a/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
index 20f5784..94833e8 100644
--- a/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
+++ b/res/layout-sw600dp/wifi_settings_for_setup_wizard_xl.xml
@@ -21,8 +21,8 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:paddingTop="60dip"
- android:paddingLeft="@dimen/screen_margin_sides"
- android:paddingRight="@dimen/screen_margin_sides"
+ android:paddingStart="@dimen/screen_margin_sides"
+ android:paddingEnd="@dimen/screen_margin_sides"
android:paddingBottom="0dip" >
<FrameLayout
@@ -42,9 +42,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="48dip"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_centerVertical="true"
- android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:layout_below="@id/top_padding_layout"
android:textSize="32dip"
android:textColor="@color/title_color"
@@ -88,7 +88,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/top_divider"
- android:layout_alignLeft="@id/dummy_for_left_edge"
+ android:layout_alignStart="@id/dummy_for_left_edge"
android:layout_centerHorizontal="true">
<!-- Padding for @id/content shown when keyboard isn't available -->
@@ -115,7 +115,7 @@
android:layout_height="wrap_content"
android:minHeight="160dip"
android:layout_marginTop="10dip"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:visibility="gone" />
<LinearLayout
android:id="@+id/connecting_status_layout"
@@ -174,7 +174,7 @@
android:layout_height="3dip"
android:layout_marginBottom="16dip"
android:layout_below="@id/bottom_padding_layout"
- android:layout_alignLeft="@id/content"
+ android:layout_alignStart="@id/content"
android:background="@color/divider_color" /> <!-- TODO: fix this -->
<LinearLayout
@@ -183,27 +183,27 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/bottom_divider"
- android:layout_alignLeft="@id/bottom_divider">
+ android:layout_alignStart="@id/bottom_divider">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/bottom_divider"
- android:layout_alignLeft="@id/bottom_divider"
- android:layout_alignParentRight="true"
+ android:layout_alignStart="@id/bottom_divider"
+ android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true">
<Button
android:id="@+id/wifi_setup_add_network"
style="@style/setup_wizard_button"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:text="@string/wifi_setup_add_network"
android:enabled="false" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:orientation="horizontal">
<!-- This misleading name is for keeping consistency between non-XL
@@ -215,14 +215,14 @@
<Button android:id="@+id/wifi_setup_connect"
style="@style/setup_wizard_button"
- android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:text="@string/wifi_setup_connect"
android:enabled="false"
android:visibility="gone" />
<Button android:id="@+id/wifi_setup_skip_or_next"
style="@style/setup_wizard_button"
- android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:text="@string/wifi_setup_skip" />
</LinearLayout>
@@ -230,7 +230,7 @@
<Button android:id="@+id/wifi_setup_refresh_list"
style="@style/setup_wizard_button"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:text="@string/wifi_setup_refresh_list"
android:enabled="false" />
diff --git a/res/layout-sw720dp/date_time_settings_setupwizard.xml b/res/layout-sw720dp/date_time_settings_setupwizard.xml
index b484472..32c4d93 100644
--- a/res/layout-sw720dp/date_time_settings_setupwizard.xml
+++ b/res/layout-sw720dp/date_time_settings_setupwizard.xml
@@ -20,8 +20,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="@dimen/datetime_margin_top"
- android:paddingLeft="@dimen/screen_margin_sides"
- android:paddingRight="@dimen/screen_margin_sides"
+ android:paddingStart="@dimen/screen_margin_sides"
+ android:paddingEnd="@dimen/screen_margin_sides"
android:paddingBottom="@dimen/datetime_margin_bottom">
<!-- Title: Set date & time-->
@@ -30,8 +30,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="48dip"
- android:layout_alignParentLeft="true"
- android:layout_marginLeft="16dip"
+ android:layout_alignParentStart="true"
+ android:layout_marginStart="16dip"
android:layout_alignParentTop="true"
android:textSize="32dip"
android:textColor="@color/title_color"
@@ -60,9 +60,9 @@
style="?android:attr/dropDownSpinnerStyle"
android:layout_width="304dip"
android:layout_height="48dip"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_alignBottom="@+id/date_time_auto"
- android:gravity="left|center_vertical"
+ android:gravity="start|center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20dip" />
@@ -71,16 +71,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:layout_toRightOf="@id/time_zone_button"
- android:layout_marginLeft="32dip"
- android:layout_alignParentRight="true">
+ android:layout_toEndOf="@id/time_zone_button"
+ android:layout_marginStart="32dip"
+ android:layout_alignParentEnd="true">
<Switch
android:id="@+id/date_time_auto_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:layout_marginLeft="16dip"
+ android:layout_marginStart="16dip"
android:text="@string/date_time_auto"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20dip" />
@@ -154,7 +154,7 @@
android:id="@+id/bottom_divider"
android:layout_width="match_parent"
android:layout_height="3dip"
- android:layout_alignLeft="@id/timezone_auto_time"
+ android:layout_alignStart="@id/timezone_auto_time"
android:layout_above="@+id/next_button"
android:layout_marginBottom="16dip"
android:background="@color/divider_color" />
@@ -163,6 +163,6 @@
android:id="@+id/next_button"
style="@style/setup_wizard_button"
android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:text="@string/next_label" />
</RelativeLayout>
diff --git a/res/layout-sw720dp/tab_widget.xml b/res/layout-sw720dp/tab_widget.xml
index 4cd4547..f591f38 100644
--- a/res/layout-sw720dp/tab_widget.xml
+++ b/res/layout-sw720dp/tab_widget.xml
@@ -25,8 +25,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
- android:paddingRight="@*android:dimen/preference_fragment_padding_side"
+ android:paddingStart="@*android:dimen/preference_fragment_padding_side"
+ android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
style="?android:attr/tabWidgetStyle" />
</HorizontalScrollView>
diff --git a/res/layout/account_sync_screen.xml b/res/layout/account_sync_screen.xml
index 117b58a..aa080cf 100644
--- a/res/layout/account_sync_screen.xml
+++ b/res/layout/account_sync_screen.xml
@@ -84,8 +84,8 @@
android:layout_width="150dip"
android:layout_height="wrap_content"
android:layout_margin="5dip"
- android:layout_alignParentRight="true"
- android:drawableRight="@drawable/ic_btn_next"
+ android:layout_alignParentEnd="true"
+ android:drawableEnd="@drawable/ic_btn_next"
android:drawablePadding="3dip"
android:text="@string/finish_button_label"
/>
diff --git a/res/layout/add_account_screen.xml b/res/layout/add_account_screen.xml
index b6305a0..7e1564c 100644
--- a/res/layout/add_account_screen.xml
+++ b/res/layout/add_account_screen.xml
@@ -21,8 +21,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- android:paddingLeft="16dip"
- android:paddingRight="16dip">
+ android:paddingStart="16dip"
+ android:paddingEnd="16dip">
<ListView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@android:id/list"
android:layout_width="match_parent"
diff --git a/res/layout/android_beam.xml b/res/layout/android_beam.xml
index 8ce90d7..4c9acc2 100644
--- a/res/layout/android_beam.xml
+++ b/res/layout/android_beam.xml
@@ -15,8 +15,8 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
- android:paddingLeft="6dip"
- android:paddingRight="6dip"
+ android:paddingStart="6dip"
+ android:paddingEnd="6dip"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:scrollbars="vertical" >
diff --git a/res/layout/apn_preference_layout.xml b/res/layout/apn_preference_layout.xml
index 1694a93..76c9c3d 100644
--- a/res/layout/apn_preference_layout.xml
+++ b/res/layout/apn_preference_layout.xml
@@ -25,8 +25,8 @@
android:id="@+android:id/text_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="16sp"
- android:layout_marginRight="6sp"
+ android:layout_marginStart="16sp"
+ android:layout_marginEnd="6sp"
android:layout_marginTop="6sp"
android:layout_marginBottom="6sp"
android:layout_weight="1"
@@ -46,7 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
- android:layout_alignLeft="@android:id/title"
+ android:layout_alignStart="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:maxLines="2" />
@@ -57,8 +57,8 @@
android:id="@+android:id/apn_radiobutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="4dip"
- android:layout_marginRight="4dip"
+ android:layout_marginStart="4dip"
+ android:layout_marginEnd="4dip"
android:layout_gravity="center_vertical"
android:clickable="true" />
diff --git a/res/layout/app_percentage_item.xml b/res/layout/app_percentage_item.xml
index eee6165..41c4060 100644
--- a/res/layout/app_percentage_item.xml
+++ b/res/layout/app_percentage_item.xml
@@ -18,8 +18,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
- android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="8dip"
android:paddingBottom="8dip"
android:columnCount="3">
@@ -29,7 +29,7 @@
android:layout_width="48dip"
android:layout_height="48dip"
android:layout_rowSpan="3"
- android:layout_marginRight="8dip"
+ android:layout_marginEnd="8dip"
android:scaleType="centerInside"
android:contentDescription="@null" />
@@ -43,7 +43,7 @@
<TextView
android:id="@android:id/text1"
- android:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
android:textAppearance="?android:attr/textAppearanceSmall" />
<ProgressBar
diff --git a/res/layout/bluetooth_connection_access.xml b/res/layout/bluetooth_connection_access.xml
index 1e74162..7f42177 100644
--- a/res/layout/bluetooth_connection_access.xml
+++ b/res/layout/bluetooth_connection_access.xml
@@ -31,8 +31,8 @@
android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:gravity="center_horizontal"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
diff --git a/res/layout/bluetooth_discoverable.xml b/res/layout/bluetooth_discoverable.xml
index fb65453..b3ddbb9 100644
--- a/res/layout/bluetooth_discoverable.xml
+++ b/res/layout/bluetooth_discoverable.xml
@@ -26,8 +26,8 @@
android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="20dip"
- android:paddingRight="20dip"
+ android:paddingStart="20dip"
+ android:paddingEnd="20dip"
android:gravity="center_horizontal"
android:textAppearance="?android:attr/textAppearanceMedium" />
</ScrollView>
diff --git a/res/layout/bluetooth_pb_access.xml b/res/layout/bluetooth_pb_access.xml
index 24f0df2..01218d6 100644
--- a/res/layout/bluetooth_pb_access.xml
+++ b/res/layout/bluetooth_pb_access.xml
@@ -31,8 +31,8 @@
android:id="@+id/message"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:gravity="center_horizontal"
android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/res/layout/bluetooth_pin_confirm.xml b/res/layout/bluetooth_pin_confirm.xml
index 5a1b41b..a768908 100644
--- a/res/layout/bluetooth_pin_confirm.xml
+++ b/res/layout/bluetooth_pin_confirm.xml
@@ -32,8 +32,8 @@
android:id="@+id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:layout_marginTop="20dip"
android:layout_marginBottom="20dip"
android:gravity="center_vertical"
diff --git a/res/layout/bluetooth_pin_entry.xml b/res/layout/bluetooth_pin_entry.xml
index ef73a79..44d9dde 100644
--- a/res/layout/bluetooth_pin_entry.xml
+++ b/res/layout/bluetooth_pin_entry.xml
@@ -32,8 +32,8 @@
android:id="@+id/message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:layout_marginTop="20dip"
android:layout_marginBottom="20dip"
android:gravity="center_vertical"
@@ -43,8 +43,8 @@
android:id="@+id/text"
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:inputType="textPassword"
android:singleLine="true" />
@@ -53,8 +53,8 @@
android:text="@string/bluetooth_pin_values_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -63,8 +63,8 @@
android:text="@string/bluetooth_enable_alphanumeric_pin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -72,8 +72,8 @@
android:id="@+id/message_below_pin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:gravity="center_vertical"
android:textAppearance="?android:attr/textAppearanceMedium" />
diff --git a/res/layout/bookmark_picker_item.xml b/res/layout/bookmark_picker_item.xml
index b4ffe73..113e83a 100644
--- a/res/layout/bookmark_picker_item.xml
+++ b/res/layout/bookmark_picker_item.xml
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:paddingLeft="2dip"
+ android:paddingStart="2dip"
android:gravity="center_vertical">
<ImageView android:id="@+id/icon"
@@ -33,7 +33,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
- android:paddingLeft="6dip" />
+ android:paddingStart="6dip" />
</LinearLayout>
diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml
index e979413..0c7c11b 100644
--- a/res/layout/choose_lock_password.xml
+++ b/res/layout/choose_lock_password.xml
@@ -49,8 +49,8 @@
android:gravity="center"
android:layout_gravity="center"
android:textSize="24sp"
- android:layout_marginLeft="30dip"
- android:layout_marginRight="30dip"
+ android:layout_marginStart="30dip"
+ android:layout_marginEnd="30dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default"
android:textColor="#ffffffff"
diff --git a/res/layout/choose_lock_pattern_tutorial.xml b/res/layout/choose_lock_pattern_tutorial.xml
index 742cef8..8514550 100644
--- a/res/layout/choose_lock_pattern_tutorial.xml
+++ b/res/layout/choose_lock_pattern_tutorial.xml
@@ -56,7 +56,7 @@
android:layout_width="200dip"
android:layout_height="200dip"
android:layout_marginTop="10dip"
- android:layout_gravity="left"/>
+ android:layout_gravity="start"/>
</LinearLayout>
diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml
index c952139..b6c60c3 100644
--- a/res/layout/confirm_lock_password.xml
+++ b/res/layout/confirm_lock_password.xml
@@ -53,8 +53,8 @@
android:gravity="center"
android:layout_gravity="center"
android:textSize="24sp"
- android:layout_marginLeft="30dip"
- android:layout_marginRight="30dip"
+ android:layout_marginStart="30dip"
+ android:layout_marginEnd="30dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default"
android:textColor="#ffffffff"
@@ -83,7 +83,7 @@
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:orientation="horizontal">
diff --git a/res/layout/crypt_keeper_confirm.xml b/res/layout/crypt_keeper_confirm.xml
index b197aa6..1b64909 100644
--- a/res/layout/crypt_keeper_confirm.xml
+++ b/res/layout/crypt_keeper_confirm.xml
@@ -22,8 +22,8 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dip"
- android:layout_marginLeft="16dp"
- android:layout_marginRight="16dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:layout_weight="1"
>
diff --git a/res/layout/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml
index 1278327..b26f542 100644
--- a/res/layout/crypt_keeper_password_entry.xml
+++ b/res/layout/crypt_keeper_password_entry.xml
@@ -27,8 +27,8 @@
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
- android:layout_marginLeft="8dip"
- android:layout_marginRight="8dip"
+ android:layout_marginStart="8dip"
+ android:layout_marginEnd="8dip"
android:orientation="horizontal"
>
<include layout="@layout/crypt_keeper_password_field" />
diff --git a/res/layout/crypt_keeper_progress.xml b/res/layout/crypt_keeper_progress.xml
index 0d408c2..6b8e65f 100644
--- a/res/layout/crypt_keeper_progress.xml
+++ b/res/layout/crypt_keeper_progress.xml
@@ -27,7 +27,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="48dip"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:textSize="30dip"
android:textColor="@color/title_color"
@@ -62,7 +62,7 @@
android:layout_width="wrap_content"
android:layout_height="0dip"
android:layout_weight="1"
- android:layout_gravity="bottom|right"
+ android:layout_gravity="bottom|end"
android:src="@drawable/encroid_waiting"
android:contentDescription="@null"
/>
diff --git a/res/layout/crypt_keeper_settings.xml b/res/layout/crypt_keeper_settings.xml
index 3239aa9..b54e0a5 100644
--- a/res/layout/crypt_keeper_settings.xml
+++ b/res/layout/crypt_keeper_settings.xml
@@ -23,8 +23,8 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dip"
- android:layout_marginLeft="16dp"
- android:layout_marginRight="16dp"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
android:layout_marginTop="16dp"
android:layout_weight="1"
>
diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml
index 80da437..df80fe3 100644
--- a/res/layout/crypt_keeper_status.xml
+++ b/res/layout/crypt_keeper_status.xml
@@ -56,7 +56,7 @@
android:textSize="@dimen/crypt_clock_size"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@color/crypt_keeper_clock_foreground"
- android:layout_alignLeft="@*android:id/timeDisplayBackground"
+ android:layout_alignStart="@*android:id/timeDisplayBackground"
android:layout_alignTop="@*android:id/timeDisplayBackground"
android:layout_marginBottom="6dip"
/>
@@ -68,8 +68,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dip"
- android:layout_marginLeft="8dip"
- android:layout_marginRight="8dip"
+ android:layout_marginStart="8dip"
+ android:layout_marginEnd="8dip"
android:textSize="18sp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/enter_password"
diff --git a/res/layout/custom_preference.xml b/res/layout/custom_preference.xml
index fcdc9f5..087a37c 100644
--- a/res/layout/custom_preference.xml
+++ b/res/layout/custom_preference.xml
@@ -22,7 +22,7 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
- android:paddingRight="?android:attr/scrollbarSize">
+ android:paddingEnd="?android:attr/scrollbarSize">
<!-- <View
android:layout_width="@dimen/preference_widget_width"
@@ -31,8 +31,8 @@
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="6dip"
- android:layout_marginRight="6dip"
+ android:layout_marginStart="6dip"
+ android:layout_marginEnd="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
@@ -49,7 +49,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
- android:layout_alignLeft="@android:id/title"
+ android:layout_alignStart="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="4" />
diff --git a/res/layout/data_usage_bytes_editor.xml b/res/layout/data_usage_bytes_editor.xml
index ec6e64f..8de7450 100644
--- a/res/layout/data_usage_bytes_editor.xml
+++ b/res/layout/data_usage_bytes_editor.xml
@@ -26,8 +26,8 @@
android:minWidth="48dip"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
+ android:layout_marginStart="16dip"
+ android:layout_marginEnd="16dip"
android:focusable="true"
android:focusableInTouchMode="true" />
diff --git a/res/layout/data_usage_chart.xml b/res/layout/data_usage_chart.xml
index 2501e9d..cec2af2 100644
--- a/res/layout/data_usage_chart.xml
+++ b/res/layout/data_usage_chart.xml
@@ -20,11 +20,11 @@
android:id="@+id/chart"
android:layout_width="match_parent"
android:layout_height="@dimen/data_usage_chart_height"
- android:layout_marginLeft="-16dip"
- android:layout_marginRight="-16dip"
+ android:layout_marginStart="-16dip"
+ android:layout_marginEnd="-16dip"
android:layout_marginBottom="-32dip"
- android:paddingLeft="24dip"
- android:paddingRight="24dip"
+ android:paddingStart="24dip"
+ android:paddingEnd="24dip"
android:paddingTop="16dip"
android:paddingBottom="48dip"
settings:optimalWidth="@dimen/data_usage_chart_optimalWidth"
@@ -34,7 +34,7 @@
android:id="@+id/grid"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="left|bottom"
+ android:layout_gravity="start|bottom"
settings:primaryDrawable="@drawable/data_grid_primary"
settings:secondaryDrawable="@drawable/data_grid_secondary"
settings:borderDrawable="@drawable/data_grid_border"
@@ -44,7 +44,7 @@
android:id="@+id/series"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="left|bottom"
+ android:layout_gravity="start|bottom"
settings:strokeColor="@android:color/holo_blue_light"
settings:fillColor="#c033b5e5"
settings:fillColorSecondary="#6633b5e5" />
@@ -53,7 +53,7 @@
android:id="@+id/detail_series"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_gravity="left|bottom"
+ android:layout_gravity="start|bottom"
settings:strokeColor="#d88d3a"
settings:fillColor="#c0ba7f3e"
settings:fillColorSecondary="#60ba7f3e" />
diff --git a/res/layout/data_usage_cycle_editor.xml b/res/layout/data_usage_cycle_editor.xml
index dffbe18..ff5fceb 100644
--- a/res/layout/data_usage_cycle_editor.xml
+++ b/res/layout/data_usage_cycle_editor.xml
@@ -32,8 +32,8 @@
android:layout_width="48dip"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
+ android:layout_marginStart="16dip"
+ android:layout_marginEnd="16dip"
android:focusable="true"
android:focusableInTouchMode="true" />
diff --git a/res/layout/data_usage_cycles.xml b/res/layout/data_usage_cycles.xml
index c9647c8..2a67d6b 100644
--- a/res/layout/data_usage_cycles.xml
+++ b/res/layout/data_usage_cycles.xml
@@ -20,8 +20,8 @@
android:layout_height="40dip"
android:orientation="horizontal"
android:gravity="center_vertical"
- android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
- android:paddingRight="?android:attr/listPreferredItemPaddingRight">
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
<TextView
android:layout_width="wrap_content"
diff --git a/res/layout/data_usage_detail.xml b/res/layout/data_usage_detail.xml
index 6c09d09..eaac49c 100644
--- a/res/layout/data_usage_detail.xml
+++ b/res/layout/data_usage_detail.xml
@@ -24,8 +24,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
- android:layout_marginRight="?android:attr/listPreferredItemPaddingRight"
+ android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+ android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:orientation="horizontal">
<LinearLayout
@@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginTop="8dip"
- android:layout_marginRight="8dip"
+ android:layout_marginEnd="8dip"
android:orientation="vertical">
<ImageView
@@ -85,8 +85,8 @@
android:id="@+id/app_settings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
- android:layout_marginRight="?android:attr/listPreferredItemPaddingRight"
+ android:layout_marginStart="?android:attr/listPreferredItemPaddingStart"
+ android:layout_marginEnd="?android:attr/listPreferredItemPaddingEnd"
android:layout_marginTop="16dip"
android:layout_marginBottom="16dip"
android:text="@string/data_usage_app_settings" />
diff --git a/res/layout/data_usage_header.xml b/res/layout/data_usage_header.xml
index 619956d..0a8006b 100644
--- a/res/layout/data_usage_header.xml
+++ b/res/layout/data_usage_header.xml
@@ -41,8 +41,8 @@
android:id="@+id/usage_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
- android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingTop="8dip"
android:paddingBottom="8dip"
android:textAppearance="?android:attr/textAppearanceSmall" />
@@ -52,8 +52,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
- android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
- android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+ android:paddingStart="?android:attr/listPreferredItemPaddingStart"
+ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingBottom="8dip"
android:text="@string/data_usage_empty"
android:textAppearance="?android:attr/textAppearanceSmall" />
diff --git a/res/layout/date_time_settings_setupwizard.xml b/res/layout/date_time_settings_setupwizard.xml
index d05098a..7227f2b 100644
--- a/res/layout/date_time_settings_setupwizard.xml
+++ b/res/layout/date_time_settings_setupwizard.xml
@@ -23,8 +23,8 @@
<View
android:id="@+id/timezone_dropdown_anchor"
android:layout_width="match_parent"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip"
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip"
android:layout_height="0px" />
<LinearLayout android:layout_height="0px"
@@ -45,7 +45,7 @@
<Button android:id="@+id/next_button"
android:layout_width="150dip"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:text="@string/next_label"
/>
diff --git a/res/layout/date_time_setup_custom_list_item_2.xml b/res/layout/date_time_setup_custom_list_item_2.xml
index 623ac32..ed32fb7 100644
--- a/res/layout/date_time_setup_custom_list_item_2.xml
+++ b/res/layout/date_time_setup_custom_list_item_2.xml
@@ -27,7 +27,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="16dip"
- android:layout_marginLeft="10dip"
+ android:layout_marginStart="10dip"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:minHeight="10dip"
android:layout_below="@android:id/text1"
- android:layout_alignLeft="@android:id/text1"
+ android:layout_alignStart="@android:id/text1"
android:textAppearance="?android:attr/textAppearanceSmall"
/>
diff --git a/res/layout/device_admin_add.xml b/res/layout/device_admin_add.xml
index 3b4824f..c54ecce 100644
--- a/res/layout/device_admin_add.xml
+++ b/res/layout/device_admin_add.xml
@@ -25,8 +25,8 @@
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1.0"
- android:paddingLeft="16dip"
- android:paddingRight="16dip"
+ android:paddingStart="16dip"
+ android:paddingEnd="16dip"
android:scrollbarStyle="outsideOverlay"
android:gravity="top">
<LinearLayout
@@ -42,7 +42,7 @@
<ImageView android:id="@+id/admin_icon"
android:layout_width="@android:dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size"
- android:layout_marginRight="16dip"
+ android:layout_marginEnd="16dip"
android:layout_gravity="center_vertical"
android:scaleType="fitCenter"
android:contentDescription="@null" />
@@ -94,8 +94,8 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
- android:paddingLeft="16dip"
- android:paddingRight="12dip" />
+ android:paddingStart="16dip"
+ android:paddingEnd="12dip" />
</LinearLayout>
</LinearLayout>
@@ -121,7 +121,7 @@
android:visibility="gone" />
<Button android:id="@+id/cancel_button"
android:layout_width="0dip"
- android:layout_gravity="right"
+ android:layout_gravity="end"
android:layout_weight="1"
android:maxLines="2"
android:text="@string/cancel"
@@ -129,7 +129,7 @@
android:layout_height="wrap_content" />
<Button android:id="@+id/action_button"
android:layout_width="0dip"
- android:layout_gravity="left"
+ android:layout_gravity="start"
android:layout_weight="1"
android:maxLines="2"
style="?android:attr/buttonBarButtonStyle"
diff --git a/res/layout/device_admin_item.xml b/res/layout/device_admin_item.xml
index 24dab5e..56be346 100644
--- a/res/layout/device_admin_item.xml
+++ b/res/layout/device_admin_item.xml
@@ -22,8 +22,8 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
- android:paddingRight="6dip"
- android:paddingLeft="6dip"
+ android:paddingEnd="6dip"
+ android:paddingStart="6dip"
android:gravity="center_vertical" >
<LinearLayout
@@ -63,7 +63,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="4dip"
android:layout_below="@id/name"
- android:layout_alignLeft="@id/name"
+ android:layout_alignStart="@id/name"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="4" />
@@ -75,8 +75,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_marginRight="16dip"
- android:layout_marginLeft="16dip"
+ android:layout_marginEnd="16dip"
+ android:layout_marginStart="16dip"
android:focusable="false"
android:clickable="false" />
diff --git a/res/layout/dialog_edittext.xml b/res/layout/dialog_edittext.xml
index 80911da..0da47a9 100644
--- a/res/layout/dialog_edittext.xml
+++ b/res/layout/dialog_edittext.xml
@@ -17,8 +17,8 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="8dip"
- android:paddingRight="8dip">
+ android:paddingStart="8dip"
+ android:paddingEnd="8dip">
<EditText
android:id="@+id/edittext"
diff --git a/res/layout/dream_picker_row.xml b/res/layout/dream_picker_row.xml
index 18fe4f0..b445cf4 100644
--- a/res/layout/dream_picker_row.xml
+++ b/res/layout/dream_picker_row.xml
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:paddingLeft="2dip"
+ android:paddingStart="2dip"
android:gravity="center_vertical">
<ImageView android:id="@+id/icon"
@@ -33,7 +33,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
- android:paddingLeft="6dip" />
+ android:paddingStart="6dip" />
</LinearLayout>
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index d69f98a..9e1eeb5 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -24,7 +24,7 @@
android:id="@+id/all_details"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingRight="6dip"
+ android:paddingEnd="6dip"
android:paddingBottom="5dip"
android:orientation="vertical">
@@ -34,8 +34,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:orientation="vertical"
- android:paddingRight="6dip"
- android:paddingLeft="6dip"
+ android:paddingEnd="6dip"
+ android:paddingStart="6dip"
android:paddingTop="5dip"
android:paddingBottom="5dip" >
@@ -53,8 +53,8 @@
<CheckBox android:id="@+id/notification_switch"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="12dip"
- android:layout_gravity="left"
+ android:layout_marginStart="12dip"
+ android:layout_gravity="start"
android:text="@string/app_notifications_switch_label" />
</LinearLayout>
@@ -67,7 +67,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="6dip"
+ android:paddingStart="6dip"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
@@ -83,7 +83,7 @@
android:layout_width="wrap_content"
android:maxLines="1"
android:paddingTop="6dip"
- android:paddingLeft="6dip"/>
+ android:paddingStart="6dip"/>
<ImageView
android:id="@+id/info_size_dots"
@@ -92,15 +92,15 @@
android:layout_weight="1"
android:layout_height="1px"
android:layout_gravity="bottom"
- android:layout_marginLeft="1dip"
- android:layout_marginRight="1dip"
+ android:layout_marginStart="1dip"
+ android:layout_marginEnd="1dip"
android:layout_marginBottom="4dip"
android:scaleType="center"
android:contentDescription="@null" />
<TextView
android:id="@+id/total_size_text"
android:paddingTop="6dip"
- android:paddingRight="6dip"
+ android:paddingEnd="6dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
@@ -121,7 +121,7 @@
android:layout_width="wrap_content"
android:maxLines="1"
android:paddingTop="6dip"
- android:paddingLeft="6dip"/>
+ android:paddingStart="6dip"/>
<ImageView
android:id="@+id/info_size_dots"
android:src="@drawable/dotted_line_480px"
@@ -129,8 +129,8 @@
android:layout_weight="1"
android:layout_height="1px"
android:layout_gravity="bottom"
- android:layout_marginLeft="1dip"
- android:layout_marginRight="1dip"
+ android:layout_marginStart="1dip"
+ android:layout_marginEnd="1dip"
android:layout_marginBottom="4dip"
android:scaleType="center"
android:contentDescription="@null" />
@@ -138,7 +138,7 @@
android:id="@+id/application_size_text"
android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingTop="6dip"
- android:paddingRight="6dip"
+ android:paddingEnd="6dip"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:maxLines="1" />
@@ -159,7 +159,7 @@
android:layout_width="wrap_content"
android:maxLines="1"
android:paddingTop="6dip"
- android:paddingLeft="6dip"/>
+ android:paddingStart="6dip"/>
<ImageView
android:id="@+id/info_size_dots"
android:src="@drawable/dotted_line_480px"
@@ -167,8 +167,8 @@
android:layout_weight="1"
android:layout_height="1px"
android:layout_gravity="bottom"
- android:layout_marginLeft="1dip"
- android:layout_marginRight="1dip"
+ android:layout_marginStart="1dip"
+ android:layout_marginEnd="1dip"
android:layout_marginBottom="4dip"
android:scaleType="center"
android:contentDescription="@null" />
@@ -176,7 +176,7 @@
android:id="@+id/external_code_size_text"
android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingTop="6dip"
- android:paddingRight="6dip"
+ android:paddingEnd="6dip"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:maxLines="1" />
@@ -198,7 +198,7 @@
android:layout_width="wrap_content"
android:maxLines="1"
android:paddingTop="6dip"
- android:paddingLeft="6dip"/>
+ android:paddingStart="6dip"/>
<ImageView
android:id="@+id/info_size_dots"
android:src="@drawable/dotted_line_480px"
@@ -206,8 +206,8 @@
android:layout_weight="1"
android:layout_height="1px"
android:layout_gravity="bottom"
- android:layout_marginLeft="1dip"
- android:layout_marginRight="1dip"
+ android:layout_marginStart="1dip"
+ android:layout_marginEnd="1dip"
android:layout_marginBottom="4dip"
android:scaleType="center"
android:contentDescription="@null" />
@@ -215,7 +215,7 @@
android:id="@+id/data_size_text"
android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingTop="6dip"
- android:paddingRight="6dip"
+ android:paddingEnd="6dip"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:maxLines="1" />
@@ -236,7 +236,7 @@
android:layout_width="wrap_content"
android:maxLines="1"
android:paddingTop="6dip"
- android:paddingLeft="6dip"/>
+ android:paddingStart="6dip"/>
<ImageView
android:id="@+id/info_size_dots"
android:src="@drawable/dotted_line_480px"
@@ -244,8 +244,8 @@
android:layout_weight="1"
android:layout_height="1px"
android:layout_gravity="bottom"
- android:layout_marginLeft="1dip"
- android:layout_marginRight="1dip"
+ android:layout_marginStart="1dip"
+ android:layout_marginEnd="1dip"
android:layout_marginBottom="4dip"
android:scaleType="center"
android:contentDescription="@null" />
@@ -253,7 +253,7 @@
android:id="@+id/external_data_size_text"
android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingTop="6dip"
- android:paddingRight="6dip"
+ android:paddingEnd="6dip"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:maxLines="1" />
@@ -293,15 +293,15 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingTop="6dip"
android:gravity="center_vertical"
- android:paddingLeft="6dip"/>
+ android:paddingStart="6dip"/>
<ImageView
android:src="@drawable/dotted_line_480px"
android:layout_width="0dip"
android:layout_weight="1"
android:layout_height="1px"
android:layout_gravity="bottom"
- android:layout_marginLeft="1dip"
- android:layout_marginRight="1dip"
+ android:layout_marginStart="1dip"
+ android:layout_marginEnd="1dip"
android:layout_marginBottom="4dip"
android:scaleType="center"
android:contentDescription="@null" />
@@ -309,14 +309,14 @@
android:id="@+id/cache_size_text"
android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingTop="6dip"
- android:paddingRight="6dip"
+ android:paddingEnd="6dip"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:maxLines="1" />
</LinearLayout>
<Button android:id="@+id/clear_cache_button"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_below="@id/cache_size"
android:layout_centerHorizontal="true"
android:layout_width="200dip"
@@ -336,14 +336,14 @@
android:layout_gravity="center_vertical">
<TextView android:id="@+id/auto_launch"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dip"
- android:paddingRight="6dip"
- android:paddingLeft="6dip" />
+ android:paddingEnd="6dip"
+ android:paddingStart="6dip" />
<Button android:id="@+id/clear_activities_button"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_below="@id/auto_launch"
android:layout_centerHorizontal="true"
android:layout_width="200dip"
@@ -362,24 +362,24 @@
android:text="@string/screen_compatibility_label" />
<TextView android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="6dip"
- android:paddingRight="6dip"
- android:paddingLeft="6dip"
+ android:paddingEnd="6dip"
+ android:paddingStart="6dip"
android:text="@string/screen_compatibility_text"/>
<CheckBox android:id="@+id/ask_compatibility_cb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="12dip"
- android:layout_gravity="left"
+ android:layout_marginStart="12dip"
+ android:layout_gravity="start"
android:text="@string/ask_compatibility" />
<CheckBox android:id="@+id/enable_compatibility_cb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="12dip"
- android:layout_gravity="left"
+ android:layout_marginStart="12dip"
+ android:layout_gravity="start"
android:text="@string/enable_compatibility" />
</LinearLayout>
@@ -397,7 +397,7 @@
android:text="@string/security_settings_desc"
android:textAppearance="?android:attr/textAppearanceSmall"
android:paddingTop="6dip"
- android:paddingLeft="6dip"
+ android:paddingStart="6dip"
android:paddingBottom="6dip"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
diff --git a/res/layout/intent_sender.xml b/res/layout/intent_sender.xml
index 8a85bf8..bf8fd64 100644
--- a/res/layout/intent_sender.xml
+++ b/res/layout/intent_sender.xml
@@ -18,8 +18,8 @@
*/
-->
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- android:paddingLeft="6dip"
- android:paddingRight="6dip"
+ android:paddingStart="6dip"
+ android:paddingEnd="6dip"
android:paddingBottom="3dip"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/res/layout/manage_applications_apps.xml b/res/layout/manage_applications_apps.xml
index 51ab412..394382e 100644
--- a/res/layout/manage_applications_apps.xml
+++ b/res/layout/manage_applications_apps.xml
@@ -47,11 +47,11 @@
android:clipChildren="false"
android:clipToPadding="false"
android:paddingTop="30dp"
- android:paddingLeft="4dp"
- android:paddingRight="4dp"
+ android:paddingStart="4dp"
+ android:paddingEnd="4dp"
android:paddingBottom="1dp"
- android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">
+ android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+ android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side">
<TextView android:id="@+id/usedStorageText"
android:layout_width="0px"
android:layout_height="wrap_content"
@@ -72,11 +72,11 @@
android:singleLine="true"
android:text="@string/internal_storage" />
<TextView android:id="@+id/freeStorageText"
- android:layout_gravity="center_vertical|right"
+ android:layout_gravity="center_vertical|end"
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:gravity="right"
+ android:gravity="end"
android:textAppearance="?android:attr/textAppearanceSmallInverse"
android:textColor="#000"
android:singleLine="true" />
@@ -87,8 +87,8 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"
+ android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+ android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
android:visibility="gone"
android:gravity="center">
diff --git a/res/layout/manage_applications_item.xml b/res/layout/manage_applications_item.xml
index 6708647..3c7944e 100755
--- a/res/layout/manage_applications_item.xml
+++ b/res/layout/manage_applications_item.xml
@@ -22,8 +22,8 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
- android:paddingRight="6dip"
- android:paddingLeft="6dip"
+ android:paddingEnd="6dip"
+ android:paddingStart="6dip"
android:paddingTop="5dip"
android:paddingBottom="5dip"
android:gravity="center_vertical" >
@@ -31,7 +31,7 @@
<ImageView android:id="@+id/app_icon"
android:layout_width="@android:dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size"
- android:layout_marginRight="11dip"
+ android:layout_marginEnd="11dip"
android:layout_gravity="center_vertical"
android:scaleType="fitCenter"
android:contentDescription="@null"/>
@@ -56,14 +56,14 @@
android:baselineAlignedChildIndex="0" >
<TextView android:id="@+id/app_size"
android:layout_marginTop="-4dip"
- android:layout_gravity="center_vertical|left"
+ android:layout_gravity="center_vertical|start"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView android:id="@+id/app_disabled"
android:layout_marginTop="-4dip"
- android:layout_gravity="center_vertical|right"
+ android:layout_gravity="center_vertical|end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
@@ -76,7 +76,7 @@
<CheckBox android:id="@+id/app_on_sdcard"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="5dip"
+ android:layout_marginStart="5dip"
android:layout_gravity="center_vertical"
android:visibility="gone"
android:clickable="false"
diff --git a/res/layout/manage_applications_running.xml b/res/layout/manage_applications_running.xml
index 634de1c..0bc69fb 100644
--- a/res/layout/manage_applications_running.xml
+++ b/res/layout/manage_applications_running.xml
@@ -27,8 +27,8 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginRight="@*android:dimen/preference_fragment_padding_side"
+ android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+ android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side"
android:visibility="gone"
android:gravity="center">
diff --git a/res/layout/master_clear.xml b/res/layout/master_clear.xml
index 268daa0..db62936 100644
--- a/res/layout/master_clear.xml
+++ b/res/layout/master_clear.xml
@@ -23,8 +23,8 @@
<ScrollView
android:layout_width="match_parent"
android:layout_height="0dip"
- android:layout_marginLeft="12dp"
- android:layout_marginRight="12dp"
+ android:layout_marginStart="12dp"
+ android:layout_marginEnd="12dp"
android:layout_marginTop="12dp"
android:layout_weight="1">
<LinearLayout android:layout_width="match_parent"
@@ -70,7 +70,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:paddingRight="8dp"
+ android:paddingEnd="8dp"
android:focusable="false"
android:clickable="false"
android:duplicateParentState="true" />
diff --git a/res/layout/master_clear_confirm.xml b/res/layout/master_clear_confirm.xml
index 0599b10..6e50278 100644
--- a/res/layout/master_clear_confirm.xml
+++ b/res/layout/master_clear_confirm.xml
@@ -22,8 +22,8 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="12dp"
- android:layout_marginRight="12dp"
+ android:layout_marginStart="12dp"
+ android:layout_marginEnd="12dp"
android:layout_marginTop="12dp"
android:textSize="20sp"
android:text="@string/master_clear_final_desc" />
diff --git a/res/layout/ownerinfo.xml b/res/layout/ownerinfo.xml
index 1001a21..d33f156 100644
--- a/res/layout/ownerinfo.xml
+++ b/res/layout/ownerinfo.xml
@@ -15,8 +15,8 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
- android:paddingLeft="6dip"
- android:paddingRight="6dip"
+ android:paddingStart="6dip"
+ android:paddingEnd="6dip"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:scrollbars="vertical" >
@@ -55,7 +55,7 @@
<EditText android:id="@+id/owner_info_edit_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="62dip"
+ android:layout_marginStart="62dip"
android:layout_marginTop="40dip"
android:gravity="top"
android:hint="@string/owner_info_settings_edit_text_hint"
diff --git a/res/layout/pick_item.xml b/res/layout/pick_item.xml
index 62fc4f4..5c58a79 100755
--- a/res/layout/pick_item.xml
+++ b/res/layout/pick_item.xml
@@ -21,5 +21,5 @@
android:textAppearance="?android:attr/textAppearanceLargeInverse"
android:gravity="center_vertical"
android:drawablePadding="14dip"
- android:paddingLeft="15dip"
- android:paddingRight="15dip" />
+ android:paddingStart="15dip"
+ android:paddingEnd="15dip" />
diff --git a/res/layout/power_usage_action_item.xml b/res/layout/power_usage_action_item.xml
index e4d8b5a..9e8551e 100644
--- a/res/layout/power_usage_action_item.xml
+++ b/res/layout/power_usage_action_item.xml
@@ -19,10 +19,10 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
- android:paddingLeft="4dip"
+ android:paddingStart="4dip"
android:focusable="true"
android:orientation="vertical"
- android:paddingRight="?android:attr/scrollbarSize">
+ android:paddingEnd="?android:attr/scrollbarSize">
<TextView android:id="@+id/summary"
android:layout_width="match_parent"
@@ -47,7 +47,7 @@
<Button
android:id="@+id/action_button"
android:layout_width="150dip"
- android:paddingRight="6dip"
+ android:paddingEnd="6dip"
android:layout_weight="0.3"
android:layout_height="wrap_content"/>
</LinearLayout>
diff --git a/res/layout/power_usage_detail_item_text.xml b/res/layout/power_usage_detail_item_text.xml
index 6c21274..fb8c705 100644
--- a/res/layout/power_usage_detail_item_text.xml
+++ b/res/layout/power_usage_detail_item_text.xml
@@ -26,19 +26,19 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold"
android:singleLine="true"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_marginBottom="4dip"
android:layout_marginTop="4dip"
- android:layout_marginLeft="4dip" />
+ android:layout_marginStart="4dip" />
<TextView
android:id="@+id/value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="normal"
android:singleLine="true"
android:layout_marginBottom="4dip"
android:layout_marginTop="4dip"
- android:layout_marginRight="10dip"/>
+ android:layout_marginEnd="10dip"/>
</RelativeLayout>
diff --git a/res/layout/power_usage_details.xml b/res/layout/power_usage_details.xml
index 99567a1..001ffec 100644
--- a/res/layout/power_usage_details.xml
+++ b/res/layout/power_usage_details.xml
@@ -47,7 +47,7 @@
android:id="@+id/details"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="6dip"
+ android:paddingStart="6dip"
android:orientation="vertical">
<!-- Insert detail items here -->
@@ -80,7 +80,7 @@
android:id="@+id/packages_section"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="6dip"
+ android:paddingStart="6dip"
android:orientation="vertical">
<!-- Insert detail items here -->
diff --git a/res/layout/power_usage_package_item.xml b/res/layout/power_usage_package_item.xml
index 750e062..d939229 100644
--- a/res/layout/power_usage_package_item.xml
+++ b/res/layout/power_usage_package_item.xml
@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:singleLine="true"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_marginBottom="2dip"
android:layout_marginTop="2dip" />
</RelativeLayout>
diff --git a/res/layout/preference.xml b/res/layout/preference.xml
index aef21a1..ef4444a 100644
--- a/res/layout/preference.xml
+++ b/res/layout/preference.xml
@@ -19,8 +19,8 @@
android:layout_height="wrap_content"
android:minHeight="48dip"
android:gravity="center_vertical"
- android:paddingLeft="@*android:dimen/preference_item_padding_side"
- android:paddingRight="?android:attr/scrollbarSize"
+ android:paddingStart="@*android:dimen/preference_item_padding_side"
+ android:paddingEnd="?android:attr/scrollbarSize"
android:background="?android:attr/selectableItemBackground">
<RelativeLayout
@@ -44,7 +44,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
- android:layout_alignLeft="@android:id/title"
+ android:layout_alignStart="@android:id/title"
android:visibility="gone"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
diff --git a/res/layout/preference_batteryhistory.xml b/res/layout/preference_batteryhistory.xml
index 53dce74..2655615 100644
--- a/res/layout/preference_batteryhistory.xml
+++ b/res/layout/preference_batteryhistory.xml
@@ -21,7 +21,7 @@
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
android:id="@+android:id/battery_history_chart"
- android:paddingRight="?android:attr/scrollbarSize"
+ android:paddingEnd="?android:attr/scrollbarSize"
android:textAppearance="?android:attr/textAppearanceMedium"
android:shadowRadius="4"
android:shadowColor="?android:attr/colorBackground"
diff --git a/res/layout/preference_dialog_brightness.xml b/res/layout/preference_dialog_brightness.xml
index 82c6f28..b3d62cb 100644
--- a/res/layout/preference_dialog_brightness.xml
+++ b/res/layout/preference_dialog_brightness.xml
@@ -40,8 +40,8 @@
android:text="@string/automatic_brightness"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_marginTop="6dip"
- android:layout_marginLeft="20dip"
- android:layout_marginRight="20dip" />
+ android:layout_marginStart="20dip"
+ android:layout_marginEnd="20dip" />
<SeekBar android:id="@*android:id/seekbar"
android:layout_width="match_parent"
diff --git a/res/layout/preference_dialog_ringervolume.xml b/res/layout/preference_dialog_ringervolume.xml
index a92f0ef..1643cab 100644
--- a/res/layout/preference_dialog_ringervolume.xml
+++ b/res/layout/preference_dialog_ringervolume.xml
@@ -44,8 +44,8 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:paddingLeft="16dip"
- android:layout_gravity="left"
+ android:paddingStart="16dip"
+ android:layout_gravity="start"
android:text="@string/volume_media_description"
/>
@@ -53,7 +53,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="8dip"
+ android:paddingStart="8dip"
android:orientation="horizontal"
android:gravity="center_vertical">
@@ -70,7 +70,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="2dip"
- android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+ android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
</LinearLayout>
<!-- Used for the ringer/notification volume -->
@@ -86,15 +86,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dip"
- android:paddingLeft="16dip"
- android:layout_gravity="left"
+ android:paddingStart="16dip"
+ android:layout_gravity="start"
android:text="@string/volume_ring_description"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="8dip"
+ android:paddingStart="8dip"
android:orientation="horizontal"
android:gravity="center_vertical">
@@ -111,7 +111,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="2dip"
- android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+ android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
</LinearLayout>
</LinearLayout>
@@ -129,15 +129,15 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dip"
- android:paddingLeft="16dip"
- android:layout_gravity="left"
+ android:paddingStart="16dip"
+ android:layout_gravity="start"
android:text="@string/volume_notification_description"
/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="8dip"
+ android:paddingStart="8dip"
android:orientation="horizontal"
android:gravity="center_vertical">
@@ -154,7 +154,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="2dip"
- android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+ android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
</LinearLayout>
</LinearLayout>
@@ -164,8 +164,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dip"
- android:paddingLeft="16dip"
- android:layout_gravity="left"
+ android:paddingStart="16dip"
+ android:layout_gravity="start"
android:text="@string/volume_alarm_description"
/>
@@ -173,7 +173,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="8dip"
+ android:paddingStart="8dip"
android:orientation="horizontal"
android:gravity="center_vertical">
@@ -188,7 +188,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingTop="2dip"
- android:layout_marginRight="@dimen/volume_seekbar_side_margin" />
+ android:layout_marginEnd="@dimen/volume_seekbar_side_margin" />
</LinearLayout>
</LinearLayout>
diff --git a/res/layout/preference_header_item.xml b/res/layout/preference_header_item.xml
index 28da8a1..36ed8e4 100644
--- a/res/layout/preference_header_item.xml
+++ b/res/layout/preference_header_item.xml
@@ -21,12 +21,12 @@
android:minHeight="48dp"
android:background="?android:attr/activatedBackgroundIndicator"
android:gravity="center_vertical"
- android:paddingRight="?android:attr/scrollbarSize">
+ android:paddingEnd="?android:attr/scrollbarSize">
<LinearLayout
android:layout_width="@dimen/header_icon_width"
- android:layout_marginLeft="6dip"
- android:layout_marginRight="6dip"
+ android:layout_marginStart="6dip"
+ android:layout_marginEnd="6dip"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/icon"
@@ -38,8 +38,8 @@
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="6dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
@@ -56,7 +56,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
- android:layout_alignLeft="@android:id/title"
+ android:layout_alignStart="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:ellipsize="end"
android:maxLines="2" />
diff --git a/res/layout/preference_header_switch_item.xml b/res/layout/preference_header_switch_item.xml
index 9d89c25..4ab09d6 100644
--- a/res/layout/preference_header_switch_item.xml
+++ b/res/layout/preference_header_switch_item.xml
@@ -21,12 +21,12 @@
android:minHeight="48dp"
android:background="?android:attr/activatedBackgroundIndicator"
android:gravity="center_vertical"
- android:paddingRight="?android:attr/scrollbarSize">
+ android:paddingEnd="?android:attr/scrollbarSize">
<LinearLayout
android:layout_width="@dimen/header_icon_width"
- android:layout_marginLeft="6dip"
- android:layout_marginRight="6dip"
+ android:layout_marginStart="6dip"
+ android:layout_marginEnd="6dip"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/icon"
@@ -38,8 +38,8 @@
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="6dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
@@ -56,7 +56,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
- android:layout_alignLeft="@android:id/title"
+ android:layout_alignStart="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:ellipsize="end"
android:maxLines="2" />
diff --git a/res/layout/preference_icon.xml b/res/layout/preference_icon.xml
index 7660646..8e62508 100644
--- a/res/layout/preference_icon.xml
+++ b/res/layout/preference_icon.xml
@@ -23,22 +23,22 @@
android:layout_height="wrap_content"
android:minHeight="56dp"
android:gravity="center_vertical"
- android:paddingRight="?android:attr/scrollbarSize">
+ android:paddingEnd="?android:attr/scrollbarSize">
<ImageView
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="6dip"
- android:layout_marginRight="6dip"
+ android:layout_marginStart="6dip"
+ android:layout_marginEnd="6dip"
android:layout_gravity="center"
android:contentDescription="@null" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="6dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
@@ -55,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
- android:layout_alignLeft="@android:id/title"
+ android:layout_alignStart="@android:id/title"
android:textAppearance="?android:attr/textAppearanceSmall"
android:maxLines="2" />
diff --git a/res/layout/preference_inputmethod.xml b/res/layout/preference_inputmethod.xml
index f477a6e..589ddc9 100644
--- a/res/layout/preference_inputmethod.xml
+++ b/res/layout/preference_inputmethod.xml
@@ -38,7 +38,7 @@
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="6dip"
+ android:layout_marginEnd="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
@@ -55,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
- android:layout_alignLeft="@android:id/title"
+ android:layout_alignStart="@android:id/title"
android:paddingBottom="3dip"
android:visibility="gone"
android:textAppearance="?android:attr/textAppearanceSmall"
@@ -75,8 +75,8 @@
android:id="@+id/inputmethod_settings"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:paddingLeft="15dip"
- android:paddingRight="?android:attr/scrollbarSize"
+ 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/preference_memoryusage.xml b/res/layout/preference_memoryusage.xml
index 2882535..ddc619d 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:paddingRight="?android:attr/scrollbarSize"
- android:paddingLeft="@*android:dimen/preference_widget_width">
+ android:paddingEnd="?android:attr/scrollbarSize"
+ android:paddingStart="@*android:dimen/preference_widget_width">
<com.android.settings.deviceinfo.PercentageBarChart
android:id="@+id/percentage_bar_chart"
diff --git a/res/layout/preference_powergauge.xml b/res/layout/preference_powergauge.xml
index e6188dc..5efc028 100644
--- a/res/layout/preference_powergauge.xml
+++ b/res/layout/preference_powergauge.xml
@@ -19,21 +19,21 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
- android:paddingLeft="16dip"
- android:paddingRight="?android:attr/scrollbarSize">
+ android:paddingStart="16dip"
+ android:paddingEnd="?android:attr/scrollbarSize">
<ImageView
android:id="@+id/appIcon"
android:layout_width="48dip"
android:layout_height="wrap_content"
- android:layout_marginRight="6dip"
+ android:layout_marginEnd="6dip"
android:layout_gravity="center"
android:contentDescription="@null" />
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="8dip"
+ android:layout_marginEnd="8dip"
android:layout_marginTop="2dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
@@ -43,9 +43,9 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:layout_marginTop="2dip"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- android:layout_toLeftOf="@+id/percent"
+ android:layout_toStartOf="@+id/percent"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceMedium"/>
@@ -53,7 +53,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:layout_alignBottom="@android:id/title"
android:layout_gravity="bottom"
android:textAppearance="?android:attr/textAppearanceSmall"
@@ -72,7 +72,7 @@
<TextView android:id="@+android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignLeft="@id/appGauge"
+ android:layout_alignStart="@id/appGauge"
android:layout_below="@id/appGauge"
android:textAppearance="?android:attr/textAppearanceSmall"
android:maxLines="2" />
diff --git a/res/layout/preference_progress_category.xml b/res/layout/preference_progress_category.xml
index ad782f2..6e8188c 100644
--- a/res/layout/preference_progress_category.xml
+++ b/res/layout/preference_progress_category.xml
@@ -25,12 +25,12 @@
<TextView
style="?android:attr/listSeparatorTextViewStyle"
android:background="@null"
- android:paddingLeft="16dip"
+ android:paddingStart="16dip"
android:id="@+android:id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:layout_gravity="left|bottom"
+ android:layout_gravity="start|bottom"
/>
<ProgressBar
@@ -39,8 +39,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
+ android:layout_marginStart="16dip"
+ android:layout_marginEnd="16dip"
style="?android:attr/progressBarStyleSmallTitle"
/>
diff --git a/res/layout/preference_settings_checkbox_widget.xml b/res/layout/preference_settings_checkbox_widget.xml
index 960661f..41cfaa5 100644
--- a/res/layout/preference_settings_checkbox_widget.xml
+++ b/res/layout/preference_settings_checkbox_widget.xml
@@ -17,7 +17,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:paddingRight="?android:attr/scrollbarSize">
+ android:paddingEnd="?android:attr/scrollbarSize">
<!-- Settings button -->
<ImageView
diff --git a/res/layout/preference_spellchecker.xml b/res/layout/preference_spellchecker.xml
index f64c26c..3e73fa1 100644
--- a/res/layout/preference_spellchecker.xml
+++ b/res/layout/preference_spellchecker.xml
@@ -38,7 +38,7 @@
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="6dip"
+ android:layout_marginEnd="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
@@ -55,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
- android:layout_alignLeft="@android:id/title"
+ android:layout_alignStart="@android:id/title"
android:visibility="gone"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textSize="13sp"
@@ -81,8 +81,8 @@
<ImageView
android:layout_width="40dip"
android:layout_height="fill_parent"
- android:paddingLeft="5dip"
- android:paddingRight="5dip"
+ android:paddingStart="5dip"
+ android:paddingEnd="5dip"
android:src="@drawable/ic_sysbar_quicksettings"
android:layout_gravity="center"
android:contentDescription="@string/spellchecker_quick_settings" />
@@ -98,10 +98,10 @@
android:id="@+id/pref_right_button2"
android:layout_width="40dip"
android:layout_height="fill_parent"
- android:paddingLeft="5dip"
- android:paddingRight="5dip"
+ android:paddingStart="5dip"
+ android:paddingEnd="5dip"
android:src="@drawable/ic_menu_3d_globe"
- android:layout_gravity="right"
+ android:layout_gravity="end"
android:clickable="true"
android:focusable="true"
android:background="?android:attr/selectableItemBackground"
diff --git a/res/layout/preference_tts_engine.xml b/res/layout/preference_tts_engine.xml
index 3cbdff4..a9d0043 100644
--- a/res/layout/preference_tts_engine.xml
+++ b/res/layout/preference_tts_engine.xml
@@ -33,8 +33,8 @@
android:id="@+id/tts_engine_radiobutton"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_marginLeft="10dip"
- android:layout_marginRight="4dip"
+ android:layout_marginStart="10dip"
+ android:layout_marginEnd="4dip"
android:layout_gravity="center_vertical"
android:orientation="vertical"
android:clickable="true" />
@@ -42,8 +42,8 @@
android:id="@+id/tts_engine_pref_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="15dip"
- android:layout_marginRight="6dip"
+ android:layout_marginStart="15dip"
+ android:layout_marginEnd="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
@@ -60,7 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
- android:layout_alignLeft="@android:id/title"
+ android:layout_alignStart="@android:id/title"
android:visibility="gone"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textSize="13sp"
@@ -78,8 +78,8 @@
android:id="@+id/tts_engine_settings"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
- android:paddingLeft="15dip"
- android:paddingRight="?android:attr/scrollbarSize"
+ android:paddingStart="15dip"
+ android:paddingEnd="?android:attr/scrollbarSize"
android:src="@drawable/ic_sysbar_quicksettings"
android:contentDescription="@string/tts_engine_settings_button"
android:layout_gravity="center"
diff --git a/res/layout/preference_widget_shortcut.xml b/res/layout/preference_widget_shortcut.xml
index 4f14667..1a885a2 100644
--- a/res/layout/preference_widget_shortcut.xml
+++ b/res/layout/preference_widget_shortcut.xml
@@ -18,7 +18,7 @@
android:id="@+id/shortcut"
android:layout_width="40dip"
android:layout_height="40dip"
- android:layout_marginRight="4sp"
+ android:layout_marginEnd="4sp"
android:layout_gravity="center_vertical"
android:background="#555555"
android:gravity="center"
diff --git a/res/layout/preference_widget_sync_toggle.xml b/res/layout/preference_widget_sync_toggle.xml
index 7cb2997..115098b 100644
--- a/res/layout/preference_widget_sync_toggle.xml
+++ b/res/layout/preference_widget_sync_toggle.xml
@@ -19,14 +19,14 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center_vertical|right"
- android:gravity="center_vertical|right">
+ android:layout_gravity="center_vertical|end"
+ android:gravity="center_vertical|end">
<ImageView
android:id="@+id/sync_failed"
android:src="@drawable/ic_sync_error_holo"
android:layout_width="wrap_content"
- android:layout_marginRight="8dip"
+ android:layout_marginEnd="8dip"
android:layout_height="wrap_content"
android:contentDescription="@string/sync_failed" />
@@ -35,7 +35,7 @@
android:src="@drawable/ic_list_sync_anim"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginRight="8dip"
+ android:layout_marginEnd="8dip"
android:contentDescription="@string/sync_active" />
<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/res/layout/profile_icon_small.xml b/res/layout/profile_icon_small.xml
index 9967f77..3fd4bfc 100644
--- a/res/layout/profile_icon_small.xml
+++ b/res/layout/profile_icon_small.xml
@@ -18,7 +18,7 @@
android:id="@+id/icon"
android:layout_width="30dp"
android:layout_height="30dp"
- android:layout_marginRight="4dip"
+ android:layout_marginEnd="4dip"
android:gravity="center"
android:layout_gravity="center_vertical"
android:contentDescription="@null" />
diff --git a/res/layout/proxy.xml b/res/layout/proxy.xml
index 5fc42e7..6409822 100644
--- a/res/layout/proxy.xml
+++ b/res/layout/proxy.xml
@@ -23,8 +23,8 @@
<LinearLayout
android:orientation="vertical"
- android:paddingLeft="6dip"
- android:paddingRight="6dip"
+ android:paddingStart="6dip"
+ android:paddingEnd="6dip"
android:paddingBottom="3dip"
android:layout_width="match_parent" android:layout_height="wrap_content"
android:scrollbars="vertical" >
diff --git a/res/layout/radio_info.xml b/res/layout/radio_info.xml
index d9e5f4d..8888a98 100644
--- a/res/layout/radio_info.xml
+++ b/res/layout/radio_info.xml
@@ -84,6 +84,13 @@
<TextView android:id="@+id/neighboring" style="@style/info_value" />
</LinearLayout>
+ <!-- CellInfo -->
+ <LinearLayout style="@style/entry_layout">
+ <TextView android:text="@string/radio_info_cellinfo_label"
+ style="@style/info_label" />
+ <TextView android:id="@+id/cellinfo" style="@style/info_value" />
+ </LinearLayout>
+
<!-- Roaming -->
<LinearLayout style="@style/entry_layout">
<TextView android:text="@string/radio_info_roaming_label" style="@style/info_label" />
@@ -233,7 +240,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/radio_info_smsc_refresh_label"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
/>
<Button android:id="@+id/update_smsc"
android:textSize="14sp"
@@ -241,14 +248,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/radio_info_smsc_update_label"
- android:layout_toLeftOf="@+id/refresh_smsc"
+ android:layout_toStartOf="@+id/refresh_smsc"
android:layout_alignBaseline="@+id/refresh_smsc"
/>
<EditText android:id="@+id/smsc"
style="@style/form_value"
android:layout_alignBaseline="@+id/refresh_smsc"
- android:layout_toLeftOf="@id/update_smsc"
- android:layout_toRightOf="@id/smsc_label" />
+ android:layout_toStartOf="@id/update_smsc"
+ android:layout_toEndOf="@id/smsc_label" />
</RelativeLayout>
<!-- Test setting to ignore bad DNS, useful in lab environments -->
diff --git a/res/layout/running_processes_item.xml b/res/layout/running_processes_item.xml
index f46527a..7cc2d8d 100644
--- a/res/layout/running_processes_item.xml
+++ b/res/layout/running_processes_item.xml
@@ -29,14 +29,14 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal"
- android:paddingRight="6dip"
- android:paddingLeft="6dip"
+ android:paddingEnd="6dip"
+ android:paddingStart="6dip"
android:gravity="center_vertical" >
<ImageView android:id="@+id/icon"
android:layout_width="@android:dimen/app_icon_size"
android:layout_height="@android:dimen/app_icon_size"
- android:layout_marginRight="11dip"
+ android:layout_marginEnd="11dip"
android:layout_gravity="center_vertical"
android:scaleType="fitCenter"
android:contentDescription="@null" />
@@ -54,14 +54,14 @@
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:paddingRight="4dip"
+ android:paddingEnd="4dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold"
android:singleLine="true"
android:ellipsize="marquee"
android:layout_marginBottom="2dip" />
<TextView android:id="@+id/size"
- android:layout_gravity="center_vertical|right"
+ android:layout_gravity="center_vertical|end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
@@ -74,16 +74,16 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView android:id="@+id/description"
- android:layout_gravity="center_vertical|left"
+ android:layout_gravity="center_vertical|start"
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_weight="1"
- android:paddingRight="4dip"
+ android:paddingEnd="4dip"
android:singleLine="true"
android:ellipsize="marquee"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView android:id="@+id/uptime"
- android:layout_gravity="center_vertical|right"
+ android:layout_gravity="center_vertical|end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
diff --git a/res/layout/running_processes_view.xml b/res/layout/running_processes_view.xml
index e23de16..b5fb810 100644
--- a/res/layout/running_processes_view.xml
+++ b/res/layout/running_processes_view.xml
@@ -26,8 +26,8 @@
<ListView android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingLeft="@*android:dimen/preference_fragment_padding_side"
- android:paddingRight="@*android:dimen/preference_fragment_padding_side"
+ android:paddingStart="@*android:dimen/preference_fragment_padding_side"
+ android:paddingEnd="@*android:dimen/preference_fragment_padding_side"
android:drawSelectorOnTop="false"
android:scrollbarStyle="outsideOverlay"
android:fastScrollEnabled="true" />
@@ -47,17 +47,17 @@
android:clipChildren="false"
android:clipToPadding="false"
android:paddingTop="30dp"
- android:paddingLeft="4dp"
- android:paddingRight="4dp"
+ android:paddingStart="4dp"
+ android:paddingEnd="4dp"
android:paddingBottom="1dp"
- android:layout_marginLeft="@*android:dimen/preference_fragment_padding_side"
- android:layout_marginRight="@*android:dimen/preference_fragment_padding_side">
+ android:layout_marginStart="@*android:dimen/preference_fragment_padding_side"
+ android:layout_marginEnd="@*android:dimen/preference_fragment_padding_side">
<TextView android:id="@+id/foregroundText"
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_weight="1"
android:focusable="true"
- android:gravity="left|bottom"
+ android:gravity="start|bottom"
android:textAppearance="?android:attr/textAppearanceSmallInverse"
android:textColor="#000"
android:singleLine="true" />
@@ -74,12 +74,12 @@
android:singleLine="true"
android:text="@string/memory" />
<TextView android:id="@+id/backgroundText"
- android:layout_gravity="center_vertical|right"
+ android:layout_gravity="center_vertical|end"
android:layout_width="0px"
android:layout_height="wrap_content"
android:layout_weight="1"
android:focusable="true"
- android:gravity="right|bottom"
+ android:gravity="end|bottom"
android:textAppearance="?android:attr/textAppearanceSmallInverse"
android:textColor="#000"
android:singleLine="true" />
diff --git a/res/layout/running_service_details_process.xml b/res/layout/running_service_details_process.xml
index d12b486..caf5664 100644
--- a/res/layout/running_service_details_process.xml
+++ b/res/layout/running_service_details_process.xml
@@ -31,7 +31,7 @@
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
- android:paddingLeft="14dip"
+ android:paddingStart="14dip"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
diff --git a/res/layout/running_service_details_service.xml b/res/layout/running_service_details_service.xml
index b9f9bbe..56cd971 100644
--- a/res/layout/running_service_details_service.xml
+++ b/res/layout/running_service_details_service.xml
@@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:paddingBottom="8dp"
- android:paddingLeft="14dip"
+ android:paddingStart="14dip"
android:textAppearance="?android:attr/textAppearanceMedium" />
<include
diff --git a/res/layout/set_backup_pw.xml b/res/layout/set_backup_pw.xml
index 3743c81..ce9a398 100644
--- a/res/layout/set_backup_pw.xml
+++ b/res/layout/set_backup_pw.xml
@@ -75,7 +75,7 @@
<Button
android:id="@+id/backup_pw_set_button"
android:layout_below="@id/confirm_new_backup_pw"
- android:layout_toRightOf="@id/backup_pw_cancel_button"
+ android:layout_toEndOf="@id/backup_pw_cancel_button"
android:text="@string/backup_pw_set_button_text"
android:layout_height="wrap_content"
android:layout_width="wrap_content" />
diff --git a/res/layout/settings_storage_miscfiles.xml b/res/layout/settings_storage_miscfiles.xml
index 7c52efa..0360cde 100644
--- a/res/layout/settings_storage_miscfiles.xml
+++ b/res/layout/settings_storage_miscfiles.xml
@@ -21,7 +21,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
- android:paddingRight="?android:attr/scrollbarSize"
+ android:paddingEnd="?android:attr/scrollbarSize"
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:focusable="true">
@@ -29,26 +29,26 @@
<CheckBox android:id="@+id/misc_checkbox"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:layout_alignParentLeft="true"
- android:paddingLeft="16dip"
+ android:layout_alignParentStart="true"
+ android:paddingStart="16dip"
android:scaleType="fitCenter"
android:layout_centerVertical="true"/>
<TextView android:id="@+id/misc_filename"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_toRightOf="@id/misc_checkbox"
+ android:layout_toEndOf="@id/misc_checkbox"
android:maxLines="1"
- android:paddingLeft="16dip"
+ android:paddingStart="16dip"
android:textAppearance="?android:attr/textAppearanceSmall"/>
<TextView android:id="@+id/misc_filesize"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_toRightOf="@id/misc_checkbox"
+ android:layout_toEndOf="@id/misc_checkbox"
android:layout_below="@id/misc_filename"
android:maxLines="1"
- android:paddingLeft="16dip"
+ android:paddingStart="16dip"
android:textStyle="bold"
android:textAppearance="?android:attr/textAppearanceSmall" />
</com.android.settings.deviceinfo.FileItemInfoLayout>
diff --git a/res/layout/settings_storage_miscfiles_list.xml b/res/layout/settings_storage_miscfiles_list.xml
index 5f8c5ed..b712073 100644
--- a/res/layout/settings_storage_miscfiles_list.xml
+++ b/res/layout/settings_storage_miscfiles_list.xml
@@ -21,8 +21,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingRight="16dip"
- android:paddingLeft="16dip">
+ android:paddingEnd="16dip"
+ android:paddingStart="16dip">
<ListView android:id="@android:id/list"
android:layout_width="match_parent"
diff --git a/res/layout/setup_preference.xml b/res/layout/setup_preference.xml
index 79d59b3..30b3373 100644
--- a/res/layout/setup_preference.xml
+++ b/res/layout/setup_preference.xml
@@ -49,8 +49,8 @@
android:id="@+id/more"
android:layout_width="@dimen/setup_button_size"
android:layout_height="@dimen/setup_button_size"
- android:layout_marginLeft="8dip"
- android:layout_marginRight="8dip"
+ android:layout_marginStart="8dip"
+ android:layout_marginEnd="8dip"
android:layout_marginBottom="8dip"
android:src="@*android:drawable/ic_menu_moreoverflow_holo_dark"
android:background="?android:attr/actionBarItemBackground"
@@ -107,7 +107,7 @@
android:background="?android:attr/selectableItemBackground"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
- android:paddingRight="?android:attr/scrollbarSize" >
+ android:paddingEnd="?android:attr/scrollbarSize" >
<ImageView
android:id="@+id/add_icon"
@@ -121,8 +121,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="6dip"
- android:layout_marginLeft="15dip"
- android:layout_marginRight="6dip"
+ android:layout_marginStart="15dip"
+ android:layout_marginEnd="6dip"
android:layout_marginTop="6dip"
android:layout_weight="1"
android:ellipsize="marquee"
@@ -144,14 +144,14 @@
android:id="@+id/back_button"
android:layout_width="150dip"
android:layout_height="wrap_content"
- android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
android:layout_margin="5dip"
android:text="@string/wifi_setup_back" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
android:orientation="horizontal" >
<Button
diff --git a/res/layout/trusted_credential.xml b/res/layout/trusted_credential.xml
index a2b84e2..e559a6e 100644
--- a/res/layout/trusted_credential.xml
+++ b/res/layout/trusted_credential.xml
@@ -18,7 +18,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center_vertical"
- android:paddingRight="?android:attr/scrollbarSize"
+ android:paddingEnd="?android:attr/scrollbarSize"
android:background="?android:attr/selectableItemBackground"
android:padding="15dip"
>
@@ -39,7 +39,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@id/trusted_credential_subject_primary"
- android:layout_alignLeft="@id/trusted_credential_subject_primary"
+ android:layout_alignStart="@id/trusted_credential_subject_primary"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
/>
diff --git a/res/layout/trusted_credential_details.xml b/res/layout/trusted_credential_details.xml
index e220e1c..c8c16f7 100644
--- a/res/layout/trusted_credential_details.xml
+++ b/res/layout/trusted_credential_details.xml
@@ -18,6 +18,6 @@
android:id="@+id/cert_remove_button"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
- android:layout_gravity="right"
+ android:layout_gravity="end"
android:layout_margin="6dip"
/>
diff --git a/res/layout/twelve_key_entry.xml b/res/layout/twelve_key_entry.xml
index 81ead98..e1d3172 100644
--- a/res/layout/twelve_key_entry.xml
+++ b/res/layout/twelve_key_entry.xml
@@ -24,16 +24,16 @@
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="64dip"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:orientation="horizontal">
<Button android:id="@+id/one"
android:layout_width="0sp"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textStyle="bold"
/>
@@ -42,8 +42,8 @@
android:layout_width="0sp"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textStyle="bold"
/>
@@ -52,8 +52,8 @@
android:layout_width="0sp"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textStyle="bold"
/>
@@ -63,16 +63,16 @@
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="64dip"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:orientation="horizontal">
<Button android:id="@+id/four"
android:layout_width="0sp"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textStyle="bold"
/>
@@ -81,8 +81,8 @@
android:layout_width="0sp"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textStyle="bold"
/>
@@ -91,8 +91,8 @@
android:layout_width="0sp"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textStyle="bold"
/>
@@ -101,16 +101,16 @@
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="64dip"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:orientation="horizontal">
<Button android:id="@+id/seven"
android:layout_width="0sp"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textStyle="bold"
/>
@@ -119,8 +119,8 @@
android:layout_width="0sp"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textStyle="bold"
/>
@@ -129,8 +129,8 @@
android:layout_width="0sp"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textStyle="bold"
/>
@@ -140,16 +140,16 @@
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="64dip"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:orientation="horizontal">
<Button android:id="@+id/ok"
android:layout_width="0sp"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold"
android:text="@android:string/ok"
@@ -159,8 +159,8 @@
android:layout_width="0sp"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textStyle="bold"
/>
@@ -169,8 +169,8 @@
android:layout_width="0sp"
android:layout_height="fill_parent"
android:layout_weight="1"
- android:layout_marginLeft="2dip"
- android:layout_marginRight="2dip"
+ android:layout_marginStart="2dip"
+ android:layout_marginEnd="2dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textStyle="bold"
android:text="@android:string/cancel"
diff --git a/res/layout/two_buttons_panel.xml b/res/layout/two_buttons_panel.xml
index 5d76312..1a5975a 100755
--- a/res/layout/two_buttons_panel.xml
+++ b/res/layout/two_buttons_panel.xml
@@ -24,8 +24,8 @@
android:layout_height="wrap_content"
android:gravity="bottom"
android:paddingTop="4dip"
- android:paddingLeft="2dip"
- android:paddingRight="2dip"
+ android:paddingStart="2dip"
+ android:paddingEnd="2dip"
android:orientation="horizontal">
<Button
android:id="@+id/left_button"
diff --git a/res/layout/usage_stats.xml b/res/layout/usage_stats.xml
index 9ce338c..96e1bd1 100755
--- a/res/layout/usage_stats.xml
+++ b/res/layout/usage_stats.xml
@@ -24,11 +24,11 @@
android:text="@string/app_name_label"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
- android:paddingRight="6dip"
+ android:paddingEnd="6dip"
android:layout_height="wrap_content" />
<TextView
android:text="@string/launch_count_label"
- android:paddingRight="6dip"
+ android:paddingEnd="6dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
diff --git a/res/layout/usage_stats_item.xml b/res/layout/usage_stats_item.xml
index bdadf85..c231b58 100755
--- a/res/layout/usage_stats_item.xml
+++ b/res/layout/usage_stats_item.xml
@@ -27,24 +27,24 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:paddingRight="6dip"
- android:paddingLeft="12dip"
+ android:paddingEnd="6dip"
+ android:paddingStart="12dip"
android:maxLines="1" />
<TextView android:id="@+id/launch_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:paddingRight="6dip"
- android:paddingLeft="12dip"
+ android:paddingEnd="6dip"
+ android:paddingStart="12dip"
android:maxLines="1" />
<TextView android:id="@+id/usage_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:paddingRight="6dip"
- android:paddingLeft="12dip"
+ android:paddingEnd="6dip"
+ android:paddingStart="12dip"
android:maxLines="1" />
</LinearLayout>
diff --git a/res/layout/user_dictionary_add_word.xml b/res/layout/user_dictionary_add_word.xml
index 4089299..d8b8694 100644
--- a/res/layout/user_dictionary_add_word.xml
+++ b/res/layout/user_dictionary_add_word.xml
@@ -28,9 +28,9 @@
android:ellipsize="end"
android:layout_width="match_parent"
android:layout_height="64dip"
- android:layout_marginLeft="16dip"
- android:layout_marginRight="16dip"
- android:gravity="center_vertical|left"
+ android:layout_marginStart="16dip"
+ android:layout_marginEnd="16dip"
+ android:gravity="center_vertical|start"
android:text="@string/user_dict_settings_add_dialog_title" />
<View android:layout_width="match_parent"
android:layout_height="2dip"
@@ -42,7 +42,7 @@
android:layout_height="match_parent"
android:layout_width="match_parent"
android:layout_gravity="fill_horizontal|center_vertical"
- android:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip"
android:inputType="textNoSuggestions"
@@ -62,7 +62,7 @@
android:orientation="horizontal"
android:measureWithLargestChild="true">
<Button android:layout_width="0dip"
- android:layout_gravity="left"
+ android:layout_gravity="start"
android:layout_weight="1"
android:maxLines="2"
style="?android:attr/buttonBarButtonStyle"
@@ -71,7 +71,7 @@
android:layout_height="wrap_content"
android:onClick="onClickCancel" />
<Button android:layout_width="0dip"
- android:layout_gravity="right"
+ android:layout_gravity="end"
android:layout_weight="1"
android:maxLines="2"
style="?android:attr/buttonBarButtonStyle"
diff --git a/res/layout/user_dictionary_add_word_fullscreen.xml b/res/layout/user_dictionary_add_word_fullscreen.xml
index c0f3f53..f29c669 100644
--- a/res/layout/user_dictionary_add_word_fullscreen.xml
+++ b/res/layout/user_dictionary_add_word_fullscreen.xml
@@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_gravity="fill_horizontal|center_vertical"
- android:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip"
android:inputType="textNoSuggestions"
@@ -40,20 +40,20 @@
<GridLayout android:id="@+id/user_dictionary_add_word_grid"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="8dip"
- android:layout_marginRight="8dip"
+ android:layout_marginStart="8dip"
+ android:layout_marginEnd="8dip"
android:columnCount="2">
<TextView android:id="@+id/user_dictionary_add_shortcut_label"
style="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="left|center_vertical"
+ android:layout_gravity="start|center_vertical"
android:text="@string/user_dict_settings_add_shortcut_option_name" />
<EditText android:id="@+id/user_dictionary_add_shortcut"
android:maxLength="@integer/maximum_user_dictionary_word_length"
android:layout_width="wrap_content"
android:layout_gravity="fill_horizontal|center_vertical"
- android:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip"
android:inputType="textNoSuggestions"
@@ -62,10 +62,10 @@
style="?android:attr/textAppearanceSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="left|center_vertical"
+ android:layout_gravity="start|center_vertical"
android:text="@string/user_dict_settings_add_locale_option_name" />
<Spinner android:id="@+id/user_dictionary_add_locale"
- android:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
android:layout_marginBottom="8dip"
android:layout_marginTop="8dip"
android:layout_width="wrap_content"
diff --git a/res/layout/user_dictionary_item.xml b/res/layout/user_dictionary_item.xml
index 749986e..82d8629 100644
--- a/res/layout/user_dictionary_item.xml
+++ b/res/layout/user_dictionary_item.xml
@@ -19,13 +19,13 @@
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
- android:paddingRight="?android:attr/scrollbarSize"
+ android:paddingEnd="?android:attr/scrollbarSize"
android:background="?android:attr/selectableItemBackground" >
<RelativeLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginLeft="15dip"
- android:layout_marginRight="6dip"
+ android:layout_marginStart="15dip"
+ android:layout_marginEnd="6dip"
android:layout_marginTop="6dip"
android:layout_marginBottom="6dip"
android:layout_weight="1">
@@ -42,7 +42,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/text1"
- android:layout_alignLeft="@android:id/text1"
+ android:layout_alignStart="@android:id/text1"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary"
android:maxLines="1" />
diff --git a/res/layout/wifi_config_ui_for_setup_wizard.xml b/res/layout/wifi_config_ui_for_setup_wizard.xml
index 1b10f90..fef10b3 100644
--- a/res/layout/wifi_config_ui_for_setup_wizard.xml
+++ b/res/layout/wifi_config_ui_for_setup_wizard.xml
@@ -68,19 +68,19 @@
android:minWidth="128dip"
android:layout_height="wrap_content"
android:minHeight="56dip"
- android:paddingRight="16dip"
- android:layout_alignParentLeft="true"
+ android:paddingEnd="16dip"
+ android:layout_alignParentStart="true"
android:text="@string/wifi_ssid"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp"
- android:gravity="left|center_vertical" />
+ android:gravity="start|center_vertical" />
<FrameLayout
android:id="@+id/ssid_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@id/ssid_text"
- android:layout_toRightOf="@id/ssid_text">
+ android:layout_toEndOf="@id/ssid_text">
<EditText
android:id="@+id/ssid"
android:layout_width="368dip"
@@ -105,7 +105,7 @@
android:text="@string/wifi_password"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp"
- android:gravity="left|center_vertical" />
+ android:gravity="start|center_vertical" />
<LinearLayout
android:id="@+id/password_layout"
@@ -162,7 +162,7 @@
android:layout_width="368dip"
android:layout_height="wrap_content"
android:minHeight="56dip"
- android:paddingLeft="4dip"/>
+ android:paddingStart="4dip"/>
</FrameLayout>
</TableRow>
</TableLayout>
diff --git a/res/layout/wifi_setup_custom_list_item_1.xml b/res/layout/wifi_setup_custom_list_item_1.xml
index 9d329ea..3ef7e25 100644
--- a/res/layout/wifi_setup_custom_list_item_1.xml
+++ b/res/layout/wifi_setup_custom_list_item_1.xml
@@ -22,6 +22,6 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:textSize="20sp"
android:gravity="center_vertical"
- android:paddingLeft="16dip"
+ android:paddingStart="16dip"
android:minHeight="48dip"
/>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 9bd2d3a..67ebc61 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datapogings:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-dienste:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Swerwing:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Verander ontsluit-PIN"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Verander ontsluitwagwoord"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Wagwoord moet minstens %d karakters hê"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN moet minstens %d karakters bevat"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN moet minstens %d syfers wees"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Raak \"Gaan voort\" as jy klaar is"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Gaan voort"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Wagwoord moet korter as <xliff:g id="NUMBER">%d</xliff:g> karakters wees."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi-beskermde opstelling"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS begin..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Druk die Wi-Fi-beskermde-opstelling-knoppie op jou roeteerder. Dit word moontlik \"WPS\" genoem of bevat hierdie simbool:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Voer die PIN <xliff:g id="NUMBER">%1$s</xliff:g> op jou Wi-Fi-roeteerder in. Die opstelling kan tot twee minute neem om te voltooi."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Voer die pin <xliff:g id="NUMBER">%1$s</xliff:g> op jou Wi-Fi-roeteerder in. Die opstelling kan tot twee minute neem om te voltooi."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS suksesvol. Koppel tans aan die netwerk..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Gekoppel aan Wi-Fi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS is reeds besig en kan tot twee minute neem om te voltooi"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS is reeds besig en kan tot twee minute neem om te voltooi"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS het misluk. Probeer asseblief oor \'n paar minute weer."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Die koordlose roeteerder se sekuriteitsinstelling (WEP) word nie ondersteun nie"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Die draadlose roeteerder se sekuriteitsinstelling (TKIP) word nie ondersteun nie"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kanselleer uitnodiging?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Wil jy die uitnodiging kanselleer om met <xliff:g id="PEER_NAME">%1$s</xliff:g> te koppel?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi-warmkol"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Skakel tans Wi-Fi-warmkol aan..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Skakel tans Wi-Fi-warmkol af..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Wi-Fi-warmkol <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktief"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fout met Wi-Fi-warmkol"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Stel Wi-Fi-warmkol op"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> se onaktiwiteit"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Muurpapier"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Kies muurpapier uit"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Skermversiering"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Sal begin sodra slaap, mits gekoppel aan krag"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Droom"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Wanneer gedok of sluimer en besig om te laai"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Wanneer sluimer en besig om te laai"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Wanneer gedok"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Gedeaktiveer"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Gekose versiering"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Het droom gekies"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Wanneer om te aktiveer"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> van niksdoen"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nooit"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Probeer dit!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Begin ook wanneer gedok"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Begin wanneer sluimer"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Begin wanneer gedok"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Outomatiese helderheid"</string>
<string name="title_font_size" msgid="4405544325522105222">"Fontgrootte"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Flits vensteroppervlaktes in geheel wanneer dit opdateer"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Wys GPU-aansigopdaterings"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flits aansigte binne die vensters wanneer dit met die GPU geskets is"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Deaktiveer HW-oorleggers"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Gebruik altyd GPU vir skermsamestelling"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Aktiveer spore"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Is jy seker jy wil die gebruiker en alle verwante data van die toestel verwyder?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Wys kennisgewings"</string>
<string name="help_label" msgid="1107174367904110532">"Hulp"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Rekening vir die inhoud"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Seluitsendings"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Kies die tipe noodwaarskuwings wat vertoon moet word."</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index dbb15c1..cf04dc0 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"አሳሹ የHTTP ተተኪ ተጠቅሟል ሆኖም በሌሎች መተግበሪያዎች ላይጠቀም ይችላል።"</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"የውሂብ ሙከራዎች፡"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"የGPRS አገልግሎት፡"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"በመንቀሳቀስ ላይ:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"መክፈቻ PIN ለውጥ"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"መክፈቻ ይለፍ ቃል ለውጥ"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"የይለፍ ቃል ቢያንስ %d ቁምፊዎች መሆን አለበት"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN ቢያንስ %d ቁምፊዎች መሆን አለበት"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN ቢያንስ %d አሃዞች መሆን አለበት"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"ሲያልቅ ቀጥል ንካ"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"ቀጥል"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"የይለፍ ቃል ከ<xliff:g id="NUMBER">%d</xliff:g> ቁምፊዎች ያነሰ መሆን አለበት።"</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"በWi-Fi የተጠበቀ መዋቅር"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS በመጀመር ላይ…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"በራውተርህ ላይ በWi-Fi የሚጠበቀው የማወቀሪያ አዝራርን ተጫን። «WPS» ሊባል ይችላል ወይም ይሄንን ምልክት ያካትታል፦"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"በገመድ አልባ ማዞሪያህ ላይ ፒን <xliff:g id="NUMBER">%1$s</xliff:g>ን አስገባ። ዝግጅቱ እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊፈጅ ይችላል።"</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"በገመድ አልባ ማዞሪያህ ላይ ፒን <xliff:g id="NUMBER">%1$s</xliff:g> አስገባ። ማዋቀሩ እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊፈጅ ይችላል።"</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS ተሳክቷል። ከአውታረ መረቡ ጋር በመገናኘት ላይ…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"ከ<xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi አውታረ መረብ ጋር ተገናኝቷል"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS አስቀድሞ በሂድት ላይ ነውና እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊፈጅ ይችላል"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS አስቀድሞ በሂድት ላይ ነውና እስኪጠናቀቅ ድረስ እስከሁለት ደቂቃ ድረስ ሊፈጅ ይችላል"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS አልተሳካም። እባክህ ከጥቂት ደቂቃዎች በኋላ እንደገና ሞክር።"</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"የገመድ አልባው የማዞሪያ ድህንነት ቅንጅት (WEP) አይደገፍም"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"የገመድ አልባው የማዞሪያ ድህንነት ቅንጅት (TKIP) አይደገፍም"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ግብዣ ይሰረዝ?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"ከ<xliff:g id="PEER_NAME">%1$s</xliff:g> ጋር የመገናኘት ግብዣውን መሰረዝ ትፈልጋለህ?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">" ተጓጓዥ Wi-Fi ድረስ ነጥብ"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"የመገናኛ ነጥብን በማብራት ላይ…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"የመገናኛ ነጥብን በማጥፋት ላይ…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"ተጓጓዥ ድረስ ነጥቦች<xliff:g id="NETWORK_SSID">%1$s</xliff:g> ገባሪ"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">" ተጓጓዥ Wi-Fi ድረስ ነጥብ ስህተት"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Wi-fi መገናኛ ነጥብ አቀናብር"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"ከ <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> የእንቅስቃሴ አለመኖር በኋላ"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"ልጣፍ"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"ልጣፍ ምረጥ ከ"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"ማሳያ ካንዲ"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"ወደ ሀይል ከተገናኘ በእንቅልፍ ላይ ይጀምራል"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"ህልም"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"ሲተከል ወይም ሲተኛ እና ባትሪ እየሞላ ሳለ"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"ሲተኛ እና ባትሪ እየሞላ ሳለ"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"ሲተከል"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"ቦዝኗል"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"የተመረጠ ካንዲ"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"የተመረጠ ህልም"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"መቼ ይገብር"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"ከ<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ስራ ከፈታ በኋላ"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"በፍፁም"</string>
<string name="screensaver_test" msgid="3048249263811694128">"ሞክረው!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"በሚተከልበት ጊዜም ጀምር"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"ሲተኛ ጀምር"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"ሲተከል ጀምር"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"ራስ ሰርብሩህነት"</string>
<string name="title_font_size" msgid="4405544325522105222">"የቁምፊ መጠን"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"የቅርጸ ቁምፊ መጠን"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"የመስኮት ወለሎች ሲዘምኑ መላ መስኮቱን አብለጭልጭ"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"የGPU እይታ ዝማኔዎችን አሳይ"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"ከGPU ጋር ሲሳል መስኮቶች ውስጥ እይታዎችን አብለጭልጭ"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"የHW ተደራቢዎችን አሰናክል"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"ለማያ ገጽ ማቀናበሪያ ሁልጊዜ GPU ተጠቀም"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"ፍንጮችን አንቃ"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"ከመሳሪያው ላይ ተጠቃሚውን እና ሁሉንም ተያያዥነት ያለው ውሂብ ለማስወገድ መፈለግህን እርግጠኛ ነህ?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"ማሳወቂያዎች አሳይ"</string>
<string name="help_label" msgid="1107174367904110532">"እገዛ"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"መለያ ለይዘት"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"የፎቶ መታወቂያ"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"የስልክ ስርጭቶች"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"የሚታዩ የአስቸኳይ አደጋ ማንቂያዎች አይነቶች ምረጥ።"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index aac53bd..d1dfde2 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"يستخدم المتصفح الخادم الوكيل HTTP، ولكنه ربما لا تستخدمه التطبيقات الأخرى."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"محاولات البيانات:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"خدمة GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"تجوال:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"تغيير رقم التعريف الشخصي لإلغاء التأمين"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغيير كلمة مرور إلغاء التأمين"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"يجب أن تكون كلمة المرور %d من الأحرف على الأقل"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"يجب أن يكون رقم التعريف الشخصي %d من الأحرف على الأقل"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"يجب أن يكون رقم التعريف الشخصي %d من الأرقام على الأقل"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"المس \"متابعة\" عند الانتهاء"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"متابعة"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"يجب أن تكون كلمة المرور أقل من <xliff:g id="NUMBER">%d</xliff:g> من الأحرف."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"إعداد Wi-Fi المحمي"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"جارٍ بدء WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"اضغط على زر الإعداد المحمي لشبكة Wi-Fi على الموجه. قد يكون اسمه \"WPS\" أو قد يحتوي على الرمز التالي:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"أدخل رقم التعريف الشخصي <xliff:g id="NUMBER">%1$s</xliff:g> في جهاز توجيه Wi-Fi. يمكن أن يستغرق إكمال الإعداد فترة قد تصل إلى دقيقتين."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"أدخل رقم التعريف الشخصي <xliff:g id="NUMBER">%1$s</xliff:g> في جهاز توجيه Wi-Fi. يمكن أن يستغرق إكمال الإعداد فترة قد تصل إلى دقيقتين."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"نجحت عملية WPS. جارٍ الاتصال بالشبكة…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"تم الاتصال بشبكة Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"عملية WPS قيد التقدم فعلاً ويمكن أن يستغرق اكتمالها فترة قد تصل إلى دقيقتين"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"إعداد WPS قيد التقدم فعلاً ويمكن أن يستغرق اكتماله فترة قد تصل إلى دقيقتين"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"أخفقت عملية WPS. يرجى إعادة المحاولة خلال بضع دقائق."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"إعداد أمان جهاز التوجيه اللاسلكي (WEP) ليس متوافقًا"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"إعداد أمان جهاز التوجيه اللاسلكي (TKIP) ليس متوافقًا"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"هل تريد إلغاء الدعوة؟"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"هل تريد إلغاء الدعوة للاتصال بـ <xliff:g id="PEER_NAME">%1$s</xliff:g>؟"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"نقطة اتصال Wi-Fi المحمولة"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"جارٍ تشغيل نقطة الاتصال…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"جارٍ إيقاف نقطة الاتصال…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"نقطة الاتصال المحمولة <xliff:g id="NETWORK_SSID">%1$s</xliff:g> نشطة"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"خطأ في نقطة اتصال Wi-Fi المتنقلة"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"إعداد نقطة اتصال Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"بعد <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من عدم النشاط"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"الخلفية"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"اختيار خلفية من"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"شاشة التوقف"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"يتم البدء عند الدخول في وضع السكون في حالة الاتصال بمصدر الطاقة"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"حلم"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"عند الإرسال أو السكون والشحن"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"عند السكون والشحن"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"عند الإرساء"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"معطلة"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"شاشة التوقف المحددة"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"الحلم المحدد"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"وقت التنشيط"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"بعد انقضاء مدة <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> من الخمول"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"أبدًا"</string>
<string name="screensaver_test" msgid="3048249263811694128">"لم لا تجرِّب!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"البدء أيضًا عند الإرساء"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"البدء عند السكون"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"البدء عند الإرساء"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"سطوع تلقائي"</string>
<string name="title_font_size" msgid="4405544325522105222">"حجم الخط"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"حجم الخط"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"وميض أسطح النوافذ بالكامل عندما يتم تحديثها"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"إظهار تحديثات عرض GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"وميض العروض داخل النوافذ عندما يتم الرسم باستخدام وحدة معالجة الرسومات"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"تعطيل تراكبات الأجهزة"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"استخدام وحدة معالجة الرسومات دائمًا لتركيب الشاشة"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"تمكين الآثار"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"هل تريد بالتأكيد إزالة المستخدم وجميع البيانات المرتبطة به من الجهاز؟"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"إظهار الإشعارات"</string>
<string name="help_label" msgid="1107174367904110532">"مساعدة"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"حساب المحتوى"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"معرف الصورة"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"عمليات البث الخلوي"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"حدد أنواع تنبيهات الطوارئ لعرضها."</string>
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 01eb5f6..f0b9688 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Проксі HTTP выкарыстоўваецца браўзэрам, але ён не можа выкарыстоўвацца іншымі прыкладаннямi"</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">"Звесткi ячэйкi:"</string>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Спробы перадачы дадзеных:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Служба GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Роўмінг:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Змяніць PIN-код разблакавання"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Змяніць пароль разблакоўкі"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Пароль павінен быць не менш за пэўную колькасць знакаў: %d"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Мiнiмальная колькасць знакаў PIN-коду: %d"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-код павінен утрымлiваць не менш за пэўную колькасць лічбаў: %d."</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Калі скончыце, націсніце \"Працягнуць\""</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Працягнуць"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Максiмальная колькасць знакаў, якую можа змяшчаць пароль: <xliff:g id="NUMBER">%d</xliff:g>"</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Абароненая ўсталёўка Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запускаецца WPS..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Націсніце кнопку Wi-Fi Protected Setup на маршрутызатары. Яна можа называцца \"WPS\" ці ўтрымліваць гэты знак:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Увядзіце PIN-код <xliff:g id="NUMBER">%1$s</xliff:g> для маршрутызатара Wi-Fi. Усталёўка можа заняць да дзвюх хвілін."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Увядзіце PIN-код <xliff:g id="NUMBER">%1$s</xliff:g> для маршрутызатара Wi-Fi. Усталёўка можа заняць да дзвюх хвілін."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"Атрымалася ўключыць WPS. Падключэнне да сеткі..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Падключэнне да сеткі Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS ужо запушчаны, гэта можа заняць да дзвюх хвілін"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS ужо запушчаны, гэта можа заняць да дзвюх хвілін"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Не атрымалася ўсталяваць WPS. Паўтарыце спробу праз некалькі хвілін."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Налады бяспекі бесправаднога маршрутызатара (WEP) не падтрымліваюцца"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Налады бяспекі бесправаднога маршрутызатара (TKIP) не падтрымліваюцца"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Адмяніць запрашэнне?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Вы жадаеце адмяніць запрашэнне на падлучэнне да прылады <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Партатыўная кропка доступу Wi-Fi"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Уключэнне кропкi доступу..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Выключэнне кропкi доступу..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Кропка доступу <xliff:g id="NETWORK_SSID">%1$s</xliff:g> актыўная"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Памылка партатыўнай кропкі доступу Wi-Fi"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Налада кропкi доступу Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Пасля бяздзейнасці: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Шпалеры"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Выбраць шпалеры ў"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Застаўка экрана"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Запусціцца у спячым рэжыме, калі будзе падлучаны да электрасілкавання"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Захавальнiк"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Калі падключана або ў рэжыме сну цi зараджаецца"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"У рэжыме сну i падчас зарадкi"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Калі падключана"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Адключана"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Абраны модуль"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Выбраны модуль"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Хуткасць актывацыі"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Час прастою: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Ніколі"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Паспрабуйце!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Таксама запускаць ў прыстыкаваным стане"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Пачаць у рэжыме сну"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Пачаць пры падключэннi"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Аўтаматычная яркасць"</string>
<string name="title_font_size" msgid="4405544325522105222">"Памер шрыфта"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Памер шрыфту"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Мігаць ўсёй паверхней акна пры абнаўленні"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Паказ. абн. выгляду GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Мігнуць вакном пры чарчэнні з дапамогай GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Адкл. апаратн. накладання"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Заўсёды выкарыстоўваць GPU для экраннай кампаноўкі"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Уключыць сляды"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Вы ўпэўнены, што хочаце выдаліць з прылады карыстальніка і ўсе звязаныя з iм дадзеныя?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Паказваць паведамленні"</string>
<string name="help_label" msgid="1107174367904110532">"Даведка"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Уліковы запіс для змесціва"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Iдэнтыфiкатар фота"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Мабільнае вяшчанне"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Выберыце тыпы надзвычайных папярэджанняў для адлюстравання."</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 6fc36df..d8acdc5 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP прокси сървърът се използва от браузъра, но не и от други приложения."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Опити за данни:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS услуга:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Роуминг:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промяна на PIN кода за отключване"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Промяна на паролата за отключване"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Паролата трябва да е поне %d знака"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN кодът трябва да е поне %d знака"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"ПИН кодът трябва да е поне %d цифри"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Докоснете „Напред“, когато сте готови"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Напред"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Паролата трябва да е по-малко от <xliff:g id="NUMBER">%d</xliff:g> знака."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Защитена настройка на Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS се стартира…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Натиснете бутона за защитена настройка на Wi-Fi на маршрутизатора си. Той може да е с името „WPS“ или да съдържа този символ:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Въведете ПИН кода <xliff:g id="NUMBER">%1$s</xliff:g> на маршрутизатора си за Wi-Fi. Завършването на настройката може да отнеме до две минути."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Въведете ПИН кода <xliff:g id="NUMBER">%1$s</xliff:g> на маршрутизатора си за Wi-Fi. Завършването на настройката може да отнеме до две минути."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS стартира успешно. Установява се връзка с мрежата…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Установена е връзка с Wi-Fi мрежата <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Настройката на WPS вече е в ход и завършването й може да отнеме до две минути"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Настройката на WPS вече е в ход и завършването й може да отнеме до две минути"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Стартирането на WPS не бе успешно. Моля, опитайте отново след няколко минути."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Защитната настройка (WEP) на безжичния маршрутизатор не се поддържа"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Защитната настройка (TKIP) на безжичния маршрутизатор не се поддържа"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Да се анулира ли поканата?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Искате ли да анулирате поканата за свързване с/ъс <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Преносима точка за достъп през Wi-Fi"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Точката за достъп се включва…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Точката за достъп се изключва…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Активна преносима точка за достъп до <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Грешка на преносимата точката за достъп до Wi-Fi"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Настройка на точката за достъп до Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Тапет"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Избор на тапет от"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Наслада от екрана"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Ще стартира от спящ режим при включено захранване"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Сън"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"При свързване с докинг станция или при спящ режим и зареждане"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"При спящ режим и зареждане"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"При свързване с докинг станция"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Деактивирано"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Отбрана наслада"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Избран сън"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Кога да се активира"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"След <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивност"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Никога"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Изпробвайте!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Да се стартира и при свързване с докинг станция"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Да се стартира при спящ режим"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Да се стартира при свързване с докинг станция"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яркост"</string>
<string name="title_font_size" msgid="4405544325522105222">"Размер на шрифта"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Размер на шрифта"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Примигв. на целите повърхности на прозорците при актуализирането им"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Показване на актуализациите на изгледа от GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Примигв. на изгледи в прозорците при начертаване с GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Хардуерни наслагвания: Деактив."</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Винаги да се използва GPU за изграждане на екрана"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Трасирания: Активиране"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Наистина ли искате да премахнете потребителя и всички свързани данни от устройството?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Известия: Показване"</string>
<string name="help_label" msgid="1107174367904110532">"Помощ"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Профил за съдържание"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Идент. № на снимката"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Клетъчни излъчвания"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Изберете типовете спешни сигнали, които да се показват."</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 9933448..0198724 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intents de dades:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servei GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinerància:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Canvia el PIN de desbloqueig"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Canvia la contrasenya de desbloqueig"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contrasenya ha de tenir almenys %d caràcters"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN ha de tenir almenys %d caràcters"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"El PIN ha de tenir almenys %d dígits"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Quan estiguis, toca \"Continua\""</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Continua"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"La contrasenya ha de tenir menys de <xliff:g id="NUMBER">%d</xliff:g> caràcters."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuració protegida de Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"S\'està iniciant WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Prem el botó Configuració protegida de Wi-Fi de l\'encaminador. Pot ser que s\'anomeni \"WPS\" o que contingui aquest símbol:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Introdueix el PIN <xliff:g id="NUMBER">%1$s</xliff:g> a l\'encaminador Wi-Fi. La configuració pot trigar fins a dos minuts a completar-se."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Introdueix el PIN <xliff:g id="NUMBER">%1$s</xliff:g> a l\'encaminador Wi-Fi. La configuració pot trigar fins a dos minuts a completar-se."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"La configuració de WPS s\'ha dut a terme correctament. S\'està connectant a la xarxa..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Connectat a la xarxa Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"La configuració de WPS ja s\'està executant i pot trigar fins a dos minuts a completar-se"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS ja s\'està executant i pot trigar fins a dos minuts a completar-se"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"S\'ha produït un error en iniciar WPS. Torna-ho a provar d\'aquí a una estona."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"La configuració de seguretat de l\'encaminador sense fils (WEP) no és compatible"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"La configuració de seguretat de l\'encaminador sense fils (TKIP) no és compatible"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vols cancel·lar la invitació?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vols cancel·lar la invitació per connectar amb <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Punt de connexió Wi-fi portàtil"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"S\'està activant la zona Wi-Fi…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"S\'està desactivant la zona Wi-Fi…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Punt de connexió portàtil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actiu"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error de punt de connexió Wi-fi portàtil"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configura la zona Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivitat"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Fons de pantalla"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecciona fons de pantalla de"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Pantalla de caramel"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Es posarà en repòs quan estigui connectat a l\'alimentació elèctrica"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Somni"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Quan estigui connectat o inactiu i carregant-se"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Quan estigui inactiu i carregant-se"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Quan estigui connectat"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Desactivat"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Caramels seleccionats"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Somni seleccionat"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Moment de l\'activació"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Després de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'estat inactiu"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Mai"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Prova-ho!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Inicia\'l també quan estigui connectat"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Inicia quan estigui inactiu"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Inicia quan estigui connectat"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Brillantor automàtica"</string>
<string name="title_font_size" msgid="4405544325522105222">"Mida del tipus de lletra"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Mida de la lletra"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash a superf. de finestres sencer. en act."</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Mostra act. vis. de GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash visual. dins de finestres en pres. amb GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Desact. superposicions HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per a la composició de la pantalla"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Activa les traces"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Estàs segur que vols eliminar l\'usuari i totes les dades associades del dispositiu?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostra les notificacions"</string>
<string name="help_label" msgid="1107174367904110532">"Ajuda"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Compte per al contingut"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Identificador de la foto"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Emissions mòbils"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona els tipus d\'alertes d\'emergència que es mostraran."</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 65736c8..d5d6eb2 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokusy dat:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Služba GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Změna bezpečnostního kódu PIN"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Změnit bezpečnostní heslo"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Heslo musí obsahovat nejméně %d znaky"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Kód PIN musí obsahovat nejméně %d znaky"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Počet číslic v kódu PIN musí být nejméně %d."</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Po dokončení se dotkněte tlačítka Pokračovat"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Pokračovat"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Heslo musí mít méně než <xliff:g id="NUMBER">%d</xliff:g> znaků."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Chráněné nastavení Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Spouštění WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Stiskněte na směrovači tlačítko Chráněné nastavení Wi-Fi. Může být označeno textem „WPS“ nebo tímto symbolem:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Zadejte ve svém směrovači sítě Wi-Fi kód PIN <xliff:g id="NUMBER">%1$s</xliff:g>. Proces nastavení může trvat až dvě minuty."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Zadejte ve svém směrovači sítě Wi-Fi kód PIN <xliff:g id="NUMBER">%1$s</xliff:g>. Proces nastavení může trvat až dvě minuty."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"Spuštění WPS se podařilo. Probíhá připojení k síti..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Připojeno k síti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS probíhá a dokončení procesu může trvat až dvě minuty."</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Nastavování WPS probíhá a dokončení procesu může trvat až dvě minuty."</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Spuštění WPS se nezdařilo. Zkuste to znovu za několik minut."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Nastavení zabezpečení bezdrátového směrovače (WEP) není podporováno"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Nastavení zabezpečení bezdrátového směrovače (TKIP) není podporováno"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Zrušit pozvánku?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Chcete zrušit pozvánku ke spojení s klientem <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Přenosný hotspot Wi-Fi"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Zapínání hotspotu…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Vypínání hotspotu…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Přenosný hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktivní"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Chyba přenosného hotspotu Wi-Fi"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Nastavit hotspot sítě Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrat tapetu:"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Dekorace displeje"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Pokud je zařízení připojeno ke zdroji, spustí se při přechodu do režimu spánku"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Sen"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Při vložení do doku nebo při nabíjení v režimu spánku"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Při nabíjení v režimu spánku"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Při vložení do doku"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Vypnuto"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Vybraná dekorace"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Vybraný sen"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Čas aktivace"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Doba nečinnosti: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikdy"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Vyzkoušet"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Spustit i po vložení do doku"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Spustit při přechodu do režimu spánku"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Spustit při vložení do doku"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
<string name="title_font_size" msgid="4405544325522105222">"Velikost písma"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Velikost písma"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Celý obsah okna při obnovení bliká."</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Zobrazit obnovení s GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Zobrazení v oknech vykreslovaná s GPU blikají."</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Zakázat HW vrstvy"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy použít GPU ke skládání obrazovky."</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Povolit sledování"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Opravdu chcete tohoto uživatele a veškerá k němu přidružená data odebrat ze zařízení?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Zobrazit upozornění"</string>
<string name="help_label" msgid="1107174367904110532">"Nápověda"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Účet pro obsah"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Hromadné zasílání zpráv v rámci buňky"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vyberte typy mimořádných upozornění, která chcete zobrazovat."</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 92501cc..f369027 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-proxyen anvendes af browseren, men må ikke bruges af andre apps."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataforsøg:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-tjeneste:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Skift pinkode til at låse op"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Skift adgangskode til at låse op"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Adgangskoden skal være på mindst %d tegn"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Pinkoden skal være på mindst %d tegn"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Pinkoden skal være på mindst %d tegn"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Tryk på Fortsæt, når du er færdig"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsæt"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Adgangskoden skal være kortere end <xliff:g id="NUMBER">%d</xliff:g> tegn."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi-beskyttet konfiguration"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starter WPS..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Tryk på Wi-Fi-beskyttet konfiguration på din router. Det kaldes muligvis \"WPS\" eller indeholder dette symbol:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Indtast pinkoden <xliff:g id="NUMBER">%1$s</xliff:g> på din Wi-Fi-router. Konfigurationen kan tage op til to minutter at fuldføre."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Indtast pinkoden <xliff:g id="NUMBER">%1$s</xliff:g> på din Wi-Fi-router. Konfigurationen kan tage op til to minutter at fuldføre."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS godkendt. Opretter forbindelse til netværket..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Forbundet til Wi-Fi-netværket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS er allerede i gang og kan tage op til to minutter at fuldføre"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS er allerede i gang og kan tage op til to minutter at fuldføre"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS mislykkedes. Prøv igen om lidt."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Sikkerhedsindstillingen til trådløse routere (WEP) understøttes ikke"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sikkerhedsindstillingen til trådløse routere (TKIP) understøttes ikke"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vil du annullere invitationen?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vil du annullere invitationen til at oprette forbindelse med <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Bærbart Wi-Fi-hotspot"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Aktiverer hotspot..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Deaktiverer hotspot..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Det bærbare hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktivt"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fejl ved bærbart Wi-Fi-hotspot"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Konfiguration af Wi-Fi-hotspot"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivitet"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Baggrund"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vælg baggrund fra"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Skærmdekoration"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Går i dvale, når tilsluttet strøm"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Drøm"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Når enheden er tilsluttet dockingstationen eller i dvale og oplader"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Når enheden er i dvale og oplader"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Når enheden er tilsluttet dockingstationen"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Deaktiveret"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Valgte dekoration"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Valgt drøm"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Hvornår der skal aktiveres"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Efter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitet"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Aldrig"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Prøv det!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Aktivér også, når tilsluttet dockingstationen"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Aktivér i dvale"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Aktivér, når enheden er tilsluttet dockingstationen"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
<string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Skriftstørrelse"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Fremhæv hele vinduesoverflader, når de opdateres"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Vis opdat. af GPU-visn."</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Fremhæv visninger i vinduer, når de tegnes med GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Deaktiver HW-overlejring"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Brug altid GPU til skærmsammensætning"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Aktivér spor"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Er du sikker på, at du vil fjerne brugeren og alle tilhørende data fra enheden?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Vis meddelelser"</string>
<string name="help_label" msgid="1107174367904110532">"Hjælp"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Konto til indhold"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Foto-id"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Mobilmeddelelser"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vælg de typer af nødalarmer, der skal vises."</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 1d907eb..59844cd 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Der HTTP-Proxy wird vom Browser verwendet, darf aber nicht von anderen Apps verwendet werden."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datenversuche:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-Service:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Entsperrungs-PIN ändern"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Entsperrungspasswort ändern"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Das Passwort muss mindestens %d Zeichen enthalten."</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Die PIN muss mindestens %d Zeichen enthalten."</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Die PIN muss mindestens %d Ziffern enthalten."</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Wählen Sie \"Weiter\", sobald Sie fertig sind."</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Weiter"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Das Passwort muss weniger als <xliff:g id="NUMBER">%d</xliff:g> Zeichen haben."</string>
@@ -531,10 +532,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Geschützte WLAN-Einrichtung"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS wird gestartet…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Wählen Sie die Schaltfläche \"Wi-Fi Protected Setup\" auf Ihrem Router aus. Eventuell lautet sie auch \"WPS\" oder enthält dieses Symbol:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Geben Sie die PIN <xliff:g id="NUMBER">%1$s</xliff:g> auf Ihrem WLAN-Router ein. Die Einrichtung kann bis zu 2 Minuten dauern."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Geben Sie die PIN <xliff:g id="NUMBER">%1$s</xliff:g> auf Ihrem WLAN-Router ein. Die Einrichtung kann bis zu 2 Minuten dauern."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS erfolgreich. Netzwerkverbindung wird hergestellt…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Mit WLAN-Netzwerk <xliff:g id="NETWORK_NAME">%s</xliff:g> verbunden"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS ist bereits im Aufbau. Dies kann bis zu 2 Minuten dauern."</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS wird bereits durchgeführt. Dieser Vorgang kann bis zu 2 Minuten dauern."</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS fehlgeschlagen. Bitte versuchen Sie es in einigen Minuten erneut."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Die Sicherheitseinstellung für drahtlose Router (WEP) wird nicht unterstützt."</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Die Sicherheitseinstellung für drahtlose Router (TKIP) wird nicht unterstützt."</string>
@@ -606,6 +607,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Einladung ablehnen?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Möchten Sie die Einladung zum Verbinden mit <xliff:g id="PEER_NAME">%1$s</xliff:g> ablehnen?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobiler WLAN-Hotspot"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot wird aktiviert…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot wird deaktiviert…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mobiler Hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktiv"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fehler beim mobilen WLAN-Hotspot"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"WLAN-Hotspot einrichten"</string>
@@ -674,15 +677,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Hintergrund"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Hintergrund auswählen"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Bildschirm-Dekor"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Wird bei Netzanschluss bei Aktivierung des Standby-Modus gestartet"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Traum"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Bei angedocktem Gerät oder im Standby-Modus beim Aufladen"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Im Standby-Modus beim Aufladen"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Bei angedocktem Gerät"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Deaktiviert"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Ausgewähltes Dekor"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Ausgewählter Traum"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Zeitpunkt der Aktivierung"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Nach <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ohne Aktivität"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nie"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Testen"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Auch bei angedocktem Gerät starten"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Bei Aktivierung des Standby-Modus starten"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Bei angedocktem Gerät starten"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automatische Helligkeit"</string>
<string name="title_font_size" msgid="4405544325522105222">"Schriftgröße"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Schriftgröße"</string>
@@ -1551,6 +1557,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash für gesamte Fensteroberfläche bei Aktualisierung"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Updates m. GPU-Ansicht"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash-Ansicht im Fenster, wenn mit GPU dargestellt"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"HW-Overlays deaktivieren"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"GPU immer für Bildschirmaufbau verwenden"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Tracing aktivieren"</string>
@@ -1706,6 +1716,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Möchten Sie den Nutzer und alle mit ihm verbundenen Daten wirklich von Ihrem Gerät löschen?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Benachrichtigungen zeigen"</string>
<string name="help_label" msgid="1107174367904110532">"Hilfe"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Konto für Inhalte"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell Broadcasts"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Wählen Sie aus, welche Notfallbenachrichtigungen angezeigt werden sollen."</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ed027c9..6bd9562 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Ο διακομ. μεσολ. HTTP χρησιμοποιείται από το πρόγρ. περιήγ., αλλά δεν πρέπει να χρησιμοποιείται από άλλες εφαρμογές."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Προσπάθειες δεδομένων:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Υπηρεσία GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Περιαγωγή:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Αλλαγή αριθμού PIN ξεκλειδώματος"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Αλλαγή κωδικού πρόσβασης ξεκλειδώματος"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Ο κωδικός πρόσβασης πρέπει να έχει τουλάχιστον %d χαρακτήρες"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Ο αριθμός PIN πρέπει να έχει τουλάχιστον %d χαρακτήρες"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Ο κωδικός PIN θα πρέπει να αποτελείται από τουλάχιστον %d ψηφία"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Πατήστε \"Συνέχεια\" όταν τελειώσετε"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Συνέχεια"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Ο κωδικός πρόσβασης πρέπει να περιέχει λιγότερους από <xliff:g id="NUMBER">%d</xliff:g> χαρακτήρες."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Ρύθμιση προστατευόμενου Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Έναρξη WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Πατήστε ο κουμπί ρύθμισης προστατευόμενου Wi-Fi στον δρομολογητή σας. Ενδέχεται να ονομάζεται \"WPS\" ή να περιέχει αυτό το σύμβολο:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Εισαγάγετε τον κωδικό PIN <xliff:g id="NUMBER">%1$s</xliff:g> στον δρομολογητή σας Wi-Fi. Η ολοκλήρωση της εγκατάστασης μπορεί να διαρκέσει έως και δύο λεπτά."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Εισαγάγετε το PIN <xliff:g id="NUMBER">%1$s</xliff:g> στον δρομολογητή σας Wi-Fi. Η ρύθμιση μπορεί να διαρκέσει έως και δύο λεπτά."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"Επιτυχία WPS. Σύνδεση στο δίκτυο…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Σύνδεση στο δίκτυο Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Η ρύθμιση WPS βρίσκεται ήδη σε εξέλιξη και ενδεχομένως να χρειαστούν έως και δύο λεπτά προκειμένου να ολοκληρωθεί"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Η ρύθμιση WPS βρίσκεται ήδη σε εξέλιξη και ίσως χρειαστούν έως και δύο λεπτά για να ολοκληρωθεί"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Αποτυχία WPS. Προσπαθήστε ξανά σε λίγα λεπτά."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Δεν υποστηρίζεται η ρύθμιση ασφάλειας ασύρματου δρομολογητή (WEP)"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Δεν υποστηρίζεται η ρύθμιση ασφάλειας ασύρματου δρομολογητή (TKIP)"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Ακύρωση πρόσκλησης;"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Θέλετε να ακυρώσετε την πρόσκληση για τη σύνδεση με τη συσκευή <xliff:g id="PEER_NAME">%1$s</xliff:g>;"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Φορητό σημείο πρόσβασης Wi-Fi"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Ενεργοποίηση σημείου πρόσβασης…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Απενεργοποίηση σημείου πρόσβασης…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Το φορητό σημείο πρόσβασης <xliff:g id="NETWORK_SSID">%1$s</xliff:g> είναι ενεργό"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Σφάλμα φορητού σημείου πρόσβασης Wi-Fi"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Ρύθμιση φορητού σημείου πρόσβασης Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> αδράνειας"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Ταπετσαρία"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Επιλογή ταπετσαρίας από"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Διακόσμηση οθόνης"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Θα ξεκινήσει όταν εισέλθει σε αδράνεια, εφόσον είναι συνδεδεμένο στο ρεύμα"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Όνειρο"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Κατά τη σύνδεση ή κατά την αναστολή λειτουργίας και τη φόρτιση"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Κατά την αναστολή λειτουργίας και τη φόρτιση"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Κατά τη σύνδεση"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Απενεργοποιημένη"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Επιλεγμένη διακόσμηση"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Έχει επιλεγεί όνειρο"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Χρόνος ενεργοποίησης"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Μετά από <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> σε αδράνεια"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Ποτέ"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Δοκιμάστε το!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Επίσης να εκκινείται όταν είναι στη βάση σύνδεσης"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Έναρξη κατά την αναστολή λειτουργίας"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Έναρξη κατά τη σύνδεση"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Αυτόματη φωτεινότητα"</string>
<string name="title_font_size" msgid="4405544325522105222">"Μέγεθος γραμματοσειράς"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Μέγεθος γραμματοσειρ."</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Προβολή Flash ολόκλ. των επιφ παραθ. όταν ενημερ."</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Εμφάνιση των ενημερώσεων προβολής GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Προβολές Flash εντός παραθύρων όταν γίνεται σχεδιασμός με το GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Απενεργ. επικαλύψεων HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Να γίνεται πάντα χρήση του GPU για σύνθεση οθόνης"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Ενεργοποίηση ιχνών"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Είστε βέβαιοι ότι θέλετε να καταργήσετε τον χρήστη και όλα τα σχετικά δεδομένα από τη συσκευή;"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Εμφάν. ειδοποιήσεων"</string>
<string name="help_label" msgid="1107174367904110532">"Βοήθεια"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Λογαριασμός για περιεχόμενο"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Αναγνωριστικό φωτογραφίας"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Εκπομπές κινητής τηλεφωνίας"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Επιλέξτε τους τύπους ειδοποιήσεων έκτακτης ανάγκης που θα εμφανίζονται."</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 03559e0..da7a2b3 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Data attempts:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS service:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Change unlock PIN"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Change unlock password"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Password must be at least %d characters"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN must be at least %d characters"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN must be at least %d characters"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Touch Continue when finished"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Continue"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Password must be fewer than <xliff:g id="NUMBER">%d</xliff:g> characters."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi Protected Setup"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starting WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Press the WiFi Protected Setup button on your router. It may be called \"WPS\" or contain this symbol:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Enter PIN <xliff:g id="NUMBER">%1$s</xliff:g> on your Wi-Fi router. The setup may take up to two minutes to complete."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Enter pin <xliff:g id="NUMBER">%1$s</xliff:g> on your Wi-Fi router. The setup may take up to two minutes to complete."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS succeeded. Connecting to the network…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Connected to the Wi-Fi network <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS is already in progress and can take up to two minutes to complete"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS is already in progress and can take up to two minutes to complete"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Request failed. Please try again in a few minutes."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"The wireless router security setting (WEP) is not supported"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"The wireless router security setting (TKIP) is not supported"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancel invitation"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Do you want to cancel invitation to connect with <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Portable Wi-Fi hotspot"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Turning hotspot on…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Turning off hotspot…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Portable hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> active"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Portable Wi-Fi hotspot error"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Set up Wi-Fi hotspot"</string>
@@ -673,15 +676,25 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> of inactivity"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Choose wallpaper from"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Will start upon sleep if connected to power"</string>
+ <!-- no translation found for screensaver_settings_title (4458091032540874366) -->
+ <skip />
+ <!-- no translation found for screensaver_settings_summary_both (1175671101656240599) -->
+ <skip />
+ <!-- no translation found for screensaver_settings_summary_sleep (7231274537626605107) -->
+ <skip />
+ <!-- no translation found for screensaver_settings_summary_dock (4450616262936082466) -->
+ <skip />
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Disabled"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Selected candy"</string>
+ <!-- no translation found for screensaver_component_title (5786117148360329058) -->
+ <skip />
<string name="screensaver_timeout_title" msgid="4882666970355550822">"When to activate"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"After <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> spent idle"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Never"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Try it!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Also start when docked"</string>
+ <!-- no translation found for screensaver_activate_on_sleep_title (5463857907577089065) -->
+ <skip />
+ <!-- no translation found for screensaver_activate_on_dock_title (5594601783697028555) -->
+ <skip />
<string name="automatic_brightness" msgid="5014143533884135461">"Automatic brightness"</string>
<string name="title_font_size" msgid="4405544325522105222">"Font size"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Font size"</string>
@@ -1550,6 +1563,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash entire window surfaces when they update"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Show GPU view updates"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash views inside windows when drawn with the GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Disable HW overlays"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Always use GPU for screen compositing"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Enable tracing"</string>
@@ -1705,6 +1722,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Are you sure you want to remove the user and all associated data from the device?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Show notifications"</string>
<string name="help_label" msgid="1107174367904110532">"Help"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Account for content"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Mobile broadcasts"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Select the types of emergency alerts to display."</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index b4e50dd..2bdfba7 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intentos de datos:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servicio GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar la contraseña de desbloqueo"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contraseña debe tener al menos %d caracteres."</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN debe tener al menos %d caracteres."</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"El PIN debe tener al menos %d dígitos."</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Toca Continuar cuando hayas finalizado"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"La contraseña debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuración Wi-Fi protegida"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando la WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Pulsa el botón Configuración Wi-Fi protegida del router. Es posible que se denomine \"WPS\" o que incluya este símbolo:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Ingresa el PIN <xliff:g id="NUMBER">%1$s</xliff:g> en tu enrutador Wi-Fi. La configuración puede demorar hasta dos minutos en completarse."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Introduce el código PIN <xliff:g id="NUMBER">%1$s</xliff:g> en el router Wi-Fi. El proceso de configuración puede tardar hasta dos minutos."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"La WPS se inició correctamente. Estableciendo conexión con la red…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Se estableció conexión con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"La configuración de WPS está en curso y puede demorar hasta dos minutos en completarse."</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"El proceso de configuración de WPS está en curso y puede tardar hasta dos minutos."</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"No se pudo iniciar la WPS. Vuelve a intentarlo en unos minutos."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"No se admite la configuración de la seguridad del enrutador inalámbrico (WEP)."</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"No se admite la configuración de seguridad del enrutador inalámbrico (TKIP)."</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"¿Quieres cancelar la invitación?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"¿Quieres cancelar la invitación para conectarte con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Zona Wi-Fi portátil de <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activa"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error en la zona Wi-Fi portátil"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configurar la zona Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Después de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Elegir fondo de pantalla de"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Pantalla de caramelo"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Se iniciará luego de que la pantalla se desactive, siempre que exista una conexión eléctrica."</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Sueño"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Cuando se conecte el dispositivo, o cuando se encuentre inactivo y cargándose"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Cuando el dispositivo se encuentre inactivo y cargándose"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Cuando se conecte el dispositivo"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Inhabilitado"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Caramelo seleccionado"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Sueño seleccionado"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Tiempo de espera para la activación"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Luego de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Pruébalo."</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Activar también cuando el dispositivo esté conectado"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Iniciar cuando se suspenda el dispositivo"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Iniciar cuando se conecte el dispositivo"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
<string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Tamaño de fuente"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Mostrar superficies de vent. cuando se actualizan"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Ver actualiz. vistas GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Mostrar vistas de ventanas procesadas con GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Desactivar superpos. HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Usar GPU para combinar pantallas"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Activar seguimientos"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"¿Seguro que quieres eliminar el usuario y todos los datos asociados del dispositivo?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificaciones"</string>
<string name="help_label" msgid="1107174367904110532">"Ayuda"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Cuenta para contenido"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Emisiones móviles"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona los tipos de alertas de emergencia para mostrar."</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 49d8a9c..082536e 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"El navegador utiliza el proxy HTTP, pero no puede utilizarlo otras aplicaciones."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Intentos de datos:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servicio GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinerancia:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambiar PIN de desbloqueo"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambiar contraseña de desbloqueo"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"La contraseña debe contener al menos %d caracteres."</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"El PIN debe contener al menos %d caracteres."</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"El PIN debe contener como mínimo %d dígitos."</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Tocar Continuar al terminar"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"La contraseña debe tener menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuración WPS"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando configuración WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Pulsa el botón Configuración WPS del router. Es posible que se llame WPS o que incluya este símbolo:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Introduce el código PIN <xliff:g id="NUMBER">%1$s</xliff:g> en el router Wi-Fi. El proceso de configuración puede tardar hasta dos minutos."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Introduce el código PIN <xliff:g id="NUMBER">%1$s</xliff:g> en el router Wi-Fi. El proceso de configuración puede tardar hasta dos minutos."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"La configuración WPS se ha iniciado correctamente. Estableciendo conexión con la red…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Conexión establecida con la red Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"El proceso WPS ya se ha iniciado y tiene una duración aproximada de dos minutos."</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"El proceso de configuración de WPS está en curso y puede tardar hasta dos minutos."</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Se ha producido un error en la configuración WPS. Inténtalo de nuevo en unos minutos."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"No se admite el ajuste de seguridad del router inalámbrico (protocolo WEP)."</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"No se admite el ajuste de seguridad del router inalámbrico (protocolo TKIP)."</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"¿Quieres cancelar la invitación?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"¿Quieres cancelar la invitación para establecer conexión con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Zona Wi-Fi portátil"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Activando zona Wi-Fi en…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desactivando zona Wi-Fi…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> de zona Wi-Fi portátil activa"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error de zona Wi-Fi portátil"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configurar zona Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Fondo de pantalla"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Seleccionar fondo de pantalla de..."</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Salvapantallas"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Se iniciará cuando el dispositivo entre en suspensión si está conectado a la corriente"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Cuando el dispositivo esté conectado o inactivo y cargando"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Cuando el dispositivo esté inactivo y cargando"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Cuando el dispositivo esté conectado"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Inhabilitado"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Caramelo seleccionado"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Módulo dream seleccionado"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Cuándo activar"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactividad"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Probar"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Iniciar también cuando el dispositivo esté conectado"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Iniciar cuando se suspenda el dispositivo"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Iniciar cuando el dispositivo esté conectado"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Brillo automático"</string>
<string name="title_font_size" msgid="4405544325522105222">"Tamaño de fuente"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Tamaño de fuente"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Actualizar superficies de ventana al actualizarse"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Actualizaciones GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Actualizar vistas de las ventanas creadas con GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Inhabilitar superposiciones HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Usar siempre GPU para combinar pantallas"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Habilitar seguimientos"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"¿Seguro que quieres eliminar el usuario y todos los datos asociados del dispositivo?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificaciones"</string>
<string name="help_label" msgid="1107174367904110532">"Ayuda"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Cuenta para contenido"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Difusiones móviles"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecciona los tipos de alertas de emergencia que quieres ver."</string>
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index d804669..87bb03e 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Brauser kasutab HTTP-puhverserverit, kuid muud rakendused ei tohi seda kasutada."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Andmete katsed:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-teenus:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Rändlus:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuda avamise PIN-koodi"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Avamisparooli muutmine"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parool peab olema vähemalt %d tähemärgi pikkune"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koodis peab olema vähemalt %d tähemärki"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koodi pikkus peab olema vähemalt %d numbrit"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Puudutage käsku Jätka, kui olete lõpetanud"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Jätka"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Parool peab olema lühem kui <xliff:g id="NUMBER">%d</xliff:g> märki."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Kaitstud WiFi seadistamine"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS-i käivitamine …"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Vajutage marsruuteril nuppu Kaitstud Wi-Fi seadistamine. Selle nimi võib olla ka „WPS” või see võib sisaldada sellist sümbolit:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Sisestage WiFi-ruuteril PIN-kood <xliff:g id="NUMBER">%1$s</xliff:g>. Seadistuse lõpetamiseks võib kuluda kuni kaks minutit."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Sisestage WiFi-ruuteril PIN-kood <xliff:g id="NUMBER">%1$s</xliff:g>. Seadistuse lõpuleviimiseks võib kuluda kuni kaks minutit."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS õnnestus. Võrguga ühenduse loomine …"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Ühendatud WiFi-võrguga <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS on juba käimas ja selle lõpuleviimiseks võib kuluda kuni kaks minutit"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS on juba käimas ja selle lõpuleviimiseks võib kuluda kuni kaks minutit"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS ebaõnnestus. Proovige mõne minuti pärast uuesti."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Ruuteri turvaseadet (WEP) ei toetata"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Ruuteri turvaseadet (TKIP) ei toetata"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kas tühistada kutse?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Kas soovite tühistada kutse kasutajaga <xliff:g id="PEER_NAME">%1$s</xliff:g> ühenduse loomiseks?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Kantav WiFi-tööpunkt"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Leviala sisselülitamine ..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Leviala väljalülitamine ..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Kantav tööpunkt <xliff:g id="NETWORK_SSID">%1$s</xliff:g> on aktiivne"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Kantava WiFi-tööpunkti viga"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"WiFi leviala seadistamine"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Pärast <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tegevusetust"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustapilt"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Taustapildi valimine:"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Ekraanikaunistus"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Kui seade on vooluvõrgus, rakendub ekraanisäästja pärast unerežiimi lülitumist"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Uni"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kui on dokitud või puhkerežiimis ja laadib"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kui on puhkerežiimis ja laadib"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kui on dokitud"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Keelatud"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Valitud kaunistus"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Valitud uni"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Aktiveerimisaeg"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Pärast seda, kui seade on olnud tegevusetu <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Mitte kunagi"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Proovige"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Rakendub ka siis, kui seade on dokitud"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Käivitu puhkerežiimis"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Käivitu siis, kui seade on dokitud"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automaatne eredus"</string>
<string name="title_font_size" msgid="4405544325522105222">"Fondi suurus"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Fondi suurus"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Akna pinna värskendam. kirjuta kogu akna pind üle"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Näita GPU kuva värskend."</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU-ga joonistades kirjuta akende kuvad üle"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Keela HW ülekatted"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Kasuta alati GPU-d kuva koostamisel"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Luba jälgimine"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Kas soovite kindlasti eemaldada seadmest kasutaja ja kõik seotud andmed?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Kuva teatised"</string>
<string name="help_label" msgid="1107174367904110532">"Abi"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Sisu konto"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Foto ID"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Kärjeteated"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Valige kuvamiseks hädaolukorra märguannete tüübid."</string>
</resources>
diff --git a/res/values-fa-nokeys/strings.xml b/res/values-fa-nokeys/strings.xml
index 282556f..2542210 100644
--- a/res/values-fa-nokeys/strings.xml
+++ b/res/values-fa-nokeys/strings.xml
@@ -16,5 +16,5 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="applications_settings_summary" msgid="6616938758022986257">"مدیریت برنامه های کاربردی"</string>
+ <string name="applications_settings_summary" msgid="6616938758022986257">"مدیریت برنامههای کاربردی"</string>
</resources>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index 4c6b973..e1b40cb 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -30,34 +30,34 @@
<item msgid="8392017019801393511">"همه"</item>
</string-array>
<string-array name="screen_timeout_entries">
- <item msgid="3342301044271143016">"15 ثانیه"</item>
- <item msgid="8881760709354815449">"30 ثانیه"</item>
- <item msgid="7589406073232279088">"1 دقیقه قبل"</item>
- <item msgid="7001195990902244174">"2 دقیقه"</item>
- <item msgid="7489864775127957179">"5 دقیقه"</item>
- <item msgid="2314124409517439288">"10 دقیقه"</item>
- <item msgid="6864027152847611413">"30 دقیقه"</item>
+ <item msgid="3342301044271143016">"۱۵ ثانیه"</item>
+ <item msgid="8881760709354815449">"۳۰ ثانیه"</item>
+ <item msgid="7589406073232279088">"۱ دقیقه قبل"</item>
+ <item msgid="7001195990902244174">"۲ دقیقه"</item>
+ <item msgid="7489864775127957179">"۵ دقیقه"</item>
+ <item msgid="2314124409517439288">"۱۰ دقیقه"</item>
+ <item msgid="6864027152847611413">"۳۰ دقیقه"</item>
</string-array>
<string-array name="dream_timeout_entries">
<item msgid="3149294732238283185">"هیچوقت"</item>
- <item msgid="2194151041885903260">"15 ثانیه"</item>
- <item msgid="5892295237131074341">"30 ثانیه"</item>
- <item msgid="3538441365970038213">"1 دقیقه"</item>
- <item msgid="412343871668955639">"2 دقیقه"</item>
- <item msgid="5076853889688991690">"5 دقیقه"</item>
- <item msgid="1903860996174927898">"10 دقیقه"</item>
- <item msgid="6415509612413178727">"30 دقیقه"</item>
+ <item msgid="2194151041885903260">"۱۵ ثانیه"</item>
+ <item msgid="5892295237131074341">"۳۰ ثانیه"</item>
+ <item msgid="3538441365970038213">"۱ دقیقه"</item>
+ <item msgid="412343871668955639">"۲ دقیقه"</item>
+ <item msgid="5076853889688991690">"۵ دقیقه"</item>
+ <item msgid="1903860996174927898">"۱۰ دقیقه"</item>
+ <item msgid="6415509612413178727">"۳۰ دقیقه"</item>
</string-array>
<string-array name="lock_after_timeout_entries">
<item msgid="8929270399652145290">"فوری"</item>
- <item msgid="6736512735606834431">"5 ثانیه"</item>
- <item msgid="8044619388267891375">"15 ثانیه"</item>
- <item msgid="1822002388249545488">"30 ثانیه"</item>
- <item msgid="8538071621211916519">"1 دقیقه"</item>
- <item msgid="5663439580228932882">"2 دقیقه"</item>
- <item msgid="49888496216106852">"5 دقیقه"</item>
- <item msgid="9002737361305019353">"10 دقیقه"</item>
- <item msgid="4322676235684793329">"30 دقیقه"</item>
+ <item msgid="6736512735606834431">"۵ ثانیه"</item>
+ <item msgid="8044619388267891375">"۱۵ ثانیه"</item>
+ <item msgid="1822002388249545488">"۳۰ ثانیه"</item>
+ <item msgid="8538071621211916519">"۱ دقیقه"</item>
+ <item msgid="5663439580228932882">"۲ دقیقه"</item>
+ <item msgid="49888496216106852">"۵ دقیقه"</item>
+ <item msgid="9002737361305019353">"۱۰ دقیقه"</item>
+ <item msgid="4322676235684793329">"۳۰ دقیقه"</item>
</string-array>
<string-array name="entries_font_size">
<item msgid="8166647333858618801">"کوچک"</item>
@@ -85,7 +85,7 @@
<item msgid="8513729475867537913">"در حال اتصال…"</item>
<item msgid="515055375277271756">"در حال تأیید اعتبار..."</item>
<item msgid="1943354004029184381">"در حال دریافت آدرس IP..."</item>
- <item msgid="4221763391123233270">"اتصال برقرار شد"</item>
+ <item msgid="4221763391123233270">"متصل"</item>
<item msgid="624838831631122137">"معلق"</item>
<item msgid="7979680559596111948">"در حال قطع اتصال..."</item>
<item msgid="1634960474403853625">"اتصال قطع شد"</item>
@@ -133,9 +133,9 @@
<item msgid="2330782789550628803">"خارج از محدوده"</item>
</string-array>
<string-array name="bluetooth_visibility_timeout_entries">
- <item msgid="8151962652413645395">"2 دقیقه"</item>
- <item msgid="8675215713017289017">"5 دقیقه"</item>
- <item msgid="477015974247590543">"1 ساعت"</item>
+ <item msgid="8151962652413645395">"۲ دقیقه"</item>
+ <item msgid="8675215713017289017">"۵ دقیقه"</item>
+ <item msgid="477015974247590543">"۱ ساعت"</item>
<item msgid="5198271470953124739">"بدون مهلت زمانی"</item>
</string-array>
<string-array name="wifi_signal">
@@ -207,7 +207,7 @@
<item msgid="6848428671997893147">"مشخص نشده"</item>
</string-array>
<string-array name="app_install_location_entries">
- <item msgid="8151497958991952759">"دستگاه ذخیره سازی داخلی"</item>
+ <item msgid="8151497958991952759">"دستگاه ذخیرهسازی داخلی"</item>
<item msgid="3738430123799803530">"کارت SD جدا شدنی"</item>
<item msgid="4498124044785815005">"سیستم تصمیم بگیرد"</item>
</string-array>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 0881635..8fc97af 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"از پروکسی HTTP توسط مرورگرها استفاده میشود اما ممکن است توسط برنامههای دیگر استفاده نشود."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"تلاشهای داده:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"سرویس GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"رومینگ:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"تغییر پین بازگشایی قفل"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"تغییر رمز ورود بازگشایی قفل"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"رمز ورود باید حداقل %d نویسه باشد"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"پین باید حداقل %d نویسه باشد"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"پین باید حداقل %d رقم باشد"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"پس از انجام کار، ادامه را لمس کنید"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"ادامه"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"گذرواژه باید کمتر از <xliff:g id="NUMBER">%d</xliff:g> نویسه باشد."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"نصب Wi-Fi حفاظت شده"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"راهاندازی WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"دکمه تنظیم محافظت شده Wi-Fi را در مسیریاب خود فشار دهید. این دکمه ممکن است «WPS» نامیده شود یا دارای این نماد باشد:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"پین <xliff:g id="NUMBER">%1$s</xliff:g> را در مسیریاب Wi-Fi خود وارد کنید. تکمیل نصب ممکن است چند دقیقه طول بکشد."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"پین <xliff:g id="NUMBER">%1$s</xliff:g> را در روتر Wi-Fi خود وارد کنید. تکمیل نصب ممکن است حداکثر دو دقیقه طول بکشد."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS انجام شد. در حال اتصال به شبکه…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"به شبکه Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> متصل شد"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS در حال انجام کار است و تکمیل آن حداکثر دو دقیقه طول میکشد"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS در حال انجام عملیات است و ممکن است حداکثر دو دقیقه طول بکشد تا کاملاْ انجام شود."</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS انجام نشد. لطفاً چند دقیقه دیگر دوباره امتحان کنید."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"تنظیمات امنیتی روتر بیسیم (WEP) پشتیبانی نمیشود"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"تنظیمات امنیتی روتر بیسیم (TKIP) پشتیبانی نمیشود"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"دعوتنامه لغو شود؟"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"آیا میخواهید دعوت برای ارتباط با <xliff:g id="PEER_NAME">%1$s</xliff:g> را لغو کنید؟"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"نقطه اتصال Wi-Fi قابل حمل"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"در حال روشن کردن نقطه اتصال…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"در حال خاموش کردن نقطه اتصال…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"نقطه اتصال قابل حمل <xliff:g id="NETWORK_SSID">%1$s</xliff:g> فعال"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"خطای نقطه اتصال Wi-Fi قابل حمل"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"تنظیم نقطه اتصال Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"پس از گذشت <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> از غیر فعال بودن"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"تصویر زمینه"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"انتخاب تصویر زمینه از"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"آب نبات صفحهٔ نمایش"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"در صورت اتصال به برق، از حالت خواب شروع به کار میکند"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"رؤیا"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"هنگام قرار گرفتن در جایگاه یا خواب و شارژ شدن"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"هنگام خواب و شارژ شدن"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"هنگام قرار گرفتن در جایگاه"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"غیرفعال شد"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"آب نبات انتخابی"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"رؤیای انتخابی"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"چه وقت فعال شود"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"پس از <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> عدم استفاده"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"هرگز"</string>
<string name="screensaver_test" msgid="3048249263811694128">"امتحان کنید!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"هنگام قرارگرفتن در جایگاه نیز آغاز شود"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"شروع در زمان خواب"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"شروع هنگام قرار گرفتن در جایگاه"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"روشنایی خودکار"</string>
<string name="title_font_size" msgid="4405544325522105222">"اندازهٔ قلم"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"اندازهٔ قلم"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"هنگام بهروزرسانی سطوح پنجره همه فلش شوند"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"نمایش به روزرسانیهای نمای GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"هنگام طراحی با GPU٬ نماها در داخل پنجرهها فلش شوند"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"غیر فعال کردن پوشش HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"همیشه از GPU در ترکیب صفحه استفاده شود"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"فعال کردن ردیابی"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"آیا مطمئن هستید که میخواهید کاربر و تمام دادههای مربوطه را از دستگاه حذف کنید؟"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"نمایش اعلانها"</string>
<string name="help_label" msgid="1107174367904110532">"راهنما"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"حساب برای محتوا"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"کارت شناسایی عکسدار"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"پخشهای سلولی"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"انواع هشدارهای اضطراری را برای نمایش انتخاب کنید."</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 05f930c..3a63e03 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Selain saa käyttää HTTP-välityspalvelinta mutta muut sovellukset eivät."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tiedonsiirtoyrityksiä:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-palvelu:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Muuta lukituksen poistoon tarvittava PIN-koodi"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Vaihda lukituksen poiston salasana"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Salasanan täytyy olla vähintään %d merkkiä"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koodin täytyy olla vähintään %d merkin pituinen"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koodin täytyy olla vähintään %d merkin pituinen"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Kosketa Jatka kun olet valmis"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Jatka"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Salasanan on oltava lyhyempi kuin <xliff:g id="NUMBER">%d</xliff:g> merkkiä."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Suojatut wifi-asetukset"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Käynnistetään WPS:ää..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Paina reitittimen Wi-Fi Protected Setup -painiketta. Siinä voi lukea WPS tai se voi sisältää seuraavan symbolin:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Näppäile pin-koodi <xliff:g id="NUMBER">%1$s</xliff:g> wifi-reitittimeen. Asennus voi kestää kaksi minuuttia."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Näppäile wifi-reitittimen pin-koodi <xliff:g id="NUMBER">%1$s</xliff:g>. Asennus voi kestää kaksi minuuttia."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS onnistui. Muodostetaan yhteyttä verkkoon..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Yhdistetty wifi-verkkoon <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS on jo käynnissä ja sen suorittaminen voi kestää kaksi minuuttia."</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS on jo käynnissä ja voi kestää kaksi minuuttia"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS epäonnistui. Yritä uudelleen muutaman minuutin kuluttua."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Langattoman reitittimen suojausasetusta (WEP) ei tueta."</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Langattoman reitittimen suojausasetusta (TKIP) ei tueta."</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Peruutetaanko kutsu?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Haluatko peruuttaa laitteelle <xliff:g id="PEER_NAME">%1$s</xliff:g> lähetetyn yhteydenmuodostuskutsun?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Kannettava wifi-yhteyspiste"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Otetaan yhteyspiste käyttöön..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Poistetaan yhteyspiste käytöstä..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Kannettava yhteyspiste <xliff:g id="NETWORK_SSID">%1$s</xliff:g> käytössä"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Kannettavan wifi-yhteyspisteen virhe"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Luo wifi-hotspot"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Kun laite on ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Taustakuva"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Valitse taustakuva"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Käynnistyy virransäästötilassa, jos virta on päällä"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Unelma"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Telakoituna tai virransäästötilassa ja ladattessa"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Virransäästötilassa ja ladattessa"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Telakoituna"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Ei käytössä"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Candy valittu"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Valittu unelma"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Käyttöönottoaika"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Kun laite on ollut käyttämättä <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Ei koskaan"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Kokeile!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Käynnistä myös telakoituna"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Käynnistä virransäästötilassa"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Käynnistä telakoituna"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automaattinen kirkkaus"</string>
<string name="title_font_size" msgid="4405544325522105222">"Kirjasimen koko"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Kirjasinkoko"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Väläytä koko ikkunoiden pinnat päivitettäessä"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Näytä GPU:n näytön päiv."</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Väläytä ikkunoiden sisältö GPU:lla piirrettäessä"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Poista HW-peittok. käyt."</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Käytä GPU:ta ruudun koostamiseen"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Ota jäljitys käyttöön"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Haluatko varmasti poistaa laitteesta käyttäjän ja kaikki tähän yhdistetyt tiedot?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Näytä ilmoitukset"</string>
<string name="help_label" msgid="1107174367904110532">"Ohje"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Käytettävä tili"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Kuvatunnus"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell Broadcast -lähetykset"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Valitse näytettävät hätäilmoitukset."</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index b3d2df5..2a83f6b 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentatives :"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Service GPRS :"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Itinérance :"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Modifier le code PIN de déverrouillage"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Modifier le mot de passe de déverrouillage"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Le mot de passe doit comporter au moins %d caractères."</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Le code PIN doit comporter au moins %d caractères."</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Le code PIN doit comporter au moins %d chiffres."</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Appuyez sur Continuer une fois l\'opération terminée."</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuer"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Le mot de passe doit comporter moins de <xliff:g id="NUMBER">%d</xliff:g> caractères."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuration Wi-Fi protégée"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Démarrage de la configuration WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Appuyez sur le bouton \"Configuration Wi-Fi protégée\" de votre routeur. Celui-ci peut s\'appeler \"WPS\" ou contenir ce symbole :"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Saisissez le code <xliff:g id="NUMBER">%1$s</xliff:g> sur votre routeur Wi-Fi. La configuration peut prendre jusqu\'à deux minutes."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Saisissez le code <xliff:g id="NUMBER">%1$s</xliff:g> sur votre routeur Wi-Fi. La configuration peut prendre jusqu\'à deux minutes."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"Configuration WPS réussie. Connexion au réseau en cours…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Connecté au réseau Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"La configuration WPS est déjà en cours et peut prendre jusqu\'à deux minutes."</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"La configuration WPS est déjà en cours et peut prendre jusqu\'à deux minutes."</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Échec de la configuration WPS. Veuillez réessayer dans quelques minutes."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"La configuration de sécurité du routeur sans fil (WEP) n\'est pas compatible."</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"La configuration de sécurité du routeur sans fil (TKIP) n\'est pas compatible."</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Annuler l\'invitation ?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Voulez-vous annuler l\'invitation à se connecter avec <xliff:g id="PEER_NAME">%1$s</xliff:g> ?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Point d\'accès Wi-Fi"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Activation du point d\'accès Wi-Fi en cours…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Désactivation du point d\'accès Wi-Fi en cours…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Point d\'accès Wi-Fi mobile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actif"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erreur liée au point d\'accès Wi-Fi mobile"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configurer le point d\'accès Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Fond d\'écran"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Sélectionner fond d\'écran dans"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Économiseur d\'écran"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Activer à la mise en veille, si l\'appareil est branché"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Rêve"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Lorsque l\'appareil est installé sur la station d\'accueil ou lorsqu\'il est en veille et en charge"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Lorsque l\'appareil est en veille et en charge"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Lorsque l\'appareil est installé sur la station d\'accueil"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Désactivé"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Économiseur sélectionné"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Rêve sélectionné"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Délai d\'activation"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Après <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> d\'inactivité"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Jamais"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Essayer"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Activer également lorsque l\'appareil est installé dans la station d\'accueil"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Activer lorsque l\'appareil est en veille"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Activer lorsque l\'appareil est installé sur la station d\'accueil"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Ajuster automatiquement la luminosité"</string>
<string name="title_font_size" msgid="4405544325522105222">"Taille de la police"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Taille de police"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Faire clignoter les surfaces à chaque mise à jour"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Afficher mises à jour GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Faire clignoter les éléments dessinés avec le GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Désact. superpos. matér."</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Toujours utiliser le GPU pour la composition écran"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Activer les traces"</string>
@@ -1707,6 +1717,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Voulez-vous vraiment supprimer le compte utilisateur ainsi que toutes les données associées de l\'appareil ?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Afficher notifications"</string>
<string name="help_label" msgid="1107174367904110532">"Aide"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Compte pour contenu"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID de photo"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Diffusions cellulaires"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Sélectionnez les types d\'alertes d\'urgence à afficher."</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 846cfed..b5a8df1 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP प्रॉक्सी का उपयोग ब्राउज़र द्वारा किया जाता है लेकिन अन्य एप्लिकेशन द्वारा उपयोग नहीं किया जा सकता."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"डेटा प्रयास:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS सेवा:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"रोमिंग:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"अनलॉक पिन बदलें"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"अनलॉक पासवर्ड बदलें"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"पासवर्ड में कम से कम %d वर्ण होने चाहिए"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"पिन में कम से कम %d वर्ण होने चाहिए"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN में कम से कम %d वर्ण होने चाहिए"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"पूर्ण होने पर जारी रखें स्पर्श करें"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"जारी रखें"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"पासवर्ड <xliff:g id="NUMBER">%d</xliff:g> से कम वर्णों का होना चाहिए."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi सुरक्षित सेटअप"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS प्रारंभ हो रहा है…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"अपने रूटर पर Wi-Fi सुरक्षित सेटअप बटन दबाएं. इसे \"WPS\" कहा जा सकता है या इसमें यह चिह्न हो सकता है:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"अपने Wi-Fi राउटर पर पिन <xliff:g id="NUMBER">%1$s</xliff:g> दर्ज करें. सेटअप पूर्ण होने में दो मिनट लग सकते हैं."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"अपने Wi-Fi राउटर पर पिन <xliff:g id="NUMBER">%1$s</xliff:g> दर्ज करें. सेटअप पूर्ण होने में दो मिनट तक लग सकते हैं."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS सफल रहा. नेटवर्क से कनेक्ट हो रहा है…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Wi-Fi नेटवर्क <xliff:g id="NETWORK_NAME">%s</xliff:g> से कनेक्ट किया गया"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS पहले से ही प्रगति में है और पूर्ण होने में दो मिनट लग सकते हैं"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS पहले से ही चल रहा है और पूर्ण होने में दो मिनट तक लग सकते हैं"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS विफल रहा. कृपया कुछ मिनटों में पुन: प्रयास करें."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"वायरलेस राउटर सुरक्षा सेटिंग (WEP) समर्थित नहीं है"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"वायरलेस राउटर सुरक्षा सेटिंग (TKIP) समर्थित नहीं है"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"आमंत्रण रद्द करें?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"क्या आप <xliff:g id="PEER_NAME">%1$s</xliff:g> से कनेक्ट होने का आमंत्रण रद्द करना चाहते हैं?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"पोर्टेबल Wi-Fi हॉट स्पॉट"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"हॉटस्पॉट को चालू किया जा रहा है…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"हॉटस्पॉट को बंद किया जा रहा है…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"पोर्टेबल हॉटस्पॉट <xliff:g id="NETWORK_SSID">%1$s</xliff:g> सक्रिय"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"पोर्टेबल Wi-Fi हॉटस्पॉट त्रुटि"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Wi-Fi हॉटस्पॉट सेट करें"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"निष्क्रियता के <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> के बाद"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"वॉलपेपर"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"यहां से वॉलपेपर चुनें:"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"स्क्रीन कैंडी"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"निष्क्रिय मोड में पावर से कनेक्ट होने पर प्रारंभ हो जाएगा"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"स्वप्न"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"डॉक किए जाने या निष्क्रिय और चार्ज होने पर"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"निष्क्रिय और चार्ज होने पर"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"डॉक किए जाने पर"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"अक्षम"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"चयनित कैंडी"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"चयनित स्वप्न"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"कब सक्रिय करें"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> निष्क्रिय रहने के बाद"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"कभी नहीं"</string>
<string name="screensaver_test" msgid="3048249263811694128">"इसे आज़माएं!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"डॉक किए जाने पर भी प्रारंभ करें"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"निष्क्रिय होने पर प्रारंभ करें"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"डॉक किए जाने पर प्रारंभ करें"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"स्वचालित चमक"</string>
<string name="title_font_size" msgid="4405544325522105222">"फ़ॉन्ट आकार"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"फ़ॉन्ट आकार"</string>
@@ -1551,6 +1557,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"विंडो सतहें अपडेट होने पर उन सभी को फ़्लैश करें"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU दृश्य अपडेट दिखाएं"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU के साथ आरेखित करने पर विंडो में दृश्यों को फ़्लैश करें"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"HW ओवरले अक्षम करें"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"स्क्रीन संयोजन के लिए हमेशा GPU का उपयोग करें"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"ट्रेस सक्षम करें"</string>
@@ -1706,6 +1716,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"क्या आप वाकई उपकरण से उपयोगकर्ता और सभी संबंधित डेटा निकालना चाहते हैं?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"सूचना दिखाएं"</string>
<string name="help_label" msgid="1107174367904110532">"सहायता"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"सामग्री के लिए खाता"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"फ़ोटो आईडी"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"सेल प्रसारण"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"प्रदर्शित करने के लिए आपातकालीन अलर्ट के प्रकारों का चयन करें."</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 8226bde..8ca625f 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Preglednik upotrebljava HTTP proxy poslužitelj, ali druge aplikacije ne mogu ga upotrebljavati."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokušaji za podatke:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS usluga:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Promijeni PIN za otključavanje"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Promijeni zaporku za otključavanje"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Zaporka mora imati najmanje ovoliko znakova: %d"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN mora imati najmanje ovoliko znakova %d"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN mora imati najmanje ovoliko znakova: %d"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Dodirnite Nastavak kad završite"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Nastavi"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Zaporka mora imati manje od ovoliko znakova: <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Postavljanje zaštićene mreže Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Pokretanje WPS-a..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Pritisnite gumb za zaštićeno postavljanje Wi-Fi mreže na svom usmjerivaču. Može se zvati \"WPS\" ili sadržavati ovaj simbol:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Unesite PIN <xliff:g id="NUMBER">%1$s</xliff:g> na svoj Wi-Fi usmjerivač. Postavljanje može potrajati do dvije minute."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Unesite PIN <xliff:g id="NUMBER">%1$s</xliff:g> na svoj Wi-Fi usmjerivač. Postavljanje može potrajati do dvije minute."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS uspio. Povezivanje s mrežom…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Povezano s mrežom Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Već je u tijeku WPS, a do dovršetka može proteći do dvije minute"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS je već u tijeku, a do završetka može proteći do dvije minute"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Zahtjev nije uspio. Pokušajte ponovo za nekoliko minuta."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Sigurnosna postavka (WEP) bežičnog usmjerivača nije podržana"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sigurnosna postavka bežičnog usmjerivača (TKIP) nije podržana"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Otkazati pozivnicu?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Želite li otkazati pozivnicu za povezivanje s korisnikom <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prijenosna pristupna WiFi točka"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Uključivanje žarišne točke…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Isključivanje žarišne točke…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Aktivna je prijenosna WiFi pristupna točka <xliff:g id="NETWORK_SSID">%1$s</xliff:g>"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Pogreška prijenosne WiFi pristupne točke"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Postavljanje WiFi pristupne točke"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivnosti"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Pozadinska slika"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Odabir pozadinske slike iz"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Čuvar zaslona"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Pokreće se u mirovanju ako je priključeno napajanje"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"San"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kada je uređaj na priključnoj stanici ili kada miruje i puni se"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kada uređaj miruje i puni se"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kada je uređaj na priključnoj stanici"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Onemogućeno"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Odabrani čuvar"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Odabrani san"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Kada aktivirati"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Nakon <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> u mirovanju"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikad"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Isprobajte!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Pokreni i na priključnoj stanici"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Pokreni pri mirovanju"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Pokreni kada je uređaj na priključnoj stanici"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automatska svjetlina"</string>
<string name="title_font_size" msgid="4405544325522105222">"Veličina fonta"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Veličina fonta"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Bljeskanje cijele površine prozora pri ažuriranju"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Prikaži GPU ažur. prikaza"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Bljeskanje prikaza u prozorima pri crtanju GPU-om"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Onemogući HW preklapanja"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Uvijek upotrijebi GPU kod slaganja zaslona"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Omogući tragove"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Jeste li sigurni da želite ukloniti korisnika i sve povezane podatke iz uređaja?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Prikaži obavijesti"</string>
<string name="help_label" msgid="1107174367904110532">"Pomoć"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Račun za sadržaj"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Poruke mobilne mreže"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Odaberite vrste hitnih obavijesti za prikaz."</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 2aa61fa..c632c63 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Adatkísérletek:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS szolgáltatás:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Barangolás:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"A feloldó PIN-kód módosítása"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Feloldási jelszó módosítása"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"A jelszónak legalább %d karakter hosszúnak kell lennie"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"A PIN-kódnak legalább %d karakter hosszúnak kell lennie"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"A PIN kódnak legalább %d számjegyűnek kell lennie."</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Ha kész, érintse meg a Folytatás gombot"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Folytatás"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"A jelszónak rövidebbnek kell lennie <xliff:g id="NUMBER">%d</xliff:g> karakternél."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"WPS"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS indítása..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Nyomja meg a Wi-Fi Protected Setup gombot a routeren. Ennek elnevezése lehet \"WPS\" is, illetve a következő szimbólum is jelölheti:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Írja be a Wi-Fi router azonosítókódját (<xliff:g id="NUMBER">%1$s</xliff:g>). A telepítés legfeljebb 2 percet vesz igénybe."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Írja be a Wi-Fi router PIN kódját (<xliff:g id="NUMBER">%1$s</xliff:g>). A telepítés legfeljebb 2 percet vesz igénybe."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"Sikeres WPS. Csatlakozás a hálózathoz..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Csatlakozva a(z) <xliff:g id="NETWORK_NAME">%s</xliff:g> Wi-Fi hálózathoz"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"A WPS már folyamatban van, és legfeljebb 2 percet vesz igénybe."</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"A WPS már folyamatban van, és legfeljebb 2 percet vesz igénybe."</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Sikertelen WPS. Kérjük, próbálkozzon újra néhány perc múlva."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"A vezeték nélküli router biztonsági beállítása (WEP) nem támogatott."</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A vezeték nélküli router biztonsági beállítása (TKIP) nem támogatott."</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Törli a meghívást?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Szeretné törölni a(z) <xliff:g id="PEER_NAME">%1$s</xliff:g> eszközhöz való csatlakozásra vonatkozó meghívást?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hordozható Wi-Fi hotspot"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot bekapcsolása..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot kikapcsolása..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"A(z) <xliff:g id="NETWORK_SSID">%1$s</xliff:g> hordozható hotspot aktív"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"A hordozható Wi-Fi hotspot hibája"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Wi-Fi hotspot beállítása"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inaktivitás után"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Háttérkép"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Válasszon tapétát innen:"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Képernyővédő"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Alvó módban elindul, ha hálózati feszültségről üzemel"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Álom"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Dokkolt vagy alvó állapotban, amikor tölt."</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Alvó állapotban, amikor tölt"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Dokkolt állapotban"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Letiltva"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Kiválasztott modul"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Kiválasztott álom"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Mikor aktiválódjon"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tétlenség után"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Soha"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Próbálja ki!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Dokkolt állapotban is induljon el"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Alvó üzemmódban induljon el."</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Dokkolt állapotban induljon el."</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automatikus fényerő"</string>
<string name="title_font_size" msgid="4405544325522105222">"Betűméret"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Betűméret"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"A teljes ablakfelület villogjon frissítéskor."</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU-nézetfriss. megjel."</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Ablakbeli nézetek villognak GPU-s rajznál."</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"HW fedvények letiltása"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Mindig a GPU használata képernyő-feldolgozáshoz"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Nyomkövetés engedélyezése"</string>
@@ -1707,6 +1717,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Biztosan eltávolítja a felhasználót és az összes hozzá kapcsolódó adatot az eszközről?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Értesítések megjelenítése"</string>
<string name="help_label" msgid="1107174367904110532">"Súgó"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Tartalom fiókja"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Fotóazonosító"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Cellán belüli adások"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Válassza ki a megjelenítendő vészriasztások típusait."</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index c51e757..a8d08c0 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP digunakan oleh browser, namun tidak boleh digunakan oleh apl lain."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Upaya data:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Layanan GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ubah PIN pembuka kunci"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ubah sandi pembuka kunci"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Sandi minimal %d karakter"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN minimal terdiri dari %d karakter"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN paling tidak harus sepanjang %d digit"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Sentuh Lanjutkan setelah selesai"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Lanjutkan"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Sandi harus kurang dari <xliff:g id="NUMBER">%d</xliff:g> karakter."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Penyiapan Wi-Fi yang Dilindungi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Memulai WPS..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Tekan tombol Penyiapan Wi-FI yang Dilindungi di router Anda. Ini dapat disebut \"WPS\" atau berisi simbol ini:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Masukkan pin <xliff:g id="NUMBER">%1$s</xliff:g> pada router Wi-Fi Anda. Penyiapan perlu hingga dua menit sampai selesai."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Masukkan pin <xliff:g id="NUMBER">%1$s</xliff:g> pada router Wi-Fi Anda. Penyiapan memerlukan waktu hingga dua menit untuk selesai."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS berhasil. Menyambung ke jaringan..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Tersambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS sedang berlangsung dan perlu hingga dua menit sampai selesai."</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS sedang berlangsung dan memerlukan waktu hingga dua menit untuk selesai"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Gagal memulai WPS. Coba lagi setelah beberapa menit."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Pengaturan keamanan router nirkabel (TKIP) tidak didukung"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Pengaturan keamanan router nirkabel (TKIP) tidak didukung"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Batalkan undangan?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Apakah Anda ingin membatalkan undangan untuk tersambung dengan <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabel"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Menyalakan hotspot..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Mematikan hotspot..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> hotspot portabel aktif"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Kesalahan hotspot Wi-Fi portabel"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Siapkan hotspot Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Setelah tidak aktif selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih wallpaper dari"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Permen Layar"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Akan dimulai saat memasuki mode tidur jika terhubung ke daya listrik"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Mimpi"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Saat di dok atau tidur dan mengisi baterai"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Saat tidur dan mengisi baterai"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Saat di dok"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Nonaktif"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Permen terpilih"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Mimpi terpilih"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Waktu pengaktifan"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Setelah menganggur selama <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Tidak akan"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Cobalah!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Juga dimulai ketika dipasangkan pada dok"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Mulai saat tidur"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Mulai saat di dok"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan otomatis"</string>
<string name="title_font_size" msgid="4405544325522105222">"Ukuran font"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Ukuran font"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Sorot seluruh permukaan jendela saat diperbarui"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Tampilkan pembaruan tampilan GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Tampilan cepat dlm jendela saat digambar dgn GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Nonaktifkan lapisan HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Selalu gunakan GPU untuk pengomposisian layar"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Aktifkan jejak"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Yakin ingin menghapus pengguna dan semua data yang terkait dari perangkat?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Tampilkan pemberitahuan"</string>
<string name="help_label" msgid="1107174367904110532">"Bantuan"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Akun untuk konten"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID Foto"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Siaran sel"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pilih jenis peringatan darurat yang akan ditampilkan."</string>
</resources>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index e66963f..3ae7071 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -213,8 +213,8 @@
</string-array>
<string-array name="long_press_timeout_selector_titles">
<item msgid="3511504869290423954">"Breve"</item>
- <item msgid="2560532955514699713">"Media"</item>
- <item msgid="2372711992605524591">"Lunga"</item>
+ <item msgid="2560532955514699713">"Medio"</item>
+ <item msgid="2372711992605524591">"Lungo"</item>
</string-array>
<string-array name="hdcp_checking_titles">
<item msgid="441827799230089869">"Non verificare mai"</item>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index f156117..adb2e3b 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativi dati:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servizio GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Cambia PIN di sblocco"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Cambia password di sblocco"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"La password deve essere lunga almeno %d caratteri"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Il PIN deve essere lungo almeno %d caratteri"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Il PIN deve essere formato da almeno %d cifre"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Al termine, tocca Continua"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Continua"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"La password deve contenere meno di <xliff:g id="NUMBER">%d</xliff:g> caratteri."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Impostazione protetta Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Avvvio WPS..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Premi il pulsante Wi-Fi Protected Setup del router. Il pulsante potrebbe essere denominato \"WPS\" o contenere questo simbolo:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Inserisci il PIN <xliff:g id="NUMBER">%1$s</xliff:g> sul router Wi-Fi. Il completamento della configurazione può richiedere fino a due minuti."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Inserisci il PIN <xliff:g id="NUMBER">%1$s</xliff:g> sul router Wi-Fi. Il completamento della configurazione può richiedere fino a due minuti."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"Configurazione WPS riuscita. Connessione alla rete..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Connesso alla rete Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"La configurazione WPS è già in corso e il completamento può richiedere fino a due minuti"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"La configurazione WPS è già in corso e il completamento può richiedere fino a due minuti"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Configurazione WPS non riuscita. Riprova tra qualche minuto."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"L\'impostazione di sicurezza del router wireless (WEP) non è supportata"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"L\'impostazione di sicurezza del router wireless (TKIP) non è supportata"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Annullare l\'invito?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vuoi annullare l\'invito a connettersi con <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portatile"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Attivazione hotspot..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Disattivazione hotspot..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portatile <xliff:g id="NETWORK_SSID">%1$s</xliff:g> attivo"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Errore hotspot Wi-Fi portatile"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configura hotspot Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Sfondo"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Scegli sfondo da"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Schermo Candy"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Attiva al momento della sospensione se collegato alla corrente"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Quando inserito nel dock o in stand-by e ricarica"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Quando in stand-by e ricarica"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Quando inserito nel dock"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Disattivato"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Candy selezionato"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Sogno selezionato"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Quando attivarlo"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Dopo <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> di inattività"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Mai"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Prova!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Attiva anche quando inserito nel dock"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Attiva in stand-by"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Attiva quando inserito nel dock"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Luminosità automatica"</string>
<string name="title_font_size" msgid="4405544325522105222">"Dimensioni carattere"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Dimensioni carattere"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Flash delle superfici delle finestre all\'aggiornamento"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Aggiornamenti visualizz. GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash delle visualizzazioni dentro le finestre se disegnate con GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Disabilita overlay HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Usa sempre GPU per la composizione dello schermo"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Abilita tracce"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Vuoi rimuovere l\'utente e tutti i dati associati dal dispositivo?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostra notifiche"</string>
<string name="help_label" msgid="1107174367904110532">"Guida"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Account per i contenuti"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID foto"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcast"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Seleziona i tipi di avvisi di emergenza da visualizzare."</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 4ad7aa4..9dc0e20 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"שרת ה-Proxy של HTTP נמצא בשימוש הדפדפן, אך יישומים אחרים לא יכולים להשתמש בו."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ניסיונות נתונים:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"שירות GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"נדידה:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"שנה PIN של ביטול נעילה"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"שנה סיסמת ביטול נעילה"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"אורך הסיסמה חייב להיות %d תווים לפחות"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"ה-PIN חייב להכיל %d תווים לפחות"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"מספר ה-PIN חייב להיות בן %d ספרות לפחות"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"גע ב\'המשך\' כשתסיים"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"המשך"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"הסיסמה אינה יכולה להכיל יותר מ-<xliff:g id="NUMBER">%d</xliff:g> תווים."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"התקנה מוגנת של Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"מפעיל WPS..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"לחץ על כפתור ה-Wi-Fi Protected Setup בנתב שלך. ייתכן שבמקום שם זה יופיע הכיתוב \"WPS\" או הסמל הזה:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"הזן את מספר PIN <xliff:g id="NUMBER">%1$s</xliff:g> בנתב ה-Wi-Fi שלך. השלמת ההתקנה עשויה להימשך עד שתי דקות."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"הזן את מספר ה-PIN <xliff:g id="NUMBER">%1$s</xliff:g> בנתב ה-Wi-Fi שלך. השלמת ההתקנה עשויה להימשך עד שתי דקות."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS הצליח. מתחבר לרשת..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"מחובר לרשת Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS כבר מתבצע, והפעולה יכולה להימשך עד שתי דקות"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"התקנת WPS כבר מתבצעת, והשלמת הפעולה עשויה להימשך עד שתי דקות"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS נכשל. נסה שוב בעוד מספר דקות."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"הגדרת האבטחה של הנתב האלחוטי (WEP) אינה נתמכת"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"הגדרת האבטחה של הנתב האלחוטי (TKIP) אינה נתמכת"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"האם לבטל את ההזמנה?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"האם אתה רוצה לבטל את ההזמנה ליצירת קשר עם <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"נקודה חמה ניידת של Wi-Fi"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"מפעיל נקודה חמה…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"מכבה נקודה חמה…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"<xliff:g id="NETWORK_SSID">%1$s</xliff:g> פעיל של נקודה חמה ניידת"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"שגיאה של נקודה חמה ניידת של Wi-Fi"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"הגדר נקודה חמה של Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> של חוסר פעילות"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"טפט"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"בחר טפט מ-"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"יופעל בעת כניסה למצב שינה אם מחובר לחשמל"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"חלום"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"בזמן עגינה או בזמן שינה כשמתבצעת טעינה"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"בזמן שינה כשמתבצעת טעינה"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"בזמן עגינה"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"מושבת"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"מבחר Candy"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"חלום נבחר"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"מתי להפעיל"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"לאחר <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ללא פעילות"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"אף פעם"</string>
<string name="screensaver_test" msgid="3048249263811694128">"נסה בעצמך!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"הפעל גם כשמחובר למעגן"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"הפעל בזמן שינה"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"הפעל בזמן עגינה"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"בהירות אוטומטית"</string>
<string name="title_font_size" msgid="4405544325522105222">"גודל גופן"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"גודל גופן"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"הבזק את כל שטחי החלון כשהם מתעדכנים"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"הצג עדכוני תצוגה של GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"הבזק תצוגות בתוך חלונות בעת ציור באמצעות ה-GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"השבת שכבות על של HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"השתמש תמיד ב-GPU להרכבת מסך"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"הפעל עקבות"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"האם אתה בטוח שאתה רוצה להסיר את המשתמש ואת כל הנתונים המשויכים מהמכשיר?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"הצג התראות"</string>
<string name="help_label" msgid="1107174367904110532">"עזרה"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"חשבון לתוכן"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"זיהוי תמונה"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"שידורים סלולריים"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"בחר את סוגי התראות החירום להצגה."</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 08f0a9d..e83410c 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -194,6 +194,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTPプロキシはブラウザで使用されていますが、他のアプリでは使用できません。"</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"データの試行:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRSサービス:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"ローミング:"</string>
@@ -366,7 +367,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"ロック解除PINの変更"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"ロック解除パスワードの変更"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"パスワードを%d文字以上で入力してください"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PINを%d文字以上で入力してください"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PINは%d桁以上にしてください。"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"終了後[次へ]をタップ"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"次へ"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"パスワードは<xliff:g id="NUMBER">%d</xliff:g>文字未満で指定してください。"</string>
@@ -532,10 +533,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi保護設定"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPSを開始しています…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"ルーターのWi-Fi保護設定ボタンを押します。「WPS」と表記されている場合や、次のような記号が表示されている場合もあります:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Wi-FiルーターでPIN「<xliff:g id="NUMBER">%1$s</xliff:g>」を入力します。セットアップの完了まで最大2分ほどかかることがあります。"</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Wi-FiルーターでPIN「<xliff:g id="NUMBER">%1$s</xliff:g>」を入力します。セットアップの完了まで最大2分ほどかかることがあります。"</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPSの設定に成功しました。ネットワークに接続しています…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Wi-Fiネットワーク<xliff:g id="NETWORK_NAME">%s</xliff:g>に接続しました"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPSを設定中です。完了まで最大2分程度かかることがあります。"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPSを設定中です。完了まで最大2分程度かかることがあります。"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPSの設定に失敗しました。数分後にもう一度お試しください。"</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"無線ルーターのセキュリティ設定（WEP）はサポートされていません"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"無線ルーターのセキュリティ設定（TKIP）はサポートされていません"</string>
@@ -607,6 +608,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"招待状のキャンセル"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>との接続への招待をキャンセルしますか？"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"ポータブルWi-Fiアクセスポイント"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"アクセスポイントをONにしています…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"アクセスポイントをOFFにしています…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"ポータブルアクセスポイント<xliff:g id="NETWORK_SSID">%1$s</xliff:g>が有効です"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"ポータブルWi-Fiアクセスポイントエラー"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Wi-Fiアクセスポイントを設定"</string>
@@ -675,15 +678,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"操作が行われない状態で<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>経過後"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"壁紙"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"壁紙の選択先:"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"スクリーンセーバー"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"電源接続時、スリープで開始"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"スクリーンセーバー"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"ホルダー装着時またはスリープ/充電時"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"スリープ/充電時"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"ホルダー装着時"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"無効"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"選択したスクリーンセーバー"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"選択されているスクリーンセーバー"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"開始のタイミング"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"アイドル状態が<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>続いた後"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"設定しない"</string>
<string name="screensaver_test" msgid="3048249263811694128">"プレビュー"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"ホルダーに置いたときも開始する"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"スリープ時に起動する"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"ホルダー装着時に起動する"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"明るさを自動調整"</string>
<string name="title_font_size" msgid="4405544325522105222">"フォントサイズ"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"フォントサイズ"</string>
@@ -1552,6 +1558,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"更新時にウィンドウの表示面全体を点滅させる"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU表示の更新を表示"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPUでの描画時にウィンドウ内の表示を点滅させる"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"HWオーバーレイを無効"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"画面合成に常にGPUを使用する"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"トレースを有効にする"</string>
@@ -1707,6 +1717,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"ユーザーとすべての関連データを端末から削除してもよろしいですか？"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"通知を表示"</string>
<string name="help_label" msgid="1107174367904110532">"ヘルプ"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"コンテンツのアカウント"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"画像ID"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"エリアメール"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"表示する緊急警報の種類を選択してください。"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index bf2891b..a2dc88b 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP 프록시는 브라우저에서 사용되며 다른 앱에서는 사용되지 않을 수 있습니다."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"데이터 시도:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS 서비스:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"로밍:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"잠금해제 PIN 변경"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"잠금해제 비밀번호 변경"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"비밀번호는 %d자 이상이어야 합니다."</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN은 %d자 이상이어야 합니다."</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN은 %d자리 이상이어야 합니다."</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"계속을 터치하세요."</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"계속"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"비밀번호는 <xliff:g id="NUMBER">%d</xliff:g>자 미만이어야 합니다."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"WPS(Wi-Fi 간편 설정)"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS을 시작하는 중…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"공유기에서 Wi-Fi Protected 설정 버튼을 누르세요. \'WPS\'라고 줄여 부르기도 하며 다음 기호를 포함할 수도 있습니다."</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Wi-Fi 공유기에 개인 식별 번호 <xliff:g id="NUMBER">%1$s</xliff:g>을(를) 입력하세요. 설정을 완료하는 데 최대 2분이 소요됩니다."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Wi-Fi 공유기에 PIN(개인 식별 번호) <xliff:g id="NUMBER">%1$s</xliff:g>을(를) 입력하세요. 설정을 완료하는 데 최대 2분이 소요됩니다."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS 성공. 네트워크에 연결 중…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Wi-Fi 네트워크 <xliff:g id="NETWORK_NAME">%s</xliff:g>에 연결됨"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS를 이미 처리하고 있으며 완료하는 데 최대 2분이 소요됩니다."</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS 설정이 이미 진행 중이며 완료하는 데 최대 2분이 소요됩니다."</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS가 실패하였습니다. 잠시 후 다시 시도해 주세요."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"무선 공유기 보안 설정(WEP)은 지원되지 않습니다."</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"무선 공유기 보안 설정(TKIP)은 지원되지 않습니다."</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"초대를 취소하시겠습니까?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g>와(과) 연결하려는 초대를 취소하시겠습니까?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"휴대용 Wi-Fi 핫스팟"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"핫스팟 켜는 중…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"핫스팟 끄는 중…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"휴대용 핫스팟 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 사용"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"휴대용 Wi-Fi 핫스팟 오류"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Wi-Fi 핫스팟 설정"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 이상 동작이 없을 때"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"배경화면"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"배경화면 선택"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"스크린 캔디"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"전원에 연결된 경우 절전 모드 시 시작"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"드림"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"도킹할 때 또는 대기상태이거나 충전할 때"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"대기상태이거나 충전할 때"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"도킹할 때"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"사용 안함"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"선택한 캔디"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"선택한 드림"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"활성화 시기"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> 이상 유휴 상태일 때"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"안함"</string>
<string name="screensaver_test" msgid="3048249263811694128">"사용해 보기"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"도킹할 때도 시작"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"절전 모드 시 시작"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"도킹할 때 시작"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"자동 밝기"</string>
<string name="title_font_size" msgid="4405544325522105222">"글꼴 크기"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"글꼴 크기"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"전체 창 표면이 업데이트되었을 때 플래시 처리"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU 보기 업데이트 표시"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU로 드로잉했을 때 창 내부 보기 플래시 처리"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"HW 오버레이 사용 안함"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"화면 합성 목적으로 항상 GPU 사용"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"추적 사용"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"기기에서 사용자와 모든 관련 데이터를 삭제하시겠습니까?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"알림 표시"</string>
<string name="help_label" msgid="1107174367904110532">"도움말"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"콘텐츠용 계정"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"사진 ID"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"셀 브로드캐스트"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"표시할 긴급 알림 유형을 선택합니다."</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index bf610ee..cf79faa 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP įgaliotąjį serverį naudoja naršyklė, bet jo negali naudoti kitos programos."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Duomenų bandymai:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS paslauga:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Tarptinklinis ryšys:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Pakeisti atrakinimo PIN kodą"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Pakeisti atrakinimo slaptažodį"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Slaptažodį turi sudaryti mažiausiai %d simboliai."</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN kodą turi sudaryti mažiausiai %d simboliai (-ių)"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN kodą turi sudaryti mažiausiai %d skaitm."</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Atlikę spustelėkite „Tęsti“"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Tęsti"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Slaptažodį turi sudaryti mažiau nei <xliff:g id="NUMBER">%d</xliff:g> simboliai (-ių)."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Apsaugota „Wi-Fi“ sąranka"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Pradedama WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Maršruto parinktuve paspauskite mygtuką „Wi-Fi“ apsaugota sąranka“. Jis gali būti pavadintas WPS arba nurodytas šis simbolis:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Įveskite „Wi-Fi“ maršruto parinktuvo PIN kodą <xliff:g id="NUMBER">%1$s</xliff:g>. Sąranka gali trukti iki dviejų min."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Įveskite „Wi-Fi“ maršruto parinktuvo PIN kodą <xliff:g id="NUMBER">%1$s</xliff:g>. Sąranka gali užtrukti iki dviejų minučių."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS pavyko. Prisijungiama prie tinklo…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Prisijungta prie „Wi-Fi“ tinklo „<xliff:g id="NETWORK_NAME">%s</xliff:g>“"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS jau vykdoma ir gali užtrukti iki dviejų min., kol bus baigta"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS jau vykdoma ir gali užtrukti iki dviejų minučių, kol bus baigta."</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS neįvykdyta. Po kelių minučių bandykite dar kartą."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Belaidžio maršruto parinktuvo saugos nustatymas (WEP) nepalaikomas"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Belaidžio maršruto parinktuvo saugos nustatymas (TKIP) nepalaikomas"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Atšaukti kvietimą?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ar norite atšaukti kvietimą prisijungti prie <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Perkeliama „Wi-Fi“ aktyvioji sritis"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Įjungiamas viešosios interneto prieigos taškas…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Išjungiamas viešosios interneto prieigos taškas…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Perkeliama aktyvioji sritis <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktyvi"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Perkeliamos „Wi-Fi“ aktyviosios srities klaida"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Nustatyti „Wi-Fi“ viešosios interneto prieigos tašką"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neveiklumo"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Darbalaukio fonas"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pasirinkti darbalaukio foną iš"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Ekrano užsklandos"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Bus pradėta, kai veikia miego režimas, jei įjungta į lizdą"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Svajonė"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kai yra doke arba kai veikia miego režimas ir kraunamas akumuliatorius"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kai veikia miego režimas ir kraunamas akumuliatorius"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kai yra doke"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Išjungta"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Pasirinkta ekrano užsklanda"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Pasirinkta svajonė"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Kada aktyvinti"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Kai <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neatliekama jokių veiksmų"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Niekada"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Išbandykite!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Taip pat pradėti, kai įrenginys yra doke"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Pradėti, kai veikia miego režimas"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Pradėti, kai įrenginys yra doke"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automatinis ryškumas"</string>
<string name="title_font_size" msgid="4405544325522105222">"Šrifto dydis"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Šrifto dydis"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Naujinant mirginti visus langų paviršius"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Rodyt GPU rodinių naujin."</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"„Flash“ rodiniai languose atvaizduojant su GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Neleisti HW perdangų"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Komponuojant ekraną visada naudoti GPU"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Įgalinti pėdsakus"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Ar tikrai norite pašalinti naudotoją ir visus susijusius duomenis iš įrenginio?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Rodyti pranešimus"</string>
<string name="help_label" msgid="1107174367904110532">"Pagalba"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Turiniui skirta paskyra"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Nuotraukos ID"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Tinklo transliacijos"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pasirinkite rodomų nepaprastųjų įspėjimų tipus."</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6767748..15dbab5 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Datu mēģinājumi:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS pakalpojums:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Viesabonēšana:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Mainīt atbloķēšanas PIN"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Mainīt atbloķēšanas paroli"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parolē jābūt vismaz %d rakstzīmēm"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN kodā jābūt vismaz %d rakstzīmēm"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN kodā ir jābūt vismaz %d cipariem."</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Kad ir pabeigts, pieskarieties Turpināt"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Turpināt"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Parole nedrīkst būt garāka par <xliff:g id="NUMBER">%d</xliff:g> rakstzīmēm."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi aizsargātā iestatīšana"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Notiek WPS sākšana..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Nospiediet maršrutētāja pogu “Wi-Fi aizsargātā iestatīšana”. Uz tās var būt rakstīts WPS, vai var būt redzams šāds simbols:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Ievadiet Wi-Fi maršrutētājā PIN numuru <xliff:g id="NUMBER">%1$s</xliff:g>. Iestatīšana var ilgt līdz pat divām minūtēm."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Ievadiet uz Wi-Fi maršrutētāja norādīto PIN numuru <xliff:g id="NUMBER">%1$s</xliff:g>. Iestatīšana var ilgt līdz pat divām minūtēm."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS bija veiksmīga. Notiek savienojuma izveide ar tīklu..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Ir izveidots savienojums ar Wi-Fi tīklu <xliff:g id="NETWORK_NAME">%s</xliff:g>."</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS jau notiek, un tās pabeigšana var ilgt divas minūtes."</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Jau notiek Wi-Fi aizsargātā iestatīšana, un tās pabeigšana var ilgt divas minūtes."</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS neizdevās. Lūdzu, pēc dažām minūtēm mēģiniet vēlreiz."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Bezvadu maršrutētāja drošības iestatījums (WEP) netiek atbalstīts."</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Bezvadu maršrutētāja drošības iestatījums (TKIP) netiek atbalstīts."</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vai atcelt uzaicinājumu?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vai vēlaties atcelt uzaicinājumu izveidot savienojumu ar ierīci <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Pārnēsājams Wi-Fi tīklājs"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Notiek tīklāja ieslēgšana…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Notiek tīklāja izslēgšana…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Pārnēsājamais tīklājs <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ir aktīvs"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Pārnēsājamā Wi-Fi tīklāja kļūda"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Iestatīt Wi-Fi tīklāju"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Pēc <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> neaktivitātes"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Fona tapete"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Fona tapetes izvēle no"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Ekrānsaudzētājs"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Tiks aktivizēts miega režīma laikā, ja ierīce tiks pievienota strāvas avotam"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Ekrānsaudzētājs"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kad ierīce tiek dokota vai ir miega režīmā un notiek uzlāde"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kad ierīce ir miega režīmā un notiek uzlāde"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kad ierīce tiek dokota"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Atspējots"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Atlasītais ekrānsaudzētājs"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Atlasītais ekrānsaudzētājs"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Aktivizēšanas laiks"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Pēc dīkstāves laika: <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nekad"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Izmēģiniet!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Aktivizēt arī tad, kad ierīce tiek dokota"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Aktivizēt, kad ierīce ir miega režīmā"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Aktivizēt, kad ierīce tiek dokota"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automātisks spilgtums"</string>
<string name="title_font_size" msgid="4405544325522105222">"Fonta lielums"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Fonta lielums"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Atjaun. visa loga virsmas, kad tās tiek atjaunin."</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Rādīt GPU skat. atjaun."</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Atjaunināt logu skat., ja zīm. tiek liet. GPU."</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Atspējot HW pārklājumus"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Vienmēr izmantot GPU atveidi ekrāna salikšanai"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Iespējot trases"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Vai tiešām vēlaties no ierīces noņemt lietotāju un visus ar viņu saistītos datus?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Rādīt paziņojumus"</string>
<string name="help_label" msgid="1107174367904110532">"Palīdzība"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Konts saturam"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Dokuments ar foto"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Šūnu apraides"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Atlasiet rādāmos ārkārtas situāciju brīdinājumus."</string>
</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 0518d55..b7da960 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi HTTP digunakan oleh penyemak imbas tetapi tidak boleh digunakan oleh aplikasi lain."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Percubaan data:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Perkhidmatan GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Perayauan:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Tukar PIN buka kunci"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Tkr kta lluan bka knci"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Kata laluan mesti sekurang-kurangnya %d aksara"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN mestilah sekurang-kurangnya %d aksara"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN mesti sekurang-kurangnya %d digit"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Sentuh Teruskan apabila selesai"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Teruskan"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Kata laluan mesti kurang daripada <xliff:g id="NUMBER">%d</xliff:g> aksara."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Persediaan Terlindung Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Memulakan WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Tekan butang Persediaan Terlindung Wi-Fi di router anda. Namanya mungkin \"WPS\" atau mengandungi simbol ini:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Masukkan pin <xliff:g id="NUMBER">%1$s</xliff:g> pada penghala Wi-Fi anda. Persediaan ini boleh mengambil masa sehingga dua minit untuk selesai."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Masukkan pin <xliff:g id="NUMBER">%1$s</xliff:g> pada penghala Wi-Fi anda. Persediaan ini boleh mengambil masa sehingga dua minit untuk selesai."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS berjaya. Menyambung ke rangkaian…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Disambungkan ke rangkaian Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS sudah pun dijalankan dan boleh mengambil masa sehingga dua minit untuk selesai"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS sudah pun dijalankan dan boleh mengambil masa sehingga dua minit untuk selesai"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS gagal. Sila cuba lagi dalam beberapa minit."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Tetapan keselamatan penghala wayarles (WEP) tidak disokong"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Tetapan keselamatan penghala wayarles (TKIP) tidak disokong"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Batalkan jemputan?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Adakah anda mahu membatalkan jemputan untuk berhubung dengan <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Titik panas Wi-Fi mudah alih"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Menghidupkan tempat liputan..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Mematikan tempat liputan..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Titik panas mudah alih <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktif"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Ralat titik panas Wi-Fi mudah alih"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Sediakan tempat liputan Wi-Fi"</string>
@@ -673,15 +676,25 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> tanpa aktiviti"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Kertas dinding"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pilih kertas dinding dari"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Gul-gula Skrin"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Akan bermula daripada tidur jika disambungkan kepada kuasa"</string>
+ <!-- no translation found for screensaver_settings_title (4458091032540874366) -->
+ <skip />
+ <!-- no translation found for screensaver_settings_summary_both (1175671101656240599) -->
+ <skip />
+ <!-- no translation found for screensaver_settings_summary_sleep (7231274537626605107) -->
+ <skip />
+ <!-- no translation found for screensaver_settings_summary_dock (4450616262936082466) -->
+ <skip />
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Dilumpuhkan"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Gula-gula yang dipilih"</string>
+ <!-- no translation found for screensaver_component_title (5786117148360329058) -->
+ <skip />
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Bila hendak diaktifkan"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Selepas <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> terbiar melahu"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Tidak sekali-kali"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Cubalah!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Juga bermula apabila didok"</string>
+ <!-- no translation found for screensaver_activate_on_sleep_title (5463857907577089065) -->
+ <skip />
+ <!-- no translation found for screensaver_activate_on_dock_title (5594601783697028555) -->
+ <skip />
<string name="automatic_brightness" msgid="5014143533884135461">"Kecerahan automatik"</string>
<string name="title_font_size" msgid="4405544325522105222">"Saiz fon"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Saiz fon"</string>
@@ -1550,6 +1563,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Denyar permukaan tetingkap yg dikemas kini"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Tunjuk kemas kini GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Denyar pandangan dlm tetingkap yg dilukis dgn GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Lumpuhkan tindihan atas HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Sentiasa gunakan GPU untuk komposit skrin"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Dayakan kesan"</string>
@@ -1705,6 +1722,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Adakah anda pasti anda mahu mengalih keluar semua pengguna dan data berkaitan dari peranti?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Tunjukkan pemberitahuan"</string>
<string name="help_label" msgid="1107174367904110532">"Bantuan"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Akaun untuk kandungan"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID Berfoto"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Siaran sel"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Pilih jenis amaran kecemasan untuk dipaparkan."</string>
</resources>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index 85cba56..50d9fe2 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -133,8 +133,8 @@
<item msgid="2330782789550628803">"Utenfor rekkevidde"</item>
</string-array>
<string-array name="bluetooth_visibility_timeout_entries">
- <item msgid="8151962652413645395">"To minutter"</item>
- <item msgid="8675215713017289017">"Fem minutter"</item>
+ <item msgid="8151962652413645395">"2 minutter"</item>
+ <item msgid="8675215713017289017">"5 minutter"</item>
<item msgid="477015974247590543">"Én time"</item>
<item msgid="5198271470953124739">"Aldri tidsavbrudd"</item>
</string-array>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 3afc02c..76b977d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"HTTP-mellomtjeneren brukes av nettleseren, men kan ikke brukes av andre apper."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataforsøk:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-tjeneste:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Endre PIN-koden for opplåsning"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Endre passord for opplåsning"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Passord må bestå av minst %d tegn"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koden må bestå av minst %d tegn"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koden må bestå av minst %d tall"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Trykk på Fortsett når du er ferdig"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsett"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Passordet må inneholde færre enn <xliff:g id="NUMBER">%d</xliff:g> tegn."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Beskyttet Wi-Fi-konfigurasjon (WPS)"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Starter WPS …"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Trykk på Beskyttet Wi-Fi-konfigurasjon-knappen på ruteren din. Den kan være merket WPS eller med dette symbolet:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Skriv inn koden <xliff:g id="NUMBER">%1$s</xliff:g> på Wi-Fi-ruteren din. Det kan ta inntil to minutter å fullføre konfigurasjonen."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Skriv inn koden <xliff:g id="NUMBER">%1$s</xliff:g> på Wi-Fi-ruteren din. Det kan ta inntil to minutter å fullføre konfigurasjonen."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS var vellykket. Kobler til nettverket …"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Koblet til Wi-Fi-nettverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS har allerede startet, og det kan ta opptil to minutter før den fullføres"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS har allerede startet, og det kan ta opptil to minutter før den fullføres"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS mislyktes. Prøv igjen om noen minutter."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Sikkerhetsinnstillingen (WEP) for trådløse rutere støttes ikke"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Sikkerhetsinnstillingen (TKIP) for trådløse rutere støttes ikke"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Vil du avbryte invitasjonen?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vil du avbryte invitasjonen til å koble til <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Flyttbar trådløs sone"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Slår på Wi-Fi-sone …"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Slår av trådløs sone …"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Flyttbar trådløs sone <xliff:g id="NETWORK_SSID">%1$s</xliff:g> er aktiv"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Flyttbar trådløs sone – feil"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Konfigurer Wi-Fi-sone"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> med inaktivivitet"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrunnsbilde"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Velg bakgrunnsbilde fra"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Skjermpynt"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Starter ved dvalemodus hvis koblet til strømnettet"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Drøm"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Når enheten er plassert i dokken eller under lading i hvilemodus"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Når enheten lades i hvilemodus"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Når enheten er plassert i dokken"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Deaktivert"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Valgt pynt"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Valgt drøm"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Aktiveringstidspunkt"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Etter <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> i uvirksomhet"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Aldri"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Prøv den!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Starter også når i dokk"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Start når enheten går i hvilemodus"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Start når enheten er plassert i dokken"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automatisk lysstyrke"</string>
<string name="title_font_size" msgid="4405544325522105222">"Skriftstørrelse"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Skriftstørrelse"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Fremhev hele vinduer når de oppdateres"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Vis GPU-visningsoppdateringer"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Fremhev visninger i vinduer når tegnet med GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Deaktiver HW-overlegg"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Bruk alltid GPU for skjermsammensetting"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Aktiver spor"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Er du sikker på at du vil slette brukeren og alle tilhørende data fra enheten?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Vis varsler"</string>
<string name="help_label" msgid="1107174367904110532">"Hjelp"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Konto for innhold"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Kringkastede meldinger"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Velg hvilke nødvarsler som skal vises."</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 368ec40..d9e8277 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Gegevenspogingen:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-service:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"PIN-code voor ontgrendelen wijzigen"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ontgrendelingswachtwoord wijzigen"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Wachtwoord moet ten minste %d tekens lang zijn"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-code moet ten minste %d tekens lang zijn"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Pincode moet ten minste %d cijfers zijn"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Raak \'Doorgaan\' aan als u klaar bent"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Doorgaan"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Wachtwoord moet korter zijn dan <xliff:g id="NUMBER">%d</xliff:g> tekens."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Beveiligde configuratie voor wifi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS starten…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Druk op de knop \'Beveiligde configuratie voor wifi\' op uw router. Misschien heet deze knop \'WPS\' of bevat deze het volgende symbool:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Geef de pincode <xliff:g id="NUMBER">%1$s</xliff:g> op uw wifi-router op. De configuratie kan twee minuten in beslag nemen."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Geef de pincode <xliff:g id="NUMBER">%1$s</xliff:g> op uw wifi-router op. De configuratie kan twee minuten duren."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS geslaagd. Bezig met verbinding maken met netwerk…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Verbonden met wifi-netwerk <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS wordt al uitgevoerd; het kan twee minuten duren voordat dit proces is voltooid"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS wordt al uitgevoerd en het kan twee minuten duren voordat dit proces is voltooid"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS is mislukt. Probeer het over enkele minuten opnieuw."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"De beveiligingsinstelling voor de draadloze router (WEP) wordt niet ondersteund"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"De beveiligingsinstelling voor de draadloze router (TKIP) wordt niet ondersteund"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Uitnodiging annuleren?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Wilt u de uitnodiging voor verbinding met <xliff:g id="PEER_NAME">%1$s</xliff:g> annuleren?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Draagbare Wi-Fi-hotspot"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot inschakelen…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot uitschakelen…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Draagbare hotspot <xliff:g id="NETWORK_SSID">%1$s</xliff:g> actief"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fout met draagbare Wi-Fi-hotspot"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Wifi-hotspot instellen"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Achtergrond"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Achtergrond kiezen van"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Wordt gestart bij activeren van slaapstand indien aangesloten op stroomvoorziening"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Dromen"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Indien gedockt, in slaapstand of tijdens het opladen"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"In de slaapstand en tijdens het opladen"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Indien gedockt"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Uitgeschakeld"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Geselecteerde candy"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Geselecteerde droom"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Wanneer activeren"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Na <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inactiviteit"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nooit"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Probeer het eens!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Ook starten indien gedockt"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Starten in slaapstand"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Starten indien gedockt"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automatische helderheid"</string>
<string name="title_font_size" msgid="4405544325522105222">"Lettergrootte"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Lettergrootte"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Volledige vensteroppervlakken flashen bij updates"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU-weergave-updates weergeven"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Flash-weergaven in vensters indien getekend met de GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"HW-overlays uitschakelen"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"GPU altijd gebruiken voor schermcompositing"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Sporen inschakelen"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Weet u zeker dat u de gebruiker en alle bijbehorende gegevens wilt verwijderen van het apparaat?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Meldingen weergeven"</string>
<string name="help_label" msgid="1107174367904110532">"Help"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Account voor inhoud"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcasts"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecteer de typen noodoproepen die moeten worden weergegeven."</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 97f70bc..a59c55f 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Próby danych:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Usługa GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmień kod PIN odblokowania"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmień hasło odblokowania"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Liczba znaków w haśle musi wynosić co najmniej %d"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN musi mieć co najmniej %d znaki"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN musi mieć co najmniej %d cyfr"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Gdy skończysz, wybierz Kontynuuj"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Kontynuuj"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Hasło musi mieć mniej znaków niż <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Konfiguracja zabezpieczonej sieci Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Uruchamianie WPS..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Naciśnij przycisk konfiguracji zabezpieczonej sieci Wi-Fi na routerze. Może on mieć nazwę „WPS” lub ten symbol:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Wpisz <xliff:g id="NUMBER">%1$s</xliff:g> na routerze Wi-Fi. Konfiguracja może potrwać do dwóch minut."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Wpisz PIN <xliff:g id="NUMBER">%1$s</xliff:g> na routerze Wi-Fi. Konfiguracja może potrwać do dwóch minut."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"Konfiguracja WPS powiodła się. Łączenie z siecią..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Połączono z siecią Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Konfigurowanie WPS już trwa i może potrwać nawet dwie minuty"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Konfiguracja WPS już się rozpoczęła i może potrwać do dwóch minut"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Konfiguracja WPS nie powiodła się. Spróbuj ponownie za kilka minut."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Ustawienie zabezpieczeń routera bezprzewodowego (WEP) nie jest obsługiwane"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Ustawienie zabezpieczeń routera bezprzewodowego (TKIP) nie jest obsługiwane"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulować zaproszenie?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Czy chcesz anulować zaproszenie do połączenia z <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Przenośny punkt Wi-Fi"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Włączanie punktu dostępu…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Wyłączanie punktu dostępu…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Przenośny punkt dostępu <xliff:g id="NETWORK_SSID">%1$s</xliff:g> jest aktywny"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Błąd przenośnego punktu dostępu Wi-Fi"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Skonfiguruj hotspot Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Wybierz tapetę z..."</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Upiększanie ekranu"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"W trybie uśpienia, jeśli jest podłączone zasilanie."</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Sen"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Gdy zadokowane lub uśpione i podczas ładowania"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Gdy uśpione i podczas ładowania"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Gdy zadokowane"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Wyłączone"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Wybrane upiększenia"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Wybrany sen"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Włączenie wygaszacza"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> bezczynności"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nigdy"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Wypróbuj"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Także, gdy zadokowany."</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Uruchamiaj, gdy uśpione"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Uruchamiaj, gdy zadokowane"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automatyczna"</string>
<string name="title_font_size" msgid="4405544325522105222">"Rozmiar czcionki"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Rozmiar czcionki"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Podświetlaj całe aktualizowane powierzchnie okien"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Pokaż zmiany widoku z GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Podświetlaj widoki w oknach rysowane przez GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Wyłącz nakładki HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Zawsze używaj GPU do komponowania ekranu"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Włącz ślady"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Czy na pewno chcesz usunąć użytkownika i wszystkie związane z nim dane z urządzenia?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Pokaż powiadomienia"</string>
<string name="help_label" msgid="1107174367904110532">"Pomoc"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Konto na materiały"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Identyfikator zdjęcia"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmisje komórkowe"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Wybierz typy alertów o zagrożeniu, które chcesz wyświetlić."</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 38e138a..86b60ccd 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativas de dados:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serviço GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Alterar PIN de desbloqueio"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Alterar palavra-passe de desbloqueio"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"A palavra-passe tem de ter no mínimo %d caracteres"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"O PIN tem de ter no mínimo %d caracteres"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"O PIN tem de ter, pelo menos, %d dígitos"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Toque em Continuar quando terminar"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"A palavra-passe tem de ter menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configuração Wi-Fi Protegida"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"A iniciar WPS..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Prima o botão de Configuração Protegida de Wi-Fi no router. Pode denominar-se \"WPS\" ou conter o seguinte símbolo:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Introduza o PIN <xliff:g id="NUMBER">%1$s</xliff:g> do router Wi-Fi. A configuração pode demorar até dois minutos a ser concluída."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Introduza o PIN <xliff:g id="NUMBER">%1$s</xliff:g> do router Wi-Fi. A configuração pode demorar até dois minutos a ser concluída."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS iniciado com êxito. A estabelecer a ligação à rede..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Ligado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"O WPS já está em curso e pode demorar até dois minutos a ser concluído"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"O WPS já está em curso e pode demorar até dois minutos a concluir"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"O WPS falhou. Tente novamente dentro de alguns minutos."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"A definição de segurança do router sem fios (WEP) não é suportada"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A definição de segurança do router sem fios (TKIP) não é suportada"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancelar convite?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Pretende cancelar o convite para se ligar a <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portátil"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"A ativar zona Wi-Fi..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"A desativar zona Wi-Fi..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activo"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erro do hotspot Wi-Fi portátil"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configurar zona Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagem de fundo"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Escolher imagem de fundo de"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Proteção de Ecrã"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Será iniciado ao suspender, se estiver ligado à alimentação"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Sonho"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Quando ancorado ou em suspensão e a carregar"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Quando em suspensão e a carregar"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Quando ancorado"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Desativado"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Proteção de Ecrã selecionada"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Sonho selecionado"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Quando ativar"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inativo"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Experimente!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Também iniciar quando ancorado"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Iniciar quando em suspensão"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Iniciar quando ancorado"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
<string name="title_font_size" msgid="4405544325522105222">"Tamanho do tipo de letra"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Tamanho do tipo de letra"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Destacar todas as superf. janelas quando atualizam"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Most.atualiz. visual. GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Dest. visualiz. em janelas quando desenh. c/ GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Desativ. sobreposições HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizar sempre GPU para a composição do ecrã"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Ativar rastreios"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Tem a certeza de que pretende remover o utilizador e todos os dados associados do dispositivo?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
<string name="help_label" msgid="1107174367904110532">"Ajuda"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID da fotografia"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmissões celulares"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecione os tipos de alertas de emergência a apresentar."</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 272ebfb..fb9ecf3 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Tentativas de dados:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serviço GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Alterar PIN de desbloqueio"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Alterar senha de desbloqueio"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"A senha deve ter no mínimo %d caracteres"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"O PIN deve ter no mínimo %d caracteres."</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"O PIN deve ter no mínimo %d caracteres"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Toque em Continuar quando terminar"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuar"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"A senha deve ter menos de <xliff:g id="NUMBER">%d</xliff:g> caracteres."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Config. protegida do Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iniciando WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Pressione o botão \"Wi-Fi Protected Setup\" do roteador. Ele também pode ser chamado de \"WPS\" ou conter este símbolo:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Insira o pin <xliff:g id="NUMBER">%1$s</xliff:g> em seu roteador Wi-Fi. A configuração pode levar até dois minutos para ser concluída."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Insira o pin <xliff:g id="NUMBER">%1$s</xliff:g> em seu roteador Wi-Fi. A configuração pode levar até dois minutos para ser concluída."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS realizada. Conectando-se à rede…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Conectado à rede Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"A WPS já está em andamento e pode levar até dois minutos para ser concluída"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"A WPS já está em andamento e pode levar até dois minutos para ser concluída"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Falha na WPS. Tente novamente em alguns minutos."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"A configuração de segurança do roteador sem fio (WEP) não é suportada"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"A configuração de segurança do roteador sem fio (TKIP) não é suportada"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Cancelar convite?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Deseja cancelar o convite para se conectar com <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi portátil"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Ativando o ponto de acesso..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Desativando o ponto de acesso..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Ponto de acesso portátil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ativo"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Erro de ponto de acesso Wi-Fi portátil"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Config. ponto de acesso Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Depois de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inatividade"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Plano de fundo"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Selecionar plano de fundo de"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Começará no modo de espera se estiver conectado à energia"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Sonho"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Quando encaixado ou em suspensão e carregamento"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Quando em suspensão e carregamento"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Quando encaixado"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Desativada"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Candy selecionado"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Sonho selecionado"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Quando ativar"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Após <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> inativo"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nunca"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Teste-o!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Começar também quando estiver encaixado"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Iniciar em suspensão"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Iniciar quando encaixado"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Brilho automático"</string>
<string name="title_font_size" msgid="4405544325522105222">"Tamanho da fonte"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Tamanho da fonte"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Piscar superfícies de toda a janela ao atualizar"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Mostrar atualiz. da GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Piscar visualizações em janelas ao desenhar c/GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Desativar sobreposição HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Sempre usar a GPU para composição de tela"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Ativar traços"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Tem certeza que deseja remover o usuário e todos os dados associados do dispositivo?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Mostrar notificações"</string>
<string name="help_label" msgid="1107174367904110532">"Ajuda"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Conta para conteúdo"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID de foto"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmissões por celular"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selecione os tipos de alertas de emergência a exibir."</string>
</resources>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 47e11e2..7ce398d 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -263,6 +263,8 @@
<skip />
<string name="radio_info_signal_location_label" msgid="16475158265551708">"Posiziun:"</string>
<string name="radio_info_neighboring_location_label" msgid="2385625674055934880">"CID vischin:"</string>
+ <!-- no translation found for radio_info_cellinfo_label (1300937728020622362) -->
+ <skip />
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Emprovas datas:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Servetsch GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -527,7 +529,8 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Midar il PIN da debloccaziun"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Midar il pled-clav da debloccaziun"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Il pled-clav sto cuntegnair almain %d caracters."</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Il PIN sto cuntegnair almain %d caracters."</string>
+ <!-- no translation found for lockpassword_pin_too_short (1677649103470518953) -->
+ <skip />
<string name="lockpassword_press_continue" msgid="122706614386757182">"Smatgai sin Vinavant sche Vus essas a fin."</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Vinavant"</string>
<!-- no translation found for lockpassword_password_too_long (7016906583950201704) -->
@@ -773,13 +776,13 @@
<skip />
<!-- no translation found for wifi_wps_onstart_pbc (7204827509934892103) -->
<skip />
- <!-- no translation found for wifi_wps_onstart_pin (8116564886303972764) -->
+ <!-- no translation found for wifi_wps_onstart_pin (8067502591043979939) -->
<skip />
<!-- no translation found for wifi_wps_complete (2388138550456729134) -->
<skip />
<!-- no translation found for wifi_wps_connected (5754399645462924103) -->
<skip />
- <!-- no translation found for wifi_wps_in_progress (2944576520214787628) -->
+ <!-- no translation found for wifi_wps_in_progress (3372311348221357944) -->
<skip />
<!-- no translation found for wifi_wps_failed_generic (5668775022238832527) -->
<skip />
@@ -895,6 +898,10 @@
<!-- no translation found for wifi_p2p_cancel_connect_message (7477756213423749402) -->
<skip />
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Punct d\'access WLAN mobil"</string>
+ <!-- no translation found for wifi_tether_starting (1322237938998639724) -->
+ <skip />
+ <!-- no translation found for wifi_tether_stopping (4835852171686388107) -->
+ <skip />
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Punct d\'access WLAN mobil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activ"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Errur en connex cun il punct d\'access WLAN mobil"</string>
<!-- no translation found for wifi_tether_configure_ap_text (61237027772641155) -->
@@ -996,13 +1003,17 @@
<skip />
<!-- no translation found for wallpaper_settings_fragment_title (519078346877860129) -->
<skip />
- <!-- no translation found for screensaver_settings_title (3848608373818910549) -->
+ <!-- no translation found for screensaver_settings_title (4458091032540874366) -->
<skip />
- <!-- no translation found for screensaver_settings_summary_on (433728808047613634) -->
+ <!-- no translation found for screensaver_settings_summary_both (1175671101656240599) -->
+ <skip />
+ <!-- no translation found for screensaver_settings_summary_sleep (7231274537626605107) -->
+ <skip />
+ <!-- no translation found for screensaver_settings_summary_dock (4450616262936082466) -->
<skip />
<!-- no translation found for screensaver_settings_summary_off (7019248565878953105) -->
<skip />
- <!-- no translation found for screensaver_component_title (8596216100441725363) -->
+ <!-- no translation found for screensaver_component_title (5786117148360329058) -->
<skip />
<!-- no translation found for screensaver_timeout_title (4882666970355550822) -->
<skip />
@@ -1012,7 +1023,9 @@
<skip />
<!-- no translation found for screensaver_test (3048249263811694128) -->
<skip />
- <!-- no translation found for screensaver_activate_on_dock_title (3753003388633168862) -->
+ <!-- no translation found for screensaver_activate_on_sleep_title (5463857907577089065) -->
+ <skip />
+ <!-- no translation found for screensaver_activate_on_dock_title (5594601783697028555) -->
<skip />
<string name="automatic_brightness" msgid="5014143533884135461">"Clerezza automatica"</string>
<!-- no translation found for title_font_size (4405544325522105222) -->
@@ -2367,6 +2380,10 @@
<skip />
<!-- no translation found for show_hw_screen_updates_summary (1115593565980196197) -->
<skip />
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<!-- no translation found for disable_overlays (2074488440505934665) -->
<skip />
<!-- no translation found for disable_overlays_summary (3578941133710758592) -->
@@ -2676,6 +2693,10 @@
<skip />
<!-- no translation found for help_label (1107174367904110532) -->
<skip />
+ <!-- no translation found for user_account_title (1127193807312271167) -->
+ <skip />
+ <!-- no translation found for user_picture_title (7297782792000291692) -->
+ <skip />
<!-- no translation found for cell_broadcast_settings (8415582011920085222) -->
<skip />
<!-- no translation found for cell_broadcast_settings_summary (3301339398950905913) -->
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 62c1c6f..47c07ab 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Încercări de date:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serviciu GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Schimbaţi codul PIN de deblocare"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Schimbaţi parola pentru deblocare"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Parola trebuie să conţină minimum %d (de) caractere"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Codul PIN trebuie să conţin minimum %d (de) caractere"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Codul PIN trebuie să aibă minimum %d cifre"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Atingeţi Continuaţi la terminare"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Continuaţi"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Parola trebuie să aibă mai puţin de <xliff:g id="NUMBER">%d</xliff:g> (de) caractere."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Configurare protejată Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Se porneşte WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Apăsaţi butonul Configurare protejată Wi-Fi de pe router. Acesta poate apărea ca „WPS” sau poate conţine acest simbol:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Introduceţi codul PIN <xliff:g id="NUMBER">%1$s</xliff:g> pe routerul Wi-Fi. Finalizarea configurării poate dura până la două minute."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Introduceţi codul PIN <xliff:g id="NUMBER">%1$s</xliff:g> pe routerul Wi-Fi. Finalizarea configurării poate dura până la două minute."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS finalizată. Se conectează la reţea…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Conectat la reţeaua Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Configurarea WPS este deja în desfăşurare şi poate dura până la două minute pentru a se finaliza"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS este deja în desfăşurare. Finalizarea poate dura până la două minute."</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS eşuată. Încercaţi din nou peste câteva minute."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Setarea de securitate pentru routerul wireless (WEP) nu este acceptată"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Setarea de securitate pentru routerul wireless (TKIP) nu este acceptată"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Anulaţi invitaţia?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Doriţi să anulaţi invitaţia de conectare cu <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Hotspot Wi-Fi portabil"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Se activează hotspotul..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Se dezactivează hotspotul..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot portabil <xliff:g id="NETWORK_SSID">%1$s</xliff:g> activ"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Eroare de hotspot Wi-Fi portabil"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Configuraţi hotspotul Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"După <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> de inactivitate"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Imagine de fundal"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Aleg. o imag. de fundal de la"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Abţibilduri pentru ecran"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Va porni după un interval de inactivitate, dacă dispozitivul este conectat la alimentare"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Vis"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Când dispozitivul este andocat sau în modul inactiv şi se realizează încărcarea"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Când dispozitivul este în modul inactiv şi se realizează încărcarea"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Când dispozitivul este andocat"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Dezactivat"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Abţibild pentru ecran selectat"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Visul selectat"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Când se activează"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"După un interval de inactivitate de <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Niciodată"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Încercaţi-l!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Porneşte şi când dispozitivul este andocat"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Porneşte când dispozitivul este în modul inactiv"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Porneşte când dispozitivul este andocat"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Luminozitate automată"</string>
<string name="title_font_size" msgid="4405544325522105222">"Dimensiune font"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Dimensiune font"</string>
@@ -1551,6 +1557,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Iluminare suprafeţe toată fereastra la actualizare"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Afiş. actualiz. ecran GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Iluminare ecrane din ferestre la desenarea cu GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Dezactivaţi suprapun. HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Utilizaţi mereu GPU pentru compunerea ecranului"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Activaţi monitorizările"</string>
@@ -1706,6 +1716,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Sigur doriţi să eliminaţi de pe dispozitiv utilizatorul şi toate datele asociate acestuia?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Afişaţi notificările"</string>
<string name="help_label" msgid="1107174367904110532">"Ajutor"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Cont pentru conţinut"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Transmisii celulare"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Selectaţi tipurile de alerte de urgenţă de afişat."</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index db5d9cd..a44ae01 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Прокси-сервер HTTP используется браузером, но недоступен для других приложений."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Попыток данных:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Услуга GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Роуминг:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Изменить ПИН-код разблокировки"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Изменить пароль разблокировки"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Пароль должен содержать не менее %d символов"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-код должен содержать не менее %d символов"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-код должен содержать не менее %d цифр"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"После завершения нажмите \"Продолжить\""</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Продолжить"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Пароль должен содержать не более <xliff:g id="NUMBER">%d</xliff:g> симв."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Безопасная настройка Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запуск WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Нажмите кнопку \"Безопасная настройка Wi-Fi\" на своем маршрутизаторе. Она может называться WPS, а также содержать следующий символ:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Введите PIN-код <xliff:g id="NUMBER">%1$s</xliff:g> на маршрутизаторе Wi-Fi. Для завершения настройки потребуется не более двух минут."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Введите PIN-код <xliff:g id="NUMBER">%1$s</xliff:g> на маршрутизаторе Wi-Fi. Для завершения настройки потребуется не более двух минут."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"Ошибок нет. Подключение к сети…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Установлено подключение к сети Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Выполняется настройка WPS. На завершение этого процесса потребуется не более двух минут."</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Выполняется настройка WPS. Для завершения потребуется не более двух минут."</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Ошибка. Повторите попытку через несколько минут."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Безопасная настройка беспроводного маршрутизатора (WEP) не поддерживается"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Безопасная настройка беспроводного маршрутизатора (TKIP) не поддерживаются"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Отмена приглашения"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Вы собираетесь отменить приглашение на подключение к устройству \"<xliff:g id="PEER_NAME">%1$s</xliff:g>\". Продолжить?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Точка доступа Wi-Fi"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Включение точки доступа…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Выключение точки доступа…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Точка доступа <xliff:g id="NETWORK_SSID">%1$s</xliff:g> активна"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Ошибка подключения"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Настройка точки доступа"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездействия"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Обои"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Установка обоев"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Заставка"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Активация в спящем режиме при зарядке"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Заставка"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"При подключении к док-станции, при переходе в спящий режим и во время зарядки"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"При переходе в спящий режим и во время зарядки"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"При подключении к док-станции"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Выключено"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Заставка"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Заставка"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Время до активации"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Выкл."</string>
<string name="screensaver_test" msgid="3048249263811694128">"Попробовать"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Вкл. в док-станции"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Активировать при переходе в спящий режим"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Активировать при подключении к док-станции"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Автонастройка"</string>
<string name="title_font_size" msgid="4405544325522105222">"Размер шрифта"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Размер шрифта"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Подсвечивать окна полностью при их обновлении"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Показывать обнов. экрана"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Подсвечивать области экрана при отрисовке с GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Откл. аппарат. наложения"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Всегда использовать GPU при компоновке экрана"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Включить трассировки"</string>
@@ -1707,6 +1717,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Действительно удалить с устройства аккаунт пользователя и все его данные?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Включить уведомления"</string>
<string name="help_label" msgid="1107174367904110532">"Справка"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Аккаунт для контента"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Документ с фото"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Широковещательная передача сообщений"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Выберите типы экстренных оповещений на экране."</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d286308..f701cc1 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Pokusy údajov:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Služba GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Zmena bezpečnostného kódu PIN"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Zmeniť bezpečnostné heslo"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Heslo musí obsahovať najmenej %d znakov"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Kód PIN musí obsahovať najmenej %d znakov"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Kód PIN musí obsahovať najmenej %d číslic"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Po dokončení sa dotknite tlačidla Pokračovať"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Pokračovať"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Heslo musí mať menej ako <xliff:g id="NUMBER">%d</xliff:g> znakov."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Zabezpečené nastavenie siete Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Spúšťanie WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Stlačte na svojom smerovači tlačidlo Chránené nastavenie Wi-Fi. Môže byť označené písmenami WPS alebo týmto symbolom:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Zadajte vo svojom smerovači siete Wi-Fi kód PIN <xliff:g id="NUMBER">%1$s</xliff:g>. Proces nastavenia môže trvať až dve minúty."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Zadajte na svojom smerovači siete Wi-Fi kód PIN <xliff:g id="NUMBER">%1$s</xliff:g>. Proces nastavenia môže trvať až dve minúty."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"Spustenie WPS sa podarilo. Prebieha pripájanie k sieti…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Pripojené k sieti Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS prebieha a dokončenie procesu môže trvať až dve mnúty."</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS prebieha a dokončenie procesu môže trvať až dve mnúty"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Spustenie WPS zlyhalo. Skúste to znova o niekoľko minút."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Nastavenie zabezpečenia bezdrôtového smerovača (TKIP) nie je podporované"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Nastavenie zabezpečenia bezdrôtového smerovača (TKIP) nie je podporované"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Zrušiť pozvánku?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Chcete zrušiť pozvánku na spojenie s klientom <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prenosný prístupový bod Wi-Fi"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Prebieha zapínanie hotspotu..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Prebieha vypínanie hotspotu..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Prenosný prístupový bod <xliff:g id="NETWORK_SSID">%1$s</xliff:g> je aktívny"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Chyba prenosného prístupového bodu Wi-Fi"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Nastaviť hotspot Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nečinnosti"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Tapeta"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Vybrať tapetu z"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Dekorácia obrazovky"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Ak je zariadenie pripojené ku zdroju, spustí sa pri prechode do režimu spánku"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Sen"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Pri vložení do doku alebo pri nabíjaní v režime spánku"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Pri nabíjaní v režime spánku"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Pri vložení do doku"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Zakázané"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Vybratá dekorácia"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Vybratý sen"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Čas aktivácie"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Po nečinnosti <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikdy"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Vyskúšať"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Spustiť aj po vložení do doku"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Spustiť v režime spánku"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Spustiť pri vložení do doku"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automatický jas"</string>
<string name="title_font_size" msgid="4405544325522105222">"Veľkosť písma"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Veľkosť písma"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Celý obsah okna pri aktualizácii bliká"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Zobr. aktual. zobraz. GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Zobrazenia v oknách vykresľované s GPU blikajú"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Zakázať hardvér. prekrytia"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Vždy používať jednotku GPU na skladanie obrazovky"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Povoliť sledovania"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Naozaj chcete odstrániť používateľa a všetky priradené údaje zo zariadenia?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Zobraziť upozornenia"</string>
<string name="help_label" msgid="1107174367904110532">"Pomocník"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Účet pre obsah"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID fotografie"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Hromadné zasielanie správ v rámci bunky"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Vyberte typy tiesňových upozornení, ktoré sa majú zobraziť."</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 0cee34b..6259b82 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proxy HTTP lahko uporablja brskalnik, drugi programi pa ne."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Podatkovni poskusi:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Storitev GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Gostovanje:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Spremeni kodo PIN za odklepanje"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Spremeni geslo za odklepanje"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Geslo mora vsebovati vsaj %d znakov"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Koda PIN mora vsebovati vsaj %d znakov"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Koda PIN mora biti vsaj %d-mestna"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Ko končate, se dotaknite »Nadaljuj«"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Naprej"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Geslo mora imeti manj kot toliko znakov: <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Zaščitena nastavitev Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Zagon nastavitve WPS ..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Pritisnite gumb »Zaščitena nastavitev za Wi-Fi« na usmerjevalniku. Morda se imenuje »WPS« ali vsebuje ta simbol."</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Vnesite PIN <xliff:g id="NUMBER">%1$s</xliff:g> za usmerjevalnik Wi-Fi. Nastavitev lahko traja do dve minuti."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Vnesite PIN <xliff:g id="NUMBER">%1$s</xliff:g> za usmerjevalnik Wi-Fi. Nastavitev lahko traja največ dve minuti."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"Nastavitev WPS je uspela. Povezovanje z omrežjem ..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Povezava z omrežjem Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g> je vzpostavljena"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Nastavitev WPS že poteka in lahko traja do dve minuti"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Nastavitev WPS že poteka in lahko traja največ dve minuti"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Nastavitev WPS ni uspela. Poskusite znova čez nekaj minut."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Varnostna nastavitev brezžičnega usmerjevalnika (WEP) ni podprta"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Varnostna nastavitev brezžičnega usmerjevalnika (TKIP) ni podprta"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Želite preklicati povabilo?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ali želite preklicati povabilo za povezavo z napravo <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Prenosna brezžična dostopna točka"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Vklop dostopne točke ..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Izklop dostopne točke ..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Prenosna dostopna točka <xliff:g id="NETWORK_SSID">%1$s</xliff:g> dejavna"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Napaka prenosne brezžične dostopne dostopne točke"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Nastavitev dostopne točke Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nedejavnosti"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Ozadje"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Izberite ozadje iz"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Zaslonske sladkarije"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Zagon v stanju pripravljenosti, če je priključeno napajanje"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Sanje"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"V stojalu ali v stanju pripravljenosti in se polni"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"V stanju pripravljenosti in se polni"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"V stojalu"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Onemogočeno"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Izbrane sladkarije"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Izbrane sanje"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Kdaj aktivirati"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Po <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> nedejavnosti"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nikoli"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Poskusite!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Zaženi tudi, ko je v stojalu"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Zaženi v stanju pripravljenosti"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Zaženi, ko je v stojalu"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Samodejna svetlost"</string>
<string name="title_font_size" msgid="4405544325522105222">"Velikost pisave"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Velikost pisave"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Ob posodobitvi osvetli celotne površine oken"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Pokaži posod. pogleda GPE"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Osvetli poglede v oknih pri risanju z GPE"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Onem. strojni medp."</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Za sestavljanje slike vedno uporabi graf. procesor"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Omogoči sledi"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Ali ste prepričani, da želite iz naprave odstraniti uporabnika in vse povezane podatke?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Pokaži obvestila"</string>
<string name="help_label" msgid="1107174367904110532">"Pomoč"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Račun za vsebino"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID fotografije"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Oddaje v celici"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Izberite vrste nujnih opozoril, ki jih želite prikazati."</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 4d27240..c02e6fa 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Прегледач користи HTTP прокси, али друге апликације не могу да га користе."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Покушаји преноса података:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS услуга:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Роминг:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Промена PIN-а за откључавање"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Промена лозинке за откључавање"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Минимални број знакова који лозинка мора да садржи је %d"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Минимални број знакова у PIN коду је %d"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Минимални број цифара у PIN-у је %d"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Додирните „Настави“ када завршите"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Настави"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Лозинка мора да има мање од <xliff:g id="NUMBER">%d</xliff:g> знак(ов)а."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Заштићено подешавање Wi-Fi-ја"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Покретање WPS-а..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Притисните дугме Заштићено подешавање Wi-Fi-ја на рутеру. Можда се зове „WPS“ или садржи овај симбол:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Унесите PIN <xliff:g id="NUMBER">%1$s</xliff:g> на Wi-Fi рутеру. Подешавање ће бити довршено за највише два минута."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Унесите PIN <xliff:g id="NUMBER">%1$s</xliff:g> на Wi-Fi рутеру. Подешавање ће бити довршено за највише два минута."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS је успео. Повезивање на мрежу..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Повезано са Wi-Fi мрежом <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS је већ покренут и биће довршен за највише два минута"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS је већ покренут и биће довршен за највише два минута"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS није успео. Покушајте поново за неколико минута."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Безбедносно подешавање бежичног рутера (WEP) није подржано"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Безбедносно подешавање бежичног рутера (TKIP) није подржано"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Желите ли да откажете позивницу?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Желите ли да откажете позивницу за повезивање са уређајем <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Преносна Wi-Fi приступна тачка"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Укључивање хотспота…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Искључивање хотспота..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Преносна приступна тачка <xliff:g id="NETWORK_SSID">%1$s</xliff:g> је активна"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Грешка у преносној Wi-Fi приступној тачки"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Подеси Wi-Fi хотспот"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"После <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> неактивности"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Позадина"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Избор позадине из"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Бомбона на екрану"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Активираће се када пређе у стање спавања ако је прикључен на напајање"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Сан"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Када је на базној станици или у стању спавања и пуни се"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Када је у стању спавања и пуни се"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Када је на базној станици"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Онемогућен"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Изабрана бомбона"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Изабрани сан"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Када да се активира"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Након стања неактивности од <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Никада"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Испробај!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Активирај и када је на постољу"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Покрени у стању спавања"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Покрени када је на базној станици"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Аутоматски ниво осветљености"</string>
<string name="title_font_size" msgid="4405544325522105222">"Величина фонта"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Величина фонта"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Осветли све површине прозора када се ажурирају"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Прикажи ажур. GPU приказа"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Осветли приказе у прозор. када се црта са GPU-ом"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Онемог. HW пост. елементе"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Увек користи GPU за компоновање екрана"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Омогући трагове"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Желите ли заиста да уклоните корисника и све повезане податке са уређаја?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Прикажи обавештења"</string>
<string name="help_label" msgid="1107174367904110532">"Помоћ"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Налог за садржај"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ИД слике"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Поруке инфо сервиса"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Изаберите типове упозорења на хитне случајеве који ће се приказивати."</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 05dbdf8..d9d90ac 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Dataförsök:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS-tjänst:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Ändra PIN-kod för upplåsning"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Ändra lösenord för upplåsning"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Lösenordet måste innehålla minst %d tecken"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-koden måste innehålla minst %d tecken"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-koden måste innehålla minst %d siffror"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Tryck på Fortsätt när du är färdig"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Fortsätt"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Lösenordet får inte innehålla mer än <xliff:g id="NUMBER">%d</xliff:g> tecken."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Skyddad Wi-Fi-konfiguration"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Startar WPS ..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Tryck på knappen Wi-Fi Protected Setup på routern. Den kan kallas WPS eller vara märkt med denna symbol:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Ange pinkoden <xliff:g id="NUMBER">%1$s</xliff:g> på din Wi-Fi-router. Det kan ta upp till två minuter att slutföra installationen."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Ange pinkoden <xliff:g id="NUMBER">%1$s</xliff:g> på din Wi-Fi-router. Det kan ta upp till två minuter att slutföra installationen."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS slutfördes. Ansluter till nätverket ..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Ansluten till Wi-Fi-nätverket <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS pågår redan och kan ta upp till två minuter att slutföra"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS pågår redan och kan ta upp till två minuter att slutföra"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS misslyckades. Försök igen om några minuter."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Säkerhetsinställningen för den trådlösa routern (WEP) stöds inte"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Säkerhetsinställningen för den trådlösa routern (TKIP) stöds inte"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Avvisa inbjudan?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Vill du avvisa inbjudan att ansluta till <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Mobil Wi-Fi-surfpunkt"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Aktiverar trådlös surfzon ..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Trådlös surfzon inaktiveras ..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Mobil surfpunkt <xliff:g id="NETWORK_SSID">%1$s</xliff:g> aktiv"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Fel på mobil Wi-Fi-surfpunkt"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Konfigurera trådlös surfzon via Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Bakgrund"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Välj bakgrund från"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Alternativ för skärmsläckare"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Skärmsläckaren aktiveras när enheten sätts i viloläge om den är ansluten till en strömkälla"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Dröm"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"När enheten dockas eller laddas i viloläge"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"När enheten laddas i viloläge"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"När enheten dockas"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Inaktiverad"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Valt alternativ"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Vald dröm"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Tidsgräns för skärmsläckare"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Efter att ha varit inaktiv i <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Aldrig"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Testa!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Starta även när enheten är dockad"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Starta i viloläge"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Starta när enheten dockas"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Automatisk ljusstyrka"</string>
<string name="title_font_size" msgid="4405544325522105222">"Teckenstorlek"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Teckenstorlek"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Hela fönstret blinkar vid uppdatering"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Visa GPU-visningsuppdateringar"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Visningar blinkar i fönster vid GPU-ritningar"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Inaktivera HW-överlagringar"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Använd alltid GPU för skärmsammansättning"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Aktivera spår"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Är du säker på att du vill ta bort användaren och alla användarens data från enheten?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Visa meddelanden"</string>
<string name="help_label" msgid="1107174367904110532">"Hjälp"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Konto för innehåll"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Foto-ID"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Cell broadcasts"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Välj vilka typer av varningsmeddelanden som ska visas."</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 2d3c2bd..b397c2f 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -194,6 +194,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Proksi ya HTTP inayotumiwa na kivinjari lakini haiwezi kutumika na programu zingine."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Majaribio ya data:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Huduma ya GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"urandaji:"</string>
@@ -366,7 +367,9 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Badilisha PIN ya kufungua"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Badilisha nenosiri la kufungua"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Nenosiri lazima iwe angalau na vibambo %d"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN lazima iwe angalau na vibambo %d"</string>
+ <!-- String.format failed for translation -->
+ <!-- no translation found for lockpassword_pin_too_short (1677649103470518953) -->
+ <skip />
<string name="lockpassword_press_continue" msgid="122706614386757182">"Gusa Endelea wakati imekamilaka"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Endelea"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Nenosiri lazima liwe na vibambo chini ya <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -520,10 +523,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Usanidi Uliolindwa na Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Inaanzisha WPS ..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Bonyeza kitufe Kilicholindwa cha Usanidi cha Wi-Fi kwenye kiteua njia chako. Kinaweza kujulikana kama \"WPS\" au kuwa na nembo hii:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Ingiza pin <xliff:g id="NUMBER">%1$s</xliff:g> kwenye kipanga njia chako cha Wi-Fi. Usanidi unaweza kuchukua hadi dakika mbili ili kukamilika."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Ingiza pin <xliff:g id="NUMBER">%1$s</xliff:g> kwenye kipanga njia chako cha Wi-Fi. Usanidi unaweza kuchukua hadi dakika mbili ili kukamilika."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS imefanikiwa. Inaunganisha kwenye mtandao..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Umeunganishwa kwa mtandao wa Wi-Fi wa <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS tayari inaendelea na inaweza kuchukua hadi dakika mbili kukamilika"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS tayari inaendelea na inaweza kuchukua hadi dakika mbili kukamilika"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS imeshindwa. Tafadhali jaribu tena baada ya dakika chache."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Mpangilio wa usalama wa kipanga njia pasiwaya (WEP) hauauniwi."</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Mpangilio wa usalama wa kipanga njia pasiwaya (TKIP) hauauniwi."</string>
@@ -595,6 +598,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Ghairi mwaliko?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Je, unataka kughairi mwaliko wa kuungana na <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Ubebezi wa Mipangilo ya ubebezi wa eneo maalum la Wi-Fi"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Inawezesha mtandao-hewa…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Inalemaza mtandao-hewa…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Hotspot bebezi<xliff:g id="NETWORK_SSID">%1$s</xliff:g> amilifu"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Wi-Fi hotspot bebezi ina hitilafu"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Sanidi mtandao-hewa wa Wi-Fi"</string>
@@ -663,15 +668,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ya kutokuwa na shughuli"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Mandhari"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chagua mandhari kutoka"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Itaanza ikilala ikiwa imeunganishwa kwenye nguvu"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Ndoto"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Wakati imewekwa kwenye gati au kulala na inachaji"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Wakati inalala au kuchaji"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Wakati kimewekwa kwenye gati"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Imelemazwa"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Pipi iliyochaguliwa"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Ndoto iliyochaguliwa"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Wakati wa kuamilisha"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Baada ya <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> uliotumika bila kufanya kitu"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Kamwe"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Ijaribu!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Pia anza wakati imewekwa kwenye kituo"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Anza kinapolala"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Anza wakati kimewekwa kwenye gati"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Mwangaza wa kiotomatiki"</string>
<string name="title_font_size" msgid="4405544325522105222">"Ukubwa wa maandishi"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Ukubwa wa fonti"</string>
@@ -1540,6 +1548,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Angaza dirisha lote zitakaposasisha"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Onyesha sasisho za mtazamo wa GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Kiwango cha maoni ndani ya madirisha wakati yanatolewa na GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Lemaza miekeleo ya HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Daima tumia GPU kwa mchanganyiko wa skrini"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Wezesha ufuatiliaji"</string>
@@ -1695,6 +1707,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Je, una uhakika unataka kuondoa mtumiaji na data zote zinazohusika kutoka kwenye kifaa?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Onyesha arifa"</string>
<string name="help_label" msgid="1107174367904110532">"Msaada"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Akaunti ya maudhui"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Kitambulisho cha Picha"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Matangazo ya simu"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Chagua aina ya arifa za dharura za kuonyesha."</string>
</resources>
diff --git a/res/values-sw600dp/styles.xml b/res/values-sw600dp/styles.xml
index 2b01d7f..f780f53 100644
--- a/res/values-sw600dp/styles.xml
+++ b/res/values-sw600dp/styles.xml
@@ -24,8 +24,8 @@
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">8dip</item>
- <item name="android:layout_marginLeft">16dip</item>
- <item name="android:layout_marginRight">16dip</item>
+ <item name="android:layout_marginStart">16dip</item>
+ <item name="android:layout_marginEnd">16dip</item>
<item name="android:orientation">horizontal</item>
<item name="android:gravity">center_vertical</item>
</style>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index bb13651..e24081b 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"พร็อกซี HTTP มีการใช้งานโดยเบราว์เซอร์ แต่อาจไม่มีการใช้งานโดยแอปพลิเคชันอื่น"</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"ความพยายามใช้ข้อมูล:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"บริการ GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"โรมมิ่ง:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"เปลี่ยน PIN สำหรับปลดล็อก"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"เปลี่ยนรหัสผ่านสำหรับปลดล็อก"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"รหัสผ่านจะต้องมีอักขระอย่างน้อย %d ตัว"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN จะต้องมีอักขระอย่างน้อย %d ตัว"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN ต้องมีตัวเลขอย่างน้อย %d หลัก"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"แตะ ดำเนินการต่อ เมื่อเสร็จสิ้น"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"ดำเนินการต่อ"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"รหัสผ่านต้องยาวไม่เกิน <xliff:g id="NUMBER">%d</xliff:g> อักขระ"</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"การตั้งค่าการป้องกัน WiFi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"กำลังเริ่มต้น WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"กดปุ่ม \"การตั้งค่า WiFi แบบปลอดภัย\" บนเราเตอร์ของคุณ ปุ่มนี้อาจถูกเรียกว่า \"WPS\" หรือมีสัญลักษณ์นี้อยู่ด้วย:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"ป้อน PIN <xliff:g id="NUMBER">%1$s</xliff:g> บนเราเตอร์ WiFi ของคุณ การตั้งค่าอาจใช้เวลานานถึงสองนาทีจึงจะเสร็จสิ้น"</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"ป้อน PIN <xliff:g id="NUMBER">%1$s</xliff:g> บนเราเตอร์ WiFi ของคุณ การตั้งค่าอาจใช้เวลาถึงสองนาทีจึงจะเสร็จสิ้น"</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS สำเร็จแล้ว กำลังเชื่อมต่อกับเครือข่าย…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"เชื่อมต่อกับเครือข่าย WiFi <xliff:g id="NETWORK_NAME">%s</xliff:g> แล้ว"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS กำลังดำเนินการอยู่และอาจใช้เวลานานถึงสองนาทีจึงจะเสร็จสิ้น"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS กำลังดำเนินการอยู่และอาจใช้เวลาถึงสองนาทีจึงจะเสร็จสิ้น"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS ล้มเหลว โปรดลองอีกครั้งหลังจากนี้สักครู่"</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"ไม่สนับสนุนการตั้งค่าความปลอดภัยของเราเตอร์ไร้สาย (WEP)"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"ไม่สนับสนุนการตั้งค่าความปลอดภัยของเราเตอร์ไร้สาย (TKIP)"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"ยกเลิกข้อความเชิญหรือไม่"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"คุณต้องการยกเลิกข้อความเชิญเพื่อเชื่อมต่อกับ <xliff:g id="PEER_NAME">%1$s</xliff:g> หรือไม่"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Wi-Fi ฮอตสปอตแบบพกพา"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"กำลังเปิดฮอตสปอต…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"กำลังปิดฮอตสปอต…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"ฮอตสปอตแบบพกพาได้ <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ทำงานอยู่"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"ข้อผิดพลาดของ Wi-Fi ฮอตสปอตแบบพกพา"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"ตั้งค่า WiFi ฮอตสปอต"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"หลังจากไม่ได้ทำงานเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"วอลเปเปอร์"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"เลือกวอลเปเปอร์จาก"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"หน้าจอ Candy"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"จะเริ่มเมื่อเข้าสู่โหมดสลีปหากชาร์จไฟ"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"เมื่อวางบนแท่นชาร์จหรืออยู่ในโหมดสลีปและกำลังชาร์จ"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"เมื่ออยู่ในโหมดสลีปและกำลังชาร์จ"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"เมื่อวางบนแท่นชาร์จ"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"ปิดใช้งานแล้ว"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Candy ที่เลือก"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Dream ที่เลือก"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"เวลาที่เปิดใช้งาน"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"หลังจากไม่มีกิจกรรมเป็นเวลา <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"ไม่เลย"</string>
<string name="screensaver_test" msgid="3048249263811694128">"ลองใช้!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"เริ่มต้นเมื่อวางบนแท่นชาร์จด้วย"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"เริ่มต้นเมื่ออยู่ในโหมดสลีป"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"เริ่มต้นเมื่อวางบนแท่นชาร์จ"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"ปรับความสว่างอัตโนมัติ"</string>
<string name="title_font_size" msgid="4405544325522105222">"ขนาดอักษร"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"ขนาดตัวอักษร"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"แฟลชพื้นผิวหน้าต่างทั้งหมดเมื่อมีการอัปเดต"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"แสดงการอัปเดตมุมมอง GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"แฟลชมุมมองภายในหน้าต่างเมื่อวาดด้วย GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"ปิดใช้งานการวางซ้อน HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"ใช้ GPU ในการจัดวางองค์ประกอบหน้าจอเสมอ"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"เปิดใช้งานร่องรอย"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"คุณแน่ใจหรือไม่ว่าต้องการนำผู้ใช้นี้และข้อมูลทั้งหมดที่เกี่ยวข้องออกจากอุปกรณ์"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"แสดงการแจ้งเตือน"</string>
<string name="help_label" msgid="1107174367904110532">"ความช่วยเหลือ"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"บัญชีสำหรับเนื้อหา"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID รูปภาพ"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"การแจ้งเครือข่ายที่ใช้งาน"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"เลือกประเภทของการแจ้งเตือนฉุกเฉินที่จะแสดง"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 26991b5..78a12c6 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Mga pagtatangka ng data:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Serbisyong GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Roaming:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Palitan ang PIN na pang-unlock"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Baguhin ang naka-unlock na password"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Dapat hindi bababa sa %d (na) character ang password"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Dapat na hindi bababa sa %d (na) character ang PIN"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Ang PIN ay hindi dapat bababa sa %d (na) digit"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Pindutin ang Magpatuloy kapag tapos na"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Magpatuloy"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Dapat mas kaunti sa <xliff:g id="NUMBER">%d</xliff:g> (na) character ang password."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Protektadong Setup ng Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Sinisimulan ang WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Pindutin ang button ng Pinoprotektahang Setup ng Wi-Fi sa iyong router. Maaaring tinatawag itong \"WPS\" o naglalaman ng simbolong ito:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Ilagay ang pin na <xliff:g id="NUMBER">%1$s</xliff:g> ng iyong Wi-Fi router. Maaaring tumagal nang hanggang dalawang minuto ang pag-setup upang matapos."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Ilagay ang pin na <xliff:g id="NUMBER">%1$s</xliff:g> sa iyong router ng Wi-Fi. Maaaring tumagal nang hanggang dalawang minuto upang makumpleto ang pag-setup."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"Nagtagumpay ang WPS. Kumokonekta sa network…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Nakakonekta sa Wi-Fi na network na <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Umuusad na ang WPS at maaaring tumagal nang dalawang minuto upang makumpleto"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Umuusad na ang WPS at maaaring tumagal nang hanggang dalawang minuto upang makumpleto"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Nabigo ang WPS. Pakisubukang muli sa loob ng ilang minuto."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Hindi sinusuportahan ang setting ng seguridad ng wireless na router (WEP)"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Hindi sinusuportahan ang setting ng seguridad ng wireless na router (TKIP)"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Kanselahin ang imbitasyon?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Nais mo bang kanselahin ang imbitasyong kumonekta kay <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Portable na Wi-Fi hotspot"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Pag-on sa hotspot…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Pag-off sa hotspot…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Ang Portable na hotspot na <xliff:g id="NETWORK_SSID">%1$s</xliff:g> ay aktibo"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Error sa portable na hotspot ng Wi-Fi"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"I-set up ang Wi-Fi hotspot"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> ng kawalan ng aktibidad"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Wallpaper"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Pumili ng wallpaper mula sa"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Candy sa Screen"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Magsisimula kapag naka-sleep kung nakakonekta sa kuryente"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Kapag naka-dock o naka-sleep at nagcha-charge"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Kapag naka-sleep at nagcha-charge"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Kapag naka-dock"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Hindi pinagana"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Napiling candy"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Piniling dream"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Kailan isasaaktibo"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Pagkatapos ng <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> na ginugol na idle"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Hindi kailanman"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Subukan ito!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Simulan din kapag naka-dock"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Magsimula sa sleep"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Simulan kapag naka-dock"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Awtomatikong pagliwanag"</string>
<string name="title_font_size" msgid="4405544325522105222">"Laki ng font"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Laki ng font"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"I-flash ang buong window surface kapag nag-update"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Ipakita GPU view update"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"I-flash ang view sa windows kapag ginuhit sa GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Wag paganahin HW overlay"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Laging gamitin ang GPU para sa screen compositing"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Paganahin ang mga trace"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Sigurado ka bang nais mong alisin ang user at ang lahat ng nauugnay na data mula sa device?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Ipakita notification"</string>
<string name="help_label" msgid="1107174367904110532">"Tulong"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Account para sa nilalaman"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Photo ID"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Mga cell broadcast"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Piliin ang mga uri ng mga alerto sa emergency na ipapakita."</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index c92464a..abec850 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Veri giriş denemeleri:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS hizmeti:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Dolaşım:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Kilit açma PIN\'ini değiştir"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Kilit açma şifresini değiştir"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Şifre en az %d karakter olmalıdır"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN, en az %d karakter olmalıdır"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN en az %d basamaklı olmalıdır"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"İşlem tamamlandığında Devam düğmesine basın"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Devam Et"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Şifre <xliff:g id="NUMBER">%d</xliff:g> karakterden kısa olmalıdır."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Kablosuz Korumalı Kurulum"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"WPS başlatılıyor…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Yönlendiricinizdeki Kablosuz Korumalı Kurulum düğmesine basın. \"WPS\" yazıyor olabilir veya bu simgeyi taşıyabilir:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Kablosuz yönlendiricinizde <xliff:g id="NUMBER">%1$s</xliff:g> pin kodunu girin. Kurulum işleminin tamamlanması iki dakika kadar sürebilir."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Kablosuz yönlendiricinizde <xliff:g id="NUMBER">%1$s</xliff:g> pin kodunu girin. Kurulum işleminin tamamlanması iki dakika kadar sürebilir."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS başarılı oldu. Ağa bağlanılıyor…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"<xliff:g id="NETWORK_NAME">%s</xliff:g> Kablosuz ağına bağlanıldı"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS kurulumu zaten devam ediyor ve tamamlanması iki dakika kadar sürebilir"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS zaten devam ediyor ve tamamlanması iki dakika alabilir"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS başarısız oldu. Lütfen birkaç dakika içinde tekrar deneyin."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Kablosuz yönlendirici güvenlik ayarı (WEP) desteklenmiyor"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Kablosuz yönlendirici güvenlik ayarı (TKIP) desteklenmiyor"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Davetiye iptal edilsin mi?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"<xliff:g id="PEER_NAME">%1$s</xliff:g> cihazına bağlanma davetiyesini iptal etmek istiyor musunuz?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Taşınabilir kablosuz ortak erişim noktası"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Hotspot açılıyor…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Hotspot kapatılıyor…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Taşınabilir ortak erişim noktası <xliff:g id="NETWORK_SSID">%1$s</xliff:g> etkin"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Taşınabilir kablosuz ortak erişim noktası hatası"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Kablosuz hotspot kurulumu yap"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> işlem yapılmadığında"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Duvar Kağıdı"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Şuradan duvar kağıdı seçin:"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Ekran Şekeri"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Prize takılıysa, uyku moduna geçtiğinde başlar"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Rüya"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Yuvasına yerleştirildiğinde veya uyku modunda ve şarj edilirken"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Uyku modunda ve şarj edilirken"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Yuvasına yerleştirildiğinde"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Devre dışı"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Seçilen şeker"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Seçili rüya"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Etkinleştirme zamanı"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"<xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> boşta kaldıktan sonra"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Hiçbir zaman"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Deneyin!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Yuvasına yerleştirildiğinde de başlat"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Uyku modunda başlat"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Yuvasına yerleştirildiğinde başlat"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Otomatik parlaklık"</string>
<string name="title_font_size" msgid="4405544325522105222">"Yazı tipi boyutu"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Yazı tipi boyutu"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Güncelleme sırasında tüm pencere yüzeylerini çiz"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"GPU görünüm güncellemelerini göster"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"GPU ile çizim yapılırken pencerelerdeki görünümleri çiz"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"HW katmanlarını devre dışı bırak"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Ekran oluştururken her zaman GPU\'yu kullan"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"İzleri etkinleştir"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Kullanıcıyı ve onunla ilişkili tüm verileri cihazdan kaldırmak istediğinizden emin misiniz?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Bildirimleri göster"</string>
<string name="help_label" msgid="1107174367904110532">"Yardım"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"İçerik için kullanılan hesap"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Fotoğraflı Kimlik"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Hücre yayınları"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Görüntülenecek acil durum uyarı türünü seçin."</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4948a76..d6da2e7 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Проксі-сервер HTTP використовується веб-переглядачем, але не може використовуватися ін. програмами."</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Спроб даних:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Служба GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Роумінг:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Змінити PIN розблок."</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Змінити пароль розблок."</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Пароль має складатися з мінімум %d симв."</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN-код має скл. з мінімум %d симв."</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN-код має складатися принаймні зі стількох цифр: %d"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"По заверш. торк. \"Продовж.\""</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Продовжити"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Максимальна кількість символів у паролі: <xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Налаштування захищеної мережі Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Запуск WPS..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Натисніть кнопку \"Налаштування захищеної мережі Wi-Fi\" на маршрутизаторі. Вона може називатися \"WPS\" або містити такий символ:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Введіть PIN-код <xliff:g id="NUMBER">%1$s</xliff:g> на своєму маршрутизаторі Wi-Fi. Налаштування може тривати не більше двох хвилин."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Введіть PIN-код <xliff:g id="NUMBER">%1$s</xliff:g> на своєму маршрутизаторі Wi-Fi. Налаштування може тривати не більше двох хвилин."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS запущено. Під’єднання до мережі..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"З’єднано з мережею Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"Налаштування WPS уже виконується, для його завершення потрібно не більше двох хвилин."</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"Налаштування WPS уже виконується. Для його завершення потрібно не більше двох хвилин"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"Помилка WPS. Повторіть спробу через декілька хвилин."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Налаштування безпеки бездротового маршрутизатора (WEP) не підтримується"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Налаштування безпеки бездротового маршрутизатора (TKIP) не підтримується"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Скасувати запрошення?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Скасувати запрошення під’єднатися до пристрою <xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Портат. точка дост. Wi-Fi"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Увімкнення точки доступу…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Вимкнення точки доступу…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Порт. точка дост. <xliff:g id="NETWORK_SSID">%1$s</xliff:g> активна"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Помилка порт. точки дост. Wi-Fi"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Налаштувати точку доступу Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Після <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> бездіяльності"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Фоновий малюнок"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Вибрати фоновий малюнок з"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Screen Candy"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Запуститься в режимі сну, якщо підключений до живлення"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Сон"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Коли в док-станції або в режимі сну й заряджання"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Коли в режимі сну й заряджання"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Коли в док-станції"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Вимкнено"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Вибрана заставка"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Selected dream"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Час для активації"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Через <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> в режимі очікування"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Ніколи"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Спробувати!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Також запускати, коли пристрій у док-станції"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Запускати в режимі сну"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Запускати, коли в док-станції"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Автоматична яскравість"</string>
<string name="title_font_size" msgid="4405544325522105222">"Розмір шрифту"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Розмір шрифту"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Підсвічув. всю поверхню вікна під час оновлення"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Показувати оновл. перегл."</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Підсвічув. область у вікні під час рисування з GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Вимк. апаратн. накладання"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Завжди використовувати GPU для компонування екрана"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Увімкнути трасування"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Дійсно видалити користувача та всі пов’язані дані з цього пристрою?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Показати сповіщення"</string>
<string name="help_label" msgid="1107174367904110532">"Довідка"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Обліковий запис для вмісту"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"Ідентифікатор фотографії"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Широкомовні повідомлення мережі"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Виберіть типи сповіщень про надзвичайні ситуації, які мають відображатися."</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 543790f..3a7ca5d 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -192,6 +192,7 @@
<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="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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Nỗ lực dữ liệu:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Dịch vụ GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Chuyển vùng:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Thay đổi mã PIN mở khóa"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Thay đổi mật khẩu mở khóa"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Mật khẩu phải có ít nhất %d ký tự"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"Mã PIN phải có ít nhất %d ký tự"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Mã PIN phải có ít nhất %d chữ số"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Chạm vào Tiếp tục khi hoàn tất"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Tiếp tục"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Mật khẩu phải ít hơn <xliff:g id="NUMBER">%d</xliff:g> ký tự."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Thiết lập Wi-Fi được bảo vệ"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Đang khởi động WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Nhấn nút Thiết lập Wi-Fi được bảo vệ trên bộ định tuyến của bạn. Quá trình này có thể được gọi là \"WPS\" hoặc chứa ký hiệu sau:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Nhập mã pin <xliff:g id="NUMBER">%1$s</xliff:g> trên bộ định tuyến Wi-Fi của bạn. Thiết lập có thể mất tới hai phút để hoàn tất."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Nhập mã pin <xliff:g id="NUMBER">%1$s</xliff:g> trên bộ định tuyến Wi-Fi của bạn. Thiết lập có thể mất tối đa hai phút để hoàn tất."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS đã thành công. Đang kết nối với mạng…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Đã kết nối với mạng Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS đã được xử lý và có thể mất tối đa hai giây để hoàn tất"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS đã được xử lý và có thể mất tối đa hai phút để hoàn tất"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS không thành công. Vui lòng thử lại sau ít phút."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Cài đặt bảo mật bộ định tuyến không dây (WEP) không được hỗ trợ"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Cài đặt bảo mật bộ định tuyến không dây (TKIP) không được hỗ trợ"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Hủy lời mời?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Bạn có muốn hủy lời mời kết nối với <xliff:g id="PEER_NAME">%1$s</xliff:g> không?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Điểm phát sóng Wi-Fi di động"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Đang bật điểm phát sóng…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Đang tắt điểm phát sóng…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Điểm phát sóng di động <xliff:g id="NETWORK_SSID">%1$s</xliff:g> hoạt động"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Lỗi điểm phát sóng Wi-Fi di động"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Thiết lập điểm phát sóng Wi-Fi"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Sau khi không hoạt động <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Hình nền"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Chọn hình nền từ"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"Kẹo trên màn hình"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Sẽ được bật nếu được kết nối với nguồn"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Mô-đun"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Khi được gắn đế hoặc ở chế độ ngủ và sạc pin"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Khi ở chế độ ngủ và sạc pin"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Khi được gắn đế"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Đã bị tắt"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Kẹo được chọn"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Mô-đun đã chọn"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Thời điểm kích hoạt"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Sau <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> không hoạt động"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Không bao giờ"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Hãy dùng thử!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Cũng kích hoạt khi được gắn"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Bắt đầu khi ở chế độ ngủ"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Bắt đầu khi được gắn đế"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Độ sáng tự động"</string>
<string name="title_font_size" msgid="4405544325522105222">"Kích thước phông chữ"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Kích thước phông chữ"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Chuyển nhanh toàn bộ các giao diện cửa sổ khi các giao diện này cập nhật"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Hiển thị cập nhật chế độ xem GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Chuyển nhanh chế độ xem trong cửa sổ khi được vẽ bằng GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Vô hiệu hóa các lớp phủ HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Luôn sử dụng GPU để tổng hợp màn hình"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Bật dấu vết"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Bạn có chắc chắn muốn xóa người dùng và tất cả các dữ liệu được liên kết khỏi thiết bị này không?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Hiển thị thông báo"</string>
<string name="help_label" msgid="1107174367904110532">"Trợ giúp"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"Tài khoản dành cho nội dung"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"ID ảnh"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Phát sóng trên di động"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Chọn các loại cảnh báo khẩn cấp để hiển thị."</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8361891..79a12ea 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"浏览器会使用 HTTP 代理，但其他应用可能不会使用。"</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"数据尝试次数："</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS 服务："</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"漫游："</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"更改解锁 PIN"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"更改解锁密码"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"密码必须至少包含 %d 个字符"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN 必须至少包含 %d 个字符"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN 至少应为 %d 位"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"完成后触摸“继续”"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"继续"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"密码必须少于 <xliff:g id="NUMBER">%d</xliff:g> 个字符。"</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Wi-Fi 保护设置"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"正在启动 WPS..."</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"请按下您路由器上的 Wi-Fi 保护设置按钮，它可能会标为“WPS”或包含此符号："</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"请在 Wi-Fi 路由器上输入 PIN <xliff:g id="NUMBER">%1$s</xliff:g>。设置过程最多可能需要两分钟时间才能完成。"</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"请在 Wi-Fi 路由器上输入 PIN <xliff:g id="NUMBER">%1$s</xliff:g>。设置过程最多可能需要两分钟时间才能完成。"</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS 已成功启动。正在连接网络..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"已连接到 Wi-Fi 网络 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"正在设置 WPS，此过程最多可能需要两分钟时间才能完成"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"正在设置 WPS，此过程最多可能需要两分钟时间才能完成。"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS 未能成功启动。请过几分钟后重试。"</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"无线路由器安全设置 (WEP) 不受支持"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"无线路由器安全设置 (TKIP) 不受支持"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀请？"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"要取消连接<xliff:g id="PEER_NAME">%1$s</xliff:g>的邀请吗？"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"便携式 Wi-Fi 热点"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"正在打开热点..."</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"正在关闭热点..."</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"便携式热点 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已启用"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"便携式 Wi-Fi 热点错误"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"设置 Wi-Fi 热点"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"无操作 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"壁纸"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"选择壁纸来源"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"屏幕模块"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"连接电源后在进入休眠模式时启动"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"插入基座或休眠且正在充电时"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"休眠且正在充电时"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"插入基座时"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"已停用"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"所选模块"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"所选 Dream"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"激活时间"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"闲置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>后"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"永不"</string>
<string name="screensaver_test" msgid="3048249263811694128">"试试看！"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"插入基座时也启动"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"休眠时启动"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"插入基座时启动"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"自动调整亮度"</string>
<string name="title_font_size" msgid="4405544325522105222">"字体大小"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"字体大小"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"窗口中的面 (surface) 更新时全部闪烁"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"显示 GPU 视图更新"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"使用 GPU 进行绘图时闪烁显示窗口中的视图"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"停用 HW 叠加层"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"始终使用 GPU 进行屏幕合成"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"启用跟踪"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"您确定要从设备中删除该用户和所有相关数据吗？"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"显示通知"</string>
<string name="help_label" msgid="1107174367904110532">"帮助"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"内容帐户"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"照片 ID"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"小区广播"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"请选择要显示的紧急消息类型。"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 46bb41a..430c0f8 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"瀏覽器會使用 HTTP Proxy，但其他應用程式不一定會採用這項設定。"</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"嘗試資料："</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"GPRS 服務："</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"漫遊："</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"變更解鎖 PIN"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"變更解鎖密碼"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"密碼必須有至少 %d 個字元"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"PIN 必須有至少 %d 個字元"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"PIN 碼最少要有 %d 位數字"</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"完成時請輕觸 [繼續]"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"繼續"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"密碼最多只能有 <xliff:g id="NUMBER">%d</xliff:g> 個字元。"</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"WiFi 保護設定"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"正在啟動 WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"按下路由器上的 Wi-Fi 保護設定按鈕，該按鈕可能標示為「WPS」或含有這個符號："</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"請在 WiFi 路由器上輸入 PIN 碼：<xliff:g id="NUMBER">%1$s</xliff:g>。設定程序最多可能需要兩分鐘完成。"</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"請在 WiFi 路由器上輸入 PIN 碼：<xliff:g id="NUMBER">%1$s</xliff:g>。最多需要兩分鐘才能完成設定。"</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS 成功，正在連線至網路…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"已連線至 WiFi 網路 <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"WPS 已開始執行，最多需要兩分鐘可完成"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"WPS 已開始執行，最多需要兩分鐘才能完成。"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"WPS 無法成功啟動，請過幾分鐘後再試一次。"</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"不支援無線路由器安全性設定 (WEP)"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"不支援無線路由器安全性設定 (TKIP)"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"取消邀請？"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"您要取消 <xliff:g id="PEER_NAME">%1$s</xliff:g> 的連線邀請？"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"可攜式 Wi-Fi 無線基地台"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"正在開啟無線基地台…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"正在關閉無線基地台…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"可攜式無線基地台 <xliff:g id="NETWORK_SSID">%1$s</xliff:g> 已啟用"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"可攜式 Wi-Fi 無線基地台發生錯誤"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"設定 WiFi 無線基地台"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"桌布"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"選擇桌布來源"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"螢幕保護程式模組"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"如果連接電源，進入休眠狀態時即啟動"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Dream"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"安置於座架上、休眠及充電時"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"休眠及充電時"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"安置於座架上時"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"已停用"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"已選取的螢幕保護程式模組"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"選取的 Dream"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"啟動時間"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"閒置 <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g>後"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"永遠不要"</string>
<string name="screensaver_test" msgid="3048249263811694128">"試試看！"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"安置於座架上時一併啟動"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"休眠時啟動"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"安置於座架上時啟動"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"自動調整亮度"</string>
<string name="title_font_size" msgid="4405544325522105222">"字型大小"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"字型大小"</string>
@@ -1550,6 +1556,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"更新表層時閃爍顯示整個視窗表層"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"顯示 GPU 畫面更新"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"使用 GPU 繪圖時在視窗中閃爍顯示畫面"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"停用硬體重疊圖層"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"一律使用 GPU 進行畫面合成"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"啟用追蹤項目"</string>
@@ -1705,6 +1715,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"您確定要將使用者和所有相關聯的資料從裝置上移除嗎？"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"顯示通知"</string>
<string name="help_label" msgid="1107174367904110532">"說明"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"內容帳戶"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"相片 ID"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"區域廣播"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"選取要顯示的緊急警示類型。"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index f5b0ba9..9d677b5 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -192,6 +192,7 @@
<string name="proxy_warning_limited_support" msgid="7229337138062837422">"Iphrokzi ye-HTTP isetshenziswa isiphequluli kodwa kungenzeka ingasetshenziswa ezinye izinhlelo zokusebenza"</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>
<string name="radio_info_data_attempts_label" msgid="1731106244577323381">"Imizamo yedatha:"</string>
<string name="radio_info_gprs_service_label" msgid="2331818110375395364">"Iseva ye-GPRS:"</string>
<string name="radio_info_roaming_label" msgid="6141505430275138647">"Ukuzulazula:"</string>
@@ -364,7 +365,7 @@
<string name="unlock_change_lock_pin_title" msgid="806629901095938484">"Shintsha i-PIN yokuvula"</string>
<string name="unlock_change_lock_password_title" msgid="5606298470358768865">"Shintsha iphasiwedi yokuvula"</string>
<string name="lockpassword_password_too_short" msgid="7328975683669256660">"Iphasiwedi kumele okungenani ibe nezinhlamvu ezingu-%d"</string>
- <string name="lockpassword_pin_too_short" msgid="2252847623267704683">"I-PIN kumele okungenani ibe izinhlamvu ezingu-%d"</string>
+ <string name="lockpassword_pin_too_short" msgid="1677649103470518953">"Iphinikhodi kumele okungenani ibe amadijithi angu-%d."</string>
<string name="lockpassword_press_continue" msgid="122706614386757182">"Thinta Qhubeka uma usuqedile"</string>
<string name="lockpassword_continue_label" msgid="4602203784934526940">"Qhubeka"</string>
<string name="lockpassword_password_too_long" msgid="7016906583950201704">"Iphasiwedi kumele ibe ngaphansi ngezinhlamvu ezingu-<xliff:g id="NUMBER">%d</xliff:g>."</string>
@@ -530,10 +531,10 @@
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Ukusethwa Okuvikelwe kwe-Wi-Fi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Iqala i-WPS…"</string>
<string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Cindezela inkinobho Wi-Fi Protected Setup kumzila wakho. Ingahle ibizwe nge-\"WPS\" noma iqukathe lolu phawu:"</string>
- <string name="wifi_wps_onstart_pin" msgid="8116564886303972764">"Faka i-pin <xliff:g id="NUMBER">%1$s</xliff:g> ku-Wi-Fi router yakho. Ukusetha kungathatha kufika emaminithini amabili ukuqedela."</string>
+ <string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Faka iphinikhodi <xliff:g id="NUMBER">%1$s</xliff:g> kumzila wakho we-Wi-Fi. Ukusetha kungathatha kufika emaminithini amabili ukuqedela."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"I-WPS iphumelele. Ixhuma kunethiwekhi…"</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Ixhunywe kwinethiwekhi ye-Wi-Fi i-<xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
- <string name="wifi_wps_in_progress" msgid="2944576520214787628">"I-WPS isivele iyaqhubeka futhi ingathatha kufika kumaminithi amabili ukuqedela"</string>
+ <string name="wifi_wps_in_progress" msgid="3372311348221357944">"I-WPS isivele iyaqhubeka futhi ingathatha amaminithi angafika kwamabili ukuqedela"</string>
<string name="wifi_wps_failed_generic" msgid="5668775022238832527">"I-WPS yehlulekile. Sicela uzame futhi emaminithini ambalawa."</string>
<string name="wifi_wps_failed_wep" msgid="2702820087105284461">"Izilungiselelo zokuphepha zendlela engenazintambo (WEP) azisekelwe"</string>
<string name="wifi_wps_failed_tkip" msgid="4282401586860713349">"Izilungiselelo zokuphepha zendlela engenazintambo (TKIP) azisekelwe"</string>
@@ -605,6 +606,8 @@
<string name="wifi_p2p_cancel_connect_title" msgid="255267538099324413">"Khansela isimemo?"</string>
<string name="wifi_p2p_cancel_connect_message" msgid="7477756213423749402">"Ingabe ufuna ukukhansela isimemo ukuze uxhume ne-<xliff:g id="PEER_NAME">%1$s</xliff:g>?"</string>
<string name="wifi_tether_checkbox_text" msgid="6961605862058056788">"Indawo ephathekayo ye-Wi-Fi"</string>
+ <string name="wifi_tether_starting" msgid="1322237938998639724">"Ikhanyisa indawo ekudonseka kuyo…"</string>
+ <string name="wifi_tether_stopping" msgid="4835852171686388107">"Icima ndawo ekudonseka kuyo…"</string>
<string name="wifi_tether_enabled_subtext" msgid="8948641212931906143">"Indawo ephathekayo <xliff:g id="NETWORK_SSID">%1$s</xliff:g> iyasebenza"</string>
<string name="wifi_tether_failed_subtext" msgid="2654888578056042315">"Iphutha lendawo le-Wi-Fi ephathekayo"</string>
<string name="wifi_tether_configure_ap_text" msgid="61237027772641155">"Setha i-Wi-Fi hotspot"</string>
@@ -673,15 +676,18 @@
<string name="screen_timeout_summary" msgid="327761329263064327">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> okungasebenzi"</string>
<string name="wallpaper_settings_title" msgid="5449180116365824625">"Iphephadonga"</string>
<string name="wallpaper_settings_fragment_title" msgid="519078346877860129">"Khetha iphephalodonga kwi"</string>
- <string name="screensaver_settings_title" msgid="3848608373818910549">"I-Screen Candy"</string>
- <string name="screensaver_settings_summary_on" msgid="433728808047613634">"Iyoqala emva kokulala uma ixhunywe kugesi"</string>
+ <string name="screensaver_settings_title" msgid="4458091032540874366">"Iphupho"</string>
+ <string name="screensaver_settings_summary_both" msgid="1175671101656240599">"Uma kudokhiwe noma kulelwe futhi ishaja"</string>
+ <string name="screensaver_settings_summary_sleep" msgid="7231274537626605107">"Uma ilele futhi ishaja"</string>
+ <string name="screensaver_settings_summary_dock" msgid="4450616262936082466">"Uma kudokhiwe"</string>
<string name="screensaver_settings_summary_off" msgid="7019248565878953105">"Kukhutshaziwe"</string>
- <string name="screensaver_component_title" msgid="8596216100441725363">"Khethe i-candy"</string>
+ <string name="screensaver_component_title" msgid="5786117148360329058">"Iphupho elikhethiwe"</string>
<string name="screensaver_timeout_title" msgid="4882666970355550822">"Qlisa nini"</string>
<string name="screensaver_timeout_summary" msgid="7717201094598701673">"Emva <xliff:g id="TIMEOUT_DESCRIPTION">%1$s</xliff:g> esithithwe kungenziwa lutho"</string>
<string name="screensaver_timeout_zero_summary" msgid="1274235565189071582">"Nhlobo"</string>
<string name="screensaver_test" msgid="3048249263811694128">"Yizame!"</string>
- <string name="screensaver_activate_on_dock_title" msgid="3753003388633168862">"Iqale futhi uma iboshiwe"</string>
+ <string name="screensaver_activate_on_sleep_title" msgid="5463857907577089065">"Qala kulelwe"</string>
+ <string name="screensaver_activate_on_dock_title" msgid="5594601783697028555">"Qala uma kudokhiwe"</string>
<string name="automatic_brightness" msgid="5014143533884135461">"Ukukhanya okuzenzakalelayo"</string>
<string name="title_font_size" msgid="4405544325522105222">"Usayizi wefonti"</string>
<string name="dialog_title_font_size" msgid="2231507851258955038">"Ubukhulu befonti"</string>
@@ -1557,6 +1563,10 @@
<string name="show_screen_updates_summary" msgid="2569622766672785529">"Khanyisa ukubonakala kwalo lonke iwindi uma libuyekezwa"</string>
<string name="show_hw_screen_updates" msgid="5036904558145941590">"Buka izibuyekezo ze-GPU"</string>
<string name="show_hw_screen_updates_summary" msgid="1115593565980196197">"Ukubuka okukhanyayo phakathi kwamawindi uma kudwetshwe nge-GPU"</string>
+ <!-- no translation found for show_hw_layers_updates (5645728765605699821) -->
+ <skip />
+ <!-- no translation found for show_hw_layers_updates_summary (5296917233236661465) -->
+ <skip />
<string name="disable_overlays" msgid="2074488440505934665">"Khubaza izimbondela ze-HW"</string>
<string name="disable_overlays_summary" msgid="3578941133710758592">"Njalo sebenzisa i-GPU ukwakha isikrini"</string>
<string name="enable_traces_title" msgid="7448835465859512430">"Nika amandla ukuthola"</string>
@@ -1712,6 +1722,8 @@
<string name="user_confirm_remove_message" msgid="5284111415714437285">"Ingabe unesiqinisekiso sokuthi ufuna ukususa umsebenzisi nayo yonke idatha ephathelene kusuka kudivayisi?"</string>
<string name="app_notifications_switch_label" msgid="9124072219553687583">"Bonisa izaziso"</string>
<string name="help_label" msgid="1107174367904110532">"Usizo"</string>
+ <string name="user_account_title" msgid="1127193807312271167">"I-akhawunti yokuqukethwe"</string>
+ <string name="user_picture_title" msgid="7297782792000291692">"I-ID yesithombe"</string>
<string name="cell_broadcast_settings" msgid="8415582011920085222">"Ukusakazwa kweselula"</string>
<string name="cell_broadcast_settings_summary" msgid="3301339398950905913">"Khetha izinhlobo zezaziso zesimo esiphuthumayo ongazibonisa."</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 946d3e83..3c54d1a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -420,6 +420,8 @@
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radio_info_neighboring_location_label">Neighboring CID:</string>
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
+ <string name="radio_info_cellinfo_label">CellInfo:</string>
+ <!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
<string name="radio_info_data_attempts_label">Data attempts:</string>
<!-- Radio Info screen. Label for a status item. Used for diagnostic info screens, precise translation isn't needed -->
@@ -1251,13 +1253,13 @@
<!-- Message in WPS dialog for PBC after start up [CHAR LIMIT=150] -->
<string name="wifi_wps_onstart_pbc">Press the Wi-Fi Protected Setup button on your router. It may be called \"WPS\" or contain this symbol:</string>
<!-- Message in WPS dialog for PIN after start up [CHAR LIMIT=150] -->
- <string name="wifi_wps_onstart_pin">Enter pin <xliff:g id="number">%1$s</xliff:g> on your Wi-Fi router. The setup can take upto two minutes to complete.</string>
+ <string name="wifi_wps_onstart_pin">Enter pin <xliff:g id="number">%1$s</xliff:g> on your Wi-Fi router. The setup can take up to two minutes to complete.</string>
<!-- Text displayed when WPS succeeds [CHAR LIMIT=150] -->
<string name="wifi_wps_complete">WPS succeeded. Connecting to the network\u2026</string>
<!-- Text displayed when Wi-Fi is connected through WPS [CHAR LIMIT=150] -->
<string name="wifi_wps_connected">Connected to Wi-Fi network <xliff:g id="network_name">%s</xliff:g></string>
<!-- Text displayed when WPS setup is in progress [CHAR LIMIT=150] -->
- <string name="wifi_wps_in_progress">WPS is already in progress and can take upto two minutes to complete</string>
+ <string name="wifi_wps_in_progress">WPS is already in progress and can take up to two minutes to complete</string>
<!-- Text displayed when WPS fails to start [CHAR LIMIT=150] -->
<string name="wifi_wps_failed_generic">WPS failed. Please try again in a few minutes.</string>
<!-- Text displayed when WPS fails due to WEP [CHAR LIMIT=150] -->
@@ -1409,7 +1411,7 @@
<!-- Label for the DNS (second one)-->
<string name="wifi_dns2">DNS 2</string>
<!-- Hint text for DNS -->
- <string name="wifi_dns2_hint" translatable="false">4.4.4.4</string>
+ <string name="wifi_dns2_hint" translatable="false">8.8.4.4</string>
<!-- Label for the gateway of the network -->
<string name="wifi_gateway">Gateway</string>
<!-- Hint text for the gateway -->
@@ -1685,13 +1687,17 @@
<!-- Wallpaper settings fragment title [CHAR LIMIT=30] -->
<string name="wallpaper_settings_fragment_title">Choose wallpaper from</string>
<!-- Display settings screen, trigger for screen saver options -->
- <string name="screensaver_settings_title">Screen Candy</string>
- <!-- Display settings screen, summary for screen saver options, screen saver is turned on -->
- <string name="screensaver_settings_summary_on">Will start upon sleep if connected to power</string>
+ <string name="screensaver_settings_title">Dream</string>
+ <!-- Display settings screen, summary fragment for screen saver options, activated on sleep or docked -->
+ <string name="screensaver_settings_summary_both">When docked or asleep and charging</string>
+ <!-- Display settings screen, summary fragment for screen saver options, activated on sleep -->
+ <string name="screensaver_settings_summary_sleep">When asleep and charging</string>
+ <!-- Display settings screen, summary fragment for screen saver options, activated when docked -->
+ <string name="screensaver_settings_summary_dock">When docked</string>
<!-- Display settings screen, summary for screen saver options, screen saver is turned off -->
<string name="screensaver_settings_summary_off">Disabled</string>
<!-- Screen saver settings, setting option name to select a module -->
- <string name="screensaver_component_title">Selected candy</string>
+ <string name="screensaver_component_title">Selected dream</string>
<!-- Screen saver settings, setting option name to change activation timeout -->
<string name="screensaver_timeout_title">When to activate</string>
<!-- Screen saver settings, setting option summary to change activation timeout -->
@@ -1701,8 +1707,11 @@
<!-- Screen saver settings, button allowing the user to test/try the current module -->
<string name="screensaver_test">Try it!</string>
<!-- Screen saver settings, checkbox allowing the screen saver to activate automatically when
+ the device sleeps -->
+ <string name="screensaver_activate_on_sleep_title">Start on sleep</string>
+ <!-- Screen saver settings, checkbox allowing the screen saver to activate automatically when
the device is docked -->
- <string name="screensaver_activate_on_dock_title">Also start when docked</string>
+ <string name="screensaver_activate_on_dock_title">Start when docked</string>
<!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
<string name="automatic_brightness">Automatic brightness</string>
<!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->
@@ -2862,6 +2871,10 @@
<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>
+ <!-- [CHAR LIMIT=NONE] Setting checkbox title for Whether to include bug report item in power menu. -->
+ <string name="bugreport_in_power">Power menu bug reports</string>
+ <!-- [CHAR LIMIT=NONE] Setting checkbox summary for Whether to include bug report item in power -->
+ <string name="bugreport_in_power_summary">Include option in power menu for taking a bug report</string>
<!-- Setting Checkbox title whether to keep the screen on when plugged in to a power source -->
<string name="keep_screen_on">Stay awake</string>
<!-- setting Checkbox summary whether to keep the screen on when plugged in -->
@@ -3390,16 +3403,6 @@
<!-- Summary text of the "automatic restore" setting -->
<string name="auto_restore_summary">When reinstalling an app, restore backed up settings and data</string>
- <!-- Take bug report menu title [CHAR LIMIT=NONE] -->
- <string name="bugreport_title">Take bug report</string>
- <!-- Message in bugreport dialog describing what it does [CHAR LIMIT=NONE] -->
- <string name="bugreport_message">This will collect information about your
- current device state, to send as an e-mail message. It will take a little
- time from starting the bug report until it is ready to be sent; please be
- patient.</string>
- <!-- Button in bugreport dialog to confirm starting the report [CHAR LIMIT=NONE] -->
- <string name="report">Report</string>
-
<!-- Local (desktop) backup password menu title [CHAR LIMIT=25] -->
<string name="local_backup_password_title">Desktop backup password</string>
<!-- Summary text of the "local backup password" setting when the user has not supplied a password -->
@@ -3738,6 +3741,11 @@
<!-- UI debug setting: show GPU rendering screen updates summary [CHAR LIMIT=50] -->
<string name="show_hw_screen_updates_summary">Flash views inside windows when drawn with the GPU</string>
+ <!-- UI debug setting: show when hardware layers get updated [CHAR LIMIT=25] -->
+ <string name="show_hw_layers_updates">Show hardware layers updates</string>
+ <!-- UI debug setting: show hardware layers updates summary [CHAR LIMIT=50] -->
+ <string name="show_hw_layers_updates_summary">Flash hardware layers green when they update</string>
+
<!-- UI debug setting: disable use of overlays? [CHAR LIMIT=25] -->
<string name="disable_overlays">Disable HW overlays</string>
<!-- UI debug setting: disable use of overlays summary [CHAR LIMIT=50] -->
@@ -4131,6 +4139,11 @@
<!-- Help URL, Tethering [DO NOT TRANSLATE] -->
<string name="help_url_tether" translatable="false"></string>
+ <!-- User account title [CHAR LIMIT=30] -->
+ <string name="user_account_title">Account for content</string>
+ <!-- User picture title [CHAR LIMIT=30] -->
+ <string name="user_picture_title">Photo ID</string>
+
<!-- Cell Broadcast settings title [CHAR LIMIT=50] -->
<string name="cell_broadcast_settings">Cell broadcasts</string>
<!-- Cell Broadcast settings description [CHAR LIMIT=100] -->
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 42f2837..502d76d 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -20,7 +20,7 @@
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">wrap_content</item>
<item name="android:textAppearance">@style/TextAppearance.info_label</item>
- <item name="android:paddingRight">4dip</item>
+ <item name="android:paddingEnd">4dip</item>
</style>
<style name="info_value">
@@ -37,9 +37,9 @@
<style name="info_layout">
<item name="android:orientation">vertical</item>
- <item name="android:paddingLeft">10dip</item>
+ <item name="android:paddingStart">10dip</item>
<item name="android:paddingTop">10dip</item>
- <item name="android:paddingRight">10dip</item>
+ <item name="android:paddingEnd">10dip</item>
<item name="android:paddingBottom">10dip</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">match_parent</item>
@@ -110,10 +110,10 @@
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginTop">8dip</item>
- <item name="android:layout_marginLeft">16dip</item>
- <item name="android:layout_marginRight">16dip</item>
+ <item name="android:layout_marginStart">16dip</item>
+ <item name="android:layout_marginEnd">16dip</item>
<item name="android:orientation">vertical</item>
- <item name="android:gravity">left</item>
+ <item name="android:gravity">start</item>
</style>
<style name="wifi_item_label">
diff --git a/res/xml/development_prefs.xml b/res/xml/development_prefs.xml
index 47e58da..e9a15be 100644
--- a/res/xml/development_prefs.xml
+++ b/res/xml/development_prefs.xml
@@ -18,8 +18,8 @@
android:title="@string/development_settings_title">
<com.android.settings.BugreportPreference
android:key="bugreport"
- android:title="@string/bugreport_title"
- android:dialogTitle="@string/bugreport_title" />
+ android:title="@*android:string/bugreport_title"
+ android:dialogTitle="@*android:string/bugreport_title" />
<PreferenceScreen
android:key="local_backup_password"
@@ -58,6 +58,11 @@
android:summary="@string/enable_adb_summary"/>
<CheckBoxPreference
+ android:key="bugreport_in_power"
+ android:title="@string/bugreport_in_power"
+ android:summary="@string/bugreport_in_power_summary"/>
+
+ <CheckBoxPreference
android:key="allow_mock_location"
android:title="@string/allow_mock_location"
android:summary="@string/allow_mock_location_summary"/>
@@ -101,6 +106,11 @@
android:summary="@string/show_hw_screen_updates_summary"/>
<CheckBoxPreference
+ android:key="show_hw_layers_udpates"
+ android:title="@string/show_hw_layers_updates"
+ android:summary="@string/show_hw_layers_updates_summary"/>
+
+ <CheckBoxPreference
android:key="show_screen_updates"
android:title="@string/show_screen_updates"
android:summary="@string/show_screen_updates_summary"/>
diff --git a/res/xml/dream_settings.xml b/res/xml/dream_settings.xml
index 6569bc7..a13032f 100644
--- a/res/xml/dream_settings.xml
+++ b/res/xml/dream_settings.xml
@@ -15,25 +15,28 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
- android:title="@string/screensaver_settings_title"
- xmlns:settings="http://schemas.android.com/apk/res/com.android.settings">
-
- <com.android.settings.DreamComponentPreference
- android:key="screensaver_component"
- android:title="@string/screensaver_component_title"
- android:persistent="false"
- />
-
- <com.android.settings.DreamTesterPreference
- android:key="test"
- android:title="@string/screensaver_test"
- android:persistent="false"
- />
+ xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
+ android:title="@string/screensaver_settings_title" >
<CheckBoxPreference
- android:key="activate_on_dock"
- android:persistent="false"
- android:title="@string/screensaver_activate_on_dock_title"
- android:defaultValue="true" />
+ android:key="activate_on_sleep"
+ android:persistent="false"
+ android:title="@string/screensaver_activate_on_sleep_title" />
-</PreferenceScreen>
+ <CheckBoxPreference
+ android:defaultValue="true"
+ android:key="activate_on_dock"
+ android:persistent="false"
+ android:title="@string/screensaver_activate_on_dock_title" />
+
+ <com.android.settings.DreamComponentPreference
+ android:key="screensaver_component"
+ android:persistent="false"
+ android:title="@string/screensaver_component_title" />
+
+ <com.android.settings.DreamTesterPreference
+ android:key="test"
+ android:persistent="false"
+ android:title="@string/screensaver_test" />
+
+</PreferenceScreen>
\ No newline at end of file
diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 2089bac..96ce0f1 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -106,13 +106,6 @@
<!-- PERSONAL -->
<header android:title="@string/header_category_personal" />
- <!-- Manage users -->
- <header
- android:fragment="com.android.settings.users.UserSettings"
- android:icon="@drawable/ic_settings_sync"
- android:title="@string/user_settings_title"
- android:id="@+id/user_settings" />
-
<!-- Location -->
<header
android:fragment="com.android.settings.LocationSettings"
@@ -146,6 +139,13 @@
android:id="@+id/account_settings"
android:title="@string/account_settings" />
+ <!-- Manage users -->
+ <header
+ android:fragment="com.android.settings.users.UserSettings"
+ android:icon="@drawable/ic_settings_sync"
+ android:title="@string/user_settings_title"
+ android:id="@+id/user_settings" />
+
<header
android:id="@+id/account_add"
android:title="@string/add_account_label"
diff --git a/res/xml/user_details.xml b/res/xml/user_details.xml
index 257eee4..616c628 100644
--- a/res/xml/user_details.xml
+++ b/res/xml/user_details.xml
@@ -26,11 +26,22 @@
android:title="@string/user_name_title"
android:persistent="false"
/>
+ <Preference
+ android:key="user_picture"
+ android:title="@string/user_picture_title"
+ android:persistent="false"
+ />
</PreferenceCategory>
<PreferenceCategory
android:key="restrictions_category"
android:title="@string/user_restrictions_heading">
+ <Preference
+ android:key="associated_account"
+ android:title="@string/user_account_title"
+ android:enabled="false"
+ android:persistent="false"
+ />
<CheckBoxPreference
android:key="market_requires_pin"
android:title="@string/user_market_requires_pin"
diff --git a/src/com/android/settings/AccessibilitySettings.java b/src/com/android/settings/AccessibilitySettings.java
index 6167f78..666542c 100644
--- a/src/com/android/settings/AccessibilitySettings.java
+++ b/src/com/android/settings/AccessibilitySettings.java
@@ -575,7 +575,7 @@
activity.getActionBar().setCustomView(toggleSwitch,
new ActionBar.LayoutParams(ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT,
- Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+ Gravity.CENTER_VERTICAL | Gravity.END));
return toggleSwitch;
}
diff --git a/src/com/android/settings/BugreportPreference.java b/src/com/android/settings/BugreportPreference.java
index e003d61..ba58ef4 100644
--- a/src/com/android/settings/BugreportPreference.java
+++ b/src/com/android/settings/BugreportPreference.java
@@ -33,8 +33,8 @@
@Override
protected void onPrepareDialogBuilder(Builder builder) {
super.onPrepareDialogBuilder(builder);
- builder.setPositiveButton(R.string.report, this);
- builder.setMessage(R.string.bugreport_message);
+ builder.setPositiveButton(com.android.internal.R.string.report, this);
+ builder.setMessage(com.android.internal.R.string.bugreport_message);
}
@Override
diff --git a/src/com/android/settings/DevelopmentSettings.java b/src/com/android/settings/DevelopmentSettings.java
index f5789ae..fc1b096 100644
--- a/src/com/android/settings/DevelopmentSettings.java
+++ b/src/com/android/settings/DevelopmentSettings.java
@@ -79,6 +79,7 @@
private static final String ENFORCE_READ_EXTERNAL = "enforce_read_external";
private static final String LOCAL_BACKUP_PASSWORD = "local_backup_password";
private static final String HARDWARE_UI_PROPERTY = "persist.sys.ui.hw";
+ private static final String BUGREPORT_IN_POWER_KEY = "bugreport_in_power";
private static final String DEBUG_APP_KEY = "debug_app";
private static final String WAIT_FOR_DEBUGGER_KEY = "wait_for_debugger";
@@ -91,6 +92,7 @@
private static final String FORCE_HARDWARE_UI_KEY = "force_hw_ui";
private static final String TRACK_FRAME_TIME_KEY = "track_frame_time";
private static final String SHOW_HW_SCREEN_UPDATES_KEY = "show_hw_screen_udpates";
+ private static final String SHOW_HW_LAYERS_UPDATES_KEY = "show_hw_layers_udpates";
private static final String DEBUG_LAYOUT_KEY = "debug_layout";
private static final String WINDOW_ANIMATION_SCALE_KEY = "window_animation_scale";
private static final String TRANSITION_ANIMATION_SCALE_KEY = "transition_animation_scale";
@@ -118,6 +120,7 @@
private boolean mDontPokeProperties;
private CheckBoxPreference mEnableAdb;
+ private CheckBoxPreference mBugreportInPower;
private CheckBoxPreference mKeepScreenOn;
private CheckBoxPreference mEnforceReadExternal;
private CheckBoxPreference mAllowMockLocation;
@@ -136,6 +139,7 @@
private CheckBoxPreference mForceHardwareUi;
private CheckBoxPreference mTrackFrameTime;
private CheckBoxPreference mShowHwScreenUpdates;
+ private CheckBoxPreference mShowHwLayersUpdates;
private CheckBoxPreference mDebugLayout;
private ListPreference mWindowAnimationScale;
private ListPreference mTransitionAnimationScale;
@@ -170,6 +174,7 @@
addPreferencesFromResource(R.xml.development_prefs);
mEnableAdb = findAndInitCheckboxPref(ENABLE_ADB);
+ mBugreportInPower = findAndInitCheckboxPref(BUGREPORT_IN_POWER_KEY);
mKeepScreenOn = findAndInitCheckboxPref(KEEP_SCREEN_ON);
mEnforceReadExternal = findAndInitCheckboxPref(ENFORCE_READ_EXTERNAL);
mAllowMockLocation = findAndInitCheckboxPref(ALLOW_MOCK_LOCATION);
@@ -188,6 +193,7 @@
mForceHardwareUi = findAndInitCheckboxPref(FORCE_HARDWARE_UI_KEY);
mTrackFrameTime = findAndInitCheckboxPref(TRACK_FRAME_TIME_KEY);
mShowHwScreenUpdates = findAndInitCheckboxPref(SHOW_HW_SCREEN_UPDATES_KEY);
+ mShowHwLayersUpdates = findAndInitCheckboxPref(SHOW_HW_LAYERS_UPDATES_KEY);
mDebugLayout = findAndInitCheckboxPref(DEBUG_LAYOUT_KEY);
mWindowAnimationScale = (ListPreference) findPreference(WINDOW_ANIMATION_SCALE_KEY);
mAllPrefs.add(mWindowAnimationScale);
@@ -260,7 +266,7 @@
activity.getActionBar().setCustomView(mEnabledSwitch, new ActionBar.LayoutParams(
ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT,
- Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+ Gravity.CENTER_VERTICAL | Gravity.END));
}
@Override
@@ -333,9 +339,11 @@
mHaveDebugSettings = false;
updateCheckBox(mEnableAdb, Settings.Secure.getInt(cr,
Settings.Secure.ADB_ENABLED, 0) != 0);
+ updateCheckBox(mBugreportInPower, Settings.Secure.getInt(cr,
+ Settings.Secure.BUGREPORT_IN_POWER_MENU, 0) != 0);
updateCheckBox(mKeepScreenOn, Settings.System.getInt(cr,
Settings.System.STAY_ON_WHILE_PLUGGED_IN, 0) != 0);
- updateCheckBox(mEnforceReadExternal, isPermissionEnforced(context, READ_EXTERNAL_STORAGE));
+ updateCheckBox(mEnforceReadExternal, isPermissionEnforced(READ_EXTERNAL_STORAGE));
updateCheckBox(mAllowMockLocation, Settings.Secure.getInt(cr,
Settings.Secure.ALLOW_MOCK_LOCATION, 0) != 0);
updateHdcpValues();
@@ -349,6 +357,7 @@
updateHardwareUiOptions();
updateTrackFrameTimeOptions();
updateShowHwScreenUpdatesOptions();
+ updateShowHwLayersUpdatesOptions();
updateDebugLayoutOptions();
updateAnimationScaleOptions();
updateEnableTracesOptions();
@@ -581,7 +590,18 @@
private void writeShowHwScreenUpdatesOptions() {
SystemProperties.set(HardwareRenderer.DEBUG_DIRTY_REGIONS_PROPERTY,
- mShowHwScreenUpdates.isChecked() ? "true" : "false");
+ mShowHwScreenUpdates.isChecked() ? "true" : null);
+ pokeSystemProperties();
+ }
+
+ private void updateShowHwLayersUpdatesOptions() {
+ updateCheckBox(mShowHwLayersUpdates, SystemProperties.getBoolean(
+ HardwareRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY, false));
+ }
+
+ private void writeShowHwLayersUpdatesOptions() {
+ SystemProperties.set(HardwareRenderer.DEBUG_SHOW_LAYERS_UPDATES_PROPERTY,
+ mShowHwLayersUpdates.isChecked() ? "true" : null);
pokeSystemProperties();
}
@@ -705,7 +725,6 @@
}
private void updateEnableTracesOptions() {
- String strValue = SystemProperties.get(Trace.PROPERTY_TRACE_TAG_ENABLEFLAGS);
long flags = SystemProperties.getLong(Trace.PROPERTY_TRACE_TAG_ENABLEFLAGS, 0);
String[] values = mEnableTracesPref.getEntryValues();
int numSet = 0;
@@ -809,6 +828,10 @@
Settings.Secure.putInt(getActivity().getContentResolver(),
Settings.Secure.ADB_ENABLED, 0);
}
+ } else if (preference == mBugreportInPower) {
+ Settings.Secure.putInt(getActivity().getContentResolver(),
+ Settings.Secure.BUGREPORT_IN_POWER_MENU,
+ mBugreportInPower.isChecked() ? 1 : 0);
} else if (preference == mKeepScreenOn) {
Settings.System.putInt(getActivity().getContentResolver(),
Settings.System.STAY_ON_WHILE_PLUGGED_IN,
@@ -850,6 +873,8 @@
writeTrackFrameTimeOptions();
} else if (preference == mShowHwScreenUpdates) {
writeShowHwScreenUpdatesOptions();
+ } else if (preference == mShowHwLayersUpdates) {
+ writeShowHwLayersUpdatesOptions();
} else if (preference == mDebugLayout) {
writeDebugLayoutOptions();
}
@@ -941,6 +966,7 @@
void pokeSystemProperties() {
if (!mDontPokeProperties) {
+ //noinspection unchecked
(new SystemPropPoker()).execute();
}
}
@@ -970,7 +996,7 @@
}
/**
- * Dialog to confirm enforcement of {@link #READ_EXTERNAL_STORAGE}.
+ * Dialog to confirm enforcement of {@link android.Manifest.permission#READ_EXTERNAL_STORAGE}.
*/
public static class ConfirmEnforceFragment extends DialogFragment {
public static void show(DevelopmentSettings parent) {
@@ -1005,9 +1031,9 @@
}
}
- private static boolean isPermissionEnforced(Context context, String permission) {
+ private static boolean isPermissionEnforced(String permission) {
try {
- return ActivityThread.getPackageManager().isPermissionEnforced(READ_EXTERNAL_STORAGE);
+ return ActivityThread.getPackageManager().isPermissionEnforced(permission);
} catch (RemoteException e) {
throw new RuntimeException("Problem talking with PackageManager", e);
}
diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index fc162e2..c71f886 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -232,10 +232,13 @@
}
private void updateScreenSaverSummary() {
+ boolean activatedOnSleep = DreamSettings.isScreenSaverActivatedOnSleep(getActivity());
+ boolean activatedOnDock = DreamSettings.isScreenSaverActivatedOnDock(getActivity());
mScreenSaverPreference.setSummary(
- DreamSettings.isScreenSaverEnabled(mScreenSaverPreference.getContext())
- ? R.string.screensaver_settings_summary_on
- : R.string.screensaver_settings_summary_off);
+ activatedOnSleep && activatedOnDock ? R.string.screensaver_settings_summary_both :
+ activatedOnSleep ? R.string.screensaver_settings_summary_sleep :
+ activatedOnDock ? R.string.screensaver_settings_summary_dock :
+ R.string.screensaver_settings_summary_off);
}
private void updateAccelerometerRotationCheckbox() {
diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index d9953aa..80b6a84 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -48,12 +48,19 @@
public class DreamSettings extends SettingsPreferenceFragment {
private static final String TAG = "DreamSettings";
+ private static final String KEY_ACTIVATE_ON_SLEEP = "activate_on_sleep";
private static final String KEY_ACTIVATE_ON_DOCK = "activate_on_dock";
+ private static final String KEY_COMPONENT = "screensaver_component";
+ private static final String KEY_TEST = "test";
- private CheckBoxPreference mActivateOnDockPreference;
+ private static final int DEFAULT_SLEEP = 0;
+ private static final int DEFAULT_DOCK = 1;
- private Switch mEnableSwitch;
- private Enabler mEnabler;
+ private ActivationSetting mActivateOnSleep;
+ private ActivationSetting mActivateOnDock;
+
+ private Preference mComponentPref;
+ private Preference mTestPref;
@Override
public void onActivityCreated(Bundle savedInstanceState) {
@@ -61,99 +68,76 @@
addPreferencesFromResource(R.xml.dream_settings);
- mActivateOnDockPreference = (CheckBoxPreference) findPreference(KEY_ACTIVATE_ON_DOCK);
+ mComponentPref = findPreference(KEY_COMPONENT);
+ mTestPref = findPreference(KEY_TEST);
- final Activity activity = getActivity();
-
- mEnableSwitch = new Switch(activity);
-
- if (activity instanceof PreferenceActivity) {
- PreferenceActivity preferenceActivity = (PreferenceActivity) activity;
- // note: we do not check onIsHidingHeaders() or onIsMultiPane() because there's no
- // switch in the left-hand pane to control this; we need to show the ON/OFF in our
- // fragment every time
- final int padding = activity.getResources().getDimensionPixelSize(
- R.dimen.action_bar_switch_padding);
- mEnableSwitch.setPadding(0, 0, padding, 0);
- activity.getActionBar().setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM,
- ActionBar.DISPLAY_SHOW_CUSTOM);
- activity.getActionBar().setCustomView(mEnableSwitch, new ActionBar.LayoutParams(
- ActionBar.LayoutParams.WRAP_CONTENT,
- ActionBar.LayoutParams.WRAP_CONTENT,
- Gravity.CENTER_VERTICAL | Gravity.RIGHT));
- activity.getActionBar().setTitle(R.string.screensaver_settings_title);
- }
-
- mEnabler = new Enabler(activity, mEnableSwitch);
+ mActivateOnSleep = new ActivationSetting(getActivity(),
+ SCREENSAVER_ENABLED, DEFAULT_SLEEP,
+ (CheckBoxPreference) findPreference(KEY_ACTIVATE_ON_SLEEP));
+ mActivateOnDock = new ActivationSetting(getActivity(),
+ SCREENSAVER_ACTIVATE_ON_DOCK, DEFAULT_DOCK,
+ (CheckBoxPreference) findPreference(KEY_ACTIVATE_ON_DOCK));
}
- public static boolean isScreenSaverEnabled(Context context) {
+ public static boolean isScreenSaverActivatedOnSleep(Context context) {
return 0 != Settings.Secure.getInt(
- context.getContentResolver(), SCREENSAVER_ENABLED, 1);
+ context.getContentResolver(), SCREENSAVER_ENABLED, DEFAULT_SLEEP);
}
- public static void setScreenSaverEnabled(Context context, boolean enabled) {
- Settings.Secure.putInt(
- context.getContentResolver(), SCREENSAVER_ENABLED, enabled ? 1 : 0);
- }
-
- public static class Enabler implements CompoundButton.OnCheckedChangeListener {
- private final Context mContext;
- private Switch mSwitch;
-
- public Enabler(Context context, Switch switch_) {
- mContext = context;
- setSwitch(switch_);
- }
- @Override
- public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- setScreenSaverEnabled(mContext, isChecked);
- }
- public void setSwitch(Switch switch_) {
- if (mSwitch == switch_) return;
- if (mSwitch != null) mSwitch.setOnCheckedChangeListener(null);
- mSwitch = switch_;
- mSwitch.setOnCheckedChangeListener(this);
-
- final boolean enabled = isScreenSaverEnabled(mContext);
- mSwitch.setChecked(enabled);
- }
- public void pause() {
- mSwitch.setOnCheckedChangeListener(null);
- }
- public void resume() {
- mSwitch.setOnCheckedChangeListener(this);
- }
+ public static boolean isScreenSaverActivatedOnDock(Context context) {
+ return 0 != Settings.Secure.getInt(
+ context.getContentResolver(), SCREENSAVER_ACTIVATE_ON_DOCK, DEFAULT_DOCK);
}
@Override
public void onResume() {
- if (mEnabler != null) {
- mEnabler.resume();
- }
-
- final boolean currentActivateOnDock = 0 != Settings.Secure.getInt(getContentResolver(),
- SCREENSAVER_ACTIVATE_ON_DOCK, 1);
- mActivateOnDockPreference.setChecked(currentActivateOnDock);
+ mActivateOnSleep.onResume();
+ mActivateOnDock.onResume();
+ refreshDependents();
super.onResume();
}
@Override
- public void onPause() {
- if (mEnabler != null) {
- mEnabler.pause();
- }
-
- super.onPause();
- }
-
- @Override
public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) {
- if (preference == mActivateOnDockPreference) {
- Settings.Secure.putInt(getContentResolver(),
- SCREENSAVER_ACTIVATE_ON_DOCK,
- mActivateOnDockPreference.isChecked() ? 1 : 0);
- }
+ mActivateOnSleep.onClick(preference);
+ mActivateOnDock.onClick(preference);
+ refreshDependents();
return super.onPreferenceTreeClick(preferenceScreen, preference);
}
+
+ private void refreshDependents() {
+ boolean enabled = mActivateOnSleep.isSelected() || mActivateOnDock.isSelected();
+ mComponentPref.setEnabled(enabled);
+ mTestPref.setEnabled(enabled);
+ }
+
+ private static class ActivationSetting {
+ private final Context mContext;
+ private final String mName;
+ private final int mDefaultValue;
+ private final CheckBoxPreference mPref;
+
+ ActivationSetting(Context context, String name, int defaultValue, CheckBoxPreference pref) {
+ mContext = context;
+ mName = name;
+ mDefaultValue = defaultValue;
+ mPref = pref;
+ }
+ public boolean isSelected() {
+ return mPref.isChecked();
+ }
+ void onClick(Preference preference) {
+ if (preference == mPref) {
+ Settings.Secure.putInt(mContext.getContentResolver(),
+ mName,
+ mPref.isChecked() ? 1 : 0);
+ }
+ }
+ void onResume() {
+ boolean currentActivated = 0 != Settings.Secure.getInt(mContext.getContentResolver(),
+ mName, mDefaultValue);
+ mPref.setChecked(currentActivated);
+ }
+ }
+
}
diff --git a/src/com/android/settings/DreamTesterPreference.java b/src/com/android/settings/DreamTesterPreference.java
index 87a142c..fa1d708 100644
--- a/src/com/android/settings/DreamTesterPreference.java
+++ b/src/com/android/settings/DreamTesterPreference.java
@@ -16,72 +16,33 @@
package com.android.settings;
-import static android.provider.Settings.Secure.SCREENSAVER_COMPONENT;
-
-import android.app.AlertDialog;
-import android.content.Context;
import android.content.ComponentName;
-import android.content.ContentResolver;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.content.pm.ActivityInfo;
-import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
-import android.content.res.Resources;
+import android.content.Context;
import android.os.RemoteException;
import android.os.ServiceManager;
import android.preference.Preference;
-import android.provider.Settings;
import android.service.dreams.IDreamManager;
import android.util.AttributeSet;
import android.util.Log;
-import android.view.Gravity;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.ListAdapter;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
public class DreamTesterPreference extends Preference {
private static final String TAG = "DreamTesterPreference";
-
- private final PackageManager pm;
- private final ContentResolver resolver;
public DreamTesterPreference(Context context, AttributeSet attrs) {
super(context, attrs);
- pm = getContext().getPackageManager();
- resolver = getContext().getContentResolver();
}
@Override
protected void onClick() {
- String component = Settings.Secure.getString(resolver, SCREENSAVER_COMPONENT);
- Log.v(TAG, "component=" + component);
- if (component != null) {
- ComponentName cn = ComponentName.unflattenFromString(component);
- Log.v(TAG, "cn=" + cn);
-// Intent intent = new Intent(Intent.ACTION_MAIN)
-// .setComponent(cn)
-// .addFlags(
-// Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS
-// )
-// .putExtra("android.dreams.TEST", true);
-// getContext().startService(intent);
- IDreamManager dm = IDreamManager.Stub.asInterface(
- ServiceManager.getService("dreams"));
- try {
- dm.testDream(cn);
- } catch (RemoteException ex) {
- // too bad, so sad, oh mom, oh dad
- }
+ IDreamManager dm = IDreamManager.Stub.asInterface(ServiceManager.getService("dreams"));
+ try {
+ ComponentName cn = dm.getDreamComponent();
+ Log.v(TAG, "DreamComponent cn=" + cn);
+ dm.testDream(cn);
+ } catch (RemoteException ex) {
+ Log.w(TAG, "error testing dream", ex);
+ // too bad, so sad, oh mom, oh dad
}
}
+
}
diff --git a/src/com/android/settings/RadioInfo.java b/src/com/android/settings/RadioInfo.java
index 5ba3837..d72508a 100644
--- a/src/com/android/settings/RadioInfo.java
+++ b/src/com/android/settings/RadioInfo.java
@@ -33,6 +33,7 @@
import android.os.RemoteException;
import android.os.ServiceManager;
import android.os.SystemProperties;
+import android.telephony.CellInfo;
import android.telephony.CellLocation;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
@@ -111,6 +112,7 @@
private TextView mCfi;
private TextView mLocation;
private TextView mNeighboringCids;
+ private TextView mCellInfo;
private TextView resets;
private TextView attempts;
private TextView successes;
@@ -140,6 +142,7 @@
private String mHttpClientTestResult;
private boolean mMwiValue = false;
private boolean mCfiValue = false;
+ private List<CellInfo> mCellInfoValue;
private PhoneStateListener mPhoneStateListener = new PhoneStateListener() {
@Override
@@ -171,6 +174,13 @@
mCfiValue = cfi;
updateCallRedirect();
}
+
+ @Override
+ public void onCellInfoChanged(List<CellInfo> arrayCi) {
+ Log.d(TAG, "[RadioInfo] onCellInfoChanged: arrayCi=" + arrayCi);
+ mCellInfoValue = arrayCi;
+ updateCellInfoTv();
+ }
};
private Handler mHandler = new Handler() {
@@ -263,6 +273,7 @@
mCfi = (TextView) findViewById(R.id.cfi);
mLocation = (TextView) findViewById(R.id.location);
mNeighboringCids = (TextView) findViewById(R.id.neighboring);
+ mCellInfo = (TextView) findViewById(R.id.cellinfo);
resets = (TextView) findViewById(R.id.resets);
attempts = (TextView) findViewById(R.id.attempts);
@@ -326,6 +337,10 @@
mHandler.obtainMessage(EVENT_QUERY_NEIGHBORING_CIDS_DONE));
CellLocation.requestLocationUpdate();
+
+ // Get current cell info
+ mCellInfoValue = mTelephonyManager.getAllCellInfo();
+ Log.d(TAG, "[RadioInfo] onCreate: mCellInfoValue=" + mCellInfoValue);
}
@Override
@@ -356,7 +371,8 @@
| PhoneStateListener.LISTEN_DATA_ACTIVITY
| PhoneStateListener.LISTEN_CELL_LOCATION
| PhoneStateListener.LISTEN_MESSAGE_WAITING_INDICATOR
- | PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR);
+ | PhoneStateListener.LISTEN_CALL_FORWARDING_INDICATOR
+ | PhoneStateListener.LISTEN_CELL_INFO);
}
@Override
@@ -508,6 +524,23 @@
mNeighboringCids.setText(sb.toString());
}
+ private final void updateCellInfoTv() {
+ StringBuilder value = new StringBuilder();
+ if (mCellInfoValue != null) {
+ int index = 0;
+ for (CellInfo ci : mCellInfoValue) {
+ value.append('[');
+ value.append(index);
+ value.append("]=");
+ value.append(ci.toString());
+ if (++index < mCellInfoValue.size()) {
+ value.append("\n");
+ }
+ }
+ }
+ mCellInfo.setText(value.toString());
+ }
+
private final void
updateMessageWaiting() {
mMwi.setText(String.valueOf(mMwiValue));
diff --git a/src/com/android/settings/SecuritySettings.java b/src/com/android/settings/SecuritySettings.java
index a12da3e..74cc753 100644
--- a/src/com/android/settings/SecuritySettings.java
+++ b/src/com/android/settings/SecuritySettings.java
@@ -446,7 +446,9 @@
resultCode == Activity.RESULT_OK) {
final LockPatternUtils lockPatternUtils = mChooseLockSettingsHelper.utils();
lockPatternUtils.setBiometricWeakLivelinessEnabled(false);
- mBiometricWeakLiveliness.setChecked(false);
+ // Setting the mBiometricWeakLiveliness checked value to false is handled when onResume
+ // is called by grabbing the value from lockPatternUtils. We can't set it here
+ // because mBiometricWeakLiveliness could be null
return;
}
createPreferenceHierarchy();
diff --git a/src/com/android/settings/TetherSettings.java b/src/com/android/settings/TetherSettings.java
index 77a72a7..368973c 100644
--- a/src/com/android/settings/TetherSettings.java
+++ b/src/com/android/settings/TetherSettings.java
@@ -55,6 +55,7 @@
*/
public class TetherSettings extends SettingsPreferenceFragment
implements DialogInterface.OnClickListener, Preference.OnPreferenceChangeListener {
+ private static final String TAG = "TetherSettings";
private static final String USB_TETHER_SETTINGS = "usb_tether_settings";
private static final String ENABLE_WIFI_AP = "enable_wifi_ap";
@@ -234,8 +235,10 @@
switch (intent
.getIntExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.ERROR)) {
case BluetoothAdapter.STATE_ON:
- mBluetoothPan.setBluetoothTethering(true);
- mBluetoothEnableForTether = false;
+ if(mBluetoothPan != null) {
+ mBluetoothPan.setBluetoothTethering(true);
+ mBluetoothEnableForTether = false;
+ }
break;
case BluetoothAdapter.STATE_OFF:
@@ -392,7 +395,8 @@
} else if (btState == BluetoothAdapter.STATE_TURNING_ON) {
mBluetoothTether.setEnabled(false);
mBluetoothTether.setSummary(R.string.bluetooth_turning_on);
- } else if (btState == BluetoothAdapter.STATE_ON && mBluetoothPan.isTetheringOn()) {
+ } else if (btState == BluetoothAdapter.STATE_ON &&
+ mBluetoothPan != null && mBluetoothPan.isTetheringOn()) {
mBluetoothTether.setChecked(true);
mBluetoothTether.setEnabled(true);
if (bluetoothTethered > 1) {
diff --git a/src/com/android/settings/applications/ApplicationsState.java b/src/com/android/settings/applications/ApplicationsState.java
index 3256fb2..cca9086 100644
--- a/src/com/android/settings/applications/ApplicationsState.java
+++ b/src/com/android/settings/applications/ApplicationsState.java
@@ -786,7 +786,10 @@
private long getTotalExternalSize(PackageStats ps) {
if (ps != null) {
+ // We also include the cache size here because for non-emulated
+ // we don't automtically clean cache files.
return ps.externalCodeSize + ps.externalDataSize
+ + ps.externalCacheSize
+ ps.externalMediaSize + ps.externalObbSize;
}
return SIZE_INVALID;
@@ -822,7 +825,7 @@
long externalCodeSize = stats.externalCodeSize
+ stats.externalObbSize;
long externalDataSize = stats.externalDataSize
- + stats.externalMediaSize + stats.externalCacheSize;
+ + stats.externalMediaSize;
long newSize = externalCodeSize + externalDataSize
+ getTotalInternalSize(stats);
if (entry.size != newSize ||
diff --git a/src/com/android/settings/applications/InstalledAppDetails.java b/src/com/android/settings/applications/InstalledAppDetails.java
index d85c341..22908ab 100644
--- a/src/com/android/settings/applications/InstalledAppDetails.java
+++ b/src/com/android/settings/applications/InstalledAppDetails.java
@@ -384,7 +384,12 @@
mDataSize = (TextView)view.findViewById(R.id.data_size_text);
mExternalCodeSize = (TextView)view.findViewById(R.id.external_code_size_text);
mExternalDataSize = (TextView)view.findViewById(R.id.external_data_size_text);
-
+
+ if (Environment.isExternalStorageEmulated()) {
+ ((View)mExternalCodeSize.getParent()).setVisibility(View.GONE);
+ ((View)mExternalDataSize.getParent()).setVisibility(View.GONE);
+ }
+
// Get Control button panel
View btnPanel = view.findViewById(R.id.control_buttons_panel);
mForceStopButton = (Button) btnPanel.findViewById(R.id.left_button);
@@ -675,22 +680,28 @@
} else {
mHaveSizes = true;
- if (mLastCodeSize != mAppEntry.codeSize) {
- mLastCodeSize = mAppEntry.codeSize;
- mAppSize.setText(getSizeStr(mAppEntry.codeSize));
+ long codeSize = mAppEntry.codeSize;
+ long dataSize = mAppEntry.dataSize;
+ if (Environment.isExternalStorageEmulated()) {
+ codeSize += mAppEntry.externalCodeSize;
+ dataSize += mAppEntry.externalDataSize;
+ } else {
+ if (mLastExternalCodeSize != mAppEntry.externalCodeSize) {
+ mLastExternalCodeSize = mAppEntry.externalCodeSize;
+ mExternalCodeSize.setText(getSizeStr(mAppEntry.externalCodeSize));
+ }
+ if (mLastExternalDataSize != mAppEntry.externalDataSize) {
+ mLastExternalDataSize = mAppEntry.externalDataSize;
+ mExternalDataSize.setText(getSizeStr( mAppEntry.externalDataSize));
+ }
}
- if (mLastDataSize != mAppEntry.dataSize) {
- mLastDataSize = mAppEntry.dataSize;
- mDataSize.setText(getSizeStr(mAppEntry.dataSize));
+ if (mLastCodeSize != codeSize) {
+ mLastCodeSize = codeSize;
+ mAppSize.setText(getSizeStr(codeSize));
}
- if (mLastExternalCodeSize != mAppEntry.externalCodeSize) {
- mLastExternalCodeSize = mAppEntry.externalCodeSize;
- mExternalCodeSize.setText(getSizeStr(mAppEntry.externalCodeSize));
- }
- long nonCacheExtDataSize = mAppEntry.externalDataSize - mAppEntry.externalCacheSize;
- if (mLastExternalDataSize != nonCacheExtDataSize) {
- mLastExternalDataSize = nonCacheExtDataSize;
- mExternalDataSize.setText(getSizeStr(nonCacheExtDataSize));
+ if (mLastDataSize != dataSize) {
+ mLastDataSize = dataSize;
+ mDataSize.setText(getSizeStr(dataSize));
}
long cacheSize = mAppEntry.cacheSize + mAppEntry.externalCacheSize;
if (mLastCacheSize != cacheSize) {
@@ -702,7 +713,7 @@
mTotalSize.setText(getSizeStr(mAppEntry.size));
}
- if ((mAppEntry.dataSize+nonCacheExtDataSize) <= 0 || !mCanClearData) {
+ if ((mAppEntry.dataSize+ mAppEntry.externalDataSize) <= 0 || !mCanClearData) {
mClearDataButton.setEnabled(false);
} else {
mClearDataButton.setEnabled(true);
diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java
index 1cc9dcc..1240d43 100644
--- a/src/com/android/settings/applications/ManageApplications.java
+++ b/src/com/android/settings/applications/ManageApplications.java
@@ -341,7 +341,8 @@
final int N = mApplications.getCount();
for (int i=0; i<N; i++) {
ApplicationsState.AppEntry ae = mApplications.getAppEntry(i);
- mAppStorage += ae.externalCodeSize + ae.externalDataSize;
+ mAppStorage += ae.externalCodeSize + ae.externalDataSize
+ + ae.externalCacheSize;
}
}
} else {
diff --git a/src/com/android/settings/bluetooth/A2dpProfile.java b/src/com/android/settings/bluetooth/A2dpProfile.java
old mode 100644
new mode 100755
index b7ba44d..fbf24c9
--- a/src/com/android/settings/bluetooth/A2dpProfile.java
+++ b/src/com/android/settings/bluetooth/A2dpProfile.java
@@ -24,17 +24,19 @@
import android.bluetooth.BluetoothUuid;
import android.content.Context;
import android.os.ParcelUuid;
+import android.util.Log;
import com.android.settings.R;
+import java.util.ArrayList;
import java.util.List;
-/**
- * A2dpProfile handles Bluetooth A2DP.
- * TODO: add null checks around calls to mService object.
- */
final class A2dpProfile implements LocalBluetoothProfile {
+ private static final String TAG = "A2dpProfile";
+ private static boolean V = true;
+
private BluetoothA2dp mService;
+ private boolean mIsProfileReady;
static final ParcelUuid[] SINK_UUIDS = {
BluetoothUuid.AudioSink,
@@ -42,6 +44,7 @@
};
static final String NAME = "A2DP";
+ private final LocalBluetoothProfileManager mProfileManager;
// Order of this profile in device profiles list
private static final int ORDINAL = 1;
@@ -51,15 +54,22 @@
implements BluetoothProfile.ServiceListener {
public void onServiceConnected(int profile, BluetoothProfile proxy) {
+ if (V) Log.d(TAG,"Bluetooth service connected");
mService = (BluetoothA2dp) proxy;
+ mIsProfileReady=true;
}
public void onServiceDisconnected(int profile) {
- mService = null;
+ if (V) Log.d(TAG,"Bluetooth service disconnected");
+ mIsProfileReady=false;
}
}
- A2dpProfile(Context context) {
+ public boolean isProfileReady() {
+ return mIsProfileReady;
+ }
+ A2dpProfile(Context context, LocalBluetoothProfileManager profileManager) {
+ mProfileManager = profileManager;
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
adapter.getProfileProxy(context, new A2dpServiceListener(),
BluetoothProfile.A2DP);
@@ -73,7 +83,8 @@
return true;
}
- private List<BluetoothDevice> getConnectedDevices() {
+ public List<BluetoothDevice> getConnectedDevices() {
+ if (mService == null) return new ArrayList<BluetoothDevice>(0);
return mService.getDevicesMatchingConnectionStates(
new int[] {BluetoothProfile.STATE_CONNECTED,
BluetoothProfile.STATE_CONNECTING,
@@ -81,6 +92,7 @@
}
public boolean connect(BluetoothDevice device) {
+ if (mService == null) return false;
List<BluetoothDevice> sinks = getConnectedDevices();
if (sinks != null) {
for (BluetoothDevice sink : sinks) {
@@ -91,22 +103,33 @@
}
public boolean disconnect(BluetoothDevice device) {
+ if (mService == null) return false;
+ // Downgrade priority as user is disconnecting the headset.
+ if (mService.getPriority(device) > BluetoothProfile.PRIORITY_ON){
+ mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
+ }
return mService.disconnect(device);
}
public int getConnectionStatus(BluetoothDevice device) {
+ if (mService == null) {
+ return BluetoothProfile.STATE_DISCONNECTED;
+ }
return mService.getConnectionState(device);
}
public boolean isPreferred(BluetoothDevice device) {
+ if (mService == null) return false;
return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
}
public int getPreferred(BluetoothDevice device) {
+ if (mService == null) return BluetoothProfile.PRIORITY_OFF;
return mService.getPriority(device);
}
public void setPreferred(BluetoothDevice device, boolean preferred) {
+ if (mService == null) return;
if (preferred) {
if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
@@ -115,8 +138,8 @@
mService.setPriority(device, BluetoothProfile.PRIORITY_OFF);
}
}
-
boolean isA2dpPlaying() {
+ if (mService == null) return false;
List<BluetoothDevice> sinks = mService.getConnectedDevices();
if (!sinks.isEmpty()) {
if (mService.isA2dpPlaying(sinks.get(0))) {
@@ -126,10 +149,6 @@
return false;
}
- public boolean isProfileReady() {
- return mService != null;
- }
-
public String toString() {
return NAME;
}
@@ -143,7 +162,7 @@
}
public int getSummaryResourceForDevice(BluetoothDevice device) {
- int state = mService.getConnectionState(device);
+ int state = getConnectionStatus(device);
switch (state) {
case BluetoothProfile.STATE_DISCONNECTED:
return R.string.bluetooth_a2dp_profile_summary_use_for;
@@ -159,4 +178,17 @@
public int getDrawableResource(BluetoothClass btClass) {
return R.drawable.ic_bt_headphones_a2dp;
}
+
+ protected void finalize() {
+ if (V) Log.d(TAG, "finalize()");
+ if (mService != null) {
+ try {
+ BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.A2DP,
+ mService);
+ mService = null;
+ }catch (Throwable t) {
+ Log.w(TAG, "Error cleaning up A2DP proxy", t);
+ }
+ }
+ }
}
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
index babf1e2..d687136 100755
--- a/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
@@ -29,6 +29,9 @@
import com.android.settings.R;
+import android.text.format.Time;
+import android.util.Log;
+
/**
* BluetoothDiscoverableEnabler is a helper to manage the "Discoverable"
* checkbox. It sets/unsets discoverability and keeps track of how much time
@@ -36,6 +39,8 @@
*/
final class BluetoothDiscoverableEnabler implements Preference.OnPreferenceClickListener {
+ private static final String TAG = "BluetoothDiscoverableEnabler";
+
private static final String SYSTEM_PROPERTY_DISCOVERABLE_TIMEOUT =
"debug.bt.discoverable_time";
@@ -128,15 +133,20 @@
private void setEnabled(boolean enable) {
if (enable) {
int timeout = getDiscoverableTimeout();
- mLocalAdapter.setDiscoverableTimeout(timeout);
-
long endTimestamp = System.currentTimeMillis() + timeout * 1000L;
LocalBluetoothPreferences.persistDiscoverableEndTimestamp(mContext, endTimestamp);
mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, timeout);
updateCountdownSummary();
+
+ Log.d(TAG, "setEnabled(): enabled = " + enable + "timeout = " + timeout);
+
+ if (timeout > 0) {
+ BluetoothDiscoverableTimeoutReceiver.setDiscoverableAlarm(mContext, endTimestamp);
+ }
} else {
mLocalAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
+ BluetoothDiscoverableTimeoutReceiver.cancelDiscoverableAlarm(mContext);
}
}
@@ -238,6 +248,7 @@
}
void handleModeChanged(int mode) {
+ Log.d(TAG, "handleModeChanged(): mode = " + mode);
if (mode == BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE) {
mDiscoverable = true;
updateCountdownSummary();
diff --git a/src/com/android/settings/bluetooth/BluetoothDiscoverableTimeoutReceiver.java b/src/com/android/settings/bluetooth/BluetoothDiscoverableTimeoutReceiver.java
new file mode 100644
index 0000000..14f7b22
--- /dev/null
+++ b/src/com/android/settings/bluetooth/BluetoothDiscoverableTimeoutReceiver.java
@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2012 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.bluetooth;
+
+/* Required to handle timeout notification when phone is suspended */
+import android.app.AlarmManager;
+import android.app.PendingIntent;
+
+import android.bluetooth.BluetoothAdapter;
+import android.content.BroadcastReceiver;
+import android.content.ContentResolver;
+import android.content.Context;
+import android.content.Intent;
+import android.util.Log;
+
+
+public class BluetoothDiscoverableTimeoutReceiver extends BroadcastReceiver {
+ private static final String TAG = "BluetoothDiscoverableTimeoutReceiver";
+
+ private static final String INTENT_DISCOVERABLE_TIMEOUT =
+ "android.bluetooth.intent.DISCOVERABLE_TIMEOUT";
+
+ static void setDiscoverableAlarm(Context context, long alarmTime) {
+ Log.d(TAG, "setDiscoverableAlarm(): alarmTime = " + alarmTime);
+
+ Intent intent = new Intent(INTENT_DISCOVERABLE_TIMEOUT);
+ intent.setClass(context, BluetoothDiscoverableTimeoutReceiver.class);
+ PendingIntent pending = PendingIntent.getBroadcast(
+ context, 0, intent, 0);
+ AlarmManager alarmManager =
+ (AlarmManager) context.getSystemService (Context.ALARM_SERVICE);
+
+ if (pending != null) {
+ // Cancel any previous alarms that do the same thing.
+ alarmManager.cancel(pending);
+ Log.d(TAG, "setDiscoverableAlarm(): cancel prev alarm");
+ }
+ pending = PendingIntent.getBroadcast(
+ context, 0, intent, 0);
+
+ alarmManager.set(AlarmManager.RTC_WAKEUP, alarmTime, pending);
+ }
+
+ static void cancelDiscoverableAlarm(Context context) {
+ Log.d(TAG, "cancelDiscoverableAlarm(): Enter");
+
+ Intent intent = new Intent(INTENT_DISCOVERABLE_TIMEOUT);
+ intent.setClass(context, BluetoothDiscoverableTimeoutReceiver.class);
+ PendingIntent pending = PendingIntent.getBroadcast(
+ context, 0, intent, PendingIntent.FLAG_NO_CREATE);
+ if (pending != null) {
+ // Cancel any previous alarms that do the same thing.
+ AlarmManager alarmManager =
+ (AlarmManager) context.getSystemService (Context.ALARM_SERVICE);
+
+ alarmManager.cancel(pending);
+ }
+ }
+
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ LocalBluetoothAdapter localBluetoothAdapter = LocalBluetoothAdapter.getInstance();
+
+ if(localBluetoothAdapter != null &&
+ localBluetoothAdapter.getState() == BluetoothAdapter.STATE_ON) {
+ Log.d(TAG, "Disable discoverable...");
+
+ localBluetoothAdapter.setScanMode(BluetoothAdapter.SCAN_MODE_CONNECTABLE);
+ } else {
+ Log.e(TAG, "localBluetoothAdapter is NULL!!");
+ }
+ }
+};
diff --git a/src/com/android/settings/bluetooth/BluetoothEventManager.java b/src/com/android/settings/bluetooth/BluetoothEventManager.java
old mode 100644
new mode 100755
index a6d9bcf..0eead85
--- a/src/com/android/settings/bluetooth/BluetoothEventManager.java
+++ b/src/com/android/settings/bluetooth/BluetoothEventManager.java
@@ -21,6 +21,7 @@
import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothProfile;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -99,6 +100,7 @@
// Dock event broadcasts
addHandler(Intent.ACTION_DOCK_EVENT, new DockEventHandler());
+
mContext.registerReceiver(mBroadcastReceiver, mAdapterIntentFilter);
}
@@ -163,6 +165,8 @@
callback.onBluetoothStateChanged(state);
}
}
+ // Inform CachedDeviceManager that the adapter state has changed
+ mDeviceManager.onBluetoothStateChanged(state);
}
}
@@ -365,7 +369,6 @@
}
}
}
-
boolean readPairedDevices() {
Set<BluetoothDevice> bondedDevices = mLocalAdapter.getBondedDevices();
if (bondedDevices == null) {
diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java
index d30e428..f44efc4 100755
--- a/src/com/android/settings/bluetooth/BluetoothSettings.java
+++ b/src/com/android/settings/bluetooth/BluetoothSettings.java
@@ -125,7 +125,7 @@
activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(
ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT,
- Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+ Gravity.CENTER_VERTICAL | Gravity.END));
}
}
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
old mode 100644
new mode 100755
index 01fd1b2..ef223d5
--- a/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDevice.java
@@ -25,6 +25,7 @@
import android.os.SystemClock;
import android.text.TextUtils;
import android.util.Log;
+import android.bluetooth.BluetoothAdapter;
import java.util.ArrayList;
import java.util.Collection;
@@ -118,7 +119,6 @@
Log.d(TAG, "onProfileStateChanged: profile " + profile +
" newProfileState " + newProfileState);
}
-
mProfileConnectionState.put(profile, newProfileState);
if (newProfileState == BluetoothProfile.STATE_CONNECTED) {
if (!mProfiles.contains(profile)) {
@@ -156,6 +156,14 @@
for (LocalBluetoothProfile profile : mProfiles) {
disconnect(profile);
}
+ // Disconnect PBAP server in case its connected
+ // This is to ensure all the profiles are disconnected as some CK/Hs do not
+ // disconnect PBAP connection when HF connection is brought down
+ PbapServerProfile PbapProfile = mProfileManager.getPbapProfile();
+ if (PbapProfile.getConnectionStatus(mDevice) == BluetoothProfile.STATE_CONNECTED)
+ {
+ PbapProfile.disconnect(mDevice);
+ }
}
void disconnect(LocalBluetoothProfile profile) {
@@ -184,12 +192,15 @@
private void connectWithoutResettingTimer(boolean connectAllProfiles) {
// Try to initialize the profiles if they were not.
if (mProfiles.isEmpty()) {
- if (!updateProfiles()) {
- // If UUIDs are not available yet, connect will be happen
- // upon arrival of the ACTION_UUID intent.
- if (DEBUG) Log.d(TAG, "No profiles. Maybe we will connect later");
- return;
- }
+ // if mProfiles is empty, then do not invoke updateProfiles. This causes a race
+ // condition with carkits during pairing, wherein RemoteDevice.UUIDs have been updated
+ // from bluetooth stack but ACTION.uuid is not sent yet.
+ // Eventually ACTION.uuid will be received which shall trigger the connection of the
+ // various profiles
+ // If UUIDs are not available yet, connect will be happen
+ // upon arrival of the ACTION_UUID intent.
+ Log.d(TAG, "No profiles. Maybe we will connect later");
+ return;
}
// Reset the only-show-one-error-dialog tracking variable
@@ -236,9 +247,11 @@
// Reset the only-show-one-error-dialog tracking variable
mIsConnectingErrorPossible = true;
connectInt(profile);
+ // Refresh the UI based on profile.connect() call
+ refresh();
}
- private void connectInt(LocalBluetoothProfile profile) {
+ synchronized void connectInt(LocalBluetoothProfile profile) {
if (!ensurePaired()) {
return;
}
@@ -283,8 +296,6 @@
}
void unpair() {
- disconnect();
-
int state = getBondState();
if (state == BluetoothDevice.BOND_BONDING) {
@@ -436,7 +447,7 @@
ParcelUuid[] localUuids = mLocalAdapter.getUuids();
if (localUuids == null) return false;
- mProfileManager.updateProfiles(uuids, localUuids, mProfiles, mRemovedProfiles);
+ mProfileManager.updateProfiles(uuids, localUuids, mProfiles, mRemovedProfiles, mLocalNapRoleConnected);
if (DEBUG) {
Log.e(TAG, "updating profiles for " + mDevice.getAliasName());
diff --git a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
index 77f6b2c..06be3c4 100644
--- a/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
+++ b/src/com/android/settings/bluetooth/CachedBluetoothDeviceManager.java
@@ -16,6 +16,7 @@
package com.android.settings.bluetooth;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothDevice;
import android.content.Context;
import android.util.Log;
@@ -134,6 +135,19 @@
}
}
+ public synchronized void onBluetoothStateChanged(int bluetoothState) {
+ // When Bluetooth is turning off, we need to clear the non-bonded devices
+ // Otherwise, they end up showing up on the next BT enable
+ if (bluetoothState == BluetoothAdapter.STATE_TURNING_OFF) {
+ for (int i = mCachedDevices.size() - 1; i >= 0; i--) {
+ CachedBluetoothDevice cachedDevice = mCachedDevices.get(i);
+ if (cachedDevice.getBondState() != BluetoothDevice.BOND_BONDED) {
+ cachedDevice.setVisible(false);
+ mCachedDevices.remove(i);
+ }
+ }
+ }
+ }
private void log(String msg) {
if (DEBUG) {
Log.d(TAG, msg);
diff --git a/src/com/android/settings/bluetooth/HeadsetProfile.java b/src/com/android/settings/bluetooth/HeadsetProfile.java
old mode 100644
new mode 100755
index 99d070b..83c8e8e
--- a/src/com/android/settings/bluetooth/HeadsetProfile.java
+++ b/src/com/android/settings/bluetooth/HeadsetProfile.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 The Android Open Source Project
+ * Copyright (C) 2012 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,6 +16,7 @@
package com.android.settings.bluetooth;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothHeadset;
@@ -27,6 +28,7 @@
import com.android.settings.R;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -34,9 +36,10 @@
*/
final class HeadsetProfile implements LocalBluetoothProfile {
private static final String TAG = "HeadsetProfile";
+ private static boolean V = true;
private BluetoothHeadset mService;
- private boolean mProfileReady;
+ private boolean mIsProfileReady;
private final LocalBluetoothAdapter mLocalAdapter;
private final CachedBluetoothDeviceManager mDeviceManager;
@@ -57,38 +60,38 @@
implements BluetoothProfile.ServiceListener {
public void onServiceConnected(int profile, BluetoothProfile proxy) {
+ if (V) Log.d(TAG,"Bluetooth service connected");
mService = (BluetoothHeadset) proxy;
- mProfileReady = true;
// We just bound to the service, so refresh the UI of the
// headset device.
List<BluetoothDevice> deviceList = mService.getConnectedDevices();
- if (deviceList.isEmpty()) {
- return;
+ if (!deviceList.isEmpty()) {
+ BluetoothDevice firstDevice = deviceList.get(0);
+ CachedBluetoothDevice device = mDeviceManager.findDevice(firstDevice);
+ // we may add a new device here, but generally this should not happen
+ if (device == null) {
+ Log.w(TAG, "HeadsetProfile found new device: " + firstDevice);
+ device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, firstDevice);
+ }
+ device.onProfileStateChanged(HeadsetProfile.this,
+ BluetoothProfile.STATE_CONNECTED);
}
- BluetoothDevice firstDevice = deviceList.get(0);
- CachedBluetoothDevice device = mDeviceManager.findDevice(firstDevice);
- // we may add a new device here, but generally this should not happen
- if (device == null) {
- Log.w(TAG, "HeadsetProfile found new device: " + firstDevice);
- device = mDeviceManager.addDevice(mLocalAdapter, mProfileManager, firstDevice);
- }
- device.onProfileStateChanged(HeadsetProfile.this,
- BluetoothProfile.STATE_CONNECTED);
mProfileManager.callServiceConnectedListeners();
+ mIsProfileReady=true;
}
public void onServiceDisconnected(int profile) {
- mProfileReady = false;
- mService = null;
+ if (V) Log.d(TAG,"Bluetooth service disconnected");
mProfileManager.callServiceDisconnectedListeners();
+ mIsProfileReady=false;
}
}
- // TODO(): The calls must get queued if mService becomes null.
- // It can happen when the phone app crashes for some reason.
- // All callers should have service listeners. Dock Service is the only
- // one right now.
+ public boolean isProfileReady() {
+ return mIsProfileReady;
+ }
+
HeadsetProfile(Context context, LocalBluetoothAdapter adapter,
CachedBluetoothDeviceManager deviceManager,
LocalBluetoothProfileManager profileManager) {
@@ -108,6 +111,7 @@
}
public boolean connect(BluetoothDevice device) {
+ if (mService == null) return false;
List<BluetoothDevice> sinks = mService.getConnectedDevices();
if (sinks != null) {
for (BluetoothDevice sink : sinks) {
@@ -118,6 +122,7 @@
}
public boolean disconnect(BluetoothDevice device) {
+ if (mService == null) return false;
List<BluetoothDevice> deviceList = mService.getConnectedDevices();
if (!deviceList.isEmpty() && deviceList.get(0).equals(device)) {
// Downgrade priority as user is disconnecting the headset.
@@ -132,7 +137,6 @@
public int getConnectionStatus(BluetoothDevice device) {
if (mService == null) return BluetoothProfile.STATE_DISCONNECTED;
-
List<BluetoothDevice> deviceList = mService.getConnectedDevices();
return !deviceList.isEmpty() && deviceList.get(0).equals(device)
@@ -141,14 +145,17 @@
}
public boolean isPreferred(BluetoothDevice device) {
+ if (mService == null) return false;
return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
}
public int getPreferred(BluetoothDevice device) {
+ if (mService == null) return BluetoothProfile.PRIORITY_OFF;
return mService.getPriority(device);
}
public void setPreferred(BluetoothDevice device, boolean preferred) {
+ if (mService == null) return;
if (preferred) {
if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
@@ -158,8 +165,12 @@
}
}
- public synchronized boolean isProfileReady() {
- return mProfileReady;
+ public List<BluetoothDevice> getConnectedDevices() {
+ if (mService == null) return new ArrayList<BluetoothDevice>(0);
+ return mService.getDevicesMatchingConnectionStates(
+ new int[] {BluetoothProfile.STATE_CONNECTED,
+ BluetoothProfile.STATE_CONNECTING,
+ BluetoothProfile.STATE_DISCONNECTING});
}
public String toString() {
@@ -175,7 +186,7 @@
}
public int getSummaryResourceForDevice(BluetoothDevice device) {
- int state = mService.getConnectionState(device);
+ int state = getConnectionStatus(device);
switch (state) {
case BluetoothProfile.STATE_DISCONNECTED:
return R.string.bluetooth_headset_profile_summary_use_for;
@@ -191,4 +202,17 @@
public int getDrawableResource(BluetoothClass btClass) {
return R.drawable.ic_bt_headset_hfp;
}
+
+ protected void finalize() {
+ if (V) Log.d(TAG, "finalize()");
+ if (mService != null) {
+ try {
+ BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.HEADSET,
+ mService);
+ mService = null;
+ }catch (Throwable t) {
+ Log.w(TAG, "Error cleaning up HID proxy", t);
+ }
+ }
+ }
}
diff --git a/src/com/android/settings/bluetooth/HidProfile.java b/src/com/android/settings/bluetooth/HidProfile.java
old mode 100644
new mode 100755
index 920f4bb..c502850
--- a/src/com/android/settings/bluetooth/HidProfile.java
+++ b/src/com/android/settings/bluetooth/HidProfile.java
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2011 The Android Open Source Project
+ * Copyright (C) 2012 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,11 +16,13 @@
package com.android.settings.bluetooth;
+import android.bluetooth.BluetoothAdapter;
import android.bluetooth.BluetoothClass;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothInputDevice;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
+import android.util.Log;
import com.android.settings.R;
@@ -30,8 +32,11 @@
* HidProfile handles Bluetooth HID profile.
*/
final class HidProfile implements LocalBluetoothProfile {
+ private static final String TAG = "HidProfile";
+ private static boolean V = true;
+
private BluetoothInputDevice mService;
- private boolean mProfileReady;
+ private boolean mIsProfileReady;
static final String NAME = "HID";
@@ -43,16 +48,21 @@
implements BluetoothProfile.ServiceListener {
public void onServiceConnected(int profile, BluetoothProfile proxy) {
+ if (V) Log.d(TAG,"Bluetooth service connected");
mService = (BluetoothInputDevice) proxy;
- mProfileReady = true;
+ mIsProfileReady=true;
}
public void onServiceDisconnected(int profile) {
- mProfileReady = false;
- mService = null;
+ if (V) Log.d(TAG,"Bluetooth service disconnected");
+ mIsProfileReady=false;
}
}
+ public boolean isProfileReady() {
+ return mIsProfileReady;
+ }
+
HidProfile(Context context, LocalBluetoothAdapter adapter) {
adapter.getProfileProxy(context, new InputDeviceServiceListener(),
BluetoothProfile.INPUT_DEVICE);
@@ -67,14 +77,19 @@
}
public boolean connect(BluetoothDevice device) {
+ if (mService == null) return false;
return mService.connect(device);
}
public boolean disconnect(BluetoothDevice device) {
+ if (mService == null) return false;
return mService.disconnect(device);
}
public int getConnectionStatus(BluetoothDevice device) {
+ if (mService == null) {
+ return BluetoothProfile.STATE_DISCONNECTED;
+ }
List<BluetoothDevice> deviceList = mService.getConnectedDevices();
return !deviceList.isEmpty() && deviceList.get(0).equals(device)
@@ -83,14 +98,17 @@
}
public boolean isPreferred(BluetoothDevice device) {
+ if (mService == null) return false;
return mService.getPriority(device) > BluetoothProfile.PRIORITY_OFF;
}
public int getPreferred(BluetoothDevice device) {
+ if (mService == null) return BluetoothProfile.PRIORITY_OFF;
return mService.getPriority(device);
}
public void setPreferred(BluetoothDevice device, boolean preferred) {
+ if (mService == null) return;
if (preferred) {
if (mService.getPriority(device) < BluetoothProfile.PRIORITY_ON) {
mService.setPriority(device, BluetoothProfile.PRIORITY_ON);
@@ -100,10 +118,6 @@
}
}
- public boolean isProfileReady() {
- return mProfileReady;
- }
-
public String toString() {
return NAME;
}
@@ -118,7 +132,7 @@
}
public int getSummaryResourceForDevice(BluetoothDevice device) {
- int state = mService.getConnectionState(device);
+ int state = getConnectionStatus(device);
switch (state) {
case BluetoothProfile.STATE_DISCONNECTED:
return R.string.bluetooth_hid_profile_summary_use_for;
@@ -149,4 +163,17 @@
return R.drawable.ic_bt_misc_hid;
}
}
+
+ protected void finalize() {
+ if (V) Log.d(TAG, "finalize()");
+ if (mService != null) {
+ try {
+ BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.INPUT_DEVICE,
+ mService);
+ mService = null;
+ }catch (Throwable t) {
+ Log.w(TAG, "Error cleaning up HID proxy", t);
+ }
+ }
+ }
}
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
index 7e62b0e..36bc7c8 100644
--- a/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothPreferences.java
@@ -19,6 +19,7 @@
import android.app.QueuedWork;
import android.content.Context;
import android.content.SharedPreferences;
+import android.content.res.Configuration;
/**
* LocalBluetoothPreferences provides an interface to the preferences
@@ -63,6 +64,12 @@
return false;
}
+ // If in appliance mode, do not show dialog in foreground.
+ if ((context.getResources().getConfiguration().uiMode &
+ Configuration.UI_MODE_TYPE_APPLIANCE) == Configuration.UI_MODE_TYPE_APPLIANCE) {
+ return false;
+ }
+
// If Bluetooth Settings is visible
if (manager.isForegroundActivity()) {
return true;
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfile.java b/src/com/android/settings/bluetooth/LocalBluetoothProfile.java
old mode 100644
new mode 100755
diff --git a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
old mode 100644
new mode 100755
index f3143f0..916ef9e
--- a/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
+++ b/src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
@@ -21,17 +21,22 @@
import android.bluetooth.BluetoothHeadset;
import android.bluetooth.BluetoothInputDevice;
import android.bluetooth.BluetoothPan;
+import android.bluetooth.BluetoothPbap;
import android.bluetooth.BluetoothProfile;
import android.bluetooth.BluetoothUuid;
import android.content.Context;
import android.content.Intent;
import android.os.ParcelUuid;
import android.util.Log;
+import android.os.Handler;
+import android.os.Message;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
+import java.util.List;
/**
* LocalBluetoothProfileManager provides access to the LocalBluetoothProfile
@@ -77,6 +82,7 @@
private final HidProfile mHidProfile;
private OppProfile mOppProfile;
private final PanProfile mPanProfile;
+ private final PbapServerProfile mPbapProfile;
/**
* Mapping from profile name, e.g. "HEADSET" to profile object.
@@ -113,6 +119,10 @@
addPanProfile(mPanProfile, PanProfile.NAME,
BluetoothPan.ACTION_CONNECTION_STATE_CHANGED);
+ //Create PBAP server profile, but do not add it to list of profiles
+ // as we do not need to monitor the profile as part of profile list
+ mPbapProfile = new PbapServerProfile(context);
+
Log.d(TAG, "LocalBluetoothProfileManager construction complete");
}
@@ -128,7 +138,7 @@
if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.AudioSource)) {
if (mA2dpProfile == null) {
Log.d(TAG, "Adding local A2DP profile");
- mA2dpProfile = new A2dpProfile(mContext);
+ mA2dpProfile = new A2dpProfile(mContext, this);
addProfile(mA2dpProfile, A2dpProfile.NAME,
BluetoothA2dp.ACTION_CONNECTION_STATE_CHANGED);
}
@@ -287,6 +297,11 @@
return mHeadsetProfile;
}
+ PbapServerProfile getPbapProfile(){
+ return mPbapProfile;
+ }
+
+
/**
* Fill in a list of LocalBluetoothProfile objects that are supported by
* the local device and the remote device.
@@ -298,7 +313,8 @@
*/
synchronized void updateProfiles(ParcelUuid[] uuids, ParcelUuid[] localUuids,
Collection<LocalBluetoothProfile> profiles,
- Collection<LocalBluetoothProfile> removedProfiles) {
+ Collection<LocalBluetoothProfile> removedProfiles,
+ boolean isPanNapConnected) {
// Copy previous profile list into removedProfiles
removedProfiles.clear();
removedProfiles.addAll(profiles);
@@ -336,10 +352,13 @@
removedProfiles.remove(mHidProfile);
}
- if (BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.NAP) &&
- mPanProfile != null) {
+ if(isPanNapConnected)
+ Log.d(TAG, "Valid PAN-NAP connection exists.");
+ if ((BluetoothUuid.isUuidPresent(uuids, BluetoothUuid.NAP) &&
+ mPanProfile != null) || isPanNapConnected) {
profiles.add(mPanProfile);
removedProfiles.remove(mPanProfile);
}
}
+
}
diff --git a/src/com/android/settings/bluetooth/OppProfile.java b/src/com/android/settings/bluetooth/OppProfile.java
old mode 100644
new mode 100755
diff --git a/src/com/android/settings/bluetooth/PBAPServerProfile.java b/src/com/android/settings/bluetooth/PBAPServerProfile.java
new file mode 100755
index 0000000..7217574
--- /dev/null
+++ b/src/com/android/settings/bluetooth/PBAPServerProfile.java
@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) 2011 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.bluetooth;
+
+import android.bluetooth.BluetoothAdapter;
+import android.bluetooth.BluetoothClass;
+import android.bluetooth.BluetoothDevice;
+import android.bluetooth.BluetoothPbap;
+import android.bluetooth.BluetoothProfile;
+import android.content.Context;
+import android.util.Log;
+
+import com.android.settings.R;
+
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ *PBAPServer Profile
+ */
+final class PbapServerProfile implements LocalBluetoothProfile {
+ private static final String TAG = "PbapServerProfile";
+ private static boolean V = true;
+
+ private BluetoothPbap mService;
+ private boolean mIsProfileReady;
+
+ static final String NAME = "PBAP Server";
+
+ // Order of this profile in device profiles list
+ private static final int ORDINAL = 6;
+
+ // These callbacks run on the main thread.
+ private final class PbapServiceListener
+ implements BluetoothPbap.ServiceListener {
+
+ public void onServiceConnected(BluetoothPbap proxy) {
+ if (V) Log.d(TAG,"Bluetooth service connected");
+ mService = (BluetoothPbap) proxy;
+ mIsProfileReady=true;
+ }
+
+ public void onServiceDisconnected() {
+ if (V) Log.d(TAG,"Bluetooth service disconnected");
+ mIsProfileReady=false;
+ }
+ }
+
+ public boolean isProfileReady() {
+ return mIsProfileReady;
+ }
+
+ PbapServerProfile(Context context) {
+ BluetoothPbap pbap = new BluetoothPbap(context, new PbapServiceListener());
+ }
+
+ public boolean isConnectable() {
+ return true;
+ }
+
+ public boolean isAutoConnectable() {
+ return false;
+ }
+
+ public boolean connect(BluetoothDevice device) {
+ /*Can't connect from server */
+ return false;
+
+ }
+
+ public boolean disconnect(BluetoothDevice device) {
+ if (mService == null) return false;
+ return mService.disconnect();
+ }
+
+ public int getConnectionStatus(BluetoothDevice device) {
+ if (mService == null) {
+ return BluetoothProfile.STATE_DISCONNECTED;
+ }
+ if (mService.isConnected(device))
+ return BluetoothProfile.STATE_CONNECTED;
+ else
+ return BluetoothProfile.STATE_DISCONNECTED;
+ }
+
+ public boolean isPreferred(BluetoothDevice device) {
+ return false;
+ }
+
+ public int getPreferred(BluetoothDevice device) {
+ return -1;
+ }
+
+ public void setPreferred(BluetoothDevice device, boolean preferred) {
+ // ignore: isPreferred is always true for PBAP
+ }
+
+ public String toString() {
+ return NAME;
+ }
+
+ public int getOrdinal() {
+ return ORDINAL;
+ }
+
+ public int getNameResource(BluetoothDevice device) {
+ return 0;
+ }
+
+ public int getSummaryResourceForDevice(BluetoothDevice device) {
+ return 0;
+ }
+
+ public int getDrawableResource(BluetoothClass btClass) {
+ return 0;
+ }
+ protected void finalize() {
+ if (V) Log.d(TAG, "finalize()");
+ if (mService != null) {
+ try {
+ mService.close();
+ mService = null;
+ }catch (Throwable t) {
+ Log.w(TAG, "Error cleaning up PBAP proxy", t);
+ }
+ }
+ }
+}
diff --git a/src/com/android/settings/bluetooth/PanProfile.java b/src/com/android/settings/bluetooth/PanProfile.java
old mode 100644
new mode 100755
index 3db4a2b..b9db77b
--- a/src/com/android/settings/bluetooth/PanProfile.java
+++ b/src/com/android/settings/bluetooth/PanProfile.java
@@ -22,6 +22,7 @@
import android.bluetooth.BluetoothPan;
import android.bluetooth.BluetoothProfile;
import android.content.Context;
+import android.util.Log;
import com.android.settings.R;
@@ -32,7 +33,11 @@
* PanProfile handles Bluetooth PAN profile (NAP and PANU).
*/
final class PanProfile implements LocalBluetoothProfile {
+ private static final String TAG = "PanProfile";
+ private static boolean V = true;
+
private BluetoothPan mService;
+ private boolean mIsProfileReady;
// Tethering direction for each device
private final HashMap<BluetoothDevice, Integer> mDeviceRoleMap =
@@ -48,14 +53,21 @@
implements BluetoothProfile.ServiceListener {
public void onServiceConnected(int profile, BluetoothProfile proxy) {
+ if (V) Log.d(TAG,"Bluetooth service connected");
mService = (BluetoothPan) proxy;
+ mIsProfileReady=true;
}
public void onServiceDisconnected(int profile) {
- mService = null;
+ if (V) Log.d(TAG,"Bluetooth service disconnected");
+ mIsProfileReady=false;
}
}
+ public boolean isProfileReady() {
+ return mIsProfileReady;
+ }
+
PanProfile(Context context) {
BluetoothAdapter adapter = BluetoothAdapter.getDefaultAdapter();
adapter.getProfileProxy(context, new PanServiceListener(),
@@ -71,6 +83,7 @@
}
public boolean connect(BluetoothDevice device) {
+ if (mService == null) return false;
List<BluetoothDevice> sinks = mService.getConnectedDevices();
if (sinks != null) {
for (BluetoothDevice sink : sinks) {
@@ -81,10 +94,14 @@
}
public boolean disconnect(BluetoothDevice device) {
+ if (mService == null) return false;
return mService.disconnect(device);
}
public int getConnectionStatus(BluetoothDevice device) {
+ if (mService == null) {
+ return BluetoothProfile.STATE_DISCONNECTED;
+ }
return mService.getConnectionState(device);
}
@@ -100,10 +117,6 @@
// ignore: isPreferred is always true for PAN
}
- public boolean isProfileReady() {
- return true;
- }
-
public String toString() {
return NAME;
}
@@ -121,7 +134,7 @@
}
public int getSummaryResourceForDevice(BluetoothDevice device) {
- int state = mService.getConnectionState(device);
+ int state = getConnectionStatus(device);
switch (state) {
case BluetoothProfile.STATE_DISCONNECTED:
return R.string.bluetooth_pan_profile_summary_use_for;
@@ -154,4 +167,16 @@
return false;
}
}
+
+ protected void finalize() {
+ if (V) Log.d(TAG, "finalize()");
+ if (mService != null) {
+ try {
+ BluetoothAdapter.getDefaultAdapter().closeProfileProxy(BluetoothProfile.PAN, mService);
+ mService = null;
+ }catch (Throwable t) {
+ Log.w(TAG, "Error cleaning up PAN proxy", t);
+ }
+ }
+ }
}
diff --git a/src/com/android/settings/bluetooth/RequestPermissionActivity.java b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
index 529312d..08c10fb 100644
--- a/src/com/android/settings/bluetooth/RequestPermissionActivity.java
+++ b/src/com/android/settings/bluetooth/RequestPermissionActivity.java
@@ -228,8 +228,12 @@
} else if (mLocalAdapter.setScanMode(
BluetoothAdapter.SCAN_MODE_CONNECTABLE_DISCOVERABLE, mTimeout)) {
// If already in discoverable mode, this will extend the timeout.
+ long endTime = System.currentTimeMillis() + (long) mTimeout * 1000;
LocalBluetoothPreferences.persistDiscoverableEndTimestamp(
- this, System.currentTimeMillis() + (long) mTimeout * 1000);
+ this, endTime);
+ if (0 < mTimeout) {
+ BluetoothDiscoverableTimeoutReceiver.setDiscoverableAlarm(this, endTime);
+ }
returnCode = mTimeout;
// Activity.RESULT_FIRST_USER should be 1
if (returnCode < RESULT_FIRST_USER) {
diff --git a/src/com/android/settings/deviceinfo/PercentageBarChart.java b/src/com/android/settings/deviceinfo/PercentageBarChart.java
index 95973c4..b45eb69 100644
--- a/src/com/android/settings/deviceinfo/PercentageBarChart.java
+++ b/src/com/android/settings/deviceinfo/PercentageBarChart.java
@@ -71,29 +71,56 @@
final int width = right - left;
- float lastX = left;
+ final boolean isLayoutRtl = isLayoutRtl();
+ if (isLayoutRtl) {
+ float nextX = right;
- if (mEntries != null) {
- for (final Entry e : mEntries) {
- final float entryWidth;
- if (e.percentage == 0.0f) {
- entryWidth = 0.0f;
- } else {
- entryWidth = Math.max(mMinTickWidth, width * e.percentage);
+ if (mEntries != null) {
+ for (final Entry e : mEntries) {
+ final float entryWidth;
+ if (e.percentage == 0.0f) {
+ entryWidth = 0.0f;
+ } else {
+ entryWidth = Math.max(mMinTickWidth, width * e.percentage);
+ }
+
+ final float lastX = nextX - entryWidth;
+ if (lastX < left) {
+ canvas.drawRect(left, top, nextX, bottom, e.paint);
+ return;
+ }
+
+ canvas.drawRect(lastX, top, nextX, bottom, e.paint);
+ nextX = lastX;
}
-
- final float nextX = lastX + entryWidth;
- if (nextX > right) {
- canvas.drawRect(lastX, top, right, bottom, e.paint);
- return;
- }
-
- canvas.drawRect(lastX, top, nextX, bottom, e.paint);
- lastX = nextX;
}
- }
- canvas.drawRect(lastX, top, right, bottom, mEmptyPaint);
+ canvas.drawRect(left, top, nextX, bottom, mEmptyPaint);
+ } else {
+ float lastX = left;
+
+ if (mEntries != null) {
+ for (final Entry e : mEntries) {
+ final float entryWidth;
+ if (e.percentage == 0.0f) {
+ entryWidth = 0.0f;
+ } else {
+ entryWidth = Math.max(mMinTickWidth, width * e.percentage);
+ }
+
+ final float nextX = lastX + entryWidth;
+ if (nextX > right) {
+ canvas.drawRect(lastX, top, right, bottom, e.paint);
+ return;
+ }
+
+ canvas.drawRect(lastX, top, nextX, bottom, e.paint);
+ lastX = nextX;
+ }
+ }
+
+ canvas.drawRect(lastX, top, right, bottom, mEmptyPaint);
+ }
}
/**
diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
index fa2b02d..ab2c891 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -436,6 +436,7 @@
final int NU = uidStats.size();
for (int iu = 0; iu < NU; iu++) {
Uid u = uidStats.valueAt(iu);
+ double p;
double power = 0;
double highestDrain = 0;
String packageWithHighestDrain = null;
@@ -445,11 +446,11 @@
long cpuFgTime = 0;
long wakelockTime = 0;
long gpsTime = 0;
+ if (DEBUG) Log.i(TAG, "UID " + u.getUid());
if (processStats.size() > 0) {
// Process CPU time
for (Map.Entry<String, ? extends BatteryStats.Uid.Proc> ent
: processStats.entrySet()) {
- if (DEBUG) Log.i(TAG, "Process name = " + ent.getKey());
Uid.Proc ps = ent.getValue();
final long userTime = ps.getUserTime(which);
final long systemTime = ps.getSystemTime(which);
@@ -470,6 +471,10 @@
processPower += ratio * tmpCpuTime * powerCpuNormal[step];
}
cpuTime += tmpCpuTime;
+ if (DEBUG && processPower != 0) {
+ Log.i(TAG, String.format("process %s, cpu power=%.2f",
+ ent.getKey(), processPower / 1000));
+ }
power += processPower;
if (packageWithHighestDrain == null
|| packageWithHighestDrain.startsWith("*")) {
@@ -481,8 +486,6 @@
packageWithHighestDrain = ent.getKey();
}
}
- if (DEBUG) Log.i(TAG, "Max drain of " + highestDrain
- + " by " + packageWithHighestDrain);
}
if (cpuFgTime > cpuTime) {
if (DEBUG && cpuFgTime > cpuTime + 10000) {
@@ -491,6 +494,7 @@
cpuTime = cpuFgTime; // Statistics may not have been gathered yet.
}
power /= 1000;
+ if (DEBUG && power != 0) Log.i(TAG, String.format("total cpu power=%.2f", power));
// Process wake lock usage
Map<String, ? extends BatteryStats.Uid.Wakelock> wakelockStats = u.getWakelockStats();
@@ -508,19 +512,32 @@
appWakelockTime += wakelockTime;
// Add cost of holding a wake lock
- power += (wakelockTime
+ p = (wakelockTime
* mPowerProfile.getAveragePower(PowerProfile.POWER_CPU_AWAKE)) / 1000;
+ power += p;
+ if (DEBUG && p != 0) Log.i(TAG, String.format("wakelock power=%.2f", p));
// Add cost of data traffic
long tcpBytesReceived = u.getTcpBytesReceived(mStatsType);
long tcpBytesSent = u.getTcpBytesSent(mStatsType);
- power += (tcpBytesReceived+tcpBytesSent) * averageCostPerByte;
+ p = (tcpBytesReceived+tcpBytesSent) * averageCostPerByte;
+ power += p;
+ if (DEBUG && p != 0) Log.i(TAG, String.format("tcp power=%.2f", p));
// Add cost of keeping WIFI running.
long wifiRunningTimeMs = u.getWifiRunningTime(uSecTime, which) / 1000;
mAppWifiRunning += wifiRunningTimeMs;
- power += (wifiRunningTimeMs
+ p = (wifiRunningTimeMs
* mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_ON)) / 1000;
+ power += p;
+ if (DEBUG && p != 0) Log.i(TAG, String.format("wifi running power=%.2f", p));
+
+ // Add cost of WIFI scans
+ long wifiScanTimeMs = u.getWifiScanTime(uSecTime, which) / 1000;
+ p = (wifiScanTimeMs
+ * mPowerProfile.getAveragePower(PowerProfile.POWER_WIFI_SCAN)) / 1000;
+ power += p;
+ if (DEBUG && p != 0) Log.i(TAG, String.format("wifi scanning power=%.2f", p));
// Process Sensor usage
Map<Integer, ? extends BatteryStats.Uid.Sensor> sensorStats = u.getSensorStats();
@@ -541,16 +558,16 @@
sensorManager.getDefaultSensor(sensorType);
if (sensorData != null) {
multiplier = sensorData.getPower();
- if (DEBUG) {
- Log.i(TAG, "Got sensor " + sensorData.getName() + " with power = "
- + multiplier);
- }
}
}
- power += (multiplier * sensorTime) / 1000;
+ p = (multiplier * sensorTime) / 1000;
+ power += p;
+ if (DEBUG && p != 0) {
+ Log.i(TAG, String.format("sensor %s power=%.2f", sensor.toString(), p));
+ }
}
- if (DEBUG) Log.i(TAG, "UID " + u.getUid() + ": power=" + power);
+ if (DEBUG) Log.i(TAG, String.format("UID %d total power=%.2f", u.getUid(), power));
// Add the app to the list if it is consuming power
if (power != 0 || u.getUid() == 0) {
@@ -583,7 +600,6 @@
if (power > mMaxPower) mMaxPower = power;
mTotalPower += power;
}
- if (DEBUG) Log.i(TAG, "Added power = " + power);
}
// The device has probably been awake for longer than the screen on
diff --git a/src/com/android/settings/nfc/AndroidBeam.java b/src/com/android/settings/nfc/AndroidBeam.java
index a6bd037..bf02c13 100644
--- a/src/com/android/settings/nfc/AndroidBeam.java
+++ b/src/com/android/settings/nfc/AndroidBeam.java
@@ -58,7 +58,7 @@
activity.getActionBar().setCustomView(mActionBarSwitch, new ActionBar.LayoutParams(
ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT,
- Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+ Gravity.CENTER_VERTICAL | Gravity.END));
activity.getActionBar().setTitle(R.string.android_beam_settings_title);
}
}
diff --git a/src/com/android/settings/tts/TtsEnginePreference.java b/src/com/android/settings/tts/TtsEnginePreference.java
index 196882f..3d612f0 100644
--- a/src/com/android/settings/tts/TtsEnginePreference.java
+++ b/src/com/android/settings/tts/TtsEnginePreference.java
@@ -16,8 +16,6 @@
package com.android.settings.tts;
-import com.android.settings.R;
-
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
@@ -31,6 +29,9 @@
import android.widget.RadioButton;
+import com.android.settings.R;
+
+
public class TtsEnginePreference extends Preference {
/**
@@ -173,7 +174,8 @@
}
private void onRadioButtonClicked(CompoundButton buttonView, boolean isChecked) {
- if (mPreventRadioButtonCallbacks) {
+ if (mPreventRadioButtonCallbacks ||
+ (mSharedState.getCurrentChecked() == buttonView)) {
return;
}
diff --git a/src/com/android/settings/tts/TtsEngineSettingsFragment.java b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
index fcc2f2e..267b8e1 100644
--- a/src/com/android/settings/tts/TtsEngineSettingsFragment.java
+++ b/src/com/android/settings/tts/TtsEngineSettingsFragment.java
@@ -16,11 +16,11 @@
package com.android.settings.tts;
-import com.android.settings.R;
-import com.android.settings.SettingsPreferenceFragment;
-
import android.content.ActivityNotFoundException;
+import android.content.BroadcastReceiver;
+import android.content.Context;
import android.content.Intent;
+import android.content.IntentFilter;
import android.os.Bundle;
import android.preference.ListPreference;
import android.preference.Preference;
@@ -32,6 +32,9 @@
import android.text.TextUtils;
import android.util.Log;
+import com.android.settings.R;
+import com.android.settings.SettingsPreferenceFragment;
+
import java.util.ArrayList;
import java.util.Locale;
@@ -45,11 +48,14 @@
private static final String KEY_ENGINE_SETTINGS = "tts_engine_settings";
private static final String KEY_INSTALL_DATA = "tts_install_data";
+ private static final int VOICE_DATA_INTEGRITY_CHECK = 1977;
+
private TtsEngines mEnginesHelper;
private ListPreference mLocalePreference;
private Preference mEngineSettingsPreference;
private Preference mInstallVoicesPreference;
private Intent mEngineSettingsIntent;
+ private Intent mVoiceDataDetails;
private TextToSpeech mTts;
@@ -63,13 +69,22 @@
@Override
public void run() {
mLocalePreference.setEnabled(true);
- updateVoiceDetails();
}
});
}
}
};
+ private final BroadcastReceiver mLanguagesChangedReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ // Installed or uninstalled some data packs
+ if (TextToSpeech.Engine.ACTION_TTS_DATA_INSTALLED.equals(intent.getAction())) {
+ checkTtsData();
+ }
+ }
+ };
+
public TtsEngineSettingsFragment() {
super();
}
@@ -103,23 +118,53 @@
mInstallVoicesPreference.setEnabled(false);
mLocalePreference.setEnabled(false);
+
+ mVoiceDataDetails = getArguments().getParcelable(TtsEnginePreference.FRAGMENT_ARGS_VOICES);
+
+ updateVoiceDetails();
+
mTts = new TextToSpeech(getActivity().getApplicationContext(), mTtsInitListener,
getEngineName());
+
+ // Check if data packs changed
+ checkTtsData();
+
+ getActivity().registerReceiver(mLanguagesChangedReceiver,
+ new IntentFilter(TextToSpeech.Engine.ACTION_TTS_DATA_INSTALLED));
}
@Override
public void onDestroy() {
+ getActivity().unregisterReceiver(mLanguagesChangedReceiver);
mTts.shutdown();
super.onDestroy();
}
+ private final void checkTtsData() {
+ Intent intent = new Intent(TextToSpeech.Engine.ACTION_CHECK_TTS_DATA);
+ intent.setPackage(getEngineName());
+ try {
+ if (DBG) Log.d(TAG, "Updating engine: Checking voice data: " + intent.toUri(0));
+ startActivityForResult(intent, VOICE_DATA_INTEGRITY_CHECK);
+ } catch (ActivityNotFoundException ex) {
+ Log.e(TAG, "Failed to check TTS data, no activity found for " + intent + ")");
+ }
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (requestCode == VOICE_DATA_INTEGRITY_CHECK) {
+ mVoiceDataDetails = data;
+ updateVoiceDetails();
+ }
+ }
+
private void updateVoiceDetails() {
- final Intent voiceDataDetails = getArguments().getParcelable(
- TtsEnginePreference.FRAGMENT_ARGS_VOICES);
- if (DBG) Log.d(TAG, "Parsing voice data details, data: " + voiceDataDetails.toUri(0));
- ArrayList<String> available = voiceDataDetails.getStringArrayListExtra(
+ if (DBG) Log.d(TAG, "Parsing voice data details, data: " + mVoiceDataDetails.toUri(0));
+
+ final ArrayList<String> available = mVoiceDataDetails.getStringArrayListExtra(
TextToSpeech.Engine.EXTRA_AVAILABLE_VOICES);
- ArrayList<String> unavailable = voiceDataDetails.getStringArrayListExtra(
+ final ArrayList<String> unavailable = mVoiceDataDetails.getStringArrayListExtra(
TextToSpeech.Engine.EXTRA_UNAVAILABLE_VOICES);
if (available == null){
diff --git a/src/com/android/settings/users/UserDetailsSettings.java b/src/com/android/settings/users/UserDetailsSettings.java
index 84cabe9..2a8c29c 100644
--- a/src/com/android/settings/users/UserDetailsSettings.java
+++ b/src/com/android/settings/users/UserDetailsSettings.java
@@ -16,6 +16,7 @@
package com.android.settings.users;
+import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
@@ -26,12 +27,14 @@
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.content.pm.UserInfo;
+import android.graphics.Bitmap;
+import android.graphics.Bitmap.CompressFormat;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
+import android.os.ParcelFileDescriptor;
import android.os.RemoteException;
import android.os.ServiceManager;
-import android.os.SystemProperties;
import android.preference.CheckBoxPreference;
import android.preference.EditTextPreference;
import android.preference.Preference;
@@ -50,7 +53,8 @@
import java.util.List;
public class UserDetailsSettings extends SettingsPreferenceFragment
- implements Preference.OnPreferenceChangeListener, DialogCreatable {
+ implements Preference.OnPreferenceChangeListener, DialogCreatable,
+ Preference.OnPreferenceClickListener {
private static final String TAG = "UserDetailsSettings";
@@ -58,15 +62,16 @@
private static final int DIALOG_CONFIRM_REMOVE = 1;
private static final String KEY_USER_NAME = "user_name";
+ private static final String KEY_USER_PICTURE = "user_picture";
private static final String KEY_INSTALLED_APPS = "market_apps_category";
private static final String KEY_SYSTEM_APPS = "system_apps_category";
+ private static final String KEY_ACCOUNT = "associated_account";
+ private static final String KEY_RESTRICTIONS = "restrictions_category";
+
public static final String EXTRA_USER_ID = "user_id";
- private static final String[] SYSTEM_APPS = {
- "com.google.android.browser",
- "com.google.android.gm",
- "com.google.android.youtube"
- };
+ private static final int RESULT_PICK_IMAGE = 1;
+ private static final int RESULT_CROP_IMAGE = 2;
static class AppState {
boolean dirty;
@@ -81,6 +86,8 @@
private PreferenceGroup mSystemAppGroup;
private PreferenceGroup mInstalledAppGroup;
private EditTextPreference mNamePref;
+ private Preference mPicturePref;
+ private Preference mAccountPref;
private IPackageManager mIPm;
private PackageManager mPm;
@@ -106,7 +113,16 @@
mInstalledAppGroup = (PreferenceGroup) findPreference(KEY_INSTALLED_APPS);
mNamePref = (EditTextPreference) findPreference(KEY_USER_NAME);
mNamePref.setOnPreferenceChangeListener(this);
+ mPicturePref = findPreference(KEY_USER_PICTURE);
+ mPicturePref.setOnPreferenceClickListener(this);
+ mAccountPref = findPreference(KEY_ACCOUNT);
+ mAccountPref.setOnPreferenceClickListener(this);
+ if (mUserId == 0) {
+ getPreferenceScreen().removePreference(mSystemAppGroup);
+ getPreferenceScreen().removePreference(mInstalledAppGroup);
+ getPreferenceScreen().removePreference(findPreference(KEY_RESTRICTIONS));
+ }
setHasOptionsMenu(true);
}
@@ -114,7 +130,7 @@
public void onResume() {
super.onResume();
mPm = getActivity().getPackageManager();
- if (mUserId > 0) {
+ if (mUserId >= 0) {
initExistingUser();
} else {
initNewUser();
@@ -124,6 +140,9 @@
@Override
public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+ if (mUserId == 0) {
+ return;
+ }
MenuItem addAccountItem = menu.add(0, MENU_REMOVE_USER, 0,
mNewUser ? R.string.user_discard_user_menu : R.string.user_remove_user_menu);
addAccountItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM
@@ -153,6 +172,9 @@
if (foundUser != null) {
mNamePref.setSummary(foundUser.name);
mNamePref.setText(foundUser.name);
+ if (foundUser.iconPath != null) {
+ setPhotoId(foundUser.iconPath);
+ }
}
}
@@ -200,6 +222,7 @@
}
private void refreshApps() {
+ if (mUserId == 0) return;
mSystemAppGroup.removeAll();
mInstalledAppGroup.removeAll();
@@ -254,7 +277,7 @@
return false;
}
try {
- mIPm.updateUserName(mUserId, (String) newValue);
+ mIPm.setUserName(mUserId, (String) newValue);
mNamePref.setSummary((String) newValue);
} catch (RemoteException re) {
return false;
@@ -282,4 +305,72 @@
return null;
}
}
+
+ @Override
+ public boolean onPreferenceClick(Preference preference) {
+ if (preference == mAccountPref) {
+// Intent launch = AccountManager.newChooseAccountsIntent(null, null, new String[]{"com.google"}, false, null,
+// null, null, null);
+ } else if (preference == mPicturePref) {
+ Intent intent = new Intent();
+ intent.setType("image/*");
+ intent.setAction(Intent.ACTION_GET_CONTENT);
+
+ startActivityForResult(intent, RESULT_PICK_IMAGE);
+ }
+ return false;
+ }
+
+ @Override
+ public void onActivityResult(int requestCode, int resultCode, Intent data) {
+ if (resultCode != Activity.RESULT_OK) {
+ return;
+ }
+ switch (requestCode) {
+ case RESULT_PICK_IMAGE:
+ if (data.getData() != null) {
+ Uri imageUri = data.getData();
+ System.err.println("imageUri = " + imageUri);
+ cropImage(imageUri);
+ }
+ break;
+ case RESULT_CROP_IMAGE:
+ saveCroppedImage(data);
+ break;
+ }
+ }
+
+ private void cropImage(Uri imageUri) {
+ final Uri inputPhotoUri = imageUri;
+ Intent intent = new Intent("com.android.camera.action.CROP");
+ intent.setDataAndType(inputPhotoUri, "image/*");
+ intent.putExtra("crop", "true");
+ intent.putExtra("aspectX", 1);
+ intent.putExtra("aspectY", 1);
+ intent.putExtra("outputX", 96);
+ intent.putExtra("outputY", 96);
+ intent.putExtra("return-data", true);
+ startActivityForResult(intent, RESULT_CROP_IMAGE);
+ }
+
+ private void saveCroppedImage(Intent data) {
+ try {
+ if (data.hasExtra("data")) {
+ Bitmap bitmap = (Bitmap) data.getParcelableExtra("data");
+ ParcelFileDescriptor fd = mIPm.setUserIcon(mUserId);
+ if (fd != null) {
+ bitmap.compress(CompressFormat.PNG, 100,
+ new ParcelFileDescriptor.AutoCloseOutputStream(fd));
+ setPhotoId(mPm.getUser(mUserId).iconPath);
+ }
+ }
+ } catch (RemoteException re) {
+ }
+ }
+
+ private void setPhotoId(String realPath) {
+ Drawable d = Drawable.createFromPath(realPath);
+ if (d == null) return;
+ mPicturePref.setIcon(d);
+ }
}
diff --git a/src/com/android/settings/users/UserSettings.java b/src/com/android/settings/users/UserSettings.java
index 9380586..d32cb45 100644
--- a/src/com/android/settings/users/UserSettings.java
+++ b/src/com/android/settings/users/UserSettings.java
@@ -17,6 +17,7 @@
package com.android.settings.users;
import android.content.pm.UserInfo;
+import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceClickListener;
@@ -83,15 +84,23 @@
mUserListCategory.removeAll();
for (UserInfo user : users) {
- if (user.id == 0) continue;
Preference pref = new Preference(getActivity());
pref.setTitle(user.name);
pref.setOnPreferenceClickListener(this);
pref.setKey("id=" + user.id);
+ if (user.iconPath != null) {
+ setPhotoId(pref, user.iconPath);
+ }
mUserListCategory.addPreference(pref);
}
}
+ private void setPhotoId(Preference pref, String realPath) {
+ Drawable d = Drawable.createFromPath(realPath);
+ if (d == null) return;
+ pref.setIcon(d);
+ }
+
@Override
public boolean onPreferenceClick(Preference pref) {
String sid = pref.getKey();
diff --git a/src/com/android/settings/vpn2/VpnDialog.java b/src/com/android/settings/vpn2/VpnDialog.java
index ca85d99..9ef269b 100644
--- a/src/com/android/settings/vpn2/VpnDialog.java
+++ b/src/com/android/settings/vpn2/VpnDialog.java
@@ -16,6 +16,7 @@
package com.android.settings.vpn2;
+import com.android.internal.net.VpnProfile;
import com.android.settings.R;
import android.app.AlertDialog;
diff --git a/src/com/android/settings/vpn2/VpnProfile.java b/src/com/android/settings/vpn2/VpnProfile.java
deleted file mode 100644
index d4d0e79..0000000
--- a/src/com/android/settings/vpn2/VpnProfile.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2011 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.vpn2;
-
-import java.nio.charset.Charsets;
-
-/**
- * Parcel-like entity class for VPN profiles. To keep things simple, all
- * fields are package private. Methods are provided for serialization, so
- * storage can be implemented easily. Two rules are set for this class.
- * First, all fields must be kept non-null. Second, always make a copy
- * using clone() before modifying.
- */
-class VpnProfile implements Cloneable {
- // Match these constants with R.array.vpn_types.
- static final int TYPE_PPTP = 0;
- static final int TYPE_L2TP_IPSEC_PSK = 1;
- static final int TYPE_L2TP_IPSEC_RSA = 2;
- static final int TYPE_IPSEC_XAUTH_PSK = 3;
- static final int TYPE_IPSEC_XAUTH_RSA = 4;
- static final int TYPE_IPSEC_HYBRID_RSA = 5;
- static final int TYPE_MAX = 5;
-
- // Entity fields.
- final String key; // -1
- String name = ""; // 0
- int type = TYPE_PPTP; // 1
- String server = ""; // 2
- String username = ""; // 3
- String password = ""; // 4
- String dnsServers = ""; // 5
- String searchDomains = ""; // 6
- String routes = ""; // 7
- boolean mppe = true; // 8
- String l2tpSecret = ""; // 9
- String ipsecIdentifier = "";// 10
- String ipsecSecret = ""; // 11
- String ipsecUserCert = ""; // 12
- String ipsecCaCert = ""; // 13
- String ipsecServerCert = "";// 14
-
- // Helper fields.
- boolean saveLogin = false;
-
- VpnProfile(String key) {
- this.key = key;
- }
-
- static VpnProfile decode(String key, byte[] value) {
- try {
- if (key == null) {
- return null;
- }
-
- String[] values = new String(value, Charsets.UTF_8).split("\0", -1);
- // There can be 14 or 15 values in ICS MR1.
- if (values.length < 14 || values.length > 15) {
- return null;
- }
-
- VpnProfile profile = new VpnProfile(key);
- profile.name = values[0];
- profile.type = Integer.valueOf(values[1]);
- if (profile.type < 0 || profile.type > TYPE_MAX) {
- return null;
- }
- profile.server = values[2];
- profile.username = values[3];
- profile.password = values[4];
- profile.dnsServers = values[5];
- profile.searchDomains = values[6];
- profile.routes = values[7];
- profile.mppe = Boolean.valueOf(values[8]);
- profile.l2tpSecret = values[9];
- profile.ipsecIdentifier = values[10];
- profile.ipsecSecret = values[11];
- profile.ipsecUserCert = values[12];
- profile.ipsecCaCert = values[13];
- profile.ipsecServerCert = (values.length > 14) ? values[14] : "";
-
- profile.saveLogin = !profile.username.isEmpty() || !profile.password.isEmpty();
- return profile;
- } catch (Exception e) {
- // ignore
- }
- return null;
- }
-
- byte[] encode() {
- StringBuilder builder = new StringBuilder(name);
- builder.append('\0').append(type);
- builder.append('\0').append(server);
- builder.append('\0').append(saveLogin ? username : "");
- builder.append('\0').append(saveLogin ? password : "");
- builder.append('\0').append(dnsServers);
- builder.append('\0').append(searchDomains);
- builder.append('\0').append(routes);
- builder.append('\0').append(mppe);
- builder.append('\0').append(l2tpSecret);
- builder.append('\0').append(ipsecIdentifier);
- builder.append('\0').append(ipsecSecret);
- builder.append('\0').append(ipsecUserCert);
- builder.append('\0').append(ipsecCaCert);
- builder.append('\0').append(ipsecServerCert);
- return builder.toString().getBytes(Charsets.UTF_8);
- }
-}
diff --git a/src/com/android/settings/vpn2/VpnSettings.java b/src/com/android/settings/vpn2/VpnSettings.java
index a26623b..a8cb35d 100644
--- a/src/com/android/settings/vpn2/VpnSettings.java
+++ b/src/com/android/settings/vpn2/VpnSettings.java
@@ -42,6 +42,7 @@
import com.android.internal.net.LegacyVpnInfo;
import com.android.internal.net.VpnConfig;
+import com.android.internal.net.VpnProfile;
import com.android.settings.SettingsPreferenceFragment;
import java.net.Inet4Address;
diff --git a/src/com/android/settings/widget/ChartView.java b/src/com/android/settings/widget/ChartView.java
index f410d57..6441612 100644
--- a/src/com/android/settings/widget/ChartView.java
+++ b/src/com/android/settings/widget/ChartView.java
@@ -38,7 +38,7 @@
public class ChartView extends FrameLayout {
// TODO: extend something that supports two-dimensional scrolling
- private static final int SWEEP_GRAVITY = Gravity.TOP | Gravity.LEFT;
+ private static final int SWEEP_GRAVITY = Gravity.TOP | Gravity.START;
ChartAxis mHoriz;
ChartAxis mVert;
diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index de42f2a..a4ee589 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -114,7 +114,6 @@
private final Scanner mScanner;
private WifiManager mWifiManager;
- private WifiManager.Channel mChannel;
private WifiManager.ActionListener mConnectListener;
private WifiManager.ActionListener mSaveListener;
private WifiManager.ActionListener mForgetListener;
@@ -243,7 +242,6 @@
mP2pSupported = getPackageManager().hasSystemFeature(PackageManager.FEATURE_WIFI_DIRECT);
mWifiManager = (WifiManager) getSystemService(Context.WIFI_SERVICE);
- mChannel = mWifiManager.initialize(getActivity(), getActivity().getMainLooper(), null);
mConnectListener = new WifiManager.ActionListener() {
public void onSuccess() {
@@ -344,7 +342,7 @@
activity.getActionBar().setCustomView(actionBarSwitch, new ActionBar.LayoutParams(
ActionBar.LayoutParams.WRAP_CONTENT,
ActionBar.LayoutParams.WRAP_CONTENT,
- Gravity.CENTER_VERTICAL | Gravity.RIGHT));
+ Gravity.CENTER_VERTICAL | Gravity.END));
}
}
@@ -373,7 +371,7 @@
getActivity().registerReceiver(mReceiver, mFilter);
if (mKeyStoreNetworkId != INVALID_NETWORK_ID &&
KeyStore.getInstance().state() == KeyStore.State.UNLOCKED) {
- mWifiManager.connect(mChannel, mKeyStoreNetworkId, mConnectListener);
+ mWifiManager.connect(mKeyStoreNetworkId, mConnectListener);
}
mKeyStoreNetworkId = INVALID_NETWORK_ID;
@@ -520,13 +518,13 @@
case MENU_ID_CONNECT: {
if (mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
if (!requireKeyStore(mSelectedAccessPoint.getConfig())) {
- mWifiManager.connect(mChannel, mSelectedAccessPoint.networkId,
+ mWifiManager.connect(mSelectedAccessPoint.networkId,
mConnectListener);
}
} else if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE) {
/** Bypass dialog for unsecured networks */
mSelectedAccessPoint.generateOpenNetworkConfig();
- mWifiManager.connect(mChannel, mSelectedAccessPoint.getConfig(),
+ mWifiManager.connect(mSelectedAccessPoint.getConfig(),
mConnectListener);
} else {
showDialog(mSelectedAccessPoint, true);
@@ -534,7 +532,7 @@
return true;
}
case MENU_ID_FORGET: {
- mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener);
+ mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
return true;
}
case MENU_ID_MODIFY: {
@@ -553,7 +551,7 @@
if (mSelectedAccessPoint.security == AccessPoint.SECURITY_NONE &&
mSelectedAccessPoint.networkId == INVALID_NETWORK_ID) {
mSelectedAccessPoint.generateOpenNetworkConfig();
- mWifiManager.connect(mChannel, mSelectedAccessPoint.getConfig(), mConnectListener);
+ mWifiManager.connect(mSelectedAccessPoint.getConfig(), mConnectListener);
} else {
showDialog(mSelectedAccessPoint, false);
}
@@ -863,18 +861,18 @@
if (mSelectedAccessPoint != null
&& !requireKeyStore(mSelectedAccessPoint.getConfig())
&& mSelectedAccessPoint.networkId != INVALID_NETWORK_ID) {
- mWifiManager.connect(mChannel, mSelectedAccessPoint.networkId,
+ mWifiManager.connect(mSelectedAccessPoint.networkId,
mConnectListener);
}
} else if (config.networkId != INVALID_NETWORK_ID) {
if (mSelectedAccessPoint != null) {
- mWifiManager.save(mChannel, config, mSaveListener);
+ mWifiManager.save(config, mSaveListener);
}
} else {
if (configController.isEdit() || requireKeyStore(config)) {
- mWifiManager.save(mChannel, config, mSaveListener);
+ mWifiManager.save(config, mSaveListener);
} else {
- mWifiManager.connect(mChannel, config, mConnectListener);
+ mWifiManager.connect(config, mConnectListener);
}
}
@@ -891,7 +889,7 @@
return;
}
- mWifiManager.forget(mChannel, mSelectedAccessPoint.networkId, mForgetListener);
+ mWifiManager.forget(mSelectedAccessPoint.networkId, mForgetListener);
if (mWifiManager.isWifiEnabled()) {
mScanner.resume();
diff --git a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
index 8258b55..bc387cb 100644
--- a/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
+++ b/src/com/android/settings/wifi/WifiSettingsForSetupWizardXL.java
@@ -38,7 +38,6 @@
import android.widget.ProgressBar;
import android.widget.TextView;
-import com.android.internal.util.AsyncChannel;
import com.android.settings.R;
import java.util.Collection;
@@ -74,7 +73,6 @@
private WifiSettings mWifiSettings;
private WifiManager mWifiManager;
- private WifiManager.Channel mChannel;
/** Used for resizing a padding above title. Hiden when software keyboard is shown. */
private View mTopPadding;
@@ -143,7 +141,6 @@
setContentView(R.layout.wifi_settings_for_setup_wizard_xl);
mWifiManager = (WifiManager)getSystemService(Context.WIFI_SERVICE);
- mChannel = mWifiManager.initialize(this, getMainLooper(), null);
// There's no button here enabling wifi network, so we need to enable it without
// users' request.
mWifiManager.setWifiEnabled(true);
@@ -596,7 +593,7 @@
Log.d(TAG, String.format("forgeting Wi-Fi network \"%s\" (id: %d)",
config.SSID, config.networkId));
}
- mWifiManager.forget(mChannel, config.networkId, new WifiManager.ActionListener() {
+ mWifiManager.forget(config.networkId, new WifiManager.ActionListener() {
public void onSuccess() {
}
public void onFailure(int reason) {
@@ -761,7 +758,7 @@
*/
/* package */ void onSaveNetwork(WifiConfiguration config) {
// We want to both save and connect a network. connectNetwork() does both.
- mWifiManager.connect(mChannel, config, new WifiManager.ActionListener() {
+ mWifiManager.connect(config, new WifiManager.ActionListener() {
public void onSuccess() {
}
public void onFailure(int reason) {
diff --git a/src/com/android/settings/wifi/WpsDialog.java b/src/com/android/settings/wifi/WpsDialog.java
index 40b2a35..b5b48ba 100644
--- a/src/com/android/settings/wifi/WpsDialog.java
+++ b/src/com/android/settings/wifi/WpsDialog.java
@@ -56,7 +56,6 @@
private static final int WPS_TIMEOUT_S = 120;
private WifiManager mWifiManager;
- private WifiManager.Channel mChannel;
private WifiManager.WpsListener mWpsListener;
private int mWpsSetup;
@@ -155,7 +154,6 @@
});
mWifiManager = (WifiManager) mContext.getSystemService(Context.WIFI_SERVICE);
- mChannel = mWifiManager.initialize(mContext, mContext.getMainLooper(), null);
setView(mView);
super.onCreate(savedInstanceState);
@@ -184,13 +182,13 @@
WpsInfo wpsConfig = new WpsInfo();
wpsConfig.setup = mWpsSetup;
- mWifiManager.startWps(mChannel, wpsConfig, mWpsListener);
+ mWifiManager.startWps(wpsConfig, mWpsListener);
}
@Override
protected void onStop() {
if (mDialogState != DialogState.WPS_COMPLETE) {
- mWifiManager.cancelWps(mChannel, null);
+ mWifiManager.cancelWps(null);
}
if (mReceiver != null) {
diff --git a/tests/res/values-fa/strings.xml b/tests/res/values-fa/strings.xml
index 1422446..d3a16b0 100644
--- a/tests/res/values-fa/strings.xml
+++ b/tests/res/values-fa/strings.xml
@@ -21,8 +21,8 @@
<string name="stop_scan" msgid="527546916633745779">"توقف اسکن"</string>
<string name="operator_hello" msgid="292208161864910159">"سلام اپراتور!"</string>
<string name="operator_settings_title" msgid="1410094511974808567">"اپراتور"</string>
- <string name="operator_settings_summary" msgid="5916597343019392258">"گیره اپراتور که جهت شروع فعالیت مورد نظر استفاده می شود"</string>
+ <string name="operator_settings_summary" msgid="5916597343019392258">"گیره اپراتور که جهت شروع فعالیت مورد نظر استفاده میشود"</string>
<string name="manufacturer_hello" msgid="7525744633645544137">"سلام سازنده!"</string>
<string name="manufacturer_settings_title" msgid="2503105049808838612">"سازنده"</string>
- <string name="manufacturer_settings_summary" msgid="766746044826063472">"گیره سازنده که می توان از آن برای شروع فعالیت دلخواه استفاده کرد"</string>
+ <string name="manufacturer_settings_summary" msgid="766746044826063472">"گیره سازنده که میتوان از آن برای شروع فعالیت دلخواه استفاده کرد"</string>
</resources>