diff options
Diffstat (limited to 'app/src/main/res')
69 files changed, 389 insertions, 99 deletions
diff --git a/app/src/main/res/layout-port/f_eip.xml b/app/src/main/res/layout-port/f_eip.xml index 99004387..cb99a700 100644 --- a/app/src/main/res/layout-port/f_eip.xml +++ b/app/src/main/res/layout-port/f_eip.xml @@ -4,7 +4,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/eipServiceFragment"> + android:id="@+id/eipServiceFragment" + tools:viewBindingIgnore="true" + > <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_vertical_left" diff --git a/app/src/main/res/layout-xlarge-port/a_add_provider.xml b/app/src/main/res/layout-xlarge-port/a_add_provider.xml index 9d1614aa..80eef3c3 100644 --- a/app/src/main/res/layout-xlarge-port/a_add_provider.xml +++ b/app/src/main/res/layout-xlarge-port/a_add_provider.xml @@ -5,7 +5,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.activities.ProviderCredentialsBaseActivity"> + tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml b/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml index da813a23..dfb58b8c 100644 --- a/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml +++ b/app/src/main/res/layout-xlarge-port/a_custom_provider_setup.xml @@ -6,7 +6,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.activities.CustomProviderSetupActivity"> + tools:context=".providersetup.activities.CustomProviderSetupActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml b/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml index 75f6244a..e1295853 100644 --- a/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml +++ b/app/src/main/res/layout-xlarge-port/a_provider_credentials.xml @@ -5,7 +5,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.activities.ProviderCredentialsBaseActivity"> + tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge-port/a_provider_detail.xml b/app/src/main/res/layout-xlarge-port/a_provider_detail.xml index 7d1e8444..34719df9 100644 --- a/app/src/main/res/layout-xlarge-port/a_provider_detail.xml +++ b/app/src/main/res/layout-xlarge-port/a_provider_detail.xml @@ -6,7 +6,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".providersetup.ProviderDetailActivity" - style="@style/BitmaskActivity"> + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge-port/a_provider_list.xml b/app/src/main/res/layout-xlarge-port/a_provider_list.xml index 87ca6427..184cbf93 100644 --- a/app/src/main/res/layout-xlarge-port/a_provider_list.xml +++ b/app/src/main/res/layout-xlarge-port/a_provider_list.xml @@ -6,7 +6,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.ProviderListActivity"> + tools:context=".providersetup.ProviderListActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge-port/f_eip.xml b/app/src/main/res/layout-xlarge-port/f_eip.xml index c3d3fd36..10b7a7e3 100644 --- a/app/src/main/res/layout-xlarge-port/f_eip.xml +++ b/app/src/main/res/layout-xlarge-port/f_eip.xml @@ -5,6 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/eipServiceFragment" + tools:viewBindingIgnore="true" > <androidx.constraintlayout.widget.Guideline diff --git a/app/src/main/res/layout-xlarge-port/f_log.xml b/app/src/main/res/layout-xlarge-port/f_log.xml index ebadeb74..56848206 100644 --- a/app/src/main/res/layout-xlarge-port/f_log.xml +++ b/app/src/main/res/layout-xlarge-port/f_log.xml @@ -10,7 +10,8 @@ xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:padding="@dimen/activity_margin" - android:id="@+id/log_layout"> + android:id="@+id/log_layout" + tools:viewBindingIgnore="true"> <LinearLayout android:background="@drawable/white_rect" diff --git a/app/src/main/res/layout-xlarge/a_add_provider.xml b/app/src/main/res/layout-xlarge/a_add_provider.xml index e4ebdadf..db63b32c 100644 --- a/app/src/main/res/layout-xlarge/a_add_provider.xml +++ b/app/src/main/res/layout-xlarge/a_add_provider.xml @@ -5,7 +5,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.activities.ProviderCredentialsBaseActivity"> + tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml b/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml index 23bf7d40..130ad95a 100644 --- a/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml +++ b/app/src/main/res/layout-xlarge/a_custom_provider_setup.xml @@ -6,7 +6,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.activities.CustomProviderSetupActivity"> + tools:context=".providersetup.activities.CustomProviderSetupActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/a_provider_credentials.xml b/app/src/main/res/layout-xlarge/a_provider_credentials.xml index c5b35fdc..61a638d4 100644 --- a/app/src/main/res/layout-xlarge/a_provider_credentials.xml +++ b/app/src/main/res/layout-xlarge/a_provider_credentials.xml @@ -5,7 +5,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.activities.ProviderCredentialsBaseActivity"> + tools:context=".providersetup.activities.ProviderCredentialsBaseActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/a_provider_detail.xml b/app/src/main/res/layout-xlarge/a_provider_detail.xml index 59e9c18d..74a0c72c 100644 --- a/app/src/main/res/layout-xlarge/a_provider_detail.xml +++ b/app/src/main/res/layout-xlarge/a_provider_detail.xml @@ -6,7 +6,8 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".providersetup.ProviderDetailActivity" - style="@style/BitmaskActivity"> + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/a_provider_list.xml b/app/src/main/res/layout-xlarge/a_provider_list.xml index 6504db10..c8c7a763 100644 --- a/app/src/main/res/layout-xlarge/a_provider_list.xml +++ b/app/src/main/res/layout-xlarge/a_provider_list.xml @@ -6,7 +6,8 @@ style="@style/BitmaskActivity" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".providersetup.ProviderListActivity"> + tools:context=".providersetup.ProviderListActivity" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/f_about.xml b/app/src/main/res/layout-xlarge/f_about.xml index 96156a71..ed7f4f1a 100644 --- a/app/src/main/res/layout-xlarge/f_about.xml +++ b/app/src/main/res/layout-xlarge/f_about.xml @@ -8,7 +8,8 @@ android:layout_marginStart="@dimen/stdpadding" android:layout_marginEnd="@dimen/stdpadding" android:layout_marginRight="@dimen/stdpadding" - tools:context=".base.MainActivity" > + tools:context=".base.MainActivity" + tools:viewBindingIgnore="true"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/f_eip.xml b/app/src/main/res/layout-xlarge/f_eip.xml index 4042933e..e6b28c67 100644 --- a/app/src/main/res/layout-xlarge/f_eip.xml +++ b/app/src/main/res/layout-xlarge/f_eip.xml @@ -9,6 +9,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/eipServiceFragment" + tools:viewBindingIgnore="true" > <androidx.constraintlayout.widget.Guideline diff --git a/app/src/main/res/layout-xlarge/f_log.xml b/app/src/main/res/layout-xlarge/f_log.xml index b014ee9d..f1ccc23a 100644 --- a/app/src/main/res/layout-xlarge/f_log.xml +++ b/app/src/main/res/layout-xlarge/f_log.xml @@ -5,11 +5,13 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" android:padding="20dp" android:id="@+id/log_layout" + tools:viewBindingIgnore="true" > <LinearLayout diff --git a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml index 530660af..dd7dc37a 100644 --- a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml @@ -3,7 +3,8 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="vertical" - xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout-xlarge/v_loading_screen.xml b/app/src/main/res/layout-xlarge/v_loading_screen.xml index 2ecb8f42..22b72f29 100644 --- a/app/src/main/res/layout-xlarge/v_loading_screen.xml +++ b/app/src/main/res/layout-xlarge/v_loading_screen.xml @@ -8,6 +8,7 @@ android:orientation="vertical" android:visibility="gone" tools:visibility="visible" + tools:viewBindingIgnore="true" > <androidx.appcompat.widget.AppCompatImageView diff --git a/app/src/main/res/layout-xlarge/v_provider_header.xml b/app/src/main/res/layout-xlarge/v_provider_header.xml index 6d826783..28bcaa6c 100644 --- a/app/src/main/res/layout-xlarge/v_provider_header.xml +++ b/app/src/main/res/layout-xlarge/v_provider_header.xml @@ -2,7 +2,9 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:layout_width="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" > + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/provider_header_logo" diff --git a/app/src/main/res/layout-xlarge/v_provider_list_item.xml b/app/src/main/res/layout-xlarge/v_provider_list_item.xml index eea55be2..2e3506b5 100644 --- a/app/src/main/res/layout-xlarge/v_provider_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_provider_list_item.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:paddingTop="2dip" android:paddingBottom="2dip" @@ -8,7 +9,7 @@ android:layout_height="wrap_content" android:background="?android:attr/activatedBackgroundIndicator" android:minHeight="?android:attr/listPreferredItemHeight" -> + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_domain" android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/v_single_list_item.xml b/app/src/main/res/layout-xlarge/v_single_list_item.xml index 6a318ff5..44cd16e5 100644 --- a/app/src/main/res/layout-xlarge/v_single_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_single_list_item.xml @@ -15,6 +15,7 @@ --> <androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -25,4 +26,5 @@ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingRight="?android:attr/listPreferredItemPaddingRight" android:background="?android:attr/activatedBackgroundIndicator" - android:minHeight="?android:attr/listPreferredItemHeight" /> + android:minHeight="?android:attr/listPreferredItemHeight" + tools:viewBindingIgnore="true" /> diff --git a/app/src/main/res/layout-xlarge/v_switch_list_item.xml b/app/src/main/res/layout-xlarge/v_switch_list_item.xml index a24f5089..4a112139 100644 --- a/app/src/main/res/layout-xlarge/v_switch_list_item.xml +++ b/app/src/main/res/layout-xlarge/v_switch_list_item.xml @@ -4,6 +4,7 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="vertical" + tools:viewBindingIgnore="true" > <RelativeLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout-xlarge/v_vpn_status.xml b/app/src/main/res/layout-xlarge/v_vpn_status.xml index ce8e6928..02f0659a 100644 --- a/app/src/main/res/layout-xlarge/v_vpn_status.xml +++ b/app/src/main/res/layout-xlarge/v_vpn_status.xml @@ -5,7 +5,8 @@ --> <merge xmlns:tools="http://schemas.android.com/tools" - xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android" + tools:viewBindingIgnore="true"> <Space android:layout_weight="1" diff --git a/app/src/main/res/layout/a_add_provider.xml b/app/src/main/res/layout/a_add_provider.xml index c78db432..517c8c19 100644 --- a/app/src/main/res/layout/a_add_provider.xml +++ b/app/src/main/res/layout/a_add_provider.xml @@ -6,7 +6,9 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="@dimen/stdpadding" - tools:context=".providersetup.AddProviderActivity"> + tools:context=".providersetup.AddProviderActivity" + tools:viewBindingIgnore="true" + > <LinearLayout android:id="@+id/content" diff --git a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml index 4debbf9f..d3b8fc58 100644 --- a/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml +++ b/app/src/main/res/layout/a_add_provider_tablet_scrollview.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView - android:orientation="vertical" +<ScrollView android:orientation="vertical" style="@style/BitmaskActivity" android:layout_width="0dp" android:layout_height="0dp" @@ -15,7 +14,9 @@ android:isScrollContainer="true" android:fadeScrollbars="false" xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> + xmlns:app="http://schemas.android.com/apk/res-auto" + tools:viewBindingIgnore="true" + xmlns:tools="http://schemas.android.com/tools"> <LinearLayout android:id="@+id/content" diff --git a/app/src/main/res/layout/a_custom_provider_setup.xml b/app/src/main/res/layout/a_custom_provider_setup.xml index 782537d9..0e4e3edf 100644 --- a/app/src/main/res/layout/a_custom_provider_setup.xml +++ b/app/src/main/res/layout/a_custom_provider_setup.xml @@ -6,7 +6,9 @@ android:layout_height="match_parent" tools:context=".providersetup.activities.CustomProviderSetupActivity" android:padding="@dimen/stdpadding" - style="@style/BitmaskActivity" > + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true" + > <!-- a "content" view that is required for ConfigWizardBaseActivities --> diff --git a/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml b/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml index 4879c76f..7e8cd51d 100644 --- a/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml +++ b/app/src/main/res/layout/a_custom_provider_setup_tablet_linear_layout.xml @@ -1,5 +1,6 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:layout_width="0dp" android:layout_height="0dp" @@ -10,7 +11,8 @@ app:layout_constraintEnd_toStartOf="@+id/guideline_right" app:layout_constraintHeight_min="411dp" app:layout_constraintStart_toStartOf="@+id/guideline_left" - app:layout_constraintTop_toTopOf="@+id/guideline_top"> + app:layout_constraintTop_toTopOf="@+id/guideline_top" + tools:viewBindingIgnore="true"> <!-- a "content" view that is required for ConfigWizardBaseActivities --> <LinearLayout diff --git a/app/src/main/res/layout/a_main.xml b/app/src/main/res/layout/a_main.xml index 0e30d2a8..92e0a3c0 100644 --- a/app/src/main/res/layout/a_main.xml +++ b/app/src/main/res/layout/a_main.xml @@ -5,7 +5,9 @@ android:id="@+id/drawer_layout" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context="se.leap.bitmaskclient.base.MainActivity"> + tools:context="se.leap.bitmaskclient.base.MainActivity" + tools:viewBindingIgnore="true" + > <!-- As the main content view, the view below consumes the entire diff --git a/app/src/main/res/layout/a_provider_credentials.xml b/app/src/main/res/layout/a_provider_credentials.xml index b5dfa088..c5ff5f99 100644 --- a/app/src/main/res/layout/a_provider_credentials.xml +++ b/app/src/main/res/layout/a_provider_credentials.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" android:padding="@dimen/stdpadding" - style="@style/BitmaskActivity"> + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true"> <include layout="@layout/v_loading_screen" /> diff --git a/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml index ea0b6dd4..56222813 100644 --- a/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml +++ b/app/src/main/res/layout/a_provider_credentials_tablet_linear_layout.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" style="@style/BitmaskActivity" android:layout_width="0dp" @@ -13,7 +13,8 @@ app:layout_constraintEnd_toStartOf="@+id/guideline_right" app:layout_constraintHeight_min="411dp" app:layout_constraintStart_toStartOf="@+id/guideline_left" - app:layout_constraintTop_toTopOf="@+id/guideline_top"> + app:layout_constraintTop_toTopOf="@+id/guideline_top" + tools:viewBindingIgnore="true"> <include layout="@layout/v_loading_screen" /> diff --git a/app/src/main/res/layout/a_provider_detail.xml b/app/src/main/res/layout/a_provider_detail.xml index bdc17ee9..4a456c32 100644 --- a/app/src/main/res/layout/a_provider_detail.xml +++ b/app/src/main/res/layout/a_provider_detail.xml @@ -1,11 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:id="@+id/provider_detail_fragment" android:layout_width="match_parent" android:layout_height="match_parent" android:padding="@dimen/stdpadding" android:orientation="vertical" - style="@style/BitmaskActivity" > + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true"> <include layout="@layout/v_loading_screen" /> diff --git a/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml index 0c7e02d1..5601a3d5 100644 --- a/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml +++ b/app/src/main/res/layout/a_provider_detail_tablet_linear_layout.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout - android:orientation="vertical" +<LinearLayout android:orientation="vertical" android:padding="@dimen/stdpadding" style="@style/BitmaskActivity" android:layout_width="0dp" @@ -13,7 +12,9 @@ app:layout_constraintStart_toStartOf="@+id/guideline_left" app:layout_constraintTop_toTopOf="@+id/guideline_top" xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> + xmlns:app="http://schemas.android.com/apk/res-auto" + tools:viewBindingIgnore="true" + xmlns:tools="http://schemas.android.com/tools"> <include layout="@layout/v_loading_screen" /> diff --git a/app/src/main/res/layout/a_provider_list.xml b/app/src/main/res/layout/a_provider_list.xml index 5d7efae7..867d6d8d 100644 --- a/app/src/main/res/layout/a_provider_list.xml +++ b/app/src/main/res/layout/a_provider_list.xml @@ -5,7 +5,8 @@ android:layout_height="match_parent" tools:context=".providersetup.ProviderListActivity" android:padding="@dimen/stdpadding" - style="@style/BitmaskActivity" > + style="@style/BitmaskActivity" + tools:viewBindingIgnore="true"> <include layout="@layout/v_loading_screen" /> diff --git a/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml b/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml index 487edd1d..67f82976 100644 --- a/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml +++ b/app/src/main/res/layout/a_provider_list_tablet_linear_layout.xml @@ -12,7 +12,9 @@ app:layout_constraintStart_toStartOf="@+id/guideline_left" app:layout_constraintTop_toTopOf="@+id/guideline_top" xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <include layout="@layout/v_loading_screen" /> diff --git a/app/src/main/res/layout/allowed_application_layout.xml b/app/src/main/res/layout/allowed_application_layout.xml index 61fc12c3..671a54fc 100644 --- a/app/src/main/res/layout/allowed_application_layout.xml +++ b/app/src/main/res/layout/allowed_application_layout.xml @@ -14,7 +14,9 @@ android:paddingTop="8dip" android:paddingBottom="8dip" android:columnCount="4" - tools:ignore="RtlCompat"> + tools:ignore="RtlCompat" + tools:viewBindingIgnore="true" + > <ImageView android:id="@+id/app_icon" diff --git a/app/src/main/res/layout/allowed_vpn_apps.xml b/app/src/main/res/layout/allowed_vpn_apps.xml index f76b5f4f..1930adf2 100644 --- a/app/src/main/res/layout/allowed_vpn_apps.xml +++ b/app/src/main/res/layout/allowed_vpn_apps.xml @@ -8,7 +8,9 @@ android:orientation="vertical" android:layout_width="match_parent" tools:ignore="RtlCompat" - android:layout_height="match_parent"> + android:layout_height="match_parent" + tools:viewBindingIgnore="true" + > <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" diff --git a/app/src/main/res/layout/custom_toast.xml b/app/src/main/res/layout/custom_toast.xml index c267fb86..b333a9b0 100644 --- a/app/src/main/res/layout/custom_toast.xml +++ b/app/src/main/res/layout/custom_toast.xml @@ -6,7 +6,9 @@ android:layout_width="fill_parent" android:layout_height="fill_parent" android:padding="16dp" - android:background="@drawable/cust_toast_background"> + android:background="@drawable/cust_toast_background" + tools:viewBindingIgnore="true" + > <ImageView android:src="@drawable/retry" android:layout_width="24dp" android:layout_height="24dp" diff --git a/app/src/main/res/layout/d_checkbox_confirm.xml b/app/src/main/res/layout/d_checkbox_confirm.xml index f8aace6e..d8811226 100644 --- a/app/src/main/res/layout/d_checkbox_confirm.xml +++ b/app/src/main/res/layout/d_checkbox_confirm.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/app/src/main/res/layout/d_list_selection.xml b/app/src/main/res/layout/d_list_selection.xml index d9a1b013..908c228f 100644 --- a/app/src/main/res/layout/d_list_selection.xml +++ b/app/src/main/res/layout/d_list_selection.xml @@ -1,7 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/app/src/main/res/layout/d_obfuscation_proxy.xml b/app/src/main/res/layout/d_obfuscation_proxy.xml new file mode 100644 index 00000000..e8f61ebd --- /dev/null +++ b/app/src/main/res/layout/d_obfuscation_proxy.xml @@ -0,0 +1,129 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:scrollbars="none"> + <androidx.appcompat.widget.LinearLayoutCompat + android:orientation = "vertical" + android:layout_height="wrap_content" + android:layout_width="match_parent" + android:padding="@dimen/activity_margin" + > + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Obfuscation Proxy Pinning" + android:textStyle="bold" + android:gravity="center_horizontal" + android:textAppearance="@android:style/TextAppearance.Large" + /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Proxy IP" + android:paddingTop="@dimen/activity_margin" + android:textStyle="bold" + android:textAppearance="@android:style/TextAppearance.DeviceDefault" /> + <androidx.appcompat.widget.AppCompatEditText + android:id="@+id/ip_field" + android:layout_width="match_parent" + android:layout_height="wrap_content" + /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Proxy Port" + android:paddingTop="@dimen/activity_margin" + android:textStyle="bold" + android:textAppearance="@android:style/TextAppearance.DeviceDefault" + + /> + <androidx.appcompat.widget.AppCompatEditText + android:id="@+id/port_field" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Certificate" + android:textStyle="bold" + android:paddingTop="@dimen/activity_margin" + android:textAppearance="@android:style/TextAppearance.DeviceDefault" /> + <androidx.appcompat.widget.AppCompatEditText + android:id="@+id/cert_field" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="Gateway Host Name" + android:textStyle="bold" + android:paddingTop="@dimen/activity_margin" + android:textAppearance="@android:style/TextAppearance.DeviceDefault" /> + <!--<androidx.appcompat.widget.AppCompatEditText + android:id="@+id/gateway_ip_field" + android:layout_width="match_parent" + android:layout_height="wrap_content"/>--> + <androidx.appcompat.widget.AppCompatSpinner + android:id="@+id/gateway_host" + android:layout_width="match_parent" + android:layout_height="wrap_content" + /> + + <se.leap.bitmaskclient.base.views.IconSwitchEntry + android:id="@+id/kcp_switch" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:text="KCP" + app:subtitle="UDP based network protocol" + app:icon="@drawable/ic_multiple_stop" + > + + </se.leap.bitmaskclient.base.views.IconSwitchEntry> + + <androidx.appcompat.widget.LinearLayoutCompat + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end" + android:layout_marginTop="@dimen/activity_margin" + android:gravity="right" + android:orientation="vertical"> + <androidx.appcompat.widget.AppCompatButton + android:id="@+id/button_defaults" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Use defaults" + android:background="@drawable/cust_button_secondary" + android:layout_marginHorizontal="@dimen/stdpadding" + /> + <androidx.appcompat.widget.LinearLayoutCompat + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/stdpadding" + android:orientation="horizontal"> + <androidx.appcompat.widget.AppCompatButton + android:id="@+id/button_cancel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/stdpadding" + android:text="@string/cancel" + /> + + <androidx.appcompat.widget.AppCompatButton + android:id="@+id/button_save" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginHorizontal="@dimen/stdpadding" + android:text="@string/save" + /> + </androidx.appcompat.widget.LinearLayoutCompat> + + </androidx.appcompat.widget.LinearLayoutCompat> + + </androidx.appcompat.widget.LinearLayoutCompat> +</ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/donation_reminder_dialog.xml b/app/src/main/res/layout/donation_reminder_dialog.xml index d6b6ea80..0a93c867 100644 --- a/app/src/main/res/layout/donation_reminder_dialog.xml +++ b/app/src/main/res/layout/donation_reminder_dialog.xml @@ -3,7 +3,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" - android:scrollbars="none"> + xmlns:tools="http://schemas.android.com/tools" + android:scrollbars="none" + tools:viewBindingIgnore="true"> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml index b73d2191..e0193c1b 100644 --- a/app/src/main/res/layout/f_about.xml +++ b/app/src/main/res/layout/f_about.xml @@ -8,7 +8,8 @@ android:layout_marginStart="@dimen/stdpadding" android:layout_marginRight="@dimen/stdpadding" android:layout_marginEnd="@dimen/stdpadding" - tools:context=".base.MainActivity"> + tools:context=".base.MainActivity" + tools:viewBindingIgnore="true"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/f_drawer_main.xml b/app/src/main/res/layout/f_drawer_main.xml index bf418bc0..a948d9ce 100644 --- a/app/src/main/res/layout/f_drawer_main.xml +++ b/app/src/main/res/layout/f_drawer_main.xml @@ -8,6 +8,7 @@ android:clickable="true" android:focusable="true" android:fillViewport="true" + tools:viewBindingIgnore="true" > <LinearLayout diff --git a/app/src/main/res/layout/f_eip.xml b/app/src/main/res/layout/f_eip.xml index fa2d4ded..9a823b65 100644 --- a/app/src/main/res/layout/f_eip.xml +++ b/app/src/main/res/layout/f_eip.xml @@ -8,7 +8,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/eipServiceFragment"> + android:id="@+id/eipServiceFragment" + tools:viewBindingIgnore="true" + > <androidx.constraintlayout.widget.Guideline android:id="@+id/guideline_horizontal_top" diff --git a/app/src/main/res/layout/f_gateway_selection.xml b/app/src/main/res/layout/f_gateway_selection.xml index 8ab2b1c3..5a614ce9 100644 --- a/app/src/main/res/layout/f_gateway_selection.xml +++ b/app/src/main/res/layout/f_gateway_selection.xml @@ -4,7 +4,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:padding="@dimen/stdpadding" - tools:context=".base.fragments.GatewaySelectionFragment"> + tools:context=".base.fragments.GatewaySelectionFragment" + tools:viewBindingIgnore="true" + > <LinearLayout android:id="@+id/current_location_container" diff --git a/app/src/main/res/layout/f_log.xml b/app/src/main/res/layout/f_log.xml index ac77abd5..792770f6 100644 --- a/app/src/main/res/layout/f_log.xml +++ b/app/src/main/res/layout/f_log.xml @@ -11,6 +11,7 @@ android:orientation="vertical" android:padding="16dp" android:id="@+id/log_layout" + tools:viewBindingIgnore="true" > <LinearLayout diff --git a/app/src/main/res/layout/f_log_sliders.xml b/app/src/main/res/layout/f_log_sliders.xml index ea444b3d..3e4bbee4 100644 --- a/app/src/main/res/layout/f_log_sliders.xml +++ b/app/src/main/res/layout/f_log_sliders.xml @@ -14,7 +14,8 @@ android:visibility="gone" tools:visibility="visible" android:layout_width="wrap_content" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatTextView android:layout_width="match_parent" diff --git a/app/src/main/res/layout/f_settings.xml b/app/src/main/res/layout/f_settings.xml index f89dc956..3ce19797 100644 --- a/app/src/main/res/layout/f_settings.xml +++ b/app/src/main/res/layout/f_settings.xml @@ -4,8 +4,9 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools" android:padding="@dimen/stdpadding" - > + tools:viewBindingIgnore="true"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -123,5 +124,15 @@ app:subtitle="These transports might circumvent censorship, but are still in a testing phase" /> + <se.leap.bitmaskclient.base.views.IconSwitchEntry + android:id="@+id/obfuscation_proxy_pinning" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:text="Obfuscation proxy pinning" + app:singleLine="false" + app:subtitle="Connect to a specific obfuscation proxy for debugging purposes" + android:visibility="gone" + /> + </LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/app/src/main/res/layout/v_custom_notification.xml b/app/src/main/res/layout/v_custom_notification.xml index e97fcbe2..c9854ff3 100644 --- a/app/src/main/res/layout/v_custom_notification.xml +++ b/app/src/main/res/layout/v_custom_notification.xml @@ -5,6 +5,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" style="@android:style/TextAppearance.StatusBar.EventContent" + tools:viewBindingIgnore="true" > <ImageView diff --git a/app/src/main/res/layout/v_icon_select_text_list_item.xml b/app/src/main/res/layout/v_icon_select_text_list_item.xml index 801a372a..60c5908c 100644 --- a/app/src/main/res/layout/v_icon_select_text_list_item.xml +++ b/app/src/main/res/layout/v_icon_select_text_list_item.xml @@ -3,7 +3,8 @@ android:layout_height="?android:attr/listPreferredItemHeightSmall" android:layout_width="match_parent" android:orientation="horizontal" - xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/material_icon" diff --git a/app/src/main/res/layout/v_icon_text_list_item.xml b/app/src/main/res/layout/v_icon_text_list_item.xml index d183864d..814fd4d5 100644 --- a/app/src/main/res/layout/v_icon_text_list_item.xml +++ b/app/src/main/res/layout/v_icon_text_list_item.xml @@ -3,7 +3,8 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="vertical" - xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/v_loading_screen.xml b/app/src/main/res/layout/v_loading_screen.xml index 26ab25cc..dd83aa38 100644 --- a/app/src/main/res/layout/v_loading_screen.xml +++ b/app/src/main/res/layout/v_loading_screen.xml @@ -8,6 +8,7 @@ android:orientation="vertical" android:visibility="gone" tools:visibility="visible" + tools:viewBindingIgnore="true" > <androidx.appcompat.widget.AppCompatImageView diff --git a/app/src/main/res/layout/v_location_button.xml b/app/src/main/res/layout/v_location_button.xml index 7f16a6b1..d304d429 100644 --- a/app/src/main/res/layout/v_location_button.xml +++ b/app/src/main/res/layout/v_location_button.xml @@ -7,7 +7,9 @@ android:layout_gravity="center_vertical" android:padding="@dimen/stdpadding" android:background="@drawable/cust_button_primary_rect" - android:layout_height="match_parent"> + android:layout_height="match_parent" + tools:viewBindingIgnore="true" + > <androidx.appcompat.widget.AppCompatImageView android:id="@+id/world_icn" diff --git a/app/src/main/res/layout/v_location_status_indicator.xml b/app/src/main/res/layout/v_location_status_indicator.xml index a8ba905e..af831cb0 100644 --- a/app/src/main/res/layout/v_location_status_indicator.xml +++ b/app/src/main/res/layout/v_location_status_indicator.xml @@ -5,6 +5,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="match_parent" + tools:viewBindingIgnore="true" > <androidx.constraintlayout.widget.Guideline diff --git a/app/src/main/res/layout/v_log_item.xml b/app/src/main/res/layout/v_log_item.xml index 5f809523..91bb99fd 100644 --- a/app/src/main/res/layout/v_log_item.xml +++ b/app/src/main/res/layout/v_log_item.xml @@ -3,6 +3,7 @@ android:orientation="vertical" android:layout_height="wrap_content" android:layout_width="match_parent" + tools:viewBindingIgnore="true" > <androidx.appcompat.widget.AppCompatTextView android:id="@android:id/text1" diff --git a/app/src/main/res/layout/v_main_btn.xml b/app/src/main/res/layout/v_main_btn.xml index c561e4cd..3ab62e5a 100644 --- a/app/src/main/res/layout/v_main_btn.xml +++ b/app/src/main/res/layout/v_main_btn.xml @@ -4,7 +4,9 @@ android:layout_height="wrap_content" android:id="@+id/vpn_btn_container" xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools"> + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true" + > <androidx.appcompat.widget.AppCompatImageView android:id="@+id/vpn_btn_glow" diff --git a/app/src/main/res/layout/v_provider_credentials.xml b/app/src/main/res/layout/v_provider_credentials.xml index be40c233..189bace6 100644 --- a/app/src/main/res/layout/v_provider_credentials.xml +++ b/app/src/main/res/layout/v_provider_credentials.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <merge xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_credentials_user_message" @@ -9,6 +10,7 @@ style="@style/TextAppearance.Design.Error" android:visibility="gone" android:linksClickable="true" + tools:viewBindingIgnore="true" /> <com.google.android.material.textfield.TextInputLayout diff --git a/app/src/main/res/layout/v_provider_header.xml b/app/src/main/res/layout/v_provider_header.xml index e0961ea6..42f4f783 100644 --- a/app/src/main/res/layout/v_provider_header.xml +++ b/app/src/main/res/layout/v_provider_header.xml @@ -2,7 +2,9 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_height="wrap_content" android:layout_width="match_parent" - xmlns:app="http://schemas.android.com/apk/res-auto" > + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/provider_header_logo" diff --git a/app/src/main/res/layout/v_provider_list_item.xml b/app/src/main/res/layout/v_provider_list_item.xml index b4f41793..0e7cc7f3 100644 --- a/app/src/main/res/layout/v_provider_list_item.xml +++ b/app/src/main/res/layout/v_provider_list_item.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:orientation="vertical" android:paddingTop="2dip" android:paddingBottom="2dip" @@ -8,7 +9,7 @@ android:layout_height="wrap_content" android:background="?android:attr/activatedBackgroundIndicator" android:minHeight="?android:attr/listPreferredItemHeight" -> + tools:viewBindingIgnore="true"> <androidx.appcompat.widget.AppCompatTextView android:id="@+id/provider_domain" android:layout_width="match_parent" diff --git a/app/src/main/res/layout/v_select_text_list_item.xml b/app/src/main/res/layout/v_select_text_list_item.xml index 44e82906..47a1f4ad 100644 --- a/app/src/main/res/layout/v_select_text_list_item.xml +++ b/app/src/main/res/layout/v_select_text_list_item.xml @@ -4,7 +4,8 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="vertical" - android:background="?attr/selectableItemBackground"> + android:background="?attr/selectableItemBackground" + tools:viewBindingIgnore="true"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/v_simple_checkbox.xml b/app/src/main/res/layout/v_simple_checkbox.xml index 8bae20b9..a5520341 100644 --- a/app/src/main/res/layout/v_simple_checkbox.xml +++ b/app/src/main/res/layout/v_simple_checkbox.xml @@ -1,8 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" android:layout_height="match_parent" - > + android:layout_width="match_parent" + android:layout_height="match_parent" + xmlns:tools="http://schemas.android.com/tools"> <View android:layout_width="wrap_content" @@ -18,6 +19,7 @@ android:layout_marginRight="8dp" android:layout_marginBottom="2dp" android:background="@drawable/cust_checkbox" + tools:viewBindingIgnore="true" /> <androidx.appcompat.widget.AppCompatImageView android:id="@+id/check_view" diff --git a/app/src/main/res/layout/v_single_list_item.xml b/app/src/main/res/layout/v_single_list_item.xml index 7b35bf7f..7bf772da 100644 --- a/app/src/main/res/layout/v_single_list_item.xml +++ b/app/src/main/res/layout/v_single_list_item.xml @@ -1,4 +1,5 @@ <androidx.appcompat.widget.AppCompatTextView xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -9,4 +10,5 @@ android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:paddingRight="?android:attr/listPreferredItemPaddingRight" android:background="?android:attr/activatedBackgroundIndicator" - android:minHeight="?android:attr/listPreferredItemHeightSmall" />
\ No newline at end of file + android:minHeight="?android:attr/listPreferredItemHeightSmall" + tools:viewBindingIgnore="true" />
\ No newline at end of file diff --git a/app/src/main/res/layout/v_switch_list_item.xml b/app/src/main/res/layout/v_switch_list_item.xml index 3ba37b81..514f28e7 100644 --- a/app/src/main/res/layout/v_switch_list_item.xml +++ b/app/src/main/res/layout/v_switch_list_item.xml @@ -4,6 +4,7 @@ android:layout_height="wrap_content" android:layout_width="match_parent" android:orientation="vertical" + tools:viewBindingIgnore="true" > <RelativeLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/v_vpn_status.xml b/app/src/main/res/layout/v_vpn_status.xml index ce8e6928..02f0659a 100644 --- a/app/src/main/res/layout/v_vpn_status.xml +++ b/app/src/main/res/layout/v_vpn_status.xml @@ -5,7 +5,8 @@ --> <merge xmlns:tools="http://schemas.android.com/tools" - xmlns:android="http://schemas.android.com/apk/res/android"> + xmlns:android="http://schemas.android.com/apk/res/android" + tools:viewBindingIgnore="true"> <Space android:layout_weight="1" diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml index 91391338..ae7d4d53 100644 --- a/app/src/main/res/values-es-rAR/strings.xml +++ b/app/src/main/res/values-es-rAR/strings.xml @@ -134,6 +134,7 @@ <string name="warning_exclude_apps_message">Tené cuidado de excluir aplicaciones de la VPN. Esto va a revelar tu identidad y comprometer a tu seguridad.</string> <plurals name="subtitle_exclude_apps"> <item quantity="one">%d aplicación desprotegida</item> + <item quantity="many">%d aplicaciones desprotegidas</item> <item quantity="other">%d aplicaciones desprotegidas</item> </plurals> <string name="warning_no_more_gateways_use_pt">%s no se pudo conectar. Puede ser que las conexiones al VPN estén bloqueadas. ¿Querés intentar conectar usando conexiones ofuscadas?</string> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6325635c..3cd933b9 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -134,6 +134,7 @@ <string name="warning_exclude_apps_message">Ten cuidado de excluir aplicaciones de la VPN. Esto revelará tu identidad y comprometerá tu seguridad.</string> <plurals name="subtitle_exclude_apps"> <item quantity="one">%d aplicación desprotegida</item> + <item quantity="many">%d aplicaciones desprotegidas</item> <item quantity="other">%d aplicaciones desprotegidas</item> </plurals> <string name="warning_no_more_gateways_use_pt">%s no se pudo conectar. Puede ser que las conexiones al VPN estén bloqueadas. ¿Quieres intentar a conectar usando conexiones ofuscadas?</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e3bf6443..ea8c6573 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -134,6 +134,7 @@ <string name="warning_exclude_apps_message">Soyez prudent en excluant des applis du RPV. Cela divulguera votre identité et compromettra votre sécurité.</string> <plurals name="subtitle_exclude_apps"> <item quantity="one">%d appli non protégée</item> + <item quantity="many">%d applis non protégées</item> <item quantity="other">%d applis non protégées</item> </plurals> <string name="warning_no_more_gateways_use_pt">%s n’a pas pu se connecter. Les connexions RPV sont peut-être bloquées. Voulez-vous tenter de vous connecter en essayant des connexions brouillées ?</string> diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 9b8975ce..68005365 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,12 +1,13 @@ <?xml version='1.0' encoding='UTF-8'?> <resources> - <string name="retry">Tente novamente</string> + <string name="retry">Tentar novamente</string> <string name="repository_url_text">Código fonte disponível em https://0xacab.org/leap/bitmask_android</string> <string name="leap_tracker">O gerenciador de bugs está disponível em https://0xacab.org/leap/bitmask_android/issues</string> <string name="translation_project_text">Traduções são bem-vindas. Veja nosso projeto do Transifex em https://www.transifex.com/projects/p/bitmask/</string> <string name="switch_provider_menu_option">Trocar provedor</string> <string name="info">info</string> <string name="show_connection_details">Mostrar os detalhes da conexão</string> + <string name="connection_details">Detalhes da conexão</string> <string name="routes_info">Rotas: %s</string> <string name="routes_info6">Rotas IPv6 %s</string> <string name="error_empty_username">O nome do usuário não pode estar vazio.</string> @@ -51,6 +52,7 @@ <string name="setup_error_configure_button">Configurar</string> <string name="setup_error_close_button">Sair</string> <string name="setup_error_text">Houve um erro configurando %s com o provedor escolhido por você.\n\nVocê pode optar por reconfigurar ou sair e configurar um provedor na próxima vez que abrir o programa. </string> + <string name="setup_error_text_custom">Houve um erro ao configurar %s.\n\nVocê pode reconfigurar ou sair.</string> <string name="server_unreachable_message">O servidor está inalcançável, tente novamente.</string> <string name="error.security.pinnedcertificate">Erro de segurança, atualize seu aplicativo ou escolha outro provedor.</string> <string name="malformed_url">Não parece ser um provedor %s.</string> @@ -87,6 +89,7 @@ <string name="action_example">Ação de exemplo</string> <string name="action_settings">Configurações</string> <string name="void_vpn_establish">%s bloqueia todo o tráfego de saída de internet.</string> + <string name="void_vpn_error_establish">Falha ao bloquear todo o tráfego de Internet.</string> <string name="void_vpn_stopped">Parou de bloquear todo o tráfego de saída de internet.</string> <string name="void_vpn_title">Bloqueando tráfego</string> <string name="update_provider_details">Atualizar detalhes do provedor</string> @@ -101,12 +104,21 @@ <string name="vpn_certificate_is_invalid">Certificado VPN inválido. Tente baixar um novo.</string> <string name="vpn_certificate_user_message">O certificado VPN é inválido. Por favor, faça login e baixe um novo.</string> <string name="save_battery">Economizar energia</string> + <string name="subtitle_save_battery">Desabilitado enquanto o Ponto de acesso VPN estiver ligado</string> <string name="save_battery_message">Conexões de dados em segundo plano vão hibernar quando o seu telefone estiver inativo.</string> <string name="always_on_vpn">VPN sempre ativa</string> <string name="subtitle_always_on_vpn">Abrir configurações do Android</string> + <string name="tethering">Ponto de acesso VPN</string> + <string name="ipv6Firewall">Bloquear IPv6</string> + <string name="require_root">Requer permissões de root</string> <string name="show_experimental">Mostrar recursos experimentais</string> <string name="hide_experimental">Esconder recursos experimentais</string> + <string name="experimental_features">Funcionalidades experimentais</string> + <string name="tethering_enabled_message">Por favor tenha certeza de primeiro habilitar tethering nas <![CDATA[<b>configurações de sistema</b>]].</string> + <string name="tethering_message">Compartilhe sua VPN com outros dispositivos através de:</string> <string name="tethering_wifi">Hotspot Wi-Fi</string> + <string name="tethering_usb">Tethering USB</string> + <string name="tethering_bluetooth">Tethering Bluetooth</string> <string name="do_not_show_again">Não mostrar novamente</string> <string name="always_on_vpn_user_message">Para habilitar VPN sempre ativa nas configurações de VPN clique no ícone de configurar [img src] e mude para ligado. </string> <string name="always_on_blocking_vpn_user_message">Para proteger sua privacidade da melhor forma, você deveria ativar também a opção \"Bloqueie conexões sem VPN\"</string> @@ -122,22 +134,72 @@ <string name="warning_exclude_apps_message">Seja cuidadoso ao excluir apps da VPN. Isso pode revelar sua identidade e comprometer sua segurança.</string> <plurals name="subtitle_exclude_apps"> <item quantity="one">%d app desprotegido</item> + <item quantity="many">%d apps desprotegidos</item> <item quantity="other">%d apps desprotegidos</item> </plurals> <string name="warning_no_more_gateways_use_pt">%s não pode se conectar. Isso pode ser devido ao bloqueio de conexões via VPN. Você deseja se conectar usando uma conexão ofuscada?</string> <string name="warning_no_more_gateways_no_pt">%s não pode se conectar. Gostaria de tentar novamente?</string> <string name="warning_no_more_gateways_use_ovpn">%s não pode se conectar usando uma VPN ofuscada. Voce gostaria de tentar usando uma conexão padrão?</string> + <string name="warning_no_more_gateways_manual_gw_selection">%1$s não pôde conectar a %2$s. Você quer tentar conectar automaticamente ao melhor local?</string> + <string name="warning_option_try_best">Tentar o melhor local</string> <string name="warning_option_try_pt">Tentar conexão ofuscada</string> <string name="warning_option_try_ovpn">Tentar conexão padrão</string> <string name="vpn_error_establish">Android falhou ao estabelecer o serviço VPN.</string> + <string name="root_permission_error">%s não pode ativar funcionalidades como Ponto de acesso VPN ou Firewall IPv6 sem permissões de root.</string> + <string name="qs_enable_vpn">Iniciar %s</string> + <string name="version_update_found">Toque aqui para iniciar o download.</string> + <string name="version_update_title">Uma nova versão de %s foi encontrada.</string> + <string name="version_update_apk_description">Baixando uma nova versão de %s</string> + <string name="version_update_download_title">Uma nova versão de %s foi baixada.</string> + <string name="version_update_download_description">Toque aqui para instalar a atualização.</string> + <string name="version_update_error_pgp_verification">Erro de verificação PGP. Ignorando arquivo baixado.</string> + <string name="version_update_error">Falha ao atualizar.</string> + <string name="version_update_error_permissions">Sem permissões para instalar o aplicativo.</string> + <string name="gateway_selection_title">Selecione o local</string> + <string name="gateway_selection_recommended_location">Local recomendado</string> <string name="gateway_selection_recommended">Recomendado</string> + <string name="gateway_selection_manually">Selecione manualmente</string> + <string name="gateway_selection_automatic_location">Use a melhor conexão automaticamente</string> <string name="gateway_selection_automatic">Automático</string> + <string name="reconnecting">Reconectando...</string> + <string name="tor_starting">Iniciando bridges para driblar a censura...</string> + <string name="tor_stopping">Parando bridges</string> + <string name="tor_started">Usando bridges para driblar a censura</string> + <string name="log_conn_done_pt">Conectado a um transporte plugável</string> + <string name="log_conn_pt">Conectando a um transporte plugável</string> + <string name="log_conn_done">Conectando a um relay</string> + <string name="log_handshake">Negociando conexão com um relay</string> + <string name="log_handshake_done">Conexão com relay negociada</string> <string name="log_onehop_create">Estabelecendo uma conexão de diretório criptografado</string> + <string name="log_requesting_status">Solicitando consenso do estado da rede</string> + <string name="log_loading_status">Carregando o consenso do estado da rede</string> <string name="log_loading_keys">Carregando certificados de autoridade</string> + <string name="log_requesting_descriptors">Solicitando descritores de relay</string> + <string name="log_loading_descriptors">Carregando descritores de relay</string> + <string name="log_enough_dirinfo">Informações suficientes sobre diretório foram carregadas para construir circuitos</string> + <string name="log_ap_handshake_done">Negociação finalizada com relay para construção de circuitos</string> <string name="log_circuit_create">Estabelecendo um circuito Tor</string> <string name="log_done">Executando</string> + <string name="channel_name_tor_service">%s Serviço de Bridges</string> + <string name="channel_description_tor_service">Informa sobre o uso de bridges ao configurar %s.</string> + <string name="error_tor_timeout">A inicialização de bridges falhou. Você quer tentar novamente ou continuar com uma conexão segura sem ofuscação para configurar %s?</string> + <string name="retry_unobfuscated">Tentar sem ofuscação</string> <string name="hide">Esconder</string> + <string name="error_network_connection">%s não tem conexão à Internet. Por favor verifique suas configurações de WiFi e dados móveis.</string> + <string name="censorship_circumvention">Driblando censura</string> <string name="use_snowflake">Usar Snowflake</string> + <string name="snowflake_description">Proteger processo de configuração contra censura.</string> + <string name="vpn_settings">Configurações de VPN</string> + <string name="prefer_udp">Usar UDP se disponível</string> + <string name="prefer_udp_subtitle">UDP pode ser mais rápido e melhor para transmissões (streaming), mas não funciona para todas as redes.</string> + <string name="disabled_while_bridges_on">Desabilitado durante o uso de bridges.</string> + <string name="hint_bridges">Apenas locais com suporte a bridges podem ser selecionados.</string> + <string name="option_disable_bridges">Desabilitar bridges</string> + <string name="eip_state_insecure">Conexão insegura</string> + <string name="connection_not_connected">Você pode estar vazando informações para seu provedor de Internet ou rede local.</string> + <string name="eip_state_no_network">Você não tem uma conexão de Internet funcionando. Assim que houver uma, você será automaticamente conectada a</string> + <string name="eip_state_blocking">%1$s está bloqueando todo o tráfego de Internet.</string> + <string name="disabled_while_udp_on">Desabilitado enquanto UDP estiver ligado.</string> <string name="advanced_settings">Configurações avançadas</string> <string name="cancel_connection">Desconectar</string> </resources> diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 88844192..9d115287 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -4,44 +4,43 @@ <string name="repository_url_text">Исходный код доступен на https://0xacab.org/leap/bitmask_android</string> <string name="leap_tracker">Отслеживание проблем доступно на https://0xacab.org/leap/bitmask_android/issues</string> - <string name="translation_project_text">Переводы приветствуются. Смотрите наш проект Transifex на -https://www.transifex.com/projects/p/bitmask/</string> - <string name="switch_provider_menu_option">Смена провайдера</string> - <string name="info">Информация</string> - <string name="show_connection_details">Показать подробности о соединении</string> + <string name="translation_project_text">Переводы приветствуются. Наш проект на Transifex: https://www.transifex.com/projects/p/bitmask/</string> + <string name="switch_provider_menu_option">Сменить провайдера</string> + <string name="info">информация</string> + <string name="show_connection_details">Показать сведения о соединении</string> <string name="connection_details">Сведения о соединении</string> <string name="routes_info">Маршруты: %s</string> <string name="routes_info6">Маршруты IPv6: %s</string> <string name="error_empty_username">Имя пользователя не должно быть пустым</string> <string name="cert_from_keystore">Получен сертификат \"%s\" из хранилища ключей</string> <string name="provider_label">Провайдер:</string> - <string name="provider_label_none">Ни один провайдер не настроен</string> - <string name="status_unknown">Состояние неизвестно.</string> - <string name="eip_service_label">Зашифрованное VPN-соединение с интернетом доступно</string> + <string name="provider_label_none">Провайдер не настроен</string> + <string name="status_unknown">Статус неизвестен.</string> + <string name="eip_service_label">Зашифрованный доступ в интернет через VPN</string> <string name="configuration_wizard_title">Выбрать провайдера</string> <string name="add_provider">Добавить нового провайдера</string> - <string name="introduce_new_provider">Добавить нового провайдера услуг</string> + <string name="introduce_new_provider">Добавить нового провайдера</string> <string name="save">Сохранить</string> - <string name="new_provider_uri">Имя домена</string> + <string name="new_provider_uri">Доменное имя</string> <string name="valid_url_entered">URL действителен</string> - <string name="not_valid_url_entered">Неправильно сформированный URL</string> + <string name="not_valid_url_entered">Неверный URL</string> <string name="provider_details_title">Информация о провайдере</string> <string name="use_anonymously_button">Использовать анонимно</string> - <string name="username_hint">Имя пользователя</string> + <string name="username_hint">имя пользователя</string> <string name="username_ask">Введите имя пользователя</string> <string name="password_ask">Введите пароль</string> - <string name="password_hint">Пароль</string> + <string name="password_hint">пароль</string> <string name="password_match">Пароли совпадают</string> <string name="password_mismatch">Пароли не совпадают</string> <string name="user_message">Сообщение пользователя</string> <string name="about_fragment_title">О нас</string> <string name="exclude_apps_fragment_title">Исключение приложений</string> - <string name="error_srp_math_error_user_message">Попытайтесь снова: ошибка сервера</string> + <string name="error_srp_math_error_user_message">Повторите попытку: ошибка сервера</string> <string name="error_bad_user_password_user_message">Неправильное имя пользователя или пароль</string> - <string name="error_not_valid_password_user_message">Должно быть не менее 8 символов</string> - <string name="error_client_http_user_message">Попытайтесь снова: ошибка HTTP-клиента</string> - <string name="error_io_exception_user_message">Попытайтесь снова: ошибка ввода/вывода</string> - <string name="error_json_exception_user_message">Попытайтесь снова: некорректный ответ от сервера</string> + <string name="error_not_valid_password_user_message">Длина должна быть не менее 8 символов</string> + <string name="error_client_http_user_message">Повторите попытку: ошибка HTTP-клиента</string> + <string name="error_io_exception_user_message">Повторите попытку: ошибка ввода/вывода</string> + <string name="error_json_exception_user_message">Повторите попытку: некорректный ответ от сервера</string> <string name="error_no_such_algorithm_exception_user_message">Алгоритм шифрования не найден. Обновите Android!</string> <string name="signup_or_login_button">Регистрация/вход</string> <string name="login_button">Войти</string> @@ -53,24 +52,24 @@ https://www.transifex.com/projects/p/bitmask/</string> <string name="setup_error_title">Ошибка конфигурации</string> <string name="setup_error_configure_button">Настройка</string> <string name="setup_error_close_button">Выход</string> - <string name="setup_error_text">Произошла ошибка при настройке %s с выбранным провайдером.\n\nВы можете выбрать перенастройку или выход и настройку поставщика при следующем запуске.</string> + <string name="setup_error_text">Произошла ошибка при настройке %s с выбранным вами провайдером.\n\nВы можете выбрать повторную настройку или выйти и настроить провайдера при следующем запуске.</string> <string name="setup_error_text_custom">Произошла ошибка в конфигурации %s.\n\nМожно изменить конфигурацию или выйти.</string> <string name="server_unreachable_message">Сервер недоступен, попробуйте ещё раз.</string> <string name="error.security.pinnedcertificate">Ошибка безопасности, обновите приложение или выберите другого провайдера.</string> - <string name="malformed_url">Не похоже, что %s провайдер.</string> - <string name="certificate_error">Это не доверенный %s провайдер.</string> + <string name="malformed_url">Похоже, %s не провайдер.</string> + <string name="certificate_error">%s не надёжный провайдер.</string> <string name="service_is_down_error">Сервис недоступен.</string> <string name="configuring_provider">Настройка провайдера</string> - <string name="incorrectly_downloaded_certificate_message">Ваш анонимный сертификат не загружен</string> + <string name="incorrectly_downloaded_certificate_message">Ваш анонимный сертификат не был загружен</string> <string name="downloading_certificate_message">Скачивание сертификата VPN</string> <string name="updating_certificate_message">Обновление сертификата VPN</string> - <string name="login.riseup.warning">Пользователям Riseup будет необходимо создать отдельный аккаунт для использования сервиса VPN.</string> + <string name="login.riseup.warning">Пользователям Riseup потребуется создать отдельную учётную запись для использования VPN</string> <string name="succesful_authentication_message">Аутентифицирован</string> <string name="authentication_failed_message">Ошибка аутентификации</string> <string name="registration_failed_message">Регистрация не выполнена</string> <string name="eip_status_start_pending">Установка соединения</string> <string name="eip_cancel_connect_title">Отменить соединение?</string> - <string name="eip_cancel_connect_text">Производится попытка установить соединение. Прервать её?</string> + <string name="eip_cancel_connect_text">Идёт попытка подключения. Вы хотите её отменить?</string> <string name="eip.warning.browser_inconsistency">Отключить VPN-соединение? При отключённой VPN ваша персональная информация может стать доступна провайдеру или в местной сети.</string> <string name="eip_state_not_connected">Не работает! Соединение небезопасно!</string> <string name="eip_state_connected">Безопасное соединение</string> @@ -92,7 +91,7 @@ https://www.transifex.com/projects/p/bitmask/</string> <string name="action_settings">Настройки</string> <string name="void_vpn_establish">%s блокирует весь исходящий интернет-трафик.</string> <string name="void_vpn_error_establish">Невозможно блокировать весь интернет-трафик.</string> - <string name="void_vpn_stopped">Перестал блокироваться весь исходящий интернет-трафик.</string> + <string name="void_vpn_stopped">Прекращена блокировка всего исходящего интернет-трафика.</string> <string name="void_vpn_title">Блокирование трафика</string> <string name="update_provider_details">Обновление информации провайдера</string> <string name="update_certificate">Обновление сертификата</string> @@ -100,7 +99,7 @@ https://www.transifex.com/projects/p/bitmask/</string> <string name="eip_json_corrupted_user_message">Невозможно обновить конфигурацию провайдера. Войдите, чтобы повторить попытку.</string> <string name="warning_client_parsing_error_gateways">Невозможно распознать шлюзы поставщика. Они могут быть настроены неправильно.</string> <string name="warning_corrupted_provider_details">Сохранённые сведения о провайдере повреждены. Можно либо обновить %s (рекомендуется), либо обновить сведения о поставщике с помощью коммерческого сертификата ЦС.</string> - <string name="warning_corrupted_provider_cert">Сохранённый сертификат провайдера недопустим. Можно либо обновить %s (рекомендуется), либо обновить сертификат поставщика с помощью коммерческого сертификата ЦС.</string> + <string name="warning_corrupted_provider_cert">Сохранённый сертификат провайдера недействителен. Вы можете либо обновить %s (рекомендуется), либо обновить сертификат провайдера используя коммерческий сертификат центра сертификации.</string> <string name="warning_expired_provider_cert">Срок действия сохранённого сертификата провайдера истёк. Можно либо обновить %s (рекомендуется), либо обновить сертификат поставщика с помощью коммерческого сертификата ЦС.</string> <string name="downloading_vpn_certificate_failed">Загрузка сертификата VPN не выполнена. Попробуйте ещё раз или выберите другого провайдера.</string> <string name="vpn_certificate_is_invalid">Сертификат VPN недействителен. Попытайтесь загрузить новый.</string> @@ -117,7 +116,7 @@ https://www.transifex.com/projects/p/bitmask/</string> <string name="hide_experimental">Скрыть экспериментальные функции</string> <string name="experimental_features">Экспериментальные функции</string> <string name="tethering_enabled_message">Не забудьте сначала включить модем в <![CDATA[<b>системных настройках</b>]]>.</string> - <string name="tethering_message">Раздавать VPN другим устройствами через:</string> + <string name="tethering_message">Поделиться VPN с другими устройствами через:</string> <string name="tethering_wifi">Точка доступа Wi-Fi</string> <string name="tethering_usb">USB-модем</string> <string name="tethering_bluetooth">Bluetooth-модем</string> @@ -129,23 +128,23 @@ https://www.transifex.com/projects/p/bitmask/</string> <string name="donate_message">LEAP зависит от пожертвований и грантов. Пожалуйста, сделайте пожертвование сегодня, если вы цените безопасное общение, простое как для конечного пользователя, так и для поставщика услуг.</string> <string name="donate_button_remind_later">Напомнить позже</string> <string name="donate_button_donate">Пожертвование</string> - <string name="obfuscated_connection">Использование запутанного соединения.</string> - <string name="obfuscated_connection_try">Попытка запутывания соединения.</string> + <string name="obfuscated_connection">Использование обфускации соединения.</string> + <string name="obfuscated_connection_try">Попытка обфускации соединения.</string> <string name="nav_drawer_obfuscated_connection">Использовать мосты</string> <string name="nav_drawer_subtitle_obfuscated_connection">Обход фильтрации VPN</string> <string name="warning_exclude_apps_message">Будьте осторожны, исключая приложения из VPN. Это позволит раскрыть вашу личность и поставить под угрозу вашу безопасность.</string> <plurals name="subtitle_exclude_apps"> - <item quantity="one">%d незащищённое приложение</item> - <item quantity="few">%d незащищённых приложения</item> - <item quantity="many">%d незащищённых приложений</item> + <item quantity="one">%d незащищенное приложение</item> + <item quantity="few">%d незащищенных приложения</item> + <item quantity="many">%d незащищенных приложений</item> <item quantity="other">%d незащищённых приложений</item> </plurals> - <string name="warning_no_more_gateways_use_pt">%s не удалось подключиться. Возможно, что VPN-соединения блокируются. Попробовать подключиться с помощью запутанных соединений?</string> + <string name="warning_no_more_gateways_use_pt">%s не подключается. Возможно, что VPN-соединения блокируются. Попробовать подключиться с помощью обфускации соединения?</string> <string name="warning_no_more_gateways_no_pt">%s не удалось подключиться. Повторить попытку?</string> - <string name="warning_no_more_gateways_use_ovpn">%s не удалось подключиться с помощью запутанных VPN-подключений. Попробовать подключиться с помощью стандартного VPN?</string> + <string name="warning_no_more_gateways_use_ovpn">%s не подключается с помощью обфускации VPN-соединения. Попробовать подключиться с помощью стандартного VPN?</string> <string name="warning_no_more_gateways_manual_gw_selection">%1$s не может подключиться к %2$s. Использовать автоматический выбор лучшего расположения?</string> <string name="warning_option_try_best">Попробовать лучшее расположение</string> - <string name="warning_option_try_pt">Попробовать запутать соединение</string> + <string name="warning_option_try_pt">Попробовать обфускацию соединения</string> <string name="warning_option_try_ovpn">Попробовать стандартное соединение</string> <string name="vpn_error_establish">Android не удалось установить службу VPN.</string> <string name="root_permission_error">%s не может использовать такие функции, как точка доступа VPN или блокировка IPv6, без root-прав.</string> @@ -185,8 +184,8 @@ https://www.transifex.com/projects/p/bitmask/</string> <string name="log_done">Запущено</string> <string name="channel_name_tor_service">Служба мостов %s</string> <string name="channel_description_tor_service">Информирует об использовании мостов при конфигурации %s.</string> - <string name="error_tor_timeout">Невозможно запустить мосты. Повторить попытку или продолжить с безопасным соединением без запутывания для настройки %s?</string> - <string name="retry_unobfuscated">Повтор без запутывания</string> + <string name="error_tor_timeout">Невозможно запустить мосты. Повторить попытку или продолжить безопасное соединение без обфускации, чтобы настроить %s?</string> + <string name="retry_unobfuscated">Повтор без обфускации</string> <string name="hide">Скрыть</string> <string name="error_network_connection">%s не имеет подключения к интернету. Проверьте настройки Wi-Fi и сотовой связи.</string> <string name="censorship_circumvention">Обход цензуры</string> |