Merge branch 'upstream-openssl' into restricted_routes

This commit is contained in:
Jeff Becker 2016-06-19 16:50:51 -04:00
parent 93deb37c94
commit 63c36e917e
44 changed files with 2523 additions and 148 deletions

View file

@ -0,0 +1,10 @@
<?xml version='1.0' encoding='utf-8'?>
<resources>
<!-- %%INSERT_STRINGS -->
<string name="ministro_not_found_msg">Can\'t find Ministro service.\nThe application can\'t start.</string>
<string name="ministro_needed_msg">This application requires Ministro service. Would you like to install it?</string>
<string name="fatal_error_msg">Your application encountered a fatal error and cannot continue.</string>
<string name="local_service_started">i2pd started</string>
<string name="local_service_stopped">i2pd stopped</string>
<string name="local_service_label">i2pd</string>
</resources>