Increment version code and upload to GPlay

Allow third-party apps to start I2P on Android via a Bradcast Intent

Closes #39

See merge request i2p-hackers/i2p.android.base!3

.gitignore

@@ -1,2 +1,8 @@
 etc/docker.signing.properties
-signing.properties
+signing.properties
+.idea
+.idea/
+.gradle/
+local.properties
+override.properties
+build

.tx/config

@@ -1,18 +1,18 @@
 [main]
-host = https://www.transifex.com
-lang_map = he: iw, id: in, pt_BR: pt-rBR, ru_RU: ru, sv_SE: sv, tr_TR: tr, uk_UA: uk, yi: ji, zh_CN: zh, zh_TW: zh-rTW
+host     = https://www.transifex.com
+lang_map = pt_BR: pt-rBR, yi: ji, zh_CN: zh, zh_TW: zh-rTW, id: in, ru_RU: ru, sv_SE: sv, tr_TR: tr, uk_UA: uk, he: iw
 
-[I2P.android]
-file_filter = app/src/main/res/values-<lang>/strings.xml
+[o:otf:p:I2P:r:android]
+file_filter  = app/src/main/res/values-<lang>/strings.xml
+source_file  = app/src/main/res/values/strings.xml
+source_lang  = en
+type         = ANDROID
 minimum_perc = 22
-source_file = app/src/main/res/values/strings.xml
-source_lang = en
-type = ANDROID
 
-[I2P.android_lib_helper]
-file_filter = lib/helper/src/main/res/values-<lang>/strings.xml
+[o:otf:p:I2P:r:android_lib_helper]
+file_filter  = lib/helper/src/main/res/values-<lang>/strings.xml
+source_file  = lib/helper/src/main/res/values/strings.xml
+source_lang  = en
+type         = ANDROID
 minimum_perc = 50
-source_file = lib/helper/src/main/res/values/strings.xml
-source_lang = en
-type = ANDROID
 

CHANGELOG

@@ -1,3 +1,75 @@
+2.4.0
+ * Update I2P Library
+
+2.3.0
+ * Update I2P Library
+
+2.2.0
+ * Add blocklist feed support
+ * Fix translations on stats page
+ * Various bugfixes
+
+2.1.0-1
+ * adds support for adding base32 addresses to the local addressbook
+ * adds support for destinations with ports in the string to i2ptunnel
+ * adds support for remote applications launching I2P, via MR#3 from @RyeMantis
+
+2.1.0
+ * Upgrades router to version 2.1.0
+ * Adds jcenter repository back to app/ target, removes jcenter from other targets
+ * explicitly set android.useAndroidX
+
+2.0.1
+ * Fixes gitlab#49 by applying MUTABLE or IMMUTABLE flags across all PendingIntents
+
+2.0.0
+ * Updates router to version 2.0.0
+ * Updates gradle plugin
+ * Remove Firefox from supported browsers list due to lack of about:config support
+ * Add Privacy Browser to supported browsers list and write guide for it
+
+1.9.1
+ * Switches back to mavenCentral builds
+ * Fixes build process for F-Droid main
+ * Using tag i2p.i2p:i2p-android-1.9.0
+ * Allow b32 and blinded b32 to validate in I2PTunnel UI
+
+1.9.0
+ * Updates router to version 1.9.0
+ * Using tag i2p.i2p:i2p-android-1.9.0
+
+1.8.2
+ * This update fixes a bug where Family Keys are incorrectly handled by the Android router, leading
+ to a crash.
+ * This update fixes a bug wherein incorrect type-checking caused a crash when using the Network
+ Config page for some users.
+
+1.8.1
+ * This update fixes a bug where certificates were unpacked to the wrong location on new installs,
+ resulting in the router failing to start.
+ * Decouples the Android version from the I2P library version to allow for android point
+ releases with less pain.
+
+1.8.0
+ * This release updates the underlying I2P libraries to I2P version 1.8.0
+ * The SAM API now operates in "Interactive Authentication" mode. Users will be prompted via
+ the notificationArea to approve or ignore new SAM connections initiated by external apps.
+ * The network config menu now features a drop-down configuration instead of a slider configuration
+ (since reversed)
+
+1.7.1
+ * This release updates the underlying I2P libraries to I2P version 1.7.1
+
+1.7.0
+ * This release updates the underlying I2P libraries to I2P version 1.7.0
+ * Refactor of the unzipResourceToDir function
+
+1.6.0
+ * This release updates the underlying I2P libraries to I2P version 1.6.0
+
+1.5.0
+ * This release updates the underlying I2P libraries to I2P version 1.5.0
+
 0.9.50 2021-05-18
  * This release updates the underlying I2P libraries to I2P version 0.9.50
 

RELEASE-PROCESS.md

@@ -14,10 +14,18 @@ NOTE: The docker container built by the Dockerfile in this repostory ensures tha
 Dependencies are properly met by obtaining them from the Debian package in `oldoldstable` and pre-configuring
 the override.properties that is used in the Docker container.
 
+## Tag Freezes and Translations
+
+1-2 weeks before the software is released, I2P Desktop will have a "Tag Freeze" which is the deadline for
+translations to be checked in. **When** that time comes, someone who has Transifex privileges should use
+the command: `tx push -s -R I2P.android` to push any and all changed string resources to transifex for
+translation.
+
 **>> Beginning of Docker-enabled Steps <<**
 
 ## Prerequirements
 
+ 0. Update the changelog!
  1. Ensure you have the deprecated maven ant tasks. ( https://maven.apache.org/ant-tasks/download.cgi )
  2. It should exist at `~/.ant/lib/maven-ant-tasks-2.1.3.jar`
  3. Ensure you have hamcrest-integration, hamcrest-library, hamcrest-core in the hamcrest.home directory.
@@ -25,7 +33,7 @@ the override.properties that is used in the Docker container.
  5. Ensure you have the Mockito framework and accompanying documentation in your $JAVA_HOME
  6. Ensure to have updated the changelog with the changes done.
  7. Ensure that you are configured to build i2p.i2p with Java 8. On Debian it is easiest to set with
-   `update-java-alternatives --set java-8-openjdk-amd64` and picking Java 8. **TODO:** add instructions for non-Debian-based
+   `update-java-alternatives --set java-1.8.0-openjdk-amd64` and picking Java 8. **TODO:** add instructions for non-Debian-based
    systems.
  8. Ensure that you have a Java 1.7 bootclasspath available. (See **Maven Central** step 2A.)
 
@@ -68,7 +76,7 @@ app. After doing the Maven release, follow these steps in the i2p.android.base r
 the `docker run` step described in `DOCKER.md`
 
  1. Edit `routerjars/local.properties` to use the clean i2p.i2p copy.
- 2. Pull the latest translations with `tx pull -a` and commit them. (If you don't have the `tx` command,
+ 2. Pull the latest translations with `tx pull -a -f` and commit them. (If you don't have the `tx` command,
   do `pip install transifex-client` )
   - If there are any new translations, `mtn add` them, and add them to `app/src/main/res/values/arrays.xml`
   (two places, alphabetical order please)

app/build.gradle

@@ -2,14 +2,15 @@ apply plugin: 'com.android.application'
 repositories {
     mavenLocal()
     mavenCentral()
+    jcenter()
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
     defaultConfig {
-        versionCode 4745266
-        versionName "$I2P_VERSION"
-        minSdkVersion 14
+        versionCode 4745280
+        versionName "$I2P_ANDROID_VERSION"
+        minSdkVersion 21
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
 
         // For Espresso
@@ -31,15 +32,19 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lintOptions {
         abortOnError false
+        checkReleaseBuilds false
         disable 'MissingDefaultResource'
     }
     packagingOptions {
-        exclude 'LICENSE.txt'
+        resources {
+            excludes += ['LICENSE.txt']
+        }
     }
     flavorDimensions 'tier'
     productFlavors {
@@ -56,7 +61,6 @@ android {
             applicationId 'net.i2p.android.router'
         }
     }
-    buildToolsVersion '28.0.3'
 }
 
 dependencies {
@@ -88,6 +92,10 @@ dependencies {
     }
 }
 
+dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+}
+
 project.ext.i2pbase = "../i2p.i2p"
 def Properties props = new Properties()
 def propFile = new File(project(':routerjars').projectDir, 'local.properties')

app/src/main/AndroidManifest.xml

@@ -27,6 +27,8 @@
         <service
             android:name=".service.RouterService"
             android:icon="@drawable/ic_launcher_itoopie"
+            android:enabled="true"
+            android:exported="true"
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="net.i2p.android.router.service.IRouterState" />
@@ -35,17 +37,28 @@
         <provider
             android:name=".provider.CacheProvider"
             android:authorities="${applicationId}.provider" />
-        <receiver android:name=".receiver.OnBootReceiver">
+        <receiver
+            android:name=".receiver.OnBootReceiver"
+            android:exported="false">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
+        <receiver
+            android:name=".receiver.RemoteStartReceiver"
+            android:enabled="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="net.i2p.android.router.receiver.START_I2P" />
+            </intent-filter>
+        </receiver>
 
         <activity
             android:name="net.i2p.android.I2PActivity"
             android:icon="@drawable/ic_launcher_itoopie"
             android:label="@string/app_name"
-            android:launchMode="singleTop">
+            android:launchMode="singleTop"
+            android:exported="true">
             <!-- Console filters -->
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -55,6 +68,10 @@
                 <action android:name="net.i2p.android.router.START_I2P" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="net.i2p.android.router.service.APPROVE_SAM" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
 
             <!-- Addressbook filters -->
             <intent-filter>
@@ -105,6 +122,7 @@
         <activity
             android:name=".web.WebActivity"
             android:configChanges="orientation|keyboardHidden"
+            android:exported="true"
             android:label="I2P Web Browser">
             <!-- Disabled, this browser is not very secure
             Temporarily enabled until an alternative browser is ready -->

app/src/main/java/net/i2p/android/I2PActivity.java

@@ -19,6 +19,7 @@ import net.i2p.android.router.MainFragment;
 import net.i2p.android.router.R;
 import net.i2p.android.router.SettingsActivity;
 import net.i2p.android.router.addressbook.AddressbookContainer;
+import net.i2p.android.router.service.AndroidSAMSecureSession;
 import net.i2p.android.router.service.RouterService;
 import net.i2p.android.router.service.State;
 import net.i2p.android.router.util.Connectivity;
@@ -134,6 +135,7 @@ public class I2PActivity extends I2PActivityBase implements
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
+        setIntent(intent);
         handleIntents();
     }
 
@@ -143,17 +145,29 @@ public class I2PActivity extends I2PActivityBase implements
 
         Intent intent = getIntent();
         String action = intent.getAction();
+        Util.d("handleIntent: intent=" + intent.toString());
 
         if (action == null)
             return;
 
+        Util.d("handleIntent: action=" + action);
+
+        Bundle extra = intent.getExtras();
+        if (extra != null)
+          Util.d("handleIntent extra=" + extra.toString());
+
         switch (action) {
             case "net.i2p.android.router.START_I2P":
                 if (mViewPager.getCurrentItem() != 0)
                     mViewPager.setCurrentItem(0, false);
                 autoStart();
                 break;
-
+            case "net.i2p.android.router.service.APPROVE_SAM":
+                Util.w("Affirmed SAM Connection");
+                String ID = extra.getString("ID");
+                Util.d("SAM ID was: " + ID);
+                AndroidSAMSecureSession.affirmResult(ID);
+                break;
             case Intent.ACTION_PICK:
                 mViewPager.setFixedPage(2, R.string.select_an_address);
                 break;

app/src/main/java/net/i2p/android/InitActivities.java

@@ -35,6 +35,7 @@ class InitActivities {
     public InitActivities(Context c) {
         ctx = c;
         myDir = Util.getFileDir(c);
+        Util.i("My app directory is "+myDir);
         _ourVersion = Util.getOurVersion(c);
     }
 
@@ -59,90 +60,89 @@ class InitActivities {
     }
 
     void initialize() {
+        Util.i("Initializing the I2P resources");
 
-        if (checkNewVersion()) {
-            List<Properties> lProps = Util.getPropertiesFromPreferences(ctx);
-            Properties props = lProps.get(0);
+        List<Properties> lProps = Util.getPropertiesFromPreferences(ctx);
+        Properties props = lProps.get(0);
 
-            props.setProperty("i2p.dir.temp", myDir + "/tmp");
-            props.setProperty("i2p.dir.pid", myDir + "/tmp");
-            // Time disabled in default router.config
-            // But lots of time problems on Android, not all carriers support NITZ
-            // and there was no NTP before 3.0. Tablets should be fine?
-            // Phones in airplane mode with wifi enabled still a problem.
-            // Deactivated phones in airplane mode definitely won't have correct time.
-            if (Build.VERSION.SDK_INT < 11)  // Honeycomb 3.0
-                props.setProperty("time.disabled", "false");
-            mergeResourceToFile(R.raw.router_config, "router.config", props);
-            mergeResourceToFile(R.raw.logger_config, "logger.config", lProps.get(1));
-            // This is not needed for now, i2ptunnel.config only contains tunnel
-            // settings, which can now be configured manually. We don't want to
-            // overwrite the user's tunnels.
-            //mergeResourceToFile(R.raw.i2ptunnel_config, "i2ptunnel.config", null);
-            copyResourceToFileIfAbsent(R.raw.i2ptunnel_config, "i2ptunnel.config");
-            // FIXME this is a memory hog to merge this way
-            mergeResourceToFile(R.raw.hosts_txt, "hosts.txt", null);
-            mergeResourceToFile(R.raw.more_hosts_txt, "hosts.txt", null);
-            copyResourceToFile(R.raw.blocklist_txt, "blocklist.txt");
+        props.setProperty("i2p.dir.temp", myDir + "/tmp");
+        props.setProperty("i2p.dir.pid", myDir + "/tmp");
+        // Time disabled in default router.config
+        // But lots of time problems on Android, not all carriers support NITZ
+        // and there was no NTP before 3.0. Tablets should be fine?
+        // Phones in airplane mode with wifi enabled still a problem.
+        // Deactivated phones in airplane mode definitely won't have correct time.
+        if (Build.VERSION.SDK_INT < 11)  // Honeycomb 3.0
+            props.setProperty("time.disabled", "false");
+        mergeResourceToFile(R.raw.router_config, "router.config", props);
+        mergeResourceToFile(R.raw.logger_config, "logger.config", lProps.get(1));
+        // This is not needed for now, i2ptunnel.config only contains tunnel
+        // settings, which can now be configured manually. We don't want to
+        // overwrite the user's tunnels.
+        //mergeResourceToFile(R.raw.i2ptunnel_config, "i2ptunnel.config", null);
+        copyResourceToFileIfAbsent(R.raw.i2ptunnel_config, "i2ptunnel.config");
+        // FIXME this is a memory hog to merge this way
+        mergeResourceToFile(R.raw.hosts_txt, "hosts.txt", null);
+        mergeResourceToFile(R.raw.more_hosts_txt, "hosts.txt", null);
+        copyResourceToFile(R.raw.blocklist_txt, "blocklist.txt");
 
-            File abDir = new File(myDir, "addressbook");
-            abDir.mkdir();
-            copyResourceToFile(R.raw.subscriptions_txt, "addressbook/subscriptions.txt");
-            mergeResourceToFile(R.raw.addressbook_config_txt, "addressbook/config.txt", null);
+        File abDir = new File(myDir, "addressbook");
+        abDir.mkdir();
+        copyResourceToFileIfAbsent(R.raw.subscriptions_txt, "addressbook/subscriptions.txt");
+        mergeResourceToFile(R.raw.addressbook_config_txt, "addressbook/config.txt", null);
 
-            File docsDir = new File(myDir, "docs");
-            docsDir.mkdir();
-            /*copyResourceToFile(R.raw.ahelper_conflict_header_ht, "docs/ahelper-conflict-header.ht");
-            copyResourceToFile(R.raw.ahelper_new_header_ht, "docs/ahelper-new-header.ht");
-            copyResourceToFile(R.raw.ahelper_notfound_header_ht, "docs/ahelper-notfound-header.ht");
-            copyResourceToFile(R.raw.auth_header_ht, "docs/auth-header.ht");
-            copyResourceToFile(R.raw.baduri_header_ht, "docs/baduri-header.ht");
-            copyResourceToFile(R.raw.denied_header_ht, "docs/denied-header.ht");
-            copyResourceToFile(R.raw.dnf_header_ht, "docs/dnf-header.ht");
-            copyResourceToFile(R.raw.dnfb_header_ht, "docs/dnfb-header.ht");
-            copyResourceToFile(R.raw.dnfh_header_ht, "docs/dnfh-header.ht");
-            copyResourceToFile(R.raw.dnfp_header_ht, "docs/dnfp-header.ht");
-            copyResourceToFile(R.raw.enc_header_ht, "docs/enc-header.ht");
-            copyResourceToFile(R.raw.encp_header_ht, "docs/encp-header.ht");
-            copyResourceToFile(R.raw.localhost_header_ht, "docs/localhost-header.ht");
-            copyResourceToFile(R.raw.nols_header_ht, "docs/nols-header.ht");
-            copyResourceToFile(R.raw.nolsp_header_ht, "docs/nolsp-header.ht");
-            copyResourceToFile(R.raw.noproxy_header_ht, "docs/noproxy-header.ht");
-            copyResourceToFile(R.raw.protocol_header_ht, "docs/protocol-header.ht");
-            copyResourceToFile(R.raw.reset_header_ht, "docs/reset-header.ht");
-            copyResourceToFile(R.raw.resetp_header_ht, "docs/resetp-header.ht");*/
+        File docsDir = new File(myDir, "docs");
+        docsDir.mkdir();
+        /*copyResourceToFile(R.raw.ahelper_conflict_header_ht, "docs/ahelper-conflict-header.ht");
+        copyResourceToFile(R.raw.ahelper_new_header_ht, "docs/ahelper-new-header.ht");
+        copyResourceToFile(R.raw.ahelper_notfound_header_ht, "docs/ahelper-notfound-header.ht");
+        copyResourceToFile(R.raw.auth_header_ht, "docs/auth-header.ht");
+        copyResourceToFile(R.raw.baduri_header_ht, "docs/baduri-header.ht");
+        copyResourceToFile(R.raw.denied_header_ht, "docs/denied-header.ht");
+        copyResourceToFile(R.raw.dnf_header_ht, "docs/dnf-header.ht");
+        copyResourceToFile(R.raw.dnfb_header_ht, "docs/dnfb-header.ht");
+        copyResourceToFile(R.raw.dnfh_header_ht, "docs/dnfh-header.ht");
+        copyResourceToFile(R.raw.dnfp_header_ht, "docs/dnfp-header.ht");
+        copyResourceToFile(R.raw.enc_header_ht, "docs/enc-header.ht");
+        copyResourceToFile(R.raw.encp_header_ht, "docs/encp-header.ht");
+        copyResourceToFile(R.raw.localhost_header_ht, "docs/localhost-header.ht");
+        copyResourceToFile(R.raw.nols_header_ht, "docs/nols-header.ht");
+        copyResourceToFile(R.raw.nolsp_header_ht, "docs/nolsp-header.ht");
+        copyResourceToFile(R.raw.noproxy_header_ht, "docs/noproxy-header.ht");
+        copyResourceToFile(R.raw.protocol_header_ht, "docs/protocol-header.ht");
+        copyResourceToFile(R.raw.reset_header_ht, "docs/reset-header.ht");
+        copyResourceToFile(R.raw.resetp_header_ht, "docs/resetp-header.ht");*/
 
-            File cssDir = new File(docsDir, "themes/console/light");
-            cssDir.mkdirs();
-            //copyResourceToFile(R.raw.console_css, "docs/themes/console/light/console.css");
-            //copyResourceToFile(R.raw.android_css, "docs/themes/console/light/android.css");
+        File cssDir = new File(docsDir, "themes/console/light");
+        cssDir.mkdirs();
+        //copyResourceToFile(R.raw.console_css, "docs/themes/console/light/console.css");
+        //copyResourceToFile(R.raw.android_css, "docs/themes/console/light/android.css");
 
-            File imgDir = new File(docsDir, "themes/console/images");
-            imgDir.mkdir();
-            copyResourceToFile(R.drawable.i2plogo, "docs/themes/console/images/i2plogo.png");
-            copyResourceToFile(R.drawable.itoopie_sm, "docs/themes/console/images/itoopie_sm.png");
-            //copyResourceToFile(R.drawable.outbound, "docs/themes/console/images/outbound.png");
-            //copyResourceToFile(R.drawable.inbound, "docs/themes/console/images/inbound.png");
+        File imgDir = new File(docsDir, "themes/console/images");
+        imgDir.mkdir();
+        copyResourceToFile(R.drawable.i2plogo, "docs/themes/console/images/i2plogo.png");
+        copyResourceToFile(R.drawable.itoopie_sm, "docs/themes/console/images/itoopie_sm.png");
+        //copyResourceToFile(R.drawable.outbound, "docs/themes/console/images/outbound.png");
+        //copyResourceToFile(R.drawable.inbound, "docs/themes/console/images/inbound.png");
 
-            File img2Dir = new File(cssDir, "images");
-            img2Dir.mkdir();
-            //copyResourceToFile(R.drawable.header, "docs/themes/console/light/images/header.png");
+        File img2Dir = new File(cssDir, "images");
+        img2Dir.mkdir();
+        //copyResourceToFile(R.drawable.header, "docs/themes/console/light/images/header.png");
 
-            File certDir = new File(myDir, "certificates");
-            certDir.mkdir();
-            File certificates = new File(myDir, "certificates");
-            File[] allcertificates = certificates.listFiles();
-            if ( allcertificates != null) {
-                for (File f : allcertificates) {
-                    Util.d("Deleting old certificate file/dir " + f);
-                    FileUtil.rmdir(f, false);
-                }
+        File certDir = new File(myDir, "certificates");
+        certDir.mkdir();
+        File certificates = new File(myDir, "certificates");
+        File[] allCertificates = certificates.listFiles();
+        if ( allCertificates != null) {
+            for (File f : allCertificates) {
+                Util.d("Deleting old certificate file/dir " + f);
+                FileUtil.rmdir(f, false);
             }
-            unzipResourceToDir(R.raw.certificates_zip, "certificates");
-            //File netDBDir = new File(myDir, "netDB");
-            //netDBDir.mkdir();
-            //unzipResourceToDir(R.raw.netdb_zip, "netDB");
         }
+        File netDBDir = new File(myDir, "netDB");
+        netDBDir.mkdir();
+        //unzipResourceToDir(R.raw.netdb_zip, "netDB");
+        unzipResourceToDir(R.raw.certificates_zip, "certificates");
 
         // Set up the locations so settings can find them
         System.setProperty("i2p.dir.base", myDir);
@@ -178,10 +178,16 @@ class InitActivities {
                 out.write(buf, 0, read);
 
         } catch (IOException ioe) {
+            Util.e("copyResourceToFile" + "IOE: ", ioe);
         } catch (Resources.NotFoundException nfe) {
+            Util.e("copyResourceToFile" + "NFE: ", nfe);
         } finally {
-            if (in != null) try { in.close(); } catch (IOException ioe) {}
-            if (out != null) try { out.close(); } catch (IOException ioe) {}
+            if (in != null) try { in.close(); } catch (IOException ioe) {
+                Util.e("copyResourceToFile" + "IOE in.close(): ", ioe);
+            }
+            if (out != null) try { out.close(); } catch (IOException ioe) {
+                Util.e("copyResourceToFile" + "IOE out.close(): ", ioe);
+            }
         }
     }
     /**
@@ -192,7 +198,7 @@ class InitActivities {
         FileOutputStream out = null;
         ZipInputStream zis = null;
 
-        Util.d("Creating files in '" + myDir + "/" + folder + "/' from resource");
+        Util.i("Creating files in '" + myDir + "/" + folder + "/' from resource");
         try {
             // Context methods
             in = ctx.getResources().openRawResource(resID);
@@ -200,6 +206,7 @@ class InitActivities {
             ZipEntry ze;
             while ((ze = zis.getNextEntry()) != null) {
                 out = null;
+                Util.i("unzipping "+ze);
                 try {
                     ByteArrayOutputStream baos = new ByteArrayOutputStream();
                     byte[] buffer = new byte[1024];
@@ -209,30 +216,51 @@ class InitActivities {
                     }
                     String name = ze.getName();
                     File f = new File(myDir + "/" + folder +"/" + name);
-                    String canonicalPath = f.getCanonicalPath();
-                    if (!canonicalPath.startsWith(myDir)) {
+                    String canonicalPath = f.getCanonicalPath().replace("/user/0/", "/data/");
+                    // account for canonical path differences when using .aab bundles
+                    if (!canonicalPath.startsWith(myDir.replace("/user/0/", "/data/"))) {
                         // If these don't match, there's a path-traversal possibility.
                         // So ignore it.
+                        Util.e("Path mismatch bug " + canonicalPath.toString() + " " + myDir.toString());
                     } else if (ze.isDirectory()) {
-                        Util.d("Creating directory " + myDir + "/" + folder +"/" + name + " from resource");
+                        Util.i("Creating directory " + myDir + "/" + folder +"/" + name + " from resource");
                         f.mkdir();
                     } else {
-                        Util.d("Creating file " + myDir + "/" + folder +"/" + name + " from resource");
+                        Util.i("Creating file " + myDir + "/" + folder +"/" + name + " from resource");
+                        //create all the leading directories
+                        File newFile = new File(myDir+"/"+folder+"/"+name);
+                        newFile.getParentFile().mkdirs();
                         byte[] bytes = baos.toByteArray();
                         out = new FileOutputStream(f);
                         out.write(bytes);
                     }
                 } catch (IOException ioe) {
+                    Util.e("unzipResourceToDir" + "IOE: ", ioe);
                 } finally {
-                    if (out != null) { try { out.close(); } catch (IOException ioe) {} out = null; }
+                    if (out != null) {
+                        try {
+                            out.close();
+                        } catch (IOException ioe) {
+                            Util.e("unzipResourceToDir" + "IOE: interior out.close ", ioe);
+                        }
+                        out = null;
+                    }
                 }
             }
         } catch (IOException ioe) {
+            Util.e("unzipResourceToDir" + "IOE: ", ioe);
         } catch (Resources.NotFoundException nfe) {
+            Util.e("unzipResourceToDir" + "NFE: ", nfe);
         } finally {
-            if (in != null) try { in.close(); } catch (IOException ioe) {}
-            if (out != null) try { out.close(); } catch (IOException ioe) {}
-            if (zis != null) try { zis.close(); } catch (IOException ioe) {}
+            if (in != null) try { in.close(); } catch (IOException ioe) {
+                Util.e("unzipResourceToDir" + "IOE: in.close() ", ioe);
+            }
+            if (out != null) try { out.close(); } catch (IOException ioe) {
+                Util.e("unzipResourceToDir" + "IOE: out.close() ", ioe);
+            }
+            if (zis != null) try { zis.close(); } catch (IOException ioe) {
+                Util.e("unzipResourceToDir" + "IOE: zis.close() ", ioe);
+            }
         }
     }
 
@@ -256,18 +284,31 @@ class InitActivities {
     private boolean checkNewVersion() {
         Properties props = new Properties();
 
+        Util.i("Checking for a new install/version");
         InputStream fin = null;
         try {
             fin = ctx.openFileInput(CONFIG_FILE);
             DataHelper.loadProps(props,  fin);
         } catch (IOException ioe) {
-            Util.d("Looks like a new install");
+            Util.i("Looks like a new install");
         } finally {
-            if (fin != null) try { fin.close(); } catch (IOException ioe) {}
+            if (fin != null) {
+                try {
+                    Util.i("fin was not null "+CONFIG_FILE);
+                    fin.close();
+                } catch (IOException ioe) {
+                    Util.i("Error loading config:", ioe);
+                }
+            }else {
+                Util.i("fin was null");
+            }
         }
 
         String oldVersion = props.getProperty(PROP_INSTALLED_VERSION);
+        Util.i("Old version is:"+oldVersion);
         boolean newInstall = oldVersion == null;
+        if (newInstall)
+            return true;
         boolean newVersion = !_ourVersion.equals(oldVersion);
 
         if (newVersion) {

app/src/main/java/net/i2p/android/apps/NewsFetcher.java

@@ -1,5 +1,13 @@
 package net.i2p.android.apps;
 
+import static net.i2p.app.ClientAppState.INITIALIZED;
+import static net.i2p.app.ClientAppState.RUNNING;
+import static net.i2p.app.ClientAppState.STARTING;
+import static net.i2p.app.ClientAppState.STOPPED;
+import static net.i2p.app.ClientAppState.STOPPING;
+import static net.i2p.app.ClientAppState.UNINITIALIZED;
+import static net.i2p.update.UpdateType.BLOCKLIST;
+
 import android.content.Context;
 
 import net.i2p.android.router.NewsActivity;
@@ -8,20 +16,26 @@ import net.i2p.android.router.util.Notifications;
 import net.i2p.app.ClientApp;
 import net.i2p.app.ClientAppManager;
 import net.i2p.app.ClientAppState;
-import static net.i2p.app.ClientAppState.*;
 import net.i2p.crypto.SU3File;
+import net.i2p.data.Base64;
 import net.i2p.data.DataHelper;
+import net.i2p.data.Hash;
+import net.i2p.router.Banlist;
+import net.i2p.router.Blocklist;
 import net.i2p.router.RouterContext;
+import net.i2p.router.news.BlocklistEntries;
 import net.i2p.router.news.NewsEntry;
 import net.i2p.router.news.NewsMetadata;
 import net.i2p.router.news.NewsXMLParser;
+import net.i2p.util.Addresses;
 import net.i2p.util.EepGet;
 import net.i2p.util.FileUtil;
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
-import net.i2p.util.ReusableGZIPInputStream;
-import net.i2p.util.SecureFileOutputStream;
 import net.i2p.util.RFC822Date;
+import net.i2p.util.ReusableGZIPInputStream;
+import net.i2p.util.SecureFile;
+import net.i2p.util.SecureFileOutputStream;
 
 import java.io.BufferedWriter;
 import java.io.File;
@@ -32,6 +46,7 @@ import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 import java.util.Date;
+import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -58,6 +73,10 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener, ClientApp {
     private volatile ClientAppState _state = UNINITIALIZED;
     public static final String APP_NAME = "NewsFetcher";
 
+    static final String PROP_BLOCKLIST_TIME = "router.blocklistVersion";
+    private static final String BLOCKLIST_DIR = "docs/feed/blocklist";
+    private static final String BLOCKLIST_FILE = "blocklist.txt";
+
     /**
      *  As of 0.9.41, returns a new one every time. Only call once.
      */
@@ -333,6 +352,11 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener, ClientApp {
             xml.delete();
             NewsMetadata data = parser.getMetadata();
             List<NewsEntry> entries = parser.getEntries();
+            BlocklistEntries ble = parser.getBlocklistEntries();
+            if (ble != null && ble.isVerified())
+                processBlocklistEntries(ble);
+            else
+                _log.info("No blocklist entries found in news feed");
             String sudVersion = su3.getVersionString();
             String signingKeyName = su3.getSignerString();
             File to3 = new File(_context.getTempDir(), "tmp3-" + _context.random().nextInt() + ".xml");
@@ -343,6 +367,104 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener, ClientApp {
         }
     }
 
+    /**
+     *  Process blocklist entries
+     *
+     *  @since 0.9.57
+     */
+    private void processBlocklistEntries(BlocklistEntries ble) {
+        long oldTime = _context.getProperty(PROP_BLOCKLIST_TIME, 0L);
+        if (ble.updated <= oldTime) {
+            if (_log.shouldWarn())
+                _log.warn("Not processing blocklist " + DataHelper.formatDate(ble.updated) +
+                        ", already have " + DataHelper.formatDate(oldTime));
+            return;
+        }
+        Blocklist bl = _context.blocklist();
+        Banlist ban = _context.banlist();
+        String reason = "Blocklist feed " + DataHelper.formatDate(ble.updated);
+        int banned = 0;
+        for (Iterator<String> iter = ble.entries.iterator(); iter.hasNext(); ) {
+            String s = iter.next();
+            if (s.length() == 44) {
+                byte[] b = Base64.decode(s);
+                if (b == null || b.length != Hash.HASH_LENGTH) {
+                    iter.remove();
+                    continue;
+                }
+                Hash h = Hash.create(b);
+                if (!ban.isBanlistedForever(h)) {
+                    ban.banlistRouterForever(h, reason);
+                    _context.commSystem().forceDisconnect(h);
+                }
+            } else {
+                byte[] ip = Addresses.getIP(s);
+                if (ip == null) {
+                    iter.remove();
+                    continue;
+                }
+                if (!bl.isBlocklisted(ip))
+                    bl.add(ip);
+            }
+            if (++banned >= BlocklistEntries.MAX_ENTRIES) {
+                // prevent somebody from destroying the whole network
+                break;
+            }
+        }
+        for (String s : ble.removes) {
+            if (s.length() == 44) {
+                byte[] b = Base64.decode(s);
+                if (b == null || b.length != Hash.HASH_LENGTH)
+                    continue;
+                Hash h = Hash.create(b);
+                if (ban.isBanlistedForever(h))
+                    ban.unbanlistRouter(h);
+            } else {
+                byte[] ip = Addresses.getIP(s);
+                if (ip == null)
+                    continue;
+                if (bl.isBlocklisted(ip))
+                    bl.remove(ip);
+            }
+        }
+        // Save the blocks. We do not save the unblocks.
+        File f = new SecureFile(_context.getConfigDir(), BLOCKLIST_DIR);
+        f.mkdirs();
+        f = new File(f, BLOCKLIST_FILE);
+        boolean fail = false;
+        BufferedWriter out = null;
+        try {
+            out = new BufferedWriter(new OutputStreamWriter(new SecureFileOutputStream(f), "UTF-8"));
+            out.write("# ");
+            out.write(ble.supdated);
+            out.newLine();
+            banned = 0;
+            for (String s : ble.entries) {
+                s = s.replace(':', ';');  // IPv6
+                out.write(reason);
+                out.write(':');
+                out.write(s);
+                out.newLine();
+                if (++banned >= BlocklistEntries.MAX_ENTRIES)
+                    break;
+            }
+        } catch (IOException ioe) {
+            _log.error("Error writing blocklist", ioe);
+            fail = true;
+        } finally {
+            if (out != null) try {
+                out.close();
+            } catch (IOException ioe) {}
+        }
+        if (!fail) {
+            f.setLastModified(ble.updated);
+            String upd = Long.toString(ble.updated);
+            _context.router().saveConfig(PROP_BLOCKLIST_TIME, upd);
+        }
+        if (_log.shouldWarn())
+            _log.warn("Processed " + ble.entries.size() + " blocks and " + ble.removes.size() + " unblocks from news feed");
+    }
+
     /**
      *  Gunzip the file
      *

app/src/main/java/net/i2p/android/help/BrowserListFragment.java

@@ -102,8 +102,28 @@ public class BrowserListFragment extends Fragment implements
                     getContext().getResources().getStringArray(R.array.supported_browsers));
             supportedLabels = Arrays.asList(
                     getContext().getResources().getStringArray(R.array.supported_browser_labels));
-            unsupported = Arrays.asList(
-                    context.getResources().getStringArray(R.array.unsupported_browsers));
+            unsupported = allBrowsers(context);//Arrays.asList(
+                    //context.getResources().getStringArray(R.array.unsupported_browsers));
+        }
+
+        public List<String> allBrowsers(Context context){
+            //try {
+                Intent intent = new Intent(Intent.ACTION_VIEW);
+                intent.setData(Uri.parse("http://www.google.com"));
+                List<ResolveInfo> browserList;
+                PackageManager pm = context.getPackageManager();
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                    // gets all
+                    browserList = pm.queryIntentActivities(intent, PackageManager.MATCH_ALL);
+                } else {
+                    browserList = pm.queryIntentActivities(intent, 0);
+                }
+            //}catch()
+            List<String> finalResult = new ArrayList<String>();
+            for (ResolveInfo ri : browserList){
+                finalResult.add(ri.resolvePackageName);
+            }
+            return finalResult;
         }
 
         @Override

app/src/main/java/net/i2p/android/router/MainFragment.java

@@ -406,20 +406,21 @@ public class MainFragment extends I2PFragmentBase {
                 //ctx.commSystem().getReachabilityStatus();
 
                 String status =
-                        "Exploratory Tunnels in/out: " + inEx + " / " + outEx
-                                + "\nClient Tunnels in/out: " + inCl + " / " + outCl;
+                        getString(R.string.notification_status_expl, inEx, outEx) + '\n' +
+                        getString(R.string.notification_status_client, inCl, outCl);
 
 
                 // Need to see if we have the participation option set to on.
                 // I thought there was a router method for that? I guess not! WHY NOT?
                 // It would be easier if we had a number to test status.
-                String participate = "\nParticipation: " + tunnelStatus + " (" + part + ")";
+                String participate = '\n' + getString(R.string.settings_label_hiddenMode) + ": " + tunnelStatus + " (" + part + ")";
 
                 String details =
-                        "\nMemory: " + DataHelper.formatSize(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory())
-                                + "B / " + DataHelper.formatSize(Runtime.getRuntime().maxMemory()) + 'B'
-                                + "\nJob Lag: " + jobLag
-                                + "\nMsg Delay: " + msgDelay;
+                        '\n' + getString(R.string.stats_memory) + ": " +
+                        DataHelper.formatSize(Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) +
+                        "B / " + DataHelper.formatSize(Runtime.getRuntime().maxMemory()) + 'B' +
+                        '\n' + getString(R.string.stats_lag) + ": " + jobLag +
+                        '\n' + getString(R.string.stats_delay) + ": " + msgDelay;
 
                 _savedStatus = status + participate + details;
                 vAdvStatusText.setText(_savedStatus);
@@ -661,7 +662,7 @@ public class MainFragment extends I2PFragmentBase {
                             // even if an error occurs. http://trac.i2p2.i2p/ticket/2783
                             intent.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
                             intent.setData(Uri.parse("package:" + packageName));
-                            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                             try {
                                 mContext.startActivity(intent);
                             } catch (ActivityNotFoundException activityNotFound) {

app/src/main/java/net/i2p/android/router/addressbook/AddressbookAddWizardModel.java

@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import net.i2p.android.router.R;
 import net.i2p.android.wizard.model.AbstractWizardModel;
-import net.i2p.android.wizard.model.I2PB64DestinationPage;
+import net.i2p.android.wizard.model.I2PDestinationPage;
 import net.i2p.android.wizard.model.PageList;
 import net.i2p.android.wizard.model.SingleTextFieldPage;
 
@@ -22,7 +22,7 @@ public class AddressbookAddWizardModel extends AbstractWizardModel {
                 .setDescription(res.getString(R.string.addressbook_add_wizard_desc_name))
                 .setRequired(true),
 
-            new I2PB64DestinationPage(this, res.getString(R.string.addressbook_add_wizard_k_destination))
+            new I2PDestinationPage(this, res.getString(R.string.i2ptunnel_wizard_k_dest))
                 .setDescription(res.getString(R.string.addressbook_add_wizard_desc_destination))
                 .setRequired(true)
             );

app/src/main/java/net/i2p/android/router/receiver/RemoteStartReceiver.java

@@ -0,0 +1,23 @@
+package net.i2p.android.router.receiver;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.widget.Toast;
+
+import net.i2p.android.router.service.RouterService;
+import net.i2p.android.router.util.Util;
+
+public class RemoteStartReceiver extends BroadcastReceiver {
+    public void onReceive(Context context, Intent intent) {
+        if(Util.getRouterContext() == null){
+            Intent rsIntent = new Intent(context, RouterService.class);
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O){
+                context.startForegroundService(rsIntent);
+            } else {
+                context.startService(rsIntent);
+            }
+            Toast.makeText(context, "Starting I2P Router", Toast.LENGTH_SHORT).show();
+        }
+    }
+}

app/src/main/java/net/i2p/android/router/service/AndroidSAMSecureSession.java

@@ -0,0 +1,147 @@
+package net.i2p.android.router.service;
+
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+import net.i2p.android.I2PActivity;
+import net.i2p.android.I2PActivityBase;
+import net.i2p.android.router.R;
+import net.i2p.android.router.util.Notifications;
+import net.i2p.android.router.util.Util;
+import net.i2p.router.Router;
+import net.i2p.router.RouterContext;
+import net.i2p.sam.*;
+import net.i2p.sam.SAMException;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+/**
+ * Implements SAMSecureSessionInterface on Android platforms using a Toast
+ * as the interactive channel.
+ *
+ * @since 1.8.0
+ */
+public class AndroidSAMSecureSession extends AppCompatActivity implements SAMSecureSessionInterface {
+    private static final String URI_I2P_ANDROID = "net.i2p.android";
+    private final Context mCtx;
+    private final RouterService _routerService;
+    private final StatusBar _statusBar;
+    static private Map<String, Integer> results = new HashMap<>();
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+    }
+
+    public static void affirmResult(String clientId) {
+        Util.d("Affirmed result for: " + clientId);
+        results.put(clientId, 1);
+    }
+
+    public AndroidSAMSecureSession(Context ctx, RouterService rCtx, StatusBar statusBar) {
+        mCtx = ctx;
+        _routerService = rCtx;
+        _statusBar = statusBar;
+    }
+
+    private void waitForResult(String clientId) {
+        for (int i=0;i<60;i++) {
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                Util.e("SAMSecureSession Error", e);
+            }
+            Integer result = results.get(clientId);
+            if (result == null)
+                continue;
+            if (result != -1)
+                break;
+            Util.d("Waiting on user to approve SAM connection for: "+clientId);
+        }
+    }
+
+    private boolean isResult(String clientId) {
+        waitForResult(clientId);
+        final Integer finResult = results.get(clientId);
+        if (finResult == null)
+            return false;
+        _routerService.updateStatus();
+        if (finResult == 0) {
+            Util.w("SAM connection cancelled by user request");
+            return false;
+        }
+        if (finResult == 1) {
+            Util.w("SAM connection allowed by user action");
+            return true;
+        }
+        Util.w("SAM connection denied by timeout.");
+        return false;
+    }
+
+    private boolean checkResult(String clientId) {
+        Intent intent = new Intent("net.i2p.android.router.service.APPROVE_SAM", null, mCtx, I2PActivity.class );
+        intent.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        intent.setPackage(URI_I2P_ANDROID);
+        Bundle bundle = new Bundle();
+        bundle.putBoolean("approveSAMConnection", true);
+        bundle.putString("ID", clientId);
+        intent.putExtras(bundle);
+        PendingIntent pendingIntent;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+            pendingIntent = PendingIntent.getActivity(
+                    mCtx, 7656,
+                    intent,
+                    PendingIntent.FLAG_MUTABLE,
+                    bundle);
+        } else {
+            pendingIntent = PendingIntent.getActivity(
+                    mCtx, 7656,
+                    intent,
+                    PendingIntent.FLAG_UPDATE_CURRENT,
+                    bundle);
+        }
+        String dlgText = mCtx.getString(R.string.settings_confirm_sam) + "\n";//""</br>";
+        dlgText += mCtx.getString(R.string.settings_confirm_sam_id) + clientId + "\n";//""</br>";
+        dlgText += mCtx.getString(R.string.settings_confirm_allow_sam) + "\n";//""</br>";
+        dlgText += mCtx.getString(R.string.settings_confirm_deny_sam) + "\n";//""</br>";
+
+
+        _statusBar.replaceIntent(StatusBar.ICON_ACTIVE, dlgText, pendingIntent);
+        return isResult(clientId);
+    }
+
+    @Override
+    public boolean approveOrDenySecureSession(Properties i2cpProps, Properties props) throws SAMException {
+        String ID = props.getProperty("USER");
+        if (ID == null)
+            ID = i2cpProps.getProperty("inbound.nickname");
+        if (ID == null)
+            ID = i2cpProps.getProperty("outbound.nickname");
+        if (ID == null)
+            ID = props.getProperty("ID");
+        if (ID == null) {
+            MessageDigest messageDigest = null;
+            try {
+                messageDigest = MessageDigest.getInstance("SHA-256");
+            } catch (NoSuchAlgorithmException e) {
+                ID = "No_ID_Present";
+            }
+            if (messageDigest != null) {
+                String combinedProps = i2cpProps.toString() + props.toString();
+                messageDigest.update(combinedProps.getBytes());
+                ID = messageDigest.digest().toString();
+            }else{
+                ID = "No_ID_Present";
+            }
+        }
+        return checkResult(ID);
+    }
+}

app/src/main/java/net/i2p/android/router/service/LoadClientsJob.java

@@ -1,21 +1,26 @@
 package net.i2p.android.router.service;
 
+import android.app.Notification;
 import android.content.Context;
 
 //import net.i2p.BOB.BOB;
-import net.i2p.I2PAppContext;
 import net.i2p.addressbook.DaemonThread;
+
+import android.content.Intent;
+import android.os.Looper;
 import android.preference.PreferenceManager;
 import net.i2p.android.apps.NewsFetcher;
+import net.i2p.android.router.service.AndroidSAMSecureSession;
 import net.i2p.android.router.util.Notifications;
 import net.i2p.android.router.util.Util;
 import net.i2p.i2ptunnel.TunnelControllerGroup;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
+import net.i2p.router.Router;
 import net.i2p.router.RouterContext;
-import net.i2p.router.startup.RouterAppManager;
 import net.i2p.util.I2PAppThread;
 import net.i2p.sam.SAMBridge;
+import net.i2p.sam.SAMSecureSessionInterface;
 
 import java.io.File;
 import java.io.IOException;
@@ -27,7 +32,8 @@ import java.util.Properties;
  * We can't use LoadClientAppsJob (reading in clients.config) directly
  * because Class.forName() needs a PathClassLoader argument -
  * http://doandroids.com/blogs/2010/6/10/android-classloader-dynamic-loading-of/
- * ClassLoader cl = new PathClassLoader(_apkPath, ClassLoader.getSystemClassLoader());
+ * ClassLoader cl = new PathClassLoader(_apkPath,
+ * ClassLoader.getSystemClassLoader());
  *
  * We can't extend LoadClientAppsJob to specify a class loader,
  * even if we use it only for Class.forName() and not for
@@ -43,46 +49,68 @@ import java.util.Properties;
 class LoadClientsJob extends JobImpl {
 
     private final Context mCtx;
+    private final RouterService _routerService;
     private final Notifications _notif;
     private DaemonThread _addressbook;
     public SAMBridge SAM_BRIDGE;
-    //private BOB _bob;
+    private final StatusBar _statusBar;
+    // private BOB _bob;
 
     /** this is the delay to load (and start) the clients. */
-    private static final long LOAD_DELAY = 60*1000;
+    private static final long LOAD_DELAY = 60 * 1000;
 
+    public LoadClientsJob(Context ctx, RouterContext rCtx, Notifications notif, StatusBar status) {
+        super(rCtx);
+        mCtx = ctx;
+        _routerService = null;
+        _notif = notif;
+        getTiming().setStartAfter(getContext().clock().now() + LOAD_DELAY);
+        _statusBar = status;
+    }
+
+    public LoadClientsJob(Context ctx, RouterContext rCtx, RouterService rSvc, Notifications notif, StatusBar status) {
+        super(rCtx);
+        mCtx = ctx;
+        _routerService = rSvc;
+        _notif = notif;
+        getTiming().setStartAfter(getContext().clock().now() + LOAD_DELAY);
+        _statusBar = status;
+    }
 
     public LoadClientsJob(Context ctx, RouterContext rCtx, Notifications notif) {
         super(rCtx);
         mCtx = ctx;
+        _routerService = null;
         _notif = notif;
         getTiming().setStartAfter(getContext().clock().now() + LOAD_DELAY);
+        _statusBar = null;
     }
 
-    public String getName() { return "Start Clients"; }
+    public String getName() {
+        return "Start Clients";
+    }
 
     public void runJob() {
         Job jtunnel = new RunI2PTunnel(getContext());
         getContext().jobQueue().addJob(jtunnel);
 
-
         Thread t = new I2PAppThread(new StatSummarizer(), "StatSummarizer", true);
         t.setPriority(Thread.NORM_PRIORITY - 1);
         t.start();
 
         // add other clients here
-        //_bob = new BOB(I2PAppContext.getGlobalContext(), null, new String[0]);
-        //try {
-        //    _bob.startup();
-        //} catch (IOException ioe) {}
+        // _bob = new BOB(I2PAppContext.getGlobalContext(), null, new String[0]);
+        // try {
+        // _bob.startup();
+        // } catch (IOException ioe) {}
         boolean useSAM = PreferenceManager.getDefaultSharedPreferences(mCtx).getBoolean("i2pandroid.client.SAM", true);
         Util.i("SAM API " + useSAM);
         if (useSAM) {
             Job jsam = new RunI2PSAM(getContext());
             getContext().jobQueue().addJob(jsam);
             Util.i("SAM API started successfully" + useSAM);
-        }else{
-            Util.i("SAM API disabled, not starting "+useSAM);
+        } else {
+            Util.i("SAM API disabled, not starting " + useSAM);
         }
         getContext().addShutdownTask(new ClientShutdownHook());
     }
@@ -93,7 +121,9 @@ class LoadClientsJob extends JobImpl {
             super(ctx);
         }
 
-        public String getName() { return "Start I2P Tunnel"; }
+        public String getName() {
+            return "Start I2P Tunnel";
+        }
 
         public void runJob() {
             if (!getContext().router().isRunning()) {
@@ -116,7 +146,7 @@ class LoadClientsJob extends JobImpl {
                 NewsFetcher fetcher = NewsFetcher.getInstance(mCtx, getContext(), _notif);
                 ctx.routerAppManager().addAndStart(fetcher, new String[0]);
 
-                _addressbook = new DaemonThread(new String[] {"addressbook"});
+                _addressbook = new DaemonThread(new String[] { "addressbook" });
                 _addressbook.setName("Addressbook");
                 _addressbook.setDaemon(true);
                 _addressbook.start();
@@ -133,7 +163,9 @@ class LoadClientsJob extends JobImpl {
             super(ctx);
         }
 
-        public String getName() { return "Start SAM API"; }
+        public String getName() {
+            return "Start SAM API";
+        }
 
         public void runJob() {
             if (!getContext().router().isRunning()) {
@@ -147,15 +179,19 @@ class LoadClientsJob extends JobImpl {
             Util.d("Starting SAM");
             try {
                 Util.i("Starting the SAM API");
+                Looper.prepare();
+                AndroidSAMSecureSession _androidSecureSession = new AndroidSAMSecureSession(mCtx, _routerService, _statusBar);
+                SAMSecureSessionInterface _secureSession = _androidSecureSession;
                 SAM_BRIDGE = new SAMBridge("127.0.0.1",
-                        7656,
-                        false,
-                        SAM_PROPERTIES(),
-                        "sam.keys",
-                        new File("sam_config"));
+                 7656,
+                 false,
+                 SAM_PROPERTIES(),
+                 "sam.keys",
+                 new File("sam_config"),
+                 _secureSession);
                 SAM_BRIDGE.run();
             } catch (IOException e) {
-                Util.e( e.toString());
+                Util.e(e.toString());
                 e.printStackTrace();
             }
         }
@@ -173,8 +209,8 @@ class LoadClientsJob extends JobImpl {
             // i2ptunnel registers its own hook
             // StatSummarizer registers its own hook
             // NewsFetcher registers its own hook
-            //if (_bob != null)
-            //    _bob.shutdown(null);
+            // if (_bob != null)
+            // _bob.shutdown(null);
             if (SAM_BRIDGE != null)
                 SAM_BRIDGE.shutdown(null);
             if (_addressbook != null)

app/src/main/java/net/i2p/android/router/service/RouterService.java

@@ -236,7 +236,7 @@ public class RouterService extends Service {
                     throw new IllegalStateException("Router has no context?");
                 }
                 _context.router().setKillVMOnEnd(false);
-                Job loadJob = new LoadClientsJob(RouterService.this, _context, _notif);
+                Job loadJob = new LoadClientsJob(RouterService.this, _context, RouterService.this, _notif, _statusBar);
                 _context.jobQueue().addJob(loadJob);
                 _context.addShutdownTask(new ShutdownHook());
                 _context.addFinalShutdownTask(new FinalShutdownHook());
@@ -262,6 +262,16 @@ public class RouterService extends Service {
     private String _currTitle;
     private boolean _hadTunnels;
 
+    public void updateStatus() {
+        RouterContext ctx = _context;
+        if(ctx != null && (_state == State.RUNNING || _state == State.ACTIVE || _state == State.GRACEFUL_SHUTDOWN)) {
+            Router router = ctx.router();
+            if(router.isAlive()) {
+                updateStatus(ctx);
+            }
+        }
+    }
+
     private void updateStatus(RouterContext ctx) {
         int active = ctx.commSystem().countActivePeers();
         int known = Math.max(ctx.netDb().getKnownRouters() - 1, 0);

app/src/main/java/net/i2p/android/router/service/StatusBar.java

@@ -13,6 +13,7 @@ import android.widget.Toast;
 
 import net.i2p.android.I2PActivity;
 import net.i2p.android.router.R;
+import net.i2p.android.router.util.Notifications;
 
 class StatusBar {
 
@@ -45,37 +46,80 @@ class StatusBar {
         int icon = ICON_STARTING;
         // won't be shown if replace() is called
         String text = mCtx.getString(R.string.notification_status_starting);
+        mNotifyBuilder = notifyBuilder(icon, text);
+    }
 
+    private NotificationCompat.Builder notifyBuilder(int icon, String text) {
+        NotificationCompat.Builder tNotifyBuilder;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            mNotifyBuilder = new NotificationCompat.Builder(mCtx);
+            tNotifyBuilder = new NotificationCompat.Builder(mCtx);
         } else {
-            mNotifyBuilder = new NotificationCompat.Builder(mCtx, NOTIFICATION_CHANNEL_ID);
+            tNotifyBuilder = new NotificationCompat.Builder(mCtx, NOTIFICATION_CHANNEL_ID);
         }
+        tNotifyBuilder.setContentText(text);
+        tNotifyBuilder.setSmallIcon(icon);
+        tNotifyBuilder.setColor(mCtx.getResources().getColor(R.color.primary_light));
+        tNotifyBuilder.setOngoing(true);
+        tNotifyBuilder.setPriority(NotificationManager.IMPORTANCE_LOW);
+        tNotifyBuilder.setCategory(Notification.CATEGORY_SERVICE);
 
-        mNotifyBuilder.setContentText(text);
-        mNotifyBuilder.setSmallIcon(icon);
-        mNotifyBuilder.setColor(mCtx.getResources().getColor(R.color.primary_light));
-        mNotifyBuilder.setOngoing(true);
-        mNotifyBuilder.setPriority(NotificationManager.IMPORTANCE_LOW);
-        mNotifyBuilder.setCategory(Notification.CATEGORY_SERVICE);
+        PendingIntent pi = this.pendingIntent();
+        tNotifyBuilder.setContentIntent(pi);
+        return tNotifyBuilder;
+    }
 
+    private PendingIntent pendingIntent() {
         Intent intent = new Intent(mCtx, I2PActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        PendingIntent pi = PendingIntent.getActivity(mCtx, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
-        mNotifyBuilder.setContentIntent(pi);
+        PendingIntent pi = null;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+            pi = PendingIntent.getActivity(mCtx,
+                    0,
+                    intent,
+                    PendingIntent.FLAG_MUTABLE);
+        } else {
+            pi = PendingIntent.getActivity(mCtx,
+                    0,
+                    intent,
+                    PendingIntent.FLAG_UPDATE_CURRENT);
+        }
+        return pi;
     }
 
     public void replace(int icon, int textResource) {
+        PendingIntent pi = pendingIntent();
+        mNotifyBuilder.setContentIntent(pi);
         replace(icon, mCtx.getString(textResource));
     }
 
     public void replace(int icon, String title) {
+        PendingIntent pi = pendingIntent();
+        mNotifyBuilder.setContentIntent(pi);
         mNotifyBuilder.setSmallIcon(icon)
             .setStyle(null)
             .setTicker(title);
         update(title);
     }
 
+    public void replaceIntent(int icon, String text, PendingIntent pi) {
+        mNotifyBuilder.setContentIntent(pi);
+        mNotifyBuilder.setPriority(NotificationCompat.PRIORITY_MAX);
+        mNotifyBuilder.setAutoCancel(true);
+        mNotifyBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(text));
+        mNotifyBuilder.setSmallIcon(icon).setContentText(text);
+        update(null, text);
+    }
+
+    public void replaceIntent(int icon, int textResource, PendingIntent pi) {
+        String text = mCtx.getString(textResource);
+        mNotifyBuilder.setContentIntent(pi);
+        mNotifyBuilder.setPriority(NotificationCompat.PRIORITY_MAX);
+        mNotifyBuilder.setAutoCancel(true);
+        mNotifyBuilder.setStyle(new NotificationCompat.BigTextStyle().bigText(text));
+        mNotifyBuilder.setSmallIcon(icon).setContentText(text);
+        update(null, text);
+    }
+
     public void update(String title) {
         update(title, null);
     }
@@ -87,8 +131,10 @@ class StatusBar {
     }
 
     public void update(String title, String text) {
-        mNotifyBuilder.setContentTitle(title)
-            .setContentText(text);
+        if (title != null)
+            mNotifyBuilder.setContentTitle(title);
+        if (text != null)
+            mNotifyBuilder.setContentText(text);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             mNotificationChannel = new NotificationChannel(NOTIFICATION_CHANNEL_ID, channelName, NotificationManager.IMPORTANCE_LOW);
             mNotificationManager.createNotificationChannel(mNotificationChannel);

app/src/main/java/net/i2p/android/router/util/NamingServiceUtil.java

@@ -46,16 +46,36 @@ public class NamingServiceUtil {
         String displayHost = host.equals(hostName) ? hostName :
                                                      hostName + " (" + host + ')';
 
-        String destB64 = data.getBundle(kDest).getString(Page.SIMPLE_DATA_KEY);
-        Destination dest = new Destination();
-        try {
-            dest.fromBase64(destB64);
-        } catch (DataFormatException e) {} // Already validated
-
+        String dest = data.getBundle(kDest).getString(Page.SIMPLE_DATA_KEY).split(":")[0];
+        Destination destination = new Destination();
+        if (dest.endsWith(".b32.i2p")) {
+            NamingService dns = NamingServiceUtil.getNamingService(Util.getRouterContext(),"");
+            destination = dns.lookup(dest);
+            int i = 0;
+            while (destination == null) {
+                dns = NamingServiceUtil.getNamingService(Util.getRouterContext(),"");
+                destination = dns.lookup(dest);
+                try {
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {
+                    e.printStackTrace();
+                }
+                i++;
+                if (i > 500){
+                    break;
+                }
+            }
+        } else {
+            try {
+                destination.fromBase64(dest);
+            } catch (DataFormatException e) {
+                e.printStackTrace();
+            }
+        }
         // Check if already in addressbook
         Destination oldDest = ns.lookup(host);
         if (oldDest != null) {
-            if (destB64.equals(oldDest.toBase64()))
+            if (destination.toBase64().equals(oldDest.toBase64()))
                 Toast.makeText(ctx,
                         "Host name " + displayHost + " is already in address book, unchanged.",
                         Toast.LENGTH_LONG).show();
@@ -65,7 +85,7 @@ public class NamingServiceUtil {
                         Toast.LENGTH_LONG).show();
         } else {
             // Put the new host name
-            success = ns.put(host, dest);
+            success = ns.put(host, destination);
             if (!success)
                 Toast.makeText(ctx,
                         "Failed to add Destination " + displayHost + " to naming service " + ns.getName(),

app/src/main/java/net/i2p/android/router/util/Notifications.java

@@ -53,7 +53,12 @@ public class Notifications {
         if (c != null) {
             Intent intent = new Intent(mCtx, c);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            PendingIntent pi = PendingIntent.getActivity(mCtx, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+            PendingIntent pi;
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+                pi = PendingIntent.getActivity(mCtx, 0, intent, PendingIntent.FLAG_MUTABLE);
+            } else {
+                pi = PendingIntent.getActivity(mCtx, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+            }
             b.setContentIntent(pi);
         }
 

app/src/main/java/net/i2p/android/wizard/model/I2PB64DestinationPage.java

@@ -1,47 +0,0 @@
-package net.i2p.android.wizard.model;
-
-import android.support.v4.app.Fragment;
-
-import net.i2p.android.wizard.ui.I2PB64DestinationFragment;
-import net.i2p.data.DataFormatException;
-import net.i2p.data.Destination;
-
-/**
- * A page asking for an I2P Destination.
- * This must be the B64 representation of a Destination.
- */
-public class I2PB64DestinationPage extends SingleTextFieldPage {
-    private String mFeedback;
-
-    public I2PB64DestinationPage(ModelCallbacks callbacks, String title) {
-        super(callbacks, title);
-    }
-
-    @Override
-    public Fragment createFragment() {
-        return I2PB64DestinationFragment.create(getKey());
-    }
-
-    @Override
-    public boolean isValid() {
-        String data = mData.getString(SIMPLE_DATA_KEY);
-        try {
-            new Destination().fromBase64(data);
-        } catch (DataFormatException dfe) {
-            mFeedback = "Invalid B64";
-            return false;
-        }
-        mFeedback = "";
-        return true;
-    }
-
-    @Override
-    public boolean showFeedback() {
-        return true;
-    }
-
-    @Override
-    public String getFeedback() {
-        return mFeedback;
-    }
-}

app/src/main/java/net/i2p/android/wizard/model/I2PDestinationPage.java

@@ -4,9 +4,12 @@ import java.util.Locale;
 
 import android.support.v4.app.Fragment;
 
+import net.i2p.I2PAppContext;
 import net.i2p.android.wizard.ui.I2PDestinationFragment;
+import net.i2p.client.naming.NamingService;
 import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
+import net.i2p.client.naming.DummyNamingService;
 
 /**
  * A page asking for an I2P Destination.
@@ -27,12 +30,20 @@ public class I2PDestinationPage extends SingleTextFieldPage {
 
     @Override
     public boolean isValid() {
-        String data = mData.getString(SIMPLE_DATA_KEY);
+        String data = mData.getString(SIMPLE_DATA_KEY).split(":")[0];
         if (data.toLowerCase(Locale.US).endsWith(".b32.i2p")) { /* B32 */
-            if (data.length() != BASE32_HASH_LENGTH + 8) {
-                mFeedback = "Invalid B32";
-                return false;
+            if (data.length() == BASE32_HASH_LENGTH){
+                mFeedback = "";
+                return true;
             }
+            if (data.length() >= BASE32_HASH_LENGTH + 8) {
+                if (data.length() <= BASE32_HASH_LENGTH + 12) {
+                    mFeedback = "";
+                    return true;
+                }
+            }
+            mFeedback = "Invalid B32";
+            return false;
         } else if (data.endsWith(".i2p")) { /* Domain */
             // Valid
         } else if (data.length() >= 516) { /* B64 */

app/src/main/java/net/i2p/android/wizard/ui/I2PB64DestinationFragment.java

@@ -1,208 +0,0 @@
-/*
- * Copyright 2013 str4d
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.i2p.android.wizard.ui;
-
-import android.app.Activity;
-import android.content.Context;
-import android.content.Intent;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.ParcelFileDescriptor;
-import android.support.v4.app.Fragment;
-import android.text.Editable;
-import android.text.TextWatcher;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import net.i2p.android.router.R;
-import net.i2p.android.router.util.Util;
-import net.i2p.android.wizard.model.Page;
-import net.i2p.android.wizard.model.SingleTextFieldPage;
-
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-public class I2PB64DestinationFragment extends Fragment {
-    static final int REQUEST_DESTINATION_FILE = 1;
-
-    private static final String ARG_KEY = "key";
-
-    private PageFragmentCallbacks mCallbacks;
-    private SingleTextFieldPage mPage;
-    protected TextView mFieldView;
-    private TextView mFeedbackView;
-
-    public static I2PB64DestinationFragment create(String key) {
-        Bundle args = new Bundle();
-        args.putString(ARG_KEY, key);
-
-        I2PB64DestinationFragment fragment = new I2PB64DestinationFragment();
-        fragment.setArguments(args);
-        return fragment;
-    }
-
-    public I2PB64DestinationFragment() {
-    }
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        Bundle args = getArguments();
-        String mKey = args.getString(ARG_KEY);
-        mPage = (SingleTextFieldPage) mCallbacks.onGetPage(mKey);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        View rootView = inflater.inflate(R.layout.fragment_wizard_page_single_text_field_picker, container, false);
-        ((TextView) rootView.findViewById(android.R.id.title)).setText(mPage.getTitle());
-        ((TextView) rootView.findViewById(R.id.wizard_text_field_desc)).setText(mPage.getDesc());
-
-        Button b = (Button) rootView.findViewById(R.id.wizard_text_field_pick);
-        b.setOnClickListener(new View.OnClickListener() {
-
-            public void onClick(View view) {
-                Intent i = new Intent(Intent.ACTION_GET_CONTENT);
-                i.setType("text/plain");
-                i.addCategory(Intent.CATEGORY_OPENABLE);
-                try {
-                    startActivityForResult(
-                            Intent.createChooser(i,"Select B64 file"),
-                            REQUEST_DESTINATION_FILE);
-                } catch (android.content.ActivityNotFoundException ex) {
-                    Toast.makeText(getActivity(), "Please install a File Manager.",
-                            Toast.LENGTH_SHORT).show();
-                }
-            }
-        });
-
-        mFieldView = ((TextView) rootView.findViewById(R.id.wizard_text_field));
-        mFieldView.setHint(mPage.getTitle());
-        if (mPage.getData().getString(Page.SIMPLE_DATA_KEY) != null)
-            mFieldView.setText(mPage.getData().getString(Page.SIMPLE_DATA_KEY));
-        else if (mPage.getDefault() != null) {
-            mFieldView.setText(mPage.getDefault());
-            mPage.getData().putString(Page.SIMPLE_DATA_KEY, mPage.getDefault());
-        }
-
-        mFeedbackView = (TextView) rootView.findViewById(R.id.wizard_text_field_feedback);
-
-        return rootView;
-    }
-
-    @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
-
-        if (!(activity instanceof PageFragmentCallbacks)) {
-            throw new ClassCastException("Activity must implement PageFragmentCallbacks");
-        }
-
-        mCallbacks = (PageFragmentCallbacks) activity;
-    }
-
-    @Override
-    public void onDetach() {
-        super.onDetach();
-        mCallbacks = null;
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-
-        mFieldView.addTextChangedListener(new TextWatcher() {
-            public void beforeTextChanged(CharSequence charSequence, int i, int i1,
-                    int i2) {
-            }
-
-            public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
-            }
-
-            public void afterTextChanged(Editable editable) {
-                mPage.getData().putString(Page.SIMPLE_DATA_KEY,
-                        (editable != null) ? editable.toString() : null);
-                mPage.notifyDataChanged();
-                if (mPage.showFeedback()) {
-                    mFeedbackView.setText(mPage.getFeedback());
-                }
-            }
-        });
-    }
-
-    @Override
-    public void setMenuVisibility(boolean menuVisible) {
-        super.setMenuVisibility(menuVisible);
-
-        // In a future update to the support library, this should override setUserVisibleHint
-        // instead of setMenuVisibility.
-        if (mFieldView != null) {
-            InputMethodManager imm = (InputMethodManager) getActivity().getSystemService(
-                    Context.INPUT_METHOD_SERVICE);
-            if (!menuVisible) {
-                imm.hideSoftInputFromWindow(getView().getWindowToken(), 0);
-            }
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        if (requestCode == REQUEST_DESTINATION_FILE) {
-            if (resultCode == Activity.RESULT_OK) {
-                Uri result = data.getData();
-                BufferedReader br = null;
-                try {
-                    ParcelFileDescriptor pfd = getActivity().getContentResolver().openFileDescriptor(result, "r");
-                    br = new BufferedReader(
-                            new InputStreamReader(
-                                    new ParcelFileDescriptor.AutoCloseInputStream(pfd)));
-                    try {
-                        mFieldView.setText(br.readLine());
-                    } catch (IOException ioe) {
-                        Util.e("Failed to read B64 file", ioe);
-                        Toast.makeText(getActivity(), "Failed to read B64 file.",
-                                Toast.LENGTH_SHORT).show();
-                    }
-                } catch (FileNotFoundException fnfe) {
-                    Util.e("Could not find B64 file", fnfe);
-                    Toast.makeText(getActivity(), "Could not find B64 file.",
-                            Toast.LENGTH_SHORT).show();
-                } catch (SecurityException se) {
-                    Util.e("Could not open B64 file", se);
-                    Toast.makeText(getActivity(), "Could not open B64 file.",
-                            Toast.LENGTH_SHORT).show();
-                } finally {
-                    if (br != null)
-                        try {
-                            br.close();
-                        } catch (IOException e) {
-                            e.printStackTrace();
-                        }
-                }
-            }
-        }
-    }
-}

app/src/main/res/raw/help_com_stoutner_privacybrowser_standard.html

@@ -0,0 +1,17 @@
+<html>
+<head></head>
+<body>
+<h2>Privacy Brower has native I2P support!</h2>
+<p>Make sure your I2P router is started before launching Privacy Browser</p>
+<p>Privacy Browser supports both I2P and Orbot (Tor), but not at the same time.</p>
+<h2>How to configure Privacy Browser:</h2>
+<ol>
+    <li>Open the main menu and tap “Settings”</li>
+    <li>Select "Disable Javascript"(Recommended)</li>
+    <li>Select "Enable Incognito Mode"(Optional)</li>
+    <li>Tap the "Proxy" menu item and select "I2P" from the submenu</li>
+    <li>Exit the settings menu.</li>
+</ol>
+    <a href="https://eyedeekay.github.io/Configuring-Privacy-Browser-for-I2P-on-Android/">A detailed guide with screenshots to is available online</a>
+</body>
+</html>

app/src/main/res/values-ar/strings.xml

@@ -46,6 +46,7 @@
   <string name="action_refresh">تحديث</string>
   <string name="stats_not_ready">مدير الإحصاءات غير جاهز حاليا. يرجى المحاولة لاحقا</string>
   <string name="routers">الموجه</string>
+  <string name="countries">بلدان</string>
   <string name="country">البلد</string>
   <string name="transport">نقل</string>
   <string name="version">إصدار</string>
@@ -105,6 +106,7 @@
   <string name="description">وصف</string>
   <string name="auto_start">تشغيل آلي</string>
   <string name="outproxies">بروكسي خارجي</string>
+  <string name="irc">IRC</string>
   <string name="use_ssl">استعمل SSL</string>
   <string name="profile">بروفايل</string>
   <string name="access_control">سيطرة الوصول</string>

app/src/main/res/values-az/strings.xml

@@ -169,7 +169,6 @@
   <string name="about_bugs">Xətalar və dəstək:</string>
   <string name="about_helpwanted">Yardıma ehtiyac var!</string>
   <string name="about_volunteer">Proqramı yaxşılaşdırmaq istəyirsiniz? Android forumunda könüllü:</string>
-  <string name="about_donate">İnkişaf və sınaq üçün daha çox Android qurğusunun alınmasına pul və ya bitkoyn bağışlamaq istəyirsiniz? Keç:</string>
   <string name="menu_help">Kömək</string>
   <string name="general">Əsas</string>
   <string name="label_router">İctimai ünvanlar</string>
@@ -230,7 +229,6 @@
   <string name="enabled">Aktivdir</string>
   <string name="i2ptunnel_wizard_desc_name"> Tunel siyahısında müəyyənləşdirilməsi üçün tunel adı.</string>
   <string name="i2ptunnel_wizard_desc_desc">Tunelin təsviri. Bu, istəkdən asılıdır və tamamilə informativdir.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Bu müştəri tunelinə bağlanacaq xidmətin İ2P hədəfinə yazın. Bu, tam əsaslı 64 hədəf açarı və ya ünvan kitabından bir İ2P hostun adı ola bilər. </string>
   <string name="i2ptunnel_wizard_desc_outproxies">Bu növ tunel (HTTP və ya SOCKS) üçün hər hansı bir outproxies bilirsinizsə, onları doldurun. Proksiləri vergül vasitəsilə ayırın. </string>
   <string name="i2ptunnel_wizard_desc_target_host">Bu, xidmətinizin işlədiyi IP-dir, adətən eyni alətdə olduğundan 127.0.0.1 avtomatik olaraq doldurulur.</string>
   <string name="i2ptunnel_wizard_desc_target_port">Bu, xidmət əlaqələrini qəbul edən portdur.</string>

app/src/main/res/values-cs/strings.xml

@@ -25,6 +25,7 @@
   <string name="firewalled">Firewalled</string>
   <string name="symmetric_nat">Symetrický NAT</string>
   <!--Parameter is a time, e.g. 32s or 2m-->
+  <string name="uptime">Dostupnost</string>
   <!--Character to indicate a client tunnel. Usually first letter of the word "client".-->
   <string name="char_client_tunnel">C</string>
   <!--Character to indicate a server tunnel. Usually first letter of the word "server".-->
@@ -65,6 +66,7 @@
   <string name="settings_label_network">Síť</string>
   <string name="settings_label_hiddenMode">Participace</string>
   <string name="settings_dialog_sharePercent">Procento šířky pásma ke sdílení</string>
+  <string name="settings_label_logging">Logování</string>
   <string name="settings_label_appearance">Podoba</string>
   <string name="settings_label_language">Jazyk</string>
   <string name="settings_default">Výchozí</string>
@@ -113,10 +115,14 @@
   <string name="disabled">Vypnuto</string>
   <string name="whitelist">Seznam povolených (whitelist)</string>
   <string name="blacklist">Seznam zakázaných (blacklist)</string>
+  <string name="tunnel_summ_delay_open">Zpozdit otevření tunelu dokud není vyžadováno</string>
+  <string name="tunnel_summ_reduce_quantity">Snížit kvantitu při nečinnosti</string>
+  <string name="close_tunnels">Zavřít tunely při nečinnosti</string>
   <string name="http_client">Klient pro HTTP</string>
   <string name="username">Uživatelské jméno</string>
   <string name="password">Heslo</string>
   <string name="other">Další</string>
+  <string name="custom_options">Vlastní možnosti</string>
   <string name="all">Vše</string>
   <string name="no_messages">Žádné zprávy</string>
 </resources>

app/src/main/res/values-da/strings.xml

@@ -84,6 +84,7 @@
   <string name="name">Navn</string>
   <string name="description">Beskrivelse</string>
   <string name="use_ssl">Brug SSL</string>
+  <string name="profile">Profil</string>
   <string name="access_control">Adgangskontrol</string>
   <string name="disabled">Deaktiveret</string>
   <string name="http_client">HTTP klient</string>

app/src/main/res/values-de/strings.xml

@@ -115,6 +115,9 @@
   <string name="notification_status_peers">Teilnehmer: %1$d aktiv, %2$d bekannt</string>
   <string name="notification_status_expl">Erkundungstunnel: %1$d/%2$d</string>
   <string name="notification_status_client">Clienttunnel: %1$d/%2$d</string>
+  <string name="stats_delay">Nachrichtenverzögerung</string>
+  <string name="copied_base32_system_notification_title">Base32 in die Zwischenablage kopiert</string>
+  <string name="copied_base32_system_notification_body">Die Adresse Ihres I2P-Tunnels wurde in die Zwischenablage kopiert.</string>
   <string name="menu_settings">Einstellungen</string>
   <string name="settings_enable">Erlauben</string>
   <string name="settings_desc_subscriptions">Abonnements-URLs</string>
@@ -147,7 +150,13 @@
   <string name="settings_label_transports">Übertragungen</string>
   <string name="settings_label_maxConns">Max. Verbindungen</string>
   <string name="settings_label_i2cp">I2CP-Benutzeroberfläche</string>
-  <string name="settings_desc_i2cp">Erlaube anderen Applikationen das Erzeugen von Tunneln (benötigt ein Neustart des Routers)</string>
+  <string name="settings_desc_i2cp">Apps von Drittanbietern die Erstellung von Tunneln über I2CP erlauben (erfordert einen Neustart des Routers)</string>
+  <string name="settings_label_sam">SAM-Schnittstelle</string>
+  <string name="settings_desc_sam">Apps von Drittanbietern die Erstellung von Tunneln mit SAM erlauben (erfordert einen Neustart des Routers)</string>
+  <string name="settings_confirm_sam">Eine Anwendung versucht, eine SAM-Verbindung herzustellen.</string>
+  <string name="settings_confirm_sam_id">Verbindungsname/-kennung:</string>
+  <string name="settings_confirm_allow_sam">Zum Erlauben antippen</string>
+  <string name="settings_confirm_deny_sam">Zum Verweigern ignorieren</string>
   <string name="settings_label_exploratory_pool">Satz an Erkundungstunneln</string>
   <string name="settings_desc_exploratory_pool">Tunnelparameter</string>
   <string name="settings_label_expl_inbound">Eingehende Tunnel</string>
@@ -172,7 +181,6 @@
   <string name="about_bugs">Fehlermeldungen und Unterstützung:</string>
   <string name="about_helpwanted">Unterstützer gesucht!!</string>
   <string name="about_volunteer">Sie wollen mithelfen, die App besser zu machen? Dann schauen Sie in das Android-Forum:</string>
-  <string name="about_donate">Sie wollen Geld oder Bitcoins spenden, damit wir mehr Android-Geräte zum Entwickeln und Testen kaufen können? Gehen Sie auf:</string>
   <string name="menu_help">Hilfe</string>
   <string name="general">Allgemein</string>
   <string name="label_router">Öffentliche Adressen</string>
@@ -233,7 +241,6 @@
   <string name="enabled">Aktiviert</string>
   <string name="i2ptunnel_wizard_desc_name">Der Name des Tunnels zur Erkennung in der Tunnelliste.</string>
   <string name="i2ptunnel_wizard_desc_desc">Eine optionale, aber für Sie aussagekräftige Beschreibung des Tunnels.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Tragen Sie das I2P-Ziel des Dienstes ein, zu welchem sich dieser Clienttunnel verbinden soll. Dies kann ein kompletter Base-64-Zielschlüssel oder ein I2P-Hostname aus Ihrem Adressbuch sein.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Falls Sie Ausgangsproxies für diese Tunnelart kennen (entweder HTTP oder SOCKS), geben Sie sie hier ein. Trennen Sie mehrere Proxies mit Kommas.</string>
   <string name="i2ptunnel_wizard_desc_target_host">Das ist die IP, unter der der Dienst erreichbar ist. Normalerweise ist er auf der gleichen Maschine, also wird 127.0.0.1 automatisch ausgefüllt.</string>
   <string name="i2ptunnel_wizard_desc_target_port">Dies ist der Port, unter dem der Dienst erreichbar ist.</string>
@@ -358,4 +365,5 @@
   <string name="label_browser_configuration">Browserkonfiguration</string>
   <string name="no_market_app">Keine angebotene App gefunden, bitte manuell installieren.</string>
   <string name="unset">Deaktivieren</string>
+  <string name="running_background">I2P läuft im Hintergrund</string>
 </resources>

app/src/main/res/values-es/strings.xml

@@ -115,6 +115,11 @@
   <string name="notification_status_peers">Pares: %1$d activos, %2$d conocidos</string>
   <string name="notification_status_expl">Túneles exploratorios: %1$d/%2$d</string>
   <string name="notification_status_client">Túneles de cliente: %1$d/%2$d</string>
+  <string name="stats_memory">Memoria usada/max</string>
+  <string name="stats_lag">Demora de tareas</string>
+  <string name="stats_delay">Demora de mensajes</string>
+  <string name="copied_base32_system_notification_title">Base32 copiado al portapapeles</string>
+  <string name="copied_base32_system_notification_body">La dirección de su túnel I2P se ha copiado en el portapapeles.</string>
   <string name="menu_settings">Configuración</string>
   <string name="settings_enable">Activar</string>
   <string name="settings_desc_subscriptions">URLs de suscripción</string>
@@ -147,7 +152,13 @@
   <string name="settings_label_transports">Transportes</string>
   <string name="settings_label_maxConns">Conexiones máximas</string>
   <string name="settings_label_i2cp">Interfaz de I2CP</string>
-  <string name="settings_desc_i2cp">Permitir que las aplicaciones de terceros creen túneles (requiere el reinicio del enrutador)</string>
+  <string name="settings_desc_i2cp">Permitir que las aplicaciones de terceros creen túneles usando I2CP (requiere el reinicio del enrutador)</string>
+  <string name="settings_label_sam">Interfaz SAM</string>
+  <string name="settings_desc_sam">Permitir que las aplicaciones de terceros creen túneles usando SAM (requiere el reinicio del enrutador)</string>
+  <string name="settings_confirm_sam">Una aplicación está intentando establecer una conexión SAM.</string>
+  <string name="settings_confirm_sam_id">Nombre de conexión/ID:</string>
+  <string name="settings_confirm_allow_sam">Toca para permitir</string>
+  <string name="settings_confirm_deny_sam">Ignorar para negar</string>
   <string name="settings_label_exploratory_pool">Grupo exploratorio</string>
   <string name="settings_desc_exploratory_pool">Parámetros de túneles</string>
   <string name="settings_label_expl_inbound">Túneles de entrada</string>
@@ -172,7 +183,7 @@
   <string name="about_bugs">Fallos y soporte:</string>
   <string name="about_helpwanted">¡Buscamos ayuda!</string>
   <string name="about_volunteer">¿Quiere ayudar a hacer mejor la aplicación? Ofrézcase voluntario en el foro de Android:</string>
-  <string name="about_donate">¿Quiere donar dinero o bitcoins para la compra de más dispositivos Android para el desarrollo y puesta a prueba? Vaya a:</string>
+  <string name="about_gitlab">¿Quiere sugerir una función o corregir un error? haga una solicitud de fusión en Android Gitlab:</string>
   <string name="menu_help">Ayuda</string>
   <string name="general">General</string>
   <string name="label_router">Direcciones públicas</string>
@@ -233,7 +244,7 @@
   <string name="enabled">Habilitado</string>
   <string name="i2ptunnel_wizard_desc_name">El nombre del túnel, para su identificación en la lista de túneles.</string>
   <string name="i2ptunnel_wizard_desc_desc">Una descripción del túnel. Esto es opcional y puramente informativo.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Escriba el destino I2P del servicio al que este túnel de cliente debe conectarse. Este podría ser la clave base 64 completa del destino I2P, o un nombre de nodo I2P de su libreta de direcciones.</string>
+  <string name="i2ptunnel_wizard_desc_dest">Especifique aquí la dirección .i2p o destino (hostname.i2p, b32 o b64) del túnel.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Si sabe de cualquier proxy de salida para este tipo de túnel (bien HTTP o SOCKS), introdúzcalo. Separe los proxys con comas.</string>
   <string name="i2ptunnel_wizard_desc_target_host">Esta es la IP sobre la que su servicio está ejecutándose, como este normalmente está en la misma máquina, se autorellena con 127.0.0.1</string>
   <string name="i2ptunnel_wizard_desc_target_port">Este es el puerto sobre el que el servicio está aceptando conexiones.</string>
@@ -343,10 +354,12 @@
   <string name="no_error_messages">No hay mensajes de error</string>
   <plurals name="log_error_messages">
     <item quantity="one">Un mensaje de error</item>
+    <item quantity="many">%d mensajes de error, los más recientes primero</item>
     <item quantity="other">%d mensajes de error, los más recientes primero</item>
   </plurals>
   <plurals name="log_messages">
     <item quantity="one">Un mensaje</item>
+    <item quantity="many">%d mensajes, los más recientes primero</item>
     <item quantity="other">%d mensajes, los más recientes primero</item>
   </plurals>
   <string name="log_entry">Entrada de registro (log)</string>
@@ -358,4 +371,5 @@
   <string name="label_browser_configuration">Configuración del navegador</string>
   <string name="no_market_app">No se encontró la aplicación en Android market, por favor, instálela manualmente</string>
   <string name="unset">No configurado</string>
+  <string name="running_background">I2P se ejecuta en segundo plano</string>
 </resources>

app/src/main/res/values-fa/strings.xml

@@ -26,6 +26,7 @@
   <string name="button_router_graceful">I2P در %s خاموش خواهد شد</string>
   <string name="no_internet">هیچ اتصال اینترنتی موجود نمی باشد</string>
   <string name="hidden">پنهان</string>
+  <string name="testing">در حال تست</string>
   <string name="symmetric_nat">NAT همگام</string>
   <!--Parameter is a time, e.g. 32s or 2m-->
   <string name="net_status_error_unresolved_tcp">آدرس های TCP حل نشده</string>
@@ -70,6 +71,7 @@
   <string name="transport">انتقال</string>
   <string name="versions">نسخه ها</string>
   <string name="version">نسخه</string>
+  <string name="count">شمارش</string>
   <string name="notification_status_starting">I2P در حال شروع می باشد</string>
   <string name="notification_status_restarting">I2P در حال راه اندازی مجدد است</string>
   <string name="notification_status_starting_after_waiting">شبکه اتصال یافت، I2P در حال آغاز است</string>
@@ -95,6 +97,7 @@
   <string name="settings_desc_hiddenMode">خاموش کردن حالت پنهان</string>
   <string name="settings_label_sharePercent">اشتراک گذاری درصد</string>
   <string name="settings_desc_upnp">باز کردن درگاه های دیوار آتشین به صورت خودکار</string>
+  <string name="settings_label_logging">ثبت وقایع</string>
   <string name="settings_label_appearance">ظاهر</string>
   <string name="settings_label_language">زبان</string>
   <string name="settings_default">پیش فرض</string>

app/src/main/res/values-fi/strings.xml

@@ -135,7 +135,6 @@
   <string name="settings_label_transports">Siirrot</string>
   <string name="settings_label_maxConns">Yhteyksien enimmäismäärä</string>
   <string name="settings_label_i2cp">I2CP-käyttöliittymä</string>
-  <string name="settings_desc_i2cp">Salli kolmanten osapuolien sovellusten luoda tunneleita (vaatii reitittimen uudelleenkäynnistyksen)</string>
   <string name="settings_desc_exploratory_pool">Tunneliparametrit</string>
   <string name="settings_label_expl_inbound">Tulotunnelit</string>
   <string name="settings_label_expl_outbound">Lähtötunnelit</string>

app/src/main/res/values-fr/strings.xml

@@ -115,6 +115,10 @@
   <string name="notification_status_peers">Pairs : %1$d actifs, %2$d connus</string>
   <string name="notification_status_expl">Tunnels exploratoires : %1$d/%2$d</string>
   <string name="notification_status_client">Tunnels client : %1$d/%2$d</string>
+  <string name="stats_memory">Mémoire utilisée/max</string>
+  <string name="stats_delay">Délai de message</string>
+  <string name="copied_base32_system_notification_title">Base 32 copié au presse-papier</string>
+  <string name="copied_base32_system_notification_body">L\'adresse de votre tunnel I2P a été copiée au presse-papier.</string>
   <string name="menu_settings">Paramètres</string>
   <string name="settings_enable">Activer</string>
   <string name="settings_desc_subscriptions">URL d’abonnement</string>
@@ -147,7 +151,13 @@
   <string name="settings_label_transports">Transports</string>
   <string name="settings_label_maxConns">Maximum de connexions</string>
   <string name="settings_label_i2cp">Interface d’I2CP</string>
-  <string name="settings_desc_i2cp">Permettre aux applis tierces de créer des tunnels (exige un redémarrage du routeur)</string>
+  <string name="settings_desc_i2cp">Autorise les applications tiers à créer des tunnels en utilisant I2CP (requiert un redémarrage du routeur)</string>
+  <string name="settings_label_sam">Interface SAM</string>
+  <string name="settings_desc_sam">Autorise les applis tiers à créer des tunnels en utilisant SAM (requiert un redémarrage du routeur)</string>
+  <string name="settings_confirm_sam">Une application essaye d\'engager une connexion SAM.</string>
+  <string name="settings_confirm_sam_id">Connexion Nom/ID :</string>
+  <string name="settings_confirm_allow_sam">Appuyez pour autoriser</string>
+  <string name="settings_confirm_deny_sam">Ignorez pour refuser</string>
   <string name="settings_label_exploratory_pool">Réserve exploratoire</string>
   <string name="settings_desc_exploratory_pool">Paramètres des tunnels</string>
   <string name="settings_label_expl_inbound">Tunnels entrants</string>
@@ -172,7 +182,7 @@
   <string name="about_bugs">Bogues et assistance :</string>
   <string name="about_helpwanted">Aide recherchée !</string>
   <string name="about_volunteer">Voulez-vous aider à améliorer l’appli ? Portez-vous volontaire sur le forum Android :</string>
-  <string name="about_donate">Voulez-vous faire un don en argent ou en bitcoins pour acheter plus d’appareils Android pour le développement et les tests ? Rendez-vous sur :</string>
+  <string name="about_gitlab">Avez vous envie de suggérer une fonctionnalité ou corriger un bug ? faites une requête sur le Gitlab Android :</string>
   <string name="menu_help">Aide</string>
   <string name="general">Général</string>
   <string name="label_router">Adresses publiques</string>
@@ -233,7 +243,7 @@
   <string name="enabled">Activé</string>
   <string name="i2ptunnel_wizard_desc_name">Le nom du tunnel, pour identification dans la liste des tunnels.</string>
   <string name="i2ptunnel_wizard_desc_desc">Une description du tunnel. Ceci est facultatif et purement informatif.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Saisir la destination I2P du service auquel ce tunnel client devrait se connecter. Cela pourrait être la clé de destination entière en Base64 ou un nom d’hôte I2P de votre carnet d’adresses.</string>
+  <string name="i2ptunnel_wizard_desc_dest">Spécifiez l\'adresse ou destination .i2p (hostname.i2p, b32 ou B64) du tunnel ici.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Si vous connaissez des mandataire sortants pour ce type de tunnel (soit HTTP ou SOCKS), ajoutez-les en les séparant par des virgules.</string>
   <string name="i2ptunnel_wizard_desc_target_host">L’IP sur laquelle votre service fonctionne, habituellement sur ​​la même machine, donc 127.0.0.1 est préremplie.</string>
   <string name="i2ptunnel_wizard_desc_target_port">Le port sur lequel le service accepte des connexions.</string>
@@ -343,10 +353,12 @@
   <string name="no_error_messages">Aucun message d’erreur</string>
   <plurals name="log_error_messages">
     <item quantity="one">Un message d’erreur</item>
+    <item quantity="many">%d messages d’erreur, les plus récents en premier</item>
     <item quantity="other">%d messages d’erreur, les plus récents en premier</item>
   </plurals>
   <plurals name="log_messages">
     <item quantity="one">Un message</item>
+    <item quantity="many">%d messages, les plus récents en premier</item>
     <item quantity="other">%d messages, les plus récents en premier</item>
   </plurals>
   <string name="log_entry">Entrée de journal</string>
@@ -358,4 +370,5 @@
   <string name="label_browser_configuration">Configuration du navigateur</string>
   <string name="no_market_app">Aucune logithèque trouvée, veuillez installer manuellement.</string>
   <string name="unset">Non défini</string>
+  <string name="running_background">I2P s\'exécute en arrière-plan</string>
 </resources>

app/src/main/res/values-hu/strings.xml

@@ -133,7 +133,6 @@
   <string name="settings_label_transports">Átvitel</string>
   <string name="settings_label_maxConns">Max kapcsolatok</string>
   <string name="settings_label_i2cp">I2CP felület</string>
-  <string name="settings_desc_i2cp">Alagutak létrehozásának engedélyezése harmadik féltől származó alkalmazásoknak (a router újraindítása szükséges hozzá)</string>
   <string name="settings_desc_exploratory_pool">Alagút paraméterei</string>
   <string name="settings_label_expl_inbound">Bejövő alagutak</string>
   <string name="settings_label_expl_outbound">Kimenő alagutak</string>
@@ -200,7 +199,6 @@
   <string name="enabled">Engedélyezve</string>
   <string name="i2ptunnel_wizard_desc_name">Az alagút neve, az alagutak listáján való azonosítás érdekében.</string>
   <string name="i2ptunnel_wizard_desc_desc">Az alagút leírása. Opcionális és csupán csak tájékoztató jellegű.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Adja meg az I2P célállomását a szolgáltatásnak amihez ennek a kliens alagútnak kapcsolódnia kellene. Ez lehet akár a teljes base-64 kódolt célállomás kulcs, vagy egy I2P állomás neve a címjegyzékéből.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Ha tud bármilyen kimenő proxy-t ezen típusú alagúthoz (legyen az akár HTTP vagy SOCKS), akkor írja be ide. A proxy-kat vesszővel választhatja el.</string>
   <string name="i2ptunnel_wizard_desc_target_host">Ez az IP, melyen a szolgáltatásod fut, ez rendszerint ugyanazon a gépen van, így a 127.0.0.1 automatikusan beírásra kerül.</string>
   <string name="i2ptunnel_wizard_desc_target_port">Ez a port, melyen a szolgáltatás csatlakozásokat fogad.</string>
@@ -237,12 +235,14 @@
   <string name="tunnel_parameters">Alagút paraméterei</string>
   <string name="profile">Profil</string>
   <string name="delay_connect">Csatlakozás késleltetése</string>
+  <string name="access_control">Hozzáférés kezelése</string>
   <string name="restricted_access">Korlátozott elérés</string>
   <string name="disabled">Tiltva</string>
   <string name="whitelist">Engedélyezett-Lista</string>
   <string name="blacklist">Tiltott-Lista</string>
   <string name="access_list">Elérési lista</string>
   <string name="reject_inproxies">Bejövő proxyk elutasítása</string>
+  <string name="post_limits">POST korlát</string>
   <string name="tunnel_summ_delay_open">Az alagút nyitás késleltetése szükségessé válásig</string>
   <string name="tunnel_summ_reduce_quantity">Alagutak mennyiségének csökkentése üres állapotban</string>
   <string name="reduced_tunnel_quantity">Csökkentett alagút mennyiség</string>

app/src/main/res/values-in/strings.xml

@@ -169,7 +169,6 @@
   <string name="about_bugs">Bugs dan Dukungan:</string>
   <string name="about_helpwanted">Dibutuhkan Bantuan!</string>
   <string name="about_volunteer">Ingin membantu membuat aplikasi lebih baik? Jadilah relawan di forum Android:</string>
-  <string name="about_donate">Ingin memberikan donasi uang atau bitcoin agar kami dapat membeli lebih banyak perangkat Android untuk pengembangan dan pengujian? Pergi ke:</string>
   <string name="menu_help">Bantuan</string>
   <string name="general">Umum</string>
   <string name="label_router">Alamat publik</string>
@@ -230,7 +229,6 @@
   <string name="enabled">Diaktifkan</string>
   <string name="i2ptunnel_wizard_desc_name">Nama saluran, untuk identifikasi dalam daftar saluran.</string>
   <string name="i2ptunnel_wizard_desc_desc">Deskripsi saluran. Ini opsional dan murni informatif.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Ketik destinasi I2P service yang harus terhubung dengan client tunnel  ini. Destinasi ini bisa berbentuk 64 bit destination key atau nama I2P host yang berada di buku alamat anda.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Jika Anda tahu berbagai outproxy untuk jenis saluran ini (baik HTTP ataupun SOCKS), isikan mereka. Pisahkan proxy ganda dengan koma.</string>
   <string name="i2ptunnel_wizard_desc_target_host">Ini adalah IP yang padanya berjalan layanan Anda, ini umumnya pada mesin yang sama, jadi 127.0.0.1 diisikan secara otomatis.</string>
   <string name="i2ptunnel_wizard_desc_target_port">Ini adalah port yang padanya menerima koneksi layanan.</string>

app/src/main/res/values-it/strings.xml

@@ -169,7 +169,6 @@
   <string name="about_bugs">Bug e supporto:</string>
   <string name="about_helpwanted">Abbiamo bisogno di te!</string>
   <string name="about_volunteer">Vuoi aiutarci a creare un\'app migliore? Offriti volontario sul forum di Android:</string>
-  <string name="about_donate">Vuoi donare al progetto denaro o bitcoin per comprare dispositivi Android, su cui effettuare sviluppo e test dell\'app? Vai qui:</string>
   <string name="menu_help">Aiuto</string>
   <string name="general">Generale</string>
   <string name="label_router">Indirizzi pubblici</string>
@@ -229,7 +228,6 @@
   <string name="enabled">Abilita</string>
   <string name="i2ptunnel_wizard_desc_name">Il nome del tunnel, per identificarlo nell\'elenco dei tunnel.</string>
   <string name="i2ptunnel_wizard_desc_desc">Una descrizione del tunnel. È un attributo opzionale a puro titolo informativo.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Scrivi la destinazione I2P del servizio a cui questo client tunnel dovrebbe connettersi. Questa potrebbe essere la chiave base 64 di destinazione, o un hostname I2P della tua rubrica.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Se conosci qualche proxy di uscita per questo tipo di tunnel (HTTP oppure SOCKS), inseriscilo. Per inserire più proxy, separa i valori usando le virgole.</string>
   <string name="i2ptunnel_wizard_desc_target_host">Questo è l\'indirizzo IP sul quale è in funzione il servizio, che generalmente risiede sulla stessa macchina: pertanto si assume il valore 127.0.0.1.</string>
   <string name="i2ptunnel_wizard_desc_target_port">Questa è la porta per la quale il servizio accetta connessioni.</string>
@@ -339,10 +337,12 @@
   <string name="no_error_messages">Nessun messaggio di errore</string>
   <plurals name="log_error_messages">
     <item quantity="one">Un messaggio di errore</item>
+    <item quantity="many">%d messaggi di errore, più recenti per primi</item>
     <item quantity="other">%d messaggi di errore, più recenti per primi</item>
   </plurals>
   <plurals name="log_messages">
     <item quantity="one">Un messaggio</item>
+    <item quantity="many">%d messaggi, più recenti per primi</item>
     <item quantity="other">%d messaggi, più recenti per primi</item>
   </plurals>
   <string name="log_entry">Record di log</string>

app/src/main/res/values-ja/strings.xml

@@ -21,7 +21,7 @@
   <string name="label_browse">ブラウズ</string>
   <string name="label_graphs">グラフ</string>
   <string name="button_router_off">長押しして I2P を起動</string>
-  <string name="button_router_on">I2P を起動中 (長押しで中止)</string>
+  <string name="button_router_on">I2Pは稼働中 (長押しで停止)</string>
   <string name="button_router_graceful">I2Pは%sでシャットダウン</string>
   <string name="button_shutdown_now">長押しで今すぐ停止</string>
   <string name="button_cancel_graceful">長押ししてシャットダウンをキャンセル</string>
@@ -36,6 +36,7 @@
   <string name="net_status_error_unresolved_tcp">未解決の TCP アドレス</string>
   <string name="net_status_error_private_tcp">プライベートな TCP アドレス</string>
   <string name="net_status_warn_firewalled_inbound_tcp">着信 TCP が有効となり、ファイアーウォールされています</string>
+  <string name="net_status_warn_firewalled_floodfill">ファイアーウォールに防がれ、 Floodfill</string>
   <string name="net_status_info_disconnected">切断されました - ネットワーク接続を確認してください</string>
   <string name="net_status_error_udp_port">UDPポートが使用中 - 設定を変更して再起動してください</string>
   <string name="net_status_error_no_active_peers">アクティブなピアなし - ネットワークの接続およびファイアーウォールを確認してください</string>
@@ -54,8 +55,8 @@
   <string name="upload">アップロード</string>
   <string name="configure_browser_title">ブラウザの設定をしますか？</string>
   <string name="configure_browser_for_i2p">I2Pサイトを見るためにブラウザを設定しますか？(あとでヘルプメニューからも設定できます)</string>
-  <string name="configure_no_doze_title">バッテリー最適化を管理？</string>
-  <string name="configure_no_doze">I2Pは稼働し続けていれば最もよく動作します。Androidが電気の節約を試みたときにI2Pを終了しないようにするため、バッテリー例外リストにI2Pを追加できます。これにより、アプリケーションの信頼性が大幅に上昇します。\n\nI2Pをバックグラウンドで稼働し続けますか？（推奨）</string>
+  <string name="configure_no_doze_title">電池最適化を管理？</string>
+  <string name="configure_no_doze">I2Pは稼働し続けていれば最もよく動作します。Androidが電気の節約を試みたときにI2Pを終了しないようにするため、電池例外の一覧にI2Pを追加できます。これにより、アプリケーションの信頼性が大幅に上昇します。\n\nI2Pをバックグラウンドで稼働し続けますか？（推奨）</string>
   <string name="first_start_title">I2P のインストールおめでとうございます！</string>
   <string name="first_start_welcome"><b>I2P へようこそ！</b> I2P が立ち上がり、ピアを見つけるまで<b>我慢してください</b>。</string>
   <string name="first_start_read">待っている間、リリースノートとウェルカムページをお読みください。</string>
@@ -79,20 +80,24 @@
   <string name="news_last_checked">ニュースは%s前に最終確認</string>
   <string name="news_updated">ニュース更新</string>
   <string name="view_news">タッチして最終のI2Pのニュースを表示</string>
-  <string name="router_not_running">ルータが起動していません。</string>
-  <string name="router_shutting_down">ルータはシャットダウン中です。</string>
+  <string name="router_not_running">ルーターが起動していません。</string>
+  <string name="router_shutting_down">ルーターはシャットダウン中です。</string>
   <string name="stats_not_ready">統計マネージャーはまだ準備出来ていません。後でやり直してください。</string>
+  <string name="select_an_address">アドレスを選択</string>
   <string name="no_graphs_configured">グラフは設定されていません。設定でどの統計をグラフにするか選択できます。すべての変更は60秒後に有効になります</string>
   <string name="configure_graphs">グラフ設定</string>
+  <string name="graphs_not_ready">グラフの準備ができていません。後でやり直してください。</string>
   <string name="statistics">統計</string>
-  <string name="routers">ルータ</string>
+  <string name="routers">ルーター</string>
   <string name="leasesets">リースセット</string>
+  <string name="countries">国</string>
   <string name="country">国</string>
   <string name="transport">トランスポート</string>
+  <string name="versions">バージョン</string>
   <string name="version">バージョン</string>
   <string name="count">カウント</string>
   <string name="tname_0">隠すか起動中</string>
-  <string name="netdb_routers_empty">NetDB にルータがありません。</string>
+  <string name="netdb_routers_empty">NetDB にルーターがありません。</string>
   <string name="netdb_leases_empty">NetDB にリースセットがありません。</string>
   <string name="notification_status_starting">I2P は起動中</string>
   <string name="notification_status_restarting">I2P は再起動中</string>
@@ -110,12 +115,15 @@
   <string name="notification_status_peers">ピア: %1$d アクティブ、 %2$d 既知</string>
   <string name="notification_status_expl">調査トンネル: %1$d/%2$d</string>
   <string name="notification_status_client">クライアントトンネル: %1$d/%2$d</string>
+  <string name="stats_memory">メモリ 使用/最大</string>
+  <string name="copied_base32_system_notification_title">Base32をクリップボードにコピー</string>
+  <string name="copied_base32_system_notification_body">あなたのI2Pトンネルのアドレスはクリップボードにコピーされました。</string>
   <string name="menu_settings">設定</string>
   <string name="settings_enable">有効</string>
   <string name="settings_desc_subscriptions">URL を登録</string>
   <string name="settings_label_bandwidth_net">帯域幅とネットワーク</string>
-  <string name="settings_label_startOnBoot">デバイスの起動時にI2Pも起動</string>
-  <string name="settings_desc_startOnBoot">デバイスの起動時に自動でI2Pに接続</string>
+  <string name="settings_label_startOnBoot">端末の起動時にI2Pも起動</string>
+  <string name="settings_desc_startOnBoot">Android端末の起動時に、自動でI2Pに接続</string>
   <string name="settings_label_bandwidth">帯域幅</string>
   <string name="settings_label_bw_inbound">受信速度</string>
   <string name="settings_desc_bw_inbound">最大受信速度</string>
@@ -137,12 +145,18 @@
   <string name="settings_label_language">言語</string>
   <string name="settings_default">デフォルト</string>
   <string name="settings_label_advanced">高度</string>
-  <string name="settings_label_showStats">ルータの統計</string>
+  <string name="settings_label_showStats">ルーターの統計</string>
   <string name="settings_summ_showStats">メインコンソールに高度な統計を表示</string>
   <string name="settings_label_transports">トランスポート</string>
   <string name="settings_label_maxConns">最大接続数</string>
   <string name="settings_label_i2cp">I2CP インターフェース</string>
-  <string name="settings_desc_i2cp">サードパーティのアプリがトンネルを作成することを許可（ルータの再起動が必要）</string>
+  <string name="settings_desc_i2cp">サードパーティのアプリがI2CPを使用するトンネルを作成することを許可（ルーターの再起動が必要）</string>
+  <string name="settings_label_sam">SAMインターフェース</string>
+  <string name="settings_desc_sam">サードパーティのアプリがSAMを使用するトンネルを作成することを許可（ルーターの再起動が必要）</string>
+  <string name="settings_confirm_sam">アプリケーションはSAM接続を作成することを試行中。</string>
+  <string name="settings_confirm_sam_id">接続 名/ID:</string>
+  <string name="settings_confirm_allow_sam">タップして許可</string>
+  <string name="settings_confirm_deny_sam">無視して拒否</string>
   <string name="settings_label_exploratory_pool">調査のプール</string>
   <string name="settings_desc_exploratory_pool">トンネルパラーメーター</string>
   <string name="settings_label_expl_inbound">受信トンネル</string>
@@ -166,12 +180,12 @@
   <string name="about_project">プロジェクトホーム:</string>
   <string name="about_bugs">バグとサポート:</string>
   <string name="about_helpwanted">人手募集中！</string>
-  <string name="about_volunteer">アプリの改善を手伝いたいですか？ Android フォーラム上でボランティア:</string>
-  <string name="about_donate">開発や試験用にさらに Android デバイスを購入するために、お金や Bitcoin を寄付していただけますか？ こちらです:</string>
+  <string name="about_volunteer">アプリの改善を手伝いたいですか？ Android フォーラム上で助力:</string>
+  <string name="about_gitlab">機能またはバグ修正の提案を行いますか？　Android Gitlab上でMerge要求を作成してください:</string>
   <string name="menu_help">ヘルプ</string>
   <string name="general">一般</string>
   <string name="label_router">公開アドレス</string>
-  <string name="label_private">プライベートなアドレス</string>
+  <string name="label_private">非公開アドレス</string>
   <string name="addressbook_is_empty">アドレス帳は空です</string>
   <string name="addressbook_search_header">%s 検出</string>
   <string name="addressbook_add_wizard_k_name">名前</string>
@@ -228,13 +242,13 @@
   <string name="enabled">有効</string>
   <string name="i2ptunnel_wizard_desc_name">トンネルリストでの識別用に、トンネルの名前。</string>
   <string name="i2ptunnel_wizard_desc_desc">トンネルの説明。これは任意であり、単なる参考です。</string>
-  <string name="i2ptunnel_wizard_desc_dest">このクライアントトンネルが接続するサービスのI2P宛先を入力します。これには、ベース64の完全な宛先キーや、アドレス帳にあるI2Pホスト名を使用できます。</string>
+  <string name="i2ptunnel_wizard_desc_dest">ここでは、トンネルの .i2p アドレスまたは宛先（ホスト名.i2p、b32 または b64）を指定します。</string>
   <string name="i2ptunnel_wizard_desc_outproxies">この種類のトンネル用 （HTTP か SOCKS のいずれか) のアウトプロキシを知っているなら、それらを入力してください。カンマで複数のプロキシを分割できます。</string>
   <string name="i2ptunnel_wizard_desc_target_host">これは、サービスが起動している IPです。通常同一のマシン上なので、 127.0.0.1 が自動で入力されます。</string>
   <string name="i2ptunnel_wizard_desc_target_port">これはサービスが接続を受け入れているポートです。</string>
   <string name="i2ptunnel_wizard_desc_reachable_on">これはどのコンピューターまたはスマートフォンがトンネルにアクセスできるかを制限するものです。</string>
   <string name="i2ptunnel_wizard_desc_binding_port">これは、クライアントトンネルがローカルにアクセスされるポートです。これはHTTP bidir サーバートンネル用のクライアントポートでもあります。</string>
-  <string name="i2ptunnel_wizard_desc_auto_start">ルータの起動時に自動的にトンネルを開始しますか？</string>
+  <string name="i2ptunnel_wizard_desc_auto_start">ルーターの起動時に自動的にトンネルを開始しますか？</string>
   <string name="i2ptunnel_wizard_submit_confirm_message">トンネルを作成しますか？</string>
   <string name="i2ptunnel_wizard_submit_confirm_button">トンネルを作成</string>
   <string name="i2ptunnel_view_target">ターゲット</string>
@@ -245,11 +259,15 @@
   <string name="name">名前</string>
   <string name="description">説明</string>
   <string name="auto_start">自動開始</string>
-  <string name="tunnel_summ_auto_start">ルータ起動時にトンネルを開始</string>
+  <string name="tunnel_summ_auto_start">ルーター起動時にトンネルを開始</string>
   <string name="tunnel_cat_ports">ローカルポート</string>
   <string name="shared_client">共有クライアント</string>
   <string name="tunnel_summ_shared_client">他の共有クライアントと同じ宛先を使う</string>
-  <string name="persistent_key">永続的なキー</string>
+  <string name="target_destination">対象の宛先</string>
+  <string name="persistent_key">永続的な鍵</string>
+  <string name="persistent_key_conflict_title">新しい鍵の再開放を無効にしますか？</string>
+  <string name="persistent_key_conflict_msg">再開放で新しい鍵を生成するようトンネルを設定している間に永続鍵を有効にできません。新しい鍵の再開放を無効にしますか？</string>
+  <string name="tunnel_summ_persistent_key">再起動時にこのトンネルの宛先を維持する</string>
   <string name="reachable_on">到達可能</string>
   <string name="listen_port">着信ポート</string>
   <string name="client_ssl">クライアントSSL</string>
@@ -266,6 +284,8 @@
   <string name="tunnel_summ_use_ssl">ターゲットに接続するためにSSLを使用</string>
   <string name="tunnel_parameters">トンネル調節</string>
   <string name="profile">プロファイル</string>
+  <string name="profile_bulk">バルク接続（ダウンロード/ウェブサイト/BT）</string>
+  <string name="profile_interactive">双方向接続</string>
   <string name="delay_connect">接続延滞</string>
   <string name="tunnel_summ_delay_connect">要求/応答 接続用を有効</string>
   <string name="access_control">アクセス制御</string>
@@ -274,6 +294,7 @@
   <string name="whitelist">ホワイトリスト</string>
   <string name="blacklist">ブラックリスト</string>
   <string name="access_list">アクセスリスト</string>
+  <string name="reject_inproxies">インプロキシを拒否する</string>
   <string name="tunnel_summ_reject_inproxies">I2Pユーザーのみに接続を許可</string>
   <string name="unique_local">ユニークローカル</string>
   <string name="tunnel_summ_unique_local">クライアントごとに固有のローカルホストIPを使用</string>
@@ -294,16 +315,23 @@
   <string name="unlimited">無制限</string>
   <string name="set_zero_for_unlimited">0=無制限</string>
   <string name="post_limits">投稿制限</string>
-  <string name="power_saving">パワーセーブ</string>
-  <string name="delay_open">オープンを遅れさせる</string>
-  <string name="tunnel_summ_delay_open">要求されるまでトンネルのオープンを遅らせる</string>
+  <string name="limit_period">制限期間</string>
+  <string name="client_posts_per_period">期間当たりのクライアントのPOST数</string>
+  <string name="client_ban_length">クライアントの禁止の長さ</string>
+  <string name="total_posts_per_period">期間当たりの合計POST数</string>
+  <string name="total_ban_length">禁止の長さの合計</string>
+  <string name="power_saving">出力温存</string>
+  <string name="delay_open">開放を遅れさせる</string>
+  <string name="tunnel_summ_delay_open">要求されるまでトンネルの開放を遅らせる</string>
   <string name="reduce_quantity">数を減らす</string>
   <string name="tunnel_summ_reduce_quantity">アイドル時トンネルの数を減らす</string>
+  <string name="idle_time">アイドル時間</string>
   <string name="num_minutes">%s /分</string>
   <string name="reduced_tunnel_quantity">減らしたトンネルの数量</string>
   <string name="close_tunnels">アイドル時トンネルを閉じる</string>
-  <string name="new_keys_on_reopen">再開放で新しいキーにする</string>
-  <string name="new_keys_on_reopen_conflict_title">持続的なキーを無効化する？</string>
+  <string name="new_keys_on_reopen">再開放で新しい鍵にする</string>
+  <string name="new_keys_on_reopen_conflict_title">持続的な鍵を無効化する？</string>
+  <string name="new_keys_on_reopen_conflict_msg">トンネルが永続鍵を持つよう設定している間に新しい鍵の再解放を有効にできません。永続鍵を無効にしますか？</string>
   <string name="http_client">HTTPクライアント</string>
   <string name="tunnel_summ_user_agent">\'User-Agent\'ヘッダーを通す</string>
   <string name="tunnel_summ_referer">\'リファラー\'ヘッダーを通す</string>
@@ -315,16 +343,27 @@
   <string name="username">ユーザー名</string>
   <string name="password">パスワード</string>
   <string name="outproxy_auth">外部プロキシ認証</string>
+  <string name="tunnel_summ_outproxy_auth">ログインにはアウトプロキシが必要です</string>
   <string name="other">その他</string>
   <string name="signature_type">署名形式</string>
   <string name="custom_options">カスタムオプション</string>
   <string name="all">すべて</string>
-  <string name="no_messages">本文がありません</string>
+  <string name="no_messages">本文なし</string>
+  <string name="no_error_messages">エラーメッセージなし</string>
+  <plurals name="log_error_messages">
+    <item quantity="other">%d エラーメッセージ、新しい順</item>
+  </plurals>
+  <plurals name="log_messages">
+    <item quantity="other">%dメッセージ、新しい順</item>
+  </plurals>
+  <string name="log_entry">ログ項目</string>
   <string name="copy_logs">ログをコピー</string>
   <string name="i2p_android_error_logs">I2PAndroidエラーログ</string>
   <string name="i2p_android_logs">I2PAndroidログ</string>
   <string name="error_logs_copied_to_clipboard">エラーログはクリップボードにコピーされました</string>
   <string name="logs_copied_to_clipboard">ログはクリップボードにコピーされました</string>
   <string name="label_browser_configuration">ブラウザ設定</string>
+  <string name="no_market_app">マーケットのアプリが見つかりませんでした。手動でインストールしてください。</string>
   <string name="unset">解除</string>
+  <string name="running_background">I2Pはバックグラウンドで稼働中</string>
 </resources>

app/src/main/res/values-ko/strings.xml

@@ -169,7 +169,6 @@
   <string name="about_bugs">버그와 지원:</string>
   <string name="about_helpwanted">도움이 필요합니다!</string>
   <string name="about_volunteer">이 앱을 개선시키고 싶나요? 안드로이드 포럼에서 기여하세요:</string>
-  <string name="about_donate">돈이나 비트코인 기부로 개발과 테스팅에 필요한 안드로이드 기기 구입을 돕고 싶나요? 참조하세요:</string>
   <string name="menu_help">도움말</string>
   <string name="general">일반</string>
   <string name="label_router">공공 주소들</string>
@@ -229,7 +228,6 @@
   <string name="enabled">활성화됨</string>
   <string name="i2ptunnel_wizard_desc_name">터널 리스트에서 구별하기 위한 터널의 이름</string>
   <string name="i2ptunnel_wizard_desc_desc">터널의 설명. 선택적이고 단순 정보용.</string>
-  <string name="i2ptunnel_wizard_desc_dest">클라이언트 터널이 접속하야 하는 I2P 서비스 도착점 입력. 전체 Base 64 도착점 키나 사용자의 주소록에 있는 I2P 호스트 이름 사용 가능.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">만약 이 터널 종류의 나가는 프록시를 안다면 (HTTP 또는 SOCKS), 입력. 여러 프록시들을 콤마로 구별.</string>
   <string name="i2ptunnel_wizard_desc_target_host">서비스가 작동중인 IP, 대부분의 경우 같은 기기이기 때문에 127.0.0.1이 자동 입력됨.</string>
   <string name="i2ptunnel_wizard_desc_target_port">서비스가 접속을 받아들일 포트.</string>

app/src/main/res/values-nb/strings.xml

@@ -169,7 +169,6 @@
   <string name="about_bugs">Feil og brukerstøtte:</string>
   <string name="about_helpwanted">Hjelp ønskes!</string>
   <string name="about_volunteer">Vil du gjøre dette programmet bedre? Meld deg som frivillig på Android-forumet:</string>
-  <string name="about_donate">Vil du donere penger eller bitcoin øremerket flere Android-enheter til utvikling og testformål? Gå til:</string>
   <string name="menu_help">Hjelp</string>
   <string name="general">Generelt</string>
   <string name="label_router">Offentlige adresser</string>
@@ -230,7 +229,6 @@
   <string name="enabled">Påskrudd</string>
   <string name="i2ptunnel_wizard_desc_name">Tunnel-navn, for identifikasjon i tunnel-listen.</string>
   <string name="i2ptunnel_wizard_desc_desc">Beskrivelse av tunnelen. Dette er valgfritt, og bare til informasjon.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Skriv inn I2P-målet og tjenesten som denne klienttunnelen skal koble til. Dette bør være hele base-64 -målnøkkelen, eller et I2P-vertsnavn fra adresseboka di.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Hvis du vet om noen utgående mellomtjenere for denne typen tunnel (enten HTTP eller SOCKS), fyll dem inn. Oppgis flere mellomtjenere må de deles med komma.</string>
   <string name="i2ptunnel_wizard_desc_target_host">Dette er IP-en din tjeneste kjører på, dette er vanligvis den samme maskinen, så 127.0.0.1 er ferdigutfylt. </string>
   <string name="i2ptunnel_wizard_desc_target_port">Dette er porten tjenesten godtar tilkoblinger på.</string>

app/src/main/res/values-nl/strings.xml

@@ -169,7 +169,6 @@
   <string name="about_bugs">Bugs en ondersteuning:</string>
   <string name="about_helpwanted">Hulp gezocht!</string>
   <string name="about_volunteer">Wil je vrijwillig helpen de app beter te maken? Kijk op het Android forum:</string>
-  <string name="about_donate">Wil je geld of bitcoins doneren zodat we op meer Android telefoons kunnen ontwikkelen en testen? Ga naar:</string>
   <string name="menu_help">Help</string>
   <string name="general">Algemeen</string>
   <string name="label_router">Publieke adressen</string>
@@ -230,7 +229,6 @@
   <string name="enabled">Staat aan</string>
   <string name="i2ptunnel_wizard_desc_name">De naam van de tunnel, voor het identificeren in de tunnellijst.</string>
   <string name="i2ptunnel_wizard_desc_desc">Een beschrijving van de tunnel. Dit is niet verplicht maar wel informatief.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Typ de I2P-bestemming van de dienst in waar deze cliënt-tunnel mee moet verbinden. Dit kan de volledige base-64 bestemmingssleutel zijn, of een I2P-hostnaam van je adresboek.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Als je outproxies kent voor dit type tunnel (HTTP of SOCKS), vul ze dan in. Scheid meerdere proxies door middel van komma\'s.</string>
   <string name="i2ptunnel_wizard_desc_target_host">Dit is het IP-adres waarop je service runt, dit is meestal op dezelfde machine, dus 127.0.0.1 is standaard ingevuld.</string>
   <string name="i2ptunnel_wizard_desc_target_port">Dit is de poort waar de service verbindingen op ontvangt.</string>

app/src/main/res/values-pl/strings.xml

@@ -147,7 +147,6 @@
   <string name="settings_label_transports">Transporty</string>
   <string name="settings_label_maxConns">Maksymalna liczba połączeń</string>
   <string name="settings_label_i2cp">Interfejs I2CP</string>
-  <string name="settings_desc_i2cp">Zezwól aplikacjom stron trzecich na tworzenie tuneli (wymaga restartu węzła)</string>
   <string name="settings_label_exploratory_pool">Pole rozpoznawcze</string>
   <string name="settings_desc_exploratory_pool">Parametry tuneli</string>
   <string name="settings_label_expl_inbound">Tunele przychodzące</string>
@@ -172,7 +171,6 @@
   <string name="about_bugs">Błędy i wsparcie:</string>
   <string name="about_helpwanted">Potrzebna pomoc!</string>
   <string name="about_volunteer">Chcesz pomóc w ulepszeniu tej aplikacji? Zgłoś się na ochotnika na forum Android:</string>
-  <string name="about_donate">Chcesz przesłać pieniądze lub bitcoiny, aby zakupić więcej Androidów dla rozwoju i testowania? Idź do:</string>
   <string name="menu_help">Pomoc</string>
   <string name="general">Ogólne</string>
   <string name="label_router">Adres publiczny</string>
@@ -233,7 +231,6 @@
   <string name="enabled">Włączony</string>
   <string name="i2ptunnel_wizard_desc_name">Nazwa tunelu dla identyfikacji w liście tuneli.</string>
   <string name="i2ptunnel_wizard_desc_desc">Opis tunelu. Ta opcja jest nieobowiązkowa i służąca wyłącznie do celów informacyjnych.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Wpisz adres Przeznaczenia I2P usługi z którą klient powinien się połączyć. To powinien być pełny adres Przeznaczenia w formacie Base64, lub adres z Twojej książki adresowej.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Jeśli znasz jakieś wychodzące proxy dla tego typu tunelów (HTTP lub SOCKS), to je wpisz. Serwery proxy oddziel przecinkami.</string>
   <string name="i2ptunnel_wizard_desc_target_host">To jest IP na którym Twój serwis jest uruchomiony, zazwyczaj jest to te same urządzenie więc 127.0.0.1 jest wpisane automatycznie.</string>
   <string name="i2ptunnel_wizard_desc_target_port">To jest port na którym Twój serwis akceptuje połączenia.</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -89,6 +89,7 @@
   <string name="graphs_not_ready">Gráficos não estão prontos ainda. Tente novamente.</string>
   <string name="statistics">Estatísticas</string>
   <string name="routers">Roteadores</string>
+  <string name="leasesets">LeaseSets</string>
   <string name="countries">Países</string>
   <string name="country">País</string>
   <string name="transport">Transporte</string>
@@ -97,6 +98,7 @@
   <string name="count">Contagem</string>
   <string name="tname_0">Oculto ou inicializando</string>
   <string name="netdb_routers_empty">Sem roteadores em seu NetDB.</string>
+  <string name="netdb_leases_empty">Não tem LeaseSets na sua NetDB.</string>
   <string name="notification_status_starting">O roteador I2P está inicializando</string>
   <string name="notification_status_restarting">O roteador I2P está reiniciando</string>
   <string name="notification_status_waiting">O roteador I2P está esperando por uma conexão de rede</string>
@@ -113,6 +115,11 @@
   <string name="notification_status_peers">Pares: %1$d ativos, %2$d conhecidos</string>
   <string name="notification_status_expl">Túneis exploratórios: %1$d/%2$d</string>
   <string name="notification_status_client">Túneis cliente: %1$d/%2$d</string>
+  <string name="stats_memory">Memória usada/max</string>
+  <string name="stats_lag">Atraso no trabalho</string>
+  <string name="stats_delay">Atraso de mensagem</string>
+  <string name="copied_base32_system_notification_title">Base32 copiado para a área de transferência</string>
+  <string name="copied_base32_system_notification_body">O endereço do túnel I2P foi copiado para a área de transferência.</string>
   <string name="menu_settings">Especificações</string>
   <string name="settings_enable">Ativar</string>
   <string name="settings_desc_subscriptions">URLs para inscrição</string>
@@ -134,6 +141,7 @@
   <string name="settings_desc_sharePercent">Percentual da largura de banda compartilhada (por omissão=80)</string>
   <string name="settings_dialog_sharePercent">Porcentagem de banda para comprtilhar</string>
   <string name="settings_desc_upnp">Abrir portas do firewall automaticamente</string>
+  <string name="settings_label_logging">Registo de Eventos</string>
   <string name="settings_label_default_log_level">Nível padrão do log</string>
   <string name="settings_label_appearance">Aparência</string>
   <string name="settings_label_language">Idioma</string>
@@ -144,7 +152,13 @@
   <string name="settings_label_transports">Transportes</string>
   <string name="settings_label_maxConns">Número máximo de conexões</string>
   <string name="settings_label_i2cp">Interface do I2CP</string>
-  <string name="settings_desc_i2cp">Permitir que aplicações de terceiros criem túneis (requer reinicialização do roteador)</string>
+  <string name="settings_desc_i2cp">Permitir que aplicativos de terceiros criem túneis usando I2CP (requer a reinicialização do roteador)</string>
+  <string name="settings_label_sam">Interface SAM</string>
+  <string name="settings_desc_sam">Permitir que aplicativos de terceiros criem túneis usando SAM (requer a reinicialização do roteador)</string>
+  <string name="settings_confirm_sam">Um aplicativo está tentando fazer uma conexão SAM.</string>
+  <string name="settings_confirm_sam_id">Nome/ID da conexão:</string>
+  <string name="settings_confirm_allow_sam">Toque para permitir</string>
+  <string name="settings_confirm_deny_sam">Ignorar para negar</string>
   <string name="settings_label_exploratory_pool">Reservatório exploratório</string>
   <string name="settings_desc_exploratory_pool">Parâmetros do túnel</string>
   <string name="settings_label_expl_inbound">Túneis entrantes</string>
@@ -169,7 +183,7 @@
   <string name="about_bugs">Falhas e Suporte:</string>
   <string name="about_helpwanted">Procura-se ajuda!</string>
   <string name="about_volunteer">Quer ajudar a tornar o aplicativo melhor? Seja voluntário no fórum Android:</string>
-  <string name="about_donate">Quer doar dinheiro ou bitcoins para comprar mais dispositivos Android para desenvolvimento e testes? Vá para:</string>
+  <string name="about_gitlab">Quer sugerir um recurso ou corrigir um bug? faça uma solicitação de mesclagem no Gitlab do Android:</string>
   <string name="menu_help">Ajuda</string>
   <string name="general">Geral</string>
   <string name="label_router">Endereços públicos</string>
@@ -230,7 +244,7 @@
   <string name="enabled">Ativado</string>
   <string name="i2ptunnel_wizard_desc_name">O nome do túnel, para identificação na lista de túneis.</string>
   <string name="i2ptunnel_wizard_desc_desc">Uma descrição do túnel. Isso é opcional e puramente informativo.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Digite o destino I2P do serviço ao qual este túnel cliente deve se conectar. Esta pode ser a chave base 64 do destino, ou um host I2P de seu catálogo de endereços.</string>
+  <string name="i2ptunnel_wizard_desc_dest">Especifique o endereço .i2p ou o destino (hostname.i2p, b32 ou b64) do túnel aqui.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Se você souber de algum proxies de saída para este tipo de túnel (seja HTTP ou SOCKS), digite-os. Separe os múltiplos proxies com vírgulas.</string>
   <string name="i2ptunnel_wizard_desc_target_host">Esse é o IP no qual o serviço está rodando, isto está geralmente na mesma maquina então 127.0.0.1 é autopreenchido.</string>
   <string name="i2ptunnel_wizard_desc_target_port">Essa é a porta pela qual o serviço está aceitando conexões.</string>
@@ -340,10 +354,12 @@
   <string name="no_error_messages">Nenhuma mensagem de erro</string>
   <plurals name="log_error_messages">
     <item quantity="one">Uma mensagem de erro</item>
+    <item quantity="many">%d mensagens de erro, a primeira a mais recente</item>
     <item quantity="other">%d mensagens de erro, a primeira a mais recente</item>
   </plurals>
   <plurals name="log_messages">
     <item quantity="one">Uma mensagem</item>
+    <item quantity="many">%d mensagens, mais novas primeiro</item>
     <item quantity="other">%d mensagens, mais novas primeiro</item>
   </plurals>
   <string name="log_entry">Entrada no log</string>
@@ -355,4 +371,5 @@
   <string name="label_browser_configuration">Configuração do navegador</string>
   <string name="no_market_app">Nenhum aplicativo de mercado encontrado, por favor, instale manualmente</string>
   <string name="unset">Desligado</string>
+  <string name="running_background">I2P está sendo executado em segundo plano</string>
 </resources>

app/src/main/res/values-pt/strings.xml

@@ -55,6 +55,8 @@
   <string name="upload">Enviar</string>
   <string name="configure_browser_title">Configurar o navegador?</string>
   <string name="configure_browser_for_i2p">Gostaria de configurar um navegador para ver sites I2P? (Pode fazê-lo mais tarde através do menu de ajuda.)</string>
+  <string name="configure_no_doze_title">Gerenciar otimizações de bateria?</string>
+  <string name="configure_no_doze">I2P funciona melhor se continuar funcionando. Para evitar que o Android feche o I2P ao tentar economizar/salvar energia, você pode adicioná-lo à lista de exceções da bateria. Isto melhorá substancialmente a confiabilidade do aplicativo.\n\nMantenha I2P funcionando em segundo plano? (recomendado)</string>
   <string name="first_start_title">Parabéns por ter instalado o I2P!</string>
   <string name="first_start_welcome"><b>Bem vindo ao I2P!</b> Por favor <b>tenha paciência</b> enquanto o I2P arranca e encontra outros nós na rede.</string>
   <string name="first_start_read">Enquanto espera, pode ler as notas de lançamento e a página de boas vindas.</string>
@@ -113,6 +115,11 @@
   <string name="notification_status_peers">Nós: %1$d ativos, %2$d conhecidos</string>
   <string name="notification_status_expl">Túneis exploratórios: %1$d/%2$d</string>
   <string name="notification_status_client">Túneis de cliente: %1$d/%2$d</string>
+  <string name="stats_memory">Memória usada/max</string>
+  <string name="stats_lag">Atraso no trabalho</string>
+  <string name="stats_delay">Atraso de mensagem</string>
+  <string name="copied_base32_system_notification_title">Base32 copiado para a área de transferência</string>
+  <string name="copied_base32_system_notification_body">O endereço do túnel I2P foi copiado para a área de transferência.</string>
   <string name="menu_settings">Configurações</string>
   <string name="settings_enable">Ativar</string>
   <string name="settings_desc_subscriptions">URLs de Subscrição</string>
@@ -145,6 +152,13 @@
   <string name="settings_label_transports">Transportes</string>
   <string name="settings_label_maxConns">Nr. máx. de ligações</string>
   <string name="settings_label_i2cp">Interface I2CP</string>
+  <string name="settings_desc_i2cp">Permitir que aplicativos de terceiros criem túneis usando I2CP (requer a reinicialização do roteador)</string>
+  <string name="settings_label_sam">Interface SAM</string>
+  <string name="settings_desc_sam">Permitir que aplicativos de terceiros criem túneis usando SAM (requer a reinicialização do roteador)</string>
+  <string name="settings_confirm_sam">Um aplicativo está tentando fazer uma conexão SAM.</string>
+  <string name="settings_confirm_sam_id">Nome/ID da conexão:</string>
+  <string name="settings_confirm_allow_sam">Toque para permitir</string>
+  <string name="settings_confirm_deny_sam">Ignorar para negar</string>
   <string name="settings_label_exploratory_pool">Poço exploratório</string>
   <string name="settings_desc_exploratory_pool">Parâmetros dos túneis</string>
   <string name="settings_label_expl_inbound">Túneis de entrada</string>
@@ -169,7 +183,7 @@
   <string name="about_bugs">Erros e Suporte</string>
   <string name="about_helpwanted">Preciso de Ajuda!</string>
   <string name="about_volunteer">Queres tornar a aplicação melhor? Voluntariar-te no fórum do Android </string>
-  <string name="about_donate">Pretende doar dinheiro ou bitcoins para comprar mais dispositivos Android para programação e testes? Vá a:</string>
+  <string name="about_gitlab">Quer sugerir um recurso ou corrigir um bug? faça uma solicitação de mesclagem no Gitlab do Android:</string>
   <string name="menu_help">Ajuda</string>
   <string name="general">Geral</string>
   <string name="label_router">Endereços públicos</string>
@@ -209,6 +223,7 @@
   <string name="i2ptunnel_msg_tunnel_stopping">Parar túnel</string>
   <string name="i2ptunnel_delete_confirm_message">Apagar túnel?</string>
   <string name="i2ptunnel_delete_confirm_button">Apagar túnel </string>
+  <string name="i2ptunnel_no_tunnel_details">Não foi possível carregar os detalhes do túnel</string>
   <string name="i2ptunnel_wizard_k_client_server">Cliente ou Servidor</string>
   <string name="i2ptunnel_wizard_v_client">Túnel cliente </string>
   <string name="i2ptunnel_wizard_v_server">Túnel servidor </string>
@@ -229,7 +244,7 @@
   <string name="enabled">Ativado</string>
   <string name="i2ptunnel_wizard_desc_name">O nome do túnel, para identificação na lista de túneis.</string>
   <string name="i2ptunnel_wizard_desc_desc">A descrição do túnel. Este elemento é opcional e puramente informativo.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Endereço I2P ao qual este túnel cliente se deve ligar. Pode introduzir um endereço completo usando a base 64 da chave de destino, ou então, o nome de uma máquina I2P presente no seu livro de endereços.</string>
+  <string name="i2ptunnel_wizard_desc_dest">Especifique o endereço .i2p ou o destino (hostname.i2p, b32 ou b64) do túnel aqui.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Pode aqui introduzir proxies de saída para este tipo de túnel (HTTP ou SOCKS). Separe as proxies com vírgulas.</string>
   <string name="i2ptunnel_wizard_desc_target_host">Este é o endereço IP no qual o seu serviço I2P está a correr. Normalmente corresponde à mesma máquina, portanto é automaticamente preenchido com 127.0.0.1.</string>
   <string name="i2ptunnel_wizard_desc_target_port">Este é a porta na qual o seu serviço aceita ligações.</string>
@@ -241,6 +256,7 @@
   <string name="i2ptunnel_view_target">Alvo</string>
   <string name="i2ptunnel_view_access_point">Ponto de acesso</string>
   <string name="i2ptunnel_view_autostart">Iniciar automaticamente</string>
+  <string name="address_copied_to_clipboard">Endereço copiado para a área de transferência</string>
   <string name="edit_tunnel">Alterar túnel </string>
   <string name="name">Nome</string>
   <string name="description">Descrição </string>
@@ -338,10 +354,12 @@
   <string name="no_error_messages">Não há mensagens de erro</string>
   <plurals name="log_error_messages">
     <item quantity="one">Uma mensagem de erro</item>
+    <item quantity="many">%d mensagens de erro, mais recentes primeiro</item>
     <item quantity="other">%d mensagens de erro, mais recentes primeiro</item>
   </plurals>
   <plurals name="log_messages">
     <item quantity="one">Uma mensagem</item>
+    <item quantity="many">%d mensagens, mais recentes primeiro</item>
     <item quantity="other">%d mensagens, mais recentes primeiro</item>
   </plurals>
   <string name="log_entry">Entrada no registo</string>
@@ -351,5 +369,7 @@
   <string name="error_logs_copied_to_clipboard">Registos de erro copiados para a área de transferência</string>
   <string name="logs_copied_to_clipboard">Registos copiados para a área de transferência</string>
   <string name="label_browser_configuration">Configuração do navegador</string>
+  <string name="no_market_app">Nenhum aplicativo de mercado encontrado, por favor, instale manualmente</string>
   <string name="unset">Desselecionar</string>
+  <string name="running_background">I2P está sendo executado em segundo plano</string>
 </resources>

app/src/main/res/values-ro/strings.xml

@@ -147,7 +147,6 @@
   <string name="settings_label_transports">Transporturi</string>
   <string name="settings_label_maxConns">Maxim conexiuni</string>
   <string name="settings_label_i2cp">Interfata I2CP</string>
-  <string name="settings_desc_i2cp">Permiteți aplicațiilor terților să creeze tuneluri (necesită repornirea routerului)</string>
   <string name="settings_label_exploratory_pool">pool de explorare</string>
   <string name="settings_desc_exploratory_pool">Parametri tunelului</string>
   <string name="settings_label_expl_inbound">Tunele de intrare</string>
@@ -172,7 +171,6 @@
   <string name="about_bugs">Defecte și suport:</string>
   <string name="about_helpwanted">Doresc ajutor!</string>
   <string name="about_volunteer">Doriți să faceți aplicația mai bună? Voluntari pe forumul Android:</string>
-  <string name="about_donate">Doriți să donați bani sau bitcoins pentru cumpărarea de mai multe dispozitive Android pentru dezvoltare și testare? Mergeți la:</string>
   <string name="menu_help">Ajutor</string>
   <string name="general">General</string>
   <string name="label_router">Adrese publice</string>
@@ -233,7 +231,6 @@
   <string name="enabled">Activat</string>
   <string name="i2ptunnel_wizard_desc_name">Numele tunelului, pentru identificare în lista tunelurilor.</string>
   <string name="i2ptunnel_wizard_desc_desc">O descriere a tunelului. Este facultativ și pur informativ.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Tastați destinația I2P a serviciului la care ar trebui să se conecteze acest tunel client. Aceasta poate fi cheia de destinație completă a bazei 64 sau un nume de gazdă I2P din agenda dvs. de adrese.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Dacă cunoașteți vreo problemă pentru acest tip de tunel (HTTP sau SOCKS), completați-le. Separați mai multe proxy cu virgule.</string>
   <string name="i2ptunnel_wizard_desc_target_host">Acesta este IP la care serviciul se execută, aceasta este, de obicei pe aceeași mașină, astfel 127.0.0.1 este autofilled.</string>
   <string name="i2ptunnel_wizard_desc_target_port">Acesta este portul pe care serviciul  accepta conexiuni.</string>

app/src/main/res/values-ru/strings.xml

@@ -147,7 +147,6 @@
   <string name="settings_label_transports">Транспортные протоколы</string>
   <string name="settings_label_maxConns">Максимум соединений</string>
   <string name="settings_label_i2cp">I2CP-интерфейс</string>
-  <string name="settings_desc_i2cp">Разрешить создание туннелей сторонним программам (требуется перезапуск маршрутизатора)</string>
   <string name="settings_label_exploratory_pool">Зондирующий пул</string>
   <string name="settings_desc_exploratory_pool">Параметры тоннелей</string>
   <string name="settings_label_expl_inbound">Входящие туннели</string>
@@ -172,7 +171,6 @@
   <string name="about_bugs">Ошибки и поддержка:</string>
   <string name="about_helpwanted">Требуется помощь!</string>
   <string name="about_volunteer">Хотите помочь улучшить приложение? Добровольцы на Android-форуме:</string>
-  <string name="about_donate">Хотите пожертвовать деньги или bitcoins на покупку дополнительных Android-устройств для разработчиков и тестировщиков? Зайдите:</string>
   <string name="menu_help">Справка</string>
   <string name="general">Общие</string>
   <string name="label_router">Публичные адреса</string>
@@ -233,7 +231,6 @@
   <string name="enabled">Включить</string>
   <string name="i2ptunnel_wizard_desc_name">Имя туннеля для идентификации в списке туннелей.</string>
   <string name="i2ptunnel_wizard_desc_desc">Описание туннеля. Заполнять не обязательно.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Впишите пункт назначения I2P сервиса, к которому должен подключаться этот туннель. Это может быть base 64 ключ назначения или I2P URL из вашей адресной книги.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Если вам известны любые внешние прокси для этого типа туннеля (как HTTP, так и SOCKS), впишите их. Несколько прокси перечисляются через запятую.</string>
   <string name="i2ptunnel_wizard_desc_target_host">Это IP, на котором запущен ваш сервис, обычно он находится на том же устройстве, так что 127.0.0.1 заполняется автоматически.</string>
   <string name="i2ptunnel_wizard_desc_target_port">Это порт, на котором сервис принимает подключения.</string>

app/src/main/res/values-sk/strings.xml

@@ -111,7 +111,6 @@
   <string name="about_bugs">Bugy a podpora:</string>
   <string name="about_helpwanted">Pomoc je žiadaná!</string>
   <string name="about_volunteer">Chceli by ste urobiť aplikáciu lepšou? Prihláste sa na androidovom fóre:</string>
-  <string name="about_donate">Chcete darovať peniaze alebo bitcoiny za účelom zakúpenia ďalších zariadení s Androidom pre vývoj a testovanie? Choďte na:</string>
   <string name="menu_help">Pomoc</string>
   <string name="general">Všeobecné</string>
   <string name="addressbook_search_header">%s nájdených</string>
@@ -198,4 +197,5 @@
   <string name="other">Ďalší</string>
   <string name="custom_options">Vlastné nastavenia</string>
   <string name="all">Všetko</string>
+  <string name="no_messages">Žiadne správy</string>
 </resources>

app/src/main/res/values-sq/strings.xml

@@ -31,6 +31,7 @@
   <string name="action_delete">Fshije</string>
   <string name="action_reload">Ringarkoje</string>
   <string name="action_refresh">Rifreskoje</string>
+  <string name="statistics">Statistika</string>
   <string name="country">Vendi</string>
   <string name="version">Version</string>
   <string name="count">Numër</string>
@@ -91,4 +92,5 @@
   <string name="password">Fjalëkalim</string>
   <string name="other">Tjetër</string>
   <string name="all">Krejt</string>
+  <string name="no_messages">Pa mesazhe</string>
 </resources>

app/src/main/res/values-sv/strings.xml

@@ -5,7 +5,7 @@
   <string name="choose_language">Välj språk</string>
   <string name="welcome_new_install">Välkommen till I2P! Den här appen är ALFA-mjukvara och erbjuder inte stark anonymitet.
 Läs utgåvenoteringar och licens-information.</string>
-  <string name="welcome_new_version">Ny version installerad. Vänligen läs versionsanteckningarna. Version: </string>
+  <string name="welcome_new_version">Ny version installerad. Läs versionsanteckningarna. Version: </string>
   <string name="label_tunnels">Tunnlar</string>
   <string name="label_status">Status</string>
   <string name="label_console">Konsoll</string>
@@ -44,7 +44,7 @@ Läs utgåvenoteringar och licens-information.</string>
   <string name="net_status_error_udp_disabled_tcp_not_set">UDP deaktiverad och inåtgående TCP värd/port inte angiven</string>
   <string name="net_status_warn_firewalled_udp_disabled">Bakom brandvägg med UDP inaktiverad</string>
   <string name="shared_clients">Delade klienter</string>
-  <string name="uptime">Drifttid</string>
+  <string name="uptime">Driftstid</string>
   <string name="active_peers">Aktiva jämlikar</string>
   <string name="known_peers">Kända jämlikar</string>
   <!--Character to indicate a client tunnel. Usually first letter of the word "client".-->
@@ -59,15 +59,15 @@ Läs utgåvenoteringar och licens-information.</string>
   <string name="configure_no_doze_title">Hantera batterioptimeringar?</string>
   <string name="configure_no_doze">I2P fungerar bäst om den fortsätter att fungera. För att förhindra att Android stänger I2P när du försöker spara ström kan du lägga till den i listan över undantag från batterier. Detta kommer att förbättra applikationens tillförlitlighet avsevärt.\n\nHålla I2P igång i bakgrunden? (rekommenderad)</string>
   <string name="first_start_title">Gratulerar till din I2P-installation!</string>
-  <string name="first_start_welcome"><b>Välkommen till I2P!</b> Vänligen <b>ha tålamod</b> medan I2P startar och letar upp jämlikar.</string>
-  <string name="first_start_read">Medan du väntar, vänligen läs utgåvans meddelanden och välkomstsidan.</string>
-  <string name="first_start_faq">När du har fått klienttunnlar, vänligen <b>kolla</b> våra vanliga frågor:</string>
+  <string name="first_start_welcome"><b>Välkommen till I2P!</b> <b>Ha tålamod</b> medan I2P startar och letar upp jämlikar.</string>
+  <string name="first_start_read">Medan du väntar, läs utgåvans meddelanden och välkomstsidan.</string>
+  <string name="first_start_faq">När du har fått klienttunnlar, <b>kolla</b> våra vanliga frågor:</string>
   <string name="first_start_faq_nonanon">Använd den här icke-anonyma länken om du inte vill vänta på tunnlar:</string>
   <string name="first_start_irc">Peka din IRCclient till <b>localhost:6668</b> och säg hej till oss på:</string>
   <string name="action_search">Sök</string>
   <string name="action_add">Lägg till</string>
   <string name="action_edit">Redigera</string>
-  <string name="action_delete">Radera</string>
+  <string name="action_delete">Ta bort</string>
   <string name="action_i2ptunnel_start">Starta tunnel</string>
   <string name="action_i2ptunnel_stop">Stanna tunnel</string>
   <string name="action_i2ptunnel_start_all">Starta alla tunnlar</string>
@@ -138,7 +138,7 @@ Läs utgåvenoteringar och licens-information.</string>
   <string name="settings_dialog_sharePercent">Procent av bandbredd at dela</string>
   <string name="settings_desc_upnp">Öppna portar i brandvägg automatiskt</string>
   <string name="settings_label_logging">Loggning</string>
-  <string name="settings_label_default_log_level">Förvald log nivå</string>
+  <string name="settings_label_default_log_level">Standard loggnivå</string>
   <string name="settings_label_appearance">Stil</string>
   <string name="settings_label_language">Språk</string>
   <string name="settings_default">Förval</string>
@@ -148,7 +148,6 @@ Läs utgåvenoteringar och licens-information.</string>
   <string name="settings_label_transports">Transporter</string>
   <string name="settings_label_maxConns">Max anslutningar</string>
   <string name="settings_label_i2cp">I2CP interfrace</string>
-  <string name="settings_desc_i2cp">Tillåt tredjepartsappar att skapa tunnlar (kräver omstart av routern)</string>
   <string name="settings_label_exploratory_pool">Utforskande pool</string>
   <string name="settings_desc_exploratory_pool">Tunnelparametrar</string>
   <string name="settings_label_expl_inbound">Inåtgående tunnlar</string>
@@ -173,7 +172,6 @@ Läs utgåvenoteringar och licens-information.</string>
   <string name="about_bugs">Fel och Support:</string>
   <string name="about_helpwanted">Hjälp Önskas!</string>
   <string name="about_volunteer">Vill du hjälpa till att göra appen bättre? Anmäl dig på Android-forumet:</string>
-  <string name="about_donate">Vill du donera pengar eller bitcoin för inköp av fler Androidenheter till utveckling och testning? Gå till:</string>
   <string name="menu_help">Hjälp</string>
   <string name="general">Generell</string>
   <string name="label_router">Publika adresser</string>
@@ -211,8 +209,8 @@ Läs utgåvenoteringar och licens-information.</string>
   <string name="i2ptunnel_msg_config_save_failed">Misslyckades med att spara konfiguration</string>
   <string name="i2ptunnel_msg_tunnel_starting">Startar tunnel</string>
   <string name="i2ptunnel_msg_tunnel_stopping">Stannar tunnel</string>
-  <string name="i2ptunnel_delete_confirm_message">Radera tunnel?</string>
-  <string name="i2ptunnel_delete_confirm_button">Radera tunnel</string>
+  <string name="i2ptunnel_delete_confirm_message">Ta bort tunnel?</string>
+  <string name="i2ptunnel_delete_confirm_button">Ta bort tunnel</string>
   <string name="i2ptunnel_no_tunnel_details">Det gick inte att läsa in tunneldetaljer</string>
   <string name="i2ptunnel_wizard_k_client_server">Klient eller Server</string>
   <string name="i2ptunnel_wizard_v_client">Klienttunnel</string>
@@ -234,9 +232,8 @@ Läs utgåvenoteringar och licens-information.</string>
   <string name="enabled">Aktiverad</string>
   <string name="i2ptunnel_wizard_desc_name">Tunnelns namn, för identifikation i tunnellistan</string>
   <string name="i2ptunnel_wizard_desc_desc">Beskrivning av tunneln. Frivillig och endast för information.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Skriv in I2P-destinationen för den tjänst som denna klienttunnel ska ansluta till. Detta kan vara den fullständiga 64-grunddestinationsnyckeln eller ett I2P-värdnamn från din adressbok.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Om du känner till några utproxier för den här typen av tunnel (antingen HTTP eller SOCKS), fyll i dem. Separera flera proxier med kommatecken.</string>
-  <string name="i2ptunnel_wizard_desc_target_host">Detta är den IP din tjänst kör på, vanligtvis på samma maskin så 127.0.0.1 är automatiskt ifylld.</string>
+  <string name="i2ptunnel_wizard_desc_target_host">Detta är IP-adressen som din tjänst körs på, den är vanligtvis på samma maskin så 127.0.0.1 fylls i automatiskt.</string>
   <string name="i2ptunnel_wizard_desc_target_port">Detta är den port din tjänst tar emot anslutningar på.</string>
   <string name="i2ptunnel_wizard_desc_reachable_on">Det här begränsar vilka datorer eller smartphones som kan få tillgång till denna tunnel.</string>
   <string name="i2ptunnel_wizard_desc_binding_port">Detta är den port som klienttunneln blir åtkomlig från lokalt. Detta är också klientporten för HTTP bidir servertunneln.</string>

app/src/main/res/values-tr/strings.xml

@@ -9,14 +9,14 @@
   <string name="label_status">Durum</string>
   <string name="label_console">Pano</string>
   <string name="label_addresses">Adresler</string>
-  <string name="label_addressbook">Adres Defteri</string>
+  <string name="label_addressbook">Adres defteri</string>
   <string name="label_i2ptunnel_client">İstemci tünelleri</string>
   <string name="label_i2ptunnel_server">Sunucu tünelleri</string>
   <string name="label_logs">Günlükler</string>
-  <string name="label_error_logs">Hata Günlükleri</string>
+  <string name="label_error_logs">Hata günlükleri</string>
   <string name="label_news">Haberler</string>
   <string name="label_peers_status">Eşler</string>
-  <string name="label_release_notes">Yayım Notları</string>
+  <string name="label_release_notes">Yayım notları</string>
   <string name="label_licenses">Lisanslar</string>
   <string name="label_browse">Göz at</string>
   <string name="label_graphs">Çizelgeler</string>
@@ -30,17 +30,17 @@
   <string name="testing">Sınanıyor</string>
   <string name="firewalled">Güvenlik duvarlı</string>
   <string name="symmetric_nat">Simetrik NAT</string>
-  <string name="net_status_error_i2cp">İstemci yöneticisi I2CP hatası - günlüklere bakın</string>
+  <string name="net_status_error_i2cp">İstemci yöneticisi I2CP hatası. Günlüklere bakın</string>
   <!--Parameter is a time, e.g. 32s or 2m-->
   <string name="net_status_error_skew">%s saat sapması</string>
   <string name="net_status_error_unresolved_tcp">Çözümlenmemiş TCP adresi</string>
   <string name="net_status_error_private_tcp">Kişisel TCP adresi</string>
   <string name="net_status_warn_firewalled_inbound_tcp">Geliş TCP bağlantısı güvenlik duvarı etkinleştirilmiş </string>
   <string name="net_status_warn_firewalled_floodfill">Güvenlik duvarı arkasında otomatik doldurma</string>
-  <string name="net_status_info_disconnected">Bağlantı kesildi - ağ bağlantısını denetleyin</string>
-  <string name="net_status_error_udp_port">UDP kapı numarası kullanılıyor - ayarları değiştirip yeniden başlatın</string>
+  <string name="net_status_info_disconnected">Bağlantı kesildi. Ağ bağlantısını denetleyin</string>
+  <string name="net_status_error_udp_port">UDP bağlantı noktası kullanılıyor. Ayarları değiştirip yeniden başlatın</string>
   <string name="net_status_error_no_active_peers">Etkin eş yok, ağ bağlantısını ve güvenlik duvarını denetleyin</string>
-  <string name="net_status_error_udp_disabled_tcp_not_set">UDP devre dışı ve Geliş TCP bağlantısı sunucu/kapı numarası ayarlanmamış</string>
+  <string name="net_status_error_udp_disabled_tcp_not_set">UDP devre dışı ve Geliş TCP bağlantısı sunucu/bağlantı noktası ayarlanmamış</string>
   <string name="net_status_warn_firewalled_udp_disabled">Güvenlik duvarı ve UDP devre dışı</string>
   <string name="shared_clients">Paylaşılmış istemciler</string>
   <string name="uptime">Çalışma süresi</string>
@@ -58,9 +58,9 @@
   <string name="configure_no_doze_title">Pil kullanımı yönetilsin mi?</string>
   <string name="configure_no_doze">I2P için en iyi durum sürekli çalışmasıdır. I2P uygulamasının Android üzerinde pili korumak için kapatılmasını engellemek için uygulamayı pil kullanımı istisnası listesine ekleyebilirsiniz. Bu durumda uygulamanın güvenirliği önemli ölçüde artacaktır.\n\nI2P arka planda çalışır durumda tutulsun mu (önerilir)?</string>
   <string name="first_start_title">Tebrikler, I2P kuruldu!</string>
-  <string name="first_start_welcome"><b>I2P uygulamasına hoş geldiniz</b> Lütfen I2P yüklenip eşleri bulana kadar <b>sabırlı olun</b>.</string>
+  <string name="first_start_welcome"><b>I2P uygulamasına hoş geldiniz</b> Lütfen I2P açılıp eşleri bulana kadar <b>sabırlı olun</b>.</string>
   <string name="first_start_read">Beklerken, lütfen sürüm notları ve hoş geldiniz sayfalarını okuyun.</string>
-  <string name="first_start_faq">İstemci tünelleri bulunduğunda, lütfen Sık Sorulan Sorular bölümüne <b>bakın</b>:</string>
+  <string name="first_start_faq">İstemci tünelleri bulunduğunda, lütfen sık sorulan sorular bölümüne <b>bakın</b>:</string>
   <string name="first_start_faq_nonanon">Ya da tünelleri beklemek istemiyorsanız anonim olmayan şu bağlantıyı kullanın:</string>
   <string name="first_start_irc">IRC istemcinizi <b>localhost:6668</b> adresine yönlendirip şuradan bize merhaba deyin:</string>
   <string name="action_search">Arama</string>
@@ -72,13 +72,13 @@
   <string name="action_i2ptunnel_start_all">Tüm tünelleri aç</string>
   <string name="action_i2ptunnel_stop_all">Tüm tünelleri kapat</string>
   <string name="action_i2ptunnel_restart_all">Tüm tünelleri yeniden aç</string>
-  <string name="action_reload">Yeniden Yükle</string>
+  <string name="action_reload">Yeniden yükle</string>
   <string name="action_refresh">Yenile</string>
   <string name="hint_search_addressbook">Adres defterinde arama</string>
   <string name="action_reload_subscriptions">Abonelikleri yeniden yükle</string>
   <string name="news_last_updated">Haberler en son %s önce güncellendi</string>
   <string name="news_last_checked">Haberler en son %s önce denetlendi</string>
-  <string name="news_updated">Haberler Güncellendi</string>
+  <string name="news_updated">Haberler güncellendi</string>
   <string name="view_news">I2P yeniliklerini görmek için dokunun</string>
   <string name="router_not_running">Yöneltici çalışmıyor.</string>
   <string name="router_shutting_down">Yöneltici kapatılıyor.</string>
@@ -89,16 +89,16 @@
   <string name="graphs_not_ready">Çizelgeler henüz hazır değil. Daha sonra yeniden deneyin.</string>
   <string name="statistics">İstatistikler</string>
   <string name="routers">Yönelticiler</string>
-  <string name="leasesets">Kiralama Kümeleri</string>
+  <string name="leasesets">\"Kiralama kümeleri\" (LeaseSets)</string>
   <string name="countries">Ülkeler</string>
   <string name="country">Ülke</string>
-  <string name="transport">Aktarım</string>
+  <string name="transport">Taşıyıcı</string>
   <string name="versions">Sürümler</string>
   <string name="version">Sürüm</string>
   <string name="count">Sayı</string>
   <string name="tname_0">Gizli ya da başlatılıyor</string>
-  <string name="netdb_routers_empty">Ağ Veritabanınızda bir yöneltici bulunamadı.</string>
-  <string name="netdb_leases_empty">Ağ Veritabanınızda bir LeaseSets bulunamadı.</string>
+  <string name="netdb_routers_empty">\"Ağ veri tabanınızda\" (NetDB) bir yöneltici bulunamadı.</string>
+  <string name="netdb_leases_empty">\"Ağ veri tabanınızda\" (NetDB) bir \"Kiralama kümesi\" (LeaseSet) bulunamadı.</string>
   <string name="notification_status_starting">I2P başlatılıyor</string>
   <string name="notification_status_restarting">I2P yeniden başlatılıyor</string>
   <string name="notification_status_waiting">I2P bir ağ bağlantısının kurulmasını bekliyor</string>
@@ -115,11 +115,16 @@
   <string name="notification_status_peers">Eşler: %1$d etkin, %2$d bilinmeyen</string>
   <string name="notification_status_expl">Keşif tünelleri: %1$d/%2$d</string>
   <string name="notification_status_client">İstemci tünelleri: %1$d/%2$d</string>
+  <string name="stats_memory">Bellek kullanılan/toplam</string>
+  <string name="stats_lag">Görev gecikmesi</string>
+  <string name="stats_delay">İleti gecikmesi</string>
+  <string name="copied_base32_system_notification_title">Base32 panoya kopyalandı</string>
+  <string name="copied_base32_system_notification_body">I2P tünelinizin adresi panoya kopyalandı.</string>
   <string name="menu_settings">Ayarlar</string>
   <string name="settings_enable">Etkinleştir</string>
-  <string name="settings_desc_subscriptions">Abonelik İnternet Adresleri</string>
+  <string name="settings_desc_subscriptions">Abonelik adresleri</string>
   <string name="settings_label_bandwidth_net">Bant genişliği ve ağ</string>
-  <string name="settings_label_startOnBoot">I2P Açılışta Başlatılsın</string>
+  <string name="settings_label_startOnBoot">I2P açılışta başlatılsın</string>
   <string name="settings_desc_startOnBoot">Android aygıtınız başlatıldığında I2P kendiliğinden bağlanır</string>
   <string name="settings_label_bandwidth">Bant genişliği</string>
   <string name="settings_label_bw_inbound">Geliş bağlantısı hızı</string>
@@ -135,7 +140,7 @@
   <string name="settings_label_sharePercent">Paylaşım yüzdesi</string>
   <string name="settings_desc_sharePercent">Paylaşılacak bant genişliği yüzdesi (varsayılan=80)</string>
   <string name="settings_dialog_sharePercent">Paylaşılacak bant genişliği yüzdesi</string>
-  <string name="settings_desc_upnp">Güvenlik duvarı kapı numaraları kendiliğinden açılsın</string>
+  <string name="settings_desc_upnp">Güvenlik duvarı bağlantı noktaları otomatik olarak açılsın</string>
   <string name="settings_label_logging">Günlükleme</string>
   <string name="settings_label_default_log_level">Varsayılan günlük düzeyi</string>
   <string name="settings_label_appearance">Görünüm</string>
@@ -144,10 +149,16 @@
   <string name="settings_label_advanced">Gelişmiş</string>
   <string name="settings_label_showStats">Yöneltici istatistikleri</string>
   <string name="settings_summ_showStats">Ana panoda ayrıntılı istatistikler görüntülensin</string>
-  <string name="settings_label_transports">Aktarımlar</string>
+  <string name="settings_label_transports">Taşıyıcılar</string>
   <string name="settings_label_maxConns">En fazla bağlantı</string>
-  <string name="settings_label_i2cp">I2CP Arabirimi</string>
-  <string name="settings_desc_i2cp">Üçüncü taraf uygulamalar tünel oluşturabilsin (yönelticinin yeniden başlatılması gerekir)</string>
+  <string name="settings_label_i2cp">I2CP arabirimi</string>
+  <string name="settings_desc_i2cp">Üçüncü taraf uygulamalar I2CP ile tüneller oluşturabilsin (yöneltici yeniden başlatılmalıdır)</string>
+  <string name="settings_label_sam">SAM arabirimi</string>
+  <string name="settings_desc_sam">Üçüncü taraf uygulamalar SAM ile tüneller oluşturabilsin (yöneltici yeniden başlatılmalıdır)</string>
+  <string name="settings_confirm_sam">Bir uygulama bir SAM bağlantısı kurmaya çalışıyor.</string>
+  <string name="settings_confirm_sam_id">Bağlantı adı/kodu:</string>
+  <string name="settings_confirm_allow_sam">İzin vermek için dokunun</string>
+  <string name="settings_confirm_deny_sam">Reddetmek için yok sayın</string>
   <string name="settings_label_exploratory_pool">Keşif havuzu</string>
   <string name="settings_desc_exploratory_pool">Tunel ayarları</string>
   <string name="settings_label_expl_inbound">Geliş tünelleri</string>
@@ -164,15 +175,15 @@
   <string name="settings_label_expl_backupQuantity">Yedek sayısı</string>
   <string name="settings_summ_expl_backupQuantity">%s tünel</string>
   <string name="settings_desc_expl_backupQuantity">Tünel yedeği sayısı</string>
-  <string name="settings_need_transport_enabled">En az bir aktarım etkinleştirilmiş olmalıdır</string>
+  <string name="settings_need_transport_enabled">En az bir taşıyıcı etkinleştirilmiş olmalıdır</string>
   <string name="settings_router_restart_required">Değişikliklerin etkili olması için I2P yeniden başlatılmalı</string>
   <string name="menu_about">Hakkında</string>
   <string name="about_version">Sürüm:</string>
-  <string name="about_project">Proje Web Sitesi:</string>
-  <string name="about_bugs">Hatalar ve Destek</string>
-  <string name="about_helpwanted">Yardımınız Gerekli!</string>
+  <string name="about_project">Proje sitesi:</string>
+  <string name="about_bugs">Hatalar ve destek</string>
+  <string name="about_helpwanted">Yardımınız gerekli!</string>
   <string name="about_volunteer">Uygulamayı daha iyi duruma getirmek için yardımcı olmak ister misiniz? Android forumunda gönüllü olun:</string>
-  <string name="about_donate">Geliştirme ve denemeler için çeşitli Android aygıtları alabilmemiz için para ya da bitcoin bağışlamak ister misiniz:</string>
+  <string name="about_gitlab">Bir öneride bulunmak ya da hata bildirmek mi istiyorsunuz? Android GitLab üzerinden bir birleştirme isteği yapın:</string>
   <string name="menu_help">Yardım</string>
   <string name="general">Genel</string>
   <string name="label_router">Herkese açık adresler</string>
@@ -202,10 +213,10 @@
   <string name="i2ptunnel_type_httpbidirserver">HTTP bidir</string>
   <string name="install_recommended_app">Önerilen uygulama kurulsun mu?</string>
   <string name="app_needed_for_this_tunnel_type">Bu tüneli kullanmak için bir uygulama kurmalısınız. Önerilen uygulamayı kurmak ister misiniz?</string>
-  <string name="i2ptunnel_not_initialized">Tüneller henüz hazır değil, lütfen iki dakika sonra yeniden yükleyin.</string>
+  <string name="i2ptunnel_not_initialized">Tüneller henüz hazır değil. Lütfen iki dakika sonra yeniden yükleyin.</string>
   <string name="no_configured_client_tunnels">Henüz ayarlanmış bir istemci tüneli yok.</string>
   <string name="no_configured_server_tunnels">Henüz ayarlanmış bir sunucu tüneli yok.</string>
-  <string name="i2ptunnel_new_tunnel">Yeni Tünel</string>
+  <string name="i2ptunnel_new_tunnel">Yeni tünel</string>
   <string name="i2ptunnel_msg_config_saved">Yapılandırma değişiklikleri kaydedildi</string>
   <string name="i2ptunnel_msg_config_save_failed">Yapılandırma kaydedilemedi</string>
   <string name="i2ptunnel_msg_tunnel_starting">Tünel açılıyor</string>
@@ -213,7 +224,7 @@
   <string name="i2ptunnel_delete_confirm_message">Tüneli sil</string>
   <string name="i2ptunnel_delete_confirm_button">Tüneli sil</string>
   <string name="i2ptunnel_no_tunnel_details">Tünel ayrıntıları yüklenemedi</string>
-  <string name="i2ptunnel_wizard_k_client_server">İstemci ya da Sunucu</string>
+  <string name="i2ptunnel_wizard_k_client_server">İstemci ya da sunucu</string>
   <string name="i2ptunnel_wizard_v_client">İstemci tüneli</string>
   <string name="i2ptunnel_wizard_v_server">Sunucu tüneli</string>
   <string name="i2ptunnel_wizard_k_type">Tünel türü</string>
@@ -222,23 +233,23 @@
   <string name="i2ptunnel_wizard_k_dest">Hedef</string>
   <string name="i2ptunnel_wizard_k_outproxies">Çıkış vekil sunucuları</string>
   <string name="i2ptunnel_wizard_k_target_host">Hedef sunucu</string>
-  <string name="i2ptunnel_wizard_k_target_port">Hedef kapı numarası</string>
+  <string name="i2ptunnel_wizard_k_target_port">Hedef bağlantı noktası</string>
   <string name="i2ptunnel_wizard_k_reachable_on">Şuradan erişilebilir</string>
-  <string name="i2ptunnel_wizard_k_binding_port">Bağlanılacak kapı numarası</string>
+  <string name="i2ptunnel_wizard_k_binding_port">Bağlanılacak bağlantı noktası</string>
   <string name="i2ptunnel_wizard_k_auto_start">Otomatik başlat</string>
   <string name="next">Sonraki</string>
   <string name="prev">Önceki</string>
   <string name="finish">Gönder</string>
-  <string name="review">Gözden Geçir</string>
+  <string name="review">Gözden geçir</string>
   <string name="enabled">Etkin</string>
   <string name="i2ptunnel_wizard_desc_name">Tünel listesinde görüntülenecek tünel adı.</string>
   <string name="i2ptunnel_wizard_desc_desc">İsteğe bağlı olarak yazılabilecek tünel açıklaması.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Bu istemci tünelinin bağlanacağı hizmetin I2P hedefini yazın. Tam Base 64 hedef anahtarı ya da adres defterinizden bir sunucu adı olabilir.</string>
+  <string name="i2ptunnel_wizard_desc_dest">Tünelin .i2p adresini ya da hedefini (sunucuadi.i2p, b32 ya da b64) buraya yazın.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Bu tünel türü için bildiğiniz çıkış sunucuları varsa (HTTP ya da SOCKS) buraya virgül ile ayırarak yazın. </string>
   <string name="i2ptunnel_wizard_desc_target_host">Çalıştırdığınız hizmetin IP adresi. Genellikle aynı bilgisayarda olduğundan otomatik olarak 127.0.0.1 yazılır.</string>
-  <string name="i2ptunnel_wizard_desc_target_port">Hizmetin bağlantıları kabul edeceği kapı numarası.</string>
+  <string name="i2ptunnel_wizard_desc_target_port">Hizmetin bağlantıları kabul edeceği bağlantı noktası.</string>
   <string name="i2ptunnel_wizard_desc_reachable_on">Bu seçenek bu tünele erişebilecek bilgisayar ve akıllı telefonları sınırlar.</string>
-  <string name="i2ptunnel_wizard_desc_binding_port">İstemci tüneline yerel olarak erişilebilecek kapı numarası. Aynı zamanda HTTP bidir sunucusu tünelinin istemci kapı numarasıdır.</string>
+  <string name="i2ptunnel_wizard_desc_binding_port">İstemci tüneline yerel olarak erişilebilecek bağlantı noktası. Aynı zamanda HTTP bidir sunucusu tünelinin istemci bağlantı noktasıdır.</string>
   <string name="i2ptunnel_wizard_desc_auto_start">Yöneltici başlatıldığında tünel de başlatılsın mı?</string>
   <string name="i2ptunnel_wizard_submit_confirm_message">Tünel oluşturulsun</string>
   <string name="i2ptunnel_wizard_submit_confirm_button">Tüneli oluştur</string>
@@ -251,7 +262,7 @@
   <string name="description">Açıklama</string>
   <string name="auto_start">Otomatik başlat</string>
   <string name="tunnel_summ_auto_start">Yöneltici başlatıldığında tünel de başlatılsın.</string>
-  <string name="tunnel_cat_ports">Yerel kapı numaraları</string>
+  <string name="tunnel_cat_ports">Yerel bağlantı noktaları</string>
   <string name="shared_client">Paylaşılmış istemci</string>
   <string name="tunnel_summ_shared_client">Diğer paylaşılmış istemciler ile aynı hedef ve tüneller kullanılsın</string>
   <string name="target_destination">Hedef konum</string>
@@ -260,22 +271,22 @@
   <string name="persistent_key_conflict_msg">Tünel yeniden açıldığında yeni anahtarlar oluşturuluyorsa sürekli anahtarlar kullanılamaz. Yeniden açıldığından yeni anahtarların oluşturulması devre dışı bırakılsın mı?</string>
   <string name="tunnel_summ_persistent_key">Yeniden başlatıldığında bu tünelin hedefi korunsun</string>
   <string name="reachable_on">Şuradan erişilebilir</string>
-  <string name="listen_port">Dinlenecek kapı numarası</string>
-  <string name="client_ssl">SSL İstemci</string>
-  <string name="tunnel_summ_client_ssl">İstemci yalnız SSL üzerinden bağlanabilir</string>
+  <string name="listen_port">Dinlenecek bağlantı noktası</string>
+  <string name="client_ssl">İstemcide SSL</string>
+  <string name="tunnel_summ_client_ssl">İstemci yalnızca SSL üzerinden bağlanabilir</string>
   <string name="outproxies">Çıkış vekil sunucuları</string>
   <string name="ssl_outproxies">SSL çıkış vekil sunucuları</string>
   <string name="irc">IRC</string>
-  <string name="enable_dcc">DCC Kullanılsın</string>
+  <string name="enable_dcc">DCC kullanılsın</string>
   <string name="tunnel_summ_enable_dcc">IRC istemcileri DCC kullanabilsin</string>
-  <string name="website_domain_name">Web sitesinin etki alanı</string>
+  <string name="website_domain_name">Sitenin etki alanı</string>
   <string name="target_host">Hedef sunucu</string>
-  <string name="target_port">Hedef kapı numarası</string>
-  <string name="use_ssl">SSL Kullanılsın</string>
+  <string name="target_port">Hedef bağlantı noktası</string>
+  <string name="use_ssl">SSL kullanılsın</string>
   <string name="tunnel_summ_use_ssl">Hedefe bağlanmak için SSL kullanılsın</string>
   <string name="tunnel_parameters">Tünel parametreleri</string>
   <string name="profile">Profil</string>
-  <string name="profile_bulk">Toplu bağlantı (indirme/web siteleri/BT)</string>
+  <string name="profile_bulk">Toplu bağlantı (indirmeler/siteler/BT)</string>
   <string name="profile_interactive">Etkileşimli bağlantı</string>
   <string name="delay_connect">Bağlantı gecikmesi</string>
   <string name="tunnel_summ_delay_connect">Bağlantı yanıtları için etkinleştirin</string>
@@ -286,7 +297,7 @@
   <string name="blacklist">Kara liste</string>
   <string name="access_list">Erişim listesi</string>
   <string name="reject_inproxies">Giriş vekil sunucular reddedilsin</string>
-  <string name="tunnel_summ_reject_inproxies">Yalnız I2P kullanıcıları bağlanabilsin</string>
+  <string name="tunnel_summ_reject_inproxies">Yalnızca I2P kullanıcıları bağlanabilsin</string>
   <string name="unique_local">Benzersiz yerel</string>
   <string name="tunnel_summ_unique_local">Her istemci için benzersiz yerel sunucu IP adresi kullanılsın</string>
   <string name="multihome">Birden çok barındırma</string>
@@ -324,14 +335,14 @@
   <string name="new_keys_on_reopen_conflict_title">Sürekli anahtarlar kullanılamasın</string>
   <string name="new_keys_on_reopen_conflict_msg">Tünel yeniden açıldığında yeni anahtarlar oluşturuluyorsa sürekli anahtarlar kullanılamaz. Sürekli anahtarlar devre dışı bırakılsın mı?</string>
   <string name="http_client">HTTP istemcisi</string>
-  <string name="tunnel_summ_user_agent">\'User-Agent\' üstbilgisi geçirilsin</string>
-  <string name="tunnel_summ_referer">\'Referer\' üstbilgisi geçirilsin</string>
-  <string name="tunnel_summ_accept">\'Accept-*\' üstbilgisi geçirilsin</string>
+  <string name="tunnel_summ_user_agent">\'User-Agent\' üst bilgisi geçirilsin</string>
+  <string name="tunnel_summ_referer">\'Referer\' üst bilgisi geçirilsin</string>
+  <string name="tunnel_summ_accept">\'Accept-*\' üst bilgisi geçirilsin</string>
   <string name="tunnel_summ_allow_ssl">I2P adreslerinde SSL kullanılabilsin</string>
   <string name="jump_url_list">Sıçrama adresi listesi</string>
   <string name="proxy_auth">Vekil sunucu kimlik doğrulaması</string>
   <string name="tunnel_summ_proxy_auth">Bu vekil sunucuda oturum açmak için kimlik doğrulaması istensin</string>
-  <string name="username">Kullanıcı Adı</string>
+  <string name="username">Kullanıcı adı</string>
   <string name="password">Parola</string>
   <string name="outproxy_auth">Çıkış vekil sunucusu kimlik doğrulaması</string>
   <string name="tunnel_summ_outproxy_auth">Çıkış vekil sunucusu için oturum açılması gerekiyor</string>
@@ -349,13 +360,14 @@
     <item quantity="one">%d ileti, yeniden eskiye</item>
     <item quantity="other">%d ileti, yeniden eskiye</item>
   </plurals>
-  <string name="log_entry">Günlük Kaydı</string>
+  <string name="log_entry">Günlük kaydı</string>
   <string name="copy_logs">Günlükleri kopyala</string>
-  <string name="i2p_android_error_logs">I2P Android Hata Günlükleri</string>
-  <string name="i2p_android_logs">I2P Android Günlükleri</string>
+  <string name="i2p_android_error_logs">I2P Android hata günlükleri</string>
+  <string name="i2p_android_logs">I2P Android günlükleri</string>
   <string name="error_logs_copied_to_clipboard">Hata günlükleri panoya kopyalandı</string>
   <string name="logs_copied_to_clipboard">Günlükler panoya kopyalandı</string>
   <string name="label_browser_configuration">Tarayıcı yapılandırması</string>
   <string name="no_market_app">Herhangi bir mağaza uygulaması bulunamadı, lütfen el ile kurun</string>
-  <string name="unset">Ayarı Kaldır</string>
+  <string name="unset">Ayarı kaldır</string>
+  <string name="running_background">I2P arka planda çalışıyor</string>
 </resources>

app/src/main/res/values-uk/strings.xml

@@ -170,7 +170,6 @@
   <string name="about_bugs">Неполадки і підтримка:</string>
   <string name="about_helpwanted">Потрібна допомога!</string>
   <string name="about_volunteer">Бажаєте зробити цей додаток краще? Зголошуйтесь на форумі Android:</string>
-  <string name="about_donate">Бажаєте пожертвувати гроші на закупівлю більшої кількості різноманітних пристроїв Android для розробки та тестування? Вам сюди:</string>
   <string name="menu_help">Допомога</string>
   <string name="general">Головне</string>
   <string name="label_router">Публічні адреси</string>
@@ -231,7 +230,6 @@
   <string name="enabled">Увімкнено</string>
   <string name="i2ptunnel_wizard_desc_name">Назва тунелю для ідентифікації у списці тунелів.</string>
   <string name="i2ptunnel_wizard_desc_desc">Опис тунелю. Використовуйте це необов\'язкове поле задля більшої інформативності.</string>
-  <string name="i2ptunnel_wizard_desc_dest">Тип призначення сервісу в мережі I2P, тобто куди клієнт має приєднатися. Це може бути повний BASE64 ключ призначення або імʼя вузла I2P з вашої адресної книги.</string>
   <string name="i2ptunnel_wizard_desc_outproxies">Якщо ви знаєте інші вихідні проксі для цього типу тунелю (або HTTP або SOCKS), то надрукуйте тут. Розділяйте проксі комами.</string>
   <string name="i2ptunnel_wizard_desc_target_host">Це IP-адреса, на якій сервіс працює. Зазвичай така сама, як у машини, тому 127.0.0.1 введено автоматично.</string>
   <string name="i2ptunnel_wizard_desc_target_port">Це порт, на який сервіс приймає з’єднання.</string>

app/src/main/res/values-vi/strings.xml

@@ -28,6 +28,7 @@
   <string name="action_reload">Tải lại</string>
   <string name="action_refresh">Nạp lại</string>
   <string name="statistics">Thống kê</string>
+  <string name="countries">Quốc Gia</string>
   <string name="country">Quốc gia</string>
   <string name="version">Phiên bản</string>
   <string name="count">Số lượng</string>
@@ -110,6 +111,7 @@
   <string name="use_ssl">Sử dụng SSL</string>
   <string name="tunnel_parameters">Thông số đường hầm</string>
   <string name="profile">Hồ sơ</string>
+  <string name="access_control">Kiểm soát truy cập</string>
   <string name="disabled">Tàn tật</string>
   <string name="whitelist">Sổ trắng</string>
   <string name="blacklist">Sổ đen</string>
@@ -120,6 +122,7 @@
   <string name="http_client">Khách HTTP</string>
   <string name="username">Tên đăng nhập</string>
   <string name="password">Mật khẩu</string>
+  <string name="other">Khác</string>
   <string name="custom_options">Tùy chọn tùy ý</string>
   <string name="all">Tất cả</string>
 </resources>

app/src/main/res/values-zh-rTW/strings.xml

@@ -55,6 +55,8 @@
   <string name="upload">上傳</string>
   <string name="configure_browser_title">配置瀏覽器嗎?</string>
   <string name="configure_browser_for_i2p">您要配置瀏覽器來查看I2P網站嗎? (您也可以稍後在幫助清單設定。)</string>
+  <string name="configure_no_doze_title">管理电池优化？</string>
+  <string name="configure_no_doze">I2P 在持续工作时能达到最佳效果。为阻止 Android 在尝试节省电量时关闭 I2P，您可以将它添加到电池例外名单中。这将大幅提高应用稳定性。\n\n要保持 I2P 在后台运行吗？（推荐）</string>
   <string name="first_start_title">恭喜您成功安裝了 I2P ！</string>
   <string name="first_start_welcome"><b>歡迎來到I2P!</b> 請 <b>保持耐心</b> 等 I2P 啟動和找節點。</string>
   <string name="first_start_read">在您等候的同時，請在閱讀發行公告與歡迎頁面。</string>
@@ -113,6 +115,11 @@
   <string name="notification_status_peers">節點: %1$d活躍，%2$d已知</string>
   <string name="notification_status_expl">隧道探索: %1$d/%2$d</string>
   <string name="notification_status_client">客戶端隧道: %1$d/%2$d</string>
+  <string name="stats_memory">已用内存/最大内存</string>
+  <string name="stats_lag">作业日志</string>
+  <string name="stats_delay">消息延迟</string>
+  <string name="copied_base32_system_notification_title">将B32地址复制到剪贴板</string>
+  <string name="copied_base32_system_notification_body">将B32地址复制到剪贴板</string>
   <string name="menu_settings">設定</string>
   <string name="settings_enable">啟用</string>
   <string name="settings_desc_subscriptions">訂閱的網址</string>
@@ -145,6 +152,13 @@
   <string name="settings_label_transports">傳輸</string>
   <string name="settings_label_maxConns">最大連接數</string>
   <string name="settings_label_i2cp">I2CP 介面</string>
+  <string name="settings_desc_i2cp">允许第三方应用程序使用I2CP（需要重新启动路由器）</string>
+  <string name="settings_label_sam">SAM接口</string>
+  <string name="settings_desc_sam">允许第三方应用程序使用SAM（需要重新启动路由器）</string>
+  <string name="settings_confirm_sam">一个应用程序正在试图建立一个SAM连接。</string>
+  <string name="settings_confirm_sam_id">会话名称/ID：</string>
+  <string name="settings_confirm_allow_sam">点按允许</string>
+  <string name="settings_confirm_deny_sam">忽略否认</string>
   <string name="settings_label_exploratory_pool">導坑池</string>
   <string name="settings_desc_exploratory_pool">隧道參數</string>
   <string name="settings_label_expl_inbound">Inbound 隧道</string>
@@ -169,7 +183,7 @@
   <string name="about_bugs">問題和支援：</string>
   <string name="about_helpwanted">需要幫忙！</string>
   <string name="about_volunteer">您是否願意伸出援手，讓這個 app 變得更好使用？我們的安卓論壇正在招募志工：</string>
-  <string name="about_donate">您願意捐款或捐比特幣給我們，去買開發和測試用的安卓設備嗎？這裡：</string>
+  <string name="about_gitlab">想建议一个功能或修复一个错误吗？ 在Android Gitlab上提出合并请求：</string>
   <string name="menu_help">幫助</string>
   <string name="general">功能概況</string>
   <string name="label_router">公共位址</string>
@@ -179,6 +193,12 @@
   <string name="addressbook_add_wizard_k_name">名稱</string>
   <string name="addressbook_add_wizard_k_destination">目標</string>
   <string name="addressbook_add_wizard_desc_name">名字是</string>
+  <string name="addressbook_add_wizard_desc_destination">在这里粘贴 B64 形式的目的地。如果您有安装一个文件管理器，您可以浏览包含 B64 的一个文本文件。</string>
+  <string name="nsu_iae_illegal_char">主机名称 \"%1$s\" 中包含非法字符 %2$s</string>
+  <string name="nsu_iae_cannot_start_with">主机名不能以 \"%s\"开始</string>
+  <string name="nsu_iae_cannot_end_with">主机名不能以 \"%s\"结尾</string>
+  <string name="nsu_iae_cannot_contain">主机名不能包含 \"%s\"</string>
+  <string name="nsu_iae_requires_conversion">主机名称 \"%s\" 需要转换为 ASCII，但转换库在此 Android 版本中不可用</string>
   <string name="i2ptunnel_type_client">標準客戶端</string>
   <string name="i2ptunnel_type_httpclient">HTTP 客戶端</string>
   <string name="i2ptunnel_type_ircclient">IRC客戶端</string>
@@ -188,7 +208,11 @@
   <string name="i2ptunnel_type_socksirctunnel">SOCKS IRC 代理</string>
   <string name="i2ptunnel_type_connectclient">CONNECT/SSL/HTTPS 代理</string>
   <string name="i2ptunnel_type_ircserver">IRC 伺服器</string>
+  <string name="i2ptunnel_type_streamrclient">Streamr 客户端</string>
+  <string name="i2ptunnel_type_streamrserver">Streamr 服务器</string>
+  <string name="i2ptunnel_type_httpbidirserver">双向 HTTP</string>
   <string name="install_recommended_app">安裝建議的 app ?</string>
+  <string name="app_needed_for_this_tunnel_type">您需要安装一个应用以使用此隧道。您想安装推荐的应用吗？</string>
   <string name="i2ptunnel_not_initialized">隧道尚未初始化，請在兩分鐘內重整。</string>
   <string name="no_configured_client_tunnels">客戶端隧道沒有設定。</string>
   <string name="no_configured_server_tunnels">伺服器隧道沒有設定。</string>
@@ -211,12 +235,22 @@
   <string name="i2ptunnel_wizard_k_target_host">目標主機</string>
   <string name="i2ptunnel_wizard_k_target_port">目標端口</string>
   <string name="i2ptunnel_wizard_k_reachable_on">開啟被連通</string>
+  <string name="i2ptunnel_wizard_k_binding_port">绑定端口</string>
   <string name="i2ptunnel_wizard_k_auto_start">自動啟動</string>
   <string name="next">下一個</string>
   <string name="prev">前一個</string>
   <string name="finish">提交</string>
   <string name="review">複檢</string>
   <string name="enabled">啟用</string>
+  <string name="i2ptunnel_wizard_desc_name">隧道的名称，隧道列表中的标识。</string>
+  <string name="i2ptunnel_wizard_desc_desc">隧道的描述。这是可选的，纯粹提供信息性。</string>
+  <string name="i2ptunnel_wizard_desc_dest">在这里指定隧道的.i2p地址或目的地（hostname.i2p，b32或b64）。</string>
+  <string name="i2ptunnel_wizard_desc_outproxies">如果您知道任何此类型的隧道 (HTTP 或者 SOCKS) 的出口代理，填入它们。用逗号分隔多个代理服务器。</string>
+  <string name="i2ptunnel_wizard_desc_target_host">这是您正在运行服务的所在 IP，这通常是在同一台机器上，所以 127.0.0.1 会被自动填写。</string>
+  <string name="i2ptunnel_wizard_desc_target_port">这是这项服务接受连接的端口。</string>
+  <string name="i2ptunnel_wizard_desc_reachable_on">这就限制了哪些电脑或智能手机可以访问此隧道。</string>
+  <string name="i2ptunnel_wizard_desc_binding_port">这是客户端隧道从本地访问的端口。这也是 HTTP bidir 服务器隧道的客户端端口。</string>
+  <string name="i2ptunnel_wizard_desc_auto_start">启动路由器时应自动启动隧道吗？</string>
   <string name="i2ptunnel_wizard_submit_confirm_message">建立新隧道？</string>
   <string name="i2ptunnel_wizard_submit_confirm_button">建立新隧道</string>
   <string name="i2ptunnel_view_target">目標</string>
@@ -230,21 +264,108 @@
   <string name="tunnel_summ_auto_start">當路由器啟動時一併啟動這個隧道。</string>
   <string name="tunnel_cat_ports">本地端口</string>
   <string name="shared_client">共享客戶端</string>
+  <string name="tunnel_summ_shared_client">使用相同的目的地和隧道为其他客户端共享</string>
+  <string name="target_destination">目标目的地</string>
+  <string name="persistent_key">持久密钥</string>
+  <string name="persistent_key_conflict_title">禁用重新打开时新建密钥？</string>
+  <string name="persistent_key_conflict_msg">您不能在隧道被配置为重新打开时生成新密钥的情况下启用持久密钥。您想禁用重新打开时新建密钥吗？</string>
+  <string name="tunnel_summ_persistent_key">它重启时保持此隧道的目的地</string>
   <string name="reachable_on">開啟被連通</string>
+  <string name="listen_port">监听端口</string>
+  <string name="client_ssl">客户端 SSL</string>
+  <string name="tunnel_summ_client_ssl">客户端必须使用 SSL 连接</string>
   <string name="outproxies">連外代理</string>
   <string name="ssl_outproxies">SSL 的連外代理</string>
+  <string name="irc">IRC</string>
+  <string name="enable_dcc">启用 DCC</string>
+  <string name="tunnel_summ_enable_dcc">允许 IRC 客户端使用 DCC</string>
+  <string name="website_domain_name">网站域名</string>
   <string name="target_host">目標主機</string>
   <string name="target_port">目標端口</string>
   <string name="use_ssl">使用 SSL</string>
+  <string name="tunnel_summ_use_ssl">使用 SSL 连接目标</string>
   <string name="tunnel_parameters">隧道參數</string>
   <string name="profile">個人資料</string>
+  <string name="profile_bulk">大包连接 (下载/网站/BT)</string>
+  <string name="profile_interactive">交互连接</string>
+  <string name="delay_connect">延迟连接</string>
+  <string name="tunnel_summ_delay_connect">对请求/响应连接启用</string>
   <string name="access_control">存取控制</string>
+  <string name="restricted_access">访问受限</string>
   <string name="disabled">關閉</string>
+  <string name="whitelist">白名单</string>
+  <string name="blacklist">黑名单</string>
+  <string name="access_list">访问列表</string>
+  <string name="reject_inproxies">拒绝代理访问</string>
+  <string name="tunnel_summ_reject_inproxies">只允许 I2P 用户连接</string>
+  <string name="unique_local">唯一本地</string>
+  <string name="tunnel_summ_unique_local">使用唯一的本地 IP 对每个客户端</string>
+  <string name="multihome">多宿主</string>
+  <string name="tunnel_summ_multihome">启用多宿主优化</string>
+  <string name="client_connection_limits">客户端连接数限制</string>
+  <string name="connections_per_minute">每分钟连接数</string>
+  <string name="connections_per_hour">每小时连接数</string>
+  <string name="connections_per_day">每天连接数</string>
+  <string name="total_connection_limits">总连接数限制</string>
+  <string name="total_connections_per_minute">总连接数每分钟</string>
+  <string name="total_connections_per_hour">总连接数每小时</string>
+  <string name="total_connections_per_day">总连接数每天</string>
+  <string name="max_active_connections">最大活动连接数</string>
+  <string name="num_per_minute">%s 每分钟</string>
+  <string name="num_per_hour">%s 每小时</string>
+  <string name="num_per_day">%s 每天</string>
   <string name="unlimited">無限制</string>
+  <string name="set_zero_for_unlimited">设置 0 表示无限制</string>
+  <string name="post_limits">POST 限制</string>
+  <string name="limit_period">限制周期</string>
+  <string name="client_posts_per_period">客户端 POST 数量每个周期</string>
+  <string name="client_ban_length">客户端封禁长度</string>
+  <string name="total_posts_per_period">POST 总数每个周期</string>
+  <string name="total_ban_length">总计封禁长度</string>
+  <string name="power_saving">省电</string>
+  <string name="delay_open">延迟打开</string>
+  <string name="tunnel_summ_delay_open">延迟隧道打开，直到请求</string>
+  <string name="reduce_quantity">减少数量</string>
+  <string name="tunnel_summ_reduce_quantity">减少隧道数量在空闲时</string>
+  <string name="idle_time">闲置时间</string>
+  <string name="num_minutes">%s 分钟</string>
+  <string name="reduced_tunnel_quantity">减少隧道数量</string>
+  <string name="close_tunnels">关闭隧道在闲置时</string>
+  <string name="new_keys_on_reopen">新建密钥在重新打开时</string>
+  <string name="new_keys_on_reopen_conflict_title">禁用持久密钥</string>
+  <string name="new_keys_on_reopen_conflict_msg">您不能在隧道被配置为有持久密钥情况下启用重新打开时新建密钥。您想禁用持久密钥吗？</string>
   <string name="http_client">HTTP 客戶端</string>
+  <string name="tunnel_summ_user_agent">传递 \'User-Agent\' 头通过</string>
+  <string name="tunnel_summ_referer">传递 \'Referer\' 头通过</string>
+  <string name="tunnel_summ_accept">传递 \'Accept-*\' 头通过</string>
+  <string name="tunnel_summ_allow_ssl">允许 SSL 到 I2P 地址簿</string>
+  <string name="jump_url_list">跳到 URL 列表</string>
+  <string name="proxy_auth">代理身份验证</string>
+  <string name="tunnel_summ_proxy_auth">需要登录才能使用此代理</string>
   <string name="username">使用者名稱</string>
   <string name="password">密碼</string>
+  <string name="outproxy_auth">出口代理身份验证</string>
+  <string name="tunnel_summ_outproxy_auth">该出口代理需要登录</string>
   <string name="other">其它</string>
+  <string name="signature_type">签名类型</string>
+  <string name="custom_options">自定义选项</string>
   <string name="all">全部</string>
   <string name="no_messages">沒有訊息</string>
+  <string name="no_error_messages">无错误消息</string>
+  <plurals name="log_error_messages">
+    <item quantity="other">%d 条错误消息，新消息优先</item>
+  </plurals>
+  <plurals name="log_messages">
+    <item quantity="other">%d 条消息，新消息优先</item>
+  </plurals>
+  <string name="log_entry">日志条目</string>
+  <string name="copy_logs">复制日志</string>
+  <string name="i2p_android_error_logs">I2P Android 错误日志</string>
+  <string name="i2p_android_logs">I2P Android 日志</string>
+  <string name="error_logs_copied_to_clipboard">错误日志已复制到剪贴板</string>
+  <string name="logs_copied_to_clipboard">日志已复制到剪贴板</string>
+  <string name="label_browser_configuration">浏览器配置</string>
+  <string name="no_market_app">没有找到应用商店，请手动安装</string>
+  <string name="unset">未设置</string>
+  <string name="running_background">I2P正在后台运行</string>
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -1,17 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">I2P</string>
-  <string name="desc_i2p_logo">I2P标识</string>
+  <string name="desc_i2p_logo">I2P logo</string>
   <string name="choose_language">选择语言</string>
-  <string name="welcome_new_install">欢迎使用 I2P！本应用是 Alpha 版的测试软件，并不提供强有力的匿名性。请阅读发布说明和许可信息。</string>
+  <string name="welcome_new_install">欢迎使用 I2P Android！本应用是 Alpha 版的测试软件，并不保证提供强匿名性。请阅读发布说明和许可信息。</string>
   <string name="welcome_new_version">新版本已安装，请阅读发布说明。版本：</string>
   <string name="label_tunnels">隧道</string>
   <string name="label_status">状态</string>
   <string name="label_console">控制台</string>
   <string name="label_addresses">地址簿</string>
   <string name="label_addressbook">地址簿</string>
-  <string name="label_i2ptunnel_client">客户隧道</string>
-  <string name="label_i2ptunnel_server">服务隧道</string>
+  <string name="label_i2ptunnel_client">客户端隧道</string>
+  <string name="label_i2ptunnel_server">服务端隧道</string>
   <string name="label_logs">日志</string>
   <string name="label_error_logs">错误日志</string>
   <string name="label_news">新闻</string>
@@ -23,29 +23,29 @@
   <string name="button_router_off">长按启动 I2P</string>
   <string name="button_router_on">I2P 正在运行 (长按停止)</string>
   <string name="button_router_graceful">I2P 将在 %s 后关闭</string>
-  <string name="button_shutdown_now">长按现在停止</string>
+  <string name="button_shutdown_now">长按立即停止</string>
   <string name="button_cancel_graceful">长按取消关闭</string>
   <string name="no_internet">没有可用的互联网连接</string>
-  <string name="hidden">隐身</string>
+  <string name="hidden">隐身模式</string>
   <string name="testing">测试中</string>
-  <string name="firewalled">防火墙后</string>
+  <string name="firewalled">受到防火墙限制</string>
   <string name="symmetric_nat">对称 NAT</string>
   <string name="net_status_error_i2cp">客户端管理器 I2CP 错误 - 请检查日志</string>
   <!--Parameter is a time, e.g. 32s or 2m-->
   <string name="net_status_error_skew">时钟偏移 %s</string>
-  <string name="net_status_error_unresolved_tcp">未解析的 TCP 地址</string>
+  <string name="net_status_error_unresolved_tcp">无法解析的 TCP 地址</string>
   <string name="net_status_error_private_tcp">私有 TCP 地址</string>
   <string name="net_status_warn_firewalled_inbound_tcp">入站 TCP 已启用但受防火墙限制</string>
-  <string name="net_status_warn_firewalled_floodfill">种子节点因防火墙受限</string>
+  <string name="net_status_warn_firewalled_floodfill">因防火墙受限的洪泛节点</string>
   <string name="net_status_info_disconnected">已断开 - 请检查网络连接</string>
   <string name="net_status_error_udp_port">UDP 端口被占用 - 请在设置中更改并重启</string>
-  <string name="net_status_error_no_active_peers">没有活跃的对等端 - 请检查连接和防火墙情况</string>
+  <string name="net_status_error_no_active_peers">没有活跃的节点 - 请检查连接和防火墙情况</string>
   <string name="net_status_error_udp_disabled_tcp_not_set">UDP 已禁用并且入站 TCP 主机/端口未设置</string>
   <string name="net_status_warn_firewalled_udp_disabled">UDP 已禁用且受防火墙限制</string>
   <string name="shared_clients">共享客户端</string>
   <string name="uptime">上线时间</string>
-  <string name="active_peers">活跃对等端</string>
-  <string name="known_peers">已知对等端</string>
+  <string name="active_peers">活跃节点</string>
+  <string name="known_peers">已知节点</string>
   <!--Character to indicate a client tunnel. Usually first letter of the word "client".-->
   <string name="char_client_tunnel">C</string>
   <!--Character to indicate a server tunnel. Usually first letter of the word "server".-->
@@ -56,13 +56,13 @@
   <string name="configure_browser_title">配置浏览器？</string>
   <string name="configure_browser_for_i2p">您想配置一个浏览器来查看 I2P 站点吗？（您也可以以后再从帮助菜单设置这个）</string>
   <string name="configure_no_doze_title">管理电池优化？</string>
-  <string name="configure_no_doze">I2P 在持续工作时能达到最佳效果。为阻止 Android 在尝试省电时关闭 I2P，您可以将它添加到电池例外名单中。这将大幅提高应用稳定性。\n\n要保持 I2P 在后台运行吗？（推荐）</string>
+  <string name="configure_no_doze">I2P 在持续工作时能达到最佳效果。为阻止 Android 在尝试节省电量时关闭 I2P，您可以将它添加到电池例外名单中。这将大幅提高应用稳定性。\n\n要保持 I2P 在后台运行吗？（推荐）</string>
   <string name="first_start_title">恭喜，I2P 已安装！</string>
-  <string name="first_start_welcome"><b>欢迎使用 I2P！</b>在 I2P 启动和寻找同伴时，请<b>保持耐心</b>。</string>
+  <string name="first_start_welcome"><b>欢迎使用 I2P！</b>在 I2P 启动和寻找节点时，请<b>保持耐心</b>。</string>
   <string name="first_start_read">在您等候时，请阅读发布说明和欢迎页面。</string>
   <string name="first_start_faq">一旦您有了客户端隧道，请<b>看看</b>我们的常见问题解答：</string>
-  <string name="first_start_faq_nonanon">或使用此非匿名链接，如果您不想等待隧道：</string>
-  <string name="first_start_irc">将您的 IRC 客户端引导到 <b>localhost:6668</b> 然后与我们打招呼，就在：</string>
+  <string name="first_start_faq_nonanon">如果您不想等待隧道，可以使用此非匿名链接，：</string>
+  <string name="first_start_irc">将您的 IRC 客户端指向到 <b>localhost:6668</b> 然后与我们打招呼，就在：</string>
   <string name="action_search">搜索</string>
   <string name="action_add">添加</string>
   <string name="action_edit">编辑</string>
@@ -89,32 +89,37 @@
   <string name="graphs_not_ready">图表尚未就绪。请稍候再试。</string>
   <string name="statistics">统计</string>
   <string name="routers">路由器</string>
-  <string name="leasesets">租契集</string>
+  <string name="leasesets">租约集</string>
   <string name="countries">国家</string>
   <string name="country">国家</string>
   <string name="transport">传输</string>
   <string name="versions">版本</string>
   <string name="version">版本</string>
   <string name="count">数量</string>
-  <string name="tname_0">隐身或正在启动</string>
+  <string name="tname_0">隐身模式或正在启动</string>
   <string name="netdb_routers_empty">您的网络库中没有路由器。</string>
-  <string name="netdb_leases_empty">您的网络库中没有赁集。</string>
+  <string name="netdb_leases_empty">您的网络库中没有租约集。</string>
   <string name="notification_status_starting">I2P 正在启动</string>
   <string name="notification_status_restarting">I2P 正在重启</string>
-  <string name="notification_status_waiting">I2P 正在等待一个网络连接</string>
+  <string name="notification_status_waiting">I2P 正在等待网络连接</string>
   <string name="notification_status_starting_after_waiting">网络已连接，I2P 正在启动</string>
   <string name="notification_status_running">I2P 正在运行</string>
   <string name="notification_status_client_ready">客户端隧道已就绪</string>
   <string name="notification_status_client_down">客户端隧道未就绪</string>
-  <string name="notification_status_graceful">正在停止 I2P，剩余 %s</string>
-  <string name="notification_status_stopping">正在停止 I2P</string>
-  <string name="notification_status_stopping_after_net">网络已中断，正在停止 I2P</string>
+  <string name="notification_status_graceful">正在关闭 I2P，剩余 %s</string>
+  <string name="notification_status_stopping">正在关闭 I2P</string>
+  <string name="notification_status_stopping_after_net">网络已中断，正在关闭 I2P</string>
   <string name="notification_status_shutdown_cancelled">关闭已取消</string>
   <string name="notification_status_shutting_down">I2P 正在关闭</string>
   <string name="notification_status_bw">带宽：下行 %1$sBps / 上行 %2$sBps</string>
   <string name="notification_status_peers">节点：%1$d 活动，%2$d 已知</string>
   <string name="notification_status_expl">探索隧道：%1$d/%2$d</string>
   <string name="notification_status_client">客户隧道：%1$d/%2$d</string>
+  <string name="stats_memory">已用内存/最大内存</string>
+  <string name="stats_lag">作业日志</string>
+  <string name="stats_delay">消息延迟</string>
+  <string name="copied_base32_system_notification_title">将B32地址复制到剪贴板</string>
+  <string name="copied_base32_system_notification_body">您的地址已复制到剪贴板上。</string>
   <string name="menu_settings">设置</string>
   <string name="settings_enable">启用</string>
   <string name="settings_desc_subscriptions">订阅 URL</string>
@@ -130,8 +135,8 @@
   <string name="settings_label_hiddenMode">参与</string>
   <string name="settings_desc_hiddenMode">关闭隐身模式</string>
   <string name="settings_label_maxPartTunnels">最大参与隧道数</string>
-  <string name="settings_desc_maxPartTunnels">参与贡献的最大隧道数量(默认=20)</string>
-  <string name="settings_dialog_maxPartTunnels">参与的最大隧道数量</string>
+  <string name="settings_desc_maxPartTunnels">参与中转的最大隧道数量(默认=20)</string>
+  <string name="settings_dialog_maxPartTunnels">参与中转的最大隧道数量</string>
   <string name="settings_label_sharePercent">共享比例</string>
   <string name="settings_desc_sharePercent">共享带宽的最大比例(默认=80%)</string>
   <string name="settings_dialog_sharePercent">共享的带宽比例</string>
@@ -147,14 +152,20 @@
   <string name="settings_label_transports">传输</string>
   <string name="settings_label_maxConns">最大连接数</string>
   <string name="settings_label_i2cp">I2CP 接口</string>
-  <string name="settings_desc_i2cp">允许第三方应用创建隧道（需要路由重启）</string>
+  <string name="settings_desc_i2cp">允许第三方应用程序使用I2CP（需要重新启动路由器）</string>
+  <string name="settings_label_sam">SAM接口</string>
+  <string name="settings_desc_sam">允许第三方应用程序使用SAM（需要重新启动路由器）</string>
+  <string name="settings_confirm_sam">一个应用程序正在试图建立一个SAM连接。</string>
+  <string name="settings_confirm_sam_id">会话名称/ID：</string>
+  <string name="settings_confirm_allow_sam">点按允许</string>
+  <string name="settings_confirm_deny_sam">忽略否认</string>
   <string name="settings_label_exploratory_pool">探索隧道池</string>
   <string name="settings_desc_exploratory_pool">隧道参数</string>
   <string name="settings_label_expl_inbound">入站隧道</string>
   <string name="settings_label_expl_outbound">出站隧道</string>
   <string name="settings_label_expl_length">长度</string>
   <string name="settings_summ_expl_length">%s 跳</string>
-  <string name="settings_desc_expl_length">使用跳点数量</string>
+  <string name="settings_desc_expl_length">跳点数量</string>
   <string name="settings_label_expl_lengthVariance">跳数变化量</string>
   <string name="settings_summ_expl_lengthVariance">%s</string>
   <string name="settings_desc_expl_lengthVariance">随机添加的跳点数量</string>
@@ -164,7 +175,7 @@
   <string name="settings_label_expl_backupQuantity">备用数量</string>
   <string name="settings_summ_expl_backupQuantity">%s 隧道</string>
   <string name="settings_desc_expl_backupQuantity">备用隧道数量</string>
-  <string name="settings_need_transport_enabled">您必须启用至少一个传输</string>
+  <string name="settings_need_transport_enabled">您必须启用至少一种传输</string>
   <string name="settings_router_restart_required">请重新启动 I2P 以应用此更改</string>
   <string name="menu_about">关于</string>
   <string name="about_version">版本:</string>
@@ -172,11 +183,11 @@
   <string name="about_bugs">Bug 和支持:</string>
   <string name="about_helpwanted">需要帮助!</string>
   <string name="about_volunteer">想帮助让本应用变得更好吗？成为 Android 论坛志愿者:</string>
-  <string name="about_donate">想捐钱或比特币来为开发和测试购买更多 Android 设备吗？前往:</string>
+  <string name="about_gitlab">想建议一个功能或修复一个错误吗？ 在Android Gitlab上提出合并请求：</string>
   <string name="menu_help">帮助</string>
   <string name="general">常规</string>
-  <string name="label_router">公网地址</string>
-  <string name="label_private">私网地址</string>
+  <string name="label_router">公共地址簿</string>
+  <string name="label_private">私人地址簿</string>
   <string name="addressbook_is_empty">地址簿是空的</string>
   <string name="addressbook_search_header">%s 找到</string>
   <string name="addressbook_add_wizard_k_name">名称</string>
@@ -233,7 +244,7 @@
   <string name="enabled">已启用</string>
   <string name="i2ptunnel_wizard_desc_name">隧道的名称，隧道列表中的标识。</string>
   <string name="i2ptunnel_wizard_desc_desc">隧道的描述。这是可选的，纯粹提供信息性。</string>
-  <string name="i2ptunnel_wizard_desc_dest">输入这个客户端隧道应该连接到的该服务的 I2P 目的地。这可以是完整的 base 64 目的地密钥，或者您地址簿中的 I2P 主机名。</string>
+  <string name="i2ptunnel_wizard_desc_dest">在这里指定隧道的.i2p地址或目的地（hostname.i2p，b32或b64）。</string>
   <string name="i2ptunnel_wizard_desc_outproxies">如果您知道任何此类型的隧道 (HTTP 或者 SOCKS) 的出口代理，填入它们。用逗号分隔多个代理服务器。</string>
   <string name="i2ptunnel_wizard_desc_target_host">这是您正在运行服务的所在 IP，这通常是在同一台机器上，所以 127.0.0.1 会被自动填写。</string>
   <string name="i2ptunnel_wizard_desc_target_port">这是这项服务接受连接的端口。</string>
@@ -252,7 +263,7 @@
   <string name="auto_start">自动启动</string>
   <string name="tunnel_summ_auto_start">路由器启动时自动启动此隧道。</string>
   <string name="tunnel_cat_ports">本地端口</string>
-  <string name="shared_client">共享客户端</string>
+  <string name="shared_client">共享隧道客户端</string>
   <string name="tunnel_summ_shared_client">使用相同的目的地和隧道为其他客户端共享</string>
   <string name="target_destination">目标目的地</string>
   <string name="persistent_key">持久密钥</string>
@@ -266,8 +277,8 @@
   <string name="outproxies">代理出口</string>
   <string name="ssl_outproxies">SSL 出口代理</string>
   <string name="irc">IRC</string>
-  <string name="enable_dcc">启用 DCC</string>
-  <string name="tunnel_summ_enable_dcc">允许 IRC 客户端使用 DCC</string>
+  <string name="enable_dcc">启用 DCC 聊天直连（危险）</string>
+  <string name="tunnel_summ_enable_dcc">允许 IRC 客户端点对点连接</string>
   <string name="website_domain_name">网站域名</string>
   <string name="target_host">目标主机</string>
   <string name="target_port">目标端口</string>
@@ -356,4 +367,5 @@
   <string name="label_browser_configuration">浏览器配置</string>
   <string name="no_market_app">没有找到应用商店，请手动安装</string>
   <string name="unset">未设置</string>
+  <string name="running_background">I2P正在后台运行</string>
 </resources>

app/src/main/res/values/arrays.xml

@@ -109,28 +109,25 @@
     </string-array>
     <string-array name="recommended_browsers">
         <item>acr.browser.lightning</item>
-        <item>io.github.forkmaintainers.iceraven</item>
+        <item>com.stoutner.privacybrowser.standard</item>
     </string-array>
     <string-array name="recommended_browser_labels">
         <item>Lightning</item>
-        <item>IceRaven(With Extension)</item>
+        <item>Privacy Browser</item>
     </string-array>
     <string-array name="supported_browsers">
-        <item>org.mozilla.firefox</item>
         <item>org.mozilla.fennec_fdroid</item>
-        <item>org.gnu.icecat</item>
     </string-array>
     <string-array name="supported_browser_labels">
-        <item>Firefox</item>
         <item>Fennec F-Droid</item>
-        <item>IceCatMobile</item>
     </string-array>
     <string-array name="unsupported_browsers">
+        <item>org.mozilla.firefox</item>
         <item>com.android.chrome</item>
         <item>com.brave.browser</item>
         <item>com.android.browser</item>
         <item>com.sec.android.app.sbrowser</item>
-        <item>com.stoutner.privacybrowser.standard</item>
+        <item>org.gnu.icecat</item>
         <item>info.guardianproject.browser</item>
         <item>mobi.mgeek.TunnyBrowser</item>
         <item>com.lastpass.lpandroid</item>
@@ -172,4 +169,28 @@
         <item>ECDSA-P521</item>
         <item>Ed25519</item>
     </string-array>
+    <string-array name="speed_increments">
+        <item>100 KB/s</item>
+        <item>200 KB/s</item>
+        <item>300 KB/s</item>
+        <item>400 KB/s</item>
+        <item>500 KB/s</item>
+        <item>600 KB/s</item>
+        <item>700 KB/s</item>
+        <item>800 KB/s</item>
+        <item>900 KB/s</item>
+        <item>1000 KB/s</item>
+    </string-array>
+    <integer-array name="speed_values">
+        <item>100</item>
+        <item>200</item>
+        <item>300</item>
+        <item>400</item>
+        <item>500</item>
+        <item>600</item>
+        <item>700</item>
+        <item>800</item>
+        <item>900</item>
+        <item>1000</item>
+    </integer-array>
 </resources>

app/src/main/res/values/strings.xml

@@ -150,6 +150,10 @@
     <string name="notification_status_expl">Exploratory tunnels: %1$d/%2$d</string>
     <string name="notification_status_client">Client tunnels: %1$d/%2$d</string>
 
+    <string name="stats_memory">Memory used/max</string>
+    <string name="stats_lag">Job Lag</string>
+    <string name="stats_delay">Message Delay</string>
+
     <string name="copied_base32_system_notification_title">Base32 copied to clipboard</string>
     <string name="copied_base32_system_notification_body">The address of your I2P tunnel has been copied to the clipboard.</string>
 
@@ -188,6 +192,10 @@
     <string name="settings_desc_i2cp">Allow third-party apps to create tunnels using I2CP (requires router restart)</string>
     <string name="settings_label_sam">SAM interface</string>
     <string name="settings_desc_sam">Allow third-party apps to create tunnels using SAM (requires router restart)</string>
+    <string name="settings_confirm_sam">An application is trying to make a SAM connection.</string>
+    <string name="settings_confirm_sam_id">Connection Name/ID:</string>
+    <string name="settings_confirm_allow_sam">Tap to allow</string>
+    <string name="settings_confirm_deny_sam">Ignore to deny</string>
     <string name="settings_label_exploratory_pool">Exploratory pool</string>
     <string name="settings_desc_exploratory_pool">Tunnel parameters</string>
     <string name="settings_label_expl_inbound">Inbound tunnels</string>
@@ -290,7 +298,7 @@
 
     <string name="i2ptunnel_wizard_desc_name">The name of the tunnel, for identification in the tunnel list.</string>
     <string name="i2ptunnel_wizard_desc_desc">A description of the tunnel. This is optional and purely informative.</string>
-    <string name="i2ptunnel_wizard_desc_dest">Type in the I2P destination of the service that this client tunnel should connect to. This could be the full base 64 destination key, or an I2P host name from your address book.</string>
+    <string name="i2ptunnel_wizard_desc_dest">Specify the .i2p address or destination (hostname.i2p, b32 or b64) of the tunnel here.</string>
     <string name="i2ptunnel_wizard_desc_outproxies">If you know of any outproxies for this type of tunnel (either HTTP or SOCKS), fill them in. Separate multiple proxies with commas.</string>
     <string name="i2ptunnel_wizard_desc_target_host">This is the IP that your service is running on, this is usually on the same machine so 127.0.0.1 is autofilled.</string>
     <string name="i2ptunnel_wizard_desc_target_port">This is the port that the service is accepting connections on.</string>
@@ -420,5 +428,5 @@
     <string name="no_market_app">No market app found, please install manually</string>
 
     <string name="unset">Unset</string>
-	<string name="running_background">I2P is running in the background</string>
+    <string name="running_background">I2P is running in the background</string>
 </resources>

app/src/main/res/xml/settings_net.xml

@@ -14,26 +14,26 @@
     <PreferenceCategory
         android:key="settings_bandwidth"
         android:title="@string/settings_label_bandwidth">
-    <!--
-    i2np.bandwidth.inboundKBytesPerSecond=100
-    -->
-    <com.pavelsikun.seekbarpreference.SeekBarPreference
-        android:key="@string/PROP_INBOUND_BANDWIDTH"
-        android:title="@string/settings_desc_bw_inbound"
-        app:msbp_defaultValue="100"
-        app:msbp_maxValue="1000"
-        app:msbp_measurementUnit="KB/s"
-        />
-    <!--
-    i2np.bandwidth.outboundKBytesPerSecond=30
-    -->
-    <com.pavelsikun.seekbarpreference.SeekBarPreference
-        android:key="@string/PROP_OUTBOUND_BANDWIDTH"
-        android:title="@string/settings_desc_bw_outbound"
-        app:msbp_defaultValue="100"
-        app:msbp_maxValue="1000"
-        app:msbp_measurementUnit="KB/s"
-        />
+        <!--
+        i2np.bandwidth.inboundKBytesPerSecond=100
+        -->
+        <com.pavelsikun.seekbarpreference.SeekBarPreference
+            android:key="@string/PROP_INBOUND_BANDWIDTH"
+            android:title="@string/settings_desc_bw_inbound"
+            app:msbp_defaultValue="100"
+            app:msbp_maxValue="1000"
+            app:msbp_measurementUnit="KB/s"
+            />
+        <!--
+        i2np.bandwidth.outboundKBytesPerSecond=30
+        -->
+        <com.pavelsikun.seekbarpreference.SeekBarPreference
+            android:key="@string/PROP_OUTBOUND_BANDWIDTH"
+            android:title="@string/settings_desc_bw_outbound"
+            app:msbp_defaultValue="100"
+            app:msbp_maxValue="1000"
+            app:msbp_measurementUnit="KB/s"
+            />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -51,9 +51,9 @@
         android:summary="@string/settings_desc_hiddenMode"
         />
         -->
-    <!--
-    router.maxParticipatingTunnels=0
-    -->
+        <!--
+        router.maxParticipatingTunnels=0
+        -->
         <!--
     <com.hlidskialf.android.preference.SeekBarPreference
         android:key="router.maxParticipatingTunnels"
@@ -66,9 +66,9 @@
         android:dependency="router.hiddenMode"
         />
         -->
-    <!--
-    router.sharePercentage=10
-    -->
+        <!--
+        router.sharePercentage=10
+        -->
         <!--
     <com.hlidskialf.android.preference.SeekBarPreference
         android:key="router.sharePercentage"
@@ -83,15 +83,15 @@
         />
         -->
 
-    <!--
-    i2np.upnp.enable=false
-    -->
-    <CheckBoxPreference
-        android:key="@string/PROP_ENABLE_UPNP"
-        android:defaultValue="true"
-        android:title="UPnP"
-        android:summary="@string/settings_desc_upnp"
-        />
+        <!--
+        i2np.upnp.enable=false
+        -->
+        <CheckBoxPreference
+            android:key="@string/PROP_ENABLE_UPNP"
+            android:defaultValue="true"
+            android:title="UPnP"
+            android:summary="@string/settings_desc_upnp"
+            />
     </PreferenceCategory>
 
 </PreferenceScreen>

build.gradle

@@ -11,11 +11,11 @@ signing {
 buildscript {
     repositories {
         mavenLocal()
-        jcenter()
+        mavenCentral()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:7.3.1'
         classpath 'com.android.tools.lint:lint-gradle:26.1.1'
     }
 }
@@ -26,7 +26,7 @@ allprojects {
 
     repositories {
         mavenLocal()
-        jcenter()
+        mavenCentral()
         google()
     }
 }

gradle.properties

@@ -14,7 +14,10 @@ POM_DEVELOPER_ID=idk
 POM_DEVELOPER_NAME=idk
 POM_DEVELOPER_EMAIL=hankhill19580@gmail.com
 
-ANDROID_BUILD_TARGET_SDK_VERSION=30
-ANDROID_BUILD_SDK_VERSION=28
+ANDROID_BUILD_TARGET_SDK_VERSION=33
+ANDROID_BUILD_SDK_VERSION=33
 
-I2P_VERSION=1.7.0
+I2P_VERSION=2.4.0
+I2P_ANDROID_VERSION=2.4.0
+android.disableAutomaticComponentCreation=true
+android.useAndroidX=true

gradle/maven-push.gradle

@@ -14,7 +14,12 @@
  * limitations under the License.
  */
 
-apply plugin: 'maven'
+
+// TODO: Migrate to something like this that works with Gradle 7.0
+// EITHER: Document how to generate build artifacts, pom files, etc and upload them to Nexus manually
+// OR: Automate the process like was possible when we could still use antique gradle versions
+// I just commented out the old code, surely something must present a similar API?
+//apply plugin: 'maven'
 apply plugin: 'signing'
 
 def isReleaseBuild() {
@@ -39,7 +44,9 @@ def getRepositoryPassword() {
     return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
 }
 
+
 afterEvaluate { project ->
+    /*
     uploadArchives {
         repositories {
             mavenDeployer {
@@ -87,7 +94,9 @@ afterEvaluate { project ->
             }
         }
     }
+    */
 
+    /*
     task installArchives(type: Upload) {
         description "Installs the artifacts to the local Maven repository."
         configuration = configurations['archives']
@@ -101,6 +110,7 @@ afterEvaluate { project ->
             }
         }
     }
+    */
 
     signing {
         required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }

gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip

lib/client/build.gradle

@@ -9,7 +9,7 @@ repositories {
 android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 21
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
     }
     buildTypes {
@@ -19,13 +19,17 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lintOptions {
         abortOnError false
     }
-    buildToolsVersion '28.0.3'
+}
+
+dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
 }
 
 dependencies {

lib/helper/build.gradle

@@ -5,7 +5,7 @@ version = '0.9.5'
 android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 21
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
     }
     buildTypes {
@@ -15,13 +15,13 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
     lintOptions {
         abortOnError false
     }
-    buildToolsVersion '28.0.3'
 }
 
 dependencies {
@@ -33,4 +33,8 @@ dependencies {
     testImplementation 'org.mockito:mockito-core:2.11.0'
 }
 
+dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+}
+
 apply from: "${project.rootDir}/gradle/maven-push.gradle"

lib/helper/src/main/res/values-sl/strings.xml

@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="yes">Da</string>
+  <string name="no">Ne</string>
+  <string name="install_i2p_android">Namesti I2P Android?</string>
+  <string name="you_must_have_i2p_android">Vi morate imeti I2P Android nameščen in zagnan. Bi vi radi ga namestili?</string>
+  <string name="start_i2p_android">Zaženi I2P Android?</string>
+  <string name="would_you_like_to_start_i2p_android">Zgleda, da I2P Android ne teče. Želite ga zagnati?</string>
+</resources>

lib/helper/src/main/res/values-tr/strings.xml

@@ -2,8 +2,8 @@
 <resources>
   <string name="yes">Evet</string>
   <string name="no">Hayır</string>
-  <string name="install_i2p_android">I2P Android Kurulsun mu?</string>
+  <string name="install_i2p_android">I2P Android kurulsun mu?</string>
   <string name="you_must_have_i2p_android">I2P Android uygulaması kurulmuş ve çalışıyor olmalıdır. Kurmak ister misiniz?</string>
-  <string name="start_i2p_android">I2P Android Başlatılsın</string>
+  <string name="start_i2p_android">I2P Android başlatılsın</string>
   <string name="would_you_like_to_start_i2p_android">I2P Android uygulaması çalışmıyor gibi görünüyor. Başlatmak ister misiniz?</string>
 </resources>

lib/helper/src/main/res/values-zh/strings.xml

@@ -5,5 +5,5 @@
   <string name="install_i2p_android">安装 I2P Android？</string>
   <string name="you_must_have_i2p_android">您必须已经安装并运行 I2P Android。您想现在安装它吗？</string>
   <string name="start_i2p_android">启动 I2P Android？</string>
-  <string name="would_you_like_to_start_i2p_android">看起来 I2P Android 未在运行。您想启动它吗？</string>
+  <string name="would_you_like_to_start_i2p_android">看起来 I2P Android 未在运行，您想启动它吗？</string>
 </resources>