From 95abf59af43bafe4922b8cc096b10b65440419b8 Mon Sep 17 00:00:00 2001 From: Ivan Chiang Date: Thu, 24 May 2018 17:52:49 +0800 Subject: [PATCH 01/24] Fix gray out previously connected device preference issue Count the dock devices in previously connected device controller. Fix: 80227045 Test: m -j SettingsRoboTests RunSettingsRoboTests Change-Id: I08d82ec715698ecf894a4a7cd0631c5f1de0f591 Merged-In: I08d82ec715698ecf894a4a7cd0631c5f1de0f591 --- ...ouslyConnectedDevicePreferenceController.java | 16 +++++++++++++--- ...yConnectedDevicePreferenceControllerTest.java | 6 ++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java index ba3ee1f1054..73c95ab4e38 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java @@ -21,26 +21,29 @@ import android.support.annotation.VisibleForTesting; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import android.util.Log; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater; +import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.core.BasePreferenceController; import com.android.settings.dashboard.DashboardFragment; - +import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import com.android.settingslib.utils.ThreadUtils; public class PreviouslyConnectedDevicePreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback { private Preference mPreference; private BluetoothDeviceUpdater mBluetoothDeviceUpdater; + private DockUpdater mSavedDockUpdater; private int mPreferenceSize; public PreviouslyConnectedDevicePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); + + mSavedDockUpdater = FeatureFactory.getFactory( + context).getDockUpdaterFeatureProvider().getSavedDockUpdater(context, this); } @Override @@ -62,12 +65,14 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc @Override public void onStart() { mBluetoothDeviceUpdater.registerCallback(); + mSavedDockUpdater.registerCallback(); updatePreferenceOnSizeChanged(); } @Override public void onStop() { mBluetoothDeviceUpdater.unregisterCallback(); + mSavedDockUpdater.unregisterCallback(); } public void init(DashboardFragment fragment) { @@ -92,6 +97,11 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc mBluetoothDeviceUpdater = bluetoothDeviceUpdater; } + @VisibleForTesting + void setSavedDockUpdater(DockUpdater savedDockUpdater) { + mSavedDockUpdater = savedDockUpdater; + } + @VisibleForTesting void setPreferenceSize(int size) { mPreferenceSize = size; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java index 444728a1c4c..d04b206c6dd 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java @@ -21,6 +21,7 @@ import android.content.pm.PackageManager; import android.support.v7.preference.Preference; import com.android.settings.bluetooth.BluetoothDeviceUpdater; +import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -46,6 +47,8 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { @Mock private BluetoothDeviceUpdater mBluetoothDeviceUpdater; @Mock + private DockUpdater mDockUpdater; + @Mock private PackageManager mPackageManager; private Context mContext; @@ -61,6 +64,7 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { mPreConnectedDeviceController = new PreviouslyConnectedDevicePreferenceController(mContext, KEY); mPreConnectedDeviceController.setBluetoothDeviceUpdater(mBluetoothDeviceUpdater); + mPreConnectedDeviceController.setSavedDockUpdater(mDockUpdater); mPreference = new Preference(mContext); mPreConnectedDeviceController.setPreference(mPreference); @@ -71,10 +75,12 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { // register the callback in onStart() mPreConnectedDeviceController.onStart(); verify(mBluetoothDeviceUpdater).registerCallback(); + verify(mDockUpdater).registerCallback(); // unregister the callback in onStop() mPreConnectedDeviceController.onStop(); verify(mBluetoothDeviceUpdater).unregisterCallback(); + verify(mDockUpdater).unregisterCallback(); } @Test -- GitLab From 0e1393ae8cac712bb56b51061a18885dae074038 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Thu, 7 Jun 2018 16:45:23 +0000 Subject: [PATCH 02/24] Delete obsolete activity alias for dev settings This activity alias is here since android 4.x for backward compatibility. We no longer need it, and keeping it will cause security issue. Change-Id: Ib7817fd7cf8c8e66ca50534a0387cdc5773f837b Merged-In: I3f985e7fe14bd290db73b8c46dd817591df02015 Fixes: 92497653 Test: manual --- AndroidManifest.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 25216db214f..796b4ddcfbf 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1932,15 +1932,6 @@ android:value="com.android.settings.print.PrintJobSettingsFragment" /> - - - - - -- GitLab From 59287d40d1f4668de1beadb684d34e8509edded3 Mon Sep 17 00:00:00 2001 From: ryanywlin Date: Fri, 8 Jun 2018 14:36:34 +0800 Subject: [PATCH 03/24] 2nd attempt handle BT is not supported on emulator Error handle before using LocalBluetoothManager in the onStart and onStop Bug: 80491267 Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest" -j42 Change-Id: I47f7d3b7cddc2fbbafb8fb5cf0fb6adb2d0d2d55 --- .../settings/sound/AudioSwitchPreferenceController.java | 8 ++++++++ .../sound/AudioOutputSwitchPreferenceControllerTest.java | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/com/android/settings/sound/AudioSwitchPreferenceController.java b/src/com/android/settings/sound/AudioSwitchPreferenceController.java index 67236608df8..11caf45fc77 100644 --- a/src/com/android/settings/sound/AudioSwitchPreferenceController.java +++ b/src/com/android/settings/sound/AudioSwitchPreferenceController.java @@ -170,12 +170,20 @@ public abstract class AudioSwitchPreferenceController extends BasePreferenceCont @Override public void onStart() { + if (mLocalBluetoothManager == null) { + Log.e(TAG, "Bluetooth is not supported on this device"); + return; + } mLocalBluetoothManager.setForegroundActivity(mContext); register(); } @Override public void onStop() { + if (mLocalBluetoothManager == null) { + Log.e(TAG, "Bluetooth is not supported on this device"); + return; + } mLocalBluetoothManager.setForegroundActivity(null); unregister(); } diff --git a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java index 1140aee98fb..bd11a159ba0 100644 --- a/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/sound/AudioOutputSwitchPreferenceControllerTest.java @@ -186,6 +186,8 @@ public class AudioOutputSwitchPreferenceControllerTest { AudioSwitchPreferenceController controller = new AudioSwitchPreferenceControllerTestable( mContext, TEST_KEY); + controller.onStart(); + controller.onStop(); assertThat(mLocalBluetoothManager).isNull(); } -- GitLab From 78f0f781fabe22f8dc8bdc61abc79aee41291524 Mon Sep 17 00:00:00 2001 From: Beverly Date: Fri, 8 Jun 2018 10:44:05 -0400 Subject: [PATCH 04/24] Fix typo Test: manual Bug: 109925028 Change-Id: I87ec517249567123df1a8eace17109ed7e0bae2b --- res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 22ae939225b..1b5f12571da 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -7421,7 +7421,7 @@ Messages, events & reminders - When Do Not Disturb is on, messages, reminders, and events will muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you. + When Do Not Disturb is on, messages, reminders, and events will be muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you. Done -- GitLab From 9ecf3e0c1110e6900f63a600e483f8925e366b4c Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 30 May 2018 09:50:52 -0700 Subject: [PATCH 05/24] Skip device index job if caller is not Settings app. Change-Id: I96184f111e83477b46ddf321ec74917bab330048 Fixes: 80437512 Fixes: 109713077 Test: robotests (cherry picked from commit 74ba1a51d74a4fb7fc2ccd62fd38087974c20020) --- .../search/DeviceIndexFeatureProvider.java | 30 +++++++++-- .../DeviceIndexFeatureProviderTest.java | 50 +++++++++++++------ 2 files changed, 60 insertions(+), 20 deletions(-) diff --git a/src/com/android/settings/search/DeviceIndexFeatureProvider.java b/src/com/android/settings/search/DeviceIndexFeatureProvider.java index c4d3abfcaa8..e6b3e937b85 100644 --- a/src/com/android/settings/search/DeviceIndexFeatureProvider.java +++ b/src/com/android/settings/search/DeviceIndexFeatureProvider.java @@ -21,7 +21,10 @@ import android.app.job.JobInfo; import android.app.job.JobScheduler; import android.content.ComponentName; import android.content.Context; +import android.content.pm.PackageManager; +import android.content.pm.ServiceInfo; import android.net.Uri; +import android.os.Binder; import android.os.Build; import android.provider.Settings; import android.text.TextUtils; @@ -36,7 +39,6 @@ import java.util.Locale; public interface DeviceIndexFeatureProvider { - String TAG = "DeviceIndex"; String INDEX_VERSION = "settings:index_version"; @@ -57,7 +59,7 @@ public interface DeviceIndexFeatureProvider { default void updateIndex(Context context, boolean force) { if (!isIndexingEnabled()) { - Log.w(TAG, "Skipping: device index is not enabled"); + Log.i(TAG, "Skipping: device index is not enabled"); return; } @@ -66,7 +68,29 @@ public interface DeviceIndexFeatureProvider { return; } + final ComponentName jobComponent = new ComponentName(context.getPackageName(), + DeviceIndexUpdateJobService.class.getName()); + + try { + final int callerUid = Binder.getCallingUid(); + final ServiceInfo si = context.getPackageManager().getServiceInfo(jobComponent, + PackageManager.MATCH_DIRECT_BOOT_AWARE + | PackageManager.MATCH_DIRECT_BOOT_UNAWARE); + if (si == null) { + Log.w(TAG, "Skipping: No such service " + jobComponent); + return; + } + if (si.applicationInfo.uid != callerUid) { + Log.w(TAG, "Skipping: Uid cannot schedule DeviceIndexUpdate: " + callerUid); + return; + } + } catch (PackageManager.NameNotFoundException e) { + Log.w(TAG, "Skipping: error finding DeviceIndexUpdateJobService from packageManager"); + return; + } + if (!force && skipIndex(context)) { + Log.i(TAG, "Skipping: already indexed."); // No need to update. return; } @@ -74,8 +98,6 @@ public interface DeviceIndexFeatureProvider { // Prevent scheduling multiple jobs setIndexState(context); - final ComponentName jobComponent = new ComponentName(context.getPackageName(), - DeviceIndexUpdateJobService.class.getName()); final int jobId = context.getResources().getInteger(R.integer.device_index_update); // Schedule a job so that we know it'll be able to complete, but try to run as // soon as possible. diff --git a/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java b/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java index ebba3f310ce..b49ef1d0683 100644 --- a/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java +++ b/tests/robotests/src/com/android/settings/search/DeviceIndexFeatureProviderTest.java @@ -15,7 +15,6 @@ package com.android.settings.search; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; @@ -23,27 +22,42 @@ import static org.mockito.Mockito.when; import android.app.Activity; import android.app.job.JobScheduler; +import android.os.Binder; import android.provider.Settings; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; +import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; +import org.robolectric.shadows.ShadowBinder; @RunWith(SettingsRobolectricTestRunner.class) public class DeviceIndexFeatureProviderTest { + @Mock + private JobScheduler mJobScheduler; private DeviceIndexFeatureProvider mProvider; private Activity mActivity; @Before public void setUp() { + MockitoAnnotations.initMocks(this); + ShadowBinder.reset(); FakeFeatureFactory.setupForTest(); mActivity = spy(Robolectric.buildActivity(Activity.class).create().visible().get()); mProvider = spy(new DeviceIndexFeatureProviderImpl()); + when(mActivity.getSystemService(JobScheduler.class)).thenReturn(mJobScheduler); + } + + @After + public void tearDown() { + ShadowBinder.reset(); } @Test @@ -51,7 +65,7 @@ public class DeviceIndexFeatureProviderTest { when(mProvider.isIndexingEnabled()).thenReturn(false); mProvider.updateIndex(mActivity, false); - verify(mProvider, never()).index(any(), any(), any(), any(), any()); + verify(mJobScheduler, never()).schedule(any()); } @Test @@ -62,19 +76,17 @@ public class DeviceIndexFeatureProviderTest { mProvider.updateIndex(mActivity, false); - verify(mProvider, never()).index(any(), any(), any(), any(), any()); + verify(mJobScheduler, never()).schedule(any()); } @Test public void updateIndex_enabled_provisioned_shouldIndex() { Settings.Global.putInt(mActivity.getContentResolver(), Settings.Global.DEVICE_PROVISIONED, 1); - JobScheduler jobScheduler = mock(JobScheduler.class); when(mProvider.isIndexingEnabled()).thenReturn(true); - when(mActivity.getSystemService(JobScheduler.class)).thenReturn(jobScheduler); mProvider.updateIndex(mActivity, false); - verify(jobScheduler).schedule(any()); + verify(mJobScheduler).schedule(any()); } @Test @@ -87,12 +99,22 @@ public class DeviceIndexFeatureProviderTest { Settings.Global.putString(mActivity.getContentResolver(), DeviceIndexFeatureProvider.LANGUAGE.toString(), DeviceIndexFeatureProvider.INDEX_LANGUAGE); - JobScheduler jobScheduler = mock(JobScheduler.class); when(mProvider.isIndexingEnabled()).thenReturn(true); - when(mActivity.getSystemService(JobScheduler.class)).thenReturn(jobScheduler); mProvider.updateIndex(mActivity, false); - verify(jobScheduler).schedule(any()); + verify(mJobScheduler).schedule(any()); + } + + @Test + public void updateIndex_enabled_provisioned_differentUid_shouldNotIndex() { + Settings.Global.putInt(mActivity.getContentResolver(), + Settings.Global.DEVICE_PROVISIONED, 1); + when(mProvider.isIndexingEnabled()).thenReturn(true); + + ShadowBinder.setCallingUid(Binder.getCallingUid() + 2000); + + mProvider.updateIndex(mActivity, false); + verify(mJobScheduler, never()).schedule(any()); } @Test @@ -102,12 +124,11 @@ public class DeviceIndexFeatureProviderTest { DeviceIndexFeatureProvider.setIndexState(mActivity); Settings.Global.putString(mActivity.getContentResolver(), DeviceIndexFeatureProvider.INDEX_LANGUAGE, "new language"); - JobScheduler jobScheduler = mock(JobScheduler.class); + when(mProvider.isIndexingEnabled()).thenReturn(true); - when(mActivity.getSystemService(JobScheduler.class)).thenReturn(jobScheduler); mProvider.updateIndex(mActivity, false); - verify(jobScheduler).schedule(any()); + verify(mJobScheduler).schedule(any()); } @Test @@ -120,11 +141,8 @@ public class DeviceIndexFeatureProviderTest { // Same build and same language DeviceIndexFeatureProvider.setIndexState(mActivity); - final JobScheduler jobScheduler = mock(JobScheduler.class); - when(mActivity.getSystemService(JobScheduler.class)).thenReturn(jobScheduler); - mProvider.updateIndex(mActivity, false); - verify(jobScheduler, never()).schedule(any()); + verify(mJobScheduler, never()).schedule(any()); } } -- GitLab From ca85cc9d278d19eef92d9ed37668e906522f56c2 Mon Sep 17 00:00:00 2001 From: Artem Iglikov Date: Tue, 12 Jun 2018 11:40:24 +0000 Subject: [PATCH 06/24] DO NOT MERGE Revert "Fix gray out previously connected device preference issue" This reverts commit 95abf59af43bafe4922b8cc096b10b65440419b8. Reason for revert: Crashes settings (b/110075201) Bug: 110075201 Change-Id: Ie6ea94e0891754f18576bd21447b64410d2fd23a --- ...ouslyConnectedDevicePreferenceController.java | 16 +++------------- ...yConnectedDevicePreferenceControllerTest.java | 6 ------ 2 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java index 73c95ab4e38..ba3ee1f1054 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java @@ -21,29 +21,26 @@ import android.support.annotation.VisibleForTesting; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; +import android.util.Log; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater; -import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.core.BasePreferenceController; import com.android.settings.dashboard.DashboardFragment; -import com.android.settings.overlay.FeatureFactory; + import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; +import com.android.settingslib.utils.ThreadUtils; public class PreviouslyConnectedDevicePreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback { private Preference mPreference; private BluetoothDeviceUpdater mBluetoothDeviceUpdater; - private DockUpdater mSavedDockUpdater; private int mPreferenceSize; public PreviouslyConnectedDevicePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); - - mSavedDockUpdater = FeatureFactory.getFactory( - context).getDockUpdaterFeatureProvider().getSavedDockUpdater(context, this); } @Override @@ -65,14 +62,12 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc @Override public void onStart() { mBluetoothDeviceUpdater.registerCallback(); - mSavedDockUpdater.registerCallback(); updatePreferenceOnSizeChanged(); } @Override public void onStop() { mBluetoothDeviceUpdater.unregisterCallback(); - mSavedDockUpdater.unregisterCallback(); } public void init(DashboardFragment fragment) { @@ -97,11 +92,6 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc mBluetoothDeviceUpdater = bluetoothDeviceUpdater; } - @VisibleForTesting - void setSavedDockUpdater(DockUpdater savedDockUpdater) { - mSavedDockUpdater = savedDockUpdater; - } - @VisibleForTesting void setPreferenceSize(int size) { mPreferenceSize = size; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java index d04b206c6dd..444728a1c4c 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java @@ -21,7 +21,6 @@ import android.content.pm.PackageManager; import android.support.v7.preference.Preference; import com.android.settings.bluetooth.BluetoothDeviceUpdater; -import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -47,8 +46,6 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { @Mock private BluetoothDeviceUpdater mBluetoothDeviceUpdater; @Mock - private DockUpdater mDockUpdater; - @Mock private PackageManager mPackageManager; private Context mContext; @@ -64,7 +61,6 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { mPreConnectedDeviceController = new PreviouslyConnectedDevicePreferenceController(mContext, KEY); mPreConnectedDeviceController.setBluetoothDeviceUpdater(mBluetoothDeviceUpdater); - mPreConnectedDeviceController.setSavedDockUpdater(mDockUpdater); mPreference = new Preference(mContext); mPreConnectedDeviceController.setPreference(mPreference); @@ -75,12 +71,10 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { // register the callback in onStart() mPreConnectedDeviceController.onStart(); verify(mBluetoothDeviceUpdater).registerCallback(); - verify(mDockUpdater).registerCallback(); // unregister the callback in onStop() mPreConnectedDeviceController.onStop(); verify(mBluetoothDeviceUpdater).unregisterCallback(); - verify(mDockUpdater).unregisterCallback(); } @Test -- GitLab From 11cea132bd0063e14d0fcad94c95cf2b9d9a9181 Mon Sep 17 00:00:00 2001 From: Ivan Chiang Date: Tue, 12 Jun 2018 15:27:25 +0000 Subject: [PATCH 07/24] DO NOT MERGE Revert "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" This reverts commit ca85cc9d278d19eef92d9ed37668e906522f56c2. Reason for revert: This patch should be submitted with whole topic. Bug: 80227045 Change-Id: I446329aa3370b64b2a943a0f970d0236258455a3 --- ...ouslyConnectedDevicePreferenceController.java | 16 +++++++++++++--- ...yConnectedDevicePreferenceControllerTest.java | 6 ++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java index ba3ee1f1054..73c95ab4e38 100644 --- a/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java +++ b/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceController.java @@ -21,26 +21,29 @@ import android.support.annotation.VisibleForTesting; import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceScreen; -import android.util.Log; import com.android.settings.bluetooth.BluetoothDeviceUpdater; import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater; +import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.core.BasePreferenceController; import com.android.settings.dashboard.DashboardFragment; - +import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; -import com.android.settingslib.utils.ThreadUtils; public class PreviouslyConnectedDevicePreferenceController extends BasePreferenceController implements LifecycleObserver, OnStart, OnStop, DevicePreferenceCallback { private Preference mPreference; private BluetoothDeviceUpdater mBluetoothDeviceUpdater; + private DockUpdater mSavedDockUpdater; private int mPreferenceSize; public PreviouslyConnectedDevicePreferenceController(Context context, String preferenceKey) { super(context, preferenceKey); + + mSavedDockUpdater = FeatureFactory.getFactory( + context).getDockUpdaterFeatureProvider().getSavedDockUpdater(context, this); } @Override @@ -62,12 +65,14 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc @Override public void onStart() { mBluetoothDeviceUpdater.registerCallback(); + mSavedDockUpdater.registerCallback(); updatePreferenceOnSizeChanged(); } @Override public void onStop() { mBluetoothDeviceUpdater.unregisterCallback(); + mSavedDockUpdater.unregisterCallback(); } public void init(DashboardFragment fragment) { @@ -92,6 +97,11 @@ public class PreviouslyConnectedDevicePreferenceController extends BasePreferenc mBluetoothDeviceUpdater = bluetoothDeviceUpdater; } + @VisibleForTesting + void setSavedDockUpdater(DockUpdater savedDockUpdater) { + mSavedDockUpdater = savedDockUpdater; + } + @VisibleForTesting void setPreferenceSize(int size) { mPreferenceSize = size; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java index 444728a1c4c..d04b206c6dd 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/PreviouslyConnectedDevicePreferenceControllerTest.java @@ -21,6 +21,7 @@ import android.content.pm.PackageManager; import android.support.v7.preference.Preference; import com.android.settings.bluetooth.BluetoothDeviceUpdater; +import com.android.settings.connecteddevice.dock.DockUpdater; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.testutils.SettingsRobolectricTestRunner; @@ -46,6 +47,8 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { @Mock private BluetoothDeviceUpdater mBluetoothDeviceUpdater; @Mock + private DockUpdater mDockUpdater; + @Mock private PackageManager mPackageManager; private Context mContext; @@ -61,6 +64,7 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { mPreConnectedDeviceController = new PreviouslyConnectedDevicePreferenceController(mContext, KEY); mPreConnectedDeviceController.setBluetoothDeviceUpdater(mBluetoothDeviceUpdater); + mPreConnectedDeviceController.setSavedDockUpdater(mDockUpdater); mPreference = new Preference(mContext); mPreConnectedDeviceController.setPreference(mPreference); @@ -71,10 +75,12 @@ public class PreviouslyConnectedDevicePreferenceControllerTest { // register the callback in onStart() mPreConnectedDeviceController.onStart(); verify(mBluetoothDeviceUpdater).registerCallback(); + verify(mDockUpdater).registerCallback(); // unregister the callback in onStop() mPreConnectedDeviceController.onStop(); verify(mBluetoothDeviceUpdater).unregisterCallback(); + verify(mDockUpdater).unregisterCallback(); } @Test -- GitLab From ff73564ea0fb26f3a2f688d10bede49d05b4417f Mon Sep 17 00:00:00 2001 From: yuemingw Date: Mon, 9 Apr 2018 17:00:38 +0100 Subject: [PATCH 08/24] Remove internal ApnSetting. Remove com.android.internal.telephony.dataconnection.ApnSetting and use android.telephony.data.ApnSetting instead. Bug: 77511388 Test: existing test Change-Id: I8ca1fb399026a8ef4ba9afa18678d986daa50606 --- src/com/android/settings/network/ApnSettings.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/network/ApnSettings.java b/src/com/android/settings/network/ApnSettings.java index bbbcdbcbb63..0537d8fe160 100755 --- a/src/com/android/settings/network/ApnSettings.java +++ b/src/com/android/settings/network/ApnSettings.java @@ -43,6 +43,7 @@ import android.telephony.CarrierConfigManager; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; import android.telephony.TelephonyManager; +import android.telephony.data.ApnSetting; import android.text.TextUtils; import android.util.Log; import android.view.Menu; @@ -54,7 +55,7 @@ import android.widget.Toast; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.telephony.PhoneConstants; import com.android.internal.telephony.TelephonyIntents; -import com.android.internal.telephony.dataconnection.ApnSetting; +import com.android.internal.telephony.dataconnection.ApnSettingUtils; import com.android.internal.telephony.uicc.IccRecords; import com.android.internal.telephony.uicc.UiccController; import com.android.settings.R; @@ -330,7 +331,8 @@ public class ApnSettings extends RestrictedSettingsFragment implements ArrayList mvnoList, IccRecords r, String mvnoType, String mvnoMatchData) { if (r != null && !TextUtils.isEmpty(mvnoType) && !TextUtils.isEmpty(mvnoMatchData)) { - if (ApnSetting.mvnoMatches(r, mvnoType, mvnoMatchData)) { + if (ApnSettingUtils.mvnoMatches(r, ApnSetting.getMvnoTypeIntFromString(mvnoType), + mvnoMatchData)) { mvnoList.add(pref); // Since adding to mvno list, save mvno info mMvnoType = mvnoType; -- GitLab From acff57fa686d903cd9f7c253286f45e0094c7894 Mon Sep 17 00:00:00 2001 From: Salvador Martinez Date: Tue, 29 May 2018 17:53:02 -0700 Subject: [PATCH 09/24] Change UI for wireless AP tether band selection We decided to use the list preference after all due to some devices not supporting various combinations of AP configurations. This change makes it so that there are three different UIs depending on the configurations which are supported. - 5.0 GHz unsupported: disable the preference and just set the value to 2.4 GHz - all supported, no dual mode: allow the user to choose EITHER 2.4 GHz or 5.0 GHz - all supported, dual mode: allow the user to choose 2.4 GHz or BOTH 2.4 GHz & 5.0 GHz with 5.0 being preferred Test: atest SettingsRoboTests Bug: 80315296 Change-Id: I888d35811a98b8cf0155a3cb96c42ff762763378 Merged-In: I888d35811a98b8cf0155a3cb96c42ff762763378 --- res/values/arrays.xml | 20 +- res/values/strings.xml | 4 +- res/xml/wifi_tether_settings.xml | 8 +- .../HotspotApBandSelectionPreference.java | 258 ------------------ .../WifiTetherApBandPreferenceController.java | 66 +++-- .../HotspotApBandSelectionPreferenceTest.java | 158 ----------- ...iTetherApBandPreferenceControllerTest.java | 66 +++-- 7 files changed, 118 insertions(+), 462 deletions(-) delete mode 100644 src/com/android/settings/widget/HotspotApBandSelectionPreference.java delete mode 100644 tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 5f39738a8af..be7a0ca50b6 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -284,17 +284,27 @@ - + + 0 + 1 + + + @string/wifi_ap_choose_2G @string/wifi_ap_choose_5G - - @string/wifi_ap_2G - @string/wifi_ap_5G + + 0 + -1 + + + + @string/wifi_ap_choose_2G + @string/wifi_ap_prefer_5G - + @string/wifi_ap_choose_auto @string/wifi_ap_choose_2G diff --git a/res/values/strings.xml b/res/values/strings.xml index 1b5f12571da..30290a788c9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1990,8 +1990,10 @@ Auto 2.4 GHz Band - + 5.0 GHz Band + + 5.0 GHz Band preferred 2.4 GHz diff --git a/res/xml/wifi_tether_settings.xml b/res/xml/wifi_tether_settings.xml index a609621e581..525870e453f 100644 --- a/res/xml/wifi_tether_settings.xml +++ b/res/xml/wifi_tether_settings.xml @@ -43,11 +43,7 @@ android:title="@string/wifi_hotspot_auto_off_title" android:summary="@string/wifi_hotspot_auto_off_summary" /> - + android:title="@string/wifi_hotspot_ap_band_title" /> \ No newline at end of file diff --git a/src/com/android/settings/widget/HotspotApBandSelectionPreference.java b/src/com/android/settings/widget/HotspotApBandSelectionPreference.java deleted file mode 100644 index 0a2405e4136..00000000000 --- a/src/com/android/settings/widget/HotspotApBandSelectionPreference.java +++ /dev/null @@ -1,258 +0,0 @@ -/* - * Copyright (C) 2018 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.widget; - -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.net.wifi.WifiConfiguration; -import android.os.Bundle; -import android.os.Parcel; -import android.os.Parcelable; -import android.support.annotation.VisibleForTesting; -import android.util.AttributeSet; -import android.view.View; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.LinearLayout; - -import com.android.settings.R; -import com.android.settingslib.CustomDialogPreference; - -import java.util.ArrayList; - -public class HotspotApBandSelectionPreference extends CustomDialogPreference implements - CompoundButton.OnCheckedChangeListener, DialogInterface.OnShowListener { - private static final int UNSET = Integer.MIN_VALUE; - - @VisibleForTesting - static final String KEY_CHECKED_BANDS = "checked_bands"; - @VisibleForTesting - static final String KEY_HOTSPOT_SUPER_STATE = "hotspot_super_state"; - - @VisibleForTesting - CheckBox mBox2G; - @VisibleForTesting - CheckBox mBox5G; - @VisibleForTesting - ArrayList mRestoredBands; - @VisibleForTesting - boolean mShouldRestore; - - private String[] mBandEntries; - private int mExistingConfigValue = UNSET; - - public HotspotApBandSelectionPreference(Context context) { - super(context); - } - - public HotspotApBandSelectionPreference(Context context, AttributeSet attrs) { - super(context, attrs); - } - - public HotspotApBandSelectionPreference(Context context, AttributeSet attrs, int defStyleAttr) { - super(context, attrs, defStyleAttr); - } - - public HotspotApBandSelectionPreference(Context context, AttributeSet attrs, int defStyleAttr, - int defStyleRes) { - super(context, attrs, defStyleAttr, defStyleRes); - } - - @Override - protected void onRestoreInstanceState(Parcelable state) { - SavedState myState = (SavedState) state; - - super.onRestoreInstanceState(myState.getSuperState()); - - mShouldRestore = myState.shouldRestore; - if (mShouldRestore) { - mRestoredBands = new ArrayList<>(); - if (myState.enabled2G) { - mRestoredBands.add(WifiConfiguration.AP_BAND_2GHZ); - } - if (myState.enabled5G) { - mRestoredBands.add(WifiConfiguration.AP_BAND_5GHZ); - } - } else { - mRestoredBands = null; - } - updatePositiveButton(); - } - - @Override - protected void onBindDialogView(View view) { - super.onBindDialogView(view); - final Context context = getContext(); - - // Register so we can adjust the buttons if needed once the dialog is available. - setOnShowListener(this); - - mBandEntries = context.getResources().getStringArray(R.array.wifi_ap_band_config_full); - // add a checkbox for every band entry. - addApBandViews((LinearLayout) view); - // try to update the button just in case we already missed the onShow call. - updatePositiveButton(); - // clear any saved state so it doesn't leak across multiple rotations/dialog closings - mRestoredBands = null; - mShouldRestore = false; - } - - @Override - protected Parcelable onSaveInstanceState() { - final Parcelable superState = super.onSaveInstanceState(); - - SavedState myState = new SavedState(superState); - myState.shouldRestore = getDialog() != null; - myState.enabled2G = mBox2G != null && mBox2G.isChecked(); - myState.enabled5G = mBox5G != null && mBox5G.isChecked(); - return myState; - } - - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - if (!(buttonView instanceof CheckBox)) { - return; - } - updatePositiveButton(); - } - - @Override - protected void onClick(DialogInterface dialog, int which) { - // we only want to persist our enabled bands if apply is clicked - if (which == DialogInterface.BUTTON_POSITIVE) { - if (mBox2G.isChecked() || mBox5G.isChecked()) { - int wifiBand = getWifiBand(); - mExistingConfigValue = wifiBand; - callChangeListener(wifiBand); - } - } - } - - /** - * Used to set the band selection for the preference if one already exists - * @param band the band to set it to from {@link WifiConfiguration} - */ - public void setExistingConfigValue(int band) { - mExistingConfigValue = band; - } - - private void addApBandViews(LinearLayout view) { - mBox2G = view.findViewById(R.id.box_2g); - mBox2G.setText(mBandEntries[WifiConfiguration.AP_BAND_2GHZ]); - mBox2G.setChecked(restoreBandIfNeeded(WifiConfiguration.AP_BAND_2GHZ)); - mBox2G.setOnCheckedChangeListener(this); - - mBox5G = view.findViewById(R.id.box_5g); - mBox5G.setText(mBandEntries[WifiConfiguration.AP_BAND_5GHZ]); - mBox5G.setChecked(restoreBandIfNeeded(WifiConfiguration.AP_BAND_5GHZ)); - mBox5G.setOnCheckedChangeListener(this); - } - - private boolean restoreBandIfNeeded(int band) { - // Only use the provided config if we aren't restoring, restore if state available - return (isBandPreviouslySelected(band) && !mShouldRestore) - || (mShouldRestore && mRestoredBands.contains(band)); - } - - private void updatePositiveButton() { - AlertDialog dialog = (AlertDialog) getDialog(); - Button button = dialog == null ? null : dialog.getButton(DialogInterface.BUTTON_POSITIVE); - if (button != null && mBox5G != null && mBox2G != null) { - button.setEnabled(mBox2G.isChecked() || mBox5G.isChecked()); - } - } - - @VisibleForTesting - int getWifiBand() { - final boolean checked_2g = mBox2G.isChecked(); - final boolean checked_5g = mBox5G.isChecked(); - if (checked_2g && checked_5g) { - return WifiConfiguration.AP_BAND_ANY; - } else if (checked_2g && !checked_5g) { - return WifiConfiguration.AP_BAND_2GHZ; - } else if (checked_5g && !checked_2g) { - return WifiConfiguration.AP_BAND_5GHZ; - } else { - throw new IllegalStateException("Wifi Config only supports selecting one or all bands"); - } - } - - private boolean isBandPreviouslySelected(int bandIndex) { - switch(mExistingConfigValue) { - case WifiConfiguration.AP_BAND_ANY: - return true; - case WifiConfiguration.AP_BAND_2GHZ: - return bandIndex == 0; - case WifiConfiguration.AP_BAND_5GHZ: - return bandIndex == 1; - case UNSET: - default: - return false; - } - } - - @Override - public void onShow(DialogInterface dialog) { - updatePositiveButton(); - } - - private static class SavedState extends BaseSavedState { - boolean shouldRestore; - boolean enabled2G; - boolean enabled5G; - - public SavedState(Parcelable source) { - super(source); - } - - private SavedState(Parcel in) { - super(in); - shouldRestore = in.readByte() == 1; - enabled2G = in.readByte() == 1; - enabled5G = in.readByte() == 1; - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - super.writeToParcel(dest, flags); - dest.writeByte((byte) (shouldRestore ? 1 : 0)); - dest.writeByte((byte) (enabled2G ? 1: 0)); - dest.writeByte((byte) (enabled5G ? 1 : 0)); - } - - @Override - public String toString() { - return "HotspotApBandSelectionPreference.SavedState{" - + Integer.toHexString(System.identityHashCode(this)) - + " shouldRestore=" + shouldRestore - + " enabled2G=" + enabled2G - + " enabled5G=" + enabled5G + "}"; - } - - public static final Parcelable.Creator CREATOR - = new Parcelable.Creator() { - public SavedState createFromParcel(Parcel in) { - return new SavedState(in); - } - - public SavedState[] newArray(int size) { - return new SavedState[size]; - } - }; - } -} diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java index b107777f67f..2624c736327 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java @@ -16,36 +16,31 @@ package com.android.settings.wifi.tether; -import static android.net.wifi.WifiConfiguration.AP_BAND_2GHZ; -import static android.net.wifi.WifiConfiguration.AP_BAND_5GHZ; - import android.content.Context; import android.content.res.Resources; -import android.icu.text.ListFormatter; import android.net.wifi.WifiConfiguration; +import android.support.annotation.VisibleForTesting; +import android.support.v7.preference.ListPreference; import android.support.v7.preference.Preference; import android.util.Log; import com.android.settings.R; -import com.android.settings.widget.HotspotApBandSelectionPreference; public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferenceController { private static final String TAG = "WifiTetherApBandPref"; private static final String PREF_KEY = "wifi_tether_network_ap_band"; - public static final String[] BAND_VALUES = - {String.valueOf(AP_BAND_2GHZ), String.valueOf(AP_BAND_5GHZ)}; - private final String[] mBandEntries; - private final String[] mBandSummaries; + private String[] mBandEntries; + private String[] mBandSummaries; private int mBandIndex; + private boolean isDualMode; public WifiTetherApBandPreferenceController(Context context, OnTetherConfigUpdateListener listener) { super(context, listener); - Resources res = mContext.getResources(); - mBandEntries = res.getStringArray(R.array.wifi_ap_band_config_full); - mBandSummaries = res.getStringArray(R.array.wifi_ap_band_summary_full); + isDualMode = mWifiManager.isDualModeSupported(); + updatePreferenceEntries(); } @Override @@ -55,7 +50,7 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen mBandIndex = 0; Log.d(TAG, "Updating band index to 0 because no config"); } else if (is5GhzBandSupported()) { - mBandIndex = config.apBand; + mBandIndex = validateSelection(config.apBand); Log.d(TAG, "Updating band index to " + mBandIndex); } else { config.apBand = 0; @@ -63,21 +58,23 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen mBandIndex = config.apBand; Log.d(TAG, "5Ghz not supported, updating band index to " + mBandIndex); } - HotspotApBandSelectionPreference preference = - (HotspotApBandSelectionPreference) mPreference; + ListPreference preference = + (ListPreference) mPreference; + preference.setEntries(mBandSummaries); + preference.setEntryValues(mBandEntries); if (!is5GhzBandSupported()) { preference.setEnabled(false); preference.setSummary(R.string.wifi_ap_choose_2G); } else { - preference.setExistingConfigValue(config.apBand); + preference.setValue(Integer.toString(config.apBand)); preference.setSummary(getConfigSummary()); } } String getConfigSummary() { if (mBandIndex == WifiConfiguration.AP_BAND_ANY) { - return ListFormatter.getInstance().format((Object[]) mBandSummaries); + return mContext.getString(R.string.wifi_ap_prefer_5G); } return mBandSummaries[mBandIndex]; } @@ -89,13 +86,46 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen @Override public boolean onPreferenceChange(Preference preference, Object newValue) { - mBandIndex = (Integer) newValue; + mBandIndex = validateSelection(Integer.parseInt((String) newValue)); Log.d(TAG, "Band preference changed, updating band index to " + mBandIndex); preference.setSummary(getConfigSummary()); mListener.onTetherConfigUpdated(); return true; } + private int validateSelection(int band) { + // Reset the band to 2.4 GHz if we get a weird config back to avoid a crash. + final boolean isDualMode = mWifiManager.isDualModeSupported(); + + // unsupported states: + // 1: no dual mode means we can't have AP_BAND_ANY - default to 5GHZ + // 2: no 5 GHZ support means we can't have AP_BAND_5GHZ - default to 2GHZ + // 3: With Dual mode support we can't have AP_BAND_5GHZ - default to ANY + if (!isDualMode && WifiConfiguration.AP_BAND_ANY == band) { + return WifiConfiguration.AP_BAND_5GHZ; + } else if (!mWifiManager.is5GHzBandSupported() && WifiConfiguration.AP_BAND_5GHZ == band) { + return WifiConfiguration.AP_BAND_2GHZ; + } else if (isDualMode && WifiConfiguration.AP_BAND_5GHZ == band) { + return WifiConfiguration.AP_BAND_ANY; + } + + return band; + } + + @VisibleForTesting + void updatePreferenceEntries() { + Resources res = mContext.getResources(); + int entriesRes = R.array.wifi_ap_band_config_full; + int summariesRes = R.array.wifi_ap_band_summary_full; + // change the list options if this is a dual mode device + if (isDualMode) { + entriesRes = R.array.wifi_ap_band_dual_mode; + summariesRes = R.array.wifi_ap_band_dual_mode_summary; + } + mBandEntries = res.getStringArray(entriesRes); + mBandSummaries = res.getStringArray(summariesRes); + } + private boolean is5GhzBandSupported() { final String countryCode = mWifiManager.getCountryCode(); if (!mWifiManager.isDualBandSupported() || countryCode == null) { diff --git a/tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java deleted file mode 100644 index 0ffda3baa96..00000000000 --- a/tests/robotests/src/com/android/settings/widget/HotspotApBandSelectionPreferenceTest.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * Copyright (C) 2018 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.widget; - -import static com.android.settingslib.CustomDialogPreference.CustomPreferenceDialogFragment; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.never; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.times; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.app.AlertDialog; -import android.content.Context; -import android.net.wifi.WifiConfiguration; -import android.os.Bundle; -import android.os.Parcelable; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.Button; -import android.widget.CheckBox; -import android.widget.LinearLayout; - -import com.android.settings.R; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RuntimeEnvironment; -import org.robolectric.util.ReflectionHelpers; - -import java.util.List; - -@RunWith(SettingsRobolectricTestRunner.class) -public class HotspotApBandSelectionPreferenceTest { - private HotspotApBandSelectionPreference mPreference; - private Context mContext; - private Button mSaveButton; - private View mLayout; - - @Before - public void setUp() { - mContext = RuntimeEnvironment.application; - mSaveButton = spy(new Button(mContext)); - - final CustomPreferenceDialogFragment fragment = mock(CustomPreferenceDialogFragment.class); - final AlertDialog dialog = mock(AlertDialog.class); - when(fragment.getDialog()).thenReturn(dialog); - when(dialog.getButton(anyInt())).thenReturn(mSaveButton); - - mPreference = new HotspotApBandSelectionPreference(mContext); - ReflectionHelpers.setField(mPreference, "mFragment", fragment); - - final LayoutInflater inflater = LayoutInflater.from(mContext); - mLayout = inflater.inflate(R.layout.hotspot_ap_band_selection_dialog, - new LinearLayout(mContext), false); - } - - @Test - public void getWifiBand_updatesBandPresetConfigProvided() { - mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_ANY); - mPreference.onBindDialogView(mLayout); - - // check that the boxes are set correctly when a pre-existing config is set - assertThat(mPreference.getWifiBand()).isEqualTo(WifiConfiguration.AP_BAND_ANY); - } - - @Test - public void getWifiBand_updatesBandWhenBoxesToggled() { - mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_ANY); - mPreference.onBindDialogView(mLayout); - - assertThat(mPreference.getWifiBand()).isEqualTo(WifiConfiguration.AP_BAND_ANY); - - // make sure we have the expected box then toggle it - mPreference.mBox2G.setChecked(false); - - // check that band is updated - assertThat(mPreference.getWifiBand()).isEqualTo(WifiConfiguration.AP_BAND_5GHZ); - } - - @Test - public void onSaveInstanceState_skipWhenDialogGone() { - mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_2GHZ); - mPreference.onBindDialogView(mLayout); - // remove the fragment to make the dialog unavailable - ReflectionHelpers.setField(mPreference, "mFragment", null); - - mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_ANY); - mPreference.onBindDialogView(mLayout); - - // state should only be saved when the dialog is available - Parcelable parcelable = mPreference.onSaveInstanceState(); - mPreference.onRestoreInstanceState(parcelable); - assertThat(mPreference.mShouldRestore).isFalse(); - } - - @Test - public void onSaveInstanceState_doesNotCrashWhenViewGone() { - mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_2GHZ); - mPreference.onBindDialogView(mLayout); - // When the device dozes the view and dialog can become null - mPreference.mBox5G = null; - mPreference.mBox2G = null; - ReflectionHelpers.setField(mPreference, "mFragment", null); - - // make sure it does not crash and state is not restored - Parcelable parcelable = mPreference.onSaveInstanceState(); - mPreference.onRestoreInstanceState(parcelable); - assertThat(mPreference.mShouldRestore).isFalse(); - } - - @Test - public void onSaveInstanceState_presentWhenDialogPresent() { - mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_2GHZ); - mPreference.onBindDialogView(mLayout); - - Parcelable parcelable = mPreference.onSaveInstanceState(); - mPreference.onRestoreInstanceState(parcelable); - assertThat(mPreference.mShouldRestore).isTrue(); - } - - @Test - public void positiveButton_updatedCorrectly() { - mPreference.setExistingConfigValue(WifiConfiguration.AP_BAND_ANY); - mPreference.onBindDialogView(mLayout); - - // button is enabled whole time so far since we have a pre-existing selection - verify(mSaveButton, never()).setEnabled(false); - - // clear all boxes and make sure it stays enabled until empty - mPreference.mBox2G.setChecked(false); - mPreference.mBox5G.setChecked(false); - - // button should be disabled now - verify(mSaveButton, times(1)).setEnabled(false); - } -} diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java index d9c867cf2a6..8df62c3c02e 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.spy; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -26,16 +27,15 @@ import android.content.Context; import android.net.ConnectivityManager; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiManager; +import android.support.v7.preference.ListPreference; import android.support.v7.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.testutils.SettingsRobolectricTestRunner; -import com.android.settings.widget.HotspotApBandSelectionPreference; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.mockito.Answers; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RuntimeEnvironment; @@ -43,8 +43,9 @@ import org.robolectric.RuntimeEnvironment; @RunWith(SettingsRobolectricTestRunner.class) public class WifiTetherApBandPreferenceControllerTest { - private static final String ALL_BANDS = "2.4 GHz and 5.0 GHz"; - @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private static final String ALL_BANDS = "5.0 GHz Band preferred"; + private static final String TWO_GHZ_STRING = "2.4 GHz Band"; + private static final String FIVE_GHZ_STRING = "5.0 GHz Band"; private Context mContext; @Mock private ConnectivityManager mConnectivityManager; @@ -56,12 +57,13 @@ public class WifiTetherApBandPreferenceControllerTest { private PreferenceScreen mScreen; private WifiTetherApBandPreferenceController mController; - private HotspotApBandSelectionPreference mPreference; + private ListPreference mPreference; @Before public void setUp() { MockitoAnnotations.initMocks(this); - mPreference = new HotspotApBandSelectionPreference(RuntimeEnvironment.application); + mContext = spy(RuntimeEnvironment.application); + mPreference = new ListPreference(RuntimeEnvironment.application); when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)) .thenReturn(mConnectivityManager); @@ -71,6 +73,7 @@ public class WifiTetherApBandPreferenceControllerTest { WifiConfiguration config = new WifiConfiguration(); config.apBand = WifiConfiguration.AP_BAND_ANY; when(mWifiManager.getWifiApConfiguration()).thenReturn(new WifiConfiguration()); + when(mWifiManager.isDualModeSupported()).thenReturn(false); mController = new WifiTetherApBandPreferenceController(mContext, mListener); } @@ -79,9 +82,10 @@ public class WifiTetherApBandPreferenceControllerTest { public void display_5GhzSupported_shouldDisplayFullList() { when(mWifiManager.getCountryCode()).thenReturn("US"); when(mWifiManager.isDualBandSupported()).thenReturn(true); + when(mWifiManager.isDualModeSupported()).thenReturn(true); mController.displayPreference(mScreen); - mController.onPreferenceChange(mPreference, -1); + mController.onPreferenceChange(mPreference, "-1"); assertThat(mPreference.getSummary()).isEqualTo(ALL_BANDS); } @@ -110,24 +114,54 @@ public class WifiTetherApBandPreferenceControllerTest { } @Test - public void changePreference_shouldUpdateValue() { + public void changePreference_noDualModeWith5G_shouldUpdateValue() { when(mWifiManager.is5GHzBandSupported()).thenReturn(true); mController.displayPreference(mScreen); + // -1 is WifiConfiguration.AP_BAND_ANY, for 'Auto' option. This should be prevented from + // being set since it is invalid for this configuration + mController.onPreferenceChange(mPreference, "-1"); + assertThat(mController.getBandIndex()).isEqualTo(1); + assertThat(mPreference.getSummary()).isEqualTo(FIVE_GHZ_STRING); + verify(mListener, times(1)).onTetherConfigUpdated(); + + // set to 5 Ghz + mController.onPreferenceChange(mPreference, "1"); + assertThat(mController.getBandIndex()).isEqualTo(1); + assertThat(mPreference.getSummary()).isEqualTo(FIVE_GHZ_STRING); + verify(mListener, times(2)).onTetherConfigUpdated(); + + // set to 2 Ghz + mController.onPreferenceChange(mPreference, "0"); + assertThat(mController.getBandIndex()).isEqualTo(0); + assertThat(mPreference.getSummary()).isEqualTo(TWO_GHZ_STRING); + verify(mListener, times(3)).onTetherConfigUpdated(); + } + + @Test + public void changePreference_dualModeWith5G_shouldUpdateValue() { + when(mWifiManager.is5GHzBandSupported()).thenReturn(true); + when(mWifiManager.isDualModeSupported()).thenReturn(true); + + mController.displayPreference(mScreen); + // -1 is WifiConfiguration.AP_BAND_ANY, for 'Auto' option. - mController.onPreferenceChange(mPreference, -1); + mController.onPreferenceChange(mPreference, "-1"); assertThat(mController.getBandIndex()).isEqualTo(-1); assertThat(mPreference.getSummary()).isEqualTo(ALL_BANDS); + verify(mListener, times(1)).onTetherConfigUpdated(); - mController.onPreferenceChange(mPreference, 1); - assertThat(mController.getBandIndex()).isEqualTo(1); - assertThat(mPreference.getSummary()).isEqualTo("5.0 GHz"); + // should revert to the default for 5 Ghz only since this is not supported with this config + mController.onPreferenceChange(mPreference, "1"); + assertThat(mController.getBandIndex()).isEqualTo(-1); + assertThat(mPreference.getSummary()).isEqualTo(ALL_BANDS); + verify(mListener, times(2)).onTetherConfigUpdated(); - mController.onPreferenceChange(mPreference, 0); + // set to 2 Ghz + mController.onPreferenceChange(mPreference, "0"); assertThat(mController.getBandIndex()).isEqualTo(0); - assertThat(mPreference.getSummary()).isEqualTo("2.4 GHz"); - + assertThat(mPreference.getSummary()).isEqualTo(TWO_GHZ_STRING); verify(mListener, times(3)).onTetherConfigUpdated(); } @@ -136,7 +170,7 @@ public class WifiTetherApBandPreferenceControllerTest { // Set controller band index to 1 and verify is set. when(mWifiManager.is5GHzBandSupported()).thenReturn(true); mController.displayPreference(mScreen); - mController.onPreferenceChange(mPreference, 1); + mController.onPreferenceChange(mPreference, "1"); assertThat(mController.getBandIndex()).isEqualTo(1); // Disable 5Ghz band -- GitLab From 55dfd8a86bf47af46ce2af4199630557a1ac1abb Mon Sep 17 00:00:00 2001 From: Beverly Date: Thu, 7 Jun 2018 10:43:32 -0400 Subject: [PATCH 10/24] Add help uri for prevent ringing gesture Test: build Bug: 79270169 Change-Id: Iea5598f26649854521202363cad6ee297cef3057 (cherry picked from commit 486d1facfab222c686e03c344619aaf19280ea2a) --- res/values/strings.xml | 3 +++ .../settings/gestures/PreventRingingGestureSettings.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 30290a788c9..cd2b78362ae 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -9928,6 +9928,9 @@ + + + Update Do Not Disturb diff --git a/src/com/android/settings/gestures/PreventRingingGestureSettings.java b/src/com/android/settings/gestures/PreventRingingGestureSettings.java index 09570dfb4f5..241e5c0bf5d 100644 --- a/src/com/android/settings/gestures/PreventRingingGestureSettings.java +++ b/src/com/android/settings/gestures/PreventRingingGestureSettings.java @@ -58,7 +58,7 @@ public class PreventRingingGestureSettings extends DashboardFragment { @Override public int getHelpResource() { - return 0; + return R.string.help_uri_prevent_ringing_gesture; } public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = -- GitLab From 7d9ec632f27b96eb9fa88ecbc6d169f64c0b4b57 Mon Sep 17 00:00:00 2001 From: Evan Laird Date: Wed, 13 Jun 2018 20:13:47 -0400 Subject: [PATCH 11/24] Allow config to disable battery percent setting Respect config_battery_percentage_setting_available to determine whether or not to allow showing battery percentage in the status bar. Test: visual Bug: 80129194 Change-Id: I23b0065ed99865a8df37c098b2f0f16d57799706 --- .../display/BatteryPercentagePreferenceController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/display/BatteryPercentagePreferenceController.java b/src/com/android/settings/display/BatteryPercentagePreferenceController.java index 449315873c0..be676e3df10 100644 --- a/src/com/android/settings/display/BatteryPercentagePreferenceController.java +++ b/src/com/android/settings/display/BatteryPercentagePreferenceController.java @@ -20,6 +20,7 @@ import android.provider.Settings; import android.support.v7.preference.Preference; import android.support.v14.preference.SwitchPreference; +import com.android.internal.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; @@ -40,7 +41,8 @@ public class BatteryPercentagePreferenceController extends AbstractPreferenceCon @Override public boolean isAvailable() { - return true; + return mContext.getResources() + .getBoolean(R.bool.config_battery_percentage_setting_available); } @Override -- GitLab From bb3337100c91b77ca9adf3c327389b4b9568e7f6 Mon Sep 17 00:00:00 2001 From: Salvador Martinez Date: Tue, 19 Jun 2018 10:27:30 -0700 Subject: [PATCH 12/24] Add unofficial intent for WifiTetherSettings This CL adds an intent that can be used to start WifiTether Settings. Test: SettingsGatewayTest still passes Bug: 110235497 Bug: 80251951 Change-Id: Iac94e563a91b1f821f69f18234d8176350ae5f29 --- AndroidManifest.xml | 14 ++++++++++++++ src/com/android/settings/Settings.java | 1 + .../settings/core/gateway/SettingsGateway.java | 2 ++ 3 files changed, 17 insertions(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 27132165b91..fb74bf96f09 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -467,6 +467,20 @@ android:value="com.android.settings.TetherSettings" /> + + + + + + + + + Date: Thu, 21 Jun 2018 11:31:13 -0700 Subject: [PATCH 13/24] Import translations. DO NOT MERGE Auto-generated-cl: translation import Bug: 64712476 Change-Id: Ieb6af16365681984ceafb048d338d8132df0e3bc --- res/values-af/arrays.xml | 6 ------ res/values-af/strings.xml | 3 ++- res/values-am/arrays.xml | 6 ------ res/values-am/strings.xml | 5 +++-- res/values-ar/arrays.xml | 6 ------ res/values-ar/strings.xml | 15 +++++++------ res/values-as/arrays.xml | 6 ------ res/values-as/strings.xml | 3 ++- res/values-az/arrays.xml | 6 ------ res/values-az/strings.xml | 3 ++- res/values-b+sr+Latn/arrays.xml | 6 ------ res/values-b+sr+Latn/strings.xml | 3 ++- res/values-be/arrays.xml | 6 ------ res/values-be/strings.xml | 5 +++-- res/values-bg/arrays.xml | 6 ------ res/values-bg/strings.xml | 3 ++- res/values-bn/arrays.xml | 14 ++++-------- res/values-bn/strings.xml | 37 ++++++++++++++++---------------- res/values-bs/arrays.xml | 6 ------ res/values-bs/strings.xml | 3 ++- res/values-ca/arrays.xml | 6 ------ res/values-ca/strings.xml | 11 +++++----- res/values-cs/arrays.xml | 6 ------ res/values-cs/strings.xml | 3 ++- res/values-da/arrays.xml | 10 ++------- res/values-da/strings.xml | 9 ++++---- res/values-de/arrays.xml | 6 ------ res/values-de/strings.xml | 3 ++- res/values-el/arrays.xml | 6 ------ res/values-el/strings.xml | 3 ++- res/values-en-rAU/arrays.xml | 6 ------ res/values-en-rAU/strings.xml | 3 ++- res/values-en-rCA/arrays.xml | 6 ------ res/values-en-rCA/strings.xml | 3 ++- res/values-en-rGB/arrays.xml | 6 ------ res/values-en-rGB/strings.xml | 3 ++- res/values-en-rIN/arrays.xml | 6 ------ res/values-en-rIN/strings.xml | 3 ++- res/values-en-rXC/arrays.xml | 6 ------ res/values-en-rXC/strings.xml | 3 ++- res/values-es-rUS/arrays.xml | 6 ------ res/values-es-rUS/strings.xml | 3 ++- res/values-es/arrays.xml | 6 ------ res/values-es/strings.xml | 7 +++--- res/values-et/arrays.xml | 6 ------ res/values-et/strings.xml | 3 ++- res/values-eu/arrays.xml | 6 ------ res/values-eu/strings.xml | 13 +++++------ res/values-fa/arrays.xml | 6 ------ res/values-fa/strings.xml | 3 ++- res/values-fi/arrays.xml | 6 ------ res/values-fi/strings.xml | 13 +++++------ res/values-fr-rCA/arrays.xml | 6 ------ res/values-fr-rCA/strings.xml | 7 +++--- res/values-fr/arrays.xml | 6 ------ res/values-fr/strings.xml | 5 +++-- res/values-gl/arrays.xml | 6 ------ res/values-gl/strings.xml | 3 ++- res/values-gu/arrays.xml | 6 ------ res/values-gu/strings.xml | 3 ++- res/values-hi/arrays.xml | 6 ------ res/values-hi/strings.xml | 12 ++++++----- res/values-hr/arrays.xml | 6 ------ res/values-hr/strings.xml | 3 ++- res/values-hu/arrays.xml | 6 ------ res/values-hu/strings.xml | 3 ++- res/values-hy/arrays.xml | 6 ------ res/values-hy/strings.xml | 3 ++- res/values-in/arrays.xml | 6 ------ res/values-in/strings.xml | 3 ++- res/values-is/arrays.xml | 6 ------ res/values-is/strings.xml | 3 ++- res/values-it/arrays.xml | 6 ------ res/values-it/strings.xml | 9 ++++---- res/values-iw/arrays.xml | 6 ------ res/values-iw/strings.xml | 5 +++-- res/values-ja/arrays.xml | 6 ------ res/values-ja/strings.xml | 5 +++-- res/values-ka/arrays.xml | 6 ------ res/values-ka/strings.xml | 5 +++-- res/values-kk/arrays.xml | 6 ------ res/values-kk/strings.xml | 3 ++- res/values-km/arrays.xml | 6 ------ res/values-km/strings.xml | 3 ++- res/values-kn/arrays.xml | 6 ------ res/values-kn/strings.xml | 3 ++- res/values-ko/arrays.xml | 6 ------ res/values-ko/strings.xml | 7 +++--- res/values-ky/arrays.xml | 6 ------ res/values-ky/strings.xml | 3 ++- res/values-lo/arrays.xml | 6 ------ res/values-lo/strings.xml | 3 ++- res/values-lt/arrays.xml | 6 ------ res/values-lt/strings.xml | 3 ++- res/values-lv/arrays.xml | 6 ------ res/values-lv/strings.xml | 3 ++- res/values-mk/arrays.xml | 6 ------ res/values-mk/strings.xml | 3 ++- res/values-ml/arrays.xml | 6 ------ res/values-ml/strings.xml | 3 ++- res/values-mn/arrays.xml | 6 ------ res/values-mn/strings.xml | 3 ++- res/values-mr/arrays.xml | 6 ------ res/values-mr/strings.xml | 3 ++- res/values-ms/arrays.xml | 6 ------ res/values-ms/strings.xml | 3 ++- res/values-my/arrays.xml | 6 ------ res/values-my/strings.xml | 3 ++- res/values-nb/arrays.xml | 6 ------ res/values-nb/strings.xml | 3 ++- res/values-ne/arrays.xml | 6 ------ res/values-ne/strings.xml | 7 +++--- res/values-nl/arrays.xml | 6 ------ res/values-nl/strings.xml | 7 +++--- res/values-or/arrays.xml | 6 ------ res/values-or/strings.xml | 18 ++++++---------- res/values-pa/arrays.xml | 6 ------ res/values-pa/strings.xml | 5 +++-- res/values-pl/arrays.xml | 6 ------ res/values-pl/strings.xml | 11 +++++----- res/values-pt-rBR/arrays.xml | 6 ------ res/values-pt-rBR/strings.xml | 7 +++--- res/values-pt-rPT/arrays.xml | 6 ------ res/values-pt-rPT/strings.xml | 13 +++++------ res/values-pt/arrays.xml | 6 ------ res/values-pt/strings.xml | 7 +++--- res/values-ro/arrays.xml | 6 ------ res/values-ro/strings.xml | 3 ++- res/values-ru/arrays.xml | 6 ------ res/values-ru/strings.xml | 19 ++++++++-------- res/values-si/arrays.xml | 6 ------ res/values-si/strings.xml | 3 ++- res/values-sk/arrays.xml | 6 ------ res/values-sk/strings.xml | 3 ++- res/values-sl/arrays.xml | 6 ------ res/values-sl/strings.xml | 3 ++- res/values-sq/arrays.xml | 6 ------ res/values-sq/strings.xml | 3 ++- res/values-sr/arrays.xml | 6 ------ res/values-sr/strings.xml | 3 ++- res/values-sv/arrays.xml | 6 ------ res/values-sv/strings.xml | 5 +++-- res/values-sw/arrays.xml | 6 ------ res/values-sw/strings.xml | 3 ++- res/values-ta/arrays.xml | 6 ------ res/values-ta/strings.xml | 3 ++- res/values-te/arrays.xml | 6 ------ res/values-te/strings.xml | 3 ++- res/values-th/arrays.xml | 6 ------ res/values-th/strings.xml | 3 ++- res/values-tl/arrays.xml | 6 ------ res/values-tl/strings.xml | 3 ++- res/values-tr/arrays.xml | 6 ------ res/values-tr/strings.xml | 3 ++- res/values-uk/arrays.xml | 6 ------ res/values-uk/strings.xml | 3 ++- res/values-ur/arrays.xml | 6 ------ res/values-ur/strings.xml | 3 ++- res/values-uz/arrays.xml | 6 ------ res/values-uz/strings.xml | 3 ++- res/values-vi/arrays.xml | 6 ------ res/values-vi/strings.xml | 3 ++- res/values-zh-rCN/arrays.xml | 6 ------ res/values-zh-rCN/strings.xml | 3 ++- res/values-zh-rHK/arrays.xml | 6 ------ res/values-zh-rHK/strings.xml | 3 ++- res/values-zh-rTW/arrays.xml | 6 ------ res/values-zh-rTW/strings.xml | 3 ++- res/values-zu/arrays.xml | 6 ------ res/values-zu/strings.xml | 3 ++- 170 files changed, 268 insertions(+), 697 deletions(-) diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml index 8e20e68c3e1..31d787ec5ca 100644 --- a/res/values-af/arrays.xml +++ b/res/values-af/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Druk knoppie" "PIN van eweknietoestel" diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 2654f5200ef..e5279a272ad 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -856,6 +856,7 @@ "Outo" "2,4 GHz-band" "5,0 GHz-band" + "5,0 GHz-band verkies" "2,4 GHz" "5,0 GHz" "Kies minstens een band vir Wi-Fi-warmkol:" @@ -3163,7 +3164,7 @@ "Gedemp, maar laat %1$s en %2$s toe" "Gedemp, maar laat %1$s, %2$s en %3$s toe" "Boodskappe, geleenthede en onthounotas" - "Boodskappe, onthounotas en geleenthede sal gedemp word wanneer Moenie Steur Nie aan is, met die uitsondering van die items wat jy hierbo toelaat. Jy kan boodskapinstellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik." + "Boodskappe, onthounotas en geleenthede sal gedemp word wanneer Moenie Steur Nie aan is, met die uitsondering van die items wat jy hierbo toelaat. Jy kan boodskapinstellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik." "Klaar" "Instellings" "Geen visuele elemente of klank van kennisgewings af nie" diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml index 67591cf1323..2cee52c7153 100644 --- a/res/values-am/arrays.xml +++ b/res/values-am/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "አዝራር ተጫን" "ፒን ከአቻ መሣሪያ" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 609611fde7a..e97c28ceb75 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -856,6 +856,7 @@ "ራስ-ሰር" "2.4 ጊሄዝ ባንድ" "5.0 ጊኸ ባንድ" + "5.0 ጊኸዝ ባንድ ይመረጣል" "2.4 ጊኸ" "5.0 ጊኸ" "ለWi-Fi መገናኛ ነጥብ ቢያንስ አንድ ሞገድ ይምረጡ፦" @@ -1183,7 +1184,7 @@ "የውሂብ ሲም ይቀየር?" "ለተንቀሳቃሽ ስልክ ውሂብ በ%2$s ፈንታ %1$sን ይጠቀሙ?" "ተመራጩ ሲም ይዘመን?" - "%1$s በእርስዎ መሣሪያ ላይ ያለው ብቸኛ ሲም ነው። ይህን ሲም ለተንቀሳቃሽ ስልክ ውሂብ፣ ጥሪዎች እና የኤስኤምኤስ መልእክቶች መጠቀም ይፈልጋሉ?" + "%1$s በእርስዎ መሣሪያ ላይ ያለው ብቸኛ ሲም ነው። ይህን ሲም ለተንቀሳቃሽ ስልክ ውሂብ፣ ጥሪዎች እና የኤስኤምኤስ መልዕክቶች መጠቀም ይፈልጋሉ?" "ልክ ያልሆነ የሲም ኮድ። አሁን መሳሪያዎን ለማስከፈት ድምጸ ተያያዥ ሞደምዎን ማግኘት አለብዎ።" ልክ ያልሆነ የሲም ፒን ኮድ፣ %d ሙከራዎች ይቀርዎታል። @@ -3163,7 +3164,7 @@ "ድምጸ-ከል ተደርጎበታል፣ ነገር ግን %1$sን እና %2$sን ፍቀድ" "ድምጸ-ከል ተደርጎበታል፣ ነገር ግን %1$sን፣ %2$sን እና %3$sን ፍቀድ" "መልዕክቶች፣ ክስተቶች እና አስታዋሾች" - "አትረብሽ ሲበራ ከላይ ከሚፈቅዷቸው ንጥሎች በስተቀር መልዕክቶች፣ አስታዋሾች እና ክስተቶች ድምጸ-ከል ይደረግባቸዋል። የእርስዎ ጓደኛዎች፣ ቤተሰብ እና ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ የመልዕክት ቅንብሮችን ማስተካከል ይችላሉ።" + "አትረብሽ ሲበራ ከላይ ከሚፈቅዷቸው ንጥሎች በስተቀር መልዕክቶች፣ አስታዋሾች እና ክስተቶች ድምጸ-ከል ይደረግባቸዋል። የእርስዎ ጓደኛዎች፣ ቤተሰብ እና ሌሎች እውቂያዎች እርስዎን ማግኘት እንዲችሉ የመልዕክት ቅንብሮችን ማስተካከል ይችላሉ።" "ተከናውኗል" "ቅንብሮች" "ማሳወቂያዎች ላይ ምንም ምስሎች ወይም ድምጽ የለም" diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml index ce19c03f727..9e0172b7580 100644 --- a/res/values-ar/arrays.xml +++ b/res/values-ar/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "زر الدفع" "رقم تعريف شخصي من جهاز نظير" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 0a4239d6f60..79704139a47 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -900,6 +900,7 @@ "تلقائي" "نطاق بتردد ٢٫٤ غيغاهرتز" "نطاق بتردد 5.0 غيغاهرتز" + "يفضّل نطاق بتردد 5.0 غيغاهرتز" "٢٫٤ غيغاهرتز" "5.0 غيغاهرتز" "‏اختر نطاقًا واحدًا على الأقل لنقطة اتصال Wi‑Fi:" @@ -1360,7 +1361,7 @@ "MIDI" "‏للسماح للتطبيقات التي تمكّن MIDI بالعمل عبر USB باستخدام برامج MIDI على الكمبيوتر." "مستخدمون آخرون" - "السعة التخزينية للجهاز" + "سعة التخزين للجهاز" "وحدة تخزين محمولة" "تم استخدام %1$s من %2$s" "^1"" ^2""" @@ -1391,7 +1392,7 @@ "استكشاف ^1" "‏تشمل الملفات الأخرى الملفات المشتركة التي تم حفظها بواسطة التطبيقات والملفات التي تم تنزيلها من مواقع الإنترنت أو عبر البلوتوث وملفات Android وما إلى ذلك. \n\nللاطلاع على المحتويات المرئية على بطاقة ^1 هذه، انقر على \"استكشاف\"." "‏يتضمّن النظام الملفات المستخدمة لتشغيل إصدار Android %s" - "ربما يكون لدى ^1 صور أو موسيقى أو تطبيقات أو بيانات أخرى محفوظة، ويتم استخدام ^2 من السعة التخزينية. \n\nللاطلاع على التفاصيل، يمكنك التبديل إلى ^1." + "ربما يكون لدى ^1 صور أو موسيقى أو تطبيقات أو بيانات أخرى محفوظة، ويتم استخدام ^2 من سعة التخزين. \n\nللاطلاع على التفاصيل، يمكنك التبديل إلى ^1." "إعداد ^1" "الاستخدام كوحدة تخزين محمولة" "لنقل الصور والوسائط الأخرى بين الأجهزة." @@ -3311,7 +3312,7 @@ "تمّ كتم الصوت مع السماح لـ %1$s و%2$s." "تمّ كتم الصوت مع السماح لـ %1$s و%2$s و%3$s." "الرسائل والأحداث والتذكيرات" - "عند تفعيل الإعداد \"الرجاء عدم الإزعاج\"، سيتم تجاهل الإشعارات عن الرسائل والتذكيرات والأحداث، باستثناء الإشعارات التي تسمح بها أعلاه. يمكنك ضبط إعدادات الرسائل للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك." + "عند تفعيل الإعداد \"الرجاء عدم الإزعاج\"، سيتم تجاهل الإشعارات عن الرسائل والتذكيرات والأحداث، باستثناء الإشعارات التي تسمح بها أعلاه. يمكنك ضبط إعدادات الرسائل للسماح لأصدقائك أو أفراد عائلتك أو جهات الاتصال الأخرى بالتواصل معك." "تمّ" "الإعدادات" "بلا عناصر مرئيّة أو أصوات من الإشعارات." @@ -3620,9 +3621,9 @@ "وحدة تخزين خارجية" "استخدام التطبيقات للبيانات" "تم استخدام %1$s منذ %2$s" - "السعة التخزينية المستخدمة" + "سعة التخزين المستخدمة" "تغيير" - "تغيير السعة التخزينية" + "تغيير سعة التخزين" "الإشعارات" "تشغيل" "تشغيل / %1$s" @@ -4025,7 +4026,7 @@ قيد واحد "قد تختلف طريقة حساب بيانات مشغِّل شبكة الجوّال عن طريقة الحساب على الجهاز." - "%1$s مستخدم" + "%1$s مستخدَمة" "ضبط تحذيرات استخدام البيانات" "تحذيرات البيانات" "يتم قياس التحذيرات والحد الأقصى للبيانات بواسطة جهازك. وقد يختلف هذا القياس عن بيانات مشغِّل شبكة الجوّال." @@ -4231,7 +4232,7 @@ "التطبيقات الفورية" "تفضيلات التطبيقات الفورية" "التطبيقات المثبَّتة" - "تتم إدارة السعة التخزينية لجهازك الآن عن طريق مدير السعة التخزينية" + "تتم إدارة سعة التخزين لجهازك الآن عن طريق مدير سعة التخزين" "حسابات %1$s" "تهيئة" "مزامنة البيانات تلقائيًا" diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml index 130882e1282..3987bcc7630 100644 --- a/res/values-as/arrays.xml +++ b/res/values-as/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "পুশ্ব বুটাম" "সংযুক্ত ডিভাইচৰ পৰা পিন" diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index 87e2d26cc07..31f9c923861 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -855,6 +855,7 @@ "স্বয়ংক্ৰিয়" "২.৪ গিগাহাৰ্টজ বেণ্ড" "৫.০ গিগাহাৰ্টজ বেণ্ড" + "৫.০ গিগাহাৰ্টজ বেণ্ডক অগ্ৰাধিকাৰ দিয়া হৈছে" "২.৪ গিগাহাৰ্টজ" "৫.০ গিগাহাৰ্টজ" "ৱাই-ফাই হ\'টস্প\'টৰ বাবে কমেও এটা বেণ্ড বাছনি কৰক:" @@ -3162,7 +3163,7 @@ "মিউট কৰা হৈছে, কিন্তু %1$s আৰু %2$sক অনুমতি দিয়ক" "মিউট কৰা হৈছে, কিন্তু %1$s, %2$s আৰু %3$sক অনুমতি দিয়ক" "বাৰ্তা, কাৰ্যক্ৰম আৰু সোঁৱৰণিসমূহ" - "অসুবিধা নিদিব ম\'ড অন থকা অৱস্থাত আপুনি ওপৰত অনুমতি দিয়া বস্তুবোৰৰ বাহিৰে বাৰ্তা, সোঁৱৰণী আৰু কাৰ্যক্ৰমবোৰ মিউট কৰা হ\'ব। আপুনি নিজৰ বন্ধু, পৰিয়ালৰ সদস্য় বা অন্য় সম্পৰ্কসমূহক আপোনাৰ সৈতে যোগাযোগ কৰিবৰ বাবে অনুমতি দিবলৈ ছেটিংসমূহ মিলাব পাৰে।" + "অসুবিধা নিদিব ম\'ড অন থকা অৱস্থাত আপুনি ওপৰত অনুমতি দিয়া বস্তুবোৰৰ বাহিৰে বাকী বাৰ্তা, ৰিমাইণ্ডাৰ আৰু কাৰ্যক্ৰম মিউট কৰা হ\'ব। আপুনি নিজৰ বন্ধু, পৰিয়ালৰ সদস্য় বা অন্য় সম্পৰ্কসমূহক আপোনাৰ সৈতে যোগাযোগ কৰিবৰ বাবে অনুমতি দিবলৈ বাৰ্তাৰ ছেটিংসমূহ মিলাব পাৰে।" "হ’ল" "ছেটিংবোৰ" "জাননীৰ লগত জড়িত দৃশ্য বা ধ্বনি নিষেধ" diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml index 1afba41902c..ac2bb7395fa 100644 --- a/res/values-az/arrays.xml +++ b/res/values-az/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Düyməyə basın" "Eynisəviyyəli cihazdan PIN" diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index 2fdd4fb3a49..75e73ba44d8 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -856,6 +856,7 @@ "Avtomatik" "2.4 GHz Diapazon" "5.0 GHz Band" + "5.0 GHz Band tərcih edilir" "2.4 GHz" "5.0 GHz" "Wi‑Fi hotspotu üçün minimum bir bağlantı seçin:" @@ -3163,7 +3164,7 @@ "Səssizdədir, %1$s və %2$s icazəli olmalıdır" "Səssizdir, %1$s, %2$s və %3$s icazəli olamlıdır" "Mesaj, tədbir və xatırlatmalar" - "\"Narahat Etməyin\" aktiv olduğu zaman yuxarıda seçdiyiniz elementlər istisna olmaqla mesaj, xatırlatma və tədbirlər səssiz ediləcək. Dostlar, ailə və digər kontaktların Sizinlə əlaqə saxlaması üçün ayarları nizamlaya bilərsiniz." + "\"Narahat Etməyin\" aktiv olduğu zaman yuxarıda seçdiyiniz elementlər istisna olmaqla mesaj, xatırlatma və tədbirlər səssiz ediləcək. Dostlar, ailə və digər kontaktların Sizinlə əlaqə saxlaması üçün ayarları nizamlaya bilərsiniz." "Hazırdır" "Ayarlar" "Bildirişlər görünməyəcək və səs çıxartmayacaq" diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml index 7c75ebb8424..f1ab846de60 100644 --- a/res/values-b+sr+Latn/arrays.xml +++ b/res/values-b+sr+Latn/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Pritiskanje dugmeta" "PIN sa ravnopravnog uređaja" diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index 134d3e1c087..45c80edaca5 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -867,6 +867,7 @@ "Automatski" "Opseg od 2,4 GHz" "Opseg od 5,0 GHz" + "Prednost se daje opsegu od 5.0 GHz" "2,4 GHz" "5,0 GHz" "Izaberite barem jedan opseg za Wi‑Fi hotspot:" @@ -3200,7 +3201,7 @@ "Zvuk je isključen, ali dozvoli za: %1$s i %2$s" "Zvuk je isključen, ali dozvoli za: %1$s, %2$s i %3$s" "Poruke, događaji i podsetnici" - "Kada je uključen režim Ne uznemiravaj, zvukovi obaveštenja za poruke, podsetnike i događaje će biti isključeni, osim za stavke koje ste dozvolili iznad. Možete da prilagodite podešavanja da biste dozvolili prijateljima, članovima porodice ili drugim kontaktima da vas kontaktiraju." + "Kada je uključen režim Ne uznemiravaj, zvukovi obaveštenja za poruke, podsetnike i događaje će biti isključeni, osim za stavke koje ste dozvolili iznad. Možete da prilagodite podešavanja da biste dozvolili prijateljima, članovima porodice ili drugim kontaktima da vas kontaktiraju." "Gotovo" "Podešavanja" "Bez zvučnog signala ili vizuelnog obaveštenja" diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml index bff1b3832c7..bf1632833ed 100644 --- a/res/values-be/arrays.xml +++ b/res/values-be/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Націсніце кнопку" "PIN-код ад пірынгавай прылады" diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 511576e2a33..43144ac4f99 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -878,6 +878,7 @@ "Аўтаматычна" "Дыяпазон 2,4 ГГц" "Дыяпазон 5,0 ГГц" + "Прыярытэтны дыяпазон 5,0 ГГц" "2,4 ГГц" "5,0 ГГц" "Выберыце як мінімум адзін дыяпазон для хот-спота Wi‑Fi:" @@ -3046,7 +3047,7 @@ "месца, дыск, цвёрды дыск, выкарыстанне прылады" "спажыванне энергіі, зарадка" "правапіс, слоўнік, праверка арфаграфіі, аўтавыпраўленне" - "праграма распазнання, увод, гаворка, гаварыць, мова, hands-free, без дапамогі рук, распазнанне, абразлівы, слова, аўдыя, гісторыя, гарнітура bluetooth" + "праграма распазнавання, увод, маўленне, гаварыць, мова, hands-free, без рук, распазнаванне, абразлівы, слова, аўдыя, гісторыя, гарнітура bluetooth" "ацаніць, мова, стандартная, гаварыць, гаворка, сінтэз, даступнасць, праграма чытання, сляпы" "гадзіннік, вайсковы стыль" "скінуць, аднавіць, заводскія параметры" @@ -3238,7 +3239,7 @@ "Без гуку, акрамя элементаў \"%1$s\" і \"%2$s\"" "Без гуку, акрамя элементаў \"%1$s\", \"%2$s\" і \"%3$s\"" "Паведамленні, падзеі і напаміны" - "Калі ўключаны рэжым \"Не турбаваць\", выключаецца гук для паведамленняў, напамінаў і падзей, акрамя выбраных вамі элементаў вышэй. Вы можаце змяніць налады паведамленняў, каб дазволіць сябрам, членам сям\'і і іншым кантактам звязацца з вамі." + "Калі ўключаны рэжым \"Не турбаваць\", выключаецца гук для паведамленняў, напамінаў і падзей, акрамя выбраных вышэй элементаў. Вы можаце змяніць налады паведамленняў, каб дазволіць сябрам, членам сям\'і і іншым кантактам звязацца з вамі." "Гатова" "Налады" "Апавяшчэнні без візуальных элементаў і гуку" diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml index a165eb23e36..f0abdf43548 100644 --- a/res/values-bg/arrays.xml +++ b/res/values-bg/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Бутон" "ПИН от съответното устройство" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 9fae44a6007..18bf7694c15 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -856,6 +856,7 @@ "Автоматично" "Честота при 2,4 ГХц" "Честота при 5 ГХц" + "Предпочита се честота от 5 ГХц" "2,4 ГХц" "5 ГХц" "Изберете поне една честота за точката за достъп до Wi‑Fi:" @@ -3163,7 +3164,7 @@ "Звукът е спрян, но %1$s и %2$s са разрешени" "Звукът е спрян, но %1$s, %2$s и %3$s са разрешени" "Съобщения, събития и напомняния" - "Когато режимът „Не безпокойте“ е включен, съобщенията, напомнянията и събитията ще бъдат спрени – това не се отнася за елементите, разрешени от вас по-горе. Можете да коригирате настройките за съобщенията, за да разрешите на близки и приятели и други контакти да се свързват с вас." + "Когато режимът „Не безпокойте“ е включен, съобщенията, напомнянията и събитията ще бъдат спрени – това не се отнася за елементите, разрешени от вас по-горе. Можете да коригирате настройките за съобщенията, за да разрешите на близки и приятели и други контакти да се свързват с вас." "Готово" "Настройки" "Без визуално прекъсване или звук от известията" diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml index 328ff64487e..ba07b914cd8 100644 --- a/res/values-bn/arrays.xml +++ b/res/values-bn/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "পুশ বোতাম" "চেনা ডিভাইস থেকে পিন" @@ -466,7 +460,7 @@ "ক্রমাগত" - "শীর্ষ কার্যকলাপ" + "শীর্ষ অ্যাক্টিভিটি" "গুরুত্বপূর্ণ (পুরোভাগে)" "গুরুত্বপূর্ণ (পশ্চাদপট)" "ব্যাকআপ" @@ -475,9 +469,9 @@ "পরিষেবা (আবার চালু হচ্ছে)" "রিসিভার" "হোম" - "সর্বশেষ কার্যকলাপ" - "ব্যবহৃত ক্যাশে (কার্যকলাপ)" - "ব্যবহৃত ক্যাশে (কার্যকলাপ ক্লায়েন্ট)" + "সর্বশেষ অ্যাক্টিভিটি" + "ব্যবহৃত ক্যাশে (অ্যাক্টিভিটি)" + "ব্যবহৃত ক্যাশে (অ্যাক্টিভিটি ক্লায়েন্ট)" "ব্যবহৃত ক্যাশে (খালি)" diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index 5e721016de2..b9f01951254 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -286,7 +286,7 @@ "শীর্ষে সরান" "নিচে সরান" "ভাষা সরান" - "কার্যকলাপ বেছে নিন" + "অ্যাক্টিভিটি বেছে নিন" "ডিভাইস তথ্য" "স্ক্রিন" "ট্যাবলেট তথ্য" @@ -303,7 +303,7 @@ "সেটিংস" "সেটিংস" "সেটিংস শর্টকাট" - "কোনো সমরূপ কার্যকলাপ খুঁজে পাওয়া যায়নি৷" + "কোনো সমরূপ অ্যাক্টিভিটি খুঁজে পাওয়া যায়নি৷" "বিমান মোড" "আরো" "ওয়্যারলেস ও নেটওয়ার্ক" @@ -856,6 +856,7 @@ "অটোমেটিক" "২.৪ GHz ব্যান্ড" "৫.০ GHz ব্যান্ড" + "৫.০ গিগা হার্জ ব্যান্ড পছন্দসই" "২.৪ GHz" "৫.০ GHz" "ওয়াই-ফাই হটস্পটের জন্য অন্তত একটি ব্যান্ড বেছে নিন:" @@ -1095,7 +1096,7 @@ "উপলব্ধ আলোর জন্য সমন্বয় করবেন না" "ব্যাটারির ব্যবহার বেড়ে যায়" "উপলব্ধ আলোর জন্য মানানসই উজ্জ্বলতার স্তর। যখন এই বৈশিষ্ট্যটি চালু থাকবে, তখনও অস্থায়ীভাবে আপনি উজ্জ্বলতা নিয়ন্ত্রণ করতে পারবেন।" - "আপনার পারিপার্শ্বিক অবস্থা এবং কার্যকলাপ অনুযায়ী স্ক্রিনের উজ্জ্বলতা নিজে থেকেই অ্যাডজাস্ট করে নেওয়া হবে। স্ক্রিন কতখানি উজ্জ্বল হলে আপনার সুবিধা হয়, তা আপনি স্লাইডারের মাধ্যমে নির্দিষ্ট করে দিতে পারেন।" + "আপনার পারিপার্শ্বিক অবস্থা এবং অ্যাক্টিভিটি অনুযায়ী স্ক্রিনের উজ্জ্বলতা নিজে থেকেই অ্যাডজাস্ট করে নেওয়া হবে। স্ক্রিন কতখানি উজ্জ্বল হলে আপনার সুবিধা হয়, তা আপনি স্লাইডারের মাধ্যমে নির্দিষ্ট করে দিতে পারেন।" "নাইট লাইট" "নাইট লাইট আপনার স্ক্রিনকে হলুদাভ করে দেয়৷ এটি আপনাকে অল্প আলোয় স্ক্রিনের দিকে স্বচ্ছন্দে তাকানোর সুবিধা দেয় এবং খুব ঘুমিয়ে পড়তে সাহায্য করতে পারে৷" "সময়সূচি" @@ -2112,9 +2113,9 @@ "অ্যাপটি পটভূমিতে চলতে দিন" "অ্যাপটির পটভুমিতে চালু থাকার অনুমতি নেই" "ব্যাকগ্রাউন্ডে ব্যবহারের সীমা নির্দিষ্ট করা যায় না" - "ব্যাকগ্রাউন্ড কার্যকলাপ সীমিত করবেন?" - "কোনও অ্যাপের ব্যাকগ্রাউন্ড কার্যকলাপ সীমিত করলে তা সঠিক ভাবে কাজ নাও করতে পারে" - "যেহেতু এই অ্যাপটিকে ব্যাটারি অপ্টিমাইজ করার জন্য সেট করা হয়নি, তাই আপনি এটির কার্যকলাপ সীমিত করতে পারবেন না।\n\nঅ্যাপের কার্যকলাপ সীমিত করতে আগে ব্যাটারি অপ্টিমাইজেশন চালু করুন।" + "ব্যাকগ্রাউন্ড অ্যাক্টিভিটি সীমিত করবেন?" + "কোনও অ্যাপের ব্যাকগ্রাউন্ড অ্যাক্টিভিটি সীমিত করলে তা সঠিক ভাবে কাজ নাও করতে পারে" + "যেহেতু এই অ্যাপটিকে ব্যাটারি অপ্টিমাইজ করার জন্য সেট করা হয়নি, তাই আপনি এটির অ্যাক্টিভিটি সীমিত করতে পারবেন না।\n\nঅ্যাপের অ্যাক্টিভিটি সীমিত করতে আগে ব্যাটারি অপ্টিমাইজেশন চালু করুন।" "সম্পূর্ণ চার্জ করার সময় থেকে স্ক্রিনের ব্যবহার" "স্ক্রিনের জন্য ব্যবহার" "মোবাইল নেটওয়ার্ক স্ক্যান করা" @@ -2148,7 +2149,7 @@ "ডিভাইসটিকে সক্রিয় রাখা হচ্ছে" "ডিভাইসটিকে পটভূমিতে সক্রিয় করা হচ্ছে" "বারবার অবস্থানের অনুরোধ করা হচ্ছে" - "%1$dটি অ্যাপে অস্বাভাবিক কার্যকলাপ দেখা যাচ্ছে" + "%1$dটি অ্যাপে অস্বাভাবিক অ্যাক্টিভিটি দেখা যাচ্ছে" "অ্যাপগুলি স্বাভাবিকভাবে কাজ করছে" "ফোনের ব্যাকগ্রাউন্ডে স্বাভাবিক পরিমাণে ব্যাটারি ব্যবহার হচ্ছে" "ট্যাবলেটের ব্যাকগ্রাউন্ডে স্বাভাবিক পরিমাণে ব্যাটারি ব্যবহার হচ্ছে" @@ -2439,7 +2440,7 @@ "লক সেট করুন" "ব্যবহারের অ্যাক্সেস যুক্ত অ্যাপ্স" "আপদকালীন ডায়ালিং সিগন্যাল" - "জরুরি কল স্থাপন করা সময় কি ধরণের কার্যকলাপ করবে তা সেট করুন" + "জরুরি কল স্থাপন করা সময় কি ধরণের অ্যাক্টিভিটি করবে তা সেট করুন" "ব্যাক-আপ" "ব্যাকআপ ও পুনরুদ্ধার" "ব্যক্তিগত ডেটা" @@ -2471,7 +2472,7 @@ "এই প্রশাসক অ্যাপটি সক্রিয় করলে তা %1$s অ্যাপকে নিম্নলিখিত কাজগুলি করতে দেবে।" "এই প্রশাসক অ্যাপটি সক্রিয় এবং %1$s অ্যাপকে নিম্নলিখিত কাজগুলি করতে দেয়।" "প্রোফাইল ম্যানেজার সক্রিয় করবেন?" - "এগিয়ে যাওয়ার মাধ্যমে, প্রশাসক দ্বারা আপনার ব্যবহারকারী পরিচালিত হবে যা আপনার ব্যক্তিগত ডেটা ছাড়াও অন্যান্য সম্পর্কিত ডেটা সঞ্চয়ে সক্ষম।\n\nআপনার প্রশাসক এই ব্যবহারকারীর সাথে সম্পর্কিত সেটিংস, অ্যাক্সেস, অ্যাপ এবং ডেটা নিরীক্ষণ ও পরিচালনা করতে পারেন, যাতে সামিল রয়েছে নেটওয়ার্ক কার্যকলাপ এবং আপনার ডিভাইসের লোকেশন তথ্য।" + "এগিয়ে যাওয়ার মাধ্যমে, প্রশাসক দ্বারা আপনার ব্যবহারকারী পরিচালিত হবে যা আপনার ব্যক্তিগত ডেটা ছাড়াও অন্যান্য সম্পর্কিত ডেটা সঞ্চয়ে সক্ষম।\n\nআপনার প্রশাসক এই ব্যবহারকারীর সাথে সম্পর্কিত সেটিংস, অ্যাক্সেস, অ্যাপ এবং ডেটা নিরীক্ষণ ও পরিচালনা করতে পারেন, যাতে সামিল রয়েছে নেটওয়ার্ক অ্যাক্টিভিটি এবং আপনার ডিভাইসের লোকেশন তথ্য।" "আপনার প্রশাসক অন্যান্য বিকল্পগুলিকে অক্ষম করেছেন" "আরো বিশদ বিবরণ" "সাধারণ" @@ -2754,8 +2755,8 @@ টি শংসাপত্রের উপরে ভরসা করুন বা সেগুলিকে সরান - %sআপনার ডিভাইসের জন্য একটি সার্টিফিকেট কর্তৃপক্ষকে ইনস্টল করেছে, যেটি তাদেরকে ইমেল, অ্যাপ্লিকেশন এবং নিরাপদ ওয়েবসাইটগুলি সহ ডিভাইসের নেটওয়ার্ক কার্যকলাপ নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই সার্টিফিকেটগুলির সম্পর্কে আরও তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷ - %sআপনার ডিভাইসের জন্য একটি সার্টিফিকেট কর্তৃপক্ষকে ইনস্টল করেছে, যেটি তাদেরকে ইমেল, অ্যাপ্লিকেশন, এবং নিরাপদ ওয়েবসাইটগুলি সহ ডিভাইসের নেটওয়ার্ক কার্যকলাপ নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই সার্টিফিকেটগুলির সম্পর্কে আরও তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷ + %sআপনার ডিভাইসের জন্য একটি সার্টিফিকেট কর্তৃপক্ষকে ইনস্টল করেছে, যেটি তাদেরকে ইমেল, অ্যাপ্লিকেশন এবং নিরাপদ ওয়েবসাইটগুলি সহ ডিভাইসের নেটওয়ার্ক অ্যাক্টিভিটি নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই সার্টিফিকেটগুলির সম্পর্কে আরও তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷ + %sআপনার ডিভাইসের জন্য একটি সার্টিফিকেট কর্তৃপক্ষকে ইনস্টল করেছে, যেটি তাদেরকে ইমেল, অ্যাপ্লিকেশন, এবং নিরাপদ ওয়েবসাইটগুলি সহ ডিভাইসের নেটওয়ার্ক অ্যাক্টিভিটি নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই সার্টিফিকেটগুলির সম্পর্কে আরও তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷ %sআপনার অফিস প্রোফাইলের জন্য সার্টিফিকেটের কর্তৃপক্ষগুলিকে ইনস্টল করেছে, যেগুলি তাদেরকে ইমেল, অ্যাপ্লিকেশন এবং নিরাপদ ওয়েবসাইটগুলি সহ অফিস নেটওয়ার্কের কার্যকলাপকে নিরীক্ষণ করার অনুমতি দিতে পারে৷\n\nএই সার্টিফিকেটগুলির সম্পর্কে আরও তথ্যের জন্য, আপনার প্রশাসকের সাথে যোগাযোগ করুন৷ @@ -3163,7 +3164,7 @@ "মিউট করা, কিন্তু %1$s এবং %2$s-এর অনুমতি দিন" "মিউট করা, কিন্তু %1$s, %2$s এবং %3$s-এর অনুমতি দিন" "মেসেজ, ইভেন্ট ও রিমাইন্ডার" - "\'বিরক্ত করবেন না\' মোড চালু থাকলে আপনি উপরে যে আইটেমগুলি ব্যতিক্রম হিসেবে চিহ্নিত করবেন সেগুলি ছাড়া বাকি সমস্ত মেসেজ, রিমাইন্ডার এবং ইভেন্ট মিউট করা হবে। আপনার বন্ধুবান্ধব, পরিবারের সদস্য অথবা অন্য পরিচিতিরা যাতে আপনার সাথে যোগাযোগ করতে পারেন তার জন্য আপনি মেসেজের সেটিংস অ্যাডজাস্ট করে নিতে পারেন।" + "\'বিরক্ত করবেন না\' মোড চালু থাকলে আপনি উপরে যে আইটেমগুলি ব্যতিক্রম হিসেবে চিহ্নিত করবেন সেগুলি ছাড়া বাকি সমস্ত মেসেজ, রিমাইন্ডার এবং ইভেন্ট মিউট করা হবে। আপনার বন্ধুবান্ধব, পরিবারের সদস্য অথবা অন্য পরিচিতিরা যাতে আপনার সাথে যোগাযোগ করতে পারেন তার জন্য আপনি মেসেজের সেটিংস অ্যাডজাস্ট করে নিতে পারেন।" "হয়ে গেছে" "সেটিংস" "বিজ্ঞপ্তি থেকে কোনওকিছু দেখা বা শোনা যাবে না" @@ -3546,8 +3547,8 @@ "অ্যাপের ব্যবহার দেখান" "অনেক বেশি ব্যাটারি ব্যবহার করে" - %2$dটি অ্যাপে অস্বাভাবিক কার্যকলাপ দেখা যাচ্ছে - %2$dটি অ্যাপে অস্বাভাবিক কার্যকলাপ দেখা যাচ্ছে + %2$dটি অ্যাপে অস্বাভাবিক অ্যাক্টিভিটি দেখা যাচ্ছে + %2$dটি অ্যাপে অস্বাভাবিক অ্যাক্টিভিটি দেখা যাচ্ছে অ্যাপ চলতে থাকার জন্য ব্যাটারি শেষ হচ্ছে @@ -3726,9 +3727,9 @@ "এই অ্যাপটি চালু করা যাবে না" "আপনার যদি কোনও প্রশ্ন থাকে তাহলে আপনার আইটি অ্যাডমিনের সাথে যোগাযোগ করুন" "আরো বিশদ বিবরণ" - "আপনার প্রশাসক আপনার কর্মস্থলের প্রোফাইলের সাথে সম্পর্কিত অ্যাপ এবং ডেটা নিরীক্ষণ ও পরিচালনা করতে পারেন, যাতে সামিল রয়েছে সেটিংস, অনুমতি, কর্পোরেট অ্যাক্সেস, নেটওয়ার্ক কার্যকলাপ এবং ডিভাইসের লোকেশন তথ্য।" - "আপনার প্রশাসক এই ব্যবহারকারীর সাথে সম্পর্কিত অ্যাপ এবং ডেটা নিরীক্ষণ ও পরিচালনা করতে পারেন, যাতে সামিল রয়েছে সেটিংস, অনুমতি, কর্পোরেট অ্যাক্সেস, নেটওয়ার্ক কার্যকলাপ এবং ডিভাইসের লোকেশন তথ্য।" - "আপনার প্রশাসক এই ডিভাইসের সাথে সম্পর্কিত অ্যাপ এবং ডেটা নিরীক্ষণ ও পরিচালনা করতে পারেন, যাতে সামিল রয়েছে সেটিংস, অনুমতি, কর্পোরেট অ্যাক্সেস, নেটওয়ার্ক কার্যকলাপ এবং ডিভাইসের লোকেশন তথ্য।" + "আপনার প্রশাসক আপনার কর্মস্থলের প্রোফাইলের সাথে সম্পর্কিত অ্যাপ এবং ডেটা নিরীক্ষণ ও পরিচালনা করতে পারেন, যাতে সামিল রয়েছে সেটিংস, অনুমতি, কর্পোরেট অ্যাক্সেস, নেটওয়ার্ক অ্যাক্টিভিটি এবং ডিভাইসের লোকেশন তথ্য।" + "আপনার প্রশাসক এই ব্যবহারকারীর সাথে সম্পর্কিত অ্যাপ এবং ডেটা নিরীক্ষণ ও পরিচালনা করতে পারেন, যাতে সামিল রয়েছে সেটিংস, অনুমতি, কর্পোরেট অ্যাক্সেস, নেটওয়ার্ক অ্যাক্টিভিটি এবং ডিভাইসের লোকেশন তথ্য।" + "আপনার প্রশাসক এই ডিভাইসের সাথে সম্পর্কিত অ্যাপ এবং ডেটা নিরীক্ষণ ও পরিচালনা করতে পারেন, যাতে সামিল রয়েছে সেটিংস, অনুমতি, কর্পোরেট অ্যাক্সেস, নেটওয়ার্ক অ্যাক্টিভিটি এবং ডিভাইসের লোকেশন তথ্য।" "বন্ধ করুন" "চালু করুন" "দেখান" @@ -3919,7 +3920,7 @@ "%1$s - %2$s" "কর্মস্থলের প্রোফাইলের সেটিংস" "পরিচিতির সার্চ" - "কলারদের এবং পরিচিতিগুলিকে চিহ্নিত করতে আপনার প্রতিষ্ঠান দ্বারা পরিচিতি অনুসন্ধানের অনুমতি দিন" + "কলারদের এবং পরিচিতিগুলিকে চিহ্নিত করতে আপনার প্রতিষ্ঠান দ্বারা পরিচিতি সার্চের অনুমতি দিন" %s ঘণ্টা %s ঘণ্টা diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml index 053105790e8..f5ab2676aaf 100644 --- a/res/values-bs/arrays.xml +++ b/res/values-bs/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Pritisnite dugme" "PIN ravnopravnog uređaja" diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index c83574b87b8..61858c7097d 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -867,6 +867,7 @@ "Automatski" "Opseg od 2.4 GHz" "Opseg od 5,0 GHz" + "Preferira se opseg od 5,0 GHz" "2,4 GHz" "5,0 GHz" "Odaberite barem jedan frekvencijski pojas za Wi‑Fi pristupnu tačku:" @@ -3200,7 +3201,7 @@ "Zvuk je isključen, ali omogući %1$s i %2$s" "Zvuk je isključen, ali omogući %1$s, %2$s i %3$s" "Poruke, događaji i podsjetnici" - "Kada je uključen način rada Ne ometaj, zvuk poruka, podsjetnika i događaja će biti isključen, osim za stavke koje omogućite iznad. Postavke poruka možete podesiti tako da omogućite prijateljima, porodici ili drugim kontaktima da vas kontaktiraju." + "Kada je uključen način rada Ne ometaj, zvuk poruka, podsjetnika i događaja će se isključiti, osim za stavke kojim dozvolite iznad. Postavke poruka možete podesiti tako da prijateljima, porodici ili drugim kontaktima omogućite da vas kontaktiraju." "Gotovo" "Postavke" "Obavještenja bez vizuelnih elemenata ili zvuka" diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml index 7cb5b6eae05..559a351ef56 100644 --- a/res/values-ca/arrays.xml +++ b/res/values-ca/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Botó per prémer" "PIN de l\'altre dispositiu" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index be4b720b465..81f0130d455 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -856,6 +856,7 @@ "Automàtica" "Banda de 2,4 GHz" "Banda de 5,0 GHz" + "Preferència per la banda de 5,0 GHz" "2,4 GHz" "5,0 GHz" "Tria almenys una banda per al punt d\'accés Wi-Fi:" @@ -974,8 +975,8 @@ "Preferència en itinerància" - "Preferència per a la Wi-Fi" - "Preferència per a dades mòbils" + "Preferència per la Wi-Fi" + "Preferència per dades mòbils" "Només Wi-Fi" @@ -989,8 +990,8 @@ "0" - "Preferència per a la Wi-Fi" - "Preferència per a dades mòbils" + "Preferència per la Wi-Fi" + "Preferència per dades mòbils" "Wi-Fi" @@ -3163,7 +3164,7 @@ "Silenciat, però permet %1$s i %2$s" "Silenciat, però permet %1$s, %2$s i %3$s" "Missatges, esdeveniments i recordatoris" - "Quan actives el mode No molestis, els missatges, els recordatoris i els esdeveniments se silencien, excepte aquells elements que hagis permès més amunt. Pots ajustar la configuració dels missatges per permetre que amics, familiars i altres contactes puguin contactar amb tu." + "Quan actives el mode No molestis, els missatges, els recordatoris i els esdeveniments se silencien, excepte aquells elements que hagis permès més amunt. Pots ajustar la configuració dels missatges per permetre que amics, familiars i altres contactes puguin contactar amb tu." "Fet" "Configuració" "Notificacions sense so ni elements visuals" diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml index 4051c880cdc..df27b051097 100644 --- a/res/values-cs/arrays.xml +++ b/res/values-cs/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Stisknutí tlačítka" "PIN ze sdíleného zařízení" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 4a493bf335c..f624d111338 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -878,6 +878,7 @@ "Automatické" "Pásmo 2,4 GHz" "Pásmo 5,0 GHz" + "Upřednostňované pásmo 5,0 GHz" "2,4 GHz" "5,0 GHz" "Vyberte alespoň jedno pásmo pro hotspot Wi-Fi:" @@ -3237,7 +3238,7 @@ "Ztlumeno, ale povolit %1$s a %2$s" "Ztlumeno, ale povolit %1$s, %2$s a %3$s" "Zprávy, události a připomenutí" - "Když je zapnut režim Nerušit, zprávy, připomenutí a události budou ztlumeny (kromě položek, které povolíte výše). Nastavení zpráv můžete upravit, aby vás mohli kontaktovat kamarádi, členové rodiny nebo jiní vybraní lidé." + "Když je zapnut režim Nerušit, zprávy, připomenutí a události budou ztlumeny (kromě položek, které povolíte výše). Nastavení zpráv můžete upravit, aby vás mohli kontaktovat kamarádi, členové rodiny nebo jiní vybraní lidé." "Hotovo" "Nastavení" "Oznámení bez vizuálního a zvukového upozornění" diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml index 7f48f350c4f..d05f10fc680 100644 --- a/res/values-da/arrays.xml +++ b/res/values-da/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Trykknap" "Pinkode fra din vens enhed" @@ -303,7 +297,7 @@ "skriv til baggrund" "forslagsstruktur" "forslagsscreenshot" - "læs telefontilstand" + "læse telefonstatus" "tilføj telefonsvarer" "brug SIP" "håndter udgående opkald" @@ -370,7 +364,7 @@ "Skriv til baggrund" "Forslagsstruktur" "Forslagsscreenshot" - "Læs telefontilstand" + "Læs telefonstatus" "Tilføj telefonsvarer" "Brug SIP" "Håndter udgående opkald" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index e4ff630a172..e116a575d56 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -184,8 +184,8 @@ "Gemte enheder" "Tilføj enhed" "Bluetooth aktiveres for at parre" - "Præferencer for forbindelse" - "Tidligere tilsluttede enheder" + "Forbindelsesindstillinger" + "Tidligere forbundne enheder" "Dato og klokkeslæt" "Vælg tidszone" @@ -856,6 +856,7 @@ "Automatisk" "2,4 GHz-bånd" "5,0 GHz-bånd" + "5,0 GHz-bånd foretrækkes" "2,4 GHz" "5,0 GHz" "Vælg mindst ét frekvensbånd til Wi‑Fi-hotspottet:" @@ -3163,7 +3164,7 @@ "Lyden er slået fra, men tillad %1$s og %2$s" "Lyden er slået fra, men tillad %1$s, %2$s og %3$s" "Beskeder, begivenheder og påmindelser" - "Når Forstyr ikke er aktiveret, slås lyden fra for beskeder, påmindelser og begivenheder med undtagelse af de elementer, du tillader ovenfor. Du kan ændre beskedindstillingerne, så dine venner, din familie eller andre kontaktpersoner kan få fat i dig." + "Når Forstyr ikke er aktiveret, slås lyden fra for beskeder, påmindelser og begivenheder med undtagelse af de elementer, du tillader ovenfor. Du kan ændre beskedindstillingerne, så dine venner, din familie eller andre kontaktpersoner kan få fat i dig." "Udfør" "Indstillinger" "Ingen lyd eller visuelle signaler fra underretninger" @@ -3239,7 +3240,7 @@ "Ingen installerede apps har anmodet om adgang til underretninger." "Tillad adgang til underretninger for %1$s?" - "%1$s kan læse alle underretninger, herunder personlige oplysninger såsom navne på kontaktpersoner og teksten i de meddelelser, du modtager. Underretningslytteren kan også afvise underretninger eller aktivere handlingsknapper, de indeholder. \n\nDette gør det også muligt for appen at slå Forstyr ikke til eller fra og ændre relaterede indstillinger." + "%1$s kan læse alle underretninger, herunder personlige oplysninger såsom navne på kontaktpersoner og teksten i de meddelelser, du modtager. Den kan også afvise underretninger eller aktivere handlingsknapper, de indeholder. \n\nDette gør det også muligt for appen at slå Forstyr ikke til eller fra og ændre relaterede indstillinger." "Hvis du slår adgang til underretninger fra for %1$s, slås adgangen til Forstyr ikke muligvis også fra." "Slå fra" "Annuller" diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml index 4e3c01c9481..018093c7abd 100644 --- a/res/values-de/arrays.xml +++ b/res/values-de/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push-Schaltfläche" "PIN von Peer-Gerät" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 26f8de4b6ea..666f67ae02b 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -856,6 +856,7 @@ "Automatisch" "2,4-GHz-Band" "5-GHz-Band" + "5-GHz-Band bevorzugt" "2,4 GHz" "5 GHz" "Bitte für den WLAN-Hotspot mindestens eine Bandbreite auswählen:" @@ -3163,7 +3164,7 @@ "Stummgeschaltet, aber %1$s und %2$s zulassen" "Stummgeschaltet, aber %1$s, %2$s und %3$s erlauben" "Nachrichten, Termine & Erinnerungen" - "Wenn \"Bitte nicht stören\" aktiviert ist, werden alle Nachrichten, Erinnerungen und Termine stummgeschaltet, die du oben nicht ausdrücklich zulässt. Die Nachrichteneinstellungen lassen sich anpassen, damit dich Freunde, Familie oder andere Kontakte erreichen können." + "Wenn \"Bitte nicht stören\" aktiviert ist, werden alle Nachrichten, Erinnerungen und Termine stummgeschaltet, die du oben nicht ausdrücklich zulässt. Die Nachrichteneinstellungen lassen sich anpassen, damit dich Freunde, Familie oder andere Kontakte erreichen können." "Fertig" "Einstellungen" "Keine optisches oder akustisches Signal bei Benachrichtigungen" diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml index c0fda737b54..131f4fab2bc 100644 --- a/res/values-el/arrays.xml +++ b/res/values-el/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Πάτημα κουμπιού" "PIN από ομότιμη συσκευή" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 393e4ec75e3..8f6b7f8f4e6 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -856,6 +856,7 @@ "Αυτόματα" "Ζώνη 2,4 GHz" "Ζώνη 5,0 GHz" + "Προτιμάται ζώνη 5,0 GHz" "2,4 GHz" "5,0 GHz" "Επιλέξτε τουλάχιστον μία ζώνη συχνοτήτων για το σημείο πρόσβασης Wi‑Fi:" @@ -3163,7 +3164,7 @@ "Σε σίγαση, αλλά να επιτρέπονται %1$s και %2$s" "Σε σίγαση, αλλά να επιτρέπονται %1$s, %2$s και %3$s" "Μηνύματα, συμβάντα και υπενθυμίσεις" - "Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\", τα μηνύματα, οι υπενθυμίσεις και τα συμβάντα θα τίθενται σε σίγαση, εκτός από τα στοιχεία που επιτρέπετε παραπάνω. Μπορείτε να προσαρμόσετε τις ρυθμίσεις μηνυμάτων για να επιτρέπετε στους φίλους και την οικογένειά σας ή σε άλλες επαφές να επικοινωνούν μαζί σας." + "Όταν είναι ενεργή η λειτουργία \"Μην ενοχλείτε\", τα μηνύματα, οι υπενθυμίσεις και τα συμβάντα θα τίθενται σε σίγαση, εκτός από τα στοιχεία που επιτρέπετε παραπάνω. Μπορείτε να προσαρμόσετε τις ρυθμίσεις μηνυμάτων για να επιτρέπετε στους φίλους και στην οικογένειά σας ή σε άλλες επαφές να επικοινωνούν μαζί σας." "Τέλος" "Ρυθμίσεις" "Ειδοποιήσεις χωρίς οπτικά στοιχεία και ήχο" diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml index b1fcba8133d..4b76d6e55d8 100644 --- a/res/values-en-rAU/arrays.xml +++ b/res/values-en-rAU/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push button" "PIN from peer device" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index ee5f59f70c9..1adec03064f 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -856,6 +856,7 @@ "Auto" "2.4 GHz band" "5.0 GHz band" + "5.0 GHz band preferred" "2.4 GHz" "5.0 GHz" "Choose at least one band for Wi‑Fi hotspot:" @@ -3163,7 +3164,7 @@ "Muted, but allow %1$s and %2$s" "Muted, but allow %1$s, %2$s and %3$s" "Messages, events & reminders" - "When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you." + "When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust message settings to allow your friends, family or other contacts to get in touch with you." "Finished" "Settings" "No visuals or sound from notifications" diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml index b1fcba8133d..4b76d6e55d8 100644 --- a/res/values-en-rCA/arrays.xml +++ b/res/values-en-rCA/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push button" "PIN from peer device" diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index 1ac434f0a17..1250ed08977 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -856,6 +856,7 @@ "Auto" "2.4 GHz band" "5.0 GHz band" + "5.0 GHz band preferred" "2.4 GHz" "5.0 GHz" "Choose at least one band for Wi‑Fi hotspot:" @@ -3163,7 +3164,7 @@ "Muted, but allow %1$s and %2$s" "Muted, but allow %1$s, %2$s and %3$s" "Messages, events & reminders" - "When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you." + "When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust message settings to allow your friends, family or other contacts to get in touch with you." "Finished" "Settings" "No visuals or sound from notifications" diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml index b1fcba8133d..4b76d6e55d8 100644 --- a/res/values-en-rGB/arrays.xml +++ b/res/values-en-rGB/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push button" "PIN from peer device" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index ee5f59f70c9..1adec03064f 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -856,6 +856,7 @@ "Auto" "2.4 GHz band" "5.0 GHz band" + "5.0 GHz band preferred" "2.4 GHz" "5.0 GHz" "Choose at least one band for Wi‑Fi hotspot:" @@ -3163,7 +3164,7 @@ "Muted, but allow %1$s and %2$s" "Muted, but allow %1$s, %2$s and %3$s" "Messages, events & reminders" - "When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you." + "When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust message settings to allow your friends, family or other contacts to get in touch with you." "Finished" "Settings" "No visuals or sound from notifications" diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml index b1fcba8133d..4b76d6e55d8 100644 --- a/res/values-en-rIN/arrays.xml +++ b/res/values-en-rIN/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push button" "PIN from peer device" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index ee5f59f70c9..1adec03064f 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -856,6 +856,7 @@ "Auto" "2.4 GHz band" "5.0 GHz band" + "5.0 GHz band preferred" "2.4 GHz" "5.0 GHz" "Choose at least one band for Wi‑Fi hotspot:" @@ -3163,7 +3164,7 @@ "Muted, but allow %1$s and %2$s" "Muted, but allow %1$s, %2$s and %3$s" "Messages, events & reminders" - "When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust messages settings to allow your friends, family or other contacts to reach you." + "When Do Not Disturb is on, messages, reminders and events will be muted, except for the items that you allow above. You can adjust message settings to allow your friends, family or other contacts to get in touch with you." "Finished" "Settings" "No visuals or sound from notifications" diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml index d886b900fb1..27ad6bfccc1 100644 --- a/res/values-en-rXC/arrays.xml +++ b/res/values-en-rXC/arrays.xml @@ -121,12 +121,6 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‎‎‏‏‎‎‎‎‏‎‏‏‏‏‏‏‎‎‏‎‏‏‎‎‏‎‏‎‎‏‏‏‏‎‎‎‎‎‎‎TTLS‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‎‏‏‎‏‎‎‏‎‏‏‎‎‎‎‏‎‏‎‎‏‎‏‏‏‏‎‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‎‏‎‎PWD‎‏‎‎‏‎" - - - - - - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‏‎‎‎‏‏‏‎‎‎‏‏‏‎‎‎‎‏‎‎‏‏‎‎‎‏‏‏‎‏‏‏‎‏‏‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‎‏‏‎Push button‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‎‏‎‎‎‏‎‏‎‏‏‎‎‎‎‏‎‎‎‎‎‎‏‎‏‏‏‏‎‏‏‎‎‏‏‎‏‎‏‎‏‎‎‎‏‏‏‎‎‏‎‎‎‏‎‏‏‎PIN from peer device‎‏‎‎‏‎" diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml index e60268c5899..b1448922306 100644 --- a/res/values-en-rXC/strings.xml +++ b/res/values-en-rXC/strings.xml @@ -855,6 +855,7 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‏‏‏‎‏‏‎‏‏‎‏‎Auto‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎‏‎‏‏‎‏‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‎‏‏‎‎‎‏‎‏‏‎‎‏‎‎2.4 GHz Band‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‎‎‏‏‏‎‎‏‎‎‏‏‎‏‎‎‏‎‎‎‎‎‏‎‏‏‎‏‎‎‏‏‏‎‎‎‏‎‎5.0 GHz Band‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‎‎‏‎‏‎‏‏‎‏‎‏‏‎‎‏‎‏‏‎‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‏‎‎‎‎‎‎‏‏‎5.0 GHz Band preferred‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‎‎‎‏‎‎‎‏‎‏‎‎‎‏‏‎‏‏‏‎‎‎‎‏‏‎‎‎‏‏‏‏‏‏‎‎‏‏‏‎‎‏‏‎‎‎‏‎‏‏‏‎‏‎‎‏‎‎‎2.4 GHz‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‎‏‏‎‎‎‏‏‏‎‎‎‏‏‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‏‏‏‏‏‏‎‎‎5.0 GHz‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‎‎‎‎‎‏‏‏‏‏‎‎‎‏‎‎‎‏‏‎‎‏‏‎‎‏‏‎‏‏‎‏‎‏‎‏‎‏‎‏‎‎‏‏‏‏‏‏‏‏‏‎‎‏‎‎‎‏‎‎Choose at least one band for Wi‑Fi hotspot:‎‏‎‎‏‎" @@ -3162,7 +3163,7 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‏‏‎‏‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‏‎‎‏‎‏‏‎‎Muted, but allow ‎‏‎‎‏‏‎%1$s‎‏‎‎‏‏‏‎ and ‎‏‎‎‏‏‎%2$s‎‏‎‎‏‏‏‎‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‎‏‎‏‏‎‎‏‏‏‏‏‎‏‏‎‏‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‏‎‎‎‏‎‎‎‎‎‏‎‎‎‏‎Muted, but allow ‎‏‎‎‏‏‎%1$s‎‏‎‎‏‏‏‎, ‎‏‎‎‏‏‎%2$s‎‏‎‎‏‏‏‎, and ‎‏‎‎‏‏‎%3$s‎‏‎‎‏‏‏‎‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‏‏‎‏‎‎‏‏‎‏‎‏‏‏‎‏‏‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‏‎‎‏‎‎‏‏‏‏‏‎‎‎‏‎‎‎‏‎‎‏‎‏‎‎‎Messages, events & reminders‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‏‏‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‏‎‏‏‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‎‎‏‏‎When Do Not Disturb is on, messages, reminders, and events will muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you.‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‎‏‎‏‏‏‎‏‎‏‏‏‏‎‎‎‏‎‎‎‎‏‎‏‎‎‎‏‎‏‏‎‏‎‏‏‎‎‎‎When Do Not Disturb is on, messages, reminders, and events will be muted, except for the items you allow above. You can adjust messages settings to allow your friends, family, or other contacts to reach you.‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‎‏‎‎‎‏‎‏‏‎‎‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‎‏‏‎‎‏‏‎‎‎‏‏‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‎‏‎Done‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‏‎‏‏‏‎‏‎‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‎Settings‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‎‎‏‎‏‏‎‏‎‎‎‎‎‎‎‎‎‏‎‎‎‎‏‎‏‏‎‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‏‏‎‎‎‏‏‎‏‏‏‎No visuals or sound from notifications‎‏‎‎‏‎" diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml index 6c5f6d77496..0bf886534b9 100644 --- a/res/values-es-rUS/arrays.xml +++ b/res/values-es-rUS/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Presionar botón" "PIN del dispositivo par" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 9dbadf85730..a7d35804e4e 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -856,6 +856,7 @@ "Automático" "Banda de 2.4 GHz" "Banda de 5.0 GHz" + "Banda preferida: 5.0 GHz" "2.4 GHz" "5.0 GHz" "Elige al menos una banda para el hotspot de Wi-Fi:" @@ -3163,7 +3164,7 @@ "Silenciar, pero permitir %1$s y %2$s" "Silenciar, pero permitir %1$s, %2$s y %3$s" "Mensajes, eventos y recordatorios" - "Si activas el modo No interrumpir, se silenciarán los mensajes, recordatorios y eventos, excepto los elementos que habilites arriba. Puedes ajustar la configuración de los mensajes para permitir que tus amigos, tu familia y otros contactos se comuniquen contigo." + "Si activas el modo No interrumpir, se silenciarán los mensajes, recordatorios y eventos, excepto los elementos que habilites arriba. También puedes ajustar la configuración de los mensajes para permitir que amigos, familiares y otros contactos se comuniquen contigo." "Listo" "Configuración" "Notificaciones sin sonido ni elementos visuales" diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml index fab0c115e64..1106e4001a9 100644 --- a/res/values-es/arrays.xml +++ b/res/values-es/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Botón WPS" "PIN del otro dispositivo" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 48155d8883d..1df94dbee34 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -856,6 +856,7 @@ "Automática" "Banda de 2,4 GHz" "Banda de 5,0 GHz" + "Banda preferida: 5,0 GHz" "2,4 GHz" "5,0 GHz" "Selecciona al menos una banda para el punto de acceso Wi‑Fi:" @@ -3163,7 +3164,7 @@ "Silenciados, pero permitir %1$s y %2$s" "Silenciados, permitir %1$s, %2$s y %3$s" "Mensajes, eventos y recordatorios" - "Cuando el modo No molestar esté activado, los mensajes, recordatorios y eventos se silenciarán, excepto los que permitas más arriba. Ajusta la configuración de los mensajes para que tus amigos, familiares u otros puedan contactarte." + "Cuando el modo No molestar esté activado, los mensajes, recordatorios y eventos se silenciarán, excepto los que permitas más arriba. Ajusta la configuración de los mensajes para que tus amigos, familiares u otras personas puedan ponerse en contacto contigo." "Listo" "Ajustes" "Notificaciones sin sonido ni elementos visuales" @@ -3238,7 +3239,7 @@ %d aplicación puede leer notificaciones "Ninguna aplicación instalada ha solicitado acceso a las notificaciones." - "¿Permitir el acceso de %1$s a las notificaciones?" + "¿Permitir que %1$s acceda a las notificaciones?" "%1$s podrá leer todas las notificaciones, incluidas las relativas a información personal, como nombres de contactos y texto de mensajes que hayas recibido. También podrá ignorar las notificaciones o utilizar los botones de acción que incluyan. \n\nTambién concede a la aplicación la capacidad de activar o desactivar el modo No molestar y de cambiar las opciones de configuración relacionadas." "Si desactivas el acceso a las notificaciones de %1$s, también puede desactivarse el acceso al modo No molestar." "Desactivar" @@ -3651,7 +3652,7 @@ "Aplicaciones" "Mostrar sobre otras aplicaciones" "Permitir mostrar sobre otras aplicaciones" - "Permite que esta aplicación se muestre sobre otras aplicaciones que estés utilizando. Esto puede interferir en el uso de dichas aplicaciones o cambiar el modo en que se muestran o se comportan." + "Permite que esta aplicación se muestre sobre otras aplicaciones que estés utilizando. Esto puede interferir en el uso de dichas aplicaciones o cambiar el modo en el que se muestran o se comportan." "rv realidad virtual procesador estéreo servicio ayuda" "sistema alerta ventana cuadro de diálogo mostrar sobre otras aplicaciones" "Mostrar sobre otras apps" diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml index cb80200e032..e774f0ed060 100644 --- a/res/values-et/arrays.xml +++ b/res/values-et/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Vajutusnupp" "PIN-kood partnerseadmest" diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index e1781468c14..8f28406a926 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -856,6 +856,7 @@ "Automaatne" "2,4 GHz riba" "5,0 GHz riba" + "Eelistatud on 5,0 GHz riba" "2,4 GHz" "5,0 GHz" "Valige WiFi-leviala lubamiseks vähemalt üks sagedusriba:" @@ -3163,7 +3164,7 @@ "Vaigistatud, kuid lubatakse %1$s ja %2$s" "Vaigistatud, kuid lubatakse %1$s, %2$s ja %3$s" "Sõnumid, sündmused ja meeldetuletused" - "Kui funktsioon Mitte segada on sisse lülitatud, vaigistatakse sõnumid, meeldetuletused ja sündmused. Teil on võimalik sõnumite seadeid kohandada, et võimaldada sõpradel, pereliikmetel või muudel kontaktidel teiega ühendust võtta." + "Kui funktsioon Mitte segada on sisse lülitatud, vaigistatakse sõnumid, meeldetuletused ja sündmused, välja arvatud teie ülal lubatud üksuste puhul. Võite sõnumite seadeid kohandada, et lubada sõpradel, pereliikmetel või muudel kontaktidel teiega ühendust võtta." "Valmis" "Seaded" "Hääletud ja ekraanilt peidetud märguanded" diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml index 64b900e3751..83e00496bc9 100644 --- a/res/values-eu/arrays.xml +++ b/res/values-eu/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Sakatu botoia" "Pareko gailuaren PINa" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index c73270fd9b7..43b6fbb4d9e 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -251,13 +251,13 @@ "Ezin izan da egin" "Ongi" "Aldaketek USB kablea berriro konektatzean izango dute eragina." - "Gaitu USB memoria masiboa" + "Gaitu USB biltegiratze masiboa" "Byteak, guztira:" "Ez da USB memoria muntatu." "Ez dago SD txartelik." "Byte erabilgarriak:" - "Memoria masiboko gailu gisa erabiltzen ari da USB memoria." - "SD txartela memoria masiboko gailu gisa erabiltzen ari da." + "USB memoria bilt. masibo gisa." + "SD txartela biltegiratze masiboko gailu gisa erabiltzen ari da." "Segurtasunez ken daiteke USB memoria." "Segurtasunez ken daiteke SD txartela." "USB mem. erabili bitartean kendu da" @@ -856,6 +856,7 @@ "Automatikoa" "2,4 GHz-ko banda" "5,0 GHz-ko banda" + "5,0 GHz-ko banda hobetsia" "2,4 GHz" "5,0 GHz" "Aukeratu gutxienez banda bat Wi-Fi sare publikorako:" @@ -2251,7 +2252,7 @@ "Askotarikoak" "Uste baino gutxiago erabili da" "PUZaren erabilera, guztira" - "CPUaren aurreko planoa" + "PUZaren aurreko planoa" "Mantendu aktibo" "GPS" "Wi-Fia exekutatzen" @@ -3163,7 +3164,7 @@ "Audioa eta dardara desaktibatuta, baina baimendu %1$s eta %2$s" "Audioa eta dardara desaktibatuta, baina baimendu %1$s, %2$s eta %3$s" "Mezuak, gertaerak eta abisuak" - "\"Ez molestatu\" modua aktibatuta dagoenean, mezu, abisu eta gertaeren audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik. Ezarpenak alda ditzakezu lagunak, familia edo beste kontaktuak zurekin harremanetan jarri ahal daitezen." + "\"Ez molestatu\" modua aktibatuta dagoenean, mezu, abisu eta gertaeren audioa eta dardara desaktibatuta egongo dira, goian baimendutako elementuetan izan ezik. Ezarpenak alda ditzakezu lagunak, familia edo beste kontaktuak zurekin harremanetan jarri ahal daitezen." "Eginda" "Ezarpenak" "Ez egin soinurik eta ez erakutsi ezer jakinarazpenak jasotzean" @@ -4071,7 +4072,7 @@ "Beste aplikazio batzuk" "Fitxategiak" "^1"" ""^2""" - "Memoria osotik (%1$s) erabilitakoa" + "/ %1$s erabilita" "erabilita" "Garbitu aplikazioa" "Zuzeneko aplikazio hau kendu nahi duzu?" diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml index 94ae20125c6..455def1372f 100644 --- a/res/values-fa/arrays.xml +++ b/res/values-fa/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "فشار دکمه" "پین از دستگاه مرتبط شده" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 30a82a8f247..029c7216f09 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -856,6 +856,7 @@ "خودکار" "باند ۲٫۴ گیگاهرتزی" "باند ۵٫۰ گیگاهرتزی" + "نوار ۵٫۰ گیگاهرتز اولویت دارد" "۲٫۴ گیگاهرتز" "۵٫۰ گیگاهرتز" "‏حداقل یک باند برای نقطه اتصال Wi‑Fi انتخاب کنید:" @@ -3163,7 +3164,7 @@ "صامت شده است، اما %1$s و %2$s را مجاز کنید" "صامت شده است، اما %1$s، %2$s و %3$s را مجاز کنید" "پیام‌ها، رویدادها و یادآوری‌ها" - "وقتی «مزاحم نشوید» روشن است، به‌جز مواردی که در بالا مجاز می‌کنید، پیام‌ها، یادآوری‌ها و رویدادها صامت می‌شوند. می‌توانید تنظیمات پیام را به‌گونه‌ای انجام دهید که دوستانتان، خانواده یا سایر مخاطبین بتوانند به شما دسترسی پیدا کنند." + "وقتی «مزاحم نشوید» روشن باشد، به‌جز مواردی که در بالا مجاز می‌کنید، پیام‌ها، یادآوری‌ها و رویدادها صامت خواهند شد. می‌توانید تنظیمات پیام‌ها را به‌گونه‌ای انجام دهید که دوستان، خانواده یا سایر مخاطبینتان بتوانند به شما دسترسی پیدا کنند." "تمام" "تنظیمات" "بدون تصویر یا صدای اعلان‌ها" diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml index 92d2647dadc..e4218bae890 100644 --- a/res/values-fi/arrays.xml +++ b/res/values-fi/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Paina painiketta" "Vertaislaitteen PIN-koodi" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 6394754fed4..9bc5c0c0fc2 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -114,7 +114,7 @@ "%1$s ei ole enää yhteydessä laitteeseen." "Katkaise" "Sinulla ei ole lupaa muuttaa Bluetooth-asetuksia." - "Muodosta laitepari uuden laitteen kanssa" + "Muodosta uusi laitepari" "%1$s näkyy lähellä olevissa laitteissa, kun Bluetooth-asetukset on auki." "Puhelimen Bluetooth-osoite: %1$s" "Tabletin Bluetooth-osoite: %1$s" @@ -169,7 +169,7 @@ "Muille laitteille näkyvä nimi: ^1" "Ota Bluetooth käyttöön saadaksesi yhteyden muihin laitteisiin." "Omat laitteet" - "Muodosta laitepari uuden laitteen kanssa" + "Muodosta uusi laitepari" "Anna tabletin viestiä lähellä olevien Bluetooth-laitteiden kanssa" "Anna laitteen viestiä lähellä olevien Bluetooth-laitteiden kanssa" "Anna puhelimen viestiä lähellä olevien Bluetooth-laitteiden kanssa" @@ -856,6 +856,7 @@ "Automaattinen" "2,4 GHz:n taajuus" "5,0 GHz:n taajuus" + "5,0 GHz:n taajuus ensisijainen" "2,4 GHz" "5,0 GHz" "Valitse vähintään yksi kaista Wi‑Fi-hotspotille:" @@ -3163,7 +3164,7 @@ "Mykistä, salli %1$s ja %2$s" "Mykistä, salli %1$s, %2$s ja %3$s" "Viestit, tapahtumat ja muistutukset" - "Älä häiritse ‑tilassa viestit, muistutukset ja tapahtumat mykistetään yllä määritettyjä poikkeuksia lukuun ottamatta. Voit määrittää viestiasetukset niin, että ystävät, perheenjäsenet tai muut yhteyshenkilöt saavat sinuun yhteyden." + "Älä häiritse ‑tilassa viestit, muistutukset ja tapahtumat mykistetään yllä määritettyjä poikkeuksia lukuun ottamatta. Voit määrittää viestiasetukset niin, että ystävät, perheenjäsenet tai muut yhteyshenkilöt saavat sinuun yhteyden." "Valmis" "Asetukset" "Ei ilmoitusgrafiikoita tai ‑ääntä" @@ -3238,7 +3239,7 @@ %d sovellus voi lukea ilmoituksia "Yksikään asennettu sovellus ei ole pyytänyt ilmoituksien käyttöoikeutta." - "Myönnetäänkö ilmoituksien käyttöoikeus kohteelle %1$s?" + "Saako %1$s ilmoituksien käyttöoikeuden?" "%1$s voi lukea kaikki ilmoitukset ja niiden sisältämät henkilökohtaiset tiedot, kuten yhteystietojen nimet ja viestien sisällön. Se voi myös hylätä ilmoituksia ja käyttää niiden toimintopainikkeita. \n\nTämä myöntää sovellukselle lisäksi oikeuden ottaa Älä häiritse ‑tilan käyttöön tai poistaa sen käytöstä ja muokata siihen liittyviä asetuksia." "Jos %1$s ei saa käyttää ilmoituksia, myös Älä häiritse ‑tilan käyttö voidaan estää." "Poista käytöstä" @@ -3583,7 +3584,7 @@ "Internetin jakaminen USB:n kautta" "MIDI" "Käytä tätä laitetta MIDI-tilassa." - "Käytä USB:tä:" + "Käytä USB:tä" "USB-oletusmääritys" "Nämä asetukset otetaan käyttöön, kun puhelimeesi yhdistetään toinen laite sen lukituksen ollessa avoinna. Yhdistä puhelimeesi vain luotettuja laitteita." "USB" @@ -3651,7 +3652,7 @@ "Sovellukset" "Näkyminen muiden päällä" "Salli näyttäminen muiden sovellusten päällä" - "Anna sovelluksen näkyä muiden avoimien sovellusten päällä. Se voi häiritä muiden sovellusten käyttöä tai muuttaa niiden ulkoasua tai vaikutelmaa käyttäytymisestä." + "Anna sovelluksen näkyä muiden avoimien sovellusten päällä. Se voi häiritä muiden sovellusten käyttöä tai muuttaa niiden ulkoasua tai käyttäytymistä." "VR virtuaalitodellisuus kuuntelija stereo avustinpalvelu" "järjestelmäilmoitus ikkuna valintaikkuna näkyy muiden sovellusten päällä" "Näkyminen muiden päällä" diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml index e780c68eb77..7d619ea96b3 100644 --- a/res/values-fr-rCA/arrays.xml +++ b/res/values-fr-rCA/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Bouton de commande" "NIP de l\'appareil associé" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 654002ded53..9f86f8356e7 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -20,7 +20,7 @@ "Non" "Créer" "Autoriser" - "Refusers" + "Refuser" "Fermer" "Changer" "Inconnu" @@ -856,6 +856,7 @@ "Auto" "Bande de 2,4 GHz" "Bande de 5 GHz" + "Préférer la bande de 5,0 GHz" "2,4 GHz" "5 GHz" "Choisissez au moins une bande pour le point d\'accès Wi-Fi :" @@ -3163,7 +3164,7 @@ "Désactivés, mais autoriser : %1$s et %2$s" "Désactivés, mais autoriser : %1$s, %2$s et %3$s" "Messages, événements et rappels" - "Lorsque le mode Ne pas déranger est activé, le son des messages, des rappels et des événements est coupé, sauf pour les éléments autorisés ci-dessus. Vous pouvez régler les paramètres des messages pour que vos proches ou d\'autres contacts puissent quand même vous joindre." + "Lorsque le mode Ne pas déranger est activé, le son des messages, des rappels et des événements est coupé, sauf pour les éléments autorisés ci-dessus. Vous pouvez régler les paramètres des messages pour que vos proches ou d\'autres contacts puissent quand même vous joindre." "OK" "Paramètres" "Aucun élément visuel ni son provenant des notifications" @@ -3238,7 +3239,7 @@ %d application peuvent lire les notifications "Aucune demande d\'accès aux notifications n\'a été envoyée pour les applications installées." - "Autoriser %1$s à accéder aux notifications ?" + "Autoriser %1$s à accéder aux notifications?" "%1$s pourra lire toutes les notifications, y compris des données personnelles, telles que des noms de contacts et le texte des messages que vous recevez. Ce service pourra également masquer des notifications ou déclencher les boutons d\'action que celles-ci contiennent. \n\nCela permettra également à l\'application d\'activer et de désactiver la fonction Ne pas déranger et de modifier les paramètres connexes." "Si vous désactivez l\'accès aux notifications pour %1$s, l\'accès à la fonction Ne pas déranger peut également être désactivé." "Désactiver" diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml index c991c73d337..2811cc43e8c 100644 --- a/res/values-fr/arrays.xml +++ b/res/values-fr/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Appuyer sur le bouton" "Code de l\'appareil associé" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 38f6bfdebf5..21fc17d0d7d 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -856,6 +856,7 @@ "Automatique" "Bande 2,4 GHz" "Bande 5 GHz" + "Bande 5 GHz de préférence" "2,4 GHz" "5 GHz" "Sélectionnez au moins une bande pour le point d\'accès Wi-Fi :" @@ -3163,7 +3164,7 @@ "Son coupé, sauf pour les %1$s et %2$s" "Son coupé, sauf pour les %1$s, %2$s et %3$s" "Messages, événements et rappels" - "Lorsque le mode Ne pas déranger est activé, le son des messages, des rappels et des événements est coupé, sauf pour les éléments autorisés ci-dessus. Vous pouvez ajuster les paramètres des messages pour que vos proches ou d\'autres contacts puissent quand même vous joindre." + "Lorsque le mode Ne pas déranger est activé, le son des messages, des rappels et des événements est coupé, sauf pour les éléments autorisés ci-dessus. Vous pouvez ajuster les paramètres des messages pour que vos proches ou d\'autres contacts puissent quand même vous joindre." "OK" "Paramètres" "Aucune notification visuelle ni sonore" @@ -4097,7 +4098,7 @@ "Activé" "Appli instantanée" "Désactiver le gestionnaire d\'espace de stockage ?" - "Applications de films et séries" + "Applications defilms et TV" "Informations de gestion des comptes opérateur" "Déclencher la gestion des comptes opérateur" "Mettre à jour le mode Ne pas déranger" diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml index d994d74df0b..00a2e396652 100644 --- a/res/values-gl/arrays.xml +++ b/res/values-gl/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Pulsar o botón" "PIN do dispositivo mesmo nivel" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 4d33a19552a..74bde7414a8 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -856,6 +856,7 @@ "Automática" "Banda de 2,4 GHz" "Banda de 5,0 GHz" + "Banda de 5,0 GHz preferida" "2,4 GHz" "5,0 GHz" "Selecciona polo menos unha banda para a zona wifi:" @@ -3164,7 +3165,7 @@ "Silenciados, pero permítense: %1$s e %2$s" "Silenciados, pero permítense: %1$s, %2$s e %3$s" "Mensaxes, eventos e recordatorios" - "Cando estea activado o modo Non molestar, silenciaranse as mensaxes, os recordatorios e os eventos, agás nos casos autorizados anteriormente. Podes axustar a configuración para permitir que os amigos, os familiares ou outros contactos se comuniquen contigo." + "Cando estea activado o modo Non molestar, silenciaranse as mensaxes, os recordatorios e os eventos, agás nos casos autorizados anteriormente. Podes axustar a configuración para permitir que os amigos, os familiares ou outros contactos se comuniquen contigo." "Feito" "Configuración" "Notificacións sen son nin elementos visuais" diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml index bcce32dcff8..b3876a40ac8 100644 --- a/res/values-gu/arrays.xml +++ b/res/values-gu/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "પુશ બટન" "પીઅર ઉપકરણ પરથી પિન" diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index 3756f807691..cd00b41101d 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -856,6 +856,7 @@ "આપમેળે" "2.4 GHz બેન્ડ" "5.0 GHz બેન્ડ" + "5.0 GHz બૅન્ડ પસંદ કર્યું" "2.4 GHz" "5.0 GHz" "વાઇ-ફાઇ હૉટસ્પૉટ માટે ઓછામાં ઓછું એક બેન્ડ પસંદ કરો:" @@ -3163,7 +3164,7 @@ "મ્યૂટ કરેલ છે, પરંતુ %1$s અને %2$sને મંજૂરી આપો" "મ્યૂટ કરેલ છે, પરંતુ %1$s, %2$s અને %3$sને મંજૂરી આપો" "સંદેશા, ઇવેન્ટ અને રિમાઇન્ડર" - "ખલેલ પાડશો નહીં મોડ ચાલુ હોય, ત્યારે સંદેશા, રિમાઇન્ડર અને ઇવેન્ટ મ્યૂટ કરવામાં આવશે, જેમાં તમે ઉપરની જે આઇટમોને મંજૂરી આપો તે અપવાદ છે. તમારા મિત્રો, પરિવારજનો અથવા અન્ય સંપર્કો તમારો સંપર્ક કરી શકે તે માટે તમે સંદેશાની સેટિંગ અનુકૂળ કરી શકો છો." + "ખલેલ પાડશો નહીં મોડ ચાલુ હોય, ત્યારે સંદેશા, રિમાઇન્ડર અને ઇવેન્ટ મ્યૂટ કરવામાં આવશે, જેમાં તમે ઉપરની જે આઇટમને મંજૂરી આપો તે અપવાદ છે. તમારા મિત્રો, પરિવારજનો અથવા અન્ય સંપર્કો તમારો સંપર્ક કરી શકે તે માટે તમે સંદેશાની સેટિંગ અનુકૂળ કરી શકો છો." "થઈ ગયું" "સેટિંગ" "નોટિફિકેશનમાં કોઈ વિઝ્યુઅલ અથવા સાઉન્ડ નથી" diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml index 3c7d033d19f..55916dc94ae 100644 --- a/res/values-hi/arrays.xml +++ b/res/values-hi/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "पुश बटन" "साथी डिवाइस से पिन" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index b41c1db4bd7..6284902daaf 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -101,7 +101,7 @@ "ध्‍वनि डायलिंग लॉक करें" "जब स्‍क्रीन लॉक हो, तो bluetooth डायलर के उपयोग को रोकें" "ब्लूटूथ डिवाइस" - "डिवाइस नाम" + "डिवाइस का नाम" "डिवाइस सेटिंग" "प्रोफ़ाइल सेटिंग" "कोई नाम सेट नहीं है, खाता नाम का उपयोग कर रहा है" @@ -757,7 +757,7 @@ "NFC चालू करें" "NFC इस डिवाइस और आस-पास के अन्य डिवाइस या लक्ष्यों के बीच डेटा का आदान-प्रदान करता है, जैसे कि भुगतान टर्मिनल, एक्सेस रीडर और सहभागी विज्ञापन या टैग." "Android बीम" - "एनएफसी के ज़रिए ऐप्लिकेशन की सामग्री भेजने के लिए तैयार" + "एनएफ़सी के ज़रिए ऐप्लिकेशन की सामग्री भेजने के लिए तैयार" "बंद" "अनुपलब्‍ध है क्‍योंकि NFC बंद है" "Android बीम" @@ -856,6 +856,8 @@ "अपने आप" "2.4 GHz बैंड" "5.0 गीगाहर्ट्ज़ का बैंड" + + "2.4 गीगाहर्ट्ज़" "5.0 गीगाहर्ट्ज़" "वाई-फ़ाई हॉटस्पॉट से डिवाइस काे जाेड़ने के लिए कम से कम एक बैंड चुनें:" @@ -2951,7 +2953,7 @@ "कनेक्ट किए गए डिवाइस" "ब्लूटूथ, ड्राइविंग मोड, NFC" "ब्लूटूथ, ड्राइविंग मोड" - "ब्लूटूथ, NFC" + "ब्लूटूथ, एनएफ़सी" "ब्लूटूथ" "ऐप्लिकेशन और सूचनाएं" "अनुमतियां, डिफ़ॉल्ट ऐप" @@ -3163,7 +3165,7 @@ "म्यूट किया गया है लेकिन %1$s और %2$s को मंज़ूरी दें" "म्यूट किया गया है लेकिन %1$s, %2$s और %3$s को मंज़ूरी दी गई है" "मैसेज, इवेंट और रिमाइंडर" - "\'परेशान न करें\' सुविधा चालू होने पर मैसेज, रिमाइंडर और इवेंट की सूचनाएं म्यूट कर दी जाएंगी. आपको सिर्फ़ उन ही सूचनाओं की आवाज़ सुनाई देगी या वाइब्रेशन महसूस होगा जिनके लिए आप मंज़ूरी देंगे. आप मैसेज सेटिंग में बदलाव कर अपने दोस्तों, परिवार के लोगों और अन्य संपर्कों के मैसेज की सूचना मिलने की मंज़ूरी दे सकते हैं." + "\'परेशान न करें\' सुविधा चालू होने पर मैसेज (एसएमएस), रिमाइंडर और इवेंट की सूचनाएं म्यूट कर दी जाएंगी. आपको सिर्फ़ उन ही सूचनाओं की आवाज़ सुनाई देगी या वाइब्रेशन महसूस होगा जिनके लिए आप मंज़ूरी देंगे. आप मैसेज सेटिंग में बदलाव करके अपने दोस्तों, परिवार के लोगों या दूसरे संपर्कों के मैसेज (एसएमएस) मिलने की मंज़ूरी दे सकते हैं." "हो गया" "सेटिंग" "सूचनाएं आने पर न तो स्क्रीन पर कुछ दिखे और न ही कोई आवाज़ सुनाई दे" @@ -3239,7 +3241,7 @@ "इंस्टॉल किए गए किसी भी ऐप ने सूचना के एक्सेस का अनुरोध नहीं किया है." "%1$s के लिए सूचना को एक्सेस करने की अनुमति दें?" - "%1$s संपर्क नामों और आपको मिलने वाले मैसेज जैसी निजी जानकारी सहित, सभी सूचना पढ़ सकता है. वह सूचना खारिज कर सकेगा और उनमें शामिल कार्रवाई बटनों को ट्रिगर भी कर सकेगा. \n\nइससे ऐप परेशान न करें सेवा को चालू या बंद कर सकता है और उससे जुड़ी सेटिंग को भी बदल सकता है" + "%1$s संपर्क नामों और आपको मिलने वाले मैसेज जैसी निजी जानकारी सहित, सभी सूचनाएं पढ़ सकता है. वह सूचना खारिज कर सकेगा और उनमें शामिल कार्रवाई बटनों को ट्रिगर भी कर सकेगा. \n\nइससे ऐप \'परेशान न करें\' सुविधा को चालू या बंद कर सकता है और उससे जुड़ी सेटिंग को भी बदल सकता है" "अगर आप %1$s के लिए सूचना का एक्सेस बंद करते हैं, तो \'परेशान न करें\' सेवा का एक्सेस भी बंद हो सकता है." "बंद करें" "रद्द करें" diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml index 6cb9b7fa944..b8a50bdc0d8 100644 --- a/res/values-hr/arrays.xml +++ b/res/values-hr/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Gumb" "PIN s paralelnog uređaja" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 817a54cc065..9d0bc0314dc 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -867,6 +867,7 @@ "Automatski" "Frekvencija od 2,4 GHz" "Frekvencija od 5,0 GHz" + "Prednost se daje frekvenciji od 5,0 GHz" "2,4 GHz" "5,0 GHz" "Odaberite barem jedan pojas za žarišnu točku Wi‑Fi-ja:" @@ -3200,7 +3201,7 @@ "Zanemareno, ali dopusti %1$s i %2$s" "Zanemareno, ali dopusti %1$s, %2$s i %3$s" "Poruke, događaji i podsjetnici" - "Kada je način Ne uznemiravaj uključen, zanemarit će se poruke, podsjetnici i događaji, osim prethodno navedenih stavki koje dopustite. Možete prilagoditi postavke poruka da bi vaša obitelj, prijatelji ili drugi kontakti mogli stupiti u kontakt s vama." + "Kada je način Ne uznemiravaj uključen, zanemarit će se poruke, podsjetnici i događaji, osim prethodno navedenih stavki koje dopustite. Možete prilagoditi postavke poruka da bi vaša obitelj, prijatelji ili drugi kontakti mogli stupiti u kontakt s vama." "Gotovo" "Postavke" "Bez vizualnih i zvučnih signala obavijesti" diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml index ee5072c9d66..9c0450b1a55 100644 --- a/res/values-hu/arrays.xml +++ b/res/values-hu/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Nyomógomb" "Partnereszköztől kapott PIN" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index b0c75c4c5e8..a9b42b4083d 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -856,6 +856,7 @@ "Automatikus" "2,4 GHz-es sáv" "5 GHz-es sáv" + "Előnyben részesített sáv: 5 GHz" "2,4 GHz" "5 GHz" "Válasszon legalább egy sávot a Wi-Fi-hotspot számára:" @@ -3163,7 +3164,7 @@ "Némítva, de a(z) %1$s és a(z) %2$s hangjainak engedélyezése" "Némítva, de a(z) %1$s, %2$s és %3$s hangjainak engedélyezése" "Üzenetek, események és emlékeztetők" - "Ha a „Ne zavarjanak” mód aktív, akkor az SMS-ek, emlékeztetők és események némítva lesznek, kivéve a fent engedélyezett elemeket. Az üzenetek beállításainak megadásával lehetővé teheti, hogy ismerősei, családtagjai vagy más névjegyei elérhessék Önt." + "Ha a „Ne zavarjanak” mód aktív, akkor az üzenetek, emlékeztetők és események némítva lesznek, kivéve a fent engedélyezett elemeket. Az üzenetek beállításainak megadásával lehetővé teheti, hogy ismerősei, családtagjai vagy más névjegyei elérhessék Önt." "Kész" "Beállítások" "Nincs hang vagy vizuális jelzés az értesítéseknél" diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml index c6fde15cd54..05ba3060944 100644 --- a/res/values-hy/arrays.xml +++ b/res/values-hy/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Սեղմման կոճակ" "Հավասարազոր սարքի PIN-ը" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 752e69b9bbd..606e4149dd2 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -856,6 +856,7 @@ "Ավտոմատ" "2,4 ԳՀց շերտ" "5․0 ԳՀց" + "5.0 ԳՀց (նախընտրելի)" "2,4 ԳՀց" "5,0 ԳՀց" "Ընտրեք նվազագույնը մեկ հաճախականություն Wi‑Fi թեժ կետի համար՝" @@ -3163,7 +3164,7 @@ "Ձայնն անջատած է: Միայն թույլատրել %1$sը և %2$sը" "Ձայնն անջատած է: Միայն թույլատրել %1$sը, %2$sը և %3$sը" "Հաղորդագրություններ, իրադարձություններ և հիշեցումներ" - "«Չանհանգստացնել» ռեժիմում հաղորդագրությունների, հիշեցումների և իրադարձությունների համար ձայնն անջատվում է: Բացառություն են կազմում վերևում ձեր թույլատրած կետերը: Դուք կարող եք փոփոխել հաղորդագրությունների կարգավորումները, որպեսզի ձեր ընկերները, ընտանիքի անդամները և այլ կոնտակտներ կարողանան կապվել ձեզ հետ:" + "«Չանհանգստացնել» ռեժիմում հաղորդագրությունների, հիշեցումների և միջոցառումների համար ձայնն անջատվում է: Բացառություն են կազմում վերևում ձեր թույլատրած կետերը: Դուք կարող եք փոփոխել հաղորդագրությունների կարգավորումները, որպեսզի ձեր ընկերները, ընտանիքի անդամները և այլ կոնտակտներ կարողանան կապվել ձեզ հետ:" "Պատրաստ է" "Կարգավորումներ" "Ծանուցումներն ամբողջությամբ անջատել" diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml index d626fdf6fb1..a875547d6f9 100644 --- a/res/values-in/arrays.xml +++ b/res/values-in/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Tekan tombol" "PIN dari perangkat rekan" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index c9214456973..1db79691afd 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -856,6 +856,7 @@ "Otomatis" "Pita frekuensi 2,4 GHz" "Pita frekuensi 5,0 GHz" + "Disarankan Band 5.0 GHz" "2,4 GHz" "5,0 GHz" "Pilih minimal satu pita frekuensi untuk hotspot Wi‑Fi:" @@ -3163,7 +3164,7 @@ "Dimatikan, namun mengizinkan %1$s dan %2$s" "Dimatikan, namun mengizinkan %1$s, %2$s, dan %3$s" "Pesan, acara & pengingat" - "Jika mode Jangan Ganggu diaktifkan, pesan, pengingat, dan acara akan dimatikan suara dan getarannya, kecuali item yang Anda izinkan di atas. Anda dapat menyesuaikan setelan pesan untuk mengizinkan teman, keluarga, atau kontak lain menghubungi Anda." + "Jika mode Jangan Ganggu diaktifkan, pesan, pengingat, dan acara akan dimatikan suara dan getarannya, kecuali item yang Anda izinkan di atas. Anda dapat menyesuaikan setelan pesan untuk mengizinkan teman, keluarga, atau kontak lain menghubungi Anda." "Selesai" "Setelan" "Tidak ada visual atau suara dari notifikasi" diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml index 393365b2beb..4e0e52ad93f 100644 --- a/res/values-is/arrays.xml +++ b/res/values-is/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Hnappur" "PIN-númer úr tengdu tæki" diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index ca0f2b8bf92..0beb31d0e2b 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -856,6 +856,7 @@ "Sjálfvirkt" "2,4 GHz tíðnisvið" "5,0 GHz tíðnisvið" + "5.0 GHz tíðnisvið í forgangi" "2,4 GHz" "5,0 GHz" "Veldu a.m.k. eitt svið fyrir heitan Wi‑Fi reit:" @@ -3163,7 +3164,7 @@ "Þaggað, en leyfa %1$s og %2$s" "Þaggað, en leyfa %1$s, %2$s og %3$s" "Skilaboð, viðburðir og áminningar" - "Þegar kveikt er á „Ónáðið ekki“ munu engin hljóð heyrast vegna skilaboða, áminninga eða viðburða, nema fyrir þá sem þú heimilar að ofan. Hægt er að breyta stillingum til leyfa símtöl frá vinum, fjölskyldumeðlimum eða öðrum tengiliðum." + "Þegar kveikt er á „Ónáðið ekki“ munu engin hljóð heyrast vegna skilaboða, áminninga eða viðburða, nema fyrir það sem þú heimilar að ofan. Hægt er að breyta stillingum til leyfa símtöl frá vinum, fjölskyldumeðlimum eða öðrum tengiliðum." "Lokið" "Stillingar" "Engin skilaboð á skjá eða hljóð frá tilkynningum" diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml index 638c32073fa..20755c2a698 100644 --- a/res/values-it/arrays.xml +++ b/res/values-it/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Pulsante di comando" "PIN del dispositivo peer" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 75a168b5ce0..cbd30958372 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -180,7 +180,7 @@ "Annulla" "Dispositivi multimediali disponibili" "Dispositivi di chiamata disponibili" - "Attualmente collegati" + "Attualmente connessi" "Dispositivi salvati" "Aggiungi dispositivo" "Il Bluetooth verrà attivato per consentire l\'accoppiamento" @@ -856,6 +856,7 @@ "Automatica" "Banda a 2,4 GHz" "Banda a 5 GHz" + "Banda a 5,0 GHz preferita" "2,4 GHz" "5 GHz" "Scegli almeno una banda per l\'hotspot Wi‑Fi:" @@ -2948,7 +2949,7 @@ "rete mobile" "utilizzo dei dati" "hotspot" - "Dispositivi collegati" + "Dispositivi connessi" "Bluetooth, modalità Auto, NFC" "Bluetooth, modalità Auto" "Bluetooth, NFC" @@ -3163,7 +3164,7 @@ "Audio disattivato, ma consenti %1$s e %2$s" "Audio disattivato, ma consenti %1$s, %2$s e %3$s" "Messaggi, eventi e promemoria" - "Quando la modalità Non disturbare è attiva, l\'audio di messaggi, promemoria ed eventi verrà disattivato, ad eccezione degli elementi da te sopra consentiti. Puoi regolare le impostazioni dei messaggi affinché amici, familiari o altri contatti possano raggiungerti." + "Quando la modalità Non disturbare è attiva, l\'audio di messaggi, promemoria ed eventi è disattivato, ad eccezione degli elementi da te sopra consentiti. Puoi regolare le impostazioni dei messaggi affinché amici, familiari o altri contatti possano raggiungerti." "Fine" "Impostazioni" "Nessuna immagine o nessun suono delle notifiche" @@ -3589,7 +3590,7 @@ "USB" "Preferenze USB" "USB controllata da" - "Dispositivo collegato" + "Dispositivo connesso" "Questo dispositivo" "Commutazione…" "Impossibile eseguire la commutazione" diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml index 644010c759c..f216462d437 100644 --- a/res/values-iw/arrays.xml +++ b/res/values-iw/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "לחצן דחיפה" "קוד גישה ממכשיר עמית" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 41938e41ac0..08d7970e196 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -878,6 +878,7 @@ "אוטומטי" "‏פס של ‎2.4 GHz" "‏פס של ‎5.0 GHz" + "‏עדיפות לתדר 5.0 GHz" "‎2.4 GHz" "‎5.0 GHz" "‏יש לבחור תדר אחד לכל הפחות לנקודת Wi‑Fi לשיתוף אינטרנט:" @@ -3239,7 +3240,7 @@ "מושתקים, אבל אני רוצה לאפשר %1$s וכן %2$s" "מושתקים, אבל אני רוצה לאפשר %1$s, %2$s וכן %3$s" "הודעות, אירועים ותזכורות" - "כשמצב \'נא לא להפריע\' פועל, הודעות, תזכורות ואירועים מושתקים, חוץ מהפריטים שאפשרת למעלה. ניתן לשנות את הגדרות ההודעות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר." + "כשמצב \'נא לא להפריע\' פועל, הודעות, תזכורות ואירועים מושתקים, חוץ מהפריטים שאפשרת למעלה. ניתן לשנות את הגדרות ההודעות כדי לאפשר לחברים, לבני משפחה או לאנשי קשר אחרים ליצור איתך קשר." "סיום" "הגדרות" "ללא סימנים חזותיים או צלילים מהודעות" @@ -3676,7 +3677,7 @@ "‏מנהל ה-IT שלך ביקש דוח על באג כדי לסייע בפתרון בעיות במכשיר זה. ייתכן שאפליקציות ונתונים ישותפו. פעילות המכשיר עשויה להאט באופן זמני." "‏הדוח על באג זה משותף כעת עם מנהל ה-IT שלך. למידע נוסף, צור איתו קשר." "שתף" - "לא, אין מצב" + "לא, תודה" "אין העברת נתונים" "רק לטעינת המכשיר" "טעינת המכשיר המחובר" diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml index 20e2658036b..1e412ec290a 100644 --- a/res/values-ja/arrays.xml +++ b/res/values-ja/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ボタンを押す" "ピアデバイスのPIN" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index fd7faf9ab90..3e9b217ad87 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -856,6 +856,7 @@ "自動" "2.4 GHz 帯" "5.0 GHz 帯" + "5.0 GHz 帯を優先" "2.4 GHz" "5.0 GHz" "Wi‑Fi アクセス ポイントの帯域幅を少なくとも 1 つ選択してください。" @@ -3167,7 +3168,7 @@ "ミュート中（%1$s、%2$sを除く）" "ミュート中（%1$s、%2$s、%3$sを除く）" "メッセージ、予定、リマインダー" - "マナーモードが ON の場合、上記の許可した項目を除き、メッセージ、リマインダー、予定はミュートされます。メッセージの設定を調整することで、友だち、家族などの連絡先からの着信のブロックを解除できます。" + "マナーモードが ON の場合、上記の許可した項目を除き、メッセージ、リマインダー、予定はミュートされます。メッセージの設定を調整することで、友だち、家族などの連絡先からの着信のブロックを解除できます。" "完了" "設定" "通知の非表示、通知音なし" @@ -3755,7 +3756,7 @@ "スマートフォンをミュートに設定" "着信音と通知音をミュートします" "端末をバイブレーションに設定" - "スマートフォンをバイブレーションに設定" + "スマートフォンはバイブレーションに設定されています" "着信と通知を端末のバイブレーションで知らせます" "着信と通知をスマートフォンのバイブレーションで知らせます" "読書灯のスケジュールの設定" diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml index 18609cd2314..06a01c2bf1d 100644 --- a/res/values-ka/arrays.xml +++ b/res/values-ka/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push ღილაკი" "ერთრანგიანი მოწყობილობის პინი" diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index e2fd2192a88..c55dc970a8d 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -773,7 +773,7 @@ "Wi‑Fi ირთვება…" "WiFi-ის გამორთვა…" "შეცდომა" - "5 გიგაჰერციანი სიხშირე არ არის ხელმისაწვდომი ამ ქვეყანაში" + "5-გიგაჰერციანი დიაპაზონი მიუწვდომელია ამ ქვეყანაში" "თვითმფრინავის რეჟიმში" "შეტყობინება ღია ქსელის შესახებ" "შეტყობინების მიღება მაღალხარისხიანი საჯარო ქსელის ხელმისაწვდომობისას" @@ -856,6 +856,7 @@ "ავტომატური" "2,4 GHz დიაპაზონი" "5 GHz დიაპაზონი" + "სასურველია 5-გიგაჰერციანი დიაპაზონი" "2.4 გჰც" "5 გჰც" "აირჩიეთ მინიმუმ ერთი დიაპაზონი Wi‑Fi უსადენო ქსელისთვის:" @@ -3163,7 +3164,7 @@ "დადუმებული, თუმცა დაიშვას %1$s და %2$s" "დადუმებული, თუმცა დაიშვას %1$s, %2$s და %3$s" "შეტყობინებები, მოვლენები და შეხსენებები" - "როცა ჩართულია რეჟიმი „არ შემაწუხოთ“, დადუმდება ყველა შეტყობინება, შეხსენება და მოვლენა იმ ერთეულების გარდა, რომლებსაც ზემოთ დაუშვებთ. სურვილისამებრ, შეგიძლიათ შეცვალოთ პარამეტრები და მისცეთ თქვენთან დაკავშირების საშუალება მეგობრებს, ოჯახის წევრებს და სხვა კონტაქტებს." + "როცა ჩართულია რეჟიმი „არ შემაწუხოთ“, დადუმდება ყველა შეტყობინება, შეხსენება და მოვლენა იმ ერთეულების გარდა, რომლებსაც ზემოთ დაუშვებთ. სურვილისამებრ, შეგიძლიათ შეცვალოთ პარამეტრები და მისცეთ თქვენთან დაკავშირების საშუალება მეგობრებს, ოჯახის წევრებს და სხვა კონტაქტებს." "მზადაა" "პარამეტრები" "უხილავი და უხმო შეტყობინებები" diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml index 515c4a465aa..819406fdb75 100644 --- a/res/values-kk/arrays.xml +++ b/res/values-kk/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Итеру түймесі" "Басқа құрылғының PIN коды" diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index 7bc0504cbc8..132ff97bc11 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -856,6 +856,7 @@ "Авто" "2,4 ГГц диапазоны" "5,0 ГГц диапазоны" + "5,0 ГГц диапазоны таңдалды" "2,4 ГГц" "5,0 ГГц" "Wi‑Fi хотспоты үшін кемінде бір диапазонды таңдаңыз:" @@ -3163,7 +3164,7 @@ "Дыбысы өшірілген, бірақ %1$s және %2$s үшін рұқсат берілген" "Дыбысы өшірілген, бірақ %1$s, %2$s және %3$s үшін рұқсат берілген" "Хабарлар, іс-шаралар және еске салғыштар" - "\"Мазаламау\" режимі қосулы кезде, хабарлардың, еске салғыштардың және іс-шаралардың дыбысы өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда). Достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алуы үшін, хабарлардың параметрлерін реттей аласыз." + "\"Мазаламау\" режимі қосулы кезде, хабарлардың, еске салғыштардың және іс-шаралардың дыбысы өшіріледі (жоғарыда рұқсат берілгендерді қоспағанда). Достарыңыз, отбасы мүшелері не басқа контактілер сізге хабарласа алуы үшін, хабарлардың параметрлерін реттей аласыз." "Дайын" "Параметрлер" "Хабарландырулар визуалды не дыбыстық сигналсыз беріледі" diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml index 7c3196e2f1d..df841b6af0a 100644 --- a/res/values-km/arrays.xml +++ b/res/values-km/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ប៊ូតុង​ចុច" "កូដ PIN ពី​ឧបករណ៍​" diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index 2fde7775fab..122c03d10e4 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -856,6 +856,7 @@ "ស្វ័យប្រវត្តិ" "រលកសញ្ញា 2.4 GHz" "រលកសញ្ញា 5.0 GHz" + "ប្រើ​រលកសញ្ញា 5.0 GHz ជា​អាទិភាព" "2.4 GHz" "5.0 GHz" "សូម​ជ្រើសរើស​ប៊ែន​យ៉ាង​ហោចណាស់​មួយសម្រាប់​ហតស្ប៉ត Wi‑Fi៖" @@ -3163,7 +3164,7 @@ "បានបិទ​សំឡេង ប៉ុន្តែ​អនុញ្ញាត​ %1$s និង %2$s" "បានបិទ​សំឡេង​ ប៉ុន្តែ​អនុញ្ញាត​ %1$s, %2$s និង %3$s" "សារ ព្រឹត្តិការណ៍ និងការរំលឹក" - "នៅ​ពេល​មុខងារ​កុំរំខាន​បើក សារ ការរំលឹក និង​ព្រឹត្តិការណ៍​នឹង​​ត្រូវបានបិទ​សំឡេង លើក​លែង​តែធាតុ​ដែល​អ្នកអនុញ្ញាត​ខាង​លើតែប៉ុណ្ណោះ។ អ្នក​អាច​កែតម្រូវ​ការកំណត់​សារ ដើម្បី​អនុញ្ញាត​​ឱ្យ​មិត្តភ័ក្តិ ក្រុមគ្រួសារ ឬ​ទំនាក់ទំនង​ផ្សេង​ទៀត​របស់អ្នកអាច​ទាក់ទង​អ្នកបាន។" + "នៅ​ពេល​មុខងារ​កុំរំខាន​បើក សារ ការរំលឹក និង​ព្រឹត្តិការណ៍​នានានឹង​​ត្រូវបានបិទ​សំឡេង លើក​លែង​តែធាតុ​ដែល​អ្នកអនុញ្ញាត​ខាង​លើតែប៉ុណ្ណោះ។ អ្នក​អាច​កែតម្រូវ​ការកំណត់​សារ ដើម្បី​អនុញ្ញាត​​ឱ្យ​មិត្តភ័ក្តិ គ្រួសារ ឬ​ទំនាក់ទំនង​ផ្សេង​ទៀត​របស់អ្នកអាច​ទាក់ទង​អ្នកបាន។" "រួចរាល់" "ការកំណត់" "គ្មាន​រូបភាព ឬសំឡេងពីការជូនដំណឹង​ទេ" diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml index 2a4afa6f337..86ec77755ad 100644 --- a/res/values-kn/arrays.xml +++ b/res/values-kn/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ಒತ್ತುವ ಬಟನ್" "ಪೀರ್ ಸಾಧನದಿಂದ ಪಿನ್‌" diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index f5d713edbba..0610a912c60 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -856,6 +856,7 @@ "ಸ್ವಯಂ" "2.4 GHz ಬ್ಯಾಂಡ್" "5.0 GHz ಬ್ಯಾಂಡ್" + "5.0 GHz ಬ್ಯಾಂಡ್‌ಗೆ ಆದ್ಯತೆ ನೀಡಲಾಗಿದೆ" "2.4 GHz" "5.0 GHz" "ವೈ-ಫೈ ಹಾಟ್‌ಸ್ಪಾಟ್‌ಗಾಗಿ ಕನಿಷ್ಠ ಒಂದು ಬ್ಯಾಂಡ್ ಆಯ್ಕೆಮಾಡಿ:" @@ -3163,7 +3164,7 @@ "ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ, ಆದರೆ %1$s ಮತ್ತು %2$s ರನ್ನು ಅನುಮತಿಸಿ" "ಮ್ಯೂಟ್ ಮಾಡಲಾಗಿದೆ, ಆದರೆ %1$s, %2$s, ಮತ್ತು %3$s ರನ್ನು ಅನುಮತಿಸಿ" "ಸಂದೇಶಗಳು, ಈವೆಂಟ್‌ಗಳು & ಜ್ಞಾಪನೆಗಳು" - "ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಇದ್ದಾಗ, ನೀವು ಮೇಲ್ಭಾಗದಲ್ಲಿ ಅನುಮತಿಸುವ ಐಟಂಗಳನ್ನು ಹೊರತುಪಡಿಸಿ, ಸಂದೇಶಗಳು, ಜ್ಞಾಪನೆಗಳು ಮತ್ತು ಈವೆಂಟ್‌ಗಳು ಮ್ಯೂಟ್ ಆಗುತ್ತವೆ. ನಿಮ್ಮ ಸ್ನೇಹಿತರು, ಕುಟುಂಬ, ಅಥವಾ ಇತರ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಲು ಅನುಮತಿಸಲು ಸಂದೇಶಗಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೀವು ಸರಿಹೊಂದಿಸಬಹುದು." + "ಅಡಚಣೆ ಮಾಡಬೇಡಿ ಆನ್ ಇದ್ದಾಗ, ನೀವು ಮೇಲ್ಭಾಗದಲ್ಲಿ ಅನುಮತಿಸುವ ಐಟಂಗಳನ್ನು ಹೊರತುಪಡಿಸಿ, ಸಂದೇಶಗಳು, ಜ್ಞಾಪನೆಗಳು ಮತ್ತು ಈವೆಂಟ್‌ಗಳು ಮ್ಯೂಟ್ ಆಗುತ್ತವೆ. ನಿಮ್ಮ ಸ್ನೇಹಿತರು, ಕುಟುಂಬ, ಅಥವಾ ಇತರ ಸಂಪರ್ಕಗಳು ನಿಮ್ಮನ್ನು ತಲುಪಲು ಅನುಮತಿಸಲು ಸಂದೇಶಗಳ ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ನೀವು ಸರಿಹೊಂದಿಸಬಹುದು." "ಮುಗಿದಿದೆ" "ಸೆಟ್ಟಿಂಗ್‌ಗಳು" "ಅಧಿಸೂಚನೆಗಳಿಂದ ಯಾವುದೇ ದೃಶ್ಯಗಳು ಅಥವಾ ಧ್ವನಿಗಳಿಲ್ಲ" diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml index 3741ac3b346..df41476127f 100644 --- a/res/values-ko/arrays.xml +++ b/res/values-ko/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "누름 버튼" "피어 기기 PIN" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index d300be1fb89..baf28d6038c 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -689,7 +689,7 @@ "%1$s에서 연락처와 통화 기록에 액세스하려고 합니다." "%1$s이(가) 블루투스를 통해 페어링하려고 합니다. 연결하면 기기가 주소록과 통화 기록에 액세스할 수 있습니다." "페어링된 기기" - "사용 가능한 기기" + "사용할 수 있는 기기" "사용 가능한 기기가 없습니다." "연결" "연결 끊기" @@ -856,6 +856,7 @@ "자동" "2.4GHz 대역" "5.0GHz 대역" + "5.0GHz 대역 사용 선호" "2.4GHz" "5.0GHz" "Wi‑Fi 핫스팟 대역을 한 개 이상 선택하세요." @@ -3163,7 +3164,7 @@ "%1$s 및 %2$s을(를) 제외하고 음소거됨" "%1$s, %2$s, %3$s을(를) 제외하고 음소거됨" "메시지, 일정, 알림" - "알림 일시중지가 사용 설정되어 있으면 위에서 허용한 항목을 제외한 메시지, 알림, 일정이 음소거됩니다. 메시지 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자가 나에게 연락하도록 허용할 수 있습니다." + "알림 일시중지가 사용 설정되어 있으면 위에서 허용한 항목을 제외한 메시지, 알림, 일정이 음소거됩니다. 메시지 설정을 조정하여 친구, 가족 또는 연락처에 등록된 다른 사용자가 나에게 연락하도록 허용할 수 있습니다." "완료" "설정" "알림 표시 및 소리 차단" @@ -3239,7 +3240,7 @@ "설치된 앱 중에서 알림 액세스를 요청한 앱이 없습니다." "%1$s의 알림 액세스를 허용하시겠습니까?" - "%1$s에서 연락처 이름과 수신 메시지 텍스트 등 개인정보를 포함한 모든 알림을 읽을 수 있게 됩니다. 또한 알림을 삭제하거나 포함된 작업 버튼을 실행하며 \n\n앱에서 알림 일시중지를 사용 또는 사용 중지하고 관련 설정을 변경할 수도 있습니다." + "%1$s에서 연락처 이름과 수신 메시지 텍스트 등 개인정보를 포함한 모든 알림을 읽을 수 있게 됩니다. 또한 알림을 삭제하거나 포함된 작업 버튼을 실행할 수 있습니다. \n\n앱에서 알림 일시중지를 사용 또는 사용 중지하고 관련 설정을 변경할 수도 있습니다." "%1$s에서 알림 액세스를 사용 중지하면 알림 일시중지 액세스도 사용 중지됩니다." "사용 중지" "취소" diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml index f5118e27673..5b70df5203f 100644 --- a/res/values-ky/arrays.xml +++ b/res/values-ky/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Баскычты басыңыз" "Туташуучу түзмөктүн PIN\'и" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 8912da63eb7..5719d6f316a 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -855,6 +855,7 @@ "Авто" "2.4 ГГц жыштыгы" "5.0 ГГц жыштыгы" + "5.0 ГГц жыштыгы сунушталат" "2.4 ГГц" "5.0 ГГц" "Wi‑Fi туташуу түйүнүн иштетүү үчүн кеминде бир жыштыкты тандаңыз:" @@ -3162,7 +3163,7 @@ "Үнсүз, бирок төмөнкүлөргө урусат берилсин: %1$s жана %2$s" "Үнсүз, бирок төмөнкүлөргө уруксат берилсин: %1$s, %2$s жана %3$s" "Билдирүүлөр, иш-чаралар жана эстеткичтер" - "\"Тынчымды алба\" режими күйүп турганда, жогоруда сиз уруксат берген нерселерден тышкары билдирүүлөр, эстеткичтер жана иш-чаралардын үнү басылат. Достор, үй-бүлө же башка тааныштарыңызга сиз менен байланышууга уруксат берүү үчүн жөндөөлөрдү тууралап алсаңыз болот." + "\"Тынчымды алба\" режими күйүп турганда, жогоруда сиз уруксат берген нерселерден тышкары билдирүүлөр, эстеткичтер жана иш-чаралардын үнү басылат. Достор, үй-бүлө же башка тааныштарыңызга сиз менен байланышууга уруксат берүү үчүн жөндөөлөрдү тууралап алсаңыз болот." "Бүттү" "Жөндөөлөр" "Билдирмелерди көрбөйсүз да, укпайсыз" diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml index 7d15b71e21c..d070743d585 100644 --- a/res/values-lo/arrays.xml +++ b/res/values-lo/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ປຸ່ມ Push" "PIN ຈາກອຸປະກອນທີ່ເຊື່ອມຕໍ່ກັນ" diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index c4b8448bd0c..b1c655dc9b9 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -856,6 +856,7 @@ "ອັດຕະໂນມັດ" "ຄື້ນ 2.4 GHz" "ຄື້ນ 5.0 GHz" + "ເລືອກຄື້ນຄວາມຖີ່ 5.0 GHz ກ່ອນ" "2.4 GHz" "5.0 GHz" "ເລືອກແຖບຄວາມຖີ່ຢ່າງໜ້ອຍໜຶ່ງອັນສຳລັບ Wi‑Fi:" @@ -3163,7 +3164,7 @@ "ປິດສຽງ, ແຕ່ອະນຸຍາດ %1$s ແລະ %2$s" "ປິດສຽງ, ແຕ່ອະນຸຍາດ %1$s, %2$s ແລະ %3$s" "ຂໍ້ຄວາມ, ນັດໝາຍ ແລະ ການເຕືອນ" - "ເມື່ອເປີດໂໝດຫ້າມລົບກວນແລ້ວ, ຂໍ້ຄວາມ, ການເຕືອນ ແລະ ນັດໝາຍຕ່າງໆຈະຖືກປິດສຽງໄວ້, ຍົກເວັ້ນລາຍການທີ່ທ່ານອະນຸຍາດຂ້າງເທິງ. ທ່ານສາມາດປັບແຕ່ງການຕັ້ງຄ່າຂໍ້ຄວາມເພື່ອໃຫ້ໝູ່, ຄອບຄົວ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ຄົນອື່ນໆຂອງທ່ານສາມາດຕິດຕໍ່ຫາທ່ານໄດ້." + "ເມື່ອເປີດໂໝດຫ້າມລົບກວນ, ຂໍ້ຄວາມ, ການແຈ້ງເຕືອນ ແລະ ເຫດການຕ່າງໆຈະຖືກປິດສຽງໄວ້, ຍົກເວັ້ນລາຍການທີ່ທ່ານອະນຸຍາດຂ້າງເທິງ. ທ່ານສາມາດປັບແຕ່ງການຕັ້ງຄ່າຂໍ້ຄວາມເພື່ອໃຫ້ໝູ່, ຄອບຄົວ ແລະ ລາຍຊື່ຜູ້ຕິດຕໍ່ຄົນອື່ນໆຂອງທ່ານສາມາດຕິດຕໍ່ຫາທ່ານໄດ້." "ແລ້ວໆ" "ການຕັ້ງຄ່າ" "ບໍ່ມີພາບ ຫຼື ສຽງຈາກການແຈ້ງເຕືອນ" diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml index 9f5198a499e..054da31521c 100644 --- a/res/values-lt/arrays.xml +++ b/res/values-lt/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Mygtuko paspaudimas" "PIN kodas iš susieto įrenginio" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index f05bae66f3a..e703bbcdabd 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -878,6 +878,7 @@ "Automatinė" "2,4 GHz dažnio juosta" "5 GHz dažnio juosta" + "Pageidaujama 5,0 GHz dažnio juosta" "2,4 GHz" "5 GHz" "Pasirinkite bent vieną „Wi‑Fi“ viešosios interneto prieigos taško dažnio juostą:" @@ -3237,7 +3238,7 @@ "Nutildyta, bet leisti %1$s ir %2$s" "Nutildyta, bet leisti %1$s, %2$s ir %3$s" "Pranešimai, įvykiai ir priminimai" - "Įjungus netrukdymo režimą pranešimai, priminimai ir įvykiai bus nutildomi, išskyrus anksčiau nurodytus elementus, kuriuos leidžiate. Galite koreguoti nustatymus, kad jūsų šeimos nariai, draugai arba kiti kontaktai galėtų su jumis susisiekti." + "Įjungus netrukdymo režimą pranešimai, priminimai ir įvykiai bus nutildomi, išskyrus anksčiau nurodytus elementus, kuriuos leidžiate. Galite koreguoti nustatymus, kad jūsų šeimos nariai, draugai arba kiti kontaktai galėtų su jumis susisiekti." "Atlikta" "Nustatymai" "Nieko nerodyti arba neskambėti gavus pranešimų" diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml index d44717f94f2..6a2b51394ac 100644 --- a/res/values-lv/arrays.xml +++ b/res/values-lv/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Spiedpoga" "Vienādranga ierīces PIN kods" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 4ca72db2b70..dd3339169a3 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -867,6 +867,7 @@ "Automātiski" "2,4 GHz josla" "5,0 GHz josla" + "Ieteicama 5,0 GHz josla" "2,4 GHz" "5,0 GHz" "Izvēlieties vismaz vienu joslu Wi‑Fi tīklājam:" @@ -3200,7 +3201,7 @@ "Izslēgta skaņa, bet atļaut: %1$s un %2$s" "Izslēgta skaņa, bet atļaut: %1$s, %2$s un %3$s" "Ziņojumi, pasākumi un atgādinājumi" - "Esot ieslēgtam režīmam Netraucēt, netiks rādīti ziņojumi, atgādinājumi un paziņojumi, izņemot vienumus, ko atļāvāt. Varat pielāgot ziņojumu iestatījumus, lai draugi, ģimene vai citas kontaktpersonas varētu ar jums sazināties." + "Kad ir ieslēgts režīms Netraucēt, netiks rādīti ziņojumi, atgādinājumi un paziņojumi par pasākumiem, izņemot vienumus, ko iepriekš būsiet atļāvis. Varat pielāgot ziņojumu iestatījumus, lai draugi, ģimene vai citas kontaktpersonas varētu ar jums sazināties." "Gatavs" "Iestatījumi" "Nav vizuālo vai skaņas signālu no paziņojumiem" diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml index 8fecee82781..a779ca00b20 100644 --- a/res/values-mk/arrays.xml +++ b/res/values-mk/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Копче „Притисни“" "PIN од спарен уред" diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index f2673d44c89..6fa83bdc857 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -856,6 +856,7 @@ "Автоматски" "Појас од 2,4 GHz" "Појас од 5,0 GHz" + "Претпочитан појас: 5,0 GHz" "2,4 GHz" "5,0 GHz" "Изберете барем еден појас за Wi‑Fi точка на пристап:" @@ -3163,7 +3164,7 @@ "Исклучи го звукот, но дозволи %1$s и %2$s" "Исклучи го звукот, но дозволи %1$s, %2$s и %3$s" "Пораки, настани и потсетници" - "Кога е вклучен режимот „Не вознемирувај“, ќе се исклучи звукот на пораките, потсетниците и настаните, освен за ставките што ќе ги дозволите погоре. Може да ги приспособите поставките за да им дозволите на пријателите, семејството или другите контакти да ве добијат." + "Кога е вклучен режимот „Не вознемирувај“, звукот на пораките, потсетниците и настаните е исклучен, освен за ставките што сте ги дозволите погоре. Може да ги приспособите поставките за пораки за да им дозволите на пријателите, семејството или другите контакти да ве добијат." "Готово" "Поставки" "Без визуелни вознемирувања или звук од известувањата" diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml index 4350dd2af55..cfd06addb58 100644 --- a/res/values-ml/arrays.xml +++ b/res/values-ml/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "പുഷ് ബട്ടൺ" "പിയർ ഉപകരണത്തിൽ നിന്നുള്ള പിൻ" diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index 8ef99685490..206fa701f86 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -856,6 +856,7 @@ "സ്വമേധയാ" "2.4 GHz ബാൻഡ്" "5.0 GHz ബാൻഡ്" + "5.0 GHz ബാൻഡ് തിരഞ്ഞെടുത്തു" "2.4 GHz" "5.0 GHz" "വൈഫൈ ഹോട്ട്‌സ്‌പോട്ടിനായി കുറഞ്ഞത് ഒരു ബാൻഡ് എങ്കിലും തിരഞ്ഞെടുക്കുക:" @@ -3163,7 +3164,7 @@ "മ്യൂട്ട് ചെയ്തു, എന്നാൽ %1$s, %2$s എന്നിവ അനുവദിക്കുന്നു" "മ്യൂട്ട് ചെയ്തു, എന്നാൽ %1$s, %2$s, %3$s എന്നിവ അനുവദിക്കുന്നു" "സന്ദേശങ്ങളും റിമൈൻഡറുകളും ഇവന്റുകളും" - "ശല്യപ്പെടുത്തരുത് ഓണായിരിക്കുമ്പോൾ, നിങ്ങൾ മുകളിൽ അനുവദിച്ചിട്ടുള്ള ഇനങ്ങൾ ഒഴികെയുള്ള, സന്ദേശങ്ങളും റിമൈൻഡറുകളും ഇവന്റുകളും മ്യൂട്ട് ചെയ്യപ്പെടും. നിങ്ങളെ വിളിക്കുന്നതിന് സുഹൃത്തുക്കളെയോ കുടുംബാംഗങ്ങളെയോ മറ്റ് കോൺടാക്‌റ്റുകളെയോ അനുവദിക്കാൻ നിങ്ങൾക്ക് ക്രമീകരണം ക്രമപ്പെടുത്താവുന്നതാണ്." + "\'ശല്യപ്പെടുത്തരുത്\' ഓണായിരിക്കുമ്പോൾ, നിങ്ങൾ മുകളിൽ അനുവദിച്ചിട്ടുള്ള ഇനങ്ങൾ ഒഴികെയുള്ള, സന്ദേശങ്ങളും റിമൈൻഡറും ഇവന്റുകളും മ്യൂട്ട് ചെയ്യപ്പെടും. നിങ്ങളെ വിളിക്കുന്നതിന് സുഹൃത്തുക്കളെയോ കുടുംബാംഗങ്ങളെയോ മറ്റ് കോൺടാക്‌റ്റുകളെയോ അനുവദിക്കാൻ നിങ്ങൾക്ക് ക്രമീകരണം ക്രമപ്പെടുത്താവുന്നതാണ്." "പൂർത്തിയാക്കി" "ക്രമീകരണം" "അറിയിപ്പുകളിൽ നിന്ന് വിഷ്വലുകളോ അല്ലെങ്കിൽ ശബ്‌ദമോ ഇല്ല" diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml index 96b972e489e..bf952f6f3ba 100644 --- a/res/values-mn/arrays.xml +++ b/res/values-mn/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Товчлуур" "Түнш төхөөрөмжийн PIN" diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index 5950f4da98a..c6df6a428f5 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -856,6 +856,7 @@ "Автомат" "2.4 ГГц зурвас" "5.0 Гц зурвас" + "5.0 Гц Зурвасыг тохиромжтой гэж үздэг" "2.4 Гц" "5.0 Гц" "Wi-Fi сүлжээний цэгт хамгийн багадаа нэг зурвасыг сонгоно уу:" @@ -3163,7 +3164,7 @@ "Дууг хаасан хэдий ч %1$s болон %2$s-г зөвшөөрдөг" "Дууг хаасан хэдий ч %1$s, %2$s болон %3$s-г зөвшөөрдөг" "Зурвас, арга хэмжээ & сануулагч" - "Бүү саад бол горим асаалттай үед зурвас, сануулагч, үйл ажиллагааны дууг таны зөвшөөрснөөс бусад зүйлд хаах болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд зурвасын тохиргоог өөрчлөх боломжтой." + "Бүү саад бол горим асаалттай үед зурвас, сануулагч, үйл ажиллагааны дууг таны зөвшөөрснөөс бусад зүйлд хаах болно. Та найз нөхөд, гэр бүлийнхэн эсвэл бусад харилцагчдаа тантай холбоо барихыг зөвшөөрөхийн тулд зурвасын тохиргоог өөрчлөх боломжтой." "Дууссан" "Тохиргоо" "Мэдэгдэл харагдахгүй бөгөөд дуугарахгүй" diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml index 83c5742fe93..99ef1c918ef 100644 --- a/res/values-mr/arrays.xml +++ b/res/values-mr/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "पुश बटण" "पीअर डिव्हाइसवरील पिन" diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index 21bf1f9eaca..9386fbbbc8b 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -856,6 +856,7 @@ "आपोआप" "2.4 GHz बँड" "५.० GHz बँड" + "५.० GHz बँडला प्राधान्य दिले" "२.४ GHz" "५.० GHz" "वाय-फाय हॉटस्‍पॉटसाठी किमान एक बँड निवडा:" @@ -3164,7 +3165,7 @@ "म्यूट केले आहे पण %1$s आणि %2$s ला अनुमती द्या" "म्यूट केले आहे पण %1$s, %2$s आणि %3$s ला अनुमती द्या" "मेसेज, इव्हेंट आणि रिमाइंडर" - "जेव्हा व्यत्यय आणू नका सुरू असते तेव्हा मेसेज, रिमाइंडर आणि इव्हेंट म्यूट असतील, तुम्ही वरती अनुमती दिलेल्या आयटम व्यतिरिक्त. तुम्ही सेटिंग्ज मध्ये बदल करून तुमच्या मित्रमैत्रिणींना, कुटुंबियांना आणि इतर संपर्कांना तुमच्यापर्यंत पोहोचण्याची अनुमती देऊ शकता." + "जेव्हा व्यत्यय आणू नका सुरू असते तेव्हा मेसेज, रिमाइंडर आणि इव्हेंट म्यूट असतील, तुम्ही वरती अनुमती दिलेल्या आयटम व्यतिरिक्त. तुम्ही सेटिंग्ज मध्ये बदल करून तुमच्या मित्रमैत्रिणींना, कुटुंबियांना आणि इतर संपर्कांना तुमच्यापर्यंत पोहोचण्याची अनुमती देऊ शकता." "झाले" "सेटिंग्ज" "सूचना आल्यावर व्हिज्युअल किंवा आवाज नाही" diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml index 46188d3dbc5..ea6be581178 100644 --- a/res/values-ms/arrays.xml +++ b/res/values-ms/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Butang tekan" "PIN daripada peranti rakan" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 5c385324ecf..28480241576 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -856,6 +856,7 @@ "Automatik" "Jalur 2.4 GHz" "Jalur 5.0 GHz" + "Lajur 5.0 GHz diutamakan" "2.4 GHz" "5.0 GHz" "Pilih sekurang-kurangnya satu jalur untuk tempat liputan Wi-Fi:" @@ -3163,7 +3164,7 @@ "Diredamkan tetapi benarkan %1$s dan %2$s" "Diredamkan, tetapi benarkan %1$s, %2$s dan %3$s" "Mesej, acara & peringatan" - "Apabila Jangan Ganggu Dihidupkan, mesej, peringatan dan acara akan diredamkan, kecuali item yang anda benarkan di atas. Anda boleh melaraskan tetapan mesej untuk membenarkan rakan, keluarga atau kenalan lain menghubungi anda." + "Apabila Jangan Ganggu dihidupkan, mesej, peringatan dan acara akan diredamkan, kecuali item yang anda benarkan di atas. Anda boleh melaraskan tetapan mesej untuk membenarkan rakan, keluarga atau kenalan lain menghubungi anda." "Selesai" "Tetapan" "Tiada visual atau bunyi daripada pemberitahuan" diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml index f2c2f068b1c..ee9d4338b52 100644 --- a/res/values-my/arrays.xml +++ b/res/values-my/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "နှိပ်ရန်ခလုတ်" "တန်းတူစက်ပစ္စည်းမှပင်နံပါတ်" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 021fa050666..3b7ddf7712a 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -856,6 +856,7 @@ "အလိုအလျောက်" "၂.၄ GHz လိုင်း" "၅.၀ GHz လိုင်း" + "5.0 GHz လိုင်း ရွေးချယ်ထားသည်" "၂.၄ GHz" "၅.၀ GHz" "Wi‑Fi ဟော့စပေါ့အတွက် အနည်းဆုံး လိုင်းတစ်လိုင်းရွေးပါ−" @@ -3163,7 +3164,7 @@ "ပိတ်ထားသော်လည်း %1$s နှင့် %2$s ကို ခွင့်ပြုသည်" "ပိတ်ထားသော်လည်း %1$s၊ %2$s နှင့် %3$s ကို ခွင့်ပြုသည်" "မက်ဆေ့ဂျ်၊ အစီအစဉ်နှင့် သတိပေးချက်များ" - "\'မနှောင့်ယှက်ရ\' ဖွင့်ထားသည့်အခါ မက်ဆေ့ဂျ်၊ သတိပေးချက်နှင့် အစီအစဉ်များကို ပိတ်ထားပါမည်။ သင့်မိတ်ဆွေများ၊ မိသားစု သို့မဟုတ် အခြားအဆက်အသွယ်များက သင့်ကိုဆက်သွယ်နိုင်စေရန် မက်ဆေ့ဂျ်ဆက်တင်များကို ပြင်ဆင်နိုင်သည်။" + "\'မနှောင့်ယှက်ရ\' ဖွင့်ထားသည့်အခါ သင်အထက်တွင် ခွင့်ပြုထားသည်များအတွက်မှလွဲ၍ မက်ဆေ့ဂျ်၊ သတိပေးချက်နှင့် အစီအစဉ်များကို ပိတ်ထားပါမည်။ သင့်မိတ်ဆွေများ၊ မိသားစု သို့မဟုတ် အခြားအဆက်အသွယ်များက သင့်အားဆက်သွယ်နိုင်စေရန် မက်ဆေ့ဂျ်ဆက်တင်များကို ပြင်ဆင်နိုင်သည်။" "ပြီးပါပြီ" "ဆက်တင်များ" "အကြောင်းကြားချက်များအတွက် ရုပ်ပုံ သို့မဟုတ် အသံ မဖွင့်ရန်" diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml index 6bae31ec2d5..636bb0b50f5 100644 --- a/res/values-nb/arrays.xml +++ b/res/values-nb/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Trykk på knappen" "Personlig kode fra motpart" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 19d9a58c34d..8ff2310b4e0 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -856,6 +856,7 @@ "Automatisk" "2,4 GHz-bånd" "5,0 GHz-bånd" + "5,0 GHz-bånd foretrekkes" "2,4 GHz" "5,0 GHz" "Velg minst ett bånd for Wi-Fi-sonen:" @@ -3163,7 +3164,7 @@ "Ignorert, men tillat %1$s og %2$s" "Ignorert, men tillat %1$s, %2$s og %3$s" "Meldinger, aktiviteter og påminnelser" - "Når «Ikke forstyrr» er på, ignoreres meldinger, påminnelser og aktiviteter, med unntak av elementene du tillater ovenfor. Du kan justere meldingsinnstillinger for å la venner, familie eller andre kontakter nå deg." + "Når «Ikke forstyrr» er på, ignoreres meldinger, påminnelser og aktiviteter, med unntak av elementene du tillater ovenfor. Du kan justere meldingsinnstillingene for å la venner, familie eller andre kontakter nå deg." "Ferdig" "Innstillinger" "Ingen lyder eller visuelle elementer fra varsler" diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml index bd4ae2e195d..46425ceab20 100644 --- a/res/values-ne/arrays.xml +++ b/res/values-ne/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push बटन" "PIN जोडी उपकरणबाट" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 3219868ce4a..3a2551e1a16 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -856,6 +856,7 @@ "स्वतः निर्धारित" "2.4 GHz ब्यान्ड" "५.० GHz ब्यान्ड" + "५.० GHz ब्यान्ड रुचाइयो" "२.४ GHz" "५.० GHz" "Wi‑Fi हटस्पटका लागि कम्तीमा एक ब्यान्ड छनौट गर्नुहोस्:" @@ -3163,7 +3164,7 @@ "म्युट गरिएको छ, तर %1$s र %2$s लाई अनुमति दिनुहोस्" "म्युट गरिएको छ, तर %1$s, %2$s र %3$s लाई अनुमति दिनुहोस्" "सन्देश, कार्यक्रम तथा रिमाइन्डरहरू" - "बाधा नपुर्‍याउनुहोस् मोड सक्रिय भएका बेला तपाईंले माथि अनुमति दिनुभएका वस्तुहरूबाहेक सन्देश, रिमाइन्डर तथा कार्यक्रमहरूलाई म्युट गरिने छ। तपाईं आफ्ना साथीभाइ, परिवारजन वा अन्य सम्पर्कहरूलाई आफूसँग सम्पर्क राख्न दिने गरी सन्देशसम्बन्धी सेटिङहरू समायोजन गर्न सक्नुहुन्छ।" + "बाधा नपुर्‍याउनुहोस् मोड सक्रिय भएका बेला तपाईंले माथि अनुमति दिनुभएका वस्तुहरूबाहेक सन्देश, रिमाइन्डर तथा कार्यक्रमहरूलाई म्युट गरिने छ। तपाईं आफ्ना साथीभाइ, परिवारजन वा अन्य सम्पर्कहरूलाई आफूसँग सम्पर्क राख्न दिने गरी सन्देशसम्बन्धी सेटिङहरू समायोजन गर्न सक्नुहुन्छ।" "सम्पन्न भयो" "सेटिङहरू" "सूचनाहरूको कुनै पनि भिजुअल वा ध्वनि छैन" @@ -3400,8 +3401,8 @@ "ठिक छ" "उपकरण बारेमा प्रतिक्रिया पठाउनुहोस्" "प्रशासकको PIN प्रविष्ट गर्नुहोस्" - "सक्रिय गर्नुहोस्" - "बन्द गर्नुहोस्" + "सक्रिय" + "निष्क्रिय" "पर्दा पिन गर्दै" "यो सेटिङ सक्रिय गर्दा, हालको स्क्रिनलाई तपाईंले अनपिन नगरुन्जेल दृश्य अवस्थामा राख्न स्क्रिन पिनिङ प्रयोग गर्न सक्नुहुन्छ।\n\nस्क्रिन पिनिङ सुविधा प्रयोग गर्न:\n\n१. स्क्रिन पिनिङ सक्रिय रहेको सुनिश्चित गर्ने\n\n२. अवलोकन खोल्ने\n\n३. स्क्रिनको सिरानमा रहेको अनुप्रयोग आइकनमा ट्याप गर्ने, त्यसपछि पिनमा ट्याप गर्ने" "पिन निकाल्नुअघि खोल्ने ढाँचा सोध्नुहोस्" diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml index ab26ad8800b..bb99c581de5 100644 --- a/res/values-nl/arrays.xml +++ b/res/values-nl/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Knop indrukken" "Pincode van peerapparaat" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 28b6f1dfcc9..87e5cb2be67 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -114,7 +114,7 @@ "De verbinding tussen je apparaat en %1$s wordt verbroken." "Koppel los" "Je hebt geen toestemming om de Bluetooth-instellingen te wijzigen." - "Nieuw apparaat koppelen" + "Apparaat koppelen" "%1$s is zichtbaar voor apparaten in de buurt wanneer het venster \'Bluetooth-instellingen\' is geopend." "Bluetooth-adres van je telefoon: %1$s" "Bluetooth-adres van je tablet: %1$s" @@ -856,6 +856,7 @@ "Automatisch" "2,4-GHz-frequentieband" "5-GHz-frequentieband" + "Voorkeur voor 5-GHz-frequentieband" "2,4 GHz" "5 GHz" "Kies ten minste één band voor je wifi-hotspot:" @@ -3163,7 +3164,7 @@ "Gedempt, maar %1$s en %2$s wel toestaan" "Gedempt, maar %1$s , %2$s en %3$s wel toestaan" "Meldingen, afspraken en herinneringen" - "Wanneer \'Niet storen\' is ingeschakeld, worden berichten, herinneringen en gebeurtenissen gedempt, met uitzondering van de items die je hierboven toestaat. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken." + "Wanneer \'Niet storen\' is ingeschakeld, worden berichten, herinneringen en afspraken gedempt, met uitzondering van de items die je hierboven toestaat. Je kunt de instellingen aanpassen zodat je vrienden, gezinsleden of andere contacten je kunnen bereiken." "Klaar" "Instellingen" "Geen zichtbare of hoorbare meldingen" @@ -3239,7 +3240,7 @@ "Er zijn geen geïnstalleerde apps die toegang tot meldingen hebben aangevraagd." "Toegang tot meldingen toestaan voor %1$s?" - "%1$s kan alle meldingen lezen, waaronder persoonlijke gegevens zoals contactnamen en de tekst van berichten die je ontvangt. De functie kan deze meldingen ook sluiten of actieknoppen die ermee samenhangen activeren. \n\nHierdoor kan de app ook \'Niet storen\' in- of uitschakelen en gerelateerde instellingen wijzigen." + "%1$s kan alle meldingen lezen, waaronder persoonlijke gegevens zoals contactnamen en de tekst van berichten die je ontvangt. De app kan deze meldingen ook sluiten of actieknoppen die ermee samenhangen activeren. \n\nHierdoor kan de app ook \'Niet storen\' in- of uitschakelen en gerelateerde instellingen wijzigen." "Als je toegang tot meldingen uitschakelt voor %1$s, kan toegang tot \'Niet storen\' ook worden uitgeschakeld." "Uitschakelen" "Annuleren" diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml index 2124b635e6b..958cb84232d 100644 --- a/res/values-or/arrays.xml +++ b/res/values-or/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ପୁଶ୍‌ ବଟନ୍‌" "ପୀଅର୍‌ ଡିଭାଇସ୍‌ରୁ PIN‌" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index 3b7fec7efb4..8b3547ef3cf 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -855,6 +855,7 @@ "ସ୍ୱତଃ" "2.4 GHz ବ୍ୟାଣ୍ଡ" "5 GHz ବ୍ୟାଣ୍ଡ" + "5.0 GHz ବ୍ୟାଣ୍ଡ ପ୍ରାଥମିକତା ଦିଆଗଲା" "2.4 GHz" "2.4 GHz" "ୱାଇ-ଫାଇ ହଟସ୍ପଟ୍ ପାଇଁ ଅତିକମ୍‌ରେ ଗୋଟିଏ ବ୍ୟାଣ୍ଡକୁ ଚୟନ କରନ୍ତୁ:" @@ -944,8 +945,7 @@ "ହଟ୍‌ସ୍ପଟ୍‌ ମାଧ୍ୟମରେ ଏହି ଟାବ୍‌ଲେଟ୍‌ର ଇଣ୍ଟର୍‌ନେଟ୍‌ ସଂଯୋଗ ଶେୟାର୍‌ କରୁଛି" "ହଟସ୍ପଟ୍‌ ମାଧ୍ୟମରେ ଏହି ଫୋନ‌ର ଇଣ୍ଟର୍ନେଟ୍‌ ସଂଯୋଗ ଶେୟାର୍‌ କରୁଛି" "ଆପ୍‍ କଣ୍ଟେଣ୍ଟ ଶେୟର୍ କରୁଛି। ଇଣ୍ଟରନେଟ୍‌ ସଂଯୋଜନା ଶେୟାର କରିବାକୁ, ହଟ୍‌ସ୍ପଟ୍‌ ଅଫ୍‌ କରି ଅନ୍‌ କରନ୍ତୁ" - - + "କୌଣସି ପାସ୍‌ୱାର୍ଡ୍‌ ସେଭ୍‌ ହୋଇନାହିଁ" "ହଟସ୍ପଟ୍‌ ନାମ" "%1$s ଅନ୍‌ ହେଉଛି..." "%1$s ସହ ଅନ୍ୟ ଡିଭାଇସ୍‌ଗୁଡ଼ିକ ସଂଯୁକ୍ତ ହୋଇପାରିବ" @@ -3163,10 +3163,9 @@ "ମ୍ୟୁଟ୍ ହୋ‍ଇଛି, କିନ୍ତୁ %1$s ଓ %2$sକୁ ଅନୁମତି ଦିଅନ୍ତୁ" "ମ୍ୟୁଟ୍ ହୋ‍ଇଛି, କିନ୍ତୁ %1$s, %2$s ଓ %3$sକୁ ଅନୁମତି ଦିଅନ୍ତୁ" "ମେସେଜ୍, ଇଭେଣ୍ଟ ଓ ରିମାଇଣ୍ଡର୍" - "ଯେତେବେଳେ ’ବିରକ୍ତ କରନ୍ତୁ ନାହିଁ’ ଅନ୍ ଥିବ, ସେତେବେଳେ ଉପରେ ଆପଣ ଅନୁମତି ଦେଇଥିବା ଆଇଟମ୍ ବ୍ୟତୀତ ମେସେଜ୍, ରିମାଇଣ୍ଡର୍ ଓ ଇଭେଣ୍ଟ ମ୍ୟୁଟ୍ ହୋ‍ଇଯିବ। ସାଙ୍ଗ, ପରିବାର ଲୋକେ କିମ୍ବା ଅନ୍ୟାନ୍ୟ ଯୋଗାଯୋଗ ଆପଣଙ୍କୁ ସମ୍ପର୍କ କରିବା ପାଇଁ ଆପଣ ସେଟିଙ୍ଗକୁ ଆଡଜଷ୍ଟ କରିପାରିବେ।" + "ଯେତେବେଳେ ’ଡୁ ନଟ୍‍ ଡିଷ୍ଟ୍ରବ୍‍’ ଅନ୍ ଥିବ, ସେତେବେଳେ ଉପରେ ଆପଣ ଅନୁମତି ଦେଇଥିବା ଉପରୋକ୍ତ ଆଇଟମ୍ ବ୍ୟତୀତ ମେସେଜ୍, ରିମାଇଣ୍ଡର୍ ଓ ଇଭେଣ୍ଟ ମ୍ୟୁଟ୍ ହୋ‍ଇଯିବ। ନିଜର ସାଙ୍ଗ, ପରିବାର କିମ୍ବା ଅନ୍ୟ କଣ୍ଟାକ୍ଟଗୁଡ଼ିକ ଆପଣଙ୍କ ପାଖରେ ପହଞ୍ଚିବା ପାଇଁ ଆପଣ ସେଟିଙ୍ଗକୁ ବ୍ୟବହାର ଉପଯୋଗୀ କରିପାରିବେ।" "ହୋ‍ଇଗଲା" - - + "ସେଟିଂ" "ବିଜ୍ଞପ୍ତି ଆସିଲେ କୌଣସି ଭିଜୁଆଲ୍ ଦେଖାଯିବ ନାହିଁ କିମ୍ବା ସାଉଣ୍ଡ୍‍ ବାହାରିବ ନାହିଁ" "ବିଜ୍ଞପ୍ତି ଆସିଲେ କୌଣସି ସାଉଣ୍ଡ ନହେଉ" "ଆପଣ ବିଜ୍ଞପ୍ତିକୁ ଦେଖି କିମ୍ବା ଶୁଣିପାରିବେ ନାହିଁ। ତାରାଙ୍କିତ ଯୋଗାଯୋଗରୁ ଆସିଥିବା କଲ୍ ଏବଂ ପୁଣି କଲ୍ କରୁଥିବା କଲର୍‍ଙ୍କୁ ଅନୁମତି ଦିଆଯାଇଛି।" @@ -3228,10 +3227,8 @@ "ଜରୁରୀ ମହତ୍ତ୍ୱପୂର୍ଣ୍ଣ" "ବିଜ୍ଞପ୍ତିଗୁଡିକ ଦେଖାନ୍ତୁ" "ବିଜ୍ଞପ୍ତି ସହାୟକ" - - - - + "ପ୍ରତି ଦିନ ~%1$s" + "ପ୍ରତି ସପ୍ତାହରେ ~%1$s" "ଆଦୌ ନୁହେଁ" "ବିଜ୍ଞପ୍ତି ଆକ୍ସେସ୍" "କାର୍ଯ୍ୟ ପ୍ରୋଫାଇଲ୍‌ ବିଜ୍ଞପ୍ତିଗୁଡିକୁ ଅକସେସ୍‌ ଅବରୋଧିତ" @@ -4134,8 +4131,7 @@ "ୱାଇ-ଫାଇକୁ ନିୟନ୍ତ୍ରଣ କରିବା ପାଇଁ ଆପ୍‌କୁ ଅନୁମତି ଦିଅନ୍ତୁ" "ୱାଇ-ଫାଇକୁ ଚାଲୁ କରିବା କିମ୍ବା ବନ୍ଦ କରିବା, ୱାଇ-ଫାଇ ନେଟୱର୍କକୁ ଖୋଜିବା ଓ କନେକ୍ଟ କରିବା, ନେଟୱର୍କକୁ ଯୋଡ଼ିବା କିମ୍ବା କାଢ଼ିଦେବା କିମ୍ବା କେବଳ ସୀମିତ କ୍ଷେତ୍ରରେ କାମ କରୁଥିବା ହଟସ୍ପଟ୍‌କୁ ଚାଲୁ କରିବା ପାଇଁ ଏହି ଆପ୍‌କୁ ଅନୁମତି ଦେବା" "ମିଡିଆ ଚଲାନ୍ତୁ" - - + "ଏହି ଡିଭାଇସ୍‍" "ଫୋନ୍" "ଟାବଲେଟ୍‌" "ଡିଭାଇସ୍" diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml index ebcf48c2989..b761d26e11b 100644 --- a/res/values-pa/arrays.xml +++ b/res/values-pa/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ਪੁਸ਼ ਬਟਨ" "ਪੀਅਰ ਡੀਵਾਈਸ ਤੋਂ ਪਿੰਨ" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index f07d5cdece9..1ceae10e892 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -856,6 +856,7 @@ "ਸਵੈਚਲਿਤ" "2.4 GHz ਬੈਂਡ" "5.0 GHz ਬੈਂਡ" + "5.0 GHz ਬੈਂਡ ਨੂੰ ਤਰਜੀਹ ਦਿੱਤੀ ਗਈ" "2.4 GHz" "5.0 GHz" "ਵਾਈ-ਫਾਈ ਹੌਟਸਪੌਟ ਲਈ ਘੱਟੋ-ਘੱਟ ਇੱਕ ਬੈਂਡ ਚੁਣੋ:" @@ -1383,7 +1384,7 @@ "ਡੀਵਾਈਸਾਂ ਵਿਚਕਾਰ ਫ਼ਾਈਲਾਂ ਅਤੇ ਮੀਡੀਆ ਟ੍ਰਾਂਸਫ਼ਰ ਕਰਨ ਲਈ" "ਪੋਰਟੇਬਲ ਸਟੋਰੇਜ" "ਬਾਅਦ ਵਿੱਚ ਸੈੱਟਅੱਪ ਕਰੋ" - "ਕੀ ਇਸ ^1 ਫਾਰਮੈਟ ਕਰਨਾ ਹੈ?" + "ਕੀ ਇਸ ^1 ਨੂੰ ਫਾਰਮੈਟ ਕਰਨਾ ਹੈ?" "ਇਸ ^1 ਨੂੰ ਐਪਾਂ, ਫ਼ਾਈਲਾਂ ਅਤੇ ਮੀਡੀਆ ਸਟੋਰ ਕਰਨ ਲਈ ਫਾਰਮੈਟ ਕਰਨਾ ਪਵੇਗਾ। \n\nਫਾਰਮੈਟ ਕਰਨ ਨਾਲ ^2 \'ਤੇ ਮੌਜੂਦ ਸਮੱਗਰੀ ਮਿਟ ਜਾਵੇਗੀ। ਸਮੱਗਰੀ ਗੁਆਉਣ ਤੋਂ ਬਚਣ ਲਈ, ਇਸ ਦਾ ਕਿਸੇ ਹੋਰ ^3 ਜਾਂ ਡੀਵਾਈਸ \'ਤੇ ਬੈਕਅੱਪ ਲਓ।" "^1 ਨੂੰ ਫਾਰਮੈਟ ਕਰੋ" "ਕੀ ^1 ਵਿੱਚ ਸਮੱਗਰੀ ਨੂੰ ਲਿਜਾਣਾ ਹੈ?" @@ -3163,7 +3164,7 @@ "ਮਿਊਟ ਕੀਤਾ ਗਿਆ, ਪਰ %1$s ਅਤੇ %2$s ਚੱਲਣ ਦਿਓ" "ਮਿਊਟ ਕੀਤਾ ਗਿਆ, ਪਰ %1$s, %2$s ਅਤੇ %3$s ਚੱਲਣ ਦਿਓ" "ਸੁਨੇਹੇ, ਇਵੈਂਟ ਅਤੇ ਯਾਦ-ਸੂਚਨਾਵਾਂ" - "ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਹੋਣ \'ਤੇ ਉਪਰੋਕਤ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਵਾਲੀਆਂ ਆਈਟਮਾਂ ਤੋਂ ਇਲਾਵਾ ਸੁਨੇਹੇ, ਯਾਦ-ਸੂਚਨਾਵਾਂ ਅਤੇ ਇਵੈਂਟ ਮਿਊਟ ਕੀਤੇ ਜਾਣਗੇ। ਤੁਸੀਂ ਆਪਣੇ ਦੋਸਤਾਂ, ਪਰਿਵਾਰਕ ਜਾਂ ਹੋਰ ਸੰਪਰਕਾਂ ਵੱਲੋਂ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣ ਲਈ ਸੁਨੇਹੇ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।" + "ਪਰੇਸ਼ਾਨ ਨਾ ਕਰੋ ਚਾਲੂ ਹੋਣ \'ਤੇ ਉਪਰੋਕਤ ਤੁਹਾਡੀ ਇਜਾਜ਼ਤ ਵਾਲੀਆਂ ਆਈਟਮਾਂ ਤੋਂ ਇਲਾਵਾ ਸੁਨੇਹੇ, ਯਾਦ-ਸੂਚਨਾਵਾਂ ਅਤੇ ਇਵੈਂਟ ਮਿਊਟ ਕੀਤੇ ਜਾਣਗੇ। ਤੁਸੀਂ ਆਪਣੇ ਦੋਸਤਾਂ, ਪਰਿਵਾਰਕ ਜਾਂ ਹੋਰ ਸੰਪਰਕਾਂ ਵੱਲੋਂ ਤੁਹਾਡੇ ਤੱਕ ਪਹੁੰਚ ਕਰਨ ਦੇਣ ਲਈ ਸੁਨੇਹੇ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵਿਵਸਥਿਤ ਕਰ ਸਕਦੇ ਹੋ।" "ਹੋ ਗਿਆ" "ਸੈਟਿੰਗਾਂ" "ਸੂਚਨਾਵਾਂ ਦੇ ਕੋਈ ਦ੍ਰਿਸ਼ਟੀਗਤ ਸੰਕੇਤ ਜਾਂ ਧੁਨੀ ਨਹੀਂ" diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml index 8d420a37cfe..62d556b9142 100644 --- a/res/values-pl/arrays.xml +++ b/res/values-pl/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Naciśnij przycisk" "Kod PIN z drugiego urządzenia" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 442fd77dde3..bf35224d6b4 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -878,6 +878,7 @@ "Automatycznie" "Pasmo 2,4 GHz" "Pasmo 5 GHz" + "Wybieraj pasmo 5,0 GHz" "2,4 GHz" "5,0 GHz" "Wybierz co najmniej jedno pasmo dla hotspotu Wi-Fi:" @@ -1975,8 +1976,8 @@ "Kliknij trzy razy, by powiększyć" "Kliknij przycisk, by powiększyć" "Aby powiększyć"", szybko kliknij ekran trzy raz.\n"
  • "Przeciągnij co najmniej dwoma palcami, by przewijać ekran."
    • \n
  • "Ściągnij do siebie co najmniej dwa palce, by dostosować powiększenie."
\n\n"Aby tymczasowo powiększyć widok"", szybko kliknij ekran trzy razy i przytrzymaj palec po trzecim kliknięciu.\n"
  • "Przeciągaj palcem, by poruszać się po ekranie."
    • \n
  • "Unieś palec, by wyłączyć powiększenie."
\n\n"Nie można powiększyć klawiatury ani paska nawigacji." - "Gdy powiększenie jest włączone, użyj przycisku ułatwień dostępu u dołu ekranu, by szybko powiększyć widok.\n\n""Aby powiększyć"", kliknij przycisk ułatwień dostępu, a potem dowolne miejsce na ekranie.\n"
  • "Przeciągnij co najmniej dwoma palcami, by przewijać."
    • \n
  • "Ściągnij do siebie co najmniej dwa palce, by dostosować powiększenie."
\n\n"Aby powiększyć tymczasowo"", dotknij przycisku ułatwień dostępu, a następnie dotknij i przytrzymaj dowolne miejsce na ekranie.\n"
  • "Przeciągaj palcem, by poruszać się po ekranie "
    • \n
  • "Unieś palec, by wyłączyć powiększenie."
\n\n"Nie można powiększyć klawiatury ani paska nawigacji." - "Przycisk ułatwień dostępu włącza: %1$s. Aby użyć powiększenia, dotknij i przytrzymaj przycisk ułatwień dostępu, a następnie wybierz powiększenie." + "Gdy powiększenie jest włączone, użyj przycisku ułatwień dostępu u dołu ekranu, by szybko powiększyć widok.\n\n""Aby powiększyć"", kliknij przycisk ułatwień dostępu, a potem dowolne miejsce na ekranie.\n"
  • "Przeciągnij co najmniej dwoma palcami, by przewijać."
    • \n
  • "Ściągnij do siebie co najmniej dwa palce, by dostosować powiększenie."
\n\n"Aby powiększyć tymczasowo"", dotknij przycisku ułatwień dostępu, a następnie naciśnij i przytrzymaj dowolne miejsce na ekranie.\n"
  • "Przeciągaj palcem, by poruszać się po ekranie "
    • \n
  • "Unieś palec, by wyłączyć powiększenie."
\n\n"Nie można powiększyć klawiatury ani paska nawigacji." + "Przycisk ułatwień dostępu włącza: %1$s. Aby użyć powiększenia, naciśnij i przytrzymaj przycisk ułatwień dostępu, a następnie wybierz powiększenie." "Skrót z klawiszami głośności" "Usługa skrótu" "Pozwól na ekranie blokady" @@ -3237,7 +3238,7 @@ "Wyciszone, ale zezwól na: %1$s i %2$s" "Wyciszone, ale zezwól na: %1$s, %2$s i %3$s" "Wiadomości, wydarzenia i przypomnienia" - "Gdy włączysz tryb Nie przeszkadzać, wiadomości, przypomnienia i wydarzenia będą wyciszone. Wyciszenie nie będzie dotyczyło elementów, na które zezwolisz powyżej. Możesz dostosować ustawienia wiadomości, by znajomi, rodzina i inne osoby mogli do Ciebie zadzwonić." + "Gdy włączysz tryb Nie przeszkadzać, wiadomości, przypomnienia i wydarzenia będą wyciszone. Wyciszenie nie będzie dotyczyło elementów, na które zezwolisz powyżej. Możesz dostosować ustawienia wiadomości, by znajomi, rodzina i inni mogli do Ciebie zadzwonić." "Gotowe" "Ustawienia" "Brak wizualnego i dźwiękowego sygnalizowania powiadomień" @@ -3675,7 +3676,7 @@ "Raport o błędzie jest udostępniany administratorowi IT. Skontaktuj się z nim, by dowiedzieć się więcej." "Udostępnij" "Odrzuć" - "Bez przenoszenia danych" + "Tylko ładowanie" "Tylko ładowanie tego urządzenia" "Ładowanie podłączonego urządzenia" "Przesyłanie plików" @@ -3685,7 +3686,7 @@ "Tethering przez USB" "MIDI" "Użyj tego urządzenia jako MIDI" - "Użyj USB do:" + "Użyj USB do tych działań:" "Domyślna konfiguracja USB" "Te ustawienia będą obowiązywać, gdy zostanie połączone inne urządzenie, a Twój telefon będzie odblokowany. Łącz się tylko z zaufanymi urządzeniami." "USB" diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml index f0b3c3d7f99..70fade6047c 100644 --- a/res/values-pt-rBR/arrays.xml +++ b/res/values-pt-rBR/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Pressione o botão" "PIN do dispositivo pareado" diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 1d22073a065..43102644cbd 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -856,6 +856,7 @@ "Automático" "Banda de 2,4 GHz" "Banda de 5 GHz" + "Banda de 5 GHz preferencial" "2,4 GHz" "5 GHz" "Escolha pelo menos uma banda para o ponto de acesso Wi-Fi:" @@ -3163,7 +3164,7 @@ "Som desativado, mas permitido para %1$s e %2$s" "Som desativado, mas permitido para %1$s, %2$s e %3$s" "Mensagens, eventos e lembretes" - "Quando o \"Não perturbe\" estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você." + "Quando o \"Não perturbe\" estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você." "Concluído" "Configurações" "Sem aviso visual ou sonoro de notificações" @@ -3238,8 +3239,8 @@ %d apps podem ler notificações "Nenhum app instalado solicitou o acesso a notificações." - "Permitir o acesso a notificações para %1$s?" - "%1$s conseguirá ler todas as notificações, incluindo informações pessoais, como nomes de contato e o texto das mensagens que você recebe. Ele também conseguirá dispensar notificações ou ativar botões de ação que elas contenham. \n\nIsso também permitira que o app ative ou desative o modo \"Não perturbe\" e alterar as configurações relacionadas." + "Permitir que %1$s acesse as notificações?" + "%1$s poderá ler todas as notificações, incluindo informações pessoais, como nomes de contato e o texto das mensagens que você recebe. O app também poderá dispensar notificações ou ativar botões de ação que elas contenham. \n\nIsso também autoriza o app a ativar ou desativar o modo \"Não perturbe\" e alterar as configurações relacionadas." "Se você desativar o acesso a notificações para %1$s, é possível que o acesso \"Não perturbe\" também seja desativado." "Desativar" "Cancelar" diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml index dc76eb3413b..ff3869041b0 100644 --- a/res/values-pt-rPT/arrays.xml +++ b/res/values-pt-rPT/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Premir botão" "PIN do aparelho do elemento" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index 3e2e1aee777..c81d231469d 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -114,7 +114,7 @@ "O dispositivo irá desligar-se de %1$s." "Desligar" "Não tem autorização para alterar as definições de Bluetooth." - "Sincr. novo dispositivo" + "Sincronizar novo dispositivo" "%1$s é visível para dispositivos próximos enquanto as definições de Bluetooth estiverem abertas." "Endereço Bluetooth do telemóvel: %1$s" "Endereço Bluetooth do tablet: %1$s" @@ -169,7 +169,7 @@ "Visível como \"^1\" para outros dispositivos" "Ative o Bluetooth para ligar a outros dispositivos." "Os seus dispositivos" - "Sincr. novo dispositivo" + "Sincronizar novo dispositivo" "Autorize o tablet a comunicar com dispositivos Bluetooth próximos." "Autorize o dispositivo a comunicar com dispositivos Bluetooth próximos." "Autorize o telemóvel a comunicar com dispositivos Bluetooth próximos." @@ -856,6 +856,7 @@ "Automático" "Banda de 2,4 GHz" "Banda de 5,0 GHz" + "Banda de 5,0 GHz preferida" "2,4 GHz" "5,0 GHz" "Selecione, pelo menos, uma banda para a zona Wi-Fi:" @@ -3163,7 +3164,7 @@ "Desativado, mas permitir %1$s e %2$s." "Desativado, mas permitir %1$s, %2$s e %3$s." "Mensagens, eventos e lembretes" - "Quando o modo Não incomodar está ativo, o som de mensagens, lembretes e eventos é desativado, exceto para os itens que permitir acima. Pode ajustar as definições para permitir que os seus amigos, a sua família ou outras pessoas o contactem." + "Quando o modo Não incomodar está ativado, o som de mensagens, lembretes e eventos é desativado, exceto para os itens que permitir acima. Pode ajustar as definições de mensagens para permitir que os seus amigos, a sua família ou outras pessoas o contactem." "Concluído" "Definições" "Sem imagens ou som de notificações" @@ -3238,8 +3239,8 @@ %d aplicação pode ler notificações "Nenhuma aplicação instalada solicitou acesso a notificações" - "Pretende permitir o acesso a notificações de %1$s?" - "%1$s consegue ler todas as notificações, incluindo informações pessoais como nomes de contactos e o texto das mensagens recebidas. Também consegue ignorar notificações ou acionar botões de ação que estas contenham. \n\nDeste modo, a aplicação também pode ativar ou desativar o modo Não incomodar e alterar as definições relacionadas." + "Pretende permitir o acesso a notificações do %1$s?" + "O %1$s consegue ler todas as notificações, incluindo informações pessoais como nomes de contactos e o texto das mensagens recebidas. Também consegue ignorar notificações ou acionar botões de ação que estas contenham. \n\nDeste modo, a aplicação também pode ativar ou desativar o modo Não incomodar e alterar as definições relacionadas." "Se desativar o acesso às notificações para %1$s, é possível que o acesso ao modo Não incomodar seja igualmente desativado." "Desativar" "Cancelar" @@ -4071,7 +4072,7 @@ "Outras aplicações" "Ficheiros" "^1"" ""^2""" - "Utilizados de %1$s" + "utilizados de %1$s" "utilizado" "Limpar aplicação" "Pretende remover esta aplicação instantânea?" diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml index f0b3c3d7f99..70fade6047c 100644 --- a/res/values-pt/arrays.xml +++ b/res/values-pt/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Pressione o botão" "PIN do dispositivo pareado" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 1d22073a065..43102644cbd 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -856,6 +856,7 @@ "Automático" "Banda de 2,4 GHz" "Banda de 5 GHz" + "Banda de 5 GHz preferencial" "2,4 GHz" "5 GHz" "Escolha pelo menos uma banda para o ponto de acesso Wi-Fi:" @@ -3163,7 +3164,7 @@ "Som desativado, mas permitido para %1$s e %2$s" "Som desativado, mas permitido para %1$s, %2$s e %3$s" "Mensagens, eventos e lembretes" - "Quando o \"Não perturbe\" estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você." + "Quando o \"Não perturbe\" estiver ativado, mensagens, lembretes e eventos serão silenciados, com exceção dos itens permitidos por você acima. É possível ajustar as configurações de mensagens para permitir que seus amigos, familiares ou outros contatos falem com você." "Concluído" "Configurações" "Sem aviso visual ou sonoro de notificações" @@ -3238,8 +3239,8 @@ %d apps podem ler notificações "Nenhum app instalado solicitou o acesso a notificações." - "Permitir o acesso a notificações para %1$s?" - "%1$s conseguirá ler todas as notificações, incluindo informações pessoais, como nomes de contato e o texto das mensagens que você recebe. Ele também conseguirá dispensar notificações ou ativar botões de ação que elas contenham. \n\nIsso também permitira que o app ative ou desative o modo \"Não perturbe\" e alterar as configurações relacionadas." + "Permitir que %1$s acesse as notificações?" + "%1$s poderá ler todas as notificações, incluindo informações pessoais, como nomes de contato e o texto das mensagens que você recebe. O app também poderá dispensar notificações ou ativar botões de ação que elas contenham. \n\nIsso também autoriza o app a ativar ou desativar o modo \"Não perturbe\" e alterar as configurações relacionadas." "Se você desativar o acesso a notificações para %1$s, é possível que o acesso \"Não perturbe\" também seja desativado." "Desativar" "Cancelar" diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml index a5137e18139..1842d90d3d1 100644 --- a/res/values-ro/arrays.xml +++ b/res/values-ro/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Buton WPS" "Codul PIN de la disp. pereche" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 3d526816365..a1d44f8bdde 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -867,6 +867,7 @@ "Automat" "Banda de 2,4 GHz" "Banda de 5,0 GHz" + "Se preferă banda de 5,0 GHz" "2,4 GHz" "5,0 GHz" "Alegeți cel puțin o bandă pentru hotspot Wi-Fi:" @@ -3200,7 +3201,7 @@ "Sunetul este dezactivat, dar permiteți %1$s și %2$s" "Sunetul este dezactivat, dar permiteți %1$s, %2$s și %3$s" "Mesaje, evenimente și mementouri" - "Când este activată funcția Nu deranja, sunetele pentru mesaje, mementouri și evenimente vor fi dezactivate, cu excepția elementelor pe care le permiteți mai sus. Puteți să modificați setările pentru mesaje ca să le permiteți prietenilor, familiei sau altor persoane de contact să vă contacteze." + "Când este activat modul Nu deranja, sunetele pentru mesaje, mementouri și evenimente vor fi dezactivate, cu excepția elementelor pe care le permiteți mai sus. Puteți să modificați setările pentru mesaje ca să le permiteți prietenilor, familiei sau altor persoane de contact să vă contacteze." "Gata" "Setări" "Fără imagini sau sunet de la notificări" diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml index 7c97a24caca..ad3dc9e1f78 100644 --- a/res/values-ru/arrays.xml +++ b/res/values-ru/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Push-кнопка" "PIN-код с обнаруженного устройства" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 90f6b14c75d..d3c9c4e4705 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -129,8 +129,8 @@ "Bluetooth-устройство без названия" "Поиск" "Устройства Bluetooth не найдены." - "Запрос сопряжения Bluetooth" - "Запрос на сопряжение" + "Запрос подключения Bluetooth" + "Запрос подключения" "Нажмите, чтобы установить соединение с устройством \"%1$s\"." "Полученные файлы" "Выбрать устройство Bluetooth" @@ -684,7 +684,7 @@ "Bluetooth" "Настройка подключений, видимости и имени устройства" "Добавить %1$s?" - "Код сопряжения Bluetooth" + "Код подключения Bluetooth" "Введите код подключения и нажмите клавишу ввода" "PIN-код содержит буквы или символы" "Обычно 0000 или 1234" @@ -715,9 +715,9 @@ "Нет доступных устройств" "Подключить" "Отключить" - "Выполнить сопряжение и подключить" - "Отменить сопряжение" - "Отключить и отменить сопряжение" + "Установить соединение и подключить" + "Отключить" + "Отключить и отменить соединение" "Параметры..." "Дополнительно" "Расш. настройки Bluetooth" @@ -878,6 +878,7 @@ "Авто" "2,4 ГГц" "5,0 ГГц" + "5,0 ГГц (рекомендуется)" "2,4 ГГц" "5,0 ГГц" "Выберите хотя бы один диапазон частот для точек доступа Wi-Fi." @@ -2005,7 +2006,7 @@ "Нет подключенных слуховых аппаратов" "Добавить слуховой аппарат" "Чтобы подключить слуховой аппарат, коснитесь его названия на следующем экране." - "Убедитесь, что ваш слуховой аппарат находится в режиме сопряжения." + "Убедитесь, что ваш слуховой аппарат находится в режиме установления соединения." "Слуховой аппарат \"%1$s\" активен" %1$d сохраненный слуховой аппарат @@ -3237,7 +3238,7 @@ "Без звука, кроме: %1$s и %2$s" "Без звука, кроме: %1$s, %2$s и %3$s" "Сообщения, напоминания и уведомления о мероприятиях" - "В режиме \"Не беспокоить\" сообщения, напоминания и уведомления о мероприятиях будут приходить без звука, за исключением тех, для которых вы задали разрешения выше. Вы можете изменить настройки, чтобы сообщения от друзей, членов семьи и других контактов приходили со звуком." + "В режиме \"Не беспокоить\" сообщения, напоминания и уведомления о мероприятиях будут приходить без звука (за исключением тех, для которых вы задали разрешения выше). Вы можете изменить настройки, чтобы сообщения от членов семьи, друзей и других контактов приходили со звуком." "ОК" "Настройки" "Полностью отключить уведомления" @@ -3690,7 +3691,7 @@ "Эти настройки будут применяться, когда ваш телефон разблокирован и к нему подключено другое устройство. Устанавливайте соединения только с надежными устройствами." "USB" "Настройки USB" - "Ведущее устройство USB" + "Устройство, управляющее USB" "Подключенное устройство" "Это устройство" "Подождите…" diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml index c9d7d948b99..3f6c1379b6a 100644 --- a/res/values-si/arrays.xml +++ b/res/values-si/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ඔබන බොත්තම" "සමයන්ගේ උපාංග වෙතින් PIN" diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index 8dcd1a96fb3..4baba8f4716 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -856,6 +856,7 @@ "ස්වයං" "2.4 GHz කලාපය" "5.0 GHz කලාපය" + "5.0 GHz කලාපය වඩාත් කැමතිය" "2.4 GHz" "5.0 GHz" "Wi-Fi හොට්ස්පොට් සඳහා අවම වශයෙන් එක් කලාපයක් තෝරන්න:" @@ -3163,7 +3164,7 @@ "නිහඬයි, නමුත් %1$s සහ %2$s හට ඉඩ දෙන්න" "නිහඬයි, නමුත් %1$s, %2$s, සහ %3$s හට ඉඩ දෙන්න" "පණිවිඩ, සිදුවීම් සහ සිහිැඳවීම්" - "බාධා නොකරන්න ක්‍රියාත්ම විට, ඔබ ඉහත අවසර දෙනු ලබන අයිතම හැරුණු විට, පණිවිඩ, සිහි කැඳවීම් සහ සිදුවීම් අවහිර කරනු ඇත. ඔබගේ මිතුරන්, පවුලේ අය හෝ වෙනත් සම්බන්ධතාවලට ඔබ සමග සම්බන්ධ වීමට ඉඩ දීමට පණිවිඩ සැකසීම් සකස් කිරීමට ඔබට හැකිය." + "බාධා නොකරන්න ක්‍රියාත්ම විට, ඔබ ඉහත අවසර දෙනු ලබන අයිතම හැරුණු විට, පණිවිඩ, සිහි කැඳවීම් සහ සිදුවීම් අවහිර කරනු ඇත. ඔබගේ මිතුරන්, පවුලේ අය හෝ වෙනත් සම්බන්ධතාවලට ඔබ සමග සම්බන්ධ වීමට ඉඩ දීමට පණිවිඩ සැකසීම් සකස් කිරීමට ඔබට හැකිය." "නිමයි" "සැකසීම්" "දැනුම්දීම්වලින් දෘශ්‍ය හෝ හඬ නැත" diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml index d158ba50faf..b25816617a4 100644 --- a/res/values-sk/arrays.xml +++ b/res/values-sk/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Stlačenie tlačidla" "PIN zo zdieľaného zariadenia" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 72866ed2b4c..acac103a9cb 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -878,6 +878,7 @@ "Automaticky" "Pásmo 2,4 GHz" "Pásmo 5 GHz" + "Preferuje sa pásmo 5 GHz" "2,4 GHz" "5 GHz" "Vyberte aspoň jedno pásmo pre hotspot Wi-Fi:" @@ -3237,7 +3238,7 @@ "Zvuk je vypnutý, ale povoľte %1$s a %2$s" "Zvuk je vypnutý, ale povoľte %1$s, %2$s a %3$s" "Správy, udalosti a pripomenutia" - "Keď je zapnutý režim Nerušiť, zvuky správ, pripomenutí a udalostí budú vypnuté. Výnimku predstavujú položky, ktoré povolíte vyššie. Môžete upraviť nastavenia správ a povoliť priateľom, rodine alebo ďalším kontaktom spojiť sa s vami." + "Keď je zapnutý režim Nerušiť, zvuky správ, pripomenutí a udalostí budú vypnuté. Výnimku predstavujú položky, ktoré povolíte vyššie. Môžete upraviť nastavenia správ a povoliť priateľom, rodine alebo ďalším kontaktom spojiť sa s vami." "Hotovo" "Nastavenia" "Upozornenia sa nebudú zobrazovať ani vydávať zvuky" diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml index 09e41a8b6b6..53162f12daa 100644 --- a/res/values-sl/arrays.xml +++ b/res/values-sl/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Pritisnite gumb" "PIN iz enakovredne naprave" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 33930ef6378..e2719c46353 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -878,6 +878,7 @@ "Samodejno" "2,4-GHz pas" "5,0-GHz pas" + "Prednostno 5,0-GHz pas" "2,4 GHz" "5,0 GHz" "Izberite vsaj en pas za dostopno točko Wi‑Fi:" @@ -3237,7 +3238,7 @@ "Prezrto; dovoljena zvoka: %1$s in %2$s" "Prezrto; dovoljeni zvoki: %1$s, %2$s in %3$s" "Sporočila, dogodki in opomniki" - "Pri vklopljenem načinu »ne moti« bodo prezrta vsa sporočila, opomniki in dogodki razen za zgoraj omogočene elemente. Nastavitve sporočil lahko prilagodite tako, da boste dosegljivi za prijatelje, družinske člane ali druge stike." + "Pri vklopljenem načinu »ne moti« bodo prezrta vsa sporočila, opomniki in dogodki razen za zgoraj omogočene elemente. Nastavitve sporočil lahko prilagodite tako, da boste dosegljivi za prijatelje, družinske člane ali druge stike." "Končano" "Nastavitve" "Brez vidnega in zvočnega opozarjanja na obvestila" diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml index 0c13676f736..f51e15a763f 100644 --- a/res/values-sq/arrays.xml +++ b/res/values-sq/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Shtyp butonin" "Kodi PIN nga pajisja homologe" diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index 7bc4dc30aa1..d2b2c78cfb0 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -856,6 +856,7 @@ "Automatik" "Bandë 2,4 GHz" "Banda 5,0 GHz" + "Preferohet banda 5,0 GHz" "2,4 GHz" "5,0 GHz" "Zgjidh të paktën një brez për zonën e qasjes për internet për Wi‑Fi:" @@ -3163,7 +3164,7 @@ "Pa zë, por lejo %1$s dhe %2$s" "Pa zë, por lejo %1$s, %2$s dhe %3$s" "Mesazhet, ngjarjet dhe alarmet rikujtuese" - "Kur modaliteti \"Mos shqetëso\" është aktiv, mesazhet, alarmet rikujtuese dhe ngjarjet do të jenë në heshtje, përveçse për artikujt që lejon më sipër. Mund t\'i përshtatësh cilësimet e mesazheve për të lejuar shokët, familjen ose kontakte të tjera që të lidhen me ty." + "Kur modaliteti \"Mos shqetëso\" është aktiv, mesazhet, alarmet rikujtuese dhe ngjarjet do të jenë në heshtje, përveçse për artikujt që lejon më sipër. Mund t\'i përshtatësh cilësimet e mesazheve për të lejuar shokët, familjen ose kontakte të tjera që të lidhen me ty." "U krye" "Cilësimet" "Asnjë pamje apo tingull nga njoftimet" diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml index e938dd7645a..94c0d18f3f2 100644 --- a/res/values-sr/arrays.xml +++ b/res/values-sr/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Притискање дугмета" "PIN са равноправног уређаја" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 8442c8e9436..45e81534a8f 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -867,6 +867,7 @@ "Аутоматски" "Опсег од 2,4 GHz" "Опсег од 5,0 GHz" + "Предност се даје опсегу од 5.0 GHz" "2,4 GHz" "5,0 GHz" "Изаберите барем један опсег за Wi‑Fi хотспот:" @@ -3200,7 +3201,7 @@ "Звук је искључен, али дозволи за: %1$s и %2$s" "Звук је искључен, али дозволи за: %1$s, %2$s и %3$s" "Поруке, догађаји и подсетници" - "Када је укључен режим Не узнемиравај, звукови обавештења за поруке, подсетнике и догађаје ће бити искључени, осим за ставке које сте дозволили изнад. Можете да прилагодите подешавања да бисте дозволили пријатељима, члановима породице или другим контактима да вас контактирају." + "Када је укључен режим Не узнемиравај, звукови обавештења за поруке, подсетнике и догађаје ће бити искључени, осим за ставке које сте дозволили изнад. Можете да прилагодите подешавања да бисте дозволили пријатељима, члановима породице или другим контактима да вас контактирају." "Готово" "Подешавања" "Без звучног сигнала или визуелног обавештења" diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml index d4cc02cd4ae..778d906e5e3 100644 --- a/res/values-sv/arrays.xml +++ b/res/values-sv/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Tryckknapp" "PIN-kod från den andra enheten" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index df3e4f0761c..7aea9a37df0 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -856,6 +856,7 @@ "Automatiskt" "2,4 GHz-bandet" "5,0 GHz-bandet" + "5,0 GHz-bandet föredras" "2,4 GHz" "5,0 GHz" "Välj minst ett band för Wi‑Fi-surfzon:" @@ -3163,7 +3164,7 @@ "Stäng av ljudet men tillåt %1$s och %2$s" "Stäng av ljudet men tillåt %1$s, %2$s och %3$s" "Meddelanden, händelser och påminnelser" - "Meddelanden, påminnelser och händelser döljs när Stör ej har aktiverats, utom objekten du har tillåtit ovan. Du kan anpassa inställningarna så att dina vänner, familj eller andra kontakter ändå kan nå dig." + "Meddelanden, påminnelser och händelser döljs när Stör ej har aktiverats, utom det som du har tillåtit ovan. Du kan anpassa inställningarna så att dina vänner, familj eller andra kontakter kan nå dig." "Klar" "Inställningar" "Inga synliga eller hörbara aviseringar" @@ -3650,7 +3651,7 @@ "Visa ovanpå andra appar" "Appar" "Visa ovanpå andra appar" - "Tillåt visning över andra appar" + "Tillåt visning ovanpå andra appar" "Tillåt att den här appen visas ovanpå andra appar. Detta kan inverka på ett störande sätt på användningen av de andra apparna eller göra så att de verkar se ut eller fungera annorlunda." "vr virtuell verklighet lyssnare stereo hjälptjänst" "systemvarning dialogruta visa på andra appar" diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml index 455537a94cb..7797fdda368 100644 --- a/res/values-sw/arrays.xml +++ b/res/values-sw/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Kichupo cha kusukuma" "PIN kutoka kwa kifaa cha rika" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index cae7f5ed919..c64c4ec97a8 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -856,6 +856,7 @@ "Otomatiki" "Bendi ya GHz 2.4" "Bendi ya GHz 5.0" + "Imechagua Bendi ya GHz 5.0" "GHz 2.4" "GHz 5.0" "Chagua angalau bendi moja ya mtandao-hewa wa Wi‑Fi:" @@ -3163,7 +3164,7 @@ "Imezimwa, lakini ruhusu %1$s na %2$s" "Imezimwa, lakini ruhusu %1$s, %2$s na %3$s" "Ujumbe, matukio na vikumbusho" - "Wakati umewasha mipangilio ya Usinisumbue, ujumbe, vikumbusho na matukio yatakomeshwa, isipokuwa yanayotoka kwenye vipengee unavyoruhusu hapo juu. Unaweza kubadilisha mipangilio ya ujumbe ili uwaruhusu marafiki, familia na watu wengine wawasiliane nawe." + "Ukiwasha kipengele cha Usinisumbue, ujumbe, vikumbusho na matukio yatakomeshwa, isipokuwa yanayotoka kwenye vipengee unavyoruhusu hapo juu. Unaweza kubadilisha mipangilio ya ujumbe ili uwaruhusu marafiki, familia na watu wengine wawasiliane nawe." "Nimemaliza" "Mipangilio" "Arifa zisionekane wala zisitoe sauti" diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml index 6bc0b092994..415902cf564 100644 --- a/res/values-ta/arrays.xml +++ b/res/values-ta/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "புஷ் பொத்தான்" "பியர் சாதனத்திலிருந்து பின்" diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index da4d0fc640c..fbadb7f8a2d 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -856,6 +856,7 @@ "தானியங்கு" "2.4 GHz அலைவரிசை" "5.0 GHz அலைவரிசை" + "5.0 GHz அலைவரிசைக்கு முன்னுரிமை" "2.4 GHz" "5.0 GHz" "வைஃபை ஹாட்ஸ்பாட்டிற்கு, குறைந்தது ஒரு பேண்ட்டைத் தேர்வுசெய்யவும்:" @@ -3163,7 +3164,7 @@ "ஒலியடக்கப்பட்டது, ஆனால் %1$s மற்றும் %2$s அனுமதிக்கப்பட்டுள்ளன" "ஒலியடக்கப்பட்டது, ஆனால் %1$s, %2$s மற்றும் %3$s அனுமதிக்கப்பட்டுள்ளன" "மெசேஜஸ், நிகழ்வுகள் & நினைவூட்டல்கள்" - "\'தொந்தரவு செய்ய வேண்டாம்\' ஆன் செய்யப்பட்டிருக்கும் போது நீங்கள் அனுமதித்தவை தவிர்த்து, மெசேஜஸ், நினைவூட்டல்கள், நிகழ்வுகள் ஆகியவை ஒலியடக்கப்படும். நண்பர்கள், குடும்பத்தினர் அல்லது வேறு தொடர்புகள் உங்களைத் தொடர்புகொள்வதை அனுமதிக்க, நீங்கள் மெசேஜஸ் அமைப்புகளை மாற்றிக்கொள்ளலாம்." + "\'தொந்தரவு செய்ய வேண்டாம்\' ஆன் செய்யப்பட்டிருக்கும்போது நீங்கள் அனுமதித்தவை தவிர்த்து, மெசேஜஸ், நினைவூட்டல்கள், நிகழ்வுகள் ஆகியவை ஒலியடக்கப்படும். உங்களை நண்பர்களோ, குடும்பத்தினரோ, வேறு தொடர்புகளோ தொடர்புகொள்வதற்கு அனுமதிக்க, நீங்கள் மெசேஜஸ் அமைப்புகளை மாற்றிக்கொள்ளலாம்." "முடிந்தது" "அமைப்புகள்" "அறிவிப்புகள் வரும்போது காட்டவோ ஒலியெழுப்பவோ வேண்டாம்" diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml index 9c71380ca4b..8837d8334f8 100644 --- a/res/values-te/arrays.xml +++ b/res/values-te/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "పుష్ బటన్" "పీర్ డివైజ్ నుండి పిన్‌" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 655eea20676..33c15ea9fca 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -856,6 +856,7 @@ "స్వీయ" "2.4 GHz బ్యాండ్" "5.0 GHz బ్యాండ్" + "5.0 GHz బ్యాండ్‌కి ప్రాధాన్యత" "2.4 GHz" "5.0 GHz" "Wi-Fi హాట్‌స్పాట్ కోసం కనీసం ఒక బ్యాండ్‌ను ఎంచుకోండి:" @@ -3163,7 +3164,7 @@ "మ్యూట్ చేయబడింది, కాని %1$s మరియు %2$sను అనుమతించు" "మ్యూట్ చేయబడింది, కాని %1$s, %2$s మరియు %3$sను అనుమతించు" "సందేశాలు, ఈవెంట్‌లు & రిమైండర్‌లు" - "అంఅంతరాయం కలిగించవద్దు ఆన్‌లో ఉన్నప్పుడు, మీరు పైన అనుమతించే అంశాలు మినహా, సందేశాలు, రిమైండర్‌లు మరియు ఈవెంట్‌లు మ్యూట్ చేయబడతాయి. మీ స్నేహితులు, కుటుంబం లేదా ఇతర పరిచయాలు మిమ్మల్ని చేరుకోవడానికి అనుమతించడానికి సందేశాలు అమర్పులను మీరు సర్దుబాటు చేయవచ్చు." + "అంతరాయం కలిగించవద్దు మోడ్ ఆన్‌లో ఉన్నప్పుడు, మీరు పైన అనుమతించే అంశాలు మినహా, సందేశాలు, రిమైండర్‌లు మరియు ఈవెంట్‌లు మ్యూట్ చేయబడతాయి. మీ స్నేహితులు, కుటుంబ సభ్యులు లేదా ఇతర పరిచయస్తులు మిమ్మల్ని సంప్రదించడానికి అనుమతించేలా సందేశాల సెట్టింగ్‌లను మీరు సర్దుబాటు చేయవచ్చు." "పూర్తయింది" "సెట్టింగ్‌లు" "నోటిఫికేషన్‌ల నుండి దృశ్య జాబితాలు లేదా శబ్దం లేవు" diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml index fe7208c8e66..182c20659f0 100644 --- a/res/values-th/arrays.xml +++ b/res/values-th/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "ปุ่มกด" "PIN จากอุปกรณ์เพียร์" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 5b75d438a50..a33fa246be4 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -856,6 +856,7 @@ "อัตโนมัติ" "ย่านความถี่ 2.4 GHz" "ย่านความถี่ 5 GHz" + "ต้องการใช้ย่านความถี่ 5.0 GHz" "2.4 GHz" "5.0 GHz" "เลือกอย่างน้อยหนึ่งย่านความถี่สำหรับฮอตสปอต Wi‑Fi:" @@ -3163,7 +3164,7 @@ "ปิดเสียงแล้ว แต่อนุญาตให้ %1$s และ %2$s" "ปิดเสียงแล้ว แต่อนุญาตให้ %1$s, %2$s และ %3$s" "ข้อความ เหตุการณ์ และการช่วยเตือน" - "เมื่อเปิด \"ห้ามรบกวน\" ข้อความ การช่วยเตือน และเหตุการณ์ต่างๆ จะถูกปิดเสียงยกเว้นรายการที่คุณอนุญาตข้างต้น คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้" + "เมื่อเปิด \"ห้ามรบกวน\" ข้อความ การช่วยเตือน และเหตุการณ์ต่างๆ จะถูกปิดเสียงยกเว้นรายการที่คุณอนุญาตข้างต้น คุณปรับเปลี่ยนการตั้งค่าเพื่ออนุญาตให้เพื่อน ครอบครัว หรือรายชื่อติดต่อคนอื่นๆ ติดต่อคุณได้" "เสร็จ" "การตั้งค่า" "ไม่มีภาพหรือเสียงจากการแจ้งเตือน" diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml index f235229fe52..4258932724b 100644 --- a/res/values-tl/arrays.xml +++ b/res/values-tl/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "button na Push" "PIN mula sa device ng kaibigan" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index d8513c2ed4f..feb9c819d3a 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -856,6 +856,7 @@ "Awtomatiko" "2.4 GHz Band" "5.0 GHz Band" + "Mas gusto ang 5.0 GHz Band" "2.4 GHz" "5.0 GHz" "Pumili ng kahit isang band para sa Wi‑Fi hotspot:" @@ -3163,7 +3164,7 @@ "Naka-mute, pero payagan ang %1$s at %2$s" "Naka-mute, pero payagan ang %1$s, %2$s, at %3$s" "Mga mensahe, event, at paalala" - "Kapag naka-on ang Huwag Istorbohin, mamu-mute ang mga mensahe, paalala, at event, maliban sa mga item na pinapayagan mo sa itaas. Maaari mong isaayos ang mga setting ng mensahe para payagan ang iyong mga kaibigan, pamilya, o iba pang contact na makipag-ugnayan sa iyo." + "Kapag naka-on ang Huwag Istorbohin, mamu-mute ang mga mensahe, paalala, at event, maliban sa mga item na pinapayagan mo sa itaas. Maaari mong isaayos ang mga setting ng mga mensahe para payagan ang iyong mga kaibigan, pamilya, o iba pang contact na makipag-ugnayan sa iyo." "Tapos na" "Mga Setting" "Walang visual o tunog mula sa mga notification" diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml index 5a3cef57346..39517daad03 100644 --- a/res/values-tr/arrays.xml +++ b/res/values-tr/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Düğme" "Eş cihazın PIN\'i" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index db014352ffe..7a10d936be3 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -856,6 +856,7 @@ "Otomatik" "2,4 GHz Bandı" "5,0 GHz Bandı" + "5,0 GHz Bandı tercih edilir" "2,4 GHz" "5,0 GHz" "Kablosuz hotspot için en az bir grup seçin:" @@ -3163,7 +3164,7 @@ "Ses kapatıldı, ancak %1$s ve %2$s seslerine izin ver" "Ses kapatıldı, ancak %1$s, %2$s ve %3$s seslerine izin ver" "Mesajlar, etkinlikler ve hatırlatıcılar" - "Rahatsız Etmeyin ayarı açık olduğunda mesajların, hatırlatıcıların ve etkinliklerin sesi kapatılır (yukarıda izin verdiğiniz öğeler hariç). Mesaj ayarlarını arkadaşlarınızın, ailenizin veya diğer kişilerin size ulaşmasına izin verecek şekilde düzenleyebilirsiniz." + "Rahatsız Etmeyin ayarı açık olduğunda mesajların, hatırlatıcıların ve etkinliklerin sesi kapatılır (yukarıda izin verdiğiniz öğeler hariç). Mesaj ayarlarını arkadaşlarınızın, ailenizin veya diğer kişilerin size ulaşmasına izin verecek şekilde düzenleyebilirsiniz." "Bitti" "Ayarlar" "Bildirimlerden görsel veya sesli uyarı yok" diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml index 1ed0756bee3..b14d55a3a7a 100644 --- a/res/values-uk/arrays.xml +++ b/res/values-uk/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Кнопка Push" "PIN з однорангового пристрою" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 7d1267cd6f4..e306c625bc0 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -878,6 +878,7 @@ "Автоматично" "Діапазон 2,4 ГГц" "Діапазон 5 ГГц" + "Бажано використовувати діапазон 5,0 ГГц" "2,4 ГГц" "5 ГГц" "Виберіть принаймні один діапазон для точки доступу Wi-Fi:" @@ -3237,7 +3238,7 @@ "Звук вимкнено. Дозволити лише %1$s та %2$s" "Звук вимкнено. Дозволити лише %1$s, %2$s та %3$s" "Повідомлення, події й нагадування" - "У режимі \"Не турбувати\" звук для повідомлень, нагадувань і подій вимикатиметься (окрім дозволених елементів вище). Можна змінити налаштування повідомлень, щоб ваші друзі, члени сім’ї та інші контакти могли зв’язатися з вами." + "У режимі \"Не турбувати\" сигнали повідомлень, нагадувань і подій буде вимкнено (окрім дозволених вище). Можна змінити налаштування повідомлень, щоб ваші друзі, члени сім’ї й інші контакти могли зв’язатися з вами." "Готово" "Налаштування" "Вимкнути зображення та звук сповіщень" diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml index f34cc009749..abd06dc1f5b 100644 --- a/res/values-ur/arrays.xml +++ b/res/values-ur/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "پش بٹن" "‏ہمسر آلہ سے PIN" diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index b66847ee623..c256890f568 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -856,6 +856,7 @@ "خودکار" "‏2.4 GHz بینڈ" "‏‎‎5.0 GHz بینڈ" + "‏5.0 GHz بینڈ کو ترجیح دی جاتی ہے" "2.4‎ GHz" "‎5.0 GHz" "‏Wi‑Fi ہاٹ اسپاٹ کیلئے کم از کم ایک بینڈ منتخب کریں:" @@ -3161,7 +3162,7 @@ "خاموش کردہ، لیکن %1$s اور %2$s کو اجازت دیں" "خاموش کردہ، لیکن %1$s، %2$s اور %3$s کو اجازت دیں" "پیغامات، ایونٹس اور یاد دہانیاں" - "\'ڈسٹرب نہ کریں\' آن ہونے پر، پیغامات، یاد دہانیاں اور ایونٹس خاموش کر دئے جائیں گے، ماسوا ان آئٹمز کے جن کی آپ نے اوپر اجازت دی ہے۔ اپنے دوستوں، اہل خانہ اور دیگر رابطوں کو آپ تک پہنچنے کی اجازت دینے کیلئے، آپ پیغامات کی ترتیبات ایڈجسٹ کر سکتے ہیں۔" + "\'ڈسٹرب نہ کریں\' آن ہونے پر، پیغامات، یاد دہانیاں اور ایونٹس خاموش کر دئے جائیں گے، سوائے ان آئٹمز کے جن کی آپ نے اوپر اجازت دی ہے۔ اپنے دوستوں، فیملی اور دیگر رابطوں کو آپ سے رابطہ کرنے کی اجازت دینے کیلئے، آپ پیغامات کی ترتیبات کو ایڈجسٹ کر سکتے ہیں۔" "ہو گیا" "ترتیبات" "اطلاعات کی کوئی ویزوئل یا آواز نہیں" diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml index 7295244278c..0f07eaaa673 100644 --- a/res/values-uz/arrays.xml +++ b/res/values-uz/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Bog‘lash tugmasi" "ulashma qurilmadagi PIN-kod" diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index 408ad0c035f..31d3a7f7d89 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -856,6 +856,7 @@ "Avtomatik" "2,4 GGs" "5,0 GGs" + "5,0 GGs (tavsiya etiladi)" "2,4 GGs" "5,0 GGs" "Wi‑Fi hotspot uchun kamida bitta chastota tanlang:" @@ -3179,7 +3180,7 @@ "Ovozsiz, lekin %1$s va %2$s uchun ruxsat berilgan" "Ovozsiz, lekin %1$s, %2$s va %3$s uchun ruxsat berilgan" "Xabarlar, tadbirlar va eslatmalar" - "Bezovta qilinmasin rejimi yoniqligida yuqorida ruxsat berilganlardan tashqari xabarlar, eslatmalar va tadbirlar ovozsiz qilinadi. Sizga bog‘lana olishlari uchun muayyan tanishlar, oila a’zolari yoki boshqa kontaktlarga sozlamalarni o‘zgartirish orqali ruxsat berishingiz mumkin." + "Bezovta qilinmasin rejimi yoniqligida yuqorida ruxsat berilganlardan tashqari xabarlar, eslatmalar va tadbirlar ovozsiz qilinadi. Sizga bog‘lana olishlari uchun muayyan tanishlar, oila a’zolari yoki boshqa kontaktlarga sozlamalarni o‘zgartirish orqali ruxsat berishingiz mumkin." "Tayyor" "Sozlamalar" "Bildirishnomalar chiqarilmaydi yoki ovozsiz keladi" diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml index 2e380262c02..f09c349cec0 100644 --- a/res/values-vi/arrays.xml +++ b/res/values-vi/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "Nút bấm" "Mã PIN từ thiết bị ngang hàng" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 243891a7b3b..c22e8b6e888 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -856,6 +856,7 @@ "Tự động" "Băng tần 2,4 GHz" "Băng tần 5 GHz" + "Ưu tiên băng tần 5 GHz" "2,4 GHz" "5 GHz" "Chọn ít nhất một băng tần cho điểm phát sóng Wi‑Fi:" @@ -3163,7 +3164,7 @@ "Đã tắt tiếng nhưng cho phép %1$s và %2$s" "Đã tắt tiếng nhưng cho phép %1$s, %2$s và %3$s" "Tin nhắn, sự kiện và lời nhắc" - "Khi chế độ Không làm phiền đang bật, tin nhắn, lời nhắc và sự kiện sẽ bị ẩn trừ các mục mà bạn cho phép ở trên. Bạn có thể điều chỉnh mục cài đặt tin nhắn để cho phép bạn bè, gia đình hoặc những người khác liên hệ với bạn." + "Khi chế độ Không làm phiền đang bật, tin nhắn, lời nhắc và sự kiện sẽ bị ẩn trừ các mục mà bạn cho phép ở trên. Bạn có thể điều chỉnh mục cài đặt tin nhắn để cho phép bạn bè, gia đình hoặc những người khác liên hệ với mình." "Xong" "Cài đặt" "Không có hình ảnh hoặc âm thanh khi có thông báo" diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml index 7d921cce742..e8e5a137a1f 100644 --- a/res/values-zh-rCN/arrays.xml +++ b/res/values-zh-rCN/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "按钮" "从对等设备获取的 PIN 码" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 0e25a9de051..bc141937cb7 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -856,6 +856,7 @@ "自动" "2.4 GHz 频段" "5.0 GHz 频段" + "首选 5.0 GHz 频段" "2.4 GHz" "5.0 GHz" "请为 WLAN 热点至少选择一个频段：" @@ -3163,7 +3164,7 @@ "已设为静音（但%1$s和%2$s除外）" "已设为静音（但%1$s、%2$s和%3$s除外）" "信息、活动和提醒" - "开启勿扰模式后，系统会忽略信息、提醒和活动。您可以调整相应信息设置（您在上访允许的项目除外），以便允许您的好友、家人或其他联系人与您联系。" + "开启勿扰模式后，系统会忽略信息、提醒和活动（您在上方允许的几项内容除外）。您可以调整相应信息设置，以便允许您的好友、家人或其他联系人与您联系。" "完成" "设置" "不显示通知，也不发出通知提示音" diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml index 65218239016..63ac8b65015 100644 --- a/res/values-zh-rHK/arrays.xml +++ b/res/values-zh-rHK/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "按鈕" "來自對端裝置的 PIN" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 631e92d14ab..f3e973b384b 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -856,6 +856,7 @@ "自動" "2.4 GHz 頻段" "5.0 GHz 頻段" + "首選 5.0 GHz 頻段" "2.4 GHz" "5.0 GHz" "請為 Wi-Fi 熱點至少選擇一個頻段：" @@ -3166,7 +3167,7 @@ "已設為靜音 (%1$s和%2$s除外)" "已設為靜音 (%1$s、%2$s和%3$s除外)" "訊息、活動和提醒" - "開啟「請勿騷擾」模式時，除了您在上方允許的項目外，所有訊息、提醒和活動會設為靜音。您可以調整訊息設定，讓好友、家人或其他聯絡人可以聯絡您。" + "開啟「請勿騷擾」模式時，除了您在上方允許的項目外，所有訊息、提醒和活動均會設為靜音。您可以調整訊息設定，讓好友、家人或其他聯絡人可以聯絡您。" "完成" "設定" "無顯示或音效通知" diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml index c4da95a7da4..741964cabbf 100644 --- a/res/values-zh-rTW/arrays.xml +++ b/res/values-zh-rTW/arrays.xml @@ -121,12 +121,6 @@ "TTLS" "PWD" - - - - - - "按鈕" "來自對端裝置的 PIN" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 261706b63f7..d5e2e6726d6 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -856,6 +856,7 @@ "自動" "2.4 GHz 頻帶" "5.0 GHz 頻帶" + "5.0 GHz 頻帶優先" "2.4 GHz" "5.0 GHz" "請至少選擇一個用於 Wi‑Fi 無線基地台的頻帶：" @@ -3167,7 +3168,7 @@ "已設為靜音 (%1$s和%2$s除外)" "已設為靜音 (%1$s、%2$s和%3$s除外)" "訊息、活動和提醒" - "開啟「零打擾」模式時，系統會將訊息、提醒和活動設為靜音 (你在上方允許的項目除外)。你可以調整訊息設定，讓好友、家人或其他聯絡人可以聯絡你。" + "開啟「零打擾」模式時，系統會將訊息、提醒和活動設為靜音 (你在上方允許的項目除外)。你可以調整訊息設定，讓好友、家人或其他聯絡人可以聯絡你。" "完成" "設定" "不顯示通知或不發出通知音效" diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml index cf98e0f0b20..0e056f865f4 100644 --- a/res/values-zu/arrays.xml +++ b/res/values-zu/arrays.xml @@ -121,12 +121,6 @@ "I-TTLS" "I-PWD" - - - - - - "Cindezela inkinobho" "Iphinikhodi kusuka kudivaysisi yabangani" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 8e640eb8d46..3eef7944bdd 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -856,6 +856,7 @@ "Okuzenzakalelayo" "2.4 GHz Ibhendi" "5.0 GHz Band" + "5.0 GHz Band ekhethwayo" "2.4 GHz" "5.0 GHz" "Khetha okungenani ibhendi eyodwa ye-Wi‑Fi hotspot:" @@ -3164,7 +3165,7 @@ "Kuthulisiwe, kodwa vumela i-%1$s ne-%2$s" "Kuthulisiwe, kodwa vumela i-%1$s, %2$s, ne-%3$s" "Imilayezo, imicimbi nezikhumbuzi" - "Uma kuvulwe ukungaphazamisi, imilayezo, izikhumbuzi, nemicimbi izothuliswa ngaphandle kwezinto ozivumela ngaphezulu. Ungalungisa izilungiselelo zemilayezo ukuze uvumele abangani bakho, umndeni, noma abanye oxhumana nabo bafinyelele kuwe." + "Uma kuvulwe ukungaphazamisi, imilayezo, izikhumbuzi, nemicimbi izothuliswa ngaphandle kwezinto ozivumela ngaphezulu. Ungalungisa izilungiselelo zemilayezo ukuze uvumele abangani bakho, umndeni, noma abanye oxhumana nabo bafinyelele kuwe." "Kwenziwe" "Izilungiselelo" "Akukho okubonakalayo noma umsindo kusukela kuzaziso" -- GitLab From 7ccb3bb4dfeb9e0e1632fb239e330283e8c6e8cd Mon Sep 17 00:00:00 2001 From: Chia-I Wu Date: Fri, 22 Jun 2018 00:13:42 +0800 Subject: [PATCH 14/24] Rename Automatic color to Adaptive color Rename the new mode (only available on 2018 devices) from Automatic to Adaptive. Bug: 110524699 Test: manual Change-Id: I56e87ad11a94915155cff56a6a13a9e167383e0c --- res/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index cd2b78362ae..117035a349c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2497,11 +2497,11 @@ Boosted Saturated - - Automatic + + Adaptive Use accurate colors only - + Adjust between vivid and accurate colors -- GitLab From f87897b84cf09da3d25ea0222fce876fdf62f302 Mon Sep 17 00:00:00 2001 From: Lei Yu Date: Thu, 28 Jun 2018 14:08:42 -0700 Subject: [PATCH 15/24] Unrestrict app if it been set as device admin app Bug: 110337989 Test: RunSettingsRoboTests Change-Id: I8229bee97d970f8b16351193cfd99ca05ff041bf Merged-In: I8229bee97d970f8b16351193cfd99ca05ff041bf --- src/com/android/settings/DeviceAdminAdd.java | 13 +++++++ .../android/settings/DeviceAdminAddTest.java | 37 +++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/src/com/android/settings/DeviceAdminAdd.java b/src/com/android/settings/DeviceAdminAdd.java index 0ad882df9a2..72f4aa32cad 100644 --- a/src/com/android/settings/DeviceAdminAdd.java +++ b/src/com/android/settings/DeviceAdminAdd.java @@ -59,6 +59,7 @@ import android.widget.ImageView; import android.widget.TextView; import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.overlay.FeatureFactory; import com.android.settings.users.UserDialogs; import com.android.settingslib.RestrictedLockUtils; @@ -425,6 +426,9 @@ public class DeviceAdminAdd extends Activity { mDPM.setActiveAdmin(mDeviceAdmin.getComponent(), mRefreshing); EventLog.writeEvent(EventLogTags.EXP_DET_DEVICE_ADMIN_ACTIVATED_BY_USER, mDeviceAdmin.getActivityInfo().applicationInfo.uid); + + unrestrictAppIfPossible(BatteryUtils.getInstance(this)); + setResult(Activity.RESULT_OK); } catch (RuntimeException e) { // Something bad happened... could be that it was @@ -446,6 +450,15 @@ public class DeviceAdminAdd extends Activity { finish(); } + void unrestrictAppIfPossible(BatteryUtils batteryUtils) { + // Unrestrict admin app if it is already been restricted + final String packageName = mDeviceAdmin.getComponent().getPackageName(); + final int uid = batteryUtils.getPackageUid(packageName); + if (batteryUtils.isForceAppStandbyEnabled(uid, packageName)) { + batteryUtils.setForceAppStandby(uid, packageName, AppOpsManager.MODE_ALLOWED); + } + } + void continueRemoveAction(CharSequence msg) { if (!mWaitingForRemoveMsg) { return; diff --git a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java index 1a4ce89fbcd..1602f15263a 100644 --- a/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java +++ b/tests/robotests/src/com/android/settings/DeviceAdminAddTest.java @@ -18,23 +18,37 @@ package com.android.settings; import static org.mockito.Matchers.any; import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import android.app.AppOpsManager; +import android.app.admin.DeviceAdminInfo; import android.content.Context; import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.SettingsRobolectricTestRunner; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +import org.mockito.Answers; +import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; @RunWith(SettingsRobolectricTestRunner.class) public class DeviceAdminAddTest { + private static final int UID = 12345; + private static final String PACKAGE_NAME = "com.android.test.device.admin"; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private DeviceAdminInfo mDeviceAdmin; + @Mock + private BatteryUtils mBatteryUtils; private FakeFeatureFactory mFeatureFactory; private DeviceAdminAdd mDeviceAdminAdd; @@ -44,6 +58,10 @@ public class DeviceAdminAddTest { mFeatureFactory = FakeFeatureFactory.setupForTest(); mDeviceAdminAdd = Robolectric.buildActivity(DeviceAdminAdd.class).get(); + + doReturn(UID).when(mBatteryUtils).getPackageUid(PACKAGE_NAME); + when(mDeviceAdmin.getComponent().getPackageName()).thenReturn(PACKAGE_NAME); + mDeviceAdminAdd.mDeviceAdmin = mDeviceAdmin; } @Test @@ -56,4 +74,23 @@ public class DeviceAdminAddTest { verify(mFeatureFactory.metricsFeatureProvider).action(any(Context.class), eq(MetricsProto.MetricsEvent.APP_SPECIAL_PERMISSION_ADMIN_DENY), eq("app")); } + + @Test + public void unrestrictAppIfPossible_appRestricted_unrestrictApp() { + doReturn(true).when(mBatteryUtils).isForceAppStandbyEnabled(UID, PACKAGE_NAME); + + mDeviceAdminAdd.unrestrictAppIfPossible(mBatteryUtils); + + verify(mBatteryUtils).setForceAppStandby(UID, PACKAGE_NAME, AppOpsManager.MODE_ALLOWED); + } + + @Test + public void unrestrictAppIfPossible_appUnrestricted_doNothing() { + doReturn(false).when(mBatteryUtils).isForceAppStandbyEnabled(UID, PACKAGE_NAME); + + mDeviceAdminAdd.unrestrictAppIfPossible(mBatteryUtils); + + verify(mBatteryUtils, never()).setForceAppStandby(UID, PACKAGE_NAME, + AppOpsManager.MODE_ALLOWED); + } } -- GitLab From 20fa18880244a811db20d5cadb177ae448a13431 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Mon, 2 Jul 2018 18:11:20 -0700 Subject: [PATCH 16/24] Import translations. DO NOT MERGE Auto-generated-cl: translation import Bug: 110524699 Change-Id: I80e63cc3fe9148fa5c6986dfc7b470e870d683ca --- res/values-af/strings.xml | 2 +- res/values-am/strings.xml | 2 +- res/values-ar/strings.xml | 2 +- res/values-as/strings.xml | 2 +- res/values-az/strings.xml | 2 +- res/values-b+sr+Latn/strings.xml | 2 +- res/values-be/strings.xml | 2 +- res/values-bg/strings.xml | 2 +- res/values-bn/strings.xml | 2 +- res/values-bs/strings.xml | 12 ++--- res/values-ca/strings.xml | 2 +- res/values-cs/strings.xml | 2 +- res/values-da/strings.xml | 30 ++++++------- res/values-de/strings.xml | 2 +- res/values-el/strings.xml | 2 +- res/values-en-rAU/strings.xml | 2 +- res/values-en-rCA/strings.xml | 2 +- res/values-en-rGB/strings.xml | 2 +- res/values-en-rIN/strings.xml | 2 +- res/values-en-rXC/strings.xml | 2 +- res/values-es-rUS/strings.xml | 2 +- res/values-es/strings.xml | 2 +- res/values-et/strings.xml | 2 +- res/values-eu/strings.xml | 2 +- res/values-fa/strings.xml | 2 +- res/values-fi/strings.xml | 2 +- res/values-fr-rCA/strings.xml | 2 +- res/values-fr/strings.xml | 2 +- res/values-gl/strings.xml | 4 +- res/values-gu/strings.xml | 2 +- res/values-hi/strings.xml | 5 +-- res/values-hr/strings.xml | 2 +- res/values-hu/strings.xml | 2 +- res/values-hy/strings.xml | 4 +- res/values-in/strings.xml | 2 +- res/values-is/strings.xml | 2 +- res/values-it/strings.xml | 2 +- res/values-iw/strings.xml | 2 +- res/values-ja/strings.xml | 2 +- res/values-ka/strings.xml | 2 +- res/values-kk/strings.xml | 2 +- res/values-km/strings.xml | 2 +- res/values-kn/strings.xml | 2 +- res/values-ko/strings.xml | 2 +- res/values-ky/strings.xml | 2 +- res/values-lo/strings.xml | 2 +- res/values-lt/strings.xml | 2 +- res/values-lv/strings.xml | 2 +- res/values-mk/strings.xml | 2 +- res/values-ml/strings.xml | 2 +- res/values-mn/strings.xml | 2 +- res/values-mr/strings.xml | 2 +- res/values-ms/strings.xml | 2 +- res/values-my/strings.xml | 2 +- res/values-nb/strings.xml | 2 +- res/values-ne/strings.xml | 2 +- res/values-nl/strings.xml | 2 +- res/values-or/strings.xml | 2 +- res/values-pa/strings.xml | 2 +- res/values-pl/strings.xml | 8 ++-- res/values-pt-rBR/strings.xml | 2 +- res/values-pt-rPT/strings.xml | 2 +- res/values-pt/strings.xml | 2 +- res/values-ro/strings.xml | 2 +- res/values-ru/strings.xml | 2 +- res/values-si/strings.xml | 2 +- res/values-sk/strings.xml | 2 +- res/values-sl/strings.xml | 2 +- res/values-sq/strings.xml | 2 +- res/values-sr/strings.xml | 2 +- res/values-sv/strings.xml | 2 +- res/values-sw/strings.xml | 76 ++++++++++++++++---------------- res/values-ta/strings.xml | 2 +- res/values-te/strings.xml | 2 +- res/values-th/strings.xml | 2 +- res/values-tl/strings.xml | 2 +- res/values-tr/strings.xml | 2 +- res/values-uk/strings.xml | 2 +- res/values-ur/strings.xml | 2 +- res/values-uz/strings.xml | 4 +- res/values-vi/strings.xml | 2 +- res/values-zh-rCN/strings.xml | 2 +- res/values-zh-rHK/strings.xml | 4 +- res/values-zh-rTW/strings.xml | 2 +- res/values-zu/strings.xml | 2 +- 85 files changed, 149 insertions(+), 150 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index e5279a272ad..18223eeafd3 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -1068,7 +1068,7 @@ "Natuurlik" "Gemaksimeer" "Intens" - "Outomaties" + "Aanpasbaar" "Gebruik net akkurate kleure" "Verstel tussen helder en akkurate kleure" "Wissel oriëntasie outomaties wanneer tablet gedraai word" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index e97c28ceb75..9bc05d22283 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -1068,7 +1068,7 @@ "ተፈጥሯዊ" "ተጨምሯል" "ቀለም የሞላ" - "ራስ-ሰር" + "ተለማማጅ" "ትክክለኛ ቀለማትን ብቻ ተጠቀም" "በግልጽ እና ትክክለኛ ቀለማት መካከል ያስተካክሉ" "ጡባዊ ሲሽከረከርየገፅ አቀማመጥ በራስሰርቀይር" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 79704139a47..1166075bc69 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -1116,7 +1116,7 @@ "طبيعي" "مُحسن" "مُشبع" - "تلقائي" + "توافقي" "استخدام الألوان الدقيقة فقط" "ضبط إلى التبديل بين الألوان الزاهية والدقيقة" "تبديل الاتجاه تلقائيًا عند تدوير الجهاز اللوحي" diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index 31f9c923861..d17c32d22fc 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -1067,7 +1067,7 @@ "প্ৰাকৃতিক" "বৃদ্ধি কৰা হ\'ল" "সংপৃক্ত" - "স্বয়ংক্ৰিয়" + "অভিযোজিত" "মাত্ৰ সঠীক ৰংৰবোৰ ব্যৱহাৰ কৰক" "উজ্জ্বল আৰু সঠীক ৰংৰ মাজত মিলাওক" "টে\'বলেটো ঘূৰালে স্বয়ংক্ৰিয়ভাৱে স্ক্ৰীণৰ দিশ সলনি কৰক" diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index 75e73ba44d8..df1a0f9059f 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -1068,7 +1068,7 @@ "Təbii" "Artan" "Dolğun" - "Avtomatik" + "Adaptiv" "Yalnız doğru rənglərdən istifadə edin" "Canlı və doğru rənglərlə tənzimləyin" "Planşetin pozisiyasından asılı olaraq orientasiyanı dəyiş" diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index 45c80edaca5..f0530717b0f 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -1080,7 +1080,7 @@ "Prirodne" "Pojačane" "Zasićene" - "Automatski" + "Prilagodljiv" "Koristite samo tačne boje" "Birajte između živopisnih i tačnih boja" "Promeni položaj automatski prilikom rotiranja tableta" diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 43144ac4f99..e789d795eb4 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -1093,7 +1093,7 @@ "Натуральны" "Яркія" "Насычаныя" - "Аўтаматычна" + "Адаптыўны колер" "Толькі натуральныя колеры" "Сярэдняе паміж насычанымі і натуральнымі колерамі" "Аўтаматычна змяняць арыентацыю экрана пры павароце планшэта" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 18bf7694c15..cfbd56dde74 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -1068,7 +1068,7 @@ "Естествени" "Подсилени" "Наситени" - "Автоматични" + "Адаптивно" "Използване само на естествени цветове" "Коригиране между ярки и естествени цветове" "Автоматично превключване на ориентацията при завъртане на таблета" diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index b9f01951254..ab208e6e6e3 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -1068,7 +1068,7 @@ "স্বাভাবিক" "বুস্ট করা" "স্যাচুরেশন বাড়ানো" - "অটোমেটিক" + "অভিযোজিত" "শুধুমাত্র আসল রঙ ব্যবহার করুন" "উজ্জ্বল এবং আসল রঙের মধ্যে অ্যাডজাস্ট করুন" "যখন ট্যাবলেট ঘোরানো হবে তখন স্থিতিবিন্যাস স্বয়ংক্রিয়ভাবে পরিবর্তন করুন" diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 61858c7097d..05099edb036 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -950,8 +950,8 @@ "Prekinuti vezu?" "Ako prekinete vezu, okončat će se veza s uređajem %1$s." "Ako prekinete vezu, okončat će se veza s uređajem %1$s i još %2$s uređaja." - "Otkazati poziv?" - "Da li želite otkazati poziv za povezivanje s uređajem %1$s?" + "Otkazati pozivnicu?" + "Da li želite otkazati pozivnicu za povezivanje s uređajem %1$s?" "Zaboraviti ovu grupu?" "Wi‑Fi pristupna tačka" "Nema dijeljenja interneta ili sadržaja s drugim uređajima" @@ -1080,7 +1080,7 @@ "Prirodne" "Pojačane" "Zasićene" - "Automatski" + "Prilagodljivi način" "Koristi samo precizne boje" "Prilagodite između izraženih i preciznih boja" "Automatski promijeni orijentaciju prilikom rotiranja tableta" @@ -3258,7 +3258,7 @@ "Visoka" "Hitno" "Dozvoli ometanja" - "Dozvolite aplikaciji da aktivira zvuk, vibrira i/ili prikaže obavještenja na ekranu" + "family link da aktivira zvuk, vibrira i/ili prikaže obavještenja na ekranu" "Manje važno" "Srednje važno" "Veoma važno" @@ -3557,7 +3557,7 @@ "Otvori u ovoj aplikaciji" "Pitaj svaki put" "Nemoj otvarati u ovoj aplikaciji" - "Nije prepoznat" + "Nije prepoznato" "Zadano" "Uobičajeno za rad" "Pomoć i glasovni unos" @@ -4195,7 +4195,7 @@ "Koristite Bluetooth za vrijeme vožnje" "Automatski uključite Bluetooth za vrijeme vožnje" "Upravljanje WiFi mrežom" - "Dozvolite aplikaciji da upravlja WiFi mrežom" + "family link da upravlja WiFi mrežom" "Dozvolite ovoj aplikaciji da uključi ili isključi WiFi, skenira i konektuje se na WiFi, doda ili ukloni mreže, te pokrene lokalnu pristupnu tačku" "Reproduciranje medija" "Ovaj uređaj" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 81f0130d455..9358edec38b 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -1068,7 +1068,7 @@ "Natural" "Millorat" "Saturat" - "Automàtic" + "Automàtic" "Fes servir només colors precisos" "Ajusta entre colors vius i precisos" "Canvia l\'orientació automàticament en girar la tauleta" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index f624d111338..ce225312e7c 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -1092,7 +1092,7 @@ "Přirozené" "Zesílené" "Syté" - "Automaticky" + "Adaptivní" "Používat pouze přesné barvy" "Vyberte mezi jasnými a přesnými barvami" "Při otáčení tabletu automaticky přepínat orientaci" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index e116a575d56..12bb74041e2 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -1068,7 +1068,7 @@ "Naturlig" "Forstærket" "Mættet" - "Automatisk" + "Selvjusterende" "Anvend kun nøjagtige farver" "Skift mellem levende og nøjagtige farver" "Skift automatisk retning, når tabletcomputeren drejes" @@ -1411,7 +1411,7 @@ "Rediger adgangspunkt" "Ikke angivet" "Navn" - "Adgangspunkt" + "APN" "Proxy" "Port" "Brugernavn" @@ -1427,28 +1427,28 @@ "PAP" "CHAP" "PAP eller CHAP" - "Adgangspunktstype" - "Adgangspunktets protokol" - "Adgangspunktets roamingprotokol" - "Aktivér/deaktiver adgangspunkt" - "Adgangspunktet er aktiveret" - "Adgangspunktet er deaktiveret" + "APN-type" + "APN-protokol" + "APN-roamingprotokol" + "Aktivér/deaktiver APN" + "APN er aktiveret" + "APN er deaktiveret" "Bærer" "MVNO-type" "MVNO-værdi" - "Slet adgangspunkt" - "Nyt adgangspunkt" + "Slet APN" + "Ny APN" "Gem" "Kassér" "Feltet Navn skal udfyldes." - "Du skal angive et adgangspunkt." + "Du skal angive et APN." "MCC-feltet skal indeholde 3 tal." "MNC-feltet skal indeholde 2 eller 3 tal." "Mobilselskabet tillader ikke, at du tilføjer adgangspunkter af typen %s." - "Gendannelse af standardindstillingerne for adgangspunktet." + "Gendannelse af standardindstillingerne for APN." "Nulstil til standard" - "Standardindstillingerne for adgangspunktet er nulstillet." + "Standardindstillingerne for APN er nulstillet." "Nulstil valg" "Netværk, apps eller enheden kan nulstilles" "Nulstil Wi-Fi, mobil og Bluetooth" @@ -2160,7 +2160,7 @@ "Forlæng din tablets batteritid" "Forlæng enhedens batteritid" "Aktivér batteriadministration" - "Aktivér Batterisparefunktion" + "Aktivér batterisparefunktionen" "Enheden løber muligvis tør for batteri hurtigere end forventet" "Batterisparefunktion er aktiveret" "Nogle funktioner kan være begrænsede" @@ -2330,7 +2330,7 @@ "Aktivér automatisk" "Ved %1$s" "Aktivér" - "Brug Batterisparefunktion" + "Brug batterisparefunktionen" "Slå automatisk til" "Aldrig" "ved batteriniveau på %1$s" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 666f67ae02b..9c37cf83cd3 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -1068,7 +1068,7 @@ "Natürlich" "Verstärkt" "Gesättigt" - "Automatisch" + "Adaptiv" "Nur originale Farben verwenden" "Farbwert zwischen kräftigen und originalen Farben einstellen" "Ausrichtung beim Drehen des Tablets automatisch ändern" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 8f6b7f8f4e6..ffc074c1458 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -1068,7 +1068,7 @@ "Φυσικό" "Ενισχυμένο" "Κορεσμένο" - "Αυτόματα" + "Προσαρμοστικό" "Χρήση μόνο ακριβών χρωμάτων" "Προσαρμογή μεταξύ ζωντανών και ακριβών χρωμάτων" "Αυτόματη εναλλαγή προσανατολισμού κατά την περιστροφή του tablet" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 1adec03064f..a9859239006 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -1068,7 +1068,7 @@ "Natural" "Boosted" "Saturated" - "Automatic" + "Adaptive" "Use accurate colours only" "Adjust between vivid and accurate colours" "Switch orientation automatically when rotating tablet" diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index 1250ed08977..6660d8a1509 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -1068,7 +1068,7 @@ "Natural" "Boosted" "Saturated" - "Automatic" + "Adaptive" "Use accurate colours only" "Adjust between vivid and accurate colours" "Switch orientation automatically when rotating tablet" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 1adec03064f..a9859239006 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -1068,7 +1068,7 @@ "Natural" "Boosted" "Saturated" - "Automatic" + "Adaptive" "Use accurate colours only" "Adjust between vivid and accurate colours" "Switch orientation automatically when rotating tablet" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 1adec03064f..a9859239006 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -1068,7 +1068,7 @@ "Natural" "Boosted" "Saturated" - "Automatic" + "Adaptive" "Use accurate colours only" "Adjust between vivid and accurate colours" "Switch orientation automatically when rotating tablet" diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml index b1448922306..7faabda4f36 100644 --- a/res/values-en-rXC/strings.xml +++ b/res/values-en-rXC/strings.xml @@ -1067,7 +1067,7 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‏‎‏‏‎‎‏‎‏‎‎‏‎‏‏‏‎‏‎‏‎‏‎‎‎‎‎‏‎‎‏‎‎‏‎‏‎‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‎‎‏‎‏‏‎‎Natural‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‏‏‏‎‎‏‎‏‏‏‏‏‎‎‎‎‎‎‎‎‎‏‏‎‎‏‎‏‏‎‏‎‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‎‏‎‎‎Boosted‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‏‏‏‎‏‏‎‏‎‏‎‏‏‎‎‎‏‏‏‎‏‎‏‏‎‎‏‏‎‏‏‎‏‏‏‎‎‎‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎Saturated‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‏‎‎‎‏‎‎‎‎‎‎‏‎‎‏‏‎‎‎‎‎‏‎‎‏‎‏‎‏‎‎‏‎‎‎‎‏‎‎‏‎‎‏‏‎Automatic‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‏‏‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‎‎‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‏‎‎‎‎‎‎Adaptive‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‎‎‎‏‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‏‏‏‎‎‏‎‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‏‎Use accurate colors only‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‎‎‏‏‎‏‎‏‏‏‎‏‎‎‏‏‏‏‎‎‏‎‎‏‏‏‎‏‎‏‏‏‎‏‎‎‏‎‎‏‏‏‏‏‏‏‎‎‏‏‎‏‏‏‎Adjust between vivid and accurate colors‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‏‏‎‏‏‏‏‏‎‏‏‏‏‎‎‏‏‎‏‎‎‏‏‏‏‎‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‎‎‏‎‏‏‎‏‎‎‎‏‏‎‎‏‏‏‎‎Switch orientation automatically when rotating tablet‎‏‎‎‏‎" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index a7d35804e4e..b9150828d58 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -1068,7 +1068,7 @@ "Naturales" "Mejorados" "Saturados" - "Automático" + "Automático" "Solo usar colores precisos" "Ajustar entre colores vívidos y reales" "Cambiar la orientación automáticamente al girar el tablet" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 1df94dbee34..a7e04972b1a 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -1068,7 +1068,7 @@ "Naturales" "Mejorados" "Saturados" - "Automático" + "Automático" "Usar solo colores reales" "Ajustar entre colores vívidos y reales" "Cambiar orientación al girar el tablet" diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 8f28406a926..a0809086153 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -1068,7 +1068,7 @@ "Loomulikud" "Võimendatud" "Küllastatud" - "Automaatne" + "Kohanduv" "Kasuta ainult täpseid värve" "Eredate ja täpsete värvide vahel kohandamine" "Tahvelarvuti pööramisel automaatselt paigutuse ümberlülitamine" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 43b6fbb4d9e..4cd9dc59a85 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -1068,7 +1068,7 @@ "Naturalak" "Nabarmenduak" "Saturatuak" - "Automatikoa" + "Doigarria" "Erabili kolore errealistak soilik" "Doitu kolore bizi eta errealisten artean" "Aldatu orientazioa automatikoki tableta biratzean" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 029c7216f09..1cc413d1059 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -1068,7 +1068,7 @@ "طبیعی" "تقویت‌شده" "اشباع‌شده" - "خودکار" + "قابل تطبیق" "فقط استفاده از رنگ‌های دقیق" "تنظیم بین رنگ‌های روشن و دقیق" "هنگام چرخاندن رایانهٔ لوحی، جهت به‌طور خودکار تغییر می‌کند" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 9bc5c0c0fc2..bc1dc37bce5 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -1068,7 +1068,7 @@ "Luonnollinen" "Tehostettu" "Kylläinen" - "Automaattinen" + "Mukautuva" "Käytä vain todenmukaisia värejä" "Vaihtele kirkkaiden ja todenmukaisten värien välillä" "Vaihda suuntaa automaattisesti, kun tablet-laitetta kierretään" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 9f86f8356e7..dec7a5992a2 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -1068,7 +1068,7 @@ "Naturelles" "Intenses" "Saturées" - "Automatique" + "Adaptatif" "Utiliser uniquement les couleurs précises" "Ajuster entre les couleurs vives et précises" "Changer automatiquement d\'orientation lors de la rotation de la tablette" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 21fc17d0d7d..96c301ce148 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -1068,7 +1068,7 @@ "Naturel" "Contrasté" "Saturé" - "Automatique" + "Adaptative" "N\'utiliser que des couleurs proches de la réalité" "Ajuster entre les couleurs vives et proches de la réalité" "Changer automatiquement d\'orientation lors de la rotation de la tablette" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 74bde7414a8..87ad17c7233 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -1068,7 +1068,7 @@ "Naturais" "Realzados" "Saturados" - "Cor automática" + "Automática" "Utiliza só cores precisas" "Axuste entre cores vivas e precisas" "Cambia a orientación automaticamente ao xirar a tableta" @@ -1642,7 +1642,7 @@ "Bloquear ao acender" "Excepto se %1$s mantén o dispositivo desbloqueado" "Definir padrón de desbloqueo" - "Cambiar deseño de desbloqueo" + "Cambiar padrón de desbloqueo" "Como debuxar un padrón de desbloqueo" "Realizáronse demasiados intentos incorrectos. Téntao de novo en %d segundos." "A aplicación non está instalada no teléfono." diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index cd00b41101d..d20fe3d8dd1 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -1068,7 +1068,7 @@ "કુદરતી" "બુસ્ટ કરેલ" "સંતૃપ્ત" - "આપમેળે" + "સુવિધાજનક" "માત્ર સચોટ રંગોનો જ ઉપયોગ કરો" "આબેહૂબ અને સચોટ રંગો વચ્ચે સમાયોજિત કરો" "ટેબ્લેટને ફેરવતી વખતે ઓરિએન્ટેશનને આપમેળે સ્વિચ કરો" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 6284902daaf..0da9502d74a 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -856,8 +856,7 @@ "अपने आप" "2.4 GHz बैंड" "5.0 गीगाहर्ट्ज़ का बैंड" - - + "5.0 गीगाहर्ट्ज़ बैंड का इस्तेमाल करना बेहतर होगा" "2.4 गीगाहर्ट्ज़" "5.0 गीगाहर्ट्ज़" "वाई-फ़ाई हॉटस्पॉट से डिवाइस काे जाेड़ने के लिए कम से कम एक बैंड चुनें:" @@ -1069,7 +1068,7 @@ "बिना किसी बदलाव के" "बढ़ाया गया" "सैचुरेट किया गया" - "अपने आप रंग चुनकर दिखाने वाला मोड" + "आस-पास की रोशनी के अनुसार स्क्रीन की चमक बदले" "सिर्फ़ सटीक रंगों का इस्तेमाल करें" "चटख और सटीक रंगों के बीच मनमुताबिक बदलाव करें" "टैबलेट घुमाने पर स्क्रीन की दिशा अपने आप बदलें" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 9d0bc0314dc..e6b5e653023 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -1080,7 +1080,7 @@ "Prirodno" "Pojačano" "Zasićeno" - "Automatski" + "Prilagodljivo" "Upotreba samo točnih boja" "Odaberite žive ili točne boje" "Prebaci orijentaciju automatski pri rotaciji tabletnog uređaja" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index a9b42b4083d..25f5f8e62f2 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -1068,7 +1068,7 @@ "Természetes" "Élénk" "Telített" - "Automatikus" + "Adaptív" "Csak pontos színek használata" "Váltás élénk és pontos színek között" "Tájolás automatikus váltása a táblagép forgatásakor" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 606e4149dd2..b7334aa50f9 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -1068,7 +1068,7 @@ "Բնական" "Պայծառ" "Հագեցած" - "Ավտոմատ" + "Հարմարողական" "Օգտագործեք միայն ճշգրիտ վերարտադրվող գույներ" "Կարգավորեք գույների պայծառությունն ու ճշգրտությունը" "Ավտոմատ փոխել դիրքավորումը պլանշետը պտտելիս" @@ -3608,7 +3608,7 @@ "Լիակատար ֆոնային մուտք" "Օգտվել էկրանի տեքստային բովանդակությունից" "Թույլ տալ օգնական հավելվածին օգտվել էկրանի տեքստային բովանդակությունից" - "Օգտագործել էկրանի պատկերը" + "Օգտագործել սքրինշոթը" "Թույլ տալ օգնական հավելվածին օգտվել էկրանի պատկերներից" "Էկրանի թարթում" "Երբ օգնական հավելվածը բացում է տեքստը Էկրանից կամ էկրանի պատկերից, էկրանի եզրագծերը թարթում են" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 1db79691afd..c95f6295975 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -1068,7 +1068,7 @@ "Alami" "Ditingkatkan" "Disaturasi" - "Otomatis" + "Adaptif" "Gunakan hanya warna yang akurat" "Sesuaikan antara warna yang jernih dan akurat" "Ubah orientasi secara otomatis ketika memutar tablet" diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index 0beb31d0e2b..3e67fd5b025 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -1068,7 +1068,7 @@ "Náttúrulegir" "Efldir" "Mettaðir" - "Sjálfvirk" + "Breytilegur" "Nota aðeins nákvæma liti" "Stilla á líflega eða nákvæma liti" "Snúa skjámynd sjálfkrafa þegar spjaldtölvu er snúið" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index cbd30958372..5bc0deca504 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -1068,7 +1068,7 @@ "Naturali" "Migliorati" "Intensi" - "Automatici" + "Adattivo" "Usa solo colori precisi" "Regola la vivacità e la precisione dei colori" "Cambia automaticamente l\'orientamento quando il tablet viene ruotato" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 08d7970e196..0be617411e5 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -1092,7 +1092,7 @@ "טבעי" "מוגבר" "רווי" - "אוטומטי" + "ניתן להתאמה" "שימוש בצבעים מדויקים בלבד" "כוונון בטווח של צבעים מלאי חיים עד צבעים מדויקים" "שנה כיוון באופן אוטומטי בעת סיבוב הטאבלט" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 3e9b217ad87..3712c61faf4 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -1068,7 +1068,7 @@ "ナチュラル" "ブースト" "ビビッド" - "自動" + "アダプティブ" "正確な色のみを使用" "鮮明な色と正確な色の間で調整" "画面の向きに合わせて縦横表示を切り替える" diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index c55dc970a8d..ed452041b95 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -1068,7 +1068,7 @@ "ბუნებრივი" "კონტრასტული" "ინტენსიური" - "ავტომატური" + "ადაპტაციური" "მხოლოდ მკვეთრი ფერების გამოყენება" "ცოცხალსა და მკვეთრ ფერებს შორის დარეგულირება" "ტაბლეტის გადატრიალებისას ეკრანის ორიენტაციის ავტომატური შეცვლა" diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index 132ff97bc11..2a319cc3e02 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -1068,7 +1068,7 @@ "Табиғи" "Жарқын" "Қаныққан" - "Автоматты" + "Адаптивті" "Тек анық түстерді пайдаланыңыз" "Түстердің ашықтығы мен анықтығын реттеңіз" "Планшетті айналдырғанда бағытын автоматты түрде ауыстыру" diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index 122c03d10e4..fc4eb490fcb 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -1068,7 +1068,7 @@ "ធម្មជាតិ" "បង្កើនពន្លឺ" "ឆ្អែត" - "ស្វ័យប្រវត្តិ" + "បត់បែន" "ប្រើតែ​ពណ៌​ត្រូវ​ប៉ុណ្ណោះ" "កែ​តម្រូវ​រវាង​ពណ៌ស្រស់ និង​ពណ៌​ដែលត្រូវ" "ប្ដូរ​ទិស​ស្វ័យ​ប្រវត្តិ​ពេល​បង្វិល​កុំព្យូទ័រ​បន្ទះ" diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index 0610a912c60..4cafa03b78b 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -1068,7 +1068,7 @@ "ಪ್ರಾಕೃತಿಕ" "ಬೂಸ್ಟ್ ಮಾಡಲಾಗಿದೆ" "ಸ್ಯಾಚುರೇಟೆಡ್" - "ಸ್ವಯಂಚಾಲಿತ" + "ಅಡಾಪ್ಟಿವ್" "ನಿಖರ ಬಣ್ಣಗಳನ್ನು ಮಾತ್ರ ಬಳಸಿ" "ಹೊಳೆಯುವ ಮತ್ತು ನಿಖರ ಬಣ್ಣಗಳ ನಡುವೆ ಹೊಂದಿಸಿ" "ಟ್ಯಾಬ್ಲೆಟ್‌ ತಿರುಗಿಸುವಾಗ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಓರಿಯಂಟೇಶನ್ ಬದಲಾಯಿಸು" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index baf28d6038c..704dced6ad9 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -1068,7 +1068,7 @@ "자연스럽게" "부스트" "선명하게" - "자동" + "색상 자동 조절" "정확한 색상만 사용" "색상 선명도와 정확도 간 조정" "태블릿 회전 시 자동으로 방향 바꾸기" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 5719d6f316a..f21bd557cdf 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -1067,7 +1067,7 @@ "Табигый" "Күчөтүлгөн" "Каныккан" - "Автоматтык" + "Ыңгайлаштырылуучу" "Так түстөрдү гана колдонуу" "Ачык жана так түстөрдү тууралоо" "Планшет тегеренип жатканда багытын автоматтык түрдө которуштуруу" diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index b1c655dc9b9..667639034f5 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -1068,7 +1068,7 @@ "ທຳ​ມະ​ຊາດ" "ເລັ່ງແລ້ວ" "ເພີ່ມສີແລ້ວ" - "ອັດຕະໂນມັດ" + "ປັບປ່ຽນໄດ້" "ໃຊ້ສີທີ່ຖືກຕ້ອງເທົ່ານັ້ນ" "ປັບແຕ່ງລະຫວ່າງສີແບບສົດໃສ ແລະ ຖືກຕ້ອງ" "ປັບປ່ຽນທິດທາງອັດຕະໂນມັດເມື່ອໝຸນແທັບເລັດ" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index e703bbcdabd..8cfb52059a5 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -1092,7 +1092,7 @@ "Natūrali" "Suintensyvinta" "Sodri" - "Automatinė" + "Prisitaikanti" "Naudokite tik tikslias spalvas" "Koreguokite tarp ryškių ir tikslių spalvų" "Sukant planšetinį kompiuterį automatiškai perjungti orientaciją" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index dd3339169a3..103017b9cc8 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -1080,7 +1080,7 @@ "Dabiska" "Paspilgtināta" "Piesātināta" - "Automātiski" + "Adaptīva krāsa" "Izmantot tikai precīzas krāsas" "Pielāgot krāsas no spilgtām līdz precīzām" "Mainīt orientāciju automātiski, rotējot planšetdatoru" diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 6fa83bdc857..f1427caaf29 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -1068,7 +1068,7 @@ "Природно" "Нагласено" "Заситено" - "Автоматски" + "Адаптивна" "Користи само прецизни бои" "Приспособувај помеѓу живописни и прецизни бои" "Автоматски префрли ја ориентацијата при ротирање на таблетот" diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index 206fa701f86..c782cd9f88c 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -1068,7 +1068,7 @@ "സ്വാഭാവികം" "ബൂസ്‌റ്റ് ചെയ്‌‌ത" "സാച്ചുറേറ്റ് ചെയ്‌‌ത" - "സ്വമേധയാ" + "അനുയോജ്യമായത്" "കൃത്യമായ നിറങ്ങൾ മാത്രം ഉപയോഗിക്കുക" "വ്യത്യസ്‌തവും കൃത്യവുമായ നിറങ്ങൾക്കിടയിൽ ക്രമീകരിക്കുക" "ടാബ്‌ലെറ്റ് തിരിക്കുമ്പോൾ ഒാറിയൻ്റേഷനിലേയ്ക്ക് സ്വയം മാറുക" diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index c6df6a428f5..4a4c6d95817 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -1068,7 +1068,7 @@ "Байгалийн" "Өдөөсөн" "Өнгө ялгасан" - "Автомат" + "Дасан зохицох" "Зөвхөн оновчтой өнгийг ашиглах" "Тод болон оновчтой өнгө хооронд тохируулах" "Таблетыг эргүүлбэл харагдацыг автоматаар эргүүлэх" diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index 9386fbbbc8b..fa5d17b39bd 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -1068,7 +1068,7 @@ "नैसर्गिक" "बूस्ट केलेला" "संपृक्त" - "आपोआप" + "अॅडॅप्टिव्ह" "फक्त अचूक रंग वापरा" "उठावदार आणि अचूक रंगामध्ये अॅडजस्‍ट करा" "टॅब्लेट फिरवताना ओरिएंटेशन आपोआप स्विच करा" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 28480241576..8d1b2fdbec5 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -1068,7 +1068,7 @@ "Asli" "Ditingkatkan" "Tepu" - "Automatik" + "Boleh suai" "Gunakan warna tepat sahaja" "Laraskan antara warna terang dengan tepat" "Menukar orientasi secara automatik apabila memutarkan tablet" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 3b7ddf7712a..cf1f4492ac8 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -1068,7 +1068,7 @@ "သဘာဝ" "အရောင်တင်ထားသည်" "ပြည့်ဝ အရောင်" - "အလိုအလျောက်" + "အလိုက်အထိုက်" "မူလအရောင်များကိုသာ သုံးပါ" "တောက်ပခြင်းနှင့် မူလအရောင်များအကြား ချိန်ညှိပါ" "တက်ဘလက်ကိုလှည့်လျှင် အနေအထားအားအလိုအလျောက်ပြောင်းရန်" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 8ff2310b4e0..29be3bfe900 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -1068,7 +1068,7 @@ "Naturlig" "Forsterket" "Mettet" - "Automatisk" + "Tilpasset" "Bruk bare nøyaktige farger" "Juster mellom levende og nøyaktige farger" "Bytt retning automatisk når nettbrettet roteres" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 3a2551e1a16..81f6f4fc7b1 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -1068,7 +1068,7 @@ "प्राकृतिक" "बढाइएको" "परिपूर्ण पारिएको" - "स्वचालित" + "अनुकूलनीय" "सही रङहरू मात्र प्रयोग गर्नुहोस्" "स्पष्ट र सही रङहरूबीच समायोजन गर्नुहोस्" "ट्याब्लेट घुमाउँदा स्वचालित रूपमा अभिमुखिकरण स्विच गर्नुहोस्" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 87e5cb2be67..4b2b8bf5699 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -1068,7 +1068,7 @@ "Natuurlijk" "Versterkt" "Verzadigd" - "Automatisch" + "Aanpasbaar" "Uitsluitend nauwkeurige kleuren gebruiken" "Levendige en nauwkeurige kleuren instellen" "Stand automatisch wijzigen als tablet wordt gedraaid" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index 8b3547ef3cf..bdba01cce41 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -1067,7 +1067,7 @@ "ପ୍ରାକୃତିକ" "ବର୍ଦ୍ଧିତ" "ସାଚୁରେଟେଡ୍" - "ସ୍ଵଚାଳିତ" + "ଖାପ ଖୁଆଇବା" "କେବଳ ସଠିକ୍ ରଙ୍ଗକୁ ବ୍ୟବହାର କରନ୍ତୁ" "ବିଭିନ୍ନ ଓ ସଠିକ୍ ରଙ୍ଗ ମଧ୍ୟରେ ଆଡଜଷ୍ଟ କରନ୍ତୁ" "ଟାବ୍‌ଲେଟ୍‌କୁ ବୁଲାଇଲେ ଅଟୋମେଟିକାଲୀ ଓରିଏଣ୍ଟେଶନ୍‌କୁ ବଦଳାନ୍ତୁ" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 1ceae10e892..a52de05e272 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -1068,7 +1068,7 @@ "ਕੁਦਰਤੀ" "ਵਧਾਇਆ ਗਿਆ" "ਪਰਿਪੂਰਨ ਕੀਤਾ ਗਿਆ" - "ਸਵੈਚਲਿਤ" + "ਅਨੁਕੂਲਨਯੋਗ" "ਸਿਰਫ਼ ਸਟੀਕ ਰੰਗ ਵਰਤੋ" "ਸਪਸ਼ਟ ਅਤੇ ਸਟੀਕ ਰੰਗਾਂ ਵਿਚਕਾਰ ਵਿਵਸਥਿਤ ਕਰੋ" "ਟੈਬਲੈੱਟ ਨੂੰ ਘੁੰਮਾਉਣ ਵੇਲੇ ਆਪਣੇ ਆਪ ਦਿਸ਼ਾਮਾਨ \'ਤੇ ਬਦਲੋ" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index bf35224d6b4..7e0ce277fa0 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -188,7 +188,7 @@ "Bluetooth włączy się, by sparować urządzenia" "Ustawienia połączeń" "Wcześniej połączone urządzenia" - "Data i czas" + "Data i godzina" "Wybierz strefę czasową" @@ -328,10 +328,10 @@ "Zezwalać na roaming danych?" "Wybór operatora" "Wybierz operatora sieci." - "Data i czas" + "Data i godzina" "Ustaw datę i godzinę" "Ustaw datę, godzinę, strefę czasową i formaty." - "Automatyczna data i czas" + "Automatyczna data i godzina" "Użyj czasu podanego przez sieć" "Użyj czasu podanego przez sieć" "Automatyczna strefa czasowa" @@ -1092,7 +1092,7 @@ "Naturalne" "Wzmocnione" "Nasycone" - "Automatycznie" + "Adaptacyjny" "Użyj tylko wiernych kolorów" "Wybierz żywe bądź wierne odwzorowanie kolorów" "Automatycznie przełącz orientację przy obracaniu tabletu" diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 43102644cbd..1fad269cc13 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -1068,7 +1068,7 @@ "Naturais" "Realçadas" "Saturadas" - "Automática" + "Adaptativo" "Usar apenas cores precisas" "Ajuste entre cores vívidas e precisas" "Alternar orientação automaticamente ao girar o tablet" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index c81d231469d..44b4a04d6c8 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -1068,7 +1068,7 @@ "Naturais" "Amplificadas" "Saturadas" - "Automática" + "Adaptável" "Utilizar apenas cores exatas" "Ajuste entre cores vivas e exatas" "Mudar orientação automaticamente ao rodar o tablet" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 43102644cbd..1fad269cc13 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -1068,7 +1068,7 @@ "Naturais" "Realçadas" "Saturadas" - "Automática" + "Adaptativo" "Usar apenas cores precisas" "Ajuste entre cores vívidas e precisas" "Alternar orientação automaticamente ao girar o tablet" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index a1d44f8bdde..e77e1fa5b68 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -1080,7 +1080,7 @@ "Natural" "Intensificat" "Saturat" - "Automat" + "Adaptiv" "Utilizați numai culori exacte" "Ajustați între culorile vii și cele exacte" "Doresc comutarea automată a orientării atunci când se rotește tableta" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index d3c9c4e4705..a07caa22561 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -1092,7 +1092,7 @@ "Натуральные" "Яркие" "Насыщенные" - "Автоматически" + "Адаптивная регулировка" "Только натуральные цвета" "Среднее между насыщенными и натуральными цветами" "Автоматически изменять ориентацию экрана при повороте планшетного ПК" diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index 4baba8f4716..a4a5eef456a 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -1068,7 +1068,7 @@ "ස්වභාවික" "වැඩි කළ" "සන්තෘප්ත" - "ස්වයංක්‍රිය" + "අනුවර්තී" "නිවැරදි වර්ණ පමණක් භාවිත කරන්න" "විචිත්‍ර සහ නිවැරදි වර්ණ අතර සීරුමාරු කරන්න" "ටැබ්ලටය කරකැවීමේදී ස්වයංක්‍රියව දිශානතිය වෙනස් කරන්න" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index acac103a9cb..e5c58e70cfb 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -1092,7 +1092,7 @@ "Prirodzené" "Zosilnené" "Sýte" - "Automatické" + "Adaptívna" "Používať iba presné farby" "Vyberte si medzi živými a presnými farbami" "Pri otáčaní tabletu automaticky prepínať orientáciu" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index e2719c46353..f89fa3c34e1 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -1092,7 +1092,7 @@ "Naravne" "Poudarjene" "Nasičene" - "Samodejno" + "Prilagodljivo" "Uporaba samo natančnih barv" "Prilagoditev med živimi in natančnimi barvami" "Samodejno spremeni usmerjenost ob zasuku tabličnega računalnika" diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index d2b2c78cfb0..faf55611e9a 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -1068,7 +1068,7 @@ "Natyrale" "Të theksuara" "E gjallë" - "Automatike" + "Me përshtatje" "Përdor vetëm ngjyrat e sakta" "Rregullo mes ngjyrave të gjalla dhe të sakta" "Ndërro orientimin automatikisht kur rrotullon tabletin" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 45e81534a8f..2a5acacd1aa 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -1080,7 +1080,7 @@ "Природне" "Појачане" "Засићене" - "Аутоматски" + "Прилагодљив" "Користите само тачне боје" "Бирајте између живописних и тачних боја" "Промени положај аутоматски приликом ротирања таблета" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 7aea9a37df0..151a56c821e 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -1068,7 +1068,7 @@ "Naturliga" "Förstärkta" "Mättade" - "Automatisk" + "Anpassad" "Använd bara naturtrogna färger" "Ändra mellan intensiva och naturtrogna färger" "Växla riktning automatiskt när du roterar surfplattan" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index c64c4ec97a8..a97ef307404 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -334,7 +334,7 @@ "Tumia saa za eneo kutoka kwa mtandao" "Tumia saa za eneo kutoka kwa mtandao" "Muundo wa saa 24 kiotomatiki" - "Tumia mipangilio chaguo msingi ya eneo la lugha" + "Tumia mipangilio chaguomsingi ya eneo la lugha" "Mfumo wa saa 24" "Tumia mpangilio wa saa 24" "Muda" @@ -1068,7 +1068,7 @@ "Asili" "Imeongezwa Rangi" "Imekolezwa" - "Otomatiki" + "Inayojirekebisha" "Tumia rangi bayana pekee" "Badilisha kati ya rangi zinazong\'aa na rangi bayana" "Badilisha uelekezo kiotomatiki wakati unazungusha kompyuta ndogo" @@ -1083,13 +1083,13 @@ "Kimezimwa" "Kiwango cha ung\'avu ni cha chini zaidi" "Kiwango cha ung\'avu ni cha chini" - "Kiwango cha ung\'avu kimewekwa kulingana na mipangilio chaguo msingi" + "Kiwango cha ung\'avu kimewekwa kulingana na mipangilio chaguomsingi" "Kiwango cha ung\'avu ni cha juu" "Kiwango cha ung\'avu ni cha juu zaidi" "Zima" "Chini sana" "Chini" - "Chaguo msingi" + "Chaguomsingi" "Juu" "Juu sana" "Kiwango cha ung\'avu unachopendelea" @@ -1125,7 +1125,7 @@ "Skrini huzima" "Baada ya %1$s za kutokuwa na shughuli" "Mandhari" - "Chaguo msingi" + "Chaguomsingi" "Maalum" "Badilisha mandhari" "Weka mapendeleo ya skrini yako" @@ -1447,7 +1447,7 @@ "Sehemu ya MNC lazima iwe na nambari 2 au 3." "Mtoa huduma haruhusu kuongeza APN za aina ya %s." "Inarejesha mipangilio mbadala ya APN" - "Rudisha kwenye chaguo msingi" + "Rudisha kwenye chaguomsingi" "Kuweka upya kwa mipangilio mbadala ya APN kumekamilika" "Chaguo za kubadilisha mipangilio" "Unaweza kubadilisha mipangilio ya mtandao, programu au kifaa" @@ -1673,7 +1673,7 @@ "Maelezo ya programu" "Hifadhi" "Fungua moja kwa moja" - "Chaguo msingi" + "Chaguomsingi" "Utangamanifu wa skrini" "Ruhusa" "Akiba" @@ -1702,7 +1702,7 @@ "Umechagua kuzindua programu hii kwa mbadala kwa baadhi ya vitendo." "Umechagua kuruhusu programu hii kuunda wijeti na kufikia data yao." "Hakuna chaguo-misingi zilizowekwa." - "Futa chaguo msingi" + "Futa chaguomsingi" "Programu hii haiwezi kuundwa kwa skrini yako: Unaweza kudhibiti jinsi inavyojirekebidhwa kwa skrini yako hapa." "Uliza wakati imezinduliwa" "Pima programu" @@ -1716,7 +1716,7 @@ "Programu ya dharura" "Badilisha mapendeleo ya programu" "Ungependa kuweka upya mapendeleo ya programu?" - "Hii itaweka upya mapendeleo yote ya: \n\n "
  • "Programu zilizozimwa"
    • \n" "
  • " Arifa za programu zilizozimwa"
    • \n" "
  • "Programu chaguo msingi kwa vitendo"
    • \n" "
  • "Vikwazo vya chinichini vya data ya programu"
    • \n" "
  • "Vikwazo vyovyote vya ruhusa"
    • \n\n"Hutapoteza data yoyote ya programu."     + "Hii itaweka upya mapendeleo yote ya: \n\n "
  • "Programu zilizozimwa"
    • \n" "
  • " Arifa za programu zilizozimwa"
    • \n" "
  • "Programu chaguomsingi kwa vitendo"
    • \n" "
  • "Vikwazo vya chinichini vya data ya programu"
    • \n" "
  • "Vikwazo vyovyote vya ruhusa"
    • \n\n"Hutapoteza data yoyote ya programu."     "Weka upya" "Dhibiti nafasi" "Kichujio" @@ -1789,7 +1789,7 @@ "Maelezo zaidi kwenye %1$s" "Inatumika" "(Haijawahi kutumiwa)" - "Hakuna programu chaguo msingi." + "Hakuna programu chaguomsingi." "Matumizi ya hifadhi" "Tazama hifadhi iliyotumika na programu" "Inawasha upya" @@ -1866,7 +1866,7 @@ "Ionyeshe kwenye skrini wakati kibodi halisi inatumika" "Kisaidizi cha njia za mkato" "Onyesha njia za mkato zilizoko" - "Chaguo msingi" + "Chaguomsingi" "Kasi ya kiashiria" "Kidhibiti cha Mchezo" "Elekeza mtetemo" @@ -1874,7 +1874,7 @@ "Chagua mpangilio wa kibodi" "sanidi mipangilio ya kibodi" "Ili kubadili, bonyeza Dhibiti-Kiweka nafasi" - "Chaguo msingi" + "Chaguomsingi" "Mpangilio wa kibodi" "Kamusi binafsi" @@ -2039,9 +2039,9 @@ "Jamii ya Fonti" "Manukuu yataonekana hivi" "Aa" - "Chaguo msingi" + "Chaguomsingi" "Rangi" - "Chaguo msingi" + "Chaguomsingi" "Hakuna" "Nyeupe" "Kijivu" @@ -2834,10 +2834,10 @@ "Gusisha ili ulipe" "Jinsi inavyofanya kazi" "Tumia simu yako kulipa katika maduka" - "Chaguo msingi la malipo" + "Chaguomsingi la malipo" "Haijawekwa" "%1$s - %2$s" - "Tumia chaguo msingi" + "Tumia chaguomsingi" "Kila wakati" "Isipokuwa wakati programu nyingine ya malipo imefunguliwa" "Unapolipa ukitumia chaguo la Gusisha ili ulipe, tumia:" @@ -2925,7 +2925,7 @@ "Hakuna SIM kadi zilizoingizwa" "Hali ya SIM" "Hali ya SIM (nafasi ya sim ya %1$d)" - "Piga simu kwa kutumia SIM kadi chaguo msingi" + "Piga simu kwa kutumia SIM kadi chaguomsingi" "SIM ya kutumia kupiga simu" "Mipangilio mingine ya simu" "Mtandao wa Upakuaji unaopendelewa" @@ -2955,7 +2955,7 @@ "Bluetooth, NFC" "Bluetooth" "Programu na arifa" - "Ruhusa, programu chaguo msingi" + "Ruhusa, programu chaguomsingi" "Akaunti" "Hakuna akaunti zilizizoongezwa" "Programu chaguomsingi" @@ -2979,7 +2979,7 @@ "matumizi ya nishati, chaji" "tahajia, kamusi, kagua maendelezo, sahihisha kiotomatiki" "king\'amuzi, vifaa vya kuingiza sauti, matamshi, ongea, lugha, tumia bila kugusa, utambuzi, la kukera, neno, sauti, historia, vifaa vya sauti, bluetooth" - "kadiria, lugha, chaguo msingi, zungumza, kuzungumza, tts, zana za walio na matatizo ya kuona na kusikia, kisoma skrini, kipofu" + "kadiria, lugha, chaguomsingi, zungumza, kuzungumza, tts, zana za walio na matatizo ya kuona na kusikia, kisoma skrini, kipofu" "saa, jeshi" "weka upya, rejesha, kiwandani" "futa data yote, futa, rejesha, ondoa, weka mipangilio ya kiwandani" @@ -2991,9 +2991,9 @@ "akaunti" "vikwazo, weka vikwazo, imewekewa vikwazo" "kusahihisha maandishi, sahihisha, sauti, tetema, otomatiki, lugha, ishara, pendekeza, pendekezo, mandhari, ya kukera, neno, andika, emoji, ya kimataifa" - "weka upya, mapendeleo, chaguo msingi" - "dharura, samawati, programu, chaguo msingi" - "simu, kipiga simu, chaguo msingi" + "weka upya, mapendeleo, chaguomsingi" + "dharura, samawati, programu, chaguomsingi" + "simu, kipiga simu, chaguomsingi" "programu, kupakua, programu, mfumo" "programu, ruhusa, usalama" "programu, chaguomsingi" @@ -3035,7 +3035,7 @@ "Imefanikiwa!" "Haiwezi kuandika data kwenye tagi ya NFC. Kama tatizo litaendelea, jaribu tagi tofauti" "Tagi ya NFC haiandikiki. Tafadhali tumia tagi tofauti." - "Sauti chaguo msingi" + "Sauti chaguomsingi" "Kiwango cha sauti ya mlio ni %1$s" "Kiwango cha sauti, mtetemo, Usinisumbue" "Programu inayotoa milio ya simu imewekwa katika hali ya kutetema" @@ -3050,7 +3050,7 @@ "Sauti chaguomsingi ya arifa" "Sauti iliyotolewa na programu" "Sauti chaguomsingi ya arifa" - "Sauti chaguo msingi ya kengele" + "Sauti chaguomsingi ya kengele" "Pia tetema simu zinapoingia" "Sauti nyingine" "Sauti za vitufe vya kupiga simu" @@ -3176,8 +3176,8 @@ "Tumia sauti za wasifu wako binafsi" "Sauti za wasifu wa binafsi na wa kazini ni sawa" "Mlio wa simu ya kazini" - "Sauti chaguo msingi ya arifa ya kazini" - "Sauti chaguo msingi ya kengele ya kazini" + "Sauti chaguomsingi ya arifa ya kazini" + "Sauti chaguomsingi ya kengele ya kazini" "Sawa na wasifu binafsi" "Ungependa kubadilisha sauti?" "Badilisha" @@ -3439,7 +3439,7 @@ "Fungua viungo vinavyoweza kutumika" "Fungua bila kuuliza" "Viungo vinavyoweza kutumika" - "Chaguo msingi nyingine" + "Chaguomsingi nyingine" "%1$s zimetumika katika %2$s" "Hifadhi ya mfumo" "Hifadhi ya nje" @@ -3509,8 +3509,8 @@ "Uliza kila wakati" "Usifungue katika programu hii" "Haitambuliwi" - "Chaguo msingi" - "Chaguo msingi ya kazini" + "Chaguomsingi" + "Chaguomsingi ya kazini" "Maagizo na usaidizi kwa kutamka" "Programu ya usaidizi" "Ungetaka kuweka %s kuwa mratibu wako?" @@ -3519,11 +3519,11 @@ "Kataa" "Chagua kuweka data kwa kutamka" "Programu ya kivinjari" - "Hakuna Kivinjari chaguo msingi" + "Hakuna Kivinjari chaguomsingi" "Programu ya simu" - "(Chaguo msingi)" + "(Chaguomsingi)" "(Mfumo)" - "(Programu chaguo msingi ya mfumo)" + "(Programu chaguomsingi ya mfumo)" "Hifadhi ya programu" "Kufikia matumizi" "Idhinisha ufikiaji wa matumizi" @@ -3711,7 +3711,7 @@ "Iweke katika hali tuli baada ya dakika 10 za kutokuwa na shughuli" "Takriban %1$s kati ya %2$s za hifadhi zimetumika" "Umeingia katika akaunti ukitumia %1$s" - "%1$s ni chaguo msingi" + "%1$s ni chaguomsingi" "Imewashwa" "Imezimwa" "Kipengee cha kuhifadhi nakala kimezimwa" @@ -3842,7 +3842,7 @@ "Matumizi ya data bila vikwazo" "Ruhusu ufikiaji wa data bila vikwazo wakati Kiokoa Data kimewashwa" "Programu ya ukurasa wa mwanzo" - "Hakuna mipangilio chaguo msingi ya Mwanzo" + "Hakuna mipangilio chaguomsingi ya Mwanzo" "Uanzishaji salama" "Weka mchoro ili kuwasha kifaa chako. Kifaa hiki hakiwezi kupokea simu, ujumbe, arifa wala kengele kikiwa kimezimwa." "Weka PIN ili kuwasha kifaa chako. Kifaa hiki hakiwezi kupokea simu, ujumbe, arifa wala kengele kikiwa kimezimwa." @@ -3856,7 +3856,7 @@ "Izime sasa" "Haitumii kipengele cha kuboresha matumizi ya betri" "Ikiwa kifaa kimefungwa, usiruhusu uchapaji wa majibu au maandishi mengine kwenye arifa" - "Kikagua maendelezo chaguo msingi" + "Kikagua maendelezo chaguomsingi" "Chagua kikagua maendelezo" "Tumia kikagua maendelezo" "Hakijachaguliwa" @@ -3885,7 +3885,7 @@ "hifadhi inayoshirikiwa katika Android" "sauti" "tetema" - "chaguo msingi" + "chaguomsingi" "hamna" "Haina kipengele cha kuorodhesha." "Kipengele cha kuorodhesha hakina ufunguo huu." @@ -4023,7 +4023,7 @@ Programu %d Programu %d - "Kibodi chaguo msingi" + "Kibodi chaguomsingi" "Weka kuwa %s" "VPN iwe imewashwa kila wakati" "Kila mara VPN iwe imewashwa kwenye wasifu wako wa binafsi" @@ -4086,7 +4086,7 @@ "otomatiki, jaza, kujaza kiotomatiki" "<b>Hakikisha kuwa unaamini programu hii</b> <br/> <br/> <xliff:g id=app_name example=Google Autofill>%1$s</xliff:g> hutumia kilicho kwenye skrini yako kubaini kinachoweza kujazwa kiotomatiki." "Mandhari ya rangi" - "Chaguo msingi" + "Chaguomsingi" "Mandhari ya kifaa" "Otomatiki (kulingana na mandhari)" "Meupe" diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index fbadb7f8a2d..8437eb963d2 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -1068,7 +1068,7 @@ "இயற்கை வண்ணம்" "பூஸ்ட் செய்யப்பட்டது" "சாச்சுரேட் ஆனது" - "தானியங்கு" + "அடாப்டிவ்" "துல்லியமான வண்ணங்களை மட்டும் பயன்படுத்து" "பளிச்சென்ற மற்றும் துல்லியமான வண்ணங்களுக்கு இடையே சரிசெய்யும்" "டேப்லெட்டைச் சுழற்றும்போது திசையமைவையும் தானாக மாற்று" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 33c15ea9fca..03b771dc171 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -1068,7 +1068,7 @@ "సహజం" "అభివృద్ధిపరచబడింది" "స్యాచురేటేడ్" - "ఆటోమేటిక్" + "అనుకూల" "ఖచ్చితమైన రంగులను మాత్రమే ఎంచుకోండి" "ప్రకాశవంతమైన మరియు ఖచ్చితమైన రంగులలో నచ్చినది ఎంచుకోండి" "టాబ్లెట్ తిప్పుతున్నప్పుడు దృగ్విన్యాసాన్ని స్వయంచాలకంగా మార్చు" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index a33fa246be4..7431e830581 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -1068,7 +1068,7 @@ "ธรรมชาติ" "บูสต์" "อิ่มตัว" - "อัตโนมัติ" + "ปรับอัตโนมัติ" "ใช้สีที่ตรงตามจริงเท่านั้น" "ปรับระหว่างสีที่สดใสและสีที่ตรงตามจริง" "เปลี่ยนการวางแนวโดยอัตโนมัติเมื่อหมุนแท็บเล็ต" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index feb9c819d3a..202a9defbf0 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -1068,7 +1068,7 @@ "Natural" "Naka-boost" "Saturated" - "Awtomatiko" + "Adaptive" "Gumamit lang ng mga tumpak na kulay" "I-adjust sa pagitan ng mga matingkad at tumpak na kulay" "Awtomatikong ilipat ang oryentasyon kapag iniikot ang tablet" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 7a10d936be3..6f6c7821fe1 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -1068,7 +1068,7 @@ "Doğal" "Zenginleştirilmiş" "Doygunluğu Artırılmış" - "Otomatik" + "Uyarlanan" "Yalnızca doğru renkleri kullan" "Canlı ve doğru renkler arasında ayarlama yapın" "Tableti döndürürken yönü otomatik değiştir" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index e306c625bc0..887bc81041d 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -1092,7 +1092,7 @@ "Природний" "Насичений" "Яскравий" - "Автоматично" + "Адаптивний колір" "Використовувати лише точно відтворені кольори" "Налаштуйте яскравість і точність відтворення кольорів" "Автомат. переключ. орієнтацію під час обертання пристрою" diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index c256890f568..9840bd0aab5 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -1068,7 +1068,7 @@ "قدرتی" "بڑھایا گیا" "سیچوریٹ کردہ" - "خودکار" + "تغیر پذیر" "صرف درست رنگوں کا استعمال کریں" "بھڑکیلے اور درست رنگوں کے بیچ ایڈجسٹ کریں" "ٹیبلٹ گھماتے وقت سمت بندی کو خود کار طور پر سوئچ کریں" diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index 31d3a7f7d89..2a6608f3253 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -1068,7 +1068,7 @@ "Tabiiy" "Yorqin" "To‘yingan" - "Avtomatik" + "Moslashuvchan" "Faqat tabiiy ranglar" "To‘yingan va tabiiy ranglar orasidagi o‘rtaliq" "Planshet aylantirilganda ekran joylashuvini avtomatik almashtirish" @@ -1442,7 +1442,7 @@ "Bekor qilish" "Nom to‘ldirilmagan bo‘lolmaydi." - "APN to‘ldirilishi shart" + "APN kiritilishi shart" "MCC 3 ta raqamdan iborat bo‘lishi shart." "MNC 2 yoki 3 ta raqamdan iborat bo‘lishi shart." "Aloqa operatori bunday turdagi APN (%s) qo‘shishni taqiqlagan." diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index c22e8b6e888..4463c282bac 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -1068,7 +1068,7 @@ "Tự nhiên" "Tăng độ nét" "Bão hòa" - "Tự động" + "Thích ứng" "Chỉ sử dụng màu chính xác" "Điều chỉnh giữa màu rực rỡ và màu chính xác" "Tự động chuyển hướng khi xoay máy tính bảng" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index bc141937cb7..8bf6eeeb34c 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -1068,7 +1068,7 @@ "自然色" "效果增强" "饱和色" - "自动" + "自动调节" "仅使用准确色彩" "在鲜明和准确色彩之间进行调整" "旋转平板电脑时自动改变浏览模式" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index f3e973b384b..f8621fd1133 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -1068,7 +1068,7 @@ "自然" "強化" "飽和" - "自動" + "自動調整" "僅使用準確的色彩" "在鮮明與準確的色彩之間作出調整" "旋轉平板電腦時自動切換瀏覽模式" @@ -1987,7 +1987,7 @@ "開啟" "關閉" - "運作唔到。撳一下就可以睇到相關資料。" + "運作唔到。㩒一下就可以睇到相關資料。" "呢個服務出現故障。" "在「快速設定」中顯示" "校正模式" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index d5e2e6726d6..55c9fb3ba72 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -1068,7 +1068,7 @@ "自然" "增強" "飽和" - "自動" + "自動調整" "僅使用準確的色彩" "在鮮明與準確的色彩間進行調整" "旋轉平板電腦時自動切換瀏覽模式" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 3eef7944bdd..cf7b7667c18 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -1068,7 +1068,7 @@ "Kwemvelo" "I-Boost" "Ukugcwaliswa kwesikhala" - "Okuzenzekelayo" + "Okungaguqula" "Sebenzisa imibala enembile kuphela" "Lungisa phakathi kwemibala ekhanya kakhulu nenembile" "Shintsha ukujikeleleza ngokuzenzakalela lapho ujikelezisa ithebhulethi" -- GitLab From 5e8005db4250e991dbd1fe2c990357b5bf1f3459 Mon Sep 17 00:00:00 2001 From: Matthew Fritze Date: Mon, 2 Jul 2018 11:22:59 -0700 Subject: [PATCH 17/24] Conditionally block battery percantage from search The PowerUsageSummary fragment doesn't use the regular pattern of a static method to build preference controllers, which can be accessed by both DashboardFragment and BaseSearchIndexProvider, because it depends on the Activity & Fragment in the creation of the preference controllers. The correct & long-term solution here would be to move those dependencies out of the getPreferenceControllers method, such that the we could use a static buildPreferenceControllers method, as seen in DisplaySettings.java. In the mean time, we know that BatteryPercentagePrefController should not show up on devices, so we conditionally add the the preference controller's into getNonIndexableKeys method based on controller Availability, which BasePreferenceController normally does automatically with a getPreferenceController method in the host fragment's SEARCH_INDEX_DATA_PROVIDER. Since this is a short-term solution, it should not be merged into master, and thus I am not marking the bug as fixed. Bug: 110894466 Test: Robotests Change-Id: I06f814571d0b72fbf020dd11a9d23a9eb9907bfd Merged-In: I5993d332dbd218c981ef5432aebb735d0000f67a --- .../settings/fuelgauge/PowerUsageSummary.java | 6 ++++ .../fuelgauge/PowerUsageSummaryTest.java | 30 +++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index e4f7a726c17..eec2008021e 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -472,6 +472,12 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList @Override public List getNonIndexableKeys(Context context) { List niks = super.getNonIndexableKeys(context); + + final BatteryPercentagePreferenceController controller = + new BatteryPercentagePreferenceController(context); + if (!controller.isAvailable()) { + niks.add(controller.getPreferenceKey()); + } niks.add(KEY_BATTERY_SAVER_SUMMARY); return niks; } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java index 07341a14656..8e7edf310d8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -35,6 +35,7 @@ import static org.mockito.Mockito.when; import android.app.LoaderManager; import android.content.Context; import android.content.Intent; +import android.content.res.Resources; import android.os.Bundle; import android.util.SparseArray; import android.view.Menu; @@ -49,6 +50,7 @@ import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.applications.LayoutPreference; import com.android.settings.dashboard.SummaryLoader; +import com.android.settings.display.BatteryPercentagePreferenceController; import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController; import com.android.settings.testutils.FakeFeatureFactory; @@ -390,6 +392,34 @@ public class PowerUsageSummaryTest { .isEqualTo("3% - Phone will shut down soon"); } + @Test + public void percentageSettingAvailable_shouldNotBeHiddenInSearch() { + final Resources resources = spy(mRealContext.getResources()); + doReturn(true).when(resources).getBoolean(anyInt()); + doReturn(resources).when(mRealContext).getResources(); + final String prefKey = new BatteryPercentagePreferenceController(mRealContext) + .getPreferenceKey(); + + final List nonIndexableKeys = + PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mRealContext); + + assertThat(nonIndexableKeys).doesNotContain(prefKey); + } + + @Test + public void percentageSettingNotAvailable_shouldBeHiddenInSearch() { + final Resources resources = spy(mRealContext.getResources()); + doReturn(false).when(resources).getBoolean(anyInt()); + doReturn(resources).when(mRealContext).getResources(); + final String prefKey = new BatteryPercentagePreferenceController(mRealContext) + .getPreferenceKey(); + + final List nonIndexableKeys = + PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mRealContext); + + assertThat(nonIndexableKeys).contains(prefKey); + } + public static class TestFragment extends PowerUsageSummary { private Context mContext; -- GitLab From f9429262d2350f7538277b88260219081a52aeb8 Mon Sep 17 00:00:00 2001 From: Pavel Grafov Date: Tue, 3 Jul 2018 20:31:42 +0100 Subject: [PATCH 18/24] Use primary user's LOCK_SCREEN_SHOW_NOTIFICATIONS. Only primary user can set LOCK_SCREEN_SHOW_NOTIFICATIONS, profile can only set notifications to be redacted. When the user changes notification settings for a work app, this class is invoked from the profile, meaning it attempts to read LOCK_SCREEN_SHOW_NOTIFICATIONS for the profile, which is not there. As a result the function always returs 0 for work apps. Bug: 111112011 Test: atest packages/apps/Settings/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java Change-Id: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad Merged-In: Ifb50209ea8ea8fb6639f00ca8b7cf8a4295890ad (cherry picked from commit f14de789f4cc7d145e6011e5a5562876e25c3f31) --- .../VisibilityPreferenceController.java | 6 +++-- .../VisibilityPreferenceControllerTest.java | 25 +++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/notification/VisibilityPreferenceController.java b/src/com/android/settings/notification/VisibilityPreferenceController.java index dac90ef7be7..8dc802ccdd0 100644 --- a/src/com/android/settings/notification/VisibilityPreferenceController.java +++ b/src/com/android/settings/notification/VisibilityPreferenceController.java @@ -147,8 +147,10 @@ public class VisibilityPreferenceController extends NotificationPreferenceContro } private boolean getLockscreenNotificationsEnabled() { - return Settings.Secure.getInt(mContext.getContentResolver(), - Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0) != 0; + final UserInfo parentUser = mUm.getProfileParent(UserHandle.myUserId()); + final int primaryUserId = parentUser != null ? parentUser.id : UserHandle.myUserId(); + return Settings.Secure.getIntForUser(mContext.getContentResolver(), + Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0, primaryUserId) != 0; } private boolean getLockscreenAllowPrivateNotifications() { diff --git a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java index e37c852277f..fbc251206dc 100644 --- a/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/notification/VisibilityPreferenceControllerTest.java @@ -208,6 +208,31 @@ public class VisibilityPreferenceControllerTest { .contains(String.valueOf(VISIBILITY_PRIVATE))); } + @Test + public void testUpdateState_noLockScreenNotificationsGloballyInProfile() { + final int primaryUserId = 2; + final UserInfo primaryUserInfo = new UserInfo(primaryUserId, "user 2", 0); + when(mUm.getProfileParent(anyInt())).thenReturn(primaryUserInfo); + + Settings.Secure.putIntForUser(mContext.getContentResolver(), + Settings.Secure.LOCK_SCREEN_SHOW_NOTIFICATIONS, 0, primaryUserId); + + NotificationBackend.AppRow appRow = new NotificationBackend.AppRow(); + NotificationChannel channel = mock(NotificationChannel.class); + mController.onResume(appRow, channel, null, null); + + RestrictedListPreference pref = mock(RestrictedListPreference.class); + mController.updateState(pref); + + ArgumentCaptor argumentCaptor = + ArgumentCaptor.forClass(CharSequence[].class); + verify(pref, times(1)).setEntryValues(argumentCaptor.capture()); + assertFalse(toStringList(argumentCaptor.getValue()) + .contains(String.valueOf(VISIBILITY_NO_OVERRIDE))); + assertFalse(toStringList(argumentCaptor.getValue()) + .contains(String.valueOf(VISIBILITY_PRIVATE))); + } + @Test public void testUpdateState_noPrivateLockScreenNotificationsGlobally() { Settings.Secure.putInt(mContext.getContentResolver(), -- GitLab From e338a41dac86f4ea28d927208d2d525a67e7575e Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Wed, 4 Jul 2018 21:09:50 -0700 Subject: [PATCH 19/24] Import translations. DO NOT MERGE Auto-generated-cl: translation import Bug: 64712476 Change-Id: Id2d2fbe5bc2473fa6de24605fc5dbef0ae4e626f --- res/values-bs/arrays.xml | 10 +++++----- res/values-bs/strings.xml | 14 +++++++------- res/values-gl/strings.xml | 2 +- res/values-hy/arrays.xml | 4 ++-- res/values-ja/strings.xml | 6 +++--- res/values-ne/strings.xml | 6 +++--- res/values-pt-rBR/strings.xml | 4 ++-- res/values-pt/strings.xml | 4 ++-- res/values-ru/strings.xml | 2 +- res/values-sw/arrays.xml | 8 ++++---- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml index f5ab2676aaf..a869cfa8956 100644 --- a/res/values-bs/arrays.xml +++ b/res/values-bs/arrays.xml @@ -72,7 +72,7 @@ "Autentifikacija…" "Dobivanje IP adrese…" "Povezano" - "Suspendiran" + "Suspendirano" "Prekidanje veze…" "Isključen" "Neuspješno" @@ -83,11 +83,11 @@ "Skeniranje…" "Povezivanje na mrežu %1$s..." - "Autentifikacija sa mrežom %1$s…" + "Autentifikacija s mrežom %1$s…" "Dobivanje IP adrese iz mreže %1$s…" - "Povezan na mrežu %1$s" - "Suspendiran" - "Prekidanje veze sa mrežom %1$s…" + "Povezano na mrežu %1$s" + "Suspendirano" + "Prekidanje veze s mrežom %1$s…" "Isključen" "Neuspješno" "Blokirano" diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 05099edb036..e90126d18ee 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -67,7 +67,7 @@ "Isključena" "Povezivanje" "Povezano" - "Suspendiran" + "Suspendirano" "Nepoznato" "paketi" "bajtova" @@ -697,8 +697,8 @@ "Kontakti i historija poziva" "Upariti sa ovim uređajem?" "Podijeliti telefonski imenik?" - "%1$s želi pristupiti vašim kontaktima i istoriji poziva." - "Uređaj %1$s želi uparivanje putem Bluetootha. Nakon povezivanja imat će pristup vašim kontaktima i istoriji poziva." + "%1$s želi pristupiti vašim kontaktima i historiji poziva." + "Uređaj %1$s želi uparivanje putem Bluetootha. Nakon povezivanja imat će pristup vašim kontaktima i historiji poziva." "Upareni uređaji" "Dostupni uređaji" "Nema dostupnih uređaja" @@ -1508,11 +1508,11 @@ "Povezivanje mobitela USB-om" "Prijenosna pristupna tačka" "Dijeljenje Bluetooth veze" - "Dijeljenje veze" + "Povezivanje putem mobitela" "Pristupna tačka i povezivanje putem mobitela" "Pristupna tačka je uključena, veza se dijeli" "Pristupna tačka je uključena" - "Dijeljenje veze" + "Povezivanje putem mobitela" "Dok je upaljena Ušteda podataka nije moguće povezati uređaj niti koristiti prijenosne pristupne tačke" "USB" "Dijeljenje USB veze" @@ -1867,7 +1867,7 @@ "Pritisnite tipku za razmak dva puta kako biste umetnuli \".\"" "Prikaži lozinke" "Kratko prikaži znakove dok se upisuju" - "Ovaj alat za provjeru pravopisa u mogućnosti je da prikuplja sav tekst koji otkucate, uključujući lične podatke kao što su lozinke i brojevi kreditnih kartica. Alat je omogućila aplikacija %1$s. Da li želite koristiti ovaj alat za provjeru pravopisa?" + "Ovaj alat za provjeru pravopisa u mogućnosti je da prikuplja sav tekst koji upišete, uključujući lične podatke kao što su lozinke i brojevi kreditnih kartica. Alat je omogućila aplikacija %1$s. Da li želite koristiti ovaj alat za provjeru pravopisa?" "Postavke" "Jezik" "Tastature i načini unosa" @@ -3570,7 +3570,7 @@ "Aplikacija preglednika" "Nema zadanog pretraživača" "Aplikacija za pozive" - "(Zadano)" + "(zadano)" "(Sistem)" "(Sistemski zadano)" "Pohrana aplikacija" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 87ad17c7233..47ed64ff7e9 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -3899,7 +3899,7 @@ 1 aplicación pode usar datos sen restricións "Seguro que queres limpar os datos de usuario e cambiar á encriptación baseada en ficheiros?" - "Limpar e converter" + "Borrar e converter" "Restablecer o límite de velocidade de ShortcutManager" "Restableceuse o límite de velocidade de ShortcutManager" "Información de control sobre a pantalla de bloqueo" diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml index 05ba3060944..25df77bc984 100644 --- a/res/values-hy/arrays.xml +++ b/res/values-hy/arrays.xml @@ -296,7 +296,7 @@ "ակտիվացնել VPN-ը" "պաստառների պահում" "օժանդակ կառույց" - "օժանդակ էկրանի պատկեր" + "օժանդակ սքրինշոթ" "կարդալ հեռախոսի վիճակի տվյալները" "ավելացնել ձայնային փոստ" "օգտագործել sip-ը" @@ -363,7 +363,7 @@ "Ակտիվացնել VPN-ը" "Պաստառների պահում" "Օժանդակ կառույց" - "Օժանդակ էկրանի պատկեր" + "Օժանդակ սքրինշոթ" "Կարդալ հեռախոսի վիճակի տվյալները" "Ավելացնել ձայնային փոստ" "Օգտագործել sip-ը" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 3712c61faf4..4eb7c88b3a1 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -2116,7 +2116,7 @@ "バックグラウンド アクティビティの制限" "アプリのバックグラウンド アクティビティを制限すると、アプリが正常に機能しないことがあります" "このアプリは、電池の最適化が設定されていないため、制限することはできません。\n\nこのアプリを制限するには、電池の最適化を ON にしてください。" - "フル充電以降の画面の電池使用状況" + "フル充電時の使用可能時間" "画面消費" "モバイル ネットワークのスキャン" "フル充電以降の電池使用" @@ -2308,7 +2308,7 @@ "電池使用量全体の %1$s" "前回のフル充電以降の内訳" "前回のフル充電" - "フル充電での推定使用時間" + "フル充電での推定待ち受け可能時間" "電池の使用状況データは概算値であり、使用状況によって変わります" "アクティブ時" "バックグラウンド時" @@ -4150,7 +4150,7 @@ "バイブレーション" "ミュート" "何もしない" - "ON（バイブ）" + "ON（バイブレーション）" "ON（ミュート）" "OFF" "ネットワークの詳細" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 81f6f4fc7b1..eea73afc8bc 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -241,7 +241,7 @@ "HTTP क्लाइन्टको परीक्षण:" "पिङ सम्बन्धी परीक्षण सञ्चालन गर्नुहोस्" "SMSC:" - "अपडेट गर्नुहोस्" + "अद्यावधिक गर्नुहोस्" "पुनःताजा गर्नुहोस्" "DNS को जाँचलाई टगल गर्नुहोस्" "OEM-विशिष्ट जानकारी/सेटिङहरू" @@ -1955,8 +1955,8 @@ "लक स्क्रिनबाट अनुमति दिनुहोस्" "सर्टकट सक्रिय हुँदा पहुँचसम्बन्धी सुविधा सुरु गर्न तपाईं दुवै भोल्युम कुञ्जीहरूलाई ३ सेकेन्डसम्म थिच्न सक्नुहुन्छ।" "उच्च विपरीत पाठ" - "स्क्रिन आवर्धन स्वतः अपडेट गर्नुहोस्" - "अनुप्रयोग ट्रान्जिसनहरूमा स्क्रिन आवर्धन अपडेट गर्नुहोस्" + "स्क्रिन आवर्धन स्वतः अद्यावधिक गर्नुहोस्" + "अनुप्रयोग ट्रान्जिसनहरूमा स्क्रिन आवर्धन अद्यावधिक गर्नुहोस्" "पावर बटनले कल समाप्त गर्दछ" "ठूलो माउस पोइन्टर" "एनिमेसनहरू हटाउनुहोस्" diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 1fad269cc13..593f5275120 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -3198,11 +3198,11 @@ "Mostrar todo o conteúdo das notificações" "Ocultar conteúdo confidencial" "Não mostrar notificações" - "Quando o dispositivo estiver bloqueado, como você deseja que as notificações sejam exibidas?" + "Quando o dispositivo estiver bloqueado, como você quer que as notificações sejam exibidas?" "Notificações" "Mostrar todo o conteúdo de notificação de trabalho" "Ocultar conteúdo de trabalho confidencial" - "Como você deseja que as notificações sejam exibidas quando o dispositivo estiver bloqueado?" + "Como você quer que as notificações sejam exibidas quando o dispositivo estiver bloqueado?" "Notificações do perfil" "Notificações" "Notificações de apps" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 1fad269cc13..593f5275120 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -3198,11 +3198,11 @@ "Mostrar todo o conteúdo das notificações" "Ocultar conteúdo confidencial" "Não mostrar notificações" - "Quando o dispositivo estiver bloqueado, como você deseja que as notificações sejam exibidas?" + "Quando o dispositivo estiver bloqueado, como você quer que as notificações sejam exibidas?" "Notificações" "Mostrar todo o conteúdo de notificação de trabalho" "Ocultar conteúdo de trabalho confidencial" - "Como você deseja que as notificações sejam exibidas quando o dispositivo estiver bloqueado?" + "Como você quer que as notificações sejam exibidas quando o dispositivo estiver bloqueado?" "Notificações do perfil" "Notificações" "Notificações de apps" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index a07caa22561..5f5fc33e38d 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -2833,7 +2833,7 @@ Проверить сертификаты Проверить сертификаты - "Несколько пользователей" + "Пользователи" "Пользователи и профили" "Добавить пользователя или профиль" "Добавить пользователя" diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml index 7797fdda368..0a1630e631b 100644 --- a/res/values-sw/arrays.xml +++ b/res/values-sw/arrays.xml @@ -61,7 +61,7 @@     "Ndogo" - "Chaguo msingi" + "Chaguomsingi" "Kubwa" "Kubwa zaidi" @@ -385,7 +385,7 @@ "Muda mrefu"     - "Chaguo msingi" + "Chaguomsingi" "Sans-serif" "Sans-serif iliyofupishwa" "Sans-serif monospace" @@ -403,7 +403,7 @@ "Makubwa sana" - "Chaguo msingi" + "Chaguomsingi" "Hamna" "Mistari" "Angusha kivuli" @@ -417,7 +417,7 @@ "100%" - "Tumia programu chaguo msingi" + "Tumia programu chaguomsingi" "Nyeupe kwenye nyeusi" "Nyeusi kwenye nyeupe" "Manjano kwenye nyeusi" -- GitLab From 78c3f368c3a64197dee84df24547449220d36e2a Mon Sep 17 00:00:00 2001 From: Salvador Martinez Date: Mon, 9 Jul 2018 11:52:34 -0700 Subject: [PATCH 20/24] Fix incorrect method call to wifiManager in Tether In the WifiTetherApBandController the incorrect method was being called to check if the device is 5Ghz compatible. We were calling is5GhzBandSupported directly, but we were supposed to call isDualBandSupported instead. Test: robotests updated Bug: 110793581 Change-Id: I61d3ff10abedde6196b8e29591ebfd3272dbbcd9 --- .../WifiTetherApBandPreferenceController.java | 2 +- .../WifiTetherApBandPreferenceControllerTest.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java index 2624c736327..1eda72d7bae 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceController.java @@ -103,7 +103,7 @@ public class WifiTetherApBandPreferenceController extends WifiTetherBasePreferen // 3: With Dual mode support we can't have AP_BAND_5GHZ - default to ANY if (!isDualMode && WifiConfiguration.AP_BAND_ANY == band) { return WifiConfiguration.AP_BAND_5GHZ; - } else if (!mWifiManager.is5GHzBandSupported() && WifiConfiguration.AP_BAND_5GHZ == band) { + } else if (!is5GhzBandSupported() && WifiConfiguration.AP_BAND_5GHZ == band) { return WifiConfiguration.AP_BAND_2GHZ; } else if (isDualMode && WifiConfiguration.AP_BAND_5GHZ == band) { return WifiConfiguration.AP_BAND_ANY; diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java index 8df62c3c02e..c9a9c0040ec 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherApBandPreferenceControllerTest.java @@ -104,6 +104,7 @@ public class WifiTetherApBandPreferenceControllerTest { @Test public void display_5GhzNotSupported_shouldDisable() { + when(mWifiManager.getCountryCode()).thenReturn("US"); when(mWifiManager.isDualBandSupported()).thenReturn(false); mController.displayPreference(mScreen); @@ -115,7 +116,8 @@ public class WifiTetherApBandPreferenceControllerTest { @Test public void changePreference_noDualModeWith5G_shouldUpdateValue() { - when(mWifiManager.is5GHzBandSupported()).thenReturn(true); + when(mWifiManager.getCountryCode()).thenReturn("US"); + when(mWifiManager.isDualBandSupported()).thenReturn(true); mController.displayPreference(mScreen); @@ -141,7 +143,8 @@ public class WifiTetherApBandPreferenceControllerTest { @Test public void changePreference_dualModeWith5G_shouldUpdateValue() { - when(mWifiManager.is5GHzBandSupported()).thenReturn(true); + when(mWifiManager.getCountryCode()).thenReturn("US"); + when(mWifiManager.isDualBandSupported()).thenReturn(true); when(mWifiManager.isDualModeSupported()).thenReturn(true); mController.displayPreference(mScreen); @@ -167,14 +170,16 @@ public class WifiTetherApBandPreferenceControllerTest { @Test public void updateDisplay_shouldUpdateValue() { + when(mWifiManager.getCountryCode()).thenReturn("US"); + when(mWifiManager.isDualBandSupported()).thenReturn(true); + // Set controller band index to 1 and verify is set. - when(mWifiManager.is5GHzBandSupported()).thenReturn(true); mController.displayPreference(mScreen); mController.onPreferenceChange(mPreference, "1"); assertThat(mController.getBandIndex()).isEqualTo(1); // Disable 5Ghz band - when(mWifiManager.is5GHzBandSupported()).thenReturn(false); + when(mWifiManager.isDualBandSupported()).thenReturn(false); // Call updateDisplay and verify it's changed. mController.updateDisplay(); -- GitLab From 11ebb14241926997cad7ea4c9b8c5734bc0e9864 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Tue, 10 Jul 2018 22:28:21 -0700 Subject: [PATCH 21/24] Import translations. DO NOT MERGE Auto-generated-cl: translation import Bug: 64712476 Change-Id: Id9deb2f66c09d1b17c35d8226673768d40d7eef7 --- res/values-ar/strings.xml | 2 +- res/values-ca/strings.xml | 4 ++-- res/values-da/strings.xml | 12 ++++++------ res/values-fa/strings.xml | 2 +- res/values-nl/strings.xml | 6 +++--- res/values-ta/arrays.xml | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 1166075bc69..9a9b70c2293 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -1292,7 +1292,7 @@ "الشبكة" "‏عنوان Mac لشبكة Wi-Fi" "عنوان البلوتوث" - "الرقم المسلسل" + "الرقم المتسلسل" "وقت التشغيل" "وقت الوضع النشط" "وحدة التخزين الداخلية" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 9358edec38b..f314c3b4750 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -1714,8 +1714,8 @@ "Serveis en execució" "Processos a la memòria cau" "Aplicació en casos d\'emergència" - "Restableix preferències d\'aplicacions" - "Restablir preferències d\'aplicacions?" + "Restableix les preferències d\'aplicacions" + "Restablir les preferències d\'aplicacions?" "Es restabliran les preferències de:\n\n "
  • "Aplicacions desactivades"
    • \n" "
  • "Notificacions d\'aplicacions desactivades"
    • \n" "
  • "Aplicacions predeterminades"
    • \n" "
  • "Restriccions de dades en segon pla d\'aplicacions"
    • \n" "
  • "Restriccions de permisos"
    • \n\n" No es perdran les dades de les aplicacions."     "Restableix aplicacions" "Gestiona l\'espai" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 12bb74041e2..e66a6f231ac 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -78,8 +78,8 @@ "Demonter SD-kort" "Slet USB-lager" "Formatér SD-kort" - "Eksempelvisning" - "Eksempelvisning af skærm %1$d af %2$d" + "Forhåndsvisning" + "Forhåndsvisning af skærm %1$d af %2$d" "Gør teksten på skærmen mindre eller større." "Formindsk" "Forstør" @@ -1078,7 +1078,7 @@ "Lysstyrke" "Lysstyrke" "Juster skærmens lysstyrke" - "Tilpasset lysstyrke" + "Automatisk lysstyrke" "Optimer lysstyrken til det omgivende lys" "Fra" "Den foretrukne lysstyrke er meget lav" @@ -1096,7 +1096,7 @@ "Undlad at justere i forhold til det omgivende lys" "Øget batteriforbrug" "Optimer lysstyrken til det omgivende lys. Når denne funktion er slået til, kan du stadig justere lysstyrken midlertidigt." - "Skærmens lysstyrke tilpasses automatisk på baggrund af dine omgivelser og dine aktiviteter. Du kan flytte skyderen manuelt for at hjælpe Tilpasset lysstyrke med at lære dine præferencer." + "Skærmens lysstyrke tilpasses automatisk på baggrund af dine omgivelser og dine aktiviteter. Du kan flytte skyderen manuelt for at hjælpe Automatisk lysstyrke med at lære dine præferencer." "Nattelys" "Med Nattelys er farvetonen på skærmen gul. Det gør din skærm mere behagelig at se på i svag belysning og kan gøre det nemmere at falde i søvn." "Planlæg" @@ -2022,7 +2022,7 @@ "Indstillinger" "Til" "Fra" - "Eksempelvisning" + "Forhåndsvisning" "Standardindstillinger" "Sprog" "Tekststørrelse" @@ -3681,7 +3681,7 @@ "Gør elementerne på skærmen større eller mindre" "visningstæthed, zoom på skærmen, skala, skalering" "Gør elementerne på skærmen mindre eller større. Visse apps på din skærm ændrer muligvis placering." - "Eksempelvisning" + "Forhåndsvisning" "Formindsk" "Forstør" "A" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 1cc413d1059..f68fefc4624 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -2066,7 +2066,7 @@ "با ضربه زدن به تأیید، %1$s متوقف خواهد شد." "سرویسی نصب نشده است" "سرویسی انتخاب نشده است" - "توضیحی ارائه نشده است." + "شرحی ارائه نشده است." "تنظیمات" "چاپ کردن" "خاموش" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 4b2b8bf5699..0202d63ccac 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -2029,11 +2029,11 @@ "Ondertitelstijl" "Aangepaste opties" "Achtergrondkleur" - "Transparantie van achtergrond" + "Ondoorzichtigheid van achtergrond" "Kleur ondertitelingsvenster" - "Transparantie ondertitelingsvenster" + "Ondoorzichtigheid ondertitelingsvenster" "Tekstkleur" - "Transparantie van tekst" + "Ondoorzichtigheid van tekst" "Randkleur" "Randtype" "Lettertypefamilie" diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml index 415902cf564..d9f8b001a21 100644 --- a/res/values-ta/arrays.xml +++ b/res/values-ta/arrays.xml @@ -67,7 +67,7 @@     - "ஸ்கேன் செய்கிறது…" + "தேடுகிறது..." "இணைக்கிறது..." "அங்கீகரிக்கிறது..." "IP முகவரியைப் பெறுகிறது…" @@ -81,7 +81,7 @@ - "ஸ்கேன் செய்கிறது…" + "தேடுகிறது..." "%1$s இல் இணைக்கிறது…" "%1$s உடன் அங்கீகரிக்கிறது…" "%1$s இலிருந்து IP முகவரியைப் பெறுகிறது…" -- GitLab From 1b3985010ddd87c0f165069c19285bbc5ac7ee94 Mon Sep 17 00:00:00 2001 From: Hall Liu Date: Tue, 12 Jun 2018 15:20:50 -0700 Subject: [PATCH 22/24] Fix usage of SubscriptionInfo ctor Use string arguments instead of ints for mcc/mnc Bug: 35064313 Test: manual, unit Change-Id: Ib460d6294d8fb86de7c2fee065defb0a890af15a (cherry picked from commit 02c5f3c7acb1fd6a33168fc299411eb46bf42685) --- .../datausage/DataUsageSummaryPreferenceControllerTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java index 9e5a2b7472a..2a85d2d3288 100644 --- a/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceControllerTest.java @@ -324,7 +324,7 @@ public class DataUsageSummaryPreferenceControllerTest { mActivity, null, null, null); final SubscriptionInfo subInfo = new SubscriptionInfo(0, "123456", 0, "name", "carrier", - 0, 0, "number", 0, null, 123, 456, "ZX"); + 0, 0, "number", 0, null, "123", "456", "ZX"); when(mSubscriptionManager.getDefaultDataSubscriptionInfo()).thenReturn(subInfo); assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); } -- GitLab From 20e7c9d0bae10537bb26510a42389196bcd188ed Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Fri, 13 Jul 2018 12:32:00 -0700 Subject: [PATCH 23/24] DO NOT MERGE Fix summary text for advanced button. - the resource for the summary text is in the support library. However, the prebuilt version in the build does not contain the latest change for the summary text. Add the overlay for the summary resource here with the updated translation to remove the redundant summary prefix in the advanced button. Change-Id: Ib6db0c402d79a2d965e6060b1851d7b898ae3f94 Fixes: 111195268 Test: manual --- res/values-zh-rCN/strings.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 8bf6eeeb34c..0db1605605a 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -4152,4 +4152,5 @@ "网络详情" "您的设备名称会显示在手机上的应用中。此外，当您连接到蓝牙设备或设置 WLAN 热点时，其他人可能也会看到您的设备名称。" "设备" + "%1$s、%2$s" -- GitLab From 0a8de9d763f460cba5f77e50375c95a70403d7f8 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 19 Jul 2018 19:35:10 -0700 Subject: [PATCH 24/24] Import translations. DO NOT MERGE Auto-generated-cl: translation import Bug: 64712476 Change-Id: I26fa1f1f72571d0541556649bf104446c9522830 --- res/values-bs/strings.xml | 2 +- res/values-es/strings.xml | 6 +++--- res/values-iw/strings.xml | 2 +- res/values-ky/strings.xml | 2 +- res/values-lt/strings.xml | 8 ++++---- res/values-mcc262-mnc02-ky/strings.xml | 2 +- res/values-pl/strings.xml | 2 +- res/values-th/strings.xml | 4 ++-- res/values-zh-rCN/strings.xml | 1 - 9 files changed, 14 insertions(+), 15 deletions(-) diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index e90126d18ee..2d4be9eb281 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -1218,7 +1218,7 @@ "ID opreme" "Verzija nemoduliranog opsega" "Verzija jezgre" - "Broj podverzije" + "Broj verzije" "Nije dostupno" "Status" "Status" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index a7e04972b1a..0afc3760eb7 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -2199,9 +2199,9 @@ "Esta aplicación puede utilizar la batería en segundo plano y provocar que te quedes sin batería antes de lo que pensabas." "Quitar" "Cancelar" - "Tus aplicaciones usan una cantidad normal de batería. Si consumieran demasiada, tu teléfono te recomendaría que realizaras algunas acciones.\n\nSi tienes poca batería, también puedes activar la función Ahorro de batería." - "Tus aplicaciones usan una cantidad normal de batería. Si consumieran demasiada, tu tablet te recomendaría que realizaras algunas acciones.\n\nSi tienes poca batería, también puedes activar la función Ahorro de batería." - "Tus aplicaciones usan una cantidad normal de batería. Si consumieran demasiada, tu dispositivo te recomendaría que realizaras algunas acciones.\n\nSi tienes poca batería, también puedes activar la función Ahorro de batería." + "Tus aplicaciones usan una cantidad normal de batería. Si consumieran demasiada, tu dispositivo te recomendaría medidas para evitarlo.\n\nSi te queda poca carga, también puedes activar Ahorro de batería." + "Tus aplicaciones usan una cantidad normal de batería. Si consumieran demasiada, tu dispositivo te recomendaría medidas para evitarlo.\n\nSi te queda poca carga, también puedes activar Ahorro de batería." + "Tus aplicaciones usan una cantidad normal de batería. Si consumieran demasiada, tu dispositivo te recomendaría medidas para evitarlo.\n\nSi te queda poca carga, también puedes activar Ahorro de batería." "Gestor de batería" "Gestionar aplicaciones automáticamente" "Limitar el consumo de batería de las aplicaciones que no utilices con frecuencia" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 0be617411e5..b0fcc5c1c16 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -3120,7 +3120,7 @@ "צליל ברירת המחדל להודעות" "צליל שסיפקה האפליקציה" "צליל ברירת המחדל להודעות" - "צליל ברירת המחדל להתראה" + "צליל לשעון מעורר" "הפעלת רטט גם עבור שיחות" "צלילים אחרים" "צלילים של לוח חיוג" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index f21bd557cdf..09ee09839f9 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -56,7 +56,7 @@ "IMS каттоосу: %1$s\nLTE аркылуу аудио чалуу: %2$s\nWiFi аркылуу аудио чалуу: %3$s\nВидео чалуу: %4$s\nUT интерфейс: %5$s" "Тейлөө аймагында" "Тейлөө аймагынын сыртында" - "Шашылыш чалуулар гана" + "Өзгөчө кырдаалда гана чалганга болот" "Радио өчүк" "Роуминг" "Роумингде эмес" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 8cfb52059a5..c054942773d 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -3576,7 +3576,7 @@ "Nėra užklausų dėl leidimų" "Visos programos" "Įdiegtos programos" - "Akimirksniu įkeliamos programėlės" + "Akimirksniu įkeliamos programos" "Asmeninės" "Darbas" "Programos: visos" @@ -4103,10 +4103,10 @@ "Nepasiekiamas įrenginiuose, kuriuose taik. operat. pasirink. ribojimas" "Norėdami įgalinti įrenginio apsaugos funkciją, paleiskite įrenginį iš naujo." "Iš viso pasiekiama: %1$s\n\nPaskutinį kartą vykdyta %2$s" - "Akimirksniu įkeliamos programėlės" + "Akimirksniu įkeliamos programos" "Atidaryti nuorodas programose, net jei jos neįdiegtos" - "Akimirksniu įkeliamos programėlės" - "„Android“ akimirksniu įkeliamų programėlių nuostatos" + "Akimirksniu įkeliamos programos" + "„Android“ akimirksniu įkeliamų programų nuostatos" "Įdiegtos programos" "Saugyklą dabar tvarko saugyklos valdytojas" "%1$s paskyros" diff --git a/res/values-mcc262-mnc02-ky/strings.xml b/res/values-mcc262-mnc02-ky/strings.xml index 12d5d6bcba7..f033c885b15 100644 --- a/res/values-mcc262-mnc02-ky/strings.xml +++ b/res/values-mcc262-mnc02-ky/strings.xml @@ -16,5 +16,5 @@ - \n\n" Өзгөчө кырдаалда Wi-Fi чалуу кызматынан чала албайсыз. Өзгөчө кырдаалда чалууга аракет кылганыңызда түзмөгүңүз автоматтык түрдө мобилдик тармакты пайдаланат. Өзгөчө кырдаалда чалууларды мобилдик тармак кармаган аймактарда гана аткара аласыз." + \n\n" Өзгөчө кырдаалда Wi-Fi аркылуу чала албайсыз. Өзгөчө кырдаалда чалууга аракет кылганыңызда түзмөгүңүз автоматтык түрдө мобилдик тармакты пайдаланат. Өзгөчө кырдаалда мобилдик тармак кармаган аймактарда гана чала аласыз." diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 7e0ce277fa0..70a754c2cdd 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -4006,7 +4006,7 @@ "Brak obiektu rankingu." "Obiekt rankingu nie zawiera takiego klucza." "Emuluj wyświetlacz z wycięciem" - "wycięcie wyświetlacza, rowek" + "wycięcie w ekranie, notch" "Brak" "Specjalny dostęp do aplikacji" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 7431e830581..651f1026a93 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -449,8 +449,8 @@ "การลงทะเบียนลายนิ้วมือไม่ทำงาน โปรดลองอีกครั้งหรือใช้นิ้วอื่น" "เพิ่มอีกหนึ่ง" "ถัดไป" - "นอกเหนือจากการปลดล็อกโทรศัพท์ คุณยังสามารถใช้ลายนิ้วมือเพื่อให้สิทธิ์การซื้อและการเข้าถึงแอปได้""เรียนรู้เพิ่มเติม" - " ตัวเลือกการล็อกหน้าจอปิดอยู่ หากต้องการเรียนรู้เพิ่มเติม ให้ติดต่อผู้ดูแลระบบขององค์กร ""รายละเอียดเพิ่มเติม"\n\n"คุณยังสามารถใช้ลายนิ้วมือเพื่ออนุญาตให้ซื้อและเข้าถึงแอป ""เรียนรู้เพิ่มเติม" + "นอกเหนือจากการปลดล็อกโทรศัพท์ คุณยังสามารถใช้ลายนิ้วมือเพื่อให้สิทธิ์การซื้อและการเข้าถึงแอปได้""ดูข้อมูลเพิ่มเติม" + " ตัวเลือกการล็อกหน้าจอปิดอยู่ หากต้องการดูข้อมูลเพิ่มเติม ให้ติดต่อผู้ดูแลระบบขององค์กร ""รายละเอียดเพิ่มเติม"\n\n"คุณยังสามารถใช้ลายนิ้วมือเพื่ออนุญาตให้ซื้อและเข้าถึงแอป ""ดูข้อมูลเพิ่มเติม" "ยกนิ้วขึ้น แล้วแตะเซ็นเซอร์อีกครั้ง" "คุณสามารถเพิ่มลายนิ้วมือได้ถึง %d ลาย" "คุณได้เพิ่มลายนิ้วมือถึงขีดจำกัดสูงสุดแล้ว" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 0db1605605a..8bf6eeeb34c 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -4152,5 +4152,4 @@ "网络详情" "您的设备名称会显示在手机上的应用中。此外，当您连接到蓝牙设备或设置 WLAN 热点时，其他人可能也会看到您的设备名称。" "设备" - "%1$s、%2$s" -- GitLab