It's Riseup's twentieth year, help keep us going! If you can afford it, please contribute to our winter fundraising drive.

Commit f01f241f authored by cyberta's avatar cyberta

Merge branch 'master' of

parents fdf1d380 6a3fb20d
Pipeline #23254 passed with stages
in 22 minutes and 5 seconds
......@@ -32,9 +32,9 @@
<string name="password_mismatch">Passwords do not match</string>
<string name="user_message">User message</string>
<string name="about_fragment_title">About</string>
<string name="error_srp_math_error_user_message">Try again: Server math error.</string>
<string name="error_bad_user_password_user_message">Incorrect username or password.</string>
<string name="error_not_valid_password_user_message">It must be at least 8 characters long.</string>
<string name="error_srp_math_error_user_message">Try again: Server math error</string>
<string name="error_bad_user_password_user_message">Incorrect username or password</string>
<string name="error_not_valid_password_user_message">It must be at least 8 characters long</string>
<string name="error_client_http_user_message">Try again: Client HTTP error</string>
<string name="error_io_exception_user_message">Try again: I/O error</string>
<string name="error_json_exception_user_message">Try again: Bad response from the server</string>
......@@ -56,19 +56,19 @@
<string name="certificate_error">This is not a trusted Bitmask provider.</string>
<string name="service_is_down_error">The service is down.</string>
<string name="configuring_provider">Configuring provider</string>
<string name="incorrectly_downloaded_certificate_message">Your anon cert was not downloaded</string>
<string name="incorrectly_downloaded_certificate_message">Your anonymous certificate was not downloaded</string>
<string name="downloading_certificate_message">Downloading VPN certificate</string>
<string name="updating_certificate_message">Updating VPN certificate</string>
<string name="login.riseup.warning">Riseup users will need to create a separate account to use the VPN service</string>
<string name="succesful_authentication_message">Authenticated.</string>
<string name="authentication_failed_message">Authentication failed.</string>
<string name="registration_failed_message">Registration failed.</string>
<string name="succesful_authentication_message">Authenticated</string>
<string name="authentication_failed_message">Authentication failed</string>
<string name="registration_failed_message">Registration failed</string>
<string name="eip_status_start_pending">Initiating connection</string>
<string name="eip_cancel_connect_title">Cancel connection?</string>
<string name="eip_cancel_connect_text">There is a connection attempt in progress. Do you wish to cancel it?</string>
<string name="eip.warning.browser_inconsistency">Turn off VPN connection? When the VPN is off, you may leak personal information to your Internet provider or local network.</string>
<string name="eip_state_not_connected">Not running! Insecure connection!</string>
<string name="eip_state_connected">Connection Secure.</string>
<string name="eip_state_connected">Connection Secure</string>
<string name="provider_problem">It seems there is a problem with the provider.</string>
<string name="try_another_provider">Please try another provider, or contact yours.</string>
<string name="default_username">Anonymous</string>
......@@ -111,7 +111,7 @@
<string name="save_battery">Save battery</string>
<string name="save_battery_message">Background data connections will hibernate when your phone is inactive.</string>
<string name="always_on_vpn">Always-on VPN</string>
<string name="do_not_show_again">Do not show again.</string>
<string name="do_not_show_again">Do not show again</string>
<string name="always_on_vpn_user_message">To enable always-on VPN in Android VPN Settings click on the configure icon [img src] and turn the switch on.</string>
<string name="donate_title">Donate</string>
<string name="donate_default_message">Please donate today if you value secure communication that is easy for both the end-user and the service provider.</string>
......@@ -34,6 +34,7 @@ RUN curl -L $ANDROID_NDK_URL -o \
RUN echo "accept all licenses"
# Accept all licenses
RUN yes | sdkmanager --licenses
RUN sdkmanager --list
......@@ -70,5 +70,6 @@ RUN sdkmanager "platforms;android-27"
RUN sdkmanager "platforms;android-25"
RUN sdkmanager "platforms;android-23"
RUN echo "accept all licenses"
# Accept all licenses
RUN yes | sdkmanager --licenses
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment