From 263592e3dd2cba5769bdede8cc11244de94f4fd9 Mon Sep 17 00:00:00 2001 From: Arc Wang Date: Thu, 6 Jan 2022 10:58:58 +0800 Subject: [PATCH 01/15] Prevent side channel package installation enumeration From Android 11, apps need the permission QUERY_ALL_PACKAGES to probe existence of arbitrary installed packages. However, an Activity which declares android:scheme="package in intent-filter may be vulnerable and attacker app can use it to probe installed packages. This change add permission QUERY_ALL_PACKAGES to protect vulnerable Activity. Bug: 185477439 Test: Install POC and check if it can probe installed packages by each vulnerable Activity. Change-Id: I521545436102f72f2e0c5053e30fd03bd6bc756f --- AndroidManifest.xml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 4d3b6d0e3f9..1f9c9086c48 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1451,7 +1451,8 @@ + android:noHistory="true" + android:permission="android.permission.QUERY_ALL_PACKAGES"> @@ -1521,6 +1522,7 @@ @@ -1534,7 +1536,8 @@ + android:exported="true" + android:permission="android.permission.QUERY_ALL_PACKAGES"> @@ -1893,7 +1896,8 @@ + android:label="@string/usage_access_title" + android:permission="android.permission.QUERY_ALL_PACKAGES"> From 646e9e4ff8f75578b015f2d9d0633cf8a85b3bc8 Mon Sep 17 00:00:00 2001 From: Yuri Lin Date: Wed, 20 Apr 2022 15:49:05 -0400 Subject: [PATCH 02/15] Move REVIEW_PERMISSIONS_NOTIFICATION_STATE to Global from Secure This is a global setting that is not per-user, so adjusting it accordingly. Bug: 225373531 Test: manual Change-Id: I100cd53a5ffef6ce5f9a01e6add9465a00ceaeb5 --- .../applications/manageapplications/ManageApplications.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/applications/manageapplications/ManageApplications.java b/src/com/android/settings/applications/manageapplications/ManageApplications.java index 3eae8855959..062bfc576b2 100644 --- a/src/com/android/settings/applications/manageapplications/ManageApplications.java +++ b/src/com/android/settings/applications/manageapplications/ManageApplications.java @@ -330,8 +330,8 @@ public class ManageApplications extends InstrumentedFragment if (className.equals(Settings.NotificationReviewPermissionsActivity.class.getName())) { // Special-case for a case where a user is directed to the all apps notification // preferences page via a notification prompt to review permissions settings. - android.provider.Settings.Secure.putInt(getContext().getContentResolver(), - android.provider.Settings.Secure.REVIEW_PERMISSIONS_NOTIFICATION_STATE, + android.provider.Settings.Global.putInt(getContext().getContentResolver(), + android.provider.Settings.Global.REVIEW_PERMISSIONS_NOTIFICATION_STATE, 1); // USER_INTERACTED } } else if (className.equals(AppLocaleDetails.class.getName())) { From b899bd3690e8b7a0040e041c0f44a700a8d8a133 Mon Sep 17 00:00:00 2001 From: tom hsu Date: Thu, 28 Apr 2022 21:32:33 +0800 Subject: [PATCH 03/15] [Panlingual] Avoid activity restart during rotation Bug: 230680942 Test: local Change-Id: Ib64509fb73fb363ad4dd5c2163659346295f581d --- AndroidManifest.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 762d84da36e..15c5272665b 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -866,6 +866,7 @@ From ddedb31f6e94253b35c413e8e0bdca98355cc37e Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Thu, 28 Apr 2022 19:09:02 +0800 Subject: [PATCH 04/15] Fix flicker for Mobile data & Wi-Fi page Both "Mobile data usage" & "Non-carrier data usage". By, 1. Add header in onCreate() instead of onViewCreated() 2. Keep the space for Spinner, and preload initial cycles 3. Keep the space for 3 usage summaries Bug: 191730864 Test: manual Change-Id: I8c309c5f51ce6290383a2d10f75e41d0f207d61a --- res/xml/app_data_usage.xml | 12 +- .../settings/datausage/AppDataUsage.java | 26 +++- .../settings/datausage/CycleAdapter.java | 141 +----------------- .../settings/datausage/SpinnerPreference.java | 14 ++ .../settings/datausage/AppDataUsageTest.java | 20 +-- 5 files changed, 53 insertions(+), 160 deletions(-) diff --git a/res/xml/app_data_usage.xml b/res/xml/app_data_usage.xml index e64a1c5cc63..e94c4ff4ca2 100644 --- a/res/xml/app_data_usage.xml +++ b/res/xml/app_data_usage.xml @@ -21,8 +21,7 @@ android:title="@string/data_usage_app_summary_title"> + android:key="cycle" /> @@ -31,19 +30,22 @@ android:key="total_usage" android:title="@string/total_size_label" android:selectable="false" - android:layout="@layout/horizontal_preference" /> + android:layout="@layout/horizontal_preference" + android:summary="@string/summary_placeholder" /> + android:layout="@layout/horizontal_preference" + android:summary="@string/summary_placeholder" /> + android:layout="@layout/horizontal_preference" + android:summary="@string/summary_placeholder" /> diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java index 460f3909f74..531a341c95a 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -144,8 +144,7 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC mForegroundUsage = findPreference(KEY_FOREGROUND_USAGE); mBackgroundUsage = findPreference(KEY_BACKGROUND_USAGE); - mCycle = findPreference(KEY_CYCLE); - mCycleAdapter = new CycleAdapter(mContext, mCycle, mCycleListener); + initCycle(); final UidDetailProvider uidDetailProvider = getUidDetailProvider(); @@ -211,6 +210,8 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC removePreference(KEY_RESTRICT_BACKGROUND); removePreference(KEY_APP_LIST); } + + addEntityHeader(); } @Override @@ -276,6 +277,17 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC return new UidDetailProvider(mContext); } + private void initCycle() { + mCycle = findPreference(KEY_CYCLE); + mCycleAdapter = new CycleAdapter(mContext, mCycle, mCycleListener); + if (mCycles != null) { + // If coming from a page like DataUsageList where already has a selected cycle, display + // that before loading to reduce flicker. + mCycleAdapter.setInitialCycleList(mCycles, mSelectedCycle); + mCycle.setHasCycles(true); + } + } + private void updatePrefs(boolean restrictBackground, boolean unrestrictData) { final EnforcedAdmin admin = RestrictedLockUtilsInternal.checkIfMeteredDataRestricted( mContext, mPackageName, UserHandle.getUserId(mAppItem.key)); @@ -308,9 +320,9 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC final long backgroundBytes, foregroundBytes; if (mUsageData == null || position >= mUsageData.size()) { backgroundBytes = foregroundBytes = 0; - mCycle.setVisible(false); + mCycle.setHasCycles(false); } else { - mCycle.setVisible(true); + mCycle.setHasCycles(true); final NetworkCycleDataForUid data = mUsageData.get(position); backgroundBytes = data.getBackgroudUsage(); foregroundBytes = data.getForegroudUsage(); @@ -335,10 +347,8 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC return false; } - @Override - public void onViewCreated(View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - + @VisibleForTesting + void addEntityHeader() { String pkg = mPackages.size() != 0 ? mPackages.valueAt(0) : null; int uid = 0; if (pkg != null) { diff --git a/src/com/android/settings/datausage/CycleAdapter.java b/src/com/android/settings/datausage/CycleAdapter.java index 2cabd8de452..b41b6aad91b 100644 --- a/src/com/android/settings/datausage/CycleAdapter.java +++ b/src/com/android/settings/datausage/CycleAdapter.java @@ -13,24 +13,13 @@ */ package com.android.settings.datausage; -import android.annotation.NonNull; -import android.app.usage.NetworkStats; import android.content.Context; -import android.net.NetworkPolicy; -import android.net.NetworkPolicyManager; -import android.text.format.DateUtils; -import android.util.Pair; -import android.util.Range; import android.widget.AdapterView; -import com.android.net.module.util.NetworkStatsUtils; import com.android.settings.Utils; -import com.android.settingslib.net.ChartData; import com.android.settingslib.net.NetworkCycleData; import com.android.settingslib.widget.SettingsSpinnerAdapter; -import java.time.ZonedDateTime; -import java.util.Iterator; import java.util.List; import java.util.Objects; @@ -45,7 +34,6 @@ public class CycleAdapter extends SettingsSpinnerAdapter mSpinner = spinner; mListener = listener; mSpinner.setAdapter(this); - mSpinner.setOnItemSelectedListener(mListener); } /** @@ -65,128 +53,14 @@ public class CycleAdapter extends SettingsSpinnerAdapter return 0; } - protected static long getTotalBytesForTimeRange(List stats, - Range range) { - long bytes = 0L; - for (NetworkStats.Bucket bucket : stats) { - final Range bucketSpan = new Range<>( - bucket.getStartTimeStamp(), bucket.getEndTimeStamp()); - // Only record bytes that overlapped with the given time range. For partially - // overlapped bucket, record rational bytes assuming the traffic is uniform - // distributed within the bucket. - try { - final Range overlapped = range.intersect(bucketSpan); - final long totalOfBucket = bucket.getRxBytes() + bucket.getTxBytes(); - bytes += NetworkStatsUtils.multiplySafeByRational(totalOfBucket, - overlapped.getUpper() - overlapped.getLower(), - bucketSpan.getUpper() - bucketSpan.getLower()); - } catch (IllegalArgumentException e) { - // Range disjoint, ignore. - continue; - } - } - return bytes; - } - - @NonNull - private Range getTimeRangeOf(@NonNull List stats) { - long start = Long.MAX_VALUE; - long end = Long.MIN_VALUE; - for (NetworkStats.Bucket bucket : stats) { - start = Math.min(start, bucket.getStartTimeStamp()); - end = Math.max(end, bucket.getEndTimeStamp()); - } - return new Range(start, end); - } - - /** - * Rebuild list based on {@link NetworkPolicy} and available - * {@link List} data. Always selects the newest item, - * updating the inspection range on chartData. - */ - @Deprecated - public boolean updateCycleList(NetworkPolicy policy, ChartData chartData) { - // stash away currently selected cycle to try restoring below - final CycleAdapter.CycleItem previousItem = (CycleAdapter.CycleItem) - mSpinner.getSelectedItem(); + void setInitialCycleList(List cycles, long selectedCycle) { clear(); - - final Context context = getContext(); - - long historyStart; - long historyEnd; - try { - final Range historyTimeRange = getTimeRangeOf(chartData.network); - historyStart = historyTimeRange.getLower(); - historyEnd = historyTimeRange.getUpper(); - } catch (IllegalArgumentException e) { - // Empty history. - final long now = System.currentTimeMillis(); - historyStart = now; - historyEnd = now + 1; - } - - boolean hasCycles = false; - if (policy != null) { - final Iterator> it = NetworkPolicyManager - .cycleIterator(policy); - while (it.hasNext()) { - final Pair cycle = it.next(); - final long cycleStart = cycle.first.toInstant().toEpochMilli(); - final long cycleEnd = cycle.second.toInstant().toEpochMilli(); - - final boolean includeCycle; - if (chartData != null) { - final long bytesInCycle = getTotalBytesForTimeRange(chartData.network, - new Range<>(cycleStart, cycleEnd)); - includeCycle = bytesInCycle > 0; - } else { - includeCycle = true; - } - - if (includeCycle) { - add(new CycleAdapter.CycleItem(context, cycleStart, cycleEnd)); - hasCycles = true; - } + for (int i = 0; i < cycles.size() - 1; i++) { + add(new CycleAdapter.CycleItem(getContext(), cycles.get(i + 1), cycles.get(i))); + if (cycles.get(i) == selectedCycle) { + mSpinner.setSelection(i); } } - - if (!hasCycles) { - // no policy defined cycles; show entry for each four-week period - long cycleEnd = historyEnd; - while (cycleEnd > historyStart) { - final long cycleStart = cycleEnd - (DateUtils.WEEK_IN_MILLIS * 4); - - final boolean includeCycle; - if (chartData != null) { - final long bytesInCycle = getTotalBytesForTimeRange(chartData.network, - new Range<>(cycleStart, cycleEnd)); - includeCycle = bytesInCycle > 0; - } else { - includeCycle = true; - } - - if (includeCycle) { - add(new CycleAdapter.CycleItem(context, cycleStart, cycleEnd)); - } - cycleEnd = cycleStart; - } - } - - // force pick the current cycle (first item) - if (getCount() > 0) { - final int position = findNearestPosition(previousItem); - mSpinner.setSelection(position); - - // only force-update cycle when changed; skipping preserves any - // user-defined inspection region. - final CycleAdapter.CycleItem selectedItem = getItem(position); - if (!Objects.equals(selectedItem, previousItem)) { - mListener.onItemSelected(null, null, position, 0); - return false; - } - } - return true; } /** @@ -194,6 +68,7 @@ public class CycleAdapter extends SettingsSpinnerAdapter * updating the inspection range on chartData. */ public boolean updateCycleList(List cycleData) { + mSpinner.setOnItemSelectedListener(mListener); // stash away currently selected cycle to try restoring below final CycleAdapter.CycleItem previousItem = (CycleAdapter.CycleItem) mSpinner.getSelectedItem(); @@ -228,10 +103,6 @@ public class CycleAdapter extends SettingsSpinnerAdapter public long start; public long end; - public CycleItem(CharSequence label) { - this.label = label; - } - public CycleItem(Context context, long start, long end) { this.label = Utils.formatDateRange(context, start, end); this.start = start; diff --git a/src/com/android/settings/datausage/SpinnerPreference.java b/src/com/android/settings/datausage/SpinnerPreference.java index 867930baa97..c4b7a4e18da 100644 --- a/src/com/android/settings/datausage/SpinnerPreference.java +++ b/src/com/android/settings/datausage/SpinnerPreference.java @@ -31,6 +31,8 @@ public class SpinnerPreference extends Preference implements CycleAdapter.Spinne private AdapterView.OnItemSelectedListener mListener; private Object mCurrentObject; private int mPosition; + private View mItemView; + private boolean mItemViewVisible = false; public SpinnerPreference(Context context, AttributeSet attrs) { super(context, attrs); @@ -63,12 +65,24 @@ public class SpinnerPreference extends Preference implements CycleAdapter.Spinne @Override public void onBindViewHolder(PreferenceViewHolder holder) { super.onBindViewHolder(holder); + mItemView = holder.itemView; + mItemView.setVisibility(mItemViewVisible ? View.VISIBLE : View.INVISIBLE); Spinner spinner = (Spinner) holder.findViewById(R.id.cycles_spinner); spinner.setAdapter(mAdapter); spinner.setSelection(mPosition); spinner.setOnItemSelectedListener(mOnSelectedListener); } + void setHasCycles(boolean hasData) { + setVisible(hasData); + if (hasData) { + mItemViewVisible = true; + if (mItemView != null) { + mItemView.setVisibility(View.VISIBLE); + } + } + } + @Override protected void performClick(View view) { view.findViewById(R.id.cycles_spinner).performClick(); diff --git a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java index 09c57340d60..f043ec737e3 100644 --- a/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java +++ b/tests/robotests/src/com/android/settings/datausage/AppDataUsageTest.java @@ -43,7 +43,6 @@ import android.os.Process; import android.telephony.SubscriptionManager; import android.text.format.DateUtils; import android.util.ArraySet; -import android.view.View; import androidx.fragment.app.FragmentActivity; import androidx.preference.Preference; @@ -96,6 +95,10 @@ public class AppDataUsageTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); + + ShadowEntityHeaderController.setUseMock(mHeaderController); + when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController); + when(mHeaderController.setUid(anyInt())).thenReturn(mHeaderController); } @After @@ -163,10 +166,6 @@ public class AppDataUsageTest { @Test public void bindAppHeader_allWorkApps_shouldNotShowAppInfoLink() { - ShadowEntityHeaderController.setUseMock(mHeaderController); - when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController); - when(mHeaderController.setUid(anyInt())).thenReturn(mHeaderController); - mFragment = spy(new AppDataUsage()); when(mFragment.getPreferenceManager()) @@ -174,7 +173,7 @@ public class AppDataUsageTest { doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen(); ReflectionHelpers.setField(mFragment, "mAppItem", mock(AppItem.class)); - mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle()); + mFragment.addEntityHeader(); verify(mHeaderController).setHasAppInfoLink(false); } @@ -196,16 +195,13 @@ public class AppDataUsageTest { when(mPackageManager.getPackageUidAsUser(anyString(), anyInt())) .thenReturn(fakeUserId); - ShadowEntityHeaderController.setUseMock(mHeaderController); - when(mHeaderController.setRecyclerView(any(), any())).thenReturn(mHeaderController); - when(mHeaderController.setUid(fakeUserId)).thenReturn(mHeaderController); when(mHeaderController.setHasAppInfoLink(anyBoolean())).thenReturn(mHeaderController); when(mFragment.getPreferenceManager()) .thenReturn(mock(PreferenceManager.class, RETURNS_DEEP_STUBS)); doReturn(mock(PreferenceScreen.class)).when(mFragment).getPreferenceScreen(); - mFragment.onViewCreated(new View(RuntimeEnvironment.application), new Bundle()); + mFragment.addEntityHeader(); verify(mHeaderController).setHasAppInfoLink(true); verify(mHeaderController).setUid(fakeUserId); @@ -268,7 +264,7 @@ public class AppDataUsageTest { mFragment.bindData(0 /* position */); - verify(cycle).setVisible(false); + verify(cycle).setHasCycles(false); } @Test @@ -293,7 +289,7 @@ public class AppDataUsageTest { mFragment.bindData(0 /* position */); - verify(cycle).setVisible(true); + verify(cycle).setHasCycles(true); verify(totalPref).setSummary( DataUsageUtils.formatDataUsage(context, backgroundBytes + foregroundBytes)); verify(backgroundPref).setSummary(DataUsageUtils.formatDataUsage(context, backgroundBytes)); From c15fb9ed814e02e51292f823623e0b81968b6707 Mon Sep 17 00:00:00 2001 From: Jan Tomljanovic Date: Thu, 28 Apr 2022 17:09:05 +0100 Subject: [PATCH 05/15] Update the SafetyCenter icon Test: manual Bug: 230731934 Change-Id: I11a82348b77b5e162e9dfaf5bfa91642db709f6f --- res/drawable/ic_settings_safety_center.xml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/res/drawable/ic_settings_safety_center.xml b/res/drawable/ic_settings_safety_center.xml index f43359fefd4..e817b7194bb 100644 --- a/res/drawable/ic_settings_safety_center.xml +++ b/res/drawable/ic_settings_safety_center.xml @@ -13,17 +13,19 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + android:viewportHeight="24" + android:tint="?android:attr/textColorPrimary"> + + android:pathData="M 0 0 H 24 V 24 H 0 V 0 Z" /> + android:fillColor="#000000" + android:pathData="M12,4.14l6,2.25v4.71c0,2.12-0.62,4-1.88,5.74c-1.13,1.55-2.48,2.56-4.12,3.09c-1.64-0.52-2.99-1.54-4.12-3.09 C6.62,15.1,6,13.22,6,11.1V6.39L12,4.14 M12,2L4,5v6.1c0,2.53,0.75,4.84,2.26,6.91C7.77,20.09,9.68,21.42,12,22 c2.32-0.58,4.23-1.91,5.74-3.99C19.25,15.94,20,13.63,20,11.1V5L12,2L12,2z" /> + \ No newline at end of file From 4e34e65228a9350dbb561e77761c7bad0a23a9fc Mon Sep 17 00:00:00 2001 From: Weng Su Date: Fri, 29 Apr 2022 02:22:05 +0800 Subject: [PATCH 06/15] Show restricted message in Wi-Fi hotspot summary - Refine WifiTetherPreferenceController - See the result screenshot in b/203168953#comment8 Bug: 203168953 Test: manual test make RunSettingsRoboTests \ ROBOTEST_FILTER=WifiTetherPreferenceControllerTest Change-Id: If094178eb0cd9ccf20ff3899dc4b087b45c66f6b --- .../WifiTetherPreferenceController.java | 48 +++++++++++------- .../WifiTetherPreferenceControllerTest.java | 49 ++++++++----------- 2 files changed, 51 insertions(+), 46 deletions(-) diff --git a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java index 94bd78a9c09..73ff31d4e47 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java +++ b/src/com/android/settings/wifi/tether/WifiTetherPreferenceController.java @@ -46,12 +46,9 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController private static final String WIFI_TETHER_SETTINGS = "wifi_tether"; - private final TetheringManager mTetheringManager; - private final String[] mWifiRegexs; - private final WifiManager mWifiManager; - private final Lifecycle mLifecycle; - @VisibleForTesting - boolean mIsWifiTetheringAllow; + private boolean mIsWifiTetherable; + private WifiManager mWifiManager; + private boolean mIsWifiTetheringAllow; private int mSoftApState; @VisibleForTesting Preference mPreference; @@ -59,18 +56,32 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController WifiTetherSoftApManager mWifiTetherSoftApManager; public WifiTetherPreferenceController(Context context, Lifecycle lifecycle) { - this(context, lifecycle, true /* initSoftApManager */); + this(context, lifecycle, + context.getSystemService(WifiManager.class), + context.getSystemService(TetheringManager.class), + true /* initSoftApManager */, + WifiEnterpriseRestrictionUtils.isWifiTetheringAllowed(context)); } @VisibleForTesting - WifiTetherPreferenceController(Context context, Lifecycle lifecycle, - boolean initSoftApManager) { + WifiTetherPreferenceController( + Context context, + Lifecycle lifecycle, + WifiManager wifiManager, + TetheringManager tetheringManager, + boolean initSoftApManager, + boolean isWifiTetheringAllow) { super(context); - mTetheringManager = context.getSystemService(TetheringManager.class); - mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE); - mWifiRegexs = mTetheringManager.getTetherableWifiRegexs(); - mIsWifiTetheringAllow = WifiEnterpriseRestrictionUtils.isWifiTetheringAllowed(context); - mLifecycle = lifecycle; + final String[] wifiRegexs = tetheringManager.getTetherableWifiRegexs(); + if (wifiRegexs != null && wifiRegexs.length != 0) { + mIsWifiTetherable = true; + } + + mIsWifiTetheringAllow = isWifiTetheringAllow; + if (!isWifiTetheringAllow) return; + + mWifiManager = wifiManager; + if (lifecycle != null) { lifecycle.addObserver(this); } @@ -81,9 +92,7 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController @Override public boolean isAvailable() { - return mWifiRegexs != null - && mWifiRegexs.length != 0 - && !Utils.isMonkeyRunning(); + return mIsWifiTetherable && !Utils.isMonkeyRunning(); } @Override @@ -94,7 +103,10 @@ public class WifiTetherPreferenceController extends AbstractPreferenceController // unavailable return; } - mPreference.setEnabled(mIsWifiTetheringAllow); + if (!mIsWifiTetheringAllow && mPreference.isEnabled()) { + mPreference.setEnabled(false); + mPreference.setSummary(R.string.not_allowed_by_ent); + } } @Override diff --git a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java index 7ce2bf3b32c..e8ee7c3b90e 100644 --- a/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/tether/WifiTetherPreferenceControllerTest.java @@ -19,30 +19,29 @@ package com.android.settings.wifi.tether; import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import android.content.Context; import android.net.TetheringManager; import android.net.wifi.SoftApConfiguration; import android.net.wifi.WifiManager; -import android.os.Bundle; -import android.os.UserManager; -import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; +import androidx.test.core.app.ApplicationProvider; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settingslib.PrimarySwitchPreference; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.mockito.Spy; +import org.mockito.junit.MockitoJUnit; +import org.mockito.junit.MockitoRule; import org.robolectric.RobolectricTestRunner; -import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; @@ -56,53 +55,44 @@ public class WifiTetherPreferenceControllerTest { private static final String SSID = "Pixel"; - private Context mContext; + @Rule + public final MockitoRule mMockitoRule = MockitoJUnit.rule(); + @Spy + Context mContext = ApplicationProvider.getApplicationContext(); + @Mock + private Lifecycle mLifecycle; @Mock private TetheringManager mTetheringManager; @Mock private WifiManager mWifiManager; @Mock - private UserManager mUserManager; - @Mock - private Bundle mBundle; - @Mock private PreferenceScreen mScreen; private SoftApConfiguration mSoftApConfiguration; private WifiTetherPreferenceController mController; - private Lifecycle mLifecycle; - private LifecycleOwner mLifecycleOwner; private PrimarySwitchPreference mPreference; @Before public void setUp() { - MockitoAnnotations.initMocks(this); - - mContext = spy(RuntimeEnvironment.application); - mLifecycleOwner = () -> mLifecycle; - mLifecycle = new Lifecycle(mLifecycleOwner); FakeFeatureFactory.setupForTest(); - mPreference = new PrimarySwitchPreference(RuntimeEnvironment.application); + mPreference = new PrimarySwitchPreference(mContext); when(mContext.getSystemService(Context.TETHERING_SERVICE)).thenReturn(mTetheringManager); when(mContext.getSystemService(Context.WIFI_SERVICE)).thenReturn(mWifiManager); - when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager); - when(mUserManager.getUserRestrictions()).thenReturn(mBundle); when(mScreen.findPreference(anyString())).thenReturn(mPreference); mSoftApConfiguration = new SoftApConfiguration.Builder().setSsid(SSID).build(); when(mWifiManager.getSoftApConfiguration()).thenReturn(mSoftApConfiguration); when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{"1", "2"}); - mController = new WifiTetherPreferenceController(mContext, mLifecycle, - false /* initSoftApManager */); - mController.mIsWifiTetheringAllow = true; + mController = new WifiTetherPreferenceController(mContext, mLifecycle, mWifiManager, + mTetheringManager, false /* initSoftApManager */, true /* isWifiTetheringAllow */); mController.displayPreference(mScreen); } @Test public void isAvailable_noTetherRegex_shouldReturnFalse() { when(mTetheringManager.getTetherableWifiRegexs()).thenReturn(new String[]{}); - mController = new WifiTetherPreferenceController(mContext, mLifecycle, - false /* initSoftApManager */); + mController = new WifiTetherPreferenceController(mContext, mLifecycle, mWifiManager, + mTetheringManager, false /* initSoftApManager */, true /* isWifiTetheringAllow */); assertThat(mController.isAvailable()).isFalse(); } @@ -114,16 +104,19 @@ public class WifiTetherPreferenceControllerTest { @Test public void displayPreference_wifiTetheringNotAllowed_shouldDisable() { - mController.mIsWifiTetheringAllow = false; + mController = new WifiTetherPreferenceController(mContext, mLifecycle, mWifiManager, + mTetheringManager, false /* initSoftApManager */, false /* isWifiTetheringAllow */); mController.displayPreference(mScreen); assertThat(mPreference.isEnabled()).isFalse(); + assertThat(mPreference.getSummary()).isEqualTo("Not allowed by your organization"); } @Test public void displayPreference_wifiTetheringAllowed_shouldEnable() { - mController.mIsWifiTetheringAllow = true; + mController = new WifiTetherPreferenceController(mContext, mLifecycle, mWifiManager, + mTetheringManager, false /* initSoftApManager */, true /* isWifiTetheringAllow */); mController.displayPreference(mScreen); From ac6b0bdef68e99e0a34656a2148483d7cb77159e Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 28 Apr 2022 18:39:25 +0000 Subject: [PATCH 07/15] Import translations. DO NOT MERGE ANYWHERE BUG:205460459 Auto-generated-cl: translation import Change-Id: I669099ad00ba7d90013836e3d456d530ae725b2f --- 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 | 2 +- res/values-ca/strings.xml | 2 +- res/values-cs/strings.xml | 2 +- res/values-da/strings.xml | 2 +- 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 | 2 +- res/values-gu/strings.xml | 2 +- res/values-hi/strings.xml | 2 +- res/values-hr/strings.xml | 2 +- res/values-hu/strings.xml | 2 +- res/values-hy/strings.xml | 2 +- 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 | 2 +- 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 | 2 +- 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 | 2 +- res/values-vi/strings.xml | 2 +- res/values-zh-rCN/strings.xml | 2 +- res/values-zh-rHK/strings.xml | 2 +- res/values-zh-rTW/strings.xml | 2 +- res/values-zu/strings.xml | 2 +- 85 files changed, 85 insertions(+), 85 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 8b50e2e2abf..03e2961a5d8 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -2924,7 +2924,7 @@ "Koppel aan %s" "Ontkoppel hierdie VPN?" "Ontkoppel" - "Weergawe %s" + "Weergawe" "Vergeet VPN" "Vervang bestaande VPN?" "Stel altyd-aan VPN?" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index 2e6178c9f85..e2ce7e85e0c 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -2924,7 +2924,7 @@ "ከ%s ጋር ተገናኝ" "የዚህ ቪፒኤን ግንኙነት ይቋረጥ?" "ግንኙነት አቋርጥ" - "ሥሪት %s" + "ስሪት" "VPNን እርሳ" "አሁን ያለው VPN ይተካ?" "ሁልጊዜ-የበራ VPN ይቀናበር?" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 5ce6c434e8c..785bf0d006b 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -3080,7 +3080,7 @@ "الاتصال بـ %s" "‏هل تريد قطع الاتصال بهذه الشبكة الافتراضية الخاصة (VPN)؟" "قطع الاتصال" - "الإصدار %s" + "الإصدار" "نسيان الشبكة الافتراضية الخاصة" "هل تريد استبدال الشبكة الافتراضية الخاصة الحالية؟" "هل تريد تشغيل الشبكة الافتراضية الخاصة باستمرار؟" diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index 58e33851e4c..9717f82a469 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -2924,7 +2924,7 @@ "%sৰ সৈতে সংযোগ কৰক" "এই ভিপিএনটোৰ সৈতে সংযোগ বিচ্ছিন্ন কৰিবনে?" "সংযোগ বিচ্ছিন্ন কৰক" - "সংস্কৰণ %s" + "সংস্কৰণ" "ভিপিএন পাহৰক" "পূৰ্বৰ ভিপিএনটো সলনি কৰেনে?" "ভিপিএনক যিকোনো সময়ত অন থকা অবস্থাত ছেট কৰিবনে?" diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index d3116018d7a..389dfa3c663 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -2924,7 +2924,7 @@ "%s profilinə qoşulun" "Bu VPN bağlantısı kəsilsin?" "Bağlantını kəsin" - "Versiya %s" + "Versiya" "VPN\'i unudun" "Mövcud VPN əvəz edilsin?" "Hər zaman aktiv VPN quraşdırılsın?" diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index 4ceac688813..4d017182864 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -2963,7 +2963,7 @@ "Povezivanje na profil %s" "Želite li da prekinete vezu sa ovim VPN-om?" "Prekini vezu" - "Verzija %s" + "Verzija" "Zaboravi VPN" "Želite li da zamenite postojeći VPN?" "Želite li da podesite uvek uključeni VPN?" diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 3cdc84ac8ba..e1df934d11c 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -3002,7 +3002,7 @@ "Падключэнне да профiлю %s" "Адключыць гэту VPN?" "Адключыць" - "Версія %s" + "Версія" "Забыць VPN" "Замяніць існуючую VPN?" "Наладзіць заўсёды ўключаную VPN?" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index b3b22296de7..6397ecbaf99 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -2924,7 +2924,7 @@ "Свързване със: %s" "Да се прекрати ли връзката с тази виртуална частна мрежа (VPN)?" "Прекратяване на връзката" - "Версия %s" + "Версия" "Забравяне на вирт. частна мрежа (VPN)" "Да се замени ли съществуващата VPN?" "Да се зададе ли винаги включена виртуална частна мрежа (VPN)?" diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index 9e9a3db86b8..d7b9e5fba1d 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -2924,7 +2924,7 @@ "%s এতে কানেক্ট করুন" "এই VPN থেকে ডিসকানেক্ট করবেন?" "ডিসকানেক্ট করুন" - "ভার্সন %s" + "ভার্সন" "VPN সরিয়ে দিন" "বিদ্যমান VPN প্রতিস্থাপন করতে চান?" "সর্বদা-চালু VPN সেট করতে চান?" diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 761b3876443..1f824530816 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -2963,7 +2963,7 @@ "Poveži se na %s" "Želite li prekinuti vezu s ovim VPN-om?" "Prekini vezu" - "Verzija %s" + "Verzija" "Zaboravi VPN" "Želite li zamijeniti postojeći VPN?" "Želite li postaviti uvijek uključen VPN?" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 2501deab905..fb8166152d1 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -2924,7 +2924,7 @@ "Connexió amb %s" "Vols desconnectar aquesta VPN?" "Desconnecta" - "Versió %s" + "Versió" "Oblida la VPN" "Vols substituir la VPN actual?" "Vols definir la VPN sempre activa?" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index affe660e63f..bd6603e530b 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -3002,7 +3002,7 @@ "Připojit k profilu %s" "Odpojit tuto síť VPN?" "Odpojit" - "Verze %s" + "Verze" "Zapomenout VPN" "Nahradit stávající síť VPN?" "Nastavit trvalou síť VPN?" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 2a713a66ffc..048bb977d50 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -2924,7 +2924,7 @@ "Opret forbindelse til %s" "Vil du afbryde dette VPN?" "Afbryd" - "Version %s" + "Version" "Glem VPN" "Erstat det eksisterende VPN-netværk?" "Vil du konfigurere konstant VPN?" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 1e8ac7ce9c5..8ad7e7cad81 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -2925,7 +2925,7 @@ "Mit %s verbinden" "Verbindung zu diesem VPN trennen?" "Verbindung trennen" - "Version %s" + "Version" "VPN entfernen" "Aktuelles VPN ersetzen?" "Durchgehend aktives VPN aktivieren?" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 785276499f0..1f4d757a2fe 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -2924,7 +2924,7 @@ "Σύνδεση στο προφίλ %s" "Να αποσυνδεθεί αυτό το VPN;" "Αποσύνδεση" - "Έκδοση %s" + "Έκδοση" "Διαγραφή VPN" "Αντικατάσταση υπάρχοντος VPN;" "Ενεργοποίηση του μονίμως ενεργού VPN;" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 24af54287b5..2b54aea7e4d 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -2924,7 +2924,7 @@ "Connect to %s" "Disconnect this VPN?" "Disconnect" - "Version %s" + "Version" "Forget VPN" "Replace existing VPN?" "Set always-on VPN?" diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index 868f5fc8749..2acbac97150 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -2924,7 +2924,7 @@ "Connect to %s" "Disconnect this VPN?" "Disconnect" - "Version %s" + "Version" "Forget VPN" "Replace existing VPN?" "Set always-on VPN?" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index b7193b5bf7d..0ff28aca9f3 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -2924,7 +2924,7 @@ "Connect to %s" "Disconnect this VPN?" "Disconnect" - "Version %s" + "Version" "Forget VPN" "Replace existing VPN?" "Set always-on VPN?" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 9a833ca88f1..cf392a82c75 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -2924,7 +2924,7 @@ "Connect to %s" "Disconnect this VPN?" "Disconnect" - "Version %s" + "Version" "Forget VPN" "Replace existing VPN?" "Set always-on VPN?" diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml index 080e220f6b9..2dd5e37d687 100644 --- a/res/values-en-rXC/strings.xml +++ b/res/values-en-rXC/strings.xml @@ -2924,7 +2924,7 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎Connect to ‎‏‎‎‏‏‎%s‎‏‎‎‏‏‏‎‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‎‏‏‎Disconnect this VPN?‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‎Disconnect‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‏‎Version ‎‏‎‎‏‏‎%s‎‏‎‎‏‏‏‎‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‎‎‎Version‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎Forget VPN‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎Replace existing VPN?‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎Set always-on VPN?‎‏‎‎‏‎" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index e674900f2ec..a0c4ff4bb77 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -2924,7 +2924,7 @@ "Conectar a %s" "¿Deseas desconectar esta VPN?" "Desconectar" - "Versión %s" + "Versión" "Borrar VPN" "¿Reemplazar VPN existente?" "¿Configurar la VPN siempre activa?" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index f82d00c7239..2869eb1d9c9 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -2924,7 +2924,7 @@ "Conectar a %s" "¿Desconectar esta VPN?" "Desconectar" - "Versión %s" + "Versión" "Olvidar VPN" "¿Reemplazar VPN actual?" "¿Configurar el modo de VPN siempre activada?" diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index 4d4910e4898..61eaa08723d 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -2924,7 +2924,7 @@ "Profiiliga %s ühendamine" "Kas soovite katkestada ühenduse selle VPN-iga?" "Katkesta ühendus" - "Versioon %s" + "Versioon" "Unusta VPN" "Kas asendada olemasolev VPN?" "Kas määrata alati sisselülitatud VPN?" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index f6a71b6f8b4..3d1900a0ffc 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -2924,7 +2924,7 @@ "Konektatu %s profilera" "VPN saretik deskonektatu nahi duzu?" "Deskonektatu" - "%s bertsioa" + "Bertsioa" "Ahaztu VPN konexioa" "Dagoen VPN konexioa ordeztu nahi duzu?" "VPNa beti aktibatuta egoteko aukera ezarri nahi duzu?" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 357ebf50ad2..a63bcdf358f 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -2924,7 +2924,7 @@ "اتصال به %s" "‏اتصال به این VPN.قطع‌ شود؟" "قطع ارتباط" - "نسخه %s" + "نسخه" "‏فراموش کردن VPN" "‏VPN موجود جایگزین شود؟" "‏VPN همیشه روشن تنظیم شود؟" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 06f333660e9..7f3a923c080 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -2924,7 +2924,7 @@ "Yhdistä profiiliin %s" "Katkaistaanko VPN-yhteys?" "Katkaise yhteys" - "Versio %s" + "Versio" "Unohda VPN" "Korvataanko nykyinen VPN?" "Määritetäänkö aina käytössä oleva VPN?" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index a12f8a7b608..8c6f7bd7988 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -2924,7 +2924,7 @@ "Se connecter à %s" "Déconnecter ce RPV?" "Déconnecter" - "Version %s" + "Version" "Oublier le profil RPV" "Remplacer le RPV existant?" "Définir le RPV permanent?" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 94eb1676ffe..77d14164b23 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -2924,7 +2924,7 @@ "Se connecter à %s" "Déconnecter ce VPN ?" "Déconnecter" - "Version %s" + "Version" "Supprimer le VPN" "Remplacer le VPN existant ?" "Définir le VPN permanent ?" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 5f6ae241fba..1f23b9dd572 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -2924,7 +2924,7 @@ "Conectar con %s" "Queres desconectar esta VPN?" "Desconectar" - "Versión %s" + "Versión" "Esquecer perfil da VPN" "Queres substituír a VPN existente?" "Queres definir a VPN como sempre activa?" diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index 0b088415184..f1fb4bfb631 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -2924,7 +2924,7 @@ "%s સાથે કનેક્ટ કરો" "આ VPNને ડિસ્કનેક્ટ કરીએ?" "ડિસ્કનેક્ટ કરો" - "વર્ઝન %s" + "વર્ઝન" "VPN ભૂલી ગયાં" "અસ્તિત્વમાંની VPN ને બદલીએ?" "હંમેશાં ચાલુ VPN સેટ કરીએ?" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index d4c6ee53097..6de18e7f370 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -2924,7 +2924,7 @@ " %s से कनेक्ट करें" "इस VPN को डिसकनेक्ट करना चाहते हैं?" "डिसकनेक्ट करें" - "वर्शन %s" + "वर्शन" "वीपीएन भूल जाएं" "मौजूदा VPN को बदलें?" "हमेशा-चालू VPN सेट करें?" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index 41056f481df..feb3dce92cd 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -2963,7 +2963,7 @@ "Povezivanje s profilom %s" "Prekinuti vezu s VPN-om?" "Prekini vezu" - "Verzija %s" + "Verzija" "Zaboravi VPN" "Želite li zamijeniti dosadašnji VPN?" "Želite li postaviti uvijek uključeni VPN?" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index ec5a4ea3277..07adca4a685 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -2924,7 +2924,7 @@ "Csatlakozás a következőhöz: %s" "Leválasztja a VPN-t?" "Leválasztás" - "Verzió: %s" + "Verzió" "VPN elfelejtése" "Lecseréli a meglévő VPN-t?" "Beállítja a mindig bekapcsolt VPN-t?" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index bb5f0db7da7..12bca42f61d 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -2924,7 +2924,7 @@ "Միանալ %s-ին" "Անջատե՞լ այս VPN-ը:" "Անջատել" - "Տարբերակ %s" + "Տարբերակ" "Մոռանալ VPN-ը" "Փոխարինե՞լ ընթացիկ VPN-ը:" "Սահմանե՞լ որպես «միշտ միացված» VPN:" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 3ccf10ddea2..8d4e6820c2c 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -2924,7 +2924,7 @@ "Menyambung ke %s" "Putuskan sambungan VPN ini?" "Putuskan sambungan" - "Versi %s" + "Versi" "Lupakan VPN" "Ganti VPN yang sudah ada?" "Setel VPN selalu aktif?" diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index cb2182a1829..ed88ee82d7c 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -2924,7 +2924,7 @@ "Tengjast %s" "Aftengja þessa VPN-tengingu?" "Aftengja" - "Útgáfa %s" + "Útgáfa" "Gleyma VPN" "Skipta út núverandi VPN?" "Velja VPN sem alltaf er kveikt á?" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index 3b9d9fa6a81..754c63d6791 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -2924,7 +2924,7 @@ "Connessione a %s" "Disconnettere questa VPN?" "Disconnetti" - "Versione %s" + "Versione" "Rimuovi VPN" "Sostituire la rete VPN esistente?" "Impostare la rete VPN sempre attiva?" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 2a90d6cfdc9..278df4662d3 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -3002,7 +3002,7 @@ "התחברות אל %s" "‏האם לנתק את ה-VPN הזה?" "נתק" - "גרסה %s" + "גרסה" "‏שכח VPN" "‏האם להחליף רשת VPN קיימת?" "‏האם להגדיר את רשת ה-VPN בחיבור תמידי?" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index cfd03254eb5..e5abf555c95 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -2924,7 +2924,7 @@ "%sに接続" "この VPN の接続を解除しますか？" "接続を解除" - "バージョン%s" + "バージョン" "VPN を削除" "既存の VPN を置き換えますか？" "常時接続 VPN を設定しますか？" diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 856e830e986..e11a462404d 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -2924,7 +2924,7 @@ "დაკავშირებულია %s-თან" "გსურთ ამ VPN-თან კავშირის გაწყვეტა?" "კავშირის გაწყვეტა" - "ვერსია %s" + "ვერსია" "VPN-ის დავიწყება" "გსურთ არსებული VPN-ის ჩანაცვლება?" "გსურთ ყოველთვის ჩართული VPN-ის დაყენება?" diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index 5638c3c7c66..b5cfddc4ba3 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -2924,7 +2924,7 @@ "%s профайлына жалғау" "Осы VPN желісі ажыратылсын ба?" "Ажырату" - "Нұсқасы: %s" + "Нұсқа" "VPN ұмыту" "Бар VPN қолданбасын ауыстыру керек пе?" "Әрқашан қосулы VPN режимін орнату" diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index c66f8bcd37c..f3e59e2e8ff 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -2924,7 +2924,7 @@ "តភ្ជាប់ %s" "ផ្តាច់ VPN នេះ?" "ផ្ដាច់" - "កំណែ %s" + "កំណែ" "បំភ្លេច VPN" "ជំនួស VPN ដែលមានស្រាប់ឬ?" "កំណត់ VPN ឲ្យបើកជានិច្ចឬ?" diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index e6ed7d89a16..699a8f239b9 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -2924,7 +2924,7 @@ "%s ಗೆ ಸಂಪರ್ಕಿಸಿ" "ಈ VPN ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?" "ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸು" - "%s ಆವೃತ್ತಿ" + "ಆವೃತ್ತಿ" "VPN ಮರೆತುಬಿಡು" "ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ VPN ಸ್ಥಾನಾಂತರಿಸುವುದೇ?" "VPN ಯಾವಾಗಲೂ ಆನ್ ಆಗಿರುವಂತೆ ಹೊಂದಿಸುವುದೇ?" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 7a623e7de8e..7b577316b1e 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -2924,7 +2924,7 @@ "%s에 연결" "이 VPN을 연결 해제하시겠습니까?" "연결 해제" - "버전 %s" + "버전" "VPN 삭제" "기존 VPN을 교체하시겠습니까?" "연결 유지 VPN을 설정하시겠습니까?" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 5a3ccad5ad1..8b20a89eab9 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -2924,7 +2924,7 @@ "%s менен байланышуу" "Бул VPN ажыратылсынбы?" "Ажыратуу" - "%s версиясы" + "Версия" "VPN профили унутулсун" "Учурдагы VPN алмаштырылсынбы?" "Туруктуу VPN\'ди жөндөйсүзбү?" diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index 645977b30a6..f7dfe7e1293 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -2924,7 +2924,7 @@ "ເຊື່ອມຕໍ່ຫາ %s" "ຕັດການເຊື່ອມຕໍ່ VPN ນີ້ບໍ?" "ຕັດການເຊື່ອມຕໍ່" - "ເວີ​ຊັນ %s" + "ເວີຊັນ" "ລືມ VPN" "ຂຽນທັບ VPN ທີ່ມີຢູ່ກ່ອນແລ້ວຂອງທ່ານບໍ?" "Set always-on VPN?" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 9840057be67..30537a5696c 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -3002,7 +3002,7 @@ "Prisijungti prie %s" "Atsijungti nuo šio VPN?" "Atsijungti" - "%s versija" + "Versija" "Pamiršti VPN" "Pakeisti esamą VPN?" "Nustatyti visada įjungtą VPN?" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index ec9d09c9f00..5561b5b2786 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -2963,7 +2963,7 @@ "Savienojuma izveide ar %s" "Vai pārtraukt šo VPN savienojumu?" "Pārtraukt savienojumu" - "Versija %s" + "Versija" "Aizmirst VPN" "Vai aizstāt esošo VPN?" "Vai iestatīt vienmēr ieslēgtu VPN?" diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 1c3f624b2ce..af5e1294c35 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -2924,7 +2924,7 @@ "Поврзи се со %s" "Да се исклучи оваа VPN?" "Исклучи" - "Верзија %s" + "Верзија" "Заборави VPN" "Да се замени постојната VPN?" "Да се постави „секогаш вклучена“ VPN?" diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index 83dbed8a999..28b47ff451d 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -2924,7 +2924,7 @@ "%s എന്നതിലേക്ക് കണക്റ്റുചെയ്യുക" "ഈ VPN വിച്ഛേദിക്കണോ?" "വിച്ഛേദിക്കുക" - "പതിപ്പ് %s" + "പതിപ്പ്" "VPN മറക്കുക" "നിലവിലുള്ള VPN-ന് പകരം പുതിയതാക്കണോ?" "\'എല്ലായ്പ്പോഴും ഓൺ\' VPN സജ്ജമാക്കണോ?" diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index 0ca774378ef..7db98c4ed10 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -2924,7 +2924,7 @@ "%s руу холбогдох" "Энэ VPN-г салгах уу?" "Салгах" - "Хувилбар %s" + "Хувилбар" "VPN-г мартах" "Энэ VPN-г солих уу?" "VPN-г тогтмол асаалттайгаар тохируулах уу?" diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index 8bab2c76a53..107925ddd87 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -2925,7 +2925,7 @@ "%s शी कनेक्ट करा" "हे VPN डिस्कनेक्ट करायचे?" "‍डिस्कनेक्ट करा" - "आवृत्ती %s" + "आवृत्ती" "VPN विसरा" "विद्यमान VPN पुनर्स्थित करायचे?" "नेहमी-सुरू VPN सेट करायचे?" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index f5df6efb53f..8e44d74c49a 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -2924,7 +2924,7 @@ "Sambung ke %s" "Putuskan sambungan VPN ini?" "Putuskan sambungan" - "Versi %s" + "Versi" "Lupakan VPN" "Gantikan VPN yang sedia ada?" "Tetapkan VPN sentiasa hidup?" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 9a4135bd59d..6cf3194ddb5 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -2924,7 +2924,7 @@ "%s နှင့် ချိတ်ဆက်ခြင်း" "ဤ VPN အား ချိတ်ဆက်မှု ဖြုတ်လိုပါသလား။" "ဆက်သွယ်မှု ဖြတ်ရန်" - "ဗားရှင်း %s" + "ဗားရှင်း" "VPN ကိုမေ့လိုက်ပါ" "ရှိပြီးသား VPN ကိုအစားထိုးမလား။" "VPN ကို အမြဲတမ်းဖွင့်ထားရန် သတ်မှတ်မလား။" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 4706404f015..7428bdb6ade 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -2924,7 +2924,7 @@ "Koble til %s" "Vil du koble fra dette VPN-et?" "Koble fra" - "Versjon %s" + "Versjon" "Glem VPN-profilen" "Vil du erstatte det nåværende VPN-et?" "Vil du angi alltid på-VPN?" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 07a4c8fd040..01da3010f8a 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -2924,7 +2924,7 @@ "%s मा जोड्नुहोस्" "यो VPN को जडान विच्छेद गर्ने हो?" "विच्छेदन गर्नुहोस्" - "संस्करण %s" + "संस्करण" "VPN लाई बिर्सनुहोस्" "विद्यमान VPN लाई बदल्ने हो?" "सधैँ-सक्रिय VPN लाई सेट गर्ने हो?" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index fe7b3b26319..2cc731b066a 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -2924,7 +2924,7 @@ "Verbinding maken met %s" "Verbinding met dit VPN verbreken?" "Verbinding verbreken" - "Versie %s" + "Versie" "VPN vergeten" "Bestaande VPN vervangen?" "Always-on VPN instellen?" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index 3db8ab59ad1..76c21613bd2 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -2924,7 +2924,7 @@ "%s ସହ ସଂଯୋଗ କରନ୍ତୁ" "ଏହି VPNକୁ ବିଚ୍ଛିନ୍ନ କରିବେ?" "ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ" - "ସଂସ୍କରଣ %s" + "ସଂସ୍କରଣ" "VPNକୁ ଭୁଲିଯାଅ" "ପୂର୍ବରୁ ଥିବା VPNକୁ ବଦଳାଇବେ?" "ସର୍ବଦା-ଅନ୍‌ ଥିବା VPN ସେଟ୍‌ କରିବେ?" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 01d9926dd04..b46adaefc25 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -2924,7 +2924,7 @@ "%s ਨਾਲ ਕਨੈਕਟ ਕਰੋ" "ਇਹ VPN ਡਿਸਕਨੈਕਟ ਕਰੀਏ?" "ਡਿਸਕਨੈਕਟ ਕਰੋ" - "ਵਰਜਨ %s" + "ਵਰਜਨ" "VPN ਨੂੰ ਭੁੱਲ ਜਾਓ" "ਕੀ ਮੌਜੂਦਾ VPN ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?" "ਕੀ ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN ਨੂੰ ਸੈੱਟ ਕਰਨਾ ਹੈ?" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index bcc68b20b2b..f70975e8255 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -3002,7 +3002,7 @@ "Połącz z: %s" "Odłączyć tę sieć VPN?" "Odłącz" - "Wersja %s" + "Wersja" "Zapomnij VPN" "Zastąpić obecną sieć VPN?" "Ustawić stały VPN?" diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 268d4ef1673..6444c385c0d 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -2924,7 +2924,7 @@ "Conectar a %s" "Desconectar esta VPN?" "Desconectar" - "Versão %s" + "Versão" "Esquecer VPN" "Substituir VPN já existente?" "Configurar VPN sempre ativa?" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index f6ad430ff70..2e929c42e38 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -2924,7 +2924,7 @@ "Ligar a %s" "Pretende desligar esta VPN?" "Desligar" - "Versão %s" + "Versão" "Esquecer VPN" "Pretende substituir a VPN existente?" "Pretende definir a VPN como sempre ativa?" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 268d4ef1673..6444c385c0d 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -2924,7 +2924,7 @@ "Conectar a %s" "Desconectar esta VPN?" "Desconectar" - "Versão %s" + "Versão" "Esquecer VPN" "Substituir VPN já existente?" "Configurar VPN sempre ativa?" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index fce7291bb6d..7bd73750631 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -2963,7 +2963,7 @@ "Conectați-vă la %s" "Doriți să vă deconectați de la această rețea VPN?" "Deconectați-vă" - "Versiunea %s" + "Versiune" "Eliminați profilul VPN" "Înlocuiți rețeaua VPN existentă?" "Setați rețeaua VPN ca activată permanent?" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 953d9e9b706..8bd1989472a 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -3002,7 +3002,7 @@ "Подключение к %s" "Отключиться от VPN?" "Да" - "Версия %s" + "Версия" "Удалить VPN" "Сменить текущую VPN-сеть?" "Настроить постоянную VPN-сеть?" diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index 2963b82cf21..841bc30765e 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -2924,7 +2924,7 @@ "%s වෙත සම්බන්ධ කරන්න" "මෙම VPN එක විසන්ධි කරන්නද?" "විසන්ධි කරන්න" - "අනුවාදය %s" + "අනුවාදය" "VPN අමතක කරන්න" "පවතින VPN ප්‍රතිස්ථාපනය කරන්නද?" "සැම විට ක්‍රියාත්මක VPN සකසන්නද?" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 981ca39568a..445ea7e3b0d 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -3002,7 +3002,7 @@ "Pripojiť k profilu %s" "Odpojiť tento profil VPN?" "Odpojiť" - "Verzia %s" + "Verzia" "Zabudnúť profil VPN" "Nahradiť existujúcu sieť VPN?" "Nastaviť sieť VPN, ktorá je vždy zapnutá?" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 2d8b7a53c17..4035c519a43 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -3002,7 +3002,7 @@ "Povezovanje z %s" "Prekinitev povezave s tem omrežjem VPN?" "Prekini povezavo" - "Različica %s" + "Različica" "Pozabi omrežje VPN" "Želite zamenjati obstoječe omrežje VPN?" "Ali želite, da je omrežje VPN stalno vklopljeno?" diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index 9c4e60aa07b..7236e838db3 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -2924,7 +2924,7 @@ "Lidhu me %s" "Shkëpute këtë rrjet VPN" "Shkëpute" - "Versioni %s" + "Versioni" "Harroje rrjetin VPN" "Të zëvendësohet rrjeti ekzistues VPN?" "Të caktohet rrjeti VPN gjithmonë aktiv?" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index b44b8e2883a..8b362440cab 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -2963,7 +2963,7 @@ "Повезивање на профил %s" "Желите ли да прекинете везу са овим VPN-ом?" "Прекини везу" - "Верзија %s" + "Верзија" "Заборави VPN" "Желите ли да замените постојећи VPN?" "Желите ли да подесите увек укључени VPN?" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 7bfe14bca76..e9c22a97793 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -2924,7 +2924,7 @@ "Anslut till %s" "Vill du koppla från VPN?" "Koppla från" - "Version %s" + "Version" "Glöm VPN" "Vill du byta ut befintligt VPN?" "Vill du ange Always-on VPN?" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 468653d4c54..8ecdef426fe 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -2924,7 +2924,7 @@ "Unganisha kwa %s" "Ungependa kuondoa VPN hii?" "Kata muungnisho" - "Toleo la %s" + "Toleo" "Ondoa VPN" "Ungependa kubadilisha VPN iliyopo?" "Ungependa kuweka VPN iliyowashwa kila mara?" diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index a6ca8485af3..52e2417122e 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -2924,7 +2924,7 @@ "%s உடன் இணை" "VPNஐத் துண்டிக்கவா?" "தொடர்பைத் துண்டி" - "பதிப்பு %s" + "பதிப்பு" "VPNஐ நீக்கு" "தற்போதுள்ள VPNஐ மாற்றியமைக்கவா?" "எப்போதும் இயங்கும் VPNஐ அமைக்கவா?" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 87d5aa84084..bf0c2d3b67d 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -2924,7 +2924,7 @@ "%sకి కనెక్ట్ చేయండి" "ఈ VPNను డిస్‌కనెక్ట్ చేయాలా?" "డిస్‌కనెక్ట్ చేయి" - "వెర్షన్ %s" + "వెర్షన్" "VPNని విస్మరించు" "ఇప్పటికే ఉన్న VPNని భర్తీ చేయాలా?" "ఎల్లప్పుడూ ఆన్‌లో ఉండే VPNని సెట్ చేయాలా?" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index bdbbd527601..203b62e46d0 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -2924,7 +2924,7 @@ "เชื่อมต่อกับ %s" "ยกเลิกการเชื่อมต่อ VPN นี้ไหม" "ยกเลิกการเชื่อมต่อ" - "เวอร์ชัน %s" + "รุ่น" "ลืม VPN" "แทนที่ VPN ที่มีอยู่หรือไม่" "ตั้งค่า VPN แบบเปิดตลอดเวลาหรือไม่" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 5f36799a624..7722820faf1 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -2924,7 +2924,7 @@ "Kumonekta sa %s" "Putulin ang koneksyon ng VPN na ito?" "Putulin ang koneksyon" - "Bersyon %s" + "Bersyon" "Kalimutan ang VPN" "Gusto mo bang palitan ang dati nang VPN?" "Gusto mo bang itakda ang VPN na palaging naka-on?" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 23dde676c4e..2d8c2a9f386 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -2924,7 +2924,7 @@ "%s profiline bağlan" "Bu VPN\'nin bağlantısı kesilsin mi?" "Bağlantıyı kes" - "Sürüm %s" + "Sürüm" "VPN\'yi unut" "Mevcut VPN değiştirilsin mi?" "Her zaman açık VPN ayarlansın mı?" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index bb0d777d521..da5029094ef 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -3002,7 +3002,7 @@ "Під’єднатися до профілю %s" "Відключити цю мережу VPN?" "Відключити" - "Версія %s" + "Версія" "Забути мережу VPN" "Замінити наявну мережу VPN?" "Увімкнути постійну мережу VPN?" diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index 735dd3fee12..ad672de953a 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -2924,7 +2924,7 @@ "%s سے مربوط کریں" "‏اس VPN سے غیر منسلک کریں؟" "غیر منسلک کریں" - "ورژن %s" + "ورژن" "‏VPN بھول جائیں" "‏موجودہ VPN بدلیں؟" "‏ہمیشہ آن VPN سیٹ کریں؟" diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index 20f917dcb11..b66b4b15b0d 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -2924,7 +2924,7 @@ "%s tarmog‘iga ulanish" "Bu VPN bilan aloqa uzilsinmi?" "Aloqani uzish" - "%s versiya" + "Versiya" "VPNni o‘chirish" "Mavjud VPN tarmog‘i almashtirilsinmi?" "Doimiy VPN o‘rnatilsinmi?" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 64c40b58257..4c718a3714e 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -2924,7 +2924,7 @@ "Kết nối với %s" "Ngắt kết nối VPN này?" "Ngắt kết nối" - "Phiên bản %s" + "Phiên bản" "Xóa VPN" "Thay thế VPN hiện có?" "Đặt VPN luôn bật?" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index f3fadb06212..909636ed2dd 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -2924,7 +2924,7 @@ "连接到%s" "要断开与此 VPN 的连接吗？" "断开连接" - "版本 %s" + "版本" "取消保存 VPN" "要替换现有 VPN 吗？" "要设置始终开启的 VPN 吗？" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 14dabfb9273..328733d1252 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -2925,7 +2925,7 @@ "連接「%s」" "要解除連結此 VPN 嗎？" "中斷連線" - "版本為：%s" + "版本" "刪除 VPN" "要取代目前的 VPN 嗎？" "要設定保持開啟的 VPN 嗎？" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 1ffd255f115..128af0cf768 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -2924,7 +2924,7 @@ "連線到「%s」" "要中斷這個 VPN 連線嗎？" "中斷連線" - "版本 %s" + "版本" "清除 VPN 設定檔" "要取代現有的 VPN 嗎？" "要設定永久連線的 VPN 嗎？" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 7dfbccc62f1..a449a244feb 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -2925,7 +2925,7 @@ "Xhuma ku-%s" "Nqamula le-VPN" "Nqamula" - "Inguqulo engu-%s" + "Uhlobo" "Khohlwa i-VPN" "Shintshanisa i-VPN ekhona?" "Setha i-VPN ehlala ivuliwe?" From 42c15dc26ce3ea010e9afe8f88b1d427ea778964 Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 28 Apr 2022 18:43:59 +0000 Subject: [PATCH 08/15] Import translations. DO NOT MERGE ANYWHERE BUG:205460459 Auto-generated-cl: translation import Change-Id: Ie80b96d07d3e8bd2c55b86e0af83bdb6a418b3fc --- 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 | 2 +- res/values-ca/strings.xml | 2 +- res/values-cs/strings.xml | 2 +- res/values-da/strings.xml | 2 +- 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 | 2 +- res/values-gu/strings.xml | 2 +- res/values-hi/strings.xml | 2 +- res/values-hr/strings.xml | 2 +- res/values-hu/strings.xml | 2 +- res/values-hy/strings.xml | 2 +- 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 | 2 +- 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 | 2 +- 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 | 2 +- res/values-vi/strings.xml | 2 +- res/values-zh-rCN/strings.xml | 2 +- res/values-zh-rHK/strings.xml | 2 +- res/values-zh-rTW/strings.xml | 2 +- res/values-zu/strings.xml | 2 +- 85 files changed, 85 insertions(+), 85 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 20afa5126cc..39aca169280 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -2936,7 +2936,7 @@ "Koppel aan %s" "Ontkoppel hierdie VPN?" "Ontkoppel" - "Weergawe %s" + "Weergawe" "Vergeet VPN" "Vervang bestaande VPN?" "Stel altyd-aan VPN?" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index ea10b06330d..d9ffd87f077 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -2936,7 +2936,7 @@ "ከ%s ጋር ተገናኝ" "የዚህ ቪፒኤን ግንኙነት ይቋረጥ?" "ግንኙነት አቋርጥ" - "ሥሪት %s" + "ስሪት" "VPNን እርሳ" "አሁን ያለው VPN ይተካ?" "ሁልጊዜ-የበራ VPN ይቀናበር?" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index b2f73dde3a7..19aacf95122 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -3092,7 +3092,7 @@ "الاتصال بـ %s" "‏هل تريد قطع الاتصال بهذه الشبكة الافتراضية الخاصة (VPN)؟" "قطع الاتصال" - "الإصدار %s" + "الإصدار" "نسيان الشبكة الافتراضية الخاصة" "هل تريد استبدال الشبكة الافتراضية الخاصة الحالية؟" "هل تريد تشغيل الشبكة الافتراضية الخاصة باستمرار؟" diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index fcb98426c78..c6e82c73660 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -2936,7 +2936,7 @@ "%sৰ সৈতে সংযোগ কৰক" "এই ভিপিএনটোৰ সৈতে সংযোগ বিচ্ছিন্ন কৰিবনে?" "সংযোগ বিচ্ছিন্ন কৰক" - "সংস্কৰণ %s" + "সংস্কৰণ" "ভিপিএন পাহৰক" "পূৰ্বৰ ভিপিএনটো সলনি কৰেনে?" "ভিপিএনক যিকোনো সময়ত অন থকা অবস্থাত ছেট কৰিবনে?" diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index 39af48b2fca..ffd1d777b66 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -2936,7 +2936,7 @@ "%s profilinə qoşulun" "Bu VPN bağlantısı kəsilsin?" "Bağlantını kəsin" - "Versiya %s" + "Versiya" "VPN\'i unudun" "Mövcud VPN əvəz edilsin?" "Hər zaman aktiv VPN quraşdırılsın?" diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index 0510f27e05b..f318052575b 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -2975,7 +2975,7 @@ "Povezivanje na profil %s" "Želite li da prekinete vezu sa ovim VPN-om?" "Prekini vezu" - "Verzija %s" + "Verzija" "Zaboravi VPN" "Želite li da zamenite postojeći VPN?" "Želite li da podesite uvek uključeni VPN?" diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 8b40efceab0..c281436b4c2 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -3014,7 +3014,7 @@ "Падключэнне да профiлю %s" "Адключыць гэту VPN?" "Адключыць" - "Версія %s" + "Версія" "Забыць VPN" "Замяніць існуючую VPN?" "Наладзіць заўсёды ўключаную VPN?" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index c0acd1d1099..b9820faba53 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -2936,7 +2936,7 @@ "Свързване със: %s" "Да се прекрати ли връзката с тази виртуална частна мрежа (VPN)?" "Прекратяване на връзката" - "Версия %s" + "Версия" "Забравяне на вирт. частна мрежа (VPN)" "Да се замени ли съществуващата VPN?" "Да се зададе ли винаги включена виртуална частна мрежа (VPN)?" diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index db99db43fc1..10f4f6b7478 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -2936,7 +2936,7 @@ "%s এতে কানেক্ট করুন" "এই VPN থেকে ডিসকানেক্ট করবেন?" "ডিসকানেক্ট করুন" - "ভার্সন %s" + "ভার্সন" "VPN সরিয়ে দিন" "বিদ্যমান VPN প্রতিস্থাপন করতে চান?" "সর্বদা-চালু VPN সেট করতে চান?" diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 4a22a9f11b9..66a25af5af5 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -2975,7 +2975,7 @@ "Poveži se na %s" "Želite li prekinuti vezu s ovim VPN-om?" "Prekini vezu" - "Verzija %s" + "Verzija" "Zaboravi VPN" "Želite li zamijeniti postojeći VPN?" "Želite li postaviti uvijek uključen VPN?" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 0604093c2e1..fb543175836 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -2936,7 +2936,7 @@ "Connexió amb %s" "Vols desconnectar aquesta VPN?" "Desconnecta" - "Versió %s" + "Versió" "Oblida la VPN" "Vols substituir la VPN actual?" "Vols definir la VPN sempre activa?" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index a6fe06c75ea..7e176f944de 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -3014,7 +3014,7 @@ "Připojit k profilu %s" "Odpojit tuto síť VPN?" "Odpojit" - "Verze %s" + "Verze" "Zapomenout VPN" "Nahradit stávající síť VPN?" "Nastavit trvalou síť VPN?" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 8a0c4509335..737b0e30220 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -2936,7 +2936,7 @@ "Opret forbindelse til %s" "Vil du afbryde dette VPN?" "Afbryd" - "Version %s" + "Version" "Glem VPN" "Erstat det eksisterende VPN-netværk?" "Vil du konfigurere konstant VPN?" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 09100ddc72e..f52ad522686 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -2937,7 +2937,7 @@ "Mit %s verbinden" "Verbindung zu diesem VPN trennen?" "Verbindung trennen" - "Version %s" + "Version" "VPN entfernen" "Aktuelles VPN ersetzen?" "Durchgehend aktives VPN aktivieren?" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 1eba38a5269..6ef2dc4e01a 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -2936,7 +2936,7 @@ "Σύνδεση στο προφίλ %s" "Να αποσυνδεθεί αυτό το VPN;" "Αποσύνδεση" - "Έκδοση %s" + "Έκδοση" "Διαγραφή VPN" "Αντικατάσταση υπάρχοντος VPN;" "Ενεργοποίηση του μονίμως ενεργού VPN;" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 2c5e1f7d2db..90aada9926f 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -2936,7 +2936,7 @@ "Connect to %s" "Disconnect this VPN?" "Disconnect" - "Version %s" + "Version" "Forget VPN" "Replace existing VPN?" "Set always-on VPN?" diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index de49faca6b5..0aa338284a4 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -2936,7 +2936,7 @@ "Connect to %s" "Disconnect this VPN?" "Disconnect" - "Version %s" + "Version" "Forget VPN" "Replace existing VPN?" "Set always-on VPN?" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 683a963dbb9..07e42a61699 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -2936,7 +2936,7 @@ "Connect to %s" "Disconnect this VPN?" "Disconnect" - "Version %s" + "Version" "Forget VPN" "Replace existing VPN?" "Set always-on VPN?" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 1ed1081a79b..8353c65d87b 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -2936,7 +2936,7 @@ "Connect to %s" "Disconnect this VPN?" "Disconnect" - "Version %s" + "Version" "Forget VPN" "Replace existing VPN?" "Set always-on VPN?" diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml index 34b69346d22..878fd068bad 100644 --- a/res/values-en-rXC/strings.xml +++ b/res/values-en-rXC/strings.xml @@ -2936,7 +2936,7 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎Connect to ‎‏‎‎‏‏‎%s‎‏‎‎‏‏‏‎‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‎‏‏‎Disconnect this VPN?‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‎Disconnect‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‏‎Version ‎‏‎‎‏‏‎%s‎‏‎‎‏‏‏‎‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‎‎‎Version‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎Forget VPN‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎Replace existing VPN?‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎Set always-on VPN?‎‏‎‎‏‎" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 75ca718f0a6..6aaa4d1627d 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -2936,7 +2936,7 @@ "Conectar a %s" "¿Deseas desconectar esta VPN?" "Desconectar" - "Versión %s" + "Versión" "Borrar VPN" "¿Reemplazar VPN existente?" "¿Configurar la VPN siempre activa?" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 5e29d00febf..8e2b339a89e 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -2936,7 +2936,7 @@ "Conectar a %s" "¿Desconectar esta VPN?" "Desconectar" - "Versión %s" + "Versión" "Olvidar VPN" "¿Reemplazar VPN actual?" "¿Configurar el modo de VPN siempre activada?" diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index a82a37e75f4..6546450cd2e 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -2936,7 +2936,7 @@ "Profiiliga %s ühendamine" "Kas soovite katkestada ühenduse selle VPN-iga?" "Katkesta ühendus" - "Versioon %s" + "Versioon" "Unusta VPN" "Kas asendada olemasolev VPN?" "Kas määrata alati sisselülitatud VPN?" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index aee5d84bc2d..5c3387ae305 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -2936,7 +2936,7 @@ "Konektatu %s profilera" "VPN saretik deskonektatu nahi duzu?" "Deskonektatu" - "%s bertsioa" + "Bertsioa" "Ahaztu VPN konexioa" "Dagoen VPN konexioa ordeztu nahi duzu?" "VPNa beti aktibatuta egoteko aukera ezarri nahi duzu?" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 4d92a04da14..a8e969ba623 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -2936,7 +2936,7 @@ "اتصال به %s" "‏اتصال به این VPN.قطع‌ شود؟" "قطع ارتباط" - "نسخه %s" + "نسخه" "‏فراموش کردن VPN" "‏VPN موجود جایگزین شود؟" "‏VPN همیشه روشن تنظیم شود؟" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index fc02742fd32..1f6be1faccf 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -2936,7 +2936,7 @@ "Yhdistä profiiliin %s" "Katkaistaanko VPN-yhteys?" "Katkaise yhteys" - "Versio %s" + "Versio" "Unohda VPN" "Korvataanko nykyinen VPN?" "Määritetäänkö aina käytössä oleva VPN?" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 4a340b638bd..cd373d0e117 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -2936,7 +2936,7 @@ "Se connecter à %s" "Déconnecter ce RPV?" "Déconnecter" - "Version %s" + "Version" "Oublier le profil RPV" "Remplacer le RPV existant?" "Définir le RPV permanent?" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index d67d487a398..6457746ecc3 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -2936,7 +2936,7 @@ "Se connecter à %s" "Déconnecter ce VPN ?" "Déconnecter" - "Version %s" + "Version" "Supprimer le VPN" "Remplacer le VPN existant ?" "Définir le VPN permanent ?" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index fab1cadae4f..85c33302377 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -2936,7 +2936,7 @@ "Conectar con %s" "Queres desconectar esta VPN?" "Desconectar" - "Versión %s" + "Versión" "Esquecer perfil da VPN" "Queres substituír a VPN existente?" "Queres definir a VPN como sempre activa?" diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index 8da374903a9..781eb8c0576 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -2936,7 +2936,7 @@ "%s સાથે કનેક્ટ કરો" "આ VPNને ડિસ્કનેક્ટ કરીએ?" "ડિસ્કનેક્ટ કરો" - "વર્ઝન %s" + "વર્ઝન" "VPN ભૂલી ગયાં" "અસ્તિત્વમાંની VPN ને બદલીએ?" "હંમેશાં ચાલુ VPN સેટ કરીએ?" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index cc7f1a85812..9019a325e1a 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -2936,7 +2936,7 @@ " %s से कनेक्ट करें" "इस VPN को डिसकनेक्ट करना चाहते हैं?" "डिसकनेक्ट करें" - "वर्शन %s" + "वर्शन" "वीपीएन भूल जाएं" "मौजूदा VPN को बदलें?" "हमेशा-चालू VPN सेट करें?" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index c406ceca270..d218d719a63 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -2975,7 +2975,7 @@ "Povezivanje s profilom %s" "Prekinuti vezu s VPN-om?" "Prekini vezu" - "Verzija %s" + "Verzija" "Zaboravi VPN" "Želite li zamijeniti dosadašnji VPN?" "Želite li postaviti uvijek uključeni VPN?" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 6e54c048b84..c02466e48e4 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -2936,7 +2936,7 @@ "Csatlakozás a következőhöz: %s" "Leválasztja a VPN-t?" "Leválasztás" - "Verzió: %s" + "Verzió" "VPN elfelejtése" "Lecseréli a meglévő VPN-t?" "Beállítja a mindig bekapcsolt VPN-t?" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index 7d97250fdb0..450df6ba6a0 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -2937,7 +2937,7 @@ "Միանալ %s-ին" "Անջատե՞լ այս VPN-ը:" "Անջատել" - "Տարբերակ %s" + "Տարբերակ" "Մոռանալ VPN-ը" "Փոխարինե՞լ ընթացիկ VPN-ը:" "Սահմանե՞լ որպես «միշտ միացված» VPN:" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 80433be3c93..059c8d50b86 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -2936,7 +2936,7 @@ "Menghubungkan ke %s" "Putuskan sambungan VPN ini?" "Putuskan koneksi" - "Versi %s" + "Versi" "Lupakan VPN" "Ganti VPN yang sudah ada?" "Setel VPN selalu aktif?" diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index 518a0175c6e..8bbada1849d 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -2936,7 +2936,7 @@ "Tengjast %s" "Aftengja þessa VPN-tengingu?" "Aftengja" - "Útgáfa %s" + "Útgáfa" "Gleyma VPN" "Skipta út núverandi VPN?" "Velja VPN sem alltaf er kveikt á?" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index a17ad3094fd..04b14297357 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -2936,7 +2936,7 @@ "Connessione a %s" "Disconnettere questa VPN?" "Disconnetti" - "Versione %s" + "Versione" "Rimuovi VPN" "Sostituire la rete VPN esistente?" "Impostare la rete VPN sempre attiva?" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index df78eee6500..24505c4b027 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -3014,7 +3014,7 @@ "התחברות אל %s" "‏האם לנתק את ה-VPN הזה?" "ניתוק" - "גרסה %s" + "גרסה" "‏אני רוצה לשכוח את ה-VPN" "‏האם להחליף רשת VPN קיימת?" "‏האם להגדיר את רשת ה-VPN בחיבור תמידי?" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index a56ed366308..6ef6238e0c2 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -2936,7 +2936,7 @@ "%sに接続" "この VPN の接続を解除しますか？" "接続を解除" - "バージョン%s" + "バージョン" "VPN を削除" "既存の VPN を置き換えますか？" "常時接続 VPN を設定しますか？" diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index cd151df8216..6edfae802b3 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -2936,7 +2936,7 @@ "დაკავშირებულია %s-თან" "გსურთ ამ VPN-თან კავშირის გაწყვეტა?" "კავშირის გაწყვეტა" - "ვერსია %s" + "ვერსია" "VPN-ის დავიწყება" "გსურთ არსებული VPN-ის ჩანაცვლება?" "გსურთ ყოველთვის ჩართული VPN-ის დაყენება?" diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index 49684897cb4..d0cfa513193 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -2936,7 +2936,7 @@ "%s профайлына жалғау" "Осы VPN желісі ажыратылсын ба?" "Ажырату" - "Нұсқасы: %s" + "Нұсқа" "VPN ұмыту" "Бар VPN қолданбасын ауыстыру керек пе?" "Әрқашан қосулы VPN режимін орнату" diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index 21c4cc87295..ecd4f18a0fc 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -2936,7 +2936,7 @@ "តភ្ជាប់ %s" "ផ្តាច់ VPN នេះ?" "ផ្ដាច់" - "កំណែ %s" + "កំណែ" "បំភ្លេច VPN" "ជំនួស VPN ដែលមានស្រាប់ឬ?" "កំណត់ VPN ឲ្យបើកជានិច្ចឬ?" diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index 7f7aa94bccd..d093b537599 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -2936,7 +2936,7 @@ "%s ಗೆ ಸಂಪರ್ಕಿಸಿ" "ಈ VPN ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?" "ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ" - "%s ಆವೃತ್ತಿ" + "ಆವೃತ್ತಿ" "VPN ಮರೆತುಬಿಡು" "ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ VPN ಸ್ಥಾನಾಂತರಿಸುವುದೇ?" "VPN ಯಾವಾಗಲೂ ಆನ್ ಆಗಿರುವಂತೆ ಹೊಂದಿಸುವುದೇ?" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index d2e7a4bfb25..df5a86155ed 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -2936,7 +2936,7 @@ "%s에 연결" "이 VPN을 연결 해제하시겠습니까?" "연결 해제" - "버전 %s" + "버전" "VPN 삭제" "기존 VPN을 교체하시겠습니까?" "연결 유지 VPN을 설정하시겠습니까?" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 17b1033c6b3..1fa10df3404 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -2937,7 +2937,7 @@ "%s менен байланышуу" "Бул VPN ажыратылсынбы?" "Ажыратуу" - "%s версиясы" + "Версия" "VPN профили унутулсун" "Учурдагы VPN алмаштырылсынбы?" "Туруктуу VPN\'ди жөндөйсүзбү?" diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index 3788bb9cb43..4e11b63b951 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -2936,7 +2936,7 @@ "ເຊື່ອມຕໍ່ຫາ %s" "ຕັດການເຊື່ອມຕໍ່ VPN ນີ້ບໍ?" "ຕັດການເຊື່ອມຕໍ່" - "ເວີ​ຊັນ %s" + "ເວີຊັນ" "ລືມ VPN" "ຂຽນທັບ VPN ທີ່ມີຢູ່ກ່ອນແລ້ວຂອງທ່ານບໍ?" "Set always-on VPN?" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 33f917fcc6f..5f561c7e7ce 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -3014,7 +3014,7 @@ "Prisijungti prie %s" "Atsijungti nuo šio VPN?" "Atsijungti" - "%s versija" + "Versija" "Pamiršti VPN" "Pakeisti esamą VPN?" "Nustatyti visada įjungtą VPN?" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 563a77f6c54..54b1c082824 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -2975,7 +2975,7 @@ "Savienojuma izveide ar %s" "Vai pārtraukt šo VPN savienojumu?" "Pārtraukt savienojumu" - "Versija %s" + "Versija" "Aizmirst VPN" "Vai aizstāt esošo VPN?" "Vai iestatīt vienmēr ieslēgtu VPN?" diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 76977025dbe..707b8b35962 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -2936,7 +2936,7 @@ "Поврзи се со %s" "Да се исклучи оваа VPN?" "Прекини врска" - "Верзија %s" + "Верзија" "Заборави VPN" "Да се замени постојната VPN?" "Да се постави „секогаш вклучена“ VPN?" diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index 90823bbd55b..623e34959ca 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -2936,7 +2936,7 @@ "%s എന്നതിലേക്ക് കണക്റ്റുചെയ്യുക" "ഈ VPN വിച്ഛേദിക്കണോ?" "വിച്ഛേദിക്കുക" - "പതിപ്പ് %s" + "പതിപ്പ്" "VPN മറക്കുക" "നിലവിലുള്ള VPN-ന് പകരം പുതിയതാക്കണോ?" "\'എല്ലായ്പ്പോഴും ഓൺ\' VPN സജ്ജമാക്കണോ?" diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index 94faf04c0f1..ed62f271861 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -2936,7 +2936,7 @@ "%s руу холбогдох" "Энэ VPN-г салгах уу?" "Салгах" - "Хувилбар %s" + "Хувилбар" "VPN-г мартах" "Энэ VPN-г солих уу?" "VPN-г тогтмол асаалттайгаар тохируулах уу?" diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index 0159454a4c2..dbe4c28107f 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -2937,7 +2937,7 @@ "%s शी कनेक्ट करा" "हे VPN डिस्कनेक्ट करायचे?" "‍डिस्कनेक्ट करा" - "आवृत्ती %s" + "आवृत्ती" "VPN विसरा" "विद्यमान VPN पुनर्स्थित करायचे?" "नेहमी-सुरू VPN सेट करायचे?" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 8bb6f9dd945..655f20af66f 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -2936,7 +2936,7 @@ "Sambung ke %s" "Putuskan sambungan VPN ini?" "Putuskan sambungan" - "Versi %s" + "Versi" "Lupakan VPN" "Gantikan VPN yang sedia ada?" "Tetapkan VPN sentiasa hidup?" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 0ee666e7605..833e34b9bf7 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -2936,7 +2936,7 @@ "%s နှင့် ချိတ်ဆက်ခြင်း" "ဤ VPN အား ချိတ်ဆက်မှု ဖြုတ်လိုပါသလား။" "ဆက်သွယ်မှု ဖြတ်ရန်" - "ဗားရှင်း %s" + "ဗားရှင်း" "VPN ကိုမေ့လိုက်ပါ" "ရှိပြီးသား VPN ကိုအစားထိုးမလား။" "VPN ကို အမြဲတမ်းဖွင့်ထားရန် သတ်မှတ်မလား။" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index fb77910b599..065ed23f2a9 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -2936,7 +2936,7 @@ "Koble til %s" "Vil du koble fra dette VPN-et?" "Koble fra" - "Versjon %s" + "Versjon" "Glem VPN-profilen" "Vil du erstatte det nåværende VPN-et?" "Vil du angi alltid på-VPN?" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index e2db9dbae84..ccb8471fe37 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -2936,7 +2936,7 @@ "%s मा जोड्नुहोस्" "यो VPN को जडान विच्छेद गर्ने हो?" "डिस्कनेक्ट गर्नुहोस्" - "संस्करण %s" + "संस्करण" "VPN लाई बिर्सनुहोस्" "विद्यमान VPN लाई बदल्ने हो?" "सधैँ-सक्रिय VPN लाई सेट गर्ने हो?" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 0401e6e2247..92d5f0b9eb7 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -2936,7 +2936,7 @@ "Verbinding maken met %s" "Verbinding met dit VPN verbreken?" "Verbinding verbreken" - "Versie %s" + "Versie" "VPN vergeten" "Bestaande VPN vervangen?" "Always-on VPN instellen?" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index e92e2b86404..0a22fee385d 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -2936,7 +2936,7 @@ "%s ସହ ସଂଯୋଗ କରନ୍ତୁ" "ଏହି VPNକୁ ବିଚ୍ଛିନ୍ନ କରିବେ?" "ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ" - "ସଂସ୍କରଣ %s" + "ସଂସ୍କରଣ" "VPNକୁ ଭୁଲିଯାଅ" "ପୂର୍ବରୁ ଥିବା VPNକୁ ବଦଳାଇବେ?" "ସର୍ବଦା-ଅନ୍‌ ଥିବା VPN ସେଟ୍‌ କରିବେ?" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index aeee1632a72..812cfd42caf 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -2936,7 +2936,7 @@ "%s ਨਾਲ ਕਨੈਕਟ ਕਰੋ" "ਇਹ VPN ਡਿਸਕਨੈਕਟ ਕਰੀਏ?" "ਡਿਸਕਨੈਕਟ ਕਰੋ" - "ਵਰਜਨ %s" + "ਵਰਜਨ" "VPN ਨੂੰ ਭੁੱਲ ਜਾਓ" "ਕੀ ਮੌਜੂਦਾ VPN ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?" "ਕੀ ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN ਨੂੰ ਸੈੱਟ ਕਰਨਾ ਹੈ?" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index c3b105ea79b..3c3c3bee783 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -3014,7 +3014,7 @@ "Połącz z: %s" "Odłączyć tę sieć VPN?" "Odłącz" - "Wersja %s" + "Wersja" "Zapomnij VPN" "Zastąpić obecną sieć VPN?" "Ustawić stały VPN?" diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 9ae1ef81bd2..dc1186bb133 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -2936,7 +2936,7 @@ "Conectar a %s" "Desconectar esta VPN?" "Desconectar" - "Versão %s" + "Versão" "Esquecer VPN" "Substituir VPN já existente?" "Configurar VPN sempre ativa?" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index d3569d768e8..1ede3ea03d5 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -2936,7 +2936,7 @@ "Ligar a %s" "Pretende desligar esta VPN?" "Desligar" - "Versão %s" + "Versão" "Esquecer VPN" "Pretende substituir a VPN existente?" "Pretende definir a VPN como sempre ativa?" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 9ae1ef81bd2..dc1186bb133 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -2936,7 +2936,7 @@ "Conectar a %s" "Desconectar esta VPN?" "Desconectar" - "Versão %s" + "Versão" "Esquecer VPN" "Substituir VPN já existente?" "Configurar VPN sempre ativa?" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index c24ea86d3bd..abd6a961ef9 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -2975,7 +2975,7 @@ "Conectați-vă la %s" "Doriți să vă deconectați de la această rețea VPN?" "Deconectați-vă" - "Versiunea %s" + "Versiune" "Eliminați profilul VPN" "Înlocuiți rețeaua VPN existentă?" "Setați rețeaua VPN ca activată permanent?" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 4f2642112c1..aacd9cd2eb4 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -3014,7 +3014,7 @@ "Подключение к %s" "Отключиться от VPN?" "Да" - "Версия %s" + "Версия" "Удалить VPN" "Сменить текущую VPN-сеть?" "Настроить постоянную VPN-сеть?" diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index 6bd4c4a6543..67ca1a36a85 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -2936,7 +2936,7 @@ "%s වෙත සම්බන්ධ කරන්න" "මෙම VPN එක විසන්ධි කරන්නද?" "විසන්ධි කරන්න" - "අනුවාදය %s" + "අනුවාදය" "VPN අමතක කරන්න" "පවතින VPN ප්‍රතිස්ථාපනය කරන්නද?" "සැම විට ක්‍රියාත්මක VPN සකසන්නද?" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index c3bb95fdf20..a32ead99fb0 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -3014,7 +3014,7 @@ "Pripojiť k profilu %s" "Odpojiť tento profil VPN?" "Odpojiť" - "Verzia %s" + "Verzia" "Zabudnúť profil VPN" "Nahradiť existujúcu sieť VPN?" "Nastaviť sieť VPN, ktorá je vždy zapnutá?" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 3e28f748106..0d6cc3d40ca 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -3014,7 +3014,7 @@ "Povezovanje z %s" "Prekinitev povezave s tem omrežjem VPN?" "Prekini povezavo" - "Različica %s" + "Različica" "Pozabi omrežje VPN" "Želite zamenjati obstoječe omrežje VPN?" "Ali želite, da je omrežje VPN stalno vklopljeno?" diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index 2337ec66bf7..acc1ff362b6 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -2936,7 +2936,7 @@ "Lidhu me %s" "Shkëpute këtë rrjet VPN" "Shkëpute" - "Versioni %s" + "Versioni" "Harroje rrjetin VPN" "Të zëvendësohet rrjeti ekzistues VPN?" "Të caktohet rrjeti VPN gjithmonë aktiv?" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 5b13f72bff9..dd7869ff2f6 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -2975,7 +2975,7 @@ "Повезивање на профил %s" "Желите ли да прекинете везу са овим VPN-ом?" "Прекини везу" - "Верзија %s" + "Верзија" "Заборави VPN" "Желите ли да замените постојећи VPN?" "Желите ли да подесите увек укључени VPN?" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index f45af5399ba..09b0f3bc533 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -2936,7 +2936,7 @@ "Anslut till %s" "Vill du koppla från VPN?" "Koppla från" - "Version %s" + "Version" "Glöm VPN" "Vill du byta ut befintligt VPN?" "Vill du ange Always-on VPN?" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 48ec9a08dcb..3df0e52d7d6 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -2936,7 +2936,7 @@ "Unganisha kwa %s" "Ungependa kuondoa VPN hii?" "Kata muungnisho" - "Toleo la %s" + "Toleo" "Ondoa VPN" "Ungependa kubadilisha VPN iliyopo?" "Ungependa kuweka VPN iliyowashwa kila mara?" diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index bd9633116f4..824a37c833e 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -2936,7 +2936,7 @@ "%s உடன் இணை" "VPNஐத் துண்டிக்கவா?" "தொடர்பைத் துண்டி" - "பதிப்பு %s" + "பதிப்பு" "VPNஐ நீக்கு" "தற்போதுள்ள VPNஐ மாற்றியமைக்கவா?" "எப்போதும் இயங்கும் VPNஐ அமைக்கவா?" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 2ca703680b4..076d3ff9022 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -2936,7 +2936,7 @@ "%sకి కనెక్ట్ చేయండి" "ఈ VPNను డిస్‌కనెక్ట్ చేయాలా?" "డిస్‌కనెక్ట్ చేయి" - "వెర్షన్ %s" + "వెర్షన్" "VPNని విస్మరించు" "ఇప్పటికే ఉన్న VPNని భర్తీ చేయాలా?" "ఎల్లప్పుడూ ఆన్‌లో ఉండే VPNని సెట్ చేయాలా?" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 53b2a10ebed..23aa7df1438 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -2936,7 +2936,7 @@ "เชื่อมต่อกับ %s" "ยกเลิกการเชื่อมต่อ VPN นี้ไหม" "ยกเลิกการเชื่อมต่อ" - "เวอร์ชัน %s" + "รุ่น" "ลืม VPN" "แทนที่ VPN ที่มีอยู่หรือไม่" "ตั้งค่า VPN แบบเปิดตลอดเวลาหรือไม่" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 416f72a5985..ddb2ed32b44 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -2936,7 +2936,7 @@ "Kumonekta sa %s" "Putulin ang koneksyon ng VPN na ito?" "Putulin ang koneksyon" - "Bersyon %s" + "Bersyon" "Kalimutan ang VPN" "Gusto mo bang palitan ang dati nang VPN?" "Gusto mo bang itakda ang VPN na palaging naka-on?" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 21b8247496b..c8ccff35fa1 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -2936,7 +2936,7 @@ "%s profiline bağlan" "Bu VPN\'nin bağlantısı kesilsin mi?" "Bağlantıyı kes" - "Sürüm %s" + "Sürüm" "VPN\'yi unut" "Mevcut VPN değiştirilsin mi?" "Her zaman açık VPN ayarlansın mı?" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index d8dbd2f92d6..a96e53a79a5 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -3014,7 +3014,7 @@ "Під’єднатися до профілю %s" "Відключити цю мережу VPN?" "Відключити" - "Версія %s" + "Версія" "Забути мережу VPN" "Замінити наявну мережу VPN?" "Увімкнути постійну мережу VPN?" diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index 2da64d7d6d9..c21b9fce1ea 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -2936,7 +2936,7 @@ "%s سے مربوط کریں" "‏اس VPN سے غیر منسلک کریں؟" "غیر منسلک کریں" - "ورژن %s" + "ورژن" "‏VPN بھول جائیں" "‏موجودہ VPN بدلیں؟" "‏ہمیشہ آن VPN سیٹ کریں؟" diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index e74a665d165..f293a34905c 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -2936,7 +2936,7 @@ "%s tarmog‘iga ulanish" "Bu VPN bilan aloqa uzilsinmi?" "Aloqani uzish" - "%s versiya" + "Versiya" "VPNni o‘chirish" "Mavjud VPN tarmog‘i almashtirilsinmi?" "Doimiy VPN o‘rnatilsinmi?" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index afe331d80e6..030fc3a3330 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -2936,7 +2936,7 @@ "Kết nối với %s" "Ngắt kết nối VPN này?" "Ngắt kết nối" - "Phiên bản %s" + "Phiên bản" "Xóa VPN" "Thay thế VPN hiện có?" "Đặt VPN luôn bật?" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index b27fd617352..2fd71e6f344 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -2936,7 +2936,7 @@ "连接到%s" "要断开与此 VPN 的连接吗？" "断开连接" - "版本 %s" + "版本" "取消保存 VPN" "要替换现有 VPN 吗？" "要设置始终开启的 VPN 吗？" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 800d53b83ee..ffa134c0c21 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -2937,7 +2937,7 @@ "連接「%s」" "要解除連結此 VPN 嗎？" "中斷連線" - "版本為：%s" + "版本" "刪除 VPN" "要取代目前的 VPN 嗎？" "要設定保持開啟的 VPN 嗎？" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 8181363a7d4..85230cc99ee 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -2936,7 +2936,7 @@ "連線到「%s」" "要中斷這個 VPN 連線嗎？" "中斷連線" - "版本 %s" + "版本" "清除 VPN 設定檔" "要取代現有的 VPN 嗎？" "要設定永久連線的 VPN 嗎？" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 9900e6cc56d..1ec7dd5de66 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -2937,7 +2937,7 @@ "Xhuma ku-%s" "Nqamula le-VPN" "Nqamula" - "Inguqulo engu-%s" + "Uhlobo" "Khohlwa i-VPN" "Shintshanisa i-VPN ekhona?" "Setha i-VPN ehlala ivuliwe?" From b81da264a852cf8245a6cad9009e6886f00579ce Mon Sep 17 00:00:00 2001 From: Bill Yi Date: Thu, 28 Apr 2022 18:48:59 +0000 Subject: [PATCH 09/15] Import translations. DO NOT MERGE ANYWHERE BUG:205460459 Auto-generated-cl: translation import Change-Id: I93c43875f9bc7b4cb45bb663c70410fa3fcaeead --- 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 | 2 +- res/values-ca/strings.xml | 2 +- res/values-cs/strings.xml | 2 +- res/values-da/strings.xml | 2 +- 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 | 2 +- res/values-gu/strings.xml | 2 +- res/values-hi/strings.xml | 2 +- res/values-hr/strings.xml | 2 +- res/values-hu/strings.xml | 2 +- res/values-hy/strings.xml | 2 +- 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 | 2 +- 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 | 2 +- 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 | 2 +- res/values-vi/strings.xml | 2 +- res/values-zh-rCN/strings.xml | 2 +- res/values-zh-rHK/strings.xml | 2 +- res/values-zh-rTW/strings.xml | 2 +- res/values-zu/strings.xml | 2 +- 85 files changed, 85 insertions(+), 85 deletions(-) diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index f342b42b373..7a7489f1c77 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -3229,7 +3229,7 @@ "Koppel aan %s" "Ontkoppel hierdie VPN?" "Ontkoppel" - "Weergawe %s" + "Weergawe" "Vergeet VPN" "Vervang bestaande VPN?" "Stel altyd-aan VPN?" diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index dd9470580d1..4084539ef9c 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -3229,7 +3229,7 @@ "ከ%s ጋር ተገናኝ" "የዚህ ቪፒኤን ግንኙነት ይቋረጥ?" "ግንኙነት አቋርጥ" - "ሥሪት %s" + "ስሪት" "VPNን እርሳ" "አሁን ያለው VPN ይተካ?" "ሁልጊዜ-የበራ VPN ይቀናበር?" diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 844aecaaca2..3906f22d76e 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -3389,7 +3389,7 @@ "الاتصال بـ %s" "‏هل تريد قطع الاتصال بهذه الشبكة الافتراضية الخاصة (VPN)؟" "قطع الاتصال" - "الإصدار %s" + "الإصدار" "نسيان الشبكة الافتراضية الخاصة" "هل تريد استبدال الشبكة الافتراضية الخاصة الحالية؟" "هل تريد تشغيل الشبكة الافتراضية الخاصة باستمرار؟" diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml index f8f7ca8882e..ff3dbe789b0 100644 --- a/res/values-as/strings.xml +++ b/res/values-as/strings.xml @@ -3229,7 +3229,7 @@ "%sৰ সৈতে সংযোগ কৰক" "এই ভিপিএনটোৰ সৈতে সংযোগ বিচ্ছিন্ন কৰিবনে?" "সংযোগ বিচ্ছিন্ন কৰক" - "সংস্কৰণ %s" + "সংস্কৰণ" "ভিপিএন পাহৰক" "পূৰ্বৰ ভিপিএনটো সলনি কৰেনে?" "ভিপিএনক যিকোনো সময়ত অন থকা অবস্থাত ছেট কৰিবনে?" diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml index 9d160aa7ee8..7caa7d04871 100644 --- a/res/values-az/strings.xml +++ b/res/values-az/strings.xml @@ -3229,7 +3229,7 @@ "%s profilinə qoşulun" "Bu VPN bağlantısı kəsilsin?" "Bağlantını kəsin" - "Versiya %s" + "Versiya" "VPN\'i unudun" "Mövcud VPN əvəz edilsin?" "Hər zaman aktiv VPN quraşdırılsın?" diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml index 2e5f50359f1..bbff07688c9 100644 --- a/res/values-b+sr+Latn/strings.xml +++ b/res/values-b+sr+Latn/strings.xml @@ -3269,7 +3269,7 @@ "Povezivanje na profil %s" "Želite li da prekinete vezu sa ovim VPN-om?" "Prekini vezu" - "Verzija %s" + "Verzija" "Zaboravi VPN" "Želite li da zamenite postojeći VPN?" "Želite li da podesite uvek uključeni VPN?" diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml index 711ef1a6142..0b099d92dde 100644 --- a/res/values-be/strings.xml +++ b/res/values-be/strings.xml @@ -3311,7 +3311,7 @@ "Падключэнне да профiлю %s" "Адключыць гэту VPN?" "Адключыць" - "Версія %s" + "Версія" "Забыць VPN" "Замяніць існуючую VPN?" "Наладзіць заўсёды ўключаную VPN?" diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index 6a0d4627a6a..76a6dda0d42 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -3231,7 +3231,7 @@ "Свързване със: %s" "Да се прекрати ли връзката с тази виртуална частна мрежа (VPN)?" "Прекратяване на връзката" - "Версия %s" + "Версия" "Забравяне на вирт. частна мрежа (VPN)" "Да се замени ли съществуващата VPN?" "Да се зададе ли винаги включена виртуална частна мрежа (VPN)?" diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml index a7073d87b8e..9d769736646 100644 --- a/res/values-bn/strings.xml +++ b/res/values-bn/strings.xml @@ -3229,7 +3229,7 @@ "%s এতে কানেক্ট করুন" "এই VPN থেকে ডিসকানেক্ট করবেন?" "ডিসকানেক্ট করুন" - "ভার্সন %s" + "ভার্সন" "VPN সরিয়ে দিন" "বিদ্যমান VPN প্রতিস্থাপন করতে চান?" "সর্বদা-চালু VPN সেট করতে চান?" diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml index 391fb7c1141..d0500077b16 100644 --- a/res/values-bs/strings.xml +++ b/res/values-bs/strings.xml @@ -3269,7 +3269,7 @@ "Poveži se na %s" "Želite li prekinuti vezu s ovim VPN-om?" "Prekini vezu" - "Verzija %s" + "Verzija" "Zaboravi VPN" "Želite li zamijeniti postojeći VPN?" "Želite li postaviti uvijek uključen VPN?" diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 6517399f7e5..4dcb4c2a05d 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -3229,7 +3229,7 @@ "Connexió amb %s" "Vols desconnectar aquesta VPN?" "Desconnecta" - "Versió %s" + "Versió" "Oblida la VPN" "Vols substituir la VPN actual?" "Vols definir la VPN sempre activa?" diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index b10b93fab21..cd18cf24878 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -3309,7 +3309,7 @@ "Připojit k profilu %s" "Odpojit tuto síť VPN?" "Odpojit" - "Verze %s" + "Verze" "Zapomenout VPN" "Nahradit stávající síť VPN?" "Nastavit trvalou síť VPN?" diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index 73abee3bd9c..7c16bfa4e42 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -3229,7 +3229,7 @@ "Opret forbindelse til %s" "Vil du afbryde dette VPN?" "Afbryd" - "Version %s" + "Version" "Glem VPN" "Erstat det eksisterende VPN-netværk?" "Vil du konfigurere konstant VPN?" diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index 974fd2edf1e..958522494c4 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -3232,7 +3232,7 @@ "Mit %s verbinden" "Verbindung zu diesem VPN trennen?" "Verbindung trennen" - "Version %s" + "Version" "VPN entfernen" "Aktuelles VPN ersetzen?" "Durchgehend aktives VPN aktivieren?" diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index f3635778d71..f7843834024 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -3229,7 +3229,7 @@ "Σύνδεση στο προφίλ %s" "Να αποσυνδεθεί αυτό το VPN;" "Αποσύνδεση" - "Έκδοση %s" + "Έκδοση" "Διαγραφή VPN" "Αντικατάσταση υπάρχοντος VPN;" "Ενεργοποίηση του μονίμως ενεργού VPN;" diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml index 35b8c972eb1..35d03fa8a07 100644 --- a/res/values-en-rAU/strings.xml +++ b/res/values-en-rAU/strings.xml @@ -3229,7 +3229,7 @@ "Connect to %s" "Disconnect this VPN?" "Disconnect" - "Version %s" + "Version" "Forget VPN" "Replace existing VPN?" "Set always-on VPN?" diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml index e24d6040b35..592a13447fc 100644 --- a/res/values-en-rCA/strings.xml +++ b/res/values-en-rCA/strings.xml @@ -3229,7 +3229,7 @@ "Connect to %s" "Disconnect this VPN?" "Disconnect" - "Version %s" + "Version" "Forget VPN" "Replace existing VPN?" "Set always-on VPN?" diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 1a1fea47e33..7f875edc62d 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -3229,7 +3229,7 @@ "Connect to %s" "Disconnect this VPN?" "Disconnect" - "Version %s" + "Version" "Forget VPN" "Replace existing VPN?" "Set always-on VPN?" diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index 4d646450545..7c12eabda73 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -3229,7 +3229,7 @@ "Connect to %s" "Disconnect this VPN?" "Disconnect" - "Version %s" + "Version" "Forget VPN" "Replace existing VPN?" "Set always-on VPN?" diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml index 834082a8a18..4772964b751 100644 --- a/res/values-en-rXC/strings.xml +++ b/res/values-en-rXC/strings.xml @@ -3229,7 +3229,7 @@ "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‎‏‏‏‏‏‏‎‏‏‎‎‏‏‏‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‎‏‏‎‎‎‏‏‎‏‎‎Connect to ‎‏‎‎‏‏‎%s‎‏‎‎‏‏‏‎‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‏‏‎‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‏‎‏‏‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‎‎‏‏‏‏‎‎‎‎‎‏‎‏‏‎Disconnect this VPN?‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‏‎‏‏‏‎‎‏‏‎‏‏‎‎‎‏‎‎‎‎‎‎‏‎‏‎‏‏‎‎‏‎‏‏‎‏‏‏‎‎‎‎‏‏‏‎‎‎‎‏‎‏‎‏‎‏‎‎‎‏‎Disconnect‎‏‎‎‏‎" - "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‏‎‏‎‎‎‏‎‏‎‎‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‎‏‏‏‎‎‏‏‎‏‏‏‏‎Version ‎‏‎‎‏‏‎%s‎‏‎‎‏‏‏‎‎‏‎‎‏‎" + "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‎‏‏‎‎‎‎‎‎‏‎‎‏‏‏‎‎‏‎‏‏‎‎‎‎‎‏‏‏‏‎‏‎‏‎‏‏‏‎‏‎‏‎‎‏‎‏‎‎‎‎‎Version‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‎‏‎‎‎‎‏‏‏‏‎‎‏‏‎‎‏‎‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‎‎‎‏‎‏‎‏‏‏‏‎‏‎‎‎‏‏‏‏‏‏‏‎‏‎Forget VPN‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‎‎‏‏‎‎‎‏‏‏‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‏‎‎‎‎Replace existing VPN?‎‏‎‎‏‎" "‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‎‏‎‎‎‏‎‎‏‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‎‏‎‏‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‏‏‏‏‏‏‎‏‎‎Set always-on VPN?‎‏‎‎‏‎" diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 39e6cebbcdd..54b944441b1 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -3231,7 +3231,7 @@ "Conectar a %s" "¿Deseas desconectar esta VPN?" "Desconectar" - "Versión %s" + "Versión" "Borrar VPN" "¿Reemplazar VPN existente?" "¿Configurar la VPN siempre activa?" diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index c46af432df3..0714f26c019 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -3229,7 +3229,7 @@ "Conectar a %s" "¿Desconectar esta VPN?" "Desconectar" - "Versión %s" + "Versión" "Olvidar VPN" "¿Reemplazar VPN actual?" "¿Configurar el modo de VPN siempre activada?" diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml index b70d1ac198c..11bb310b2e0 100644 --- a/res/values-et/strings.xml +++ b/res/values-et/strings.xml @@ -3231,7 +3231,7 @@ "Profiiliga %s ühendamine" "Kas soovite katkestada ühenduse selle VPN-iga?" "Katkesta ühendus" - "Versioon %s" + "Versioon" "Unusta VPN" "Kas asendada olemasolev VPN?" "Kas määrata alati sisselülitatud VPN?" diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml index 90e18e28719..3688d4336ae 100644 --- a/res/values-eu/strings.xml +++ b/res/values-eu/strings.xml @@ -3229,7 +3229,7 @@ "Konektatu %s profilera" "VPN saretik deskonektatu nahi duzu?" "Deskonektatu" - "%s bertsioa" + "Bertsioa" "Ahaztu VPN konexioa" "Dagoen VPN konexioa ordeztu nahi duzu?" "VPNa beti aktibatuta egoteko aukera ezarri nahi duzu?" diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index 2de1172237b..b6e2da21017 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -3229,7 +3229,7 @@ "اتصال به %s" "‏اتصال به این VPN.قطع‌ شود؟" "قطع ارتباط" - "نسخه %s" + "نسخه" "‏فراموش کردن VPN" "‏VPN موجود جایگزین شود؟" "‏VPN همیشه روشن تنظیم شود؟" diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 4a37cd336f9..7a5a50334ae 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -3229,7 +3229,7 @@ "Yhdistä profiiliin %s" "Katkaistaanko VPN-yhteys?" "Katkaise yhteys" - "Versio %s" + "Versio" "Unohda VPN" "Korvataanko nykyinen VPN?" "Määritetäänkö aina käytössä oleva VPN?" diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 51ee45b461b..b748a66f7bc 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -3229,7 +3229,7 @@ "Se connecter à %s" "Déconnecter ce RPV?" "Déconnecter" - "Version %s" + "Version" "Oublier le profil RPV" "Remplacer le RPV existant?" "Définir le RPV permanent?" diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 3b3b4f2ceb8..e5c91cb2c5b 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -3229,7 +3229,7 @@ "Se connecter à %s" "Déconnecter ce VPN ?" "Déconnecter" - "Version %s" + "Version" "Supprimer le VPN" "Remplacer le VPN existant ?" "Définir le VPN permanent ?" diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml index 0551e987f7b..3be4db5974d 100644 --- a/res/values-gl/strings.xml +++ b/res/values-gl/strings.xml @@ -3229,7 +3229,7 @@ "Conectar con %s" "Queres desconectar esta VPN?" "Desconectar" - "Versión %s" + "Versión" "Esquecer perfil da VPN" "Queres substituír a VPN existente?" "Queres definir a VPN como sempre activa?" diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml index 3aad2f6f08b..26cac9905d6 100644 --- a/res/values-gu/strings.xml +++ b/res/values-gu/strings.xml @@ -3229,7 +3229,7 @@ "%s સાથે કનેક્ટ કરો" "આ VPNને ડિસ્કનેક્ટ કરીએ?" "ડિસ્કનેક્ટ કરો" - "વર્ઝન %s" + "વર્ઝન" "VPN ભૂલી ગયાં" "અસ્તિત્વમાંની VPN ને બદલીએ?" "હંમેશાં ચાલુ VPN સેટ કરીએ?" diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index edcea1bfda7..6c45ac6b465 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -3229,7 +3229,7 @@ " %s से कनेक्ट करें" "इस VPN को डिसकनेक्ट करना चाहते हैं?" "डिसकनेक्ट करें" - "वर्शन %s" + "वर्शन" "वीपीएन भूल जाएं" "मौजूदा VPN को बदलें?" "हमेशा-चालू VPN सेट करें?" diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index f64b941c3a2..59ad82813ee 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -3271,7 +3271,7 @@ "Povezivanje s profilom %s" "Prekinuti vezu s VPN-om?" "Prekini vezu" - "Verzija %s" + "Verzija" "Zaboravi VPN" "Želite li zamijeniti dosadašnji VPN?" "Želite li postaviti uvijek uključeni VPN?" diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index 62069024b86..4a55f80ed54 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -3229,7 +3229,7 @@ "Csatlakozás a következőhöz: %s" "Leválasztja a VPN-t?" "Leválasztás" - "Verzió: %s" + "Verzió" "VPN elfelejtése" "Lecseréli a meglévő VPN-t?" "Beállítja a mindig bekapcsolt VPN-t?" diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml index ab360781187..2a3b82b289b 100644 --- a/res/values-hy/strings.xml +++ b/res/values-hy/strings.xml @@ -3229,7 +3229,7 @@ "Միանալ %s-ին" "Անջատե՞լ այս VPN-ը:" "Անջատել" - "Տարբերակ %s" + "Տարբերակ" "Մոռանալ VPN-ը" "Փոխարինե՞լ ընթացիկ VPN-ը:" "Սահմանե՞լ որպես «միշտ միացված» VPN:" diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 1b5431d0918..dc414ccbad8 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -3229,7 +3229,7 @@ "Menghubungkan ke %s" "Putuskan sambungan VPN ini?" "Putuskan koneksi" - "Versi %s" + "Versi" "Lupakan VPN" "Ganti VPN yang sudah ada?" "Setel VPN selalu aktif?" diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml index 0b3c1c14115..8ca94acf3bf 100644 --- a/res/values-is/strings.xml +++ b/res/values-is/strings.xml @@ -3229,7 +3229,7 @@ "Tengjast %s" "Aftengja þessa VPN-tengingu?" "Aftengja" - "Útgáfa %s" + "Útgáfa" "Gleyma VPN" "Skipta út núverandi VPN?" "Velja VPN sem alltaf er kveikt á?" diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index fd4372c8fa9..7220f21a3a9 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -3229,7 +3229,7 @@ "Connessione a %s" "Disconnettere questa VPN?" "Disconnetti" - "Versione %s" + "Versione" "Rimuovi VPN" "Sostituire la rete VPN esistente?" "Impostare la rete VPN sempre attiva?" diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 86307bd7146..8c54dd604f1 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -3311,7 +3311,7 @@ "התחברות אל %s" "‏האם לנתק את ה-VPN הזה?" "ניתוק" - "גרסה %s" + "גרסה" "‏אני רוצה לשכוח את ה-VPN" "‏האם להחליף רשת VPN קיימת?" "‏האם להגדיר את רשת ה-VPN בחיבור תמידי?" diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index f40a6e6cafc..a94009be379 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -3229,7 +3229,7 @@ "%sに接続" "この VPN の接続を解除しますか？" "接続を解除" - "バージョン%s" + "バージョン" "VPN を削除" "既存の VPN を置き換えますか？" "常時接続 VPN を設定しますか？" diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml index 928b6813229..77a5d4ce87e 100644 --- a/res/values-ka/strings.xml +++ b/res/values-ka/strings.xml @@ -3229,7 +3229,7 @@ "დაკავშირებულია %s-თან" "გსურთ ამ VPN-თან კავშირის გაწყვეტა?" "კავშირის გაწყვეტა" - "ვერსია %s" + "ვერსია" "VPN-ის დავიწყება" "გსურთ არსებული VPN-ის ჩანაცვლება?" "გსურთ ყოველთვის ჩართული VPN-ის დაყენება?" diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml index 862d55d2eb3..de4775f0054 100644 --- a/res/values-kk/strings.xml +++ b/res/values-kk/strings.xml @@ -3229,7 +3229,7 @@ "%s профайлына жалғау" "Осы VPN желісі ажыратылсын ба?" "Ажырату" - "Нұсқасы: %s" + "Нұсқа" "VPN ұмыту" "Бар VPN қолданбасын ауыстыру керек пе?" "Әрқашан қосулы VPN режимін орнату" diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml index b893f0a8e94..cdc800e448b 100644 --- a/res/values-km/strings.xml +++ b/res/values-km/strings.xml @@ -3229,7 +3229,7 @@ "តភ្ជាប់ %s" "ផ្តាច់ VPN នេះ?" "ផ្ដាច់" - "កំណែ %s" + "កំណែ" "បំភ្លេច VPN" "ជំនួស VPN ដែលមានស្រាប់ឬ?" "កំណត់ VPN ឲ្យបើកជានិច្ចឬ?" diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml index a82421f366b..890eb507d21 100644 --- a/res/values-kn/strings.xml +++ b/res/values-kn/strings.xml @@ -3229,7 +3229,7 @@ "%s ಗೆ ಸಂಪರ್ಕಿಸಿ" "ಈ VPN ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸುವುದೇ?" "ಸಂಪರ್ಕ ಕಡಿತಗೊಳಿಸಿ" - "%s ಆವೃತ್ತಿ" + "ಆವೃತ್ತಿ" "VPN ಮರೆತುಬಿಡು" "ಅಸ್ತಿತ್ವದಲ್ಲಿರುವ VPN ಸ್ಥಾನಾಂತರಿಸುವುದೇ?" "VPN ಯಾವಾಗಲೂ ಆನ್ ಆಗಿರುವಂತೆ ಹೊಂದಿಸುವುದೇ?" diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index afb001c9621..42e891566ba 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -3231,7 +3231,7 @@ "%s에 연결" "이 VPN을 연결 해제하시겠습니까?" "연결 해제" - "버전 %s" + "버전" "VPN 삭제" "기존 VPN을 교체하시겠습니까?" "연결 유지 VPN을 설정하시겠습니까?" diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml index 8ab22ffbf3c..76a70d3bd18 100644 --- a/res/values-ky/strings.xml +++ b/res/values-ky/strings.xml @@ -3229,7 +3229,7 @@ "%s менен байланышуу" "Бул VPN ажыратылсынбы?" "Ажыратуу" - "%s версиясы" + "Версия" "VPN профили унутулсун" "Учурдагы VPN алмаштырылсынбы?" "Туруктуу VPN\'ди жөндөйсүзбү?" diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml index 7726397909f..9945e93bde4 100644 --- a/res/values-lo/strings.xml +++ b/res/values-lo/strings.xml @@ -3229,7 +3229,7 @@ "ເຊື່ອມຕໍ່ຫາ %s" "ຕັດການເຊື່ອມຕໍ່ VPN ນີ້ບໍ?" "ຕັດການເຊື່ອມຕໍ່" - "ເວີ​ຊັນ %s" + "ເວີຊັນ" "ລືມ VPN" "ຂຽນທັບ VPN ທີ່ມີຢູ່ກ່ອນແລ້ວຂອງທ່ານບໍ?" "Set always-on VPN?" diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index e90e1007434..2f70dfe3348 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -3309,7 +3309,7 @@ "Prisijungti prie %s" "Atsijungti nuo šio VPN?" "Atsijungti" - "%s versija" + "Versija" "Pamiršti VPN" "Pakeisti esamą VPN?" "Nustatyti visada įjungtą VPN?" diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index e5dd7e3d283..1fffe8aa65d 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -3269,7 +3269,7 @@ "Savienojuma izveide ar %s" "Vai pārtraukt šo VPN savienojumu?" "Pārtraukt savienojumu" - "Versija %s" + "Versija" "Aizmirst VPN" "Vai aizstāt esošo VPN?" "Vai iestatīt vienmēr ieslēgtu VPN?" diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml index 53dc8d51e02..784adef0aef 100644 --- a/res/values-mk/strings.xml +++ b/res/values-mk/strings.xml @@ -3231,7 +3231,7 @@ "Поврзи се со %s" "Да се исклучи оваа VPN?" "Прекини врска" - "Верзија %s" + "Верзија" "Заборави VPN" "Да се замени постојната VPN?" "Да се постави „секогаш вклучена“ VPN?" diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml index 77461338527..35d643a9415 100644 --- a/res/values-ml/strings.xml +++ b/res/values-ml/strings.xml @@ -3229,7 +3229,7 @@ "%s എന്നതിലേക്ക് കണക്റ്റുചെയ്യുക" "ഈ VPN വിച്ഛേദിക്കണോ?" "വിച്ഛേദിക്കുക" - "പതിപ്പ് %s" + "പതിപ്പ്" "VPN മറക്കുക" "നിലവിലുള്ള VPN-ന് പകരം പുതിയതാക്കണോ?" "\'എല്ലായ്പ്പോഴും ഓൺ\' VPN സജ്ജമാക്കണോ?" diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml index f3d7e4fc6b8..309030a1b44 100644 --- a/res/values-mn/strings.xml +++ b/res/values-mn/strings.xml @@ -3229,7 +3229,7 @@ "%s руу холбогдох" "Энэ VPN-г салгах уу?" "Салгах" - "Хувилбар %s" + "Хувилбар" "VPN-г мартах" "Энэ VPN-г солих уу?" "VPN-г тогтмол асаалттайгаар тохируулах уу?" diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml index 37793c3ee6c..c8727e2a724 100644 --- a/res/values-mr/strings.xml +++ b/res/values-mr/strings.xml @@ -3230,7 +3230,7 @@ "%s शी कनेक्ट करा" "हे VPN डिस्कनेक्ट करायचे?" "‍डिस्कनेक्ट करा" - "आवृत्ती %s" + "आवृत्ती" "VPN विसरा" "विद्यमान VPN पुनर्स्थित करायचे?" "नेहमी-सुरू VPN सेट करायचे?" diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml index 51f5e2cfdd8..25e8faa6c84 100644 --- a/res/values-ms/strings.xml +++ b/res/values-ms/strings.xml @@ -3229,7 +3229,7 @@ "Sambung ke %s" "Putuskan sambungan VPN ini?" "Putuskan sambungan" - "Versi %s" + "Versi" "Lupakan VPN" "Gantikan VPN yang sedia ada?" "Tetapkan VPN sentiasa hidup?" diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml index 5ae7cca81b7..0ec81192d09 100644 --- a/res/values-my/strings.xml +++ b/res/values-my/strings.xml @@ -3229,7 +3229,7 @@ "%s နှင့် ချိတ်ဆက်ခြင်း" "ဤ VPN အား ချိတ်ဆက်မှု ဖြုတ်လိုပါသလား။" "ဆက်သွယ်မှု ဖြတ်ရန်" - "ဗားရှင်း %s" + "ဗားရှင်း" "VPN ကိုမေ့လိုက်ပါ" "ရှိပြီးသား VPN ကိုအစားထိုးမလား။" "VPN ကို အမြဲတမ်းဖွင့်ထားရန် သတ်မှတ်မလား။" diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index c94072c4080..bb908693c73 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -3229,7 +3229,7 @@ "Koble til %s" "Vil du koble fra dette VPN-et?" "Koble fra" - "Versjon %s" + "Versjon" "Glem VPN-profilen" "Vil du erstatte det nåværende VPN-et?" "Vil du angi alltid på-VPN?" diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml index 4589e79a84c..0419a7377e6 100644 --- a/res/values-ne/strings.xml +++ b/res/values-ne/strings.xml @@ -3229,7 +3229,7 @@ "%s मा जोड्नुहोस्" "यो VPN को जडान विच्छेद गर्ने हो?" "डिस्कनेक्ट गर्नुहोस्" - "संस्करण %s" + "संस्करण" "VPN लाई बिर्सनुहोस्" "विद्यमान VPN लाई बदल्ने हो?" "सधैँ-सक्रिय VPN लाई सेट गर्ने हो?" diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index e7f1bf18ac6..819642d4815 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -3229,7 +3229,7 @@ "Verbinding maken met %s" "Verbinding met dit VPN verbreken?" "Verbinding verbreken" - "Versie %s" + "Versie" "VPN vergeten" "Bestaande VPN vervangen?" "Always-on VPN instellen?" diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml index 42f3a601a02..29357437591 100644 --- a/res/values-or/strings.xml +++ b/res/values-or/strings.xml @@ -3229,7 +3229,7 @@ "%s ସହ ସଂଯୋଗ କରନ୍ତୁ" "ଏହି VPNକୁ ବିଚ୍ଛିନ୍ନ କରିବେ?" "ବିଚ୍ଛିନ୍ନ କରନ୍ତୁ" - "ସଂସ୍କରଣ %s" + "ସଂସ୍କରଣ" "VPNକୁ ଭୁଲିଯାଅ" "ପୂର୍ବରୁ ଥିବା VPNକୁ ବଦଳାଇବେ?" "ସର୍ବଦା-ଅନ୍‌ ଥିବା VPN ସେଟ୍‌ କରିବେ?" diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml index 4685153fae3..e3bbd368fbc 100644 --- a/res/values-pa/strings.xml +++ b/res/values-pa/strings.xml @@ -3229,7 +3229,7 @@ "%s ਨਾਲ ਕਨੈਕਟ ਕਰੋ" "ਇਹ VPN ਡਿਸਕਨੈਕਟ ਕਰੀਏ?" "ਡਿਸਕਨੈਕਟ ਕਰੋ" - "ਵਰਜਨ %s" + "ਵਰਜਨ" "VPN ਨੂੰ ਭੁੱਲ ਜਾਓ" "ਕੀ ਮੌਜੂਦਾ VPN ਨੂੰ ਤਬਦੀਲ ਕਰਨਾ ਹੈ?" "ਕੀ ਹਮੇਸ਼ਾ-ਚਾਲੂ VPN ਨੂੰ ਸੈੱਟ ਕਰਨਾ ਹੈ?" diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index b2a24e6c4c6..23d15ed86de 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -3309,7 +3309,7 @@ "Połącz z: %s" "Odłączyć tę sieć VPN?" "Odłącz" - "Wersja %s" + "Wersja" "Zapomnij VPN" "Zastąpić obecną sieć VPN?" "Ustawić stały VPN?" diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml index 0712683d3d1..e9a032f1832 100644 --- a/res/values-pt-rBR/strings.xml +++ b/res/values-pt-rBR/strings.xml @@ -3231,7 +3231,7 @@ "Conectar a %s" "Desconectar esta VPN?" "Desconectar" - "Versão %s" + "Versão" "Esquecer VPN" "Substituir VPN já existente?" "Configurar VPN sempre ativa?" diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index ee1cf5b20e3..9806e2f25cf 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -3229,7 +3229,7 @@ "Ligar a %s" "Pretende desligar esta VPN?" "Desligar" - "Versão %s" + "Versão" "Esquecer VPN" "Pretende substituir a VPN existente?" "Pretende definir a VPN como sempre ativa?" diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index 0712683d3d1..e9a032f1832 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -3231,7 +3231,7 @@ "Conectar a %s" "Desconectar esta VPN?" "Desconectar" - "Versão %s" + "Versão" "Esquecer VPN" "Substituir VPN já existente?" "Configurar VPN sempre ativa?" diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 1560f7a536f..090c9e5efbd 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -3271,7 +3271,7 @@ "Conectați-vă la %s" "Doriți să vă deconectați de la această rețea VPN?" "Deconectați-vă" - "Versiunea %s" + "Versiune" "Eliminați profilul VPN" "Înlocuiți rețeaua VPN existentă?" "Setați rețeaua VPN ca activată permanent?" diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 826939c64e4..dcd81190757 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -3309,7 +3309,7 @@ "Подключение к %s" "Отключиться от VPN?" "Да" - "Версия %s" + "Версия" "Удалить VPN" "Сменить текущую VPN-сеть?" "Настроить постоянную VPN-сеть?" diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml index feb6700a8df..93a5582612d 100644 --- a/res/values-si/strings.xml +++ b/res/values-si/strings.xml @@ -3229,7 +3229,7 @@ "%s වෙත සම්බන්ධ කරන්න" "මෙම VPN එක විසන්ධි කරන්නද?" "විසන්ධි කරන්න" - "අනුවාදය %s" + "අනුවාදය" "VPN අමතක කරන්න" "පවතින VPN ප්‍රතිස්ථාපනය කරන්නද?" "සැම විට ක්‍රියාත්මක VPN සකසන්නද?" diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 7cf2bbe0129..4ca746f954d 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -3311,7 +3311,7 @@ "Pripojiť k profilu %s" "Odpojiť tento profil VPN?" "Odpojiť" - "Verzia %s" + "Verzia" "Zabudnúť profil VPN" "Nahradiť existujúcu sieť VPN?" "Nastaviť sieť VPN, ktorá je vždy zapnutá?" diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index c1a951046c5..d0a4bc3aae9 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -3311,7 +3311,7 @@ "Povezovanje z %s" "Prekinitev povezave s tem omrežjem VPN?" "Prekini povezavo" - "Različica %s" + "Različica" "Pozabi omrežje VPN" "Želite zamenjati obstoječe omrežje VPN?" "Ali želite, da je omrežje VPN stalno vklopljeno?" diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml index a3ca372020b..f741d40102f 100644 --- a/res/values-sq/strings.xml +++ b/res/values-sq/strings.xml @@ -3229,7 +3229,7 @@ "Lidhu me %s" "Shkëpute këtë rrjet VPN" "Shkëpute" - "Versioni %s" + "Versioni" "Harroje rrjetin VPN" "Të zëvendësohet rrjeti ekzistues VPN?" "Të caktohet rrjeti VPN gjithmonë aktiv?" diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index 03570cea019..d3692e83326 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -3269,7 +3269,7 @@ "Повезивање на профил %s" "Желите ли да прекинете везу са овим VPN-ом?" "Прекини везу" - "Верзија %s" + "Верзија" "Заборави VPN" "Желите ли да замените постојећи VPN?" "Желите ли да подесите увек укључени VPN?" diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index fee5c3ffb15..4b4684f2b1d 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -3229,7 +3229,7 @@ "Anslut till %s" "Vill du koppla från VPN?" "Koppla från" - "Version %s" + "Version" "Glöm VPN" "Vill du byta ut befintligt VPN?" "Vill du ange Always-on VPN?" diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 5c379364d8c..13ec6e5b17e 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -3229,7 +3229,7 @@ "Unganisha kwa %s" "Ungependa kuondoa VPN hii?" "Kata muungnisho" - "Toleo la %s" + "Toleo" "Ondoa VPN" "Ungependa kubadilisha VPN iliyopo?" "Ungependa kuweka VPN iliyowashwa kila mara?" diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml index 0a02a0123f9..1d556a0fb45 100644 --- a/res/values-ta/strings.xml +++ b/res/values-ta/strings.xml @@ -3229,7 +3229,7 @@ "%s உடன் இணை" "VPNஐத் துண்டிக்கவா?" "தொடர்பைத் துண்டி" - "பதிப்பு %s" + "பதிப்பு" "VPNஐ நீக்கு" "தற்போதுள்ள VPNஐ மாற்றியமைக்கவா?" "எப்போதும் இயங்கும் VPNஐ அமைக்கவா?" diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml index 12a347ce739..7d00aac8594 100644 --- a/res/values-te/strings.xml +++ b/res/values-te/strings.xml @@ -3229,7 +3229,7 @@ "%sకి కనెక్ట్ చేయండి" "ఈ VPNను డిస్‌కనెక్ట్ చేయాలా?" "డిస్‌కనెక్ట్ చేయి" - "వెర్షన్ %s" + "వెర్షన్" "VPNని విస్మరించు" "ఇప్పటికే ఉన్న VPNని భర్తీ చేయాలా?" "ఎల్లప్పుడూ ఆన్‌లో ఉండే VPNని సెట్ చేయాలా?" diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 18c6475c737..4bb41c8328f 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -3229,7 +3229,7 @@ "เชื่อมต่อกับ %s" "ยกเลิกการเชื่อมต่อ VPN นี้ไหม" "ยกเลิกการเชื่อมต่อ" - "เวอร์ชัน %s" + "รุ่น" "ลืม VPN" "แทนที่ VPN ที่มีอยู่หรือไม่" "ตั้งค่า VPN แบบเปิดตลอดเวลาหรือไม่" diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index e6bdc7b7fcf..9525ce3fbc3 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -3229,7 +3229,7 @@ "Kumonekta sa %s" "Putulin ang koneksyon ng VPN na ito?" "Putulin ang koneksyon" - "Bersyon %s" + "Bersyon" "Kalimutan ang VPN" "Gusto mo bang palitan ang dati nang VPN?" "Gusto mo bang itakda ang VPN na palaging naka-on?" diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 5c80bc3aedb..f01cfd177bd 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -3229,7 +3229,7 @@ "%s profiline bağlan" "Bu VPN\'nin bağlantısı kesilsin mi?" "Bağlantıyı kes" - "Sürüm %s" + "Sürüm" "VPN\'yi unut" "Mevcut VPN değiştirilsin mi?" "Her zaman açık VPN ayarlansın mı?" diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 59e8f124b9d..1c40c40d67b 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -3309,7 +3309,7 @@ "Під’єднатися до профілю %s" "Відключити цю мережу VPN?" "Відключити" - "Версія %s" + "Версія" "Забути мережу VPN" "Замінити наявну мережу VPN?" "Увімкнути постійну мережу VPN?" diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml index 7c498752161..6bc54e4b40e 100644 --- a/res/values-ur/strings.xml +++ b/res/values-ur/strings.xml @@ -3229,7 +3229,7 @@ "%s سے مربوط کریں" "‏اس VPN سے غیر منسلک کریں؟" "غیر منسلک کریں" - "ورژن %s" + "ورژن" "‏VPN بھول جائیں" "‏موجودہ VPN بدلیں؟" "‏ہمیشہ آن VPN سیٹ کریں؟" diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml index 4b4ded220cf..7a75aa7d20c 100644 --- a/res/values-uz/strings.xml +++ b/res/values-uz/strings.xml @@ -3231,7 +3231,7 @@ "%s tarmog‘iga ulanish" "Bu VPN bilan aloqa uzilsinmi?" "Aloqani uzish" - "%s versiya" + "Versiya" "VPNni o‘chirish" "Mavjud VPN tarmog‘i almashtirilsinmi?" "Doimiy VPN o‘rnatilsinmi?" diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index eea27b30fe9..1153fd81bd3 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -3231,7 +3231,7 @@ "Kết nối với %s" "Ngắt kết nối VPN này?" "Ngắt kết nối" - "Phiên bản %s" + "Phiên bản" "Xóa VPN" "Thay thế VPN hiện có?" "Đặt VPN luôn bật?" diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index 4bf0a51793a..a4a56625dde 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -3229,7 +3229,7 @@ "连接到%s" "要断开与此 VPN 的连接吗？" "断开连接" - "版本 %s" + "版本" "取消保存 VPN" "要替换现有 VPN 吗？" "要设置始终开启的 VPN 吗？" diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index d4531805d1f..26d513c8a56 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -3232,7 +3232,7 @@ "連接「%s」" "要解除連結此 VPN 嗎？" "中斷連線" - "版本為：%s" + "版本" "刪除 VPN" "要取代目前的 VPN 嗎？" "要設定保持開啟的 VPN 嗎？" diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 481dff59235..f7978fc5e6d 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -3231,7 +3231,7 @@ "連線到「%s」" "要中斷這個 VPN 連線嗎？" "中斷連線" - "版本 %s" + "版本" "清除 VPN 設定檔" "要取代現有的 VPN 嗎？" "要設定永久連線的 VPN 嗎？" diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 6d0c2bbc8cb..1c56e849e21 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -3230,7 +3230,7 @@ "Xhuma ku-%s" "Nqamula le-VPN" "Nqamula" - "Inguqulo engu-%s" + "Uhlobo" "Khohlwa i-VPN" "Shintshanisa i-VPN ekhona?" "Setha i-VPN ehlala ivuliwe?" From 5e3d75a6f980916e70f779d00a19e62ec69816e4 Mon Sep 17 00:00:00 2001 From: Weng Su Date: Fri, 29 Apr 2022 03:41:56 +0800 Subject: [PATCH 10/15] Show restricted message in Wi-Fi Direct summary - See the result screenshot in b/203168953#comment9 Bug: 203168953 Test: manual test make RunSettingsRoboTests \ ROBOTEST_FILTER=WifiP2PPreferenceControllerTest Change-Id: I87ad6d7554fbb4aa86d4617438fa359c67544812 --- .../settings/wifi/p2p/WifiP2pPreferenceController.java | 6 ++++-- .../settings/wifi/p2p/WifiP2PPreferenceControllerTest.java | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java index db150dab3b5..5d73fa464f1 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pPreferenceController.java @@ -15,18 +15,17 @@ */ package com.android.settings.wifi.p2p; -import android.app.Service; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.location.LocationManager; import android.net.wifi.WifiManager; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settings.core.PreferenceControllerMixin; import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; @@ -70,6 +69,9 @@ public class WifiP2pPreferenceController extends AbstractPreferenceController super.displayPreference(screen); mWifiDirectPref = screen.findPreference(KEY_WIFI_DIRECT); togglePreferences(); + if (!mIsWifiDirectAllow) { + mWifiDirectPref.setSummary(R.string.not_allowed_by_ent); + } } @Override diff --git a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java index a9d5611918d..e292f24e5ce 100644 --- a/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/wifi/p2p/WifiP2PPreferenceControllerTest.java @@ -22,12 +22,10 @@ import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import android.app.Service; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; @@ -40,6 +38,7 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.R; import com.android.settingslib.core.lifecycle.Lifecycle; import org.junit.Before; @@ -142,6 +141,7 @@ public class WifiP2PPreferenceControllerTest { mController.displayPreference(mScreen); verify(mWifiDirectPreference).setEnabled(false); + verify(mWifiDirectPreference).setSummary(R.string.not_allowed_by_ent); } @Test From 0f68faf99669f4654a3797f238520501cc2c7988 Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Wed, 27 Apr 2022 14:27:04 +0800 Subject: [PATCH 11/15] [Settings] Avoid from crash UI when querying data usage Screen update been requested while querying data usage and response not yet available. This change tried to avoid from updating the UI in this case. Bug: 210664126 Test: local Change-Id: Id055fbd441936a9842b4acc978a894a855165bb7 --- .../android/settings/datausage/DataUsageList.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java index dc945f1fc42..4ee653017e4 100644 --- a/src/com/android/settings/datausage/DataUsageList.java +++ b/src/com/android/settings/datausage/DataUsageList.java @@ -48,6 +48,7 @@ import android.widget.ImageView; import android.widget.Spinner; import androidx.annotation.VisibleForTesting; +import androidx.lifecycle.Lifecycle; import androidx.loader.app.LoaderManager.LoaderCallbacks; import androidx.loader.content.Loader; import androidx.preference.Preference; @@ -500,6 +501,17 @@ public class DataUsageList extends DataUsageBaseFragment + cycle.end + "]"); } + // Avoid from updating UI after #onStop. + if (!getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) { + return; + } + + // Avoid from updating UI when async query still on-going. + // This could happen when a request from #onMobileDataEnabledChange. + if (mCycleData == null) { + return; + } + // update chart to show selected cycle, and update detail data // to match updated sweep bounds. mChart.setNetworkCycleData(mCycleData.get(position)); From a95b12f921cb7eb8eee3904850b147d845d6c78a Mon Sep 17 00:00:00 2001 From: Tsung-Mao Fang Date: Thu, 28 Apr 2022 23:40:44 +0800 Subject: [PATCH 12/15] Remove tab symbol for app pinning strings The pinning description can't align together in certain device. To mitigate the alignment problem, we try to remove the \t character now. Test: visual Fix: 222617691 Change-Id: I35974caf9d6fa316a6e4a0a5200ccab6a80f915b --- res/values/strings.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index f87b489f5d6..57eb740b94f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10207,18 +10207,18 @@ When an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nTo use app pinning: - \t\n1.\tTurn on app pinning - \t\n2.\tOpen Overview - \t\n3.\tTap the app icon at the top of the screen, then tap Pin + \t\n1. Turn on app pinning + \t\n2. Open Overview + \t\n3. Tap the app icon at the top of the screen, then tap Pin When an app is pinned, the pinned app may open other apps and personal data may be accessible. \n\nIf you want to securely share your device with someone, try using a guest user instead. \n\nTo use app pinning: - \t\n1.\tTurn on app pinning - \t\n2.\tOpen Overview - \t\n3.\tTap the app icon at the top of the screen, then tap Pin + \t\n1. Turn on app pinning + \t\n2. Open Overview + \t\n3. Tap the app icon at the top of the screen, then tap Pin From ba943c9b946a429c456b5719247be3b1959d6c6b Mon Sep 17 00:00:00 2001 From: Bonian Chen Date: Thu, 28 Apr 2022 15:14:42 +0800 Subject: [PATCH 13/15] [Settings] Rename title of SIM UI when changed Title of subscription page should align with the SIM card. Bug: 230308627 Test: local Change-Id: Iab9ba25ac8c3faf7d37f97c8f3f3488cbaa2e228 --- .../telephony/MobileNetworkSettings.java | 32 ++++++++++++++++--- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java index 763962c492f..4eb8a857232 100644 --- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java +++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java @@ -37,6 +37,7 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.Settings.MobileNetworkActivity; +import com.android.settings.SettingsActivity; import com.android.settings.datausage.BillingCyclePreferenceController; import com.android.settings.datausage.DataUsageSummaryPreferenceController; import com.android.settings.network.ActiveSubscriptionsListener; @@ -54,6 +55,7 @@ import com.android.settingslib.utils.ThreadUtils; import java.util.Arrays; import java.util.List; +import java.util.function.Consumer; @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) public class MobileNetworkSettings extends AbstractMobileNetworkSettings { @@ -275,17 +277,37 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings { Log.d(LOG_TAG, "Callback during onResume()"); return; } + + final SubscriptionInfo subInfo = SubscriptionUtil + .getSubscriptionOrDefault(getContext(), mSubId); + + if (subInfo != null) { + /** + * Update the title when SIM stats got changed + */ + final Consumer renameTitle = activity -> { + if (activity != null && !activity.isFinishing()) { + if (activity instanceof SettingsActivity) { + final CharSequence displayName = SubscriptionUtil + .getUniqueSubscriptionDisplayName(subInfo, activity); + ((SettingsActivity)activity).setTitle(displayName); + } + } + }; + + ThreadUtils.postOnMainThread(() -> renameTitle.accept(getActivity())); + } + mActiveSubscriptionsListenerCount++; if (mActiveSubscriptionsListenerCount != 1) { return; } - if (SubscriptionUtil.getSubscriptionOrDefault(getContext(), mSubId) == null) { - finishFragment(); - return; - } - ThreadUtils.postOnMainThread(() -> { + if (subInfo == null) { + finishFragment(); + return; + } mActiveSubscriptionsListenerCount = 0; redrawPreferenceControllers(); }); From e2ef52d6f1016b4bb243eca1cbed355febd6c7c5 Mon Sep 17 00:00:00 2001 From: Lucas Silva Date: Fri, 29 Apr 2022 16:41:32 -0400 Subject: [PATCH 14/15] Update dream settings logic to keep the customize button unselected. Test: manually on device Bug: 227717835 Fixed: 227717835 Change-Id: I4d796c3b7510baf07a670347fe4112a0b95d3036 --- src/com/android/settings/dream/DreamAdapter.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/dream/DreamAdapter.java b/src/com/android/settings/dream/DreamAdapter.java index 590b282b25a..cfee12e0f42 100644 --- a/src/com/android/settings/dream/DreamAdapter.java +++ b/src/com/android/settings/dream/DreamAdapter.java @@ -105,11 +105,6 @@ public class DreamAdapter extends RecyclerView.Adapter icon.setBounds(0, 0, iconSize, iconSize); mTitleView.setCompoundDrawablesRelative(icon, null, null, null); - mCustomizeButton.setOnClickListener(v -> item.onCustomizeClicked()); - mCustomizeButton.setVisibility( - item.allowCustomization() && mEnabled ? View.VISIBLE : View.GONE); - mCustomizeButton.setSelected(false); - itemView.setOnClickListener(v -> { item.onItemClicked(); if (mLastSelectedPos > -1 && mLastSelectedPos != position) { @@ -127,6 +122,13 @@ public class DreamAdapter extends RecyclerView.Adapter itemView.setClickable(true); } + mCustomizeButton.setOnClickListener(v -> item.onCustomizeClicked()); + mCustomizeButton.setVisibility( + item.allowCustomization() && mEnabled ? View.VISIBLE : View.GONE); + // This must be called AFTER itemView.setSelected above, in order to keep the + // customize button in an unselected state. + mCustomizeButton.setSelected(false); + setEnabledStateOnViews(itemView, mEnabled); } From b7f3001ceab0c613b1216c2eced1e80c6d69d94f Mon Sep 17 00:00:00 2001 From: Joshua McCloskey Date: Fri, 22 Apr 2022 19:38:41 +0000 Subject: [PATCH 15/15] Fix final UDFPS enrollment haptic. Test: Verified both accessibility/non-accessibility flows have correct haptic feedback. Fixes: 229804277 Change-Id: I8623771016b9819d4211d07a19b50291a8b06cd9 Merged-In: I8623771016b9819d4211d07a19b50291a8b06cd9 --- .../fingerprint/FingerprintEnrollEnrolling.java | 17 ++--------------- .../FingerprintEnrollEnrollingTest.java | 2 +- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java index 67e4a63b30e..de778bdf100 100644 --- a/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java +++ b/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrolling.java @@ -112,12 +112,6 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { private static final VibrationAttributes FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES = VibrationAttributes.createForUsage(VibrationAttributes.USAGE_ACCESSIBILITY); - private static final VibrationAttributes HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES = - VibrationAttributes.createForUsage(VibrationAttributes.USAGE_HARDWARE_FEEDBACK); - - private static final VibrationEffect SUCCESS_VIBRATION_EFFECT = - VibrationEffect.get(VibrationEffect.EFFECT_CLICK); - private FingerprintManager mFingerprintManager; private boolean mCanAssumeUdfps; @Nullable private ProgressBar mProgressBar; @@ -515,14 +509,6 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { mErrorText.removeCallbacks(mTouchAgainRunnable); mErrorText.postDelayed(mTouchAgainRunnable, HINT_TIMEOUT_DURATION); } else { - if (mVibrator != null) { - mVibrator.vibrate(Process.myUid(), - getApplicationContext().getOpPackageName(), - SUCCESS_VIBRATION_EFFECT, - getClass().getSimpleName() + "::OnEnrollmentProgressChanged", - HARDWARE_FEEDBACK_VIBRATION_ATTRIBUTES); - } - if (mIsAccessibilityEnabled) { final int percent = (int) (((float)(steps - remaining) / (float) steps) * 100); CharSequence cs = getString( @@ -594,7 +580,8 @@ public class FingerprintEnrollEnrolling extends BiometricsEnrollEnrolling { mErrorText.setTranslationY(0f); } } - if (isResumed() && (mIsAccessibilityEnabled || !mCanAssumeUdfps)) { + + if (isResumed() && mIsAccessibilityEnabled && !mCanAssumeUdfps) { mVibrator.vibrate(Process.myUid(), getApplicationContext().getOpPackageName(), VIBRATE_EFFECT_ERROR, getClass().getSimpleName() + "::showError", FINGERPRINT_ENROLLING_SONFICATION_ATTRIBUTES); diff --git a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java index 9b39a034f0b..a7b7e85d063 100644 --- a/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java +++ b/tests/robotests/src/com/android/settings/biometrics/fingerprint/FingerprintEnrollEnrollingTest.java @@ -101,4 +101,4 @@ public class FingerprintEnrollEnrollingTest { return callbackCaptor.getValue(); } -} +} \ No newline at end of file