From d6db9433d9f9e0e2f1dc21cd3de7d88d1e473861 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Mon, 19 Feb 2018 13:05:49 +0100 Subject: fix invalid vpn user message --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fa8fcd6c..2ea4670a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -106,5 +106,5 @@ Stored provider certificate is expired. You can either update Bitmask (recommended) or update the provider certificate using a commercial CA certificate. Downloading the VPN certificate failed. Try again or choose another provider. VPN certificate is invalid. Try to download a new one. - The VPN certificate is invalid. Please log in to do download a new one. + The VPN certificate is invalid. Please log in to download a new one. -- cgit v1.2.3 From cf10c3dc481b154cd8f4d6996c9a80643b67c840 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Thu, 22 Feb 2018 12:04:19 +0100 Subject: 8851 - remove options menu --- app/src/main/res/menu/configuration_wizard_activity.xml | 15 --------------- 1 file changed, 15 deletions(-) delete mode 100644 app/src/main/res/menu/configuration_wizard_activity.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/menu/configuration_wizard_activity.xml b/app/src/main/res/menu/configuration_wizard_activity.xml deleted file mode 100644 index 21591547..00000000 --- a/app/src/main/res/menu/configuration_wizard_activity.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - \ No newline at end of file -- cgit v1.2.3 From 6a683c605aa5bb5ce72f8ea46a4b6bcae0f9e98a Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Thu, 22 Feb 2018 17:00:40 +0100 Subject: 8868 - fix lollipop ui issues --- app/src/main/res/layout-xlarge/eip_service_fragment.xml | 9 ++++++--- app/src/main/res/layout/eip_service_fragment.xml | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml index b7af5797..c09bda2d 100644 --- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml +++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml @@ -54,7 +54,7 @@ app:srcCompat="@drawable/ic_colorsquare" /> - @@ -97,7 +98,7 @@ style="@style/BitmaskButtonBlack" /> - - diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml index 814ec310..30b94de9 100644 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ b/app/src/main/res/layout/eip_service_fragment.xml @@ -52,7 +52,7 @@ app:srcCompat="@drawable/ic_colorsquare" /> - @@ -97,7 +98,7 @@ style="@style/BitmaskButtonBlack" /> - - -- cgit v1.2.3 From 06eb4014837704e04d6ea8e9d7a69475a58c3c65 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 23 Feb 2018 02:22:25 +0100 Subject: #8754 enable pause openvpn on device inactivity feature --- app/src/main/res/layout/switch_list_item.xml | 15 +++++++++++++++ app/src/main/res/values/strings.xml | 3 +++ 2 files changed, 18 insertions(+) create mode 100644 app/src/main/res/layout/switch_list_item.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/switch_list_item.xml b/app/src/main/res/layout/switch_list_item.xml new file mode 100644 index 00000000..bdb9a74c --- /dev/null +++ b/app/src/main/res/layout/switch_list_item.xml @@ -0,0 +1,15 @@ + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2ea4670a..a69c2420 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -107,4 +107,7 @@ Downloading the VPN certificate failed. Try again or choose another provider. VPN certificate is invalid. Try to download a new one. The VPN certificate is invalid. Please log in to download a new one. + Save battery + Save Battery Warning + Background data connections will hibernate when your phone is inactive. This feature is still experimental. -- cgit v1.2.3 From ad086ab192b9094278b27f94120566a7ca21dccc Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 23 Feb 2018 02:34:55 +0100 Subject: #8754 fix dialog cancellation handling and change dialog title --- app/src/main/res/values/strings.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a69c2420..a0ca00c9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -108,6 +108,5 @@ VPN certificate is invalid. Try to download a new one. The VPN certificate is invalid. Please log in to download a new one. Save battery - Save Battery Warning - Background data connections will hibernate when your phone is inactive. This feature is still experimental. + Background data connections will hibernate when your phone is inactive. This feature is still experimental. -- cgit v1.2.3 From 3f37c6891621d913d034409cad69cd9f8feb6675 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 23 Feb 2018 03:53:08 +0100 Subject: #8754 don't let both navigation drawer lists eat each other on small displays --- app/src/main/res/layout/drawer_main.xml | 48 ++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 15 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/drawer_main.xml b/app/src/main/res/layout/drawer_main.xml index 26267bbb..54614f3f 100644 --- a/app/src/main/res/layout/drawer_main.xml +++ b/app/src/main/res/layout/drawer_main.xml @@ -1,13 +1,13 @@ + xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:background="@color/colorBackground" + tools:context="se.leap.bitmaskclient.drawer.NavigationDrawerFragment" + android:clickable="true" + android:focusable="true"> - + android:layout_height="wrap_content" + android:isScrollContainer="false" + /> - + + + android:layout_alignTop="@id/divider" + android:layout_alignParentBottom="true" + > + + + + -- cgit v1.2.3 From 2324de2a0bbcdd6befe4bbe1fea70731d538b664 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Sun, 25 Feb 2018 10:24:49 +0100 Subject: 8865 - resolve discussions --- app/src/main/res/values/strings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'app/src/main/res') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2ea4670a..2c191afa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -85,6 +85,7 @@ Turn off Stop blocking Your traffic is securely routed through: + No internet connection. Your traffic will be securely routed through: Bitmask Log Bitmask Log -- cgit v1.2.3 From 44322f28b28676a8938f4c1066a75ba47397aa7d Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Mon, 26 Feb 2018 20:31:48 +0100 Subject: 8865 - allow disconnecting without internet * moved logic from MainActivity to EIP --- .../res/layout-xlarge/eip_service_fragment.xml | 17 +++----------- app/src/main/res/layout/eip_service_fragment.xml | 27 ++++------------------ 2 files changed, 8 insertions(+), 36 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml index c09bda2d..2fe046b8 100644 --- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml +++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml @@ -58,11 +58,7 @@ android:id="@+id/eipLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/stdpadding" - android:layout_marginStart="@dimen/stdpadding" - android:layout_marginTop="@dimen/stdpadding" - android:layout_marginLeft="@dimen/stdpadding" - android:layout_marginRight="@dimen/stdpadding" + android:padding="@dimen/stdpadding" android:text="@string/eip_service_label" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center" @@ -102,11 +98,7 @@ android:id="@+id/routed_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/stdpadding" - android:layout_marginStart="@dimen/stdpadding" - android:layout_marginTop="@dimen/stdpadding" - android:layout_marginLeft="@dimen/stdpadding" - android:layout_marginRight="@dimen/stdpadding" + android:padding="@dimen/stdpadding" android:text="@string/vpn_securely_routed" android:gravity="center" android:visibility="visible" @@ -118,10 +110,7 @@ android:id="@+id/vpn_route" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/stdpadding" - android:layout_marginStart="@dimen/stdpadding" - android:layout_marginLeft="@dimen/stdpadding" - android:layout_marginRight="@dimen/stdpadding" + android:padding="@dimen/stdpadding" android:gravity="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml index 30b94de9..347f09d2 100644 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ b/app/src/main/res/layout/eip_service_fragment.xml @@ -56,11 +56,7 @@ android:id="@+id/eipLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/stdpadding" - android:layout_marginStart="@dimen/stdpadding" - android:layout_marginTop="@dimen/stdpadding" - android:layout_marginLeft="@dimen/stdpadding" - android:layout_marginRight="@dimen/stdpadding" + android:padding="@dimen/stdpadding" android:text="@string/eip_service_label" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center" @@ -85,28 +81,18 @@ android:id="@+id/vpn_main_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/stdpadding" - android:layout_marginEnd="@dimen/stdpadding" - android:layout_marginStart="@dimen/stdpadding" - android:layout_marginTop="@dimen/stdpadding" - android:layout_marginLeft="@dimen/stdpadding" - android:layout_marginRight="@dimen/stdpadding" + android:padding="@dimen/stdpadding" app:layout_constraintBottom_toBottomOf="@+id/background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" android:text="@string/vpn.button.turn.on" - style="@style/BitmaskButtonBlack" - /> + style="@style/BitmaskButtonBlack" /> Date: Tue, 27 Feb 2018 13:23:43 +0100 Subject: 8871 - rename sign up/log in --- app/src/main/res/values/strings.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2ea4670a..f4a5e6a8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -39,12 +39,11 @@ Try again: I/O error Try again: Bad response from the server Encryption algorithm not found. Please upgrade Android! - Sign Up/Log In Log In - Log in to profile + Log In Log Out Sign Up - Create profile + Sign Up Set up provider Configuration Error Configure -- cgit v1.2.3 From c532d4726e72071a14959846a2ebde3c693c2d72 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 27 Feb 2018 13:34:32 +0100 Subject: 8872 - new launcher icon --- app/src/main/res/drawable-hdpi/icon.png | Bin 7965 -> 0 bytes app/src/main/res/drawable-ldpi/icon.png | Bin 3118 -> 0 bytes app/src/main/res/drawable-mdpi/icon.png | Bin 4518 -> 0 bytes app/src/main/res/drawable-xhdpi/icon.png | Bin 11135 -> 0 bytes .../main/res/drawable/ic_launcher_background.xml | 74 +++++++++++++++++++++ app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 5 ++ .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 5 ++ app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 4054 bytes .../res/mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 5812 bytes app/src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 0 -> 6301 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2738 bytes .../res/mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 3796 bytes app/src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 0 -> 3812 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 5607 bytes .../res/mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 8292 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 0 -> 8783 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 8486 bytes .../res/mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 13528 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 0 -> 13542 bytes app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 11566 bytes .../res/mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 20381 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 0 -> 19074 bytes 22 files changed, 84 insertions(+) delete mode 100644 app/src/main/res/drawable-hdpi/icon.png delete mode 100644 app/src/main/res/drawable-ldpi/icon.png delete mode 100644 app/src/main/res/drawable-mdpi/icon.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon.png create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (limited to 'app/src/main/res') diff --git a/app/src/main/res/drawable-hdpi/icon.png b/app/src/main/res/drawable-hdpi/icon.png deleted file mode 100644 index 02ede650..00000000 Binary files a/app/src/main/res/drawable-hdpi/icon.png and /dev/null differ diff --git a/app/src/main/res/drawable-ldpi/icon.png b/app/src/main/res/drawable-ldpi/icon.png deleted file mode 100644 index e312075d..00000000 Binary files a/app/src/main/res/drawable-ldpi/icon.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/icon.png b/app/src/main/res/drawable-mdpi/icon.png deleted file mode 100644 index 468314c6..00000000 Binary files a/app/src/main/res/drawable-mdpi/icon.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/icon.png b/app/src/main/res/drawable-xhdpi/icon.png deleted file mode 100644 index ead03720..00000000 Binary files a/app/src/main/res/drawable-xhdpi/icon.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..01f0af0a --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 00000000..c4a603d4 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 00000000..c4a603d4 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 00000000..2d33905e Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..4b5ebe2f Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 00000000..226eb6cd Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 00000000..93c5dda3 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..8adc11b3 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 00000000..8b289993 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 00000000..f1ffdafa Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..bdaf6943 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000..bf47a793 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 00000000..8c507b7b Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..7197b58a Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..68139e11 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 00000000..c0eafbc4 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 00000000..cc095966 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..89d2ec18 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ -- cgit v1.2.3 From e5c09ca83bafd5cc8d473793b18c82f649ba02f7 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 27 Feb 2018 17:57:32 +0100 Subject: Revert "8865 - allow disconnecting without internet" This reverts commit 44322f28b28676a8938f4c1066a75ba47397aa7d. --- .../res/layout-xlarge/eip_service_fragment.xml | 17 +++++++++++--- app/src/main/res/layout/eip_service_fragment.xml | 27 ++++++++++++++++++---- 2 files changed, 36 insertions(+), 8 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml index 2fe046b8..c09bda2d 100644 --- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml +++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml @@ -58,7 +58,11 @@ android:id="@+id/eipLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/stdpadding" + android:layout_marginEnd="@dimen/stdpadding" + android:layout_marginStart="@dimen/stdpadding" + android:layout_marginTop="@dimen/stdpadding" + android:layout_marginLeft="@dimen/stdpadding" + android:layout_marginRight="@dimen/stdpadding" android:text="@string/eip_service_label" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center" @@ -98,7 +102,11 @@ android:id="@+id/routed_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/stdpadding" + android:layout_marginEnd="@dimen/stdpadding" + android:layout_marginStart="@dimen/stdpadding" + android:layout_marginTop="@dimen/stdpadding" + android:layout_marginLeft="@dimen/stdpadding" + android:layout_marginRight="@dimen/stdpadding" android:text="@string/vpn_securely_routed" android:gravity="center" android:visibility="visible" @@ -110,7 +118,10 @@ android:id="@+id/vpn_route" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/stdpadding" + android:layout_marginEnd="@dimen/stdpadding" + android:layout_marginStart="@dimen/stdpadding" + android:layout_marginLeft="@dimen/stdpadding" + android:layout_marginRight="@dimen/stdpadding" android:gravity="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml index 347f09d2..30b94de9 100644 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ b/app/src/main/res/layout/eip_service_fragment.xml @@ -56,7 +56,11 @@ android:id="@+id/eipLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/stdpadding" + android:layout_marginEnd="@dimen/stdpadding" + android:layout_marginStart="@dimen/stdpadding" + android:layout_marginTop="@dimen/stdpadding" + android:layout_marginLeft="@dimen/stdpadding" + android:layout_marginRight="@dimen/stdpadding" android:text="@string/eip_service_label" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center" @@ -81,18 +85,28 @@ android:id="@+id/vpn_main_button" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/stdpadding" + android:layout_marginBottom="@dimen/stdpadding" + android:layout_marginEnd="@dimen/stdpadding" + android:layout_marginStart="@dimen/stdpadding" + android:layout_marginTop="@dimen/stdpadding" + android:layout_marginLeft="@dimen/stdpadding" + android:layout_marginRight="@dimen/stdpadding" app:layout_constraintBottom_toBottomOf="@+id/background" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" android:text="@string/vpn.button.turn.on" - style="@style/BitmaskButtonBlack" /> + style="@style/BitmaskButtonBlack" + /> Date: Tue, 27 Feb 2018 18:12:21 +0100 Subject: 8865 - allow disconnect without connection * revert last commit * dirty fix to disconnect - see #8876 * add padding in EipFragment --- app/src/main/res/layout-xlarge/eip_service_fragment.xml | 17 +++-------------- app/src/main/res/layout/eip_service_fragment.xml | 17 +++-------------- 2 files changed, 6 insertions(+), 28 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml index c09bda2d..2fe046b8 100644 --- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml +++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml @@ -58,11 +58,7 @@ android:id="@+id/eipLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/stdpadding" - android:layout_marginStart="@dimen/stdpadding" - android:layout_marginTop="@dimen/stdpadding" - android:layout_marginLeft="@dimen/stdpadding" - android:layout_marginRight="@dimen/stdpadding" + android:padding="@dimen/stdpadding" android:text="@string/eip_service_label" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center" @@ -102,11 +98,7 @@ android:id="@+id/routed_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/stdpadding" - android:layout_marginStart="@dimen/stdpadding" - android:layout_marginTop="@dimen/stdpadding" - android:layout_marginLeft="@dimen/stdpadding" - android:layout_marginRight="@dimen/stdpadding" + android:padding="@dimen/stdpadding" android:text="@string/vpn_securely_routed" android:gravity="center" android:visibility="visible" @@ -118,10 +110,7 @@ android:id="@+id/vpn_route" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/stdpadding" - android:layout_marginStart="@dimen/stdpadding" - android:layout_marginLeft="@dimen/stdpadding" - android:layout_marginRight="@dimen/stdpadding" + android:padding="@dimen/stdpadding" android:gravity="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml index 30b94de9..9842198b 100644 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ b/app/src/main/res/layout/eip_service_fragment.xml @@ -56,11 +56,7 @@ android:id="@+id/eipLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/stdpadding" - android:layout_marginStart="@dimen/stdpadding" - android:layout_marginTop="@dimen/stdpadding" - android:layout_marginLeft="@dimen/stdpadding" - android:layout_marginRight="@dimen/stdpadding" + android:padding="@dimen/stdpadding" android:text="@string/eip_service_label" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center" @@ -102,11 +98,7 @@ android:id="@+id/routed_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/stdpadding" - android:layout_marginStart="@dimen/stdpadding" - android:layout_marginTop="@dimen/stdpadding" - android:layout_marginLeft="@dimen/stdpadding" - android:layout_marginRight="@dimen/stdpadding" + android:padding="@dimen/stdpadding" android:text="@string/vpn_securely_routed" android:gravity="center" android:visibility="visible" @@ -118,10 +110,7 @@ android:id="@+id/vpn_route" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/stdpadding" - android:layout_marginStart="@dimen/stdpadding" - android:layout_marginLeft="@dimen/stdpadding" - android:layout_marginRight="@dimen/stdpadding" + android:padding="@dimen/stdpadding" android:gravity="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" -- cgit v1.2.3 From 51944da747bc883eeef09bb5ffc9b395416ec253 Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 27 Feb 2018 18:48:26 +0100 Subject: #8875 update licenses --- app/src/main/res/layout-xlarge/about.xml | 52 ++++++++++++++++++++++++++++++ app/src/main/res/layout/about.xml | 46 ++++++++++++++++++++++++++ app/src/main/res/values/untranslatable.xml | 20 ++++++------ 3 files changed, 108 insertions(+), 10 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout-xlarge/about.xml b/app/src/main/res/layout-xlarge/about.xml index ea2251cf..c7896917 100644 --- a/app/src/main/res/layout-xlarge/about.xml +++ b/app/src/main/res/layout-xlarge/about.xml @@ -152,6 +152,58 @@ android:layout_height="wrap_content" android:textSize="18sp" android:text="@string/copyright_okhttp" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml index abc12566..aba51141 100644 --- a/app/src/main/res/layout/about.xml +++ b/app/src/main/res/layout/about.xml @@ -150,6 +150,52 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_okhttp" /> + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index 59605609..2e91366a 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -1,8 +1,7 @@ Bitmask - %s - - Copyright 2012-2017\nLEAP Encryption Access Project <info@leap.se> + Copyright 2012-2018\nLEAP Encryption Access Project <info@leap.se> Copyright © 2002–2010 OpenVPN Technologies, Inc. <sales@openvpn.net>\n "OpenVPN" is a trademark of OpenVPN Technologies, Inc. Copyright © 1996 – 2011 Markus Franz Xaver Johannes Oberhumer @@ -15,20 +14,21 @@ OpenVPN LZO OpenSSL + Mbed TLS + Unless specifically indicated otherwise in a file, files are licensed under the Apache 2.0 license, as can be found in: apache-2.0.txt. \n + https://github.com/schwabe/polarssl/blob/icsopenvpn_270/apache-2.0.txt + + Asio + Boost Software License - Version 1.0 - August 17th, 2003 + OpenVPN 3 + GNU AFFERO GENERAL PUBLIC LICENSE\n + Version 3, 19 November 2007 Unknown state - Copyright 2012–2017 Arne Schwabe <arne@rfc2549.org> - openvpn.uni-paderborn.de 1194 File Dialog based on work by Alexander Ponomarev - - - File Dialog - - - Allows another app to control OpenVPN Bouncy Castle Crypto APIs Copyright © 2000–2012 The Legion Of The Bouncy Castle (http://www.bouncycastle.org) -- cgit v1.2.3 From ebfd6b38aaf5a375aaa4d27d696e22dd432e642a Mon Sep 17 00:00:00 2001 From: cyBerta Date: Tue, 27 Feb 2018 19:36:02 +0100 Subject: #8873 add new translations --- app/src/main/res/values-ar/strings_ar.xml | 12 ++++ app/src/main/res/values-de/strings.xml | 13 +++- app/src/main/res/values-es/strings.xml | 7 ++ app/src/main/res/values-fa-rIR/strings.xml | 92 +++++++++++++++++++++--- app/src/main/res/values-fr/strings.xml | 16 +++++ app/src/main/res/values-gl/strings.xml | 110 +++++++++++++++++++++++++++++ app/src/main/res/values-nl/strings.xml | 73 +++++++++++++++++++ app/src/main/res/values-no/strings.xml | 5 ++ app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values/strings.xml | 5 +- 10 files changed, 319 insertions(+), 15 deletions(-) create mode 100644 app/src/main/res/values-ar/strings_ar.xml create mode 100644 app/src/main/res/values-gl/strings.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/values-ar/strings_ar.xml b/app/src/main/res/values-ar/strings_ar.xml new file mode 100644 index 00000000..d432873f --- /dev/null +++ b/app/src/main/res/values-ar/strings_ar.xml @@ -0,0 +1,12 @@ + + + حاول مجددا + حفظ + اسم النطاق + إسم المستخدم + كلمة المرور + تسجيل الدخول + تسجيل الخروج + تكوين + الخروج + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f42ddb03..38e98e4a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -23,7 +23,7 @@ Gültige URL Ungültige URL Provider Details - Anonym benutzen. + Anonym benutzen Benutzer*innenname Bitte geben Sie Ihr Benutzer*innenname ein Bitte Passwort eingeben @@ -41,10 +41,10 @@ Verschlüsselungsalgorithmus nicht gefunden. Bitte aktualisiere deine Android-Version! Registrieren / Anmelden Anmelden - Profil anmelden. + Anmelden Abmelden Registrieren - Profil erstellen. + Profil erstellen Provider einrichten. Konfigurationsfehler Konfigurieren @@ -99,7 +99,14 @@ Internetverkehr wird blockiert Providerdetails werden aktualisiert Zertifikat aktualisieren + Die Aktualisierung der Providerkonfiguration ist fehlgeschlagen. + Die Aktualisierung der Providerkonfiguration ist fehlgeschlagen. Bitte einloggen, um es erneut zu versuchen. Die gespeicherten Providerdetails sind fehlerhaft. Du kannst entweder Bitmask aktualisieren (Empfehlung) oder die Providerdetails mithilfe eines kommerziellen CA Zertifikates aktualisieren. Das gespeicherte Providerzertifikat ist ungültig. Du kannst entweder Bitmask aktualisieren (Empfehlung) oder das Providerzertifikat mithilfe eines kommerziellen CA Zertifikates aktualisieren. Das gespeicherte Providerzertifikat ist abgelaufen. Du kannst entweder Bitmask aktualisieren (Empfehlung) oder das Providerzertifikat mithilfe eines kommerziellen CA Zertifikates aktualisieren. + Das Herunterladen des VPN Zertifikates ist fehlgeschlagen. Versuche es erneut oder wähle einen anderen Provider aus. + Das VPN Zertifikat ist ungültig. Versuche ein neues herunterzuladen. + Das VPN Zertifikat ist ungültig. Bitte melde dich an, um ein neues herunterzuladen. + Batteriesparmodus + Hintergrunddaten werden nicht übertragen während das Telefon inaktiv ist. Diese Funktion ist noch experimentell. diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 710b1b8d..abb263bc 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -99,7 +99,14 @@ Bloqueando el tráfico Actualizar detalles del proveedor Actualizar certificado + No se pudo actualizar la configuración del proveedor. + No se pudo actualizar la configuración del proveedor. Por favor, incie sesión e inténtelo de nuevo. Los detalles del proveedor almacenados están corrompidos. Puede actualizar Bitmask (recomendado), o bien actualizar los detalles del proveedor usando un certificado de una autoridad de certificación/CA comercial. El certificado del proveedor almacenado no es válido. Puede actualizar Bitmask (recomendado), o bien actualizar el certificado de proveedor usando una autoridad de certificación/CA comercial. El certificado del proveedor almacenado ha caducado. Puede actualizar Bitmask (recomendado) o actualizar el certificado de proveedor usando una autoridad de certificación/CA comercial. + No se pudo descargar el certificado de la VPN. Inténtelo de nuevo o escoja otro proveedor. + El certificado de la VPN no es válido. Trate de descargar uno nuevo. + El certificado de la VPN no es válido. Por favor, inicie sesión para descargar uno nuevo. + Ahorrar batería + Las conexiones de datos en segundo plano hibernarán cuando su teléfono esté inactivo. Esta característica todavía es experimental. diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml index 551bdd16..99819cfb 100644 --- a/app/src/main/res/values-fa-rIR/strings.xml +++ b/app/src/main/res/values-fa-rIR/strings.xml @@ -1,38 +1,110 @@ تلاش دوباره + دسترسی به منبع کد در https://0xacab.org/leap/bitmask_android + نظرات، پیشنهادات و گزارش اشکالات در https://0xacab.org/leap/bitmask_android/issues + از همکاری شما برای ترجمه استقبال می‌کنیم. پروژه Transifex ما در اینجا ببینید: https://www.transifex.com/projects/p/bitmask-android/ تعویض ارائه دهنده اطلاعات - نمایش اطلاعات تماس + نمایش جزئیات ارتباط مسیرها: %s + مسیرهای IPv6: %s نام کاربری نباید خالی باشد. + گرفتن تصدیق \'%s\' از کی‌استور ارائه‌دهنده: - ارائه‌دهنده‌ای تنظیم نشده - وضعیت نامشخص. + ارائه‌دهنده‌ای تنظیم نشده است + وضعیت نامشخص + دسترسی کدگزاری شده به اینترنت با وی‌پی‌ان + انتخاب سرویس ارائه‌دهنده + اضافه کردن ارائه‌دهنده جدید ارائه‌دهنده‌ی سروریس جدید وارد کنید ذخیره نام دامنه - استفاده از ناشناسی + URL معتبر است + URL صحیح نیست + اطلاعات ارائه‌دهنده + استفاده به صورت ناشناس نام کاربری لطفا شناسه‌ی خود را وارد کنید - کلمه عبور + لطفا رمز عبور خود را وارد کنید + رمز عبور + رمزهای عبور یکسان است + رمزهای عبور یکسان نیست پیغام کاربر - شناسه یا رمز نادرست - تلاش دوباره: خطای HTTP کاربر - تلاش دوباره: خطای I/O - تلاش دوباره: پاسخ نامناسب از سرور + درباره‌ + دوباره تلاش کنید: اشکال در سرور + نام کاربری یا رمز نادرست + باید حداقل ۸ حرف باشد. + دوباره تلاش کنید: خطای HTTP کاربر + دوباره تلاش کنید: خطای I/O + دوباره تلاش کنید: پاسخ نامناسب از سرور + الگوریتم کدگذاری‌شده یافت نشد. لطفا آندروید را به‌روز رسانی کنید! + ثبت نام/ ورود ورود - برون رفت + ورود به صفحه شخصی + خروج + ثبت‌نام + درست‌کردن صفحه شخصی + تنظیم ارائه‌دهنده خطای تنظیمات تنظیم خروج + خطای تنظیم بیتمسک با ارائه‌دهنده انتخابی شما. n\n\ تنظیم را دوباره انجام دهید یا از برنامه خارج شوید و تنظیم ارائه‌دهنده را با بازکردن مجدد انجام دهید. + سرور قابل دسترس نیست، لطفا دوباره تلاش کنید. + اخطار امنیتی، برنامه app را به‌روز رسانی کنید یا ارائه‌دهنده دیگری انتخاب کنید. به نظر نمی‌رسد که یک ارائه‌دهنده‌ی بیتمسک باشد. این یک ارائه‌دهنده‌ی قابل اعتماد بیتمسک نیست. + سرور وی‌پی‌ان در دسترس نیست. در حال تنظیم کردن ارائه‌دهنده گواهی ناشناسی شما دریافت نشد + دریافت گواهی وی‌پی‌ان + به‌روز رسانی گواهی وی‌پی‌ان + کاربران Riseup نیاز به ساختن حساب کاربری جداگانه‌ای برای استفاده از وی‌پی‌ان دارند + احراز هویت احراز هویت ناموفق بود. + ثبت‌ ناموفق آماده‌سازی اتصال انصراف از اتصال؟ تلاشی برای برقراری ارتباط در جریان است. آیا می‌خواهید آن را قطع کنید؟ + خاموش کردن اتصال با وی‌پی‌ان؟ وقتی وی‌پی‌ان خاموش است، اطلاعات شما ممکن است توسط ارائه‌دهنده اینترنت و یا شبکه محلی قابل دسترس باشد. + کار نمی‌کند! اتصال ناامن! اتصال امن. + به نظر می‌رسد مشکلی با ارائه‌دهنده وجود دارد. + لطفا از ارائه‌دهنده دیگری استفاده کنید و یا با ارائه‌دهنده تماس بگیرید. + ناشناس + وارد شده است. + خارج شده است + خارج نشده‌است. بعدا دوباره امتحان کنید، ممکن است مشکلی در شبکه یا با ارائه‌دهنده باشد. اگر قابل حل نیست، اطلاعات بیتمسک را از روی تنظیمات اندروید پاک کنید. + وارد نشده است. + در حال ورود. + وارد شدن + ثبت‌نام کردن + در حال خروج. + ثبت شده است. + روشن کردن + خاموش کردن + توقف مسدود کردن + ترافیک شما به صورت امن از اینجا گذشته است: + لاگ بیتمسک + بیتمسک + لاگ + وی‌پی‌ان + بازکردن نوار ابزار + بستن نوار ابزار + فعالیت نمونه + تنظیمات + بیتمسک تمام ترافیک خروجی اینترنت را مسدود می‌کند. + ناموفق در راه‌اندازی وی‌پی‌ان مسدودکننده + مسدودکردن تمام ترافیک خروجی اینترنت متوقف شد. + مسدود کردن ترافیک + به‌روز رسانی اطلاعات ارائه‌دهنده + به‌روز رسانی گواهی + ناموفق در به‌روز رسانی تنظیمات ارا‌ئه‌دهنده + ناموفق در به‌روز رسانی تنظیمات ارا‌ئه‌دهنده. برای تلاش مجدد، لطفا دوباره وارد شوید. + گواهی ارائه‌دهنده ذخیره‌شده خراب است. یا بیتمسک را به‌روز رسانی کنید (گزینه پیشنهادی)، و یا اطلاعات ارائه‌دهنده را با استفاده از گواهی تجاری CA به‌روز رسانی کنید. + گواهی ارائه‌دهنده ذخیره‌شده نامعتبر است. یا بیتمسک را به‌روز رسانی کنید (گزینه پیشنهادی)، و یا گواهی ارائه‌دهنده را با استفاده از گواهی تجاری CA به‌روز رسانی کنید. + گواهی ارائه‌دهنده ذخیره‌شده تاریخ‌گذشته است. یا بیتمسک را به‌روز رسانی کنید (گزینه پیشنهادی)، و یا گواهی ارائه‌دهنده را با استفاده از گواهی تجاری CA به‌روز رسانی کنید. + ناموفق در دریافت گواهی وی‌پی‌ان. لطفا دوباره تلاش کنید و یا ارائه‌دهنده دیگری را انتخاب کنید. + گواهی وی‌پی‌ان نامعتبر است. تلاش کنید که گواهی جدیدی دریافت کنید. + گواهی وی‌پی‌ان نامعتبر است. لطفا برای دریافت گواهی جدید وارد شوید. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e1133837..3a668286 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -16,15 +16,20 @@ État inconnu. Accès à Internet par RPV chiffré Choisir un fournisseur de services + Ajouter un nouveau fournisseur Ajouter un nouveau fournisseur de services Enregistrer Nom de domaine Cette URL est valide URL malformée + Renseignements sur le fournisseur Utiliser anonymement nom d’utilisateur Veuillez saisir votre nom d’utilisateur + Veuillez saisir votre mot de passe mot de passe + Les mots de passe correspondent + Les mots de passe ne correspondent pas Message utilisateur À propos Ressayer : erreur mathématique du serveur. @@ -82,6 +87,10 @@ Votre trafic est acheminé en toute sécurité par : Journal Bitmask Bitmask + Journal + RPV + Ouvrir le tiroir de navigation + Fermer le tiroir de navigation Exemple d’action Paramètres Bitmask bloque tout le trafic Internet sortant. @@ -90,7 +99,14 @@ Blocage du trafic Mettre les renseignements de fournisseur à jour Mettre le certificat à jour + Échec de mise à jour de la configuration du fournisseur. + Échec de mise à jour de la configuration du fournisseur. Veuillez vous connecter pour ressayer. Les renseignements de fournisseur enregistrés sont corrompus. Vous pouvez soit mettre Bitmask à jour (recommandé), soit mettre les renseignements de fournisseur à jour en utilisant un certificat CA commercial. Le certificat de fournisseur enregistré est invalide. Vous pouvez soit mettre Bitmask à jour (recommandé), soit mettre le certificat de fournisseur à jour en utilisant un certificat CA commercial. Le certificat de fournisseur enregistré est expiré. Vous pouvez soit mettre Bitmask à jour (recommandé), soit mettre le certificat de fournisseur à jour en utilisant un certificat CA commercial. + Échec de téléchargement du certificat du RPV. Ressayez ou choisissez un autre fournisseur. + Le certificat du RPV est invalide. Essayez d’en télécharger un nouveau. + Le certificat du RPV est invalide. Veuillez vous connecter pour en télécharger un nouveau. + Économiser la batterie + Les communications de données d’arrière-plan seront mises en veille quand votre téléphone sera inactif. Cette fonction est encore expérimentale. diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml new file mode 100644 index 00000000..35c77f4f --- /dev/null +++ b/app/src/main/res/values-gl/strings.xml @@ -0,0 +1,110 @@ + + + Intentar de novo + Código fonte dispoñible en https://0xacab.org/leap/bitmask_android + Seguimento de incidencias en https://0xacab.org/leap/bitmask_android/issues + Agradécese a tradución. Aquí está o noso proxecto en Transifex https://www.transifex.com/projects/p/bitmask-android/ + Cambiar provedor + info + Mostrar detalles da conexión + Rutas: %s + Rutas IPv6: %s + A caixa nome de usuaria non pode estar baldeira. + Obteña o certificado \'%s\' do almacén de chaves + Provedor: + Non hai provedor configurado + Estado descoñecido. + Acceso a internet con VPN cifrado + Escolla un provedor de acceso + Engadir novo provedor + Engadir novo provedor de servizo + Gardar + Nome de dominio + O URL é válido + URL mal formado + Detalles do provedor + Utilizar de xeito anónimo + nome de usuaria + Por favor introduza o seu nome de usuaria + Por favor introduza o seu contrasinal + contrasinal + Os contrasinais concordan + Os contrasinais non concordan + Mensaxe de usuaria + Sobre + Inténtar de novo: Fallo no servidor. + Nome de usuaria ou contrasinal incorrectos. + Cando menos debe ter 8 caracteres. + Intentar de novo: Fallo no cliente HTTP + Intentar de novo: fallo I/O + Intentar de novo: resposta incorrecta desde o servidor + Non se atopou algoritmo de cifrado. Por favor actualice Android! + Conexión/Rexistro + Conectar + Conectar perfil + Desconectar + Rexistro + Crear perfil + Establecer provedor + Fallo na configuración + Configurar + Saír + Algo fallou ao configurar Bitmask co provedor escollido.\n\nPode escoller reconfigurar ou saír e configurar un provedor no seguinte inicio. + Non se puido conectar ao servidor, por favor inténteo de novo. + Fallo de seguridade, anove o aplicativo ou escolla outro provedor + Non semella ser un provedor Bitmask. + Este non é un provedor de confianza de Bitmask + O servizo está caído. + Configurando provedor + Non se descargou o seu certificado de anonimato + Descargando certificado VPN + Anovando certificado VPN + As usuarias de Riseup precisarán crear unha conta separada para utilizar o servizo VPN + Autenticada. + Fallo na autenticación. + Fallo no rexistro + Iniciando conexión + Cancelar a conexión? + Hai un intento de conexión en proceso. Desexa cancelalo? + Apagar a conexión VPN? Si está desconectada a VPN podería suministrar información personal ao seu provedor de acceso a internet ou rede local. + Non está a conectada! Conexión insegura! + Conexión segura. + Semella que hai un problema co provedor. + Por favor, inténteo con un novo provedor ou contacte co seu. + Anónimo + está conectada. + desconectada. + non se desconectou. Inténteo máis tarde, podería haber un problema na rede ou co provedor. Si persiste o problema, borre os datos de Bitmask nos axustes de Android. + non se ten conectado. + está a conectar. + Conectando + Rexistrando + está a desconectar. + está sendo rexistrada. + Acender + Apagar + Deixar de bloquear + O seu tráfico está securizado a través de: + Rexistro Bitmask + Bitmask + Rexistro + VPN + Abrir cadro de navegación + Pechar cadro de navegación + Acción de exemplo + Axustes + Bitmask bloquea todo o tráfico saínte a internet. + Fallo ao establecer bloqueo VPN. + Deixou de bloquear todo o tráfico saínte. + Bloqueando tráfico + Actualizar detalles do provedor + Anovar certificado + Fallo ao anovar a configuración do provedor. + Fallo ao anovar a configuración do provedor. Por favor conéctese para intentalo de novo. + Os datos do provedor gardados son defectuosos. Pode actualizar Bitmask (recomendado) ou ben actualizar os detalles do provedor utilizando un certificado CA de confianza. + O certificado de provedor gardado non é válido. Pode actualizar Bitmask (recomendado) ou actualizar o certificado do provedor utilizando un certificado CA comercial. + O certificado do provedor gardado caducou. Pode actualizar Bitmask (recomendado) ou pode actualizar o certificado do provedor utilizando un certificado CA comercial. + Fallou a descarga do certificado do VPN. Inténteo de novo ou escolla outro provedor. + O certificado do VPN non é válido. Intente descargar un novo. + O certificado VPN non é válido. Por favor conéctese para descargar un novo. + diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 0d8b85a6..b17ac66d 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -3,39 +3,112 @@ Opnieuw proberen Broncode is beschikbaar op https://0xacab.org/leap/bitmask_android Issue tracker https://0xacab.org/leap/bitmask_android/issues + Vertalingen zijn welkom en worden gewaardeerd. Kijk voor meer info op onze Transifex pagina: https://www.transifex.com/projects/p/bitmask-android/ Provider wisselen info Details van de verbinding weergeven Routes: %s + IPv6 routes: %s De gebruikersnaam moet niet leeg zijn. + Kreeg certificaat \'%s\' van de keystore Provider: Geen provider ingesteld Status onbekend + VPN Versleutelde Internet Toegang + Service provider selecteren + Nieuwe provider toevoegen Nieuwe serviceprovider toevoegen Opslaan Domeinnaam + De URL is correct + Incorrecte URL + Provider details Anoniem gebruiken gebruikersnaam Geef je gebruikersnaam in + Voer je wachtwoord in wachtwoord + Wachtwoorden komen overeen + Wachtwoorden komen niet overeen Bericht + Over + Probeer opnieuw: serverrekenfout. Gebruikersnaam of wachtwoord verkeerd. + Wachtwoord moet minstens 8 tekens bevatten. Probeer opnieuw: Client HTTP fout Probeer opnieuw: I/O fout Probeer opnieuw: incorrect antwoord van de server + Coderingsalgoritme niet gevonden. Gelieve Android te upgraden! + Inschrijven/Inloggen Aanmelden + Login voor profiel Afmelden + Registreer + Creeer profiel + Setup provider Configuratiefout Configureren Aflsluiten + Er is een probleem opgetreden om Bitmask te configureren met jou provider. + +Je kan kiezen om te herconfigureren of af te sluiten en bij de volgende start een provider in te stellen. + Server is onbereikbaar, probeer later opnieuw. + Beveiligingsprobleem, upgrade de app of kies een andere provider. Dit lijkt geen Bitmask provider te zijn. Dit is geen vertrouwde Bitmask provider. + Service is onbereikbaar. Provider wordt ingesteld Je anonieme certificaat is niet gedownload + Downloading VPN certificaat + Updaten VPN certificaat + Riseup gebruikers moeten een apart account aanmaken om de VPN service te gebruiken + Geauthenticeerd. Authenticatie mislukt. + Registratie mislukt. Verbinding wordt geïnitialiseerd Verbinding annuleren? We proberen een verbinding tot stand te brengen. Wil je dit annuleren? + VPN verbinding uitzetten? Wanneer de VPN uitstaat, kan je persoonlijke data lekken naar je internet provider of je lokale netwerk. + Uitgeschakeld! Onbeveiligde verbinding! Verbinding beveiligd. + Het lijkt er op dat er een probleem is met de provider. + Gelieve een andere provider te proberen of contacteer je huidige. + Anoniem + is ingelogd. + is uitgelogd. + niet uitgelogd. Probeer het later, er kan een probleem zijn met het netwerk of de provider. Als het probleem zich blijft voordoen, verwijder dan de Bitmask data uit de Android settings. + heeft zich niet ingelogd. + wordt aangemeld. + Aanmelden + Sign up + wordt uitgelogd. + wordt geregistreerd. + Aanzetten + Uitschakelen + Stop blokkeren + Je verkeer wordt veilig geroute door: + Bitmask Log + Bitmask + Log + VPN + Open navigatiemenu + Sluit navigatiemenu + Voorbeeld + Instellingen + Bitmaks blokkert alle uitgaande internetverkeer. + Niet gelukt om een blokkerende VPN op te zetten. + Gestopt met blokkkeren van alle uitgaande internetverkeer. + Blokkeert verkeer + Update provider details Update certificaat + Updaten providerconfiguratie mislukt + Updaten providerconfiguratie mislukt. Login of probeer opnieuw. + Opgeslagen providerdetails zijn corrupt. Je kan Bitmask updaten (aanbevolen) of de provider details updaten met een commercieel CA-certificaat. + Opgeslagen providercertificaat is ongeldig. Je kan Bitmask updaten (aanbevolen) of het provider certificaat updaten met een commercieel CA-certificaat. + Opgeslagen providercertificaat is verlopen. Je kan Bitmask updaten (aanbevolen) of het provider certificaat updaten met een commercieel CA-certificaat. + Downloaden van het VPN certificaat mislukt. Probeer opnieuw of kies een andere provider. + VPN certificaat is ongeldig. Probeer een nieuw te downloaden. + Het VPN certificaat in ongeldig. Gelieve opnieuw in te loggen om een nieuw te downloaden. + Batterij besparen + Achtergrond dataverbindingen worden in slaapstand gezet wanneer uw telefoon inactief is. Deze functionaliteit is nog experimenteel. diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml index 42a03df0..1e825b9d 100644 --- a/app/src/main/res/values-no/strings.xml +++ b/app/src/main/res/values-no/strings.xml @@ -99,7 +99,12 @@ Blokkerer trafikk Oppdater tilbyderdetaljer Oppdater sertifikat + Oppdatering av tilbyderoppsett mislyktes + Oppdatering av tilbyderoppsett mislyktes. Logg inn og prøv igjen. De lagrede tilbyderdetaljene er skadet. Du kan enten oppdatere Bitmask (anbefalt) eller oppdatere tilbyderdetaljene til å bruke et kommersielt CA-sertifikat. Lagret tilbydersertifikat er ugyldig. Du kan enten oppdatere Bitmask (anbefalt) eller oppdatere tilbydersertifikatet til å bruke et kommersielt CA-sertifikat. Det lagrede tilbydersertifikatet er utløpt. Du kan enten oppdatere Bitmask (anbefalt) eller oppdatere tilbydersertifikatet til å bruke et kommersielt CA-sertifikat. + Nedlasting av VPN-sertifikat mislyktes. Prøv igjen eller velg en annen tilbyder. + VPN-sertifikatet er ugyldig. Prøv å laste ned et nytt et. + VPN-sertifikatet er ugyldig. Logg inn for å laste ned et nytt et. diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index b810af61..70efcd9d 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -9,6 +9,7 @@ Назва домена ім\'я користувача пароль + Про Вхід у систему Налаштування Вихід diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 122800ce..a0ca00c9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -39,11 +39,12 @@ Try again: I/O error Try again: Bad response from the server Encryption algorithm not found. Please upgrade Android! + Sign Up/Log In Log In - Log In + Log in to profile Log Out Sign Up - Sign Up + Create profile Set up provider Configuration Error Configure -- cgit v1.2.3 From b047acd0b627c97d4a7a518b4979af8926a4a684 Mon Sep 17 00:00:00 2001 From: Fup Duck Date: Tue, 27 Feb 2018 19:54:25 +0100 Subject: 8865 - smaller vertical padding --- app/src/main/res/layout-xlarge/eip_service_fragment.xml | 15 ++++++++++++--- app/src/main/res/layout/eip_service_fragment.xml | 17 ++++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout-xlarge/eip_service_fragment.xml b/app/src/main/res/layout-xlarge/eip_service_fragment.xml index 2fe046b8..2326ffe8 100644 --- a/app/src/main/res/layout-xlarge/eip_service_fragment.xml +++ b/app/src/main/res/layout-xlarge/eip_service_fragment.xml @@ -58,7 +58,10 @@ android:id="@+id/eipLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/stdpadding" + android:paddingLeft="@dimen/stdpadding" + android:paddingRight="@dimen/stdpadding" + android:paddingStart="@dimen/stdpadding" + android:paddingEnd="@dimen/stdpadding" android:text="@string/eip_service_label" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center" @@ -98,7 +101,10 @@ android:id="@+id/routed_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/stdpadding" + android:paddingLeft="@dimen/stdpadding" + android:paddingRight="@dimen/stdpadding" + android:paddingStart="@dimen/stdpadding" + android:paddingEnd="@dimen/stdpadding" android:text="@string/vpn_securely_routed" android:gravity="center" android:visibility="visible" @@ -110,7 +116,10 @@ android:id="@+id/vpn_route" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/stdpadding" + android:paddingLeft="@dimen/stdpadding" + android:paddingRight="@dimen/stdpadding" + android:paddingStart="@dimen/stdpadding" + android:paddingEnd="@dimen/stdpadding" android:gravity="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/layout/eip_service_fragment.xml b/app/src/main/res/layout/eip_service_fragment.xml index 9842198b..e220bf16 100644 --- a/app/src/main/res/layout/eip_service_fragment.xml +++ b/app/src/main/res/layout/eip_service_fragment.xml @@ -56,7 +56,11 @@ android:id="@+id/eipLabel" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/stdpadding" + android:paddingLeft="@dimen/stdpadding" + android:paddingRight="@dimen/stdpadding" + android:paddingStart="@dimen/stdpadding" + android:paddingEnd="@dimen/stdpadding" + android:paddingTop="@dimen/stdpadding" android:text="@string/eip_service_label" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center" @@ -98,7 +102,11 @@ android:id="@+id/routed_text" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/stdpadding" + android:paddingLeft="@dimen/stdpadding" + android:paddingRight="@dimen/stdpadding" + android:paddingStart="@dimen/stdpadding" + android:paddingEnd="@dimen/stdpadding" + android:paddingTop="@dimen/stdpadding" android:text="@string/vpn_securely_routed" android:gravity="center" android:visibility="visible" @@ -110,7 +118,10 @@ android:id="@+id/vpn_route" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="@dimen/stdpadding" + android:paddingLeft="@dimen/stdpadding" + android:paddingRight="@dimen/stdpadding" + android:paddingStart="@dimen/stdpadding" + android:paddingEnd="@dimen/stdpadding" android:gravity="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" -- cgit v1.2.3