Google said no. The 0.9.44 release would be based off this commit instead as it's has the current minimum target sdk.

Revision: 034402ca4ed4243122bd88857c7d306e295c9fbe
  Parent:   9f9a905cf75324471b3a8eb41da2feebf620207c
  Author:   meeh@mail.i2p
  Date:     10/27/2019 15:00:33
  Branch:   i2p.android.base
  Changelog:
  Merged two heads

.tx/config

@@ -4,7 +4,7 @@ lang_map = he: iw, id: in, pt_BR: pt-rBR, ru_RU: ru, sv_SE: sv, tr_TR: tr, uk_UA
 
 [I2P.android]
 file_filter = app/src/main/res/values-<lang>/strings.xml
-minimum_perc = 50
+minimum_perc = 22
 source_file = app/src/main/res/values/strings.xml
 source_lang = en
 type = ANDROID

CHANGELOG

@@ -1,3 +1,60 @@
+0.9.44 / 2019-12-03
+ * Updated translations
+ * Bumped target sdk version to 28, enforced by google
+
+0.9.43-1 / 2019-10-28
+ * Fix crash at startup in TCG
+
+0.9.43 / 2019-10-27
+ * Save state in background thread (tickets #2595, #2632)
+ * Fix ISE in language dialog (ticket #2631)
+ * Fix NPE in create tunnel (ticket #2629)
+ * Update logo after router killed in background
+ * Fix message in tunnels tabs when tunnels not up yet
+ * Hide tunnel actions while TCG is starting
+ * Add battery permissions dialog (ticket #2607)
+
+0.9.42 / 2019-08-28
+ * Possible fix for tunnel edit dialog crash (ticket #2598)
+
+0.9.41 / 2019-07-03
+ * New 64 bit libjbigi (ticket #2503)
+ * Update 32 bit jbigi to GMP 6.1.2
+ * Fix for client tunnels not starting after reseed
+ * UPnP Fixes (ticket #2499)
+ * WebView crash fixes (ticket #2390)
+ * i2ptunnel crash fix (ticket #2552)
+ * i2ptunnel ANR fix (ticket #2491)
+ * Browser help pages improvements (tickets #2521, 2523)
+ * Code cleanups and fixes
+ * Update visibility of floating menu items
+ * Put our router info at top of list
+ * Table layout cleanups
+ * Fixes for threads remaining after router stop
+ * Remove BOB
+ * Remove welterde IRC tunnel
+ * Various lint fixes
+ * New translations: Add cs, da, el
+ * Add missing translations to menu: ar, fi, gl, hu, zh_TW
+
+0.9.40 / 2019-05-10
+ * Open local I2CP socket for 3rd party apps
+ * Fix News URLs
+ * Numerous bug fixes (see trac)
+
+0.9.39 / 2019-03-23
+ * Set App ID
+
+0.9.38 / 2019-01-27
+
+0.9.37 / 2018-10-10
+
+0.9.36 / 2018-08-27
+
+0.9.35 / 2018-07-03
+
+0.9.34 / 2018-04-25
+
 0.9.33 / 2018-02-18
  * Translation updates
 

DEVELOPMENT-README.md

@@ -0,0 +1,11 @@
+# Development Readme
+
+## How to build development builds of the router core for android?
+
+Check the RELEASE-PROCESS.md file for general information about how to build and to bump the version.
+
+In your i2p.i2p codebase checkout, execute `./installer/resources/maven-dev-release.sh` with your build number as first argument.
+The script locates itself and uses the same codebase as it's in, to produce the maven builds which will be locally installed.
+
+Next, add the build number to the gradle.properties and build the android build as usual.
+

README.md

@@ -7,8 +7,8 @@
 - Java SDK (preferably Oracle/Sun or OpenJDK) 1.6.0 or higher
 - Apache Ant 1.8.0 or higher
 - I2P source
-- Android SDK for API 21
-- Android Build Tools 21.1.2
+- Android SDK for API 28 or higher
+- Android Build Tools 28.0.0 or higher
 - Android Support Repository
 - Gradle 2.2.1
 
@@ -67,10 +67,18 @@ systemProp.socksProxyPort=9150
     ```
     sdk.dir=/path/to/android-studio/sdk
     ```
+1a. For building with a local router development build:
+    cd ../i2p.i2p
+    installer/resources/maven-dev-release.sh x // x is the build number, e.g. 6
+    cd back here
+    edit gradle.properties, add the build number x to I2P_PROPERTIES=0.9.xx-x
 
 2. `gradle assembleDebug`
 
-3. The APK will be placed in `i2p.android.base/app/build/outputs/apk`.
+3. The APK files will be placed in `i2p.android.base/app/build/outputs/apk` subdirectories.
+
+4. Install debug build on phone in USB debugging mode
+    adb install app/build/outputs/apk/free/debug/app-free-debug.apk 
 
 ### Building with Android Studio
 

RELEASE-PROCESS.md

@@ -1,25 +1,59 @@
 # Release Process
 
-1. Check out a clean copy of i2p.i2p at the correct release version.
-2. Edit `routerjars/local.properties` to use the clean i2p.i2p copy.
-3. Pull the latest translations with `tx pull -a` and commit them. (If you don't have the `tx` command, do `pip install transifex-client` )
-4. Ensure that `signing.properties` contains the details of the release key.
-5. Edit `gradle.properties` to bump the I2P version.
-6. Edit `app/build.gradle` to bump the Android version number.
+## Prerequirements
+
+1. Ensure you got 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 got hamcrest-integration, hamcrest-library, hamcrest-core in the hamcrest.home directory.
+4. Ensure junit 4.12 at least in junit.home, ensure the jar file is named `junit4.jar`.
+5. Ensure to have updated the changelog with the changes done.
+
+## Maven Central
+
+1. Check out a clean copy of i2p.i2p at the correct release version. (Make a clean checkout)
+2. Build the maven packages via `ant mavenCentral` where you end up with mavencentral-*.jar files in the current directory.
+3. Login to http://oss.sonatype.org for uploading the mavencentral-*.jar bundles.
+4. In nexus, choose "Staging Upload" and upload all of the bundles with upload mode set to "Artifact Bundle"
+5. Under "Staging Repositories" ensure all where uploaded correctly, select them all and press "Release" in the toolbar.
+
+## Android Common Build
+
+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, do `pip install transifex-client` )
+2a. 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)
+3. Ensure that `signing.properties` contains the details of the release key.
+4. Edit `gradle.properties` to bump the I2P version.
+5. Edit `app/build.gradle` to bump the Android version number.
+6. Edit `CHANGELOG` to add the release and date.
 7. If the helper has changed since the last release, edit
    `lib/helper/gradle.properties` to bump the version.
 8. `./gradlew clean assembleRelease`
-9. `./gradlew :lib:client:uploadArchives`
-10. If the helper version was changed: `./gradlew :lib:helper:uploadArchives`
-11. Check on Sonatype that everything worked, and close/release.
-12. Update local fdroidserver repo
-13. `cp app/build/outputs/apk/free/release/app-free-release.apk path/to/fdroid/repo/I2P-VERSION.apk`
-14. Update `path/to/fdroid/metadata/net.i2p.android.txt`
-15. `fdroid update`
-16. Push to download server and put in place.
-17. Check F-Droid repo works, and app works.
-18. `mtn ci gradle.properties lib/helper/gradle.properties app/build.gradle`
-19. Push free and donate builds to Google Play.
-20. Tag the new release. Example `mtn tag h: android-0.9.36`
 
+### Libraries
+
+1. `./gradlew :lib:client:uploadArchives`
+2. If the helper version was changed and should be released: `./gradlew :lib:helper:uploadArchives`
+3. Check on Sonatype that everything worked, and close/release.
+
+## F-Droid Guide
+
+1. Ensure you have the release keys, the keyfile must be placed at `~/.local/share/fdroidserver/keystore.jks`
+2. If it's the first time, or you have reinstalled anything, ensure `path/to/fdroid/config.py` has correct information.
+3. Assuming you already have ran `./gradlew clean assembleRelease` from a earlier step, continue.
+4. `cp app/build/outputs/apk/free/release/app-free-release.apk path/to/fdroid/repo/I2P-VERSION.apk`
+5. Update `path/to/fdroid/metadata/net.i2p.android.txt` (The versions at the bottom of the file)
+6. Run `fdroid update` from inside the fdroid path (install fdroid command via `pip install fdroidserver`)
+7. Zip/tar the local fdroid repo and archive. `rm fdroid.tgz && tar czf fdroid.tgz archive/ repo/` from the fdroid directory.
+8. Push to download server and put in place. (via SSH for example, `scp fdroid.tgz download.i2p2.de:~/`)
+9. On the server run `bin-fd/update-fdroid` and `sudo bin-fd/update-app i2p 0.9.40` (This ensures we use the exact same apk file for the download page as in fdroid and gplay)
+10. Check F-Droid repo works, and app works.
+
+## Google Play and finishing up
+
+1. Verify which files that are changed via `mtn ls cha`. It shouldn't be much more than those bellow this line and possible translations (`mtn ls unk`).
+2. Commit your release changes, `mtn ci gradle.properties lib/helper/gradle.properties app/build.gradle`
+3. Push free and donate builds to Google Play via https://play.google.com/apps/publish/
+4. Tag the new release. Example `mtn tag h: android-0.9.36`
+5. Push the monotone changes
+6. Update download page (version and hash, including F-Droid)
 

app/build.gradle

@@ -1,9 +1,13 @@
 apply plugin: 'com.android.application'
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
 
 android {
-    compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
+    compileSdkVersion 28
     defaultConfig {
-        versionCode 4745247
+        versionCode 4745253
         versionName "$I2P_VERSION"
         minSdkVersion 14
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
@@ -73,10 +77,13 @@ dependencies {
     implementation 'com.inkapplications.viewpageindicator:library:2.4.4'
     implementation 'com.pnikosis:materialish-progress:1.7'
     implementation "net.i2p:router:$I2P_VERSION"
+    implementation "net.i2p:i2p:$I2P_VERSION"
+    implementation "net.i2p.client:mstreaming:$I2P_VERSION"
+    implementation "net.i2p.client:streaming:$I2P_VERSION"
     implementation 'net.i2p.android.ext:floatingactionbutton:1.10.1'
     implementation 'org.sufficientlysecure:html-textview:3.1'
     // Testing-only dependencies
-    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2') {
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2') {
         exclude group: 'com.android.support', module: 'support-annotations'
     }
 }

app/src/main/AndroidManifest.xml

@@ -11,6 +11,14 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <!-- following two are for UPnP -->
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
+    <!-- required for reliable core functionality on Android, see:
+    https://geti2p.net/en/docs/applications/embedding
+    heading: "Design for and Encourage Long Uptimes"
+    -->
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
 
     <application
         android:icon="@drawable/ic_launcher_itoopie"

app/src/main/java/android/support/v4/view/CustomViewPager.java

@@ -31,6 +31,13 @@ public class CustomViewPager extends ViewPager {
 
     @Override
     public boolean onInterceptTouchEvent(MotionEvent event) {
+        // See Nov. 20, 2013 comment at:
+        // https://github.com/JakeWharton/ViewPagerIndicator/pull/257
+        // Our ticket #2488
+
+        // prevent NPE if fake dragging and touching ViewPager
+        if(isFakeDragging()) return false;
+
         return mEnabled && mFixedPage < 0 && super.onInterceptTouchEvent(event);
     }
 

app/src/main/java/com/pavelsikun/seekbarpreference/MaterialSeekBarController.java

@@ -125,7 +125,8 @@ public class MaterialSeekBarController implements SeekBar.OnSeekBarChangeListene
     }
 
     private void setPaddedValue(int value) {
-        mSeekBarValue.setText(String.format("%0" + mMaxDigits +"d", value));
+        //mSeekBarValue.setText(String.format("%0" + mMaxDigits +"d", value));
+        mSeekBarValue.setText(String.format("%" + mMaxDigits +"d", value));
     }
 
 

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

@@ -5,6 +5,8 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.Locale;
+
 import net.i2p.I2PAppContext;
 import net.i2p.data.DataHelper;
 import net.i2p.util.EepGet;
@@ -83,7 +85,7 @@ public class EepGetFetcher implements EepGet.StatusListener {
         int semi = rv.indexOf(";");
         if (semi > 0)
             rv = rv.substring(0, semi);
-        return rv.toLowerCase();
+        return rv.toLowerCase(Locale.US);
     }
 
     /**

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

@@ -5,6 +5,10 @@ import android.content.Context;
 import net.i2p.android.router.NewsActivity;
 import net.i2p.android.router.R;
 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.DataHelper;
 import net.i2p.router.RouterContext;
@@ -13,6 +17,7 @@ import net.i2p.router.news.NewsMetadata;
 import net.i2p.router.news.NewsXMLParser;
 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;
@@ -32,8 +37,11 @@ import java.util.List;
 /**
  * From router console, simplified since we don't deal with router versions
  * or updates.
+ *
+ * As of 0.9.41, implements ClientApp to hang us off the ClientAppManager,
+ * so we can remove the static reference.
  */
-public class NewsFetcher implements Runnable, EepGet.StatusListener {
+public class NewsFetcher implements Runnable, EepGet.StatusListener, ClientApp {
     private final Context mCtx;
     private final RouterContext _context;
     private final Notifications _notif;
@@ -44,20 +52,18 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
     private boolean _invalidated;
     private File _newsFile;
     private File _tempFile;
-    private static NewsFetcher _instance;
     private volatile boolean _isRunning = true;
     private Thread _thread;
+    private final ClientAppManager _mgr;
+    private volatile ClientAppState _state = UNINITIALIZED;
+    public static final String APP_NAME = "NewsFetcher";
 
-    public static /*final */ NewsFetcher getInstance() {
-        return _instance;
-    }
-
+    /**
+     *  As of 0.9.41, returns a new one every time. Only call once.
+     */
     public static /* final */ synchronized NewsFetcher getInstance(
             Context context, RouterContext ctx, Notifications notif) {
-        if (_instance != null)
-            return _instance;
-        _instance = new NewsFetcher(context, ctx, notif);
-        return _instance;
+        return new NewsFetcher(context, ctx, notif);
     }
 
     private static final String NEWS_DIR = "docs";
@@ -71,18 +77,17 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
      *
      * @since 0.7.14 not configurable
      */
-    private static final String BACKUP_NEWS_URL_SU3 = "http://avviiexdngd32ccoy4kuckvc3mkf53ycvzbz6vz75vzhv4tbpk5a.b32.i2p/news.su3";
+    private static final String BACKUP_NEWS_URL_SU3 = "http://dn3tvalnjz432qkqsvpfdqrwpqkw3ye4n4i2uyfr4jexvo3sp5ka.b32.i2p/news/news.su3";
     private static final String PROP_LAST_CHECKED = "router.newsLastChecked";
     private static final String PROP_REFRESH_FREQUENCY = "router.newsRefreshFrequency";
     private static final String DEFAULT_REFRESH_FREQUENCY = 24 * 60 * 60 * 1000 + "";
     private static final String PROP_NEWS_URL = "router.newsURL";
-    public static final String DEFAULT_NEWS_URL_SU3 = "http://echelon.i2p/news/news.su3";
+    public static final String DEFAULT_NEWS_URL_SU3 = "http://tc73n4kivdroccekirco7rhgxdg5f3cjvbaapabupeyzrqwv5guq.b32.i2p/news.su3";
 
     private NewsFetcher(Context context, RouterContext ctx, Notifications notif) {
         mCtx = context;
         _context = ctx;
         _notif = notif;
-        _context.addShutdownTask(new Shutdown());
         _log = ctx.logManager().getLog(NewsFetcher.class);
         try {
             String last = ctx.getProperty(PROP_LAST_CHECKED);
@@ -96,6 +101,9 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
         _newsFile = new File(newsDir, NEWS_FILE);
         _tempFile = new File(_context.getTempDir(), TEMP_NEWS_FILE);
         updateLastFetched();
+        _mgr = ctx.clientAppManager();
+        changeState(INITIALIZED);
+        _mgr.register(this);
     }
 
     private void updateLastFetched() {
@@ -134,7 +142,17 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
     private static final long RUN_DELAY = 30 * 60 * 1000;
 
     public void run() {
-        _thread = Thread.currentThread();
+        changeState(RUNNING);
+        try {
+            run2();
+        } finally {
+            _mgr.unregister(this);
+            changeState(STOPPED);
+        }
+    }
+
+
+    private void run2() {
         try {
             Thread.sleep(INITIAL_DELAY);
         } catch (InterruptedException ie) {
@@ -276,14 +294,6 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
     public void attempting(String url) {
     }
 
-    private class Shutdown implements Runnable {
-        public void run() {
-            _isRunning = false;
-            if (_thread != null)
-                _thread.interrupt();
-        }
-    }
-
     //
     // SU3 handlers
     //
@@ -417,4 +427,69 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
             } catch (IOException ioe) {}
         }
     }
+
+    ////// begin ClientApp interface
+
+    /**
+     *  @since 0.9.41
+     */
+    public synchronized void startup() {
+        changeState(STARTING);
+        _thread = new I2PAppThread(this, "NewsFetcher", true);
+        _thread.start();
+    }
+
+    /**
+     *  @since 0.9.41
+     */
+    public synchronized void shutdown(String[] args) {
+        if (_state != RUNNING)
+            return;
+        changeState(STOPPING);
+        _isRunning = false;
+        if (_thread != null)
+            _thread.interrupt();
+        changeState(STOPPED);
+    }
+
+    /**
+     *  @since 0.9.41
+     */
+    public ClientAppState getState() {
+        return _state;
+    }
+
+    /**
+     *  @since 0.9.41
+     */
+    public String getName() {
+        return APP_NAME;
+    }
+
+    /**
+     *  @since 0.9.41
+     */
+    public String getDisplayName() {
+        return APP_NAME;
+    }
+
+    ////// end ClientApp interface
+    ////// begin ClientApp helpers
+
+    /**
+     *  @since 0.9.41
+     */
+    private void changeState(ClientAppState state) {
+        changeState(state, null);
+    }
+
+    /**
+     *  @since 0.9.41
+     */
+    private synchronized void changeState(ClientAppState state, Exception e) {
+        _state = state;
+        _mgr.notify(this, state, null, e);
+    }
+
+    ////// end ClientApp helpers
 }

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

@@ -1,19 +1,26 @@
 package net.i2p.android.help;
 
+import android.content.Context;
+import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.graphics.drawable.Drawable;
+import android.net.Uri;
 import android.support.annotation.NonNull;
 
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
 public class Browser implements Comparable<Browser> {
     public final String packageName;
     public final CharSequence label;
     public final Drawable icon;
-    public final boolean isInstalled;
     public final boolean isKnown;
     public final boolean isSupported;
     public final boolean isRecommended;
 
+    private boolean isInstalled;
     /**
      * A browser that we don't know about.
      *
@@ -80,4 +87,23 @@ public class Browser implements Comparable<Browser> {
         } else
             return 2;
     }
+
+    public boolean isInstalled(Context context){
+        if (isInstalled) {
+            return true;
+        }
+        // Find all installed browsers that listen for ".i2p"
+        Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse("http://stats.i2p"));
+
+        final PackageManager pm = context.getPackageManager();
+        List<ResolveInfo> installedBrowsers = pm.queryIntentActivities(intent, 0);
+        for (ResolveInfo browser : installedBrowsers) {
+            if (browser.activityInfo.packageName.equals(packageName)) {
+                isInstalled = true;
+                break;
+            }
+        }
+        return isInstalled;
+    }
 }

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

@@ -73,11 +73,15 @@ public class BrowserAdapter extends RecyclerView.Adapter<BrowserAdapter.ViewHold
         holder.mLabel.setText(browser.label);
 
         if (browser.isKnown) {
-            if (browser.isRecommended && browser.isInstalled) {
+            if (browser.isRecommended && browser.isInstalled(mCtx)) {
                 holder.mStatus.setImageDrawable(
                         mCtx.getResources().getDrawable(R.drawable.ic_stars_white_24dp));
                 holder.mStatus.setVisibility(View.VISIBLE);
-            } else if (browser.isSupported && !browser.isInstalled) {
+            } else if (browser.isSupported && browser.isInstalled(mCtx)) {
+                holder.mStatus.setImageDrawable(
+                        mCtx.getResources().getDrawable(R.drawable.ic_stars_white_24dp));
+                holder.mStatus.setVisibility(View.INVISIBLE);
+            } else if (browser.isSupported && !browser.isInstalled(mCtx)) {
                 holder.mStatus.setImageDrawable(
                         mCtx.getResources().getDrawable(R.drawable.ic_shop_white_24dp));
                 holder.mStatus.setOnClickListener(new View.OnClickListener() {
@@ -94,7 +98,7 @@ public class BrowserAdapter extends RecyclerView.Adapter<BrowserAdapter.ViewHold
                     }
                 });
                 holder.mStatus.setVisibility(View.VISIBLE);
-            } else if (!browser.isSupported) {
+            } else if (browser.isInstalled(mCtx) && !browser.isSupported) {
                 // Make the icon gray-scale to show it is unsupported
                 ColorMatrix matrix = new ColorMatrix();
                 matrix.setSaturation(0);

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

@@ -26,6 +26,8 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
 import java.util.List;
 import java.util.Map;
 
@@ -121,8 +123,9 @@ public class BrowserListFragment extends Fragment implements
             intent.setData(Uri.parse("http://stats.i2p"));
 
             final PackageManager pm = getContext().getPackageManager();
-            List<ResolveInfo> installedBrowsers = pm.queryIntentActivities(intent, 0);
+            Set<ResolveInfo> installedBrowsers = new HashSet<>(pm.queryIntentActivities(intent, 0));
 
+            // Compare installed browsers to supported browsers
             for (ResolveInfo browser : installedBrowsers) {
                 if (recommended.contains(browser.activityInfo.packageName)) {
                     browsers.add(new Browser(pm, browser, true, true));

app/src/main/java/net/i2p/android/i2ptunnel/TunnelDetailFragment.java

@@ -81,7 +81,7 @@ public class TunnelDetailFragment extends Fragment {
         try {
             mGroup = TunnelControllerGroup.getInstance();
             error = mGroup == null ? getResources().getString(R.string.i2ptunnel_not_initialized) : null;
-            controllers = mGroup.getControllers();
+            controllers = mGroup == null ? null : mGroup.getControllers();
         } catch (IllegalArgumentException iae) {
             mGroup = null;
             controllers = null;

app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntry.java

@@ -20,6 +20,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
+/**
+ *  A single tunnel.
+ *  Stored by the TunnelEntryAdapter.
+ */
 public class TunnelEntry {
     public static final int RUNNING = 1;
     public static final int STARTING = 2;
@@ -31,6 +35,7 @@ public class TunnelEntry {
     private final int mId;
 
     /**
+     * @param tcg non-null
      * @return the new TunnelEntry, or null if there was an error.
      */
     public static TunnelEntry createNewTunnel(

app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntryAdapter.java

@@ -14,13 +14,20 @@ import android.widget.TextView;
 import net.i2p.android.router.R;
 import net.i2p.android.util.FragmentUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
+/**
+ *  Contains the List of TunnelEntries.
+ *  There's two of these, one for client tunnels and
+ *  one for server tunnels.
+ *  Created by the TunnelListFragment.
+ */
 public class TunnelEntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-    private Context mCtx;
-    private boolean mClientTunnels;
-    private TunnelListFragment.OnTunnelSelectedListener mListener;
-    private FragmentUtils.TwoPaneProvider mTwoPane;
+    private final Context mCtx;
+    private final boolean mClientTunnels;
+    private final TunnelListFragment.OnTunnelSelectedListener mListener;
+    private final FragmentUtils.TwoPaneProvider mTwoPane;
     private List<TunnelEntry> mTunnels;
     /**
      * The current activated item position. Only used on tablets.
@@ -34,10 +41,10 @@ public class TunnelEntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
     }
 
     public static class TunnelViewHolder extends RecyclerView.ViewHolder {
-        public ImageView status;
-        public TextView name;
-        public TextView description;
-        public TextView interfacePort;
+        public final ImageView status;
+        public final TextView name;
+        public final TextView description;
+        public final TextView interfacePort;
 
         public TunnelViewHolder(View itemView) {
             super(itemView);
@@ -65,6 +72,8 @@ public class TunnelEntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
     }
 
     public void addTunnel(TunnelEntry tunnel) {
+        if (mTunnels == null)
+            mTunnels = new ArrayList<TunnelEntry>();
         boolean wasEmpty = mTunnels.isEmpty();
         mTunnels.add(tunnel);
         if (wasEmpty) {
@@ -126,7 +135,7 @@ public class TunnelEntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
         switch (holder.getItemViewType()) {
             case R.string.router_not_running:
                 ((TextView) holder.itemView).setText(
-                        mCtx.getString(R.string.router_not_running));
+                        mCtx.getString(R.string.i2ptunnel_not_initialized));
                 break;
 
             case R.layout.listitem_empty:
@@ -155,6 +164,16 @@ public class TunnelEntryAdapter extends RecyclerView.Adapter<RecyclerView.ViewHo
                 tvh.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View view) {
+                        // TODO
+                        // lint priority 8/10
+                        // lint: Do not treat position as fixed; only use immediately and call holder.getAdapterPosition() to look it up later
+                        // javadocs: Note that unlike ListView, RecyclerView will not call this method again
+                        // if the position of the item changes in the data set unless the item itself is invalidated
+                        // or the new position cannot be determined.
+                        // For this reason, you should only use the position parameter while acquiring
+                        // the related data item inside this method and should not keep a copy of it.
+                        // If you need the position of an item later on (e.g. in a click listener),
+                        // use RecyclerView.ViewHolder.getAdapterPosition() which will have the updated adapter position.
                         int oldPosition = mActivatedPosition;
                         mActivatedPosition = position;
                         notifyItemChanged(oldPosition);

app/src/main/java/net/i2p/android/i2ptunnel/TunnelEntryLoader.java

@@ -13,10 +13,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class TunnelEntryLoader extends AsyncTaskLoader<List<TunnelEntry>> {
-    private TunnelControllerGroup mGroup;
-    private boolean mClientTunnels;
+    private final TunnelControllerGroup mGroup;
+    private final boolean mClientTunnels;
     private List<TunnelEntry> mData;
-    private Handler mHandler;
+    private final Handler mHandler;
     private TunnelControllerMonitor mMonitor;
 
     public TunnelEntryLoader(Context context, TunnelControllerGroup tcg, boolean clientTunnels) {

app/src/main/java/net/i2p/android/i2ptunnel/TunnelListFragment.java

@@ -31,6 +31,12 @@ import net.i2p.i2ptunnel.TunnelControllerGroup;
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ *  The list of tunnels.
+ *  There's two of these, one for client tunnels and
+ *  one for server tunnels.
+ *  Creates the TunnelEntryAdapter.
+ */
 public class TunnelListFragment extends Fragment implements
         LoaderManager.LoaderCallbacks<List<TunnelEntry>> {
     public static final String SHOW_CLIENT_TUNNELS = "show_client_tunnels";

app/src/main/java/net/i2p/android/i2ptunnel/TunnelsContainer.java

@@ -33,6 +33,11 @@ import net.i2p.router.RouterContext;
 
 import java.util.List;
 
+/**
+ *  The top level Fragment of the tunnels tabs.
+ *  Creates client and server TunnelListFragments,
+ *  the options menu, and the new tunnel wizard button.
+ */
 public class TunnelsContainer extends Fragment implements
         FragmentUtils.TwoPaneProvider,
         TunnelListFragment.OnTunnelSelectedListener,
@@ -65,12 +70,11 @@ public class TunnelsContainer extends Fragment implements
         setHasOptionsMenu(true);
     }
 
-    private boolean showActions() {
+    private static boolean showActions() {
         RouterContext rCtx = Util.getRouterContext();
         TunnelControllerGroup tcg = TunnelControllerGroup.getInstance();
         return rCtx != null && tcg != null &&
-                (tcg.getState() == ClientAppState.STARTING ||
-                        tcg.getState() == ClientAppState.RUNNING);
+               tcg.getState() == ClientAppState.RUNNING;
     }
 
     @Override
@@ -211,8 +215,17 @@ public class TunnelsContainer extends Fragment implements
         if (requestCode == TUNNEL_WIZARD_REQUEST) {
             if (resultCode == Activity.RESULT_OK) {
                 Bundle tunnelData = data.getExtras().getBundle(TUNNEL_WIZARD_DATA);
+                // ticket #2483
+                if (tunnelData == null)
+                    return;
                 // TODO fetch earlier
                 TunnelControllerGroup tcg = TunnelControllerGroup.getInstance();
+                if (tcg == null) {
+                    // router went away
+                    Toast.makeText(getActivity().getApplicationContext(),
+                                   R.string.router_not_running, Toast.LENGTH_LONG).show();
+                    return;
+                }
                 TunnelConfig cfg = TunnelUtil.createConfigFromWizard(getActivity(), tcg, tunnelData);
                 TunnelEntry tunnel = TunnelEntry.createNewTunnel(getActivity(), tcg, cfg);
 

app/src/main/java/net/i2p/android/i2ptunnel/preferences/BaseTunnelPreferenceFragment.java

@@ -16,6 +16,9 @@ import net.i2p.i2ptunnel.TunnelControllerGroup;
 import net.i2p.i2ptunnel.ui.TunnelConfig;
 
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.TimeUnit;
 
 public abstract class BaseTunnelPreferenceFragment extends CustomPreferenceFragment {
     protected static final String ARG_TUNNEL_ID = "tunnelId";
@@ -88,11 +91,15 @@ public abstract class BaseTunnelPreferenceFragment extends CustomPreferenceFragm
                 // TODO: There used to be a possible ANR here, because the underlying I2P code
                 // checks if the session is open as part of updating its config. We may need to save
                 // completely asynchronously (and ensure we do actually save before the app closes).
-                task.execute().get();
+                task.execute().get(2, TimeUnit.SECONDS);
             } catch (InterruptedException e) {
                 Util.e("Interrupted while saving tunnel config", e);
             } catch (ExecutionException e) {
                 Util.e("Error while saving tunnel config", e);
+            } catch (CancellationException e) {
+                Util.e("Cancelled while saving tunnel config", e);
+            } catch (TimeoutException e) {
+                Util.e("Timed out while savomg tunnel config", e);
             }
         }
     }

app/src/main/java/net/i2p/android/i2ptunnel/util/SaveTunnelTask.java

@@ -15,9 +15,9 @@ import java.util.List;
  * InetAddress.getByName(), which will trigger a NetworkOnMainThreadException otherwise.
  */
 public class SaveTunnelTask  extends AsyncTask<Void, Void, List<String>> {
-    TunnelControllerGroup mGroup;
-    int mTunnelId;
-    TunnelConfig mCfg;
+    final TunnelControllerGroup mGroup;
+    final int mTunnelId;
+    final TunnelConfig mCfg;
 
     public SaveTunnelTask(TunnelControllerGroup group, int tunnelId, TunnelConfig cfg) {
         mGroup = group;

app/src/main/java/net/i2p/android/i2ptunnel/util/TunnelLogic.java

@@ -11,7 +11,7 @@ package net.i2p.android.i2ptunnel.util;
  * tunnel properties always exist.
  */
 public abstract class TunnelLogic {
-    protected String mType;
+    protected final String mType;
 
     public TunnelLogic(String type) {
         mType = type;

app/src/main/java/net/i2p/android/i2ptunnel/util/TunnelUtil.java

@@ -7,6 +7,7 @@ import android.os.Bundle;
 
 import net.i2p.I2PAppContext;
 import net.i2p.android.router.R;
+import net.i2p.android.router.util.Util;
 import net.i2p.android.wizard.model.Page;
 import net.i2p.i2ptunnel.TunnelController;
 import net.i2p.i2ptunnel.TunnelControllerGroup;
@@ -99,6 +100,7 @@ public class TunnelUtil extends GeneralHelper {
     public static void writeTunnelToPreferences(Context ctx, TunnelControllerGroup tcg, int tunnel) {
         new TunnelUtil(tcg).writeTunnelToPreferences(ctx, tunnel);
     }
+
     public void writeTunnelToPreferences(Context ctx, int tunnel) {
         Resources res = ctx.getResources();
 
@@ -122,9 +124,9 @@ public class TunnelUtil extends GeneralHelper {
     }
 
     class TunnelToPreferences extends TunnelLogic {
-        SharedPreferences.Editor ed;
-        Resources res;
-        int tunnel;
+        final SharedPreferences.Editor ed;
+        final Resources res;
+        final int tunnel;
 
         public TunnelToPreferences(SharedPreferences.Editor ed, Resources res, int tunnel, String type) {
             super(type);
@@ -328,6 +330,7 @@ public class TunnelUtil extends GeneralHelper {
     public static TunnelConfig createConfigFromPreferences(Context ctx, TunnelControllerGroup tcg, int tunnel) {
         return new TunnelUtil(tcg).createConfigFromPreferences(ctx, tunnel);
     }
+
     public TunnelConfig createConfigFromPreferences(Context ctx, int tunnel) {
         Resources res = ctx.getResources();
 
@@ -348,11 +351,11 @@ public class TunnelUtil extends GeneralHelper {
     }
 
     class TunnelConfigFromPreferences extends TunnelLogic {
-        TunnelConfig cfg;
-        SharedPreferences prefs;
-        Resources res;
-        TunnelControllerGroup tcg;
-        int tunnel;
+        final TunnelConfig cfg;
+        final SharedPreferences prefs;
+        final Resources res;
+        final TunnelControllerGroup tcg;
+        final int tunnel;
 
         public TunnelConfigFromPreferences(TunnelConfig cfg, SharedPreferences prefs, Resources res,
                                            TunnelControllerGroup tcg, int tunnel, String type) {
@@ -566,10 +569,17 @@ public class TunnelUtil extends GeneralHelper {
         }
     }
 
+    /**
+     *  @param data non-null
+     */
     public static TunnelConfig createConfigFromWizard(
             Context ctx, TunnelControllerGroup tcg, Bundle data) {
         return new TunnelUtil(tcg).createConfigFromWizard(ctx, data);
     }
+
+    /**
+     *  @param data non-null
+     */
     public TunnelConfig createConfigFromWizard(Context ctx, Bundle data) {
         // Get the Bundle keys
         Resources res = ctx.getResources();
@@ -580,21 +590,26 @@ public class TunnelUtil extends GeneralHelper {
         // Update the TunnelConfig from the tunnel wizard settings
         String kClientServer = res.getString(R.string.i2ptunnel_wizard_k_client_server);
         String kType = res.getString(R.string.i2ptunnel_wizard_k_type);
-        String clientServer = data.getBundle(kClientServer).getString(Page.SIMPLE_DATA_KEY);
-        String typeName = data.getBundle(clientServer + ":" + kType).getString(Page.SIMPLE_DATA_KEY);
-        String type = getTypeFromName(typeName, ctx);
-        cfg.setType(type);
+        try {
+            String clientServer = data.getBundle(kClientServer).getString(Page.SIMPLE_DATA_KEY);
+            String typeName = data.getBundle(clientServer + ":" + kType).getString(Page.SIMPLE_DATA_KEY);
+            String type = getTypeFromName(typeName, ctx);
+            cfg.setType(type);
+
+            new TunnelConfigFromWizard(cfg, data, res, _group, type).runLogic();
+        } catch (NullPointerException ex) {
+            Util.e("Exception while trying to create config from wizard: "+ex.getMessage());
+        }
 
-        new TunnelConfigFromWizard(cfg, data, res, _group, type).runLogic();
 
         return cfg;
     }
 
     class TunnelConfigFromWizard extends TunnelLogic {
-        TunnelConfig cfg;
-        Bundle data;
-        Resources res;
-        TunnelControllerGroup tcg;
+        final TunnelConfig cfg;
+        final Bundle data;
+        final Resources res;
+        final TunnelControllerGroup tcg;
 
         public TunnelConfigFromWizard(TunnelConfig cfg, Bundle data, Resources res,
                                            TunnelControllerGroup tcg, String type) {

app/src/main/java/net/i2p/android/preferences/AdvancedPreferenceFragment.java

@@ -3,12 +3,11 @@ package net.i2p.android.preferences;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
 
 import net.i2p.android.router.R;
 import net.i2p.android.router.SettingsActivity;
 
-public class AdvancedPreferenceFragment extends PreferenceFragmentCompat {
+public class AdvancedPreferenceFragment extends I2PreferenceFragment {
     private static final String PREFERENCE_CATEGORY_TRANSPORTS = "preference_category_transports";
     private static final String PREFERENCE_CATEGORY_EXPL_TUNNELS = "preference_category_expl_tunnels";
 

app/src/main/java/net/i2p/android/preferences/TransportsPreferenceFragment.java

@@ -1,5 +1,6 @@
 package net.i2p.android.preferences;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -30,6 +31,7 @@ public class TransportsPreferenceFragment extends I2PreferenceFragment {
         ((SettingsActivity) getActivity()).getSupportActionBar().setTitle(R.string.settings_label_transports);
     }
 
+    @SuppressLint("ApplySharedPref")
     private void loadProperties() {
         Context context= getActivity();
         RouterContext ctx = Util.getRouterContext();

app/src/main/java/net/i2p/android/preferences/util/IntListPreference.java

@@ -20,7 +20,7 @@ public class IntListPreference extends ListPreference {
                 getPersistedInt(0);
             } catch (ClassCastException e) {
                 // Fix for where this preference was previously stored in a ListPreference
-                getSharedPreferences().edit().remove(getKey()).commit();
+                getSharedPreferences().edit().remove(getKey()).apply();
             }
         }
 

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

@@ -12,6 +12,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import net.i2p.android.ext.floatingactionbutton.FloatingActionsMenu;
+import net.i2p.android.ext.floatingactionbutton.FloatingActionsMenu.OnFloatingActionsMenuUpdateListener;
 import net.i2p.android.router.dialog.AboutDialog;
 import net.i2p.android.router.dialog.TextResourceDialog;
 import net.i2p.android.router.log.LogActivity;
@@ -42,6 +43,17 @@ public class ConsoleContainer extends Fragment {
         }
 
         mConsoleMenu = (FloatingActionsMenu) v.findViewById(R.id.console_action_menu);
+        // update visibility based on router state
+        mConsoleMenu.setOnFloatingActionsMenuUpdateListener(new OnFloatingActionsMenuUpdateListener() {
+            public void onMenuExpanded() {
+                // this is called after the animation starts, sadly
+                setMenuVisibility();
+            }
+            public void onMenuCollapsed() {
+                // call it here too so the expand animation isn't glitchy as often
+                setMenuVisibility();
+            }
+        });
         mConsoleMenu.findViewById(R.id.action_news).setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

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

@@ -1,15 +1,19 @@
 package net.i2p.android.router;
 
 import android.app.Activity;
+import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.graphics.Typeface;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.PowerManager;
 import android.preference.PreferenceManager;
+import android.provider.Settings;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v7.app.AlertDialog;
 import android.view.Gravity;
@@ -69,6 +73,7 @@ public class MainFragment extends I2PFragmentBase {
     private TextView vAdvStatusText;
 
     private static final String PREF_CONFIGURE_BROWSER = "app.dialog.configureBrowser";
+    private static final String PREF_CONFIGURE_BATTERY = "app.dialog.configureBattery";
     private static final String PREF_FIRST_START = "app.router.firstStart";
     private static final String PREF_SHOW_STATS = "i2pandroid.main.showStats";
     protected static final String PROP_NEW_INSTALL = "i2p.newInstall";
@@ -320,7 +325,10 @@ public class MainFragment extends I2PFragmentBase {
         }
     }
 
-    public void updateState(State newState) {
+    /**
+     *  Changes the logo based on the state.
+     */
+    private void updateState(State newState) {
         if (newState == State.INIT ||
                 newState == State.STOPPED ||
                 newState == State.MANUAL_STOPPED ||
@@ -328,13 +336,13 @@ public class MainFragment extends I2PFragmentBase {
                 newState == State.NETWORK_STOPPED) {
             mConsoleLights.setImageResource(R.drawable.routerlogo_0);
         } else if (newState == State.STARTING ||
-                //newState == State.GRACEFUL_SHUTDOWN || // Don't change lights for graceful
                 newState == State.STOPPING ||
                 newState == State.MANUAL_STOPPING ||
                 newState == State.MANUAL_QUITTING ||
                 newState == State.NETWORK_STOPPING) {
             mConsoleLights.setImageResource(R.drawable.routerlogo_1);
-        } else if (newState == State.RUNNING) {
+        } else if (newState == State.RUNNING ||
+                   newState == State.GRACEFUL_SHUTDOWN) {
             mConsoleLights.setImageResource(R.drawable.routerlogo_2);
         } else if (newState == State.ACTIVE) {
             mConsoleLights.setImageResource(R.drawable.routerlogo_3);
@@ -375,9 +383,9 @@ public class MainFragment extends I2PFragmentBase {
             String uptime = DataHelper.formatDuration(ctx.router().getUptime());
             int active = ctx.commSystem().countActivePeers();
             int known = Math.max(ctx.netDb().getKnownRouters() - 1, 0);
-            vUptime.setText("" + uptime);
-            vActive.setText("" + active);
-            vKnown.setText("" + known);
+            vUptime.setText(uptime);
+            vActive.setText(Integer.toString(active));
+            vKnown.setText(Integer.toString(known));
 
             // Load running tunnels
             loadDestinations(ctx);
@@ -437,6 +445,7 @@ public class MainFragment extends I2PFragmentBase {
             // network but no router context
             vStatusContainer.setVisibility(View.GONE);
             getActivity().findViewById(R.id.console_usage_stats).setVisibility(View.INVISIBLE);
+            updateState(State.STOPPED);
             /**
              * **
              * RouterService svc = _routerService; String status = "connected? "
@@ -526,8 +535,8 @@ public class MainFragment extends I2PFragmentBase {
      * compare translated nicknames - put "shared clients" first in the sort
      */
     private class AlphaComparator implements Comparator<Destination> {
-        private String xsc;
-        private RouterContext _ctx;
+        private final String xsc;
+        private final RouterContext _ctx;
 
         public AlphaComparator(RouterContext ctx) {
             _ctx = ctx;
@@ -578,16 +587,18 @@ public class MainFragment extends I2PFragmentBase {
         );
         if (language == null) {
             AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
+            // avoid ISE caused by fragment detachment ticket #2631
+            final String languages[] = getResources().getStringArray(R.array.languages);
             b.setTitle(R.string.choose_language)
                     .setItems(R.array.language_names, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
                             // Save the language choice
-                            String language = getResources().getStringArray(R.array.languages)[which];
+                            String language = languages[which];
                             PreferenceManager.getDefaultSharedPreferences(getActivity())
                                     .edit()
                                     .putString(getString(R.string.PREF_LANGUAGE), language)
-                                    .commit();
+                                    .apply();
                             // Close the dialog
                             dialog.dismiss();
                             // Broadcast the change to RouterService just in case the router is running
@@ -614,16 +625,57 @@ public class MainFragment extends I2PFragmentBase {
                             ab.setPref(PREF_CONFIGURE_BROWSER, false);
                             Intent hi = new Intent(getActivity(), BrowserConfigActivity.class);
                             startActivity(hi);
+                            checkDialog();
                         }
                     })
                     .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int i) {
-                            dialog.cancel();
+                            dialog.dismiss();
                             ab.setPref(PREF_CONFIGURE_BROWSER, false);
+                            checkDialog();
                         }
                     })
                     .show();
+        } else if (ab.getPref(PREF_CONFIGURE_BATTERY, true)) {
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                // only for Marshmallow and newer versions
+                final Intent intent = new Intent();
+                final Context mContext = ab.getApplicationContext();
+                String packageName = mContext.getPackageName();
+                PowerManager pm = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
+                if (!pm.isIgnoringBatteryOptimizations(packageName)) {
+                    AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
+                    b.setTitle(R.string.configure_no_doze_title)
+                            .setMessage(R.string.configure_no_doze)
+                            .setCancelable(false)
+                            .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int i) {
+                                    String packageName = mContext.getPackageName();
+                                    dialog.dismiss();
+                                    ab.setPref(PREF_CONFIGURE_BATTERY, true);
+                                    intent.setAction(Settings.ACTION_REQUEST_IGNORE_BATTERY_OPTIMIZATIONS);
+                                    intent.setData(Uri.parse("package:" + packageName));
+                                    try {
+                                        mContext.startActivity(intent);
+                                    } catch (ActivityNotFoundException activityNotFound) {
+                                        ab.setPref(PREF_CONFIGURE_BATTERY, true);
+                                    }
+                                }
+                            })
+                            .setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int i) {
+                                    dialog.cancel();
+                                    ab.setPref(PREF_CONFIGURE_BATTERY, false);
+                                }
+                            })
+                            .show();
+                }
+            } else {
+                ab.setPref(PREF_CONFIGURE_BATTERY, false);
+            }
         }
         /*VersionDialog dialog = new VersionDialog();
         String oldVersion = ((I2PActivityBase) getActivity()).getPref(PREF_INSTALLED_VERSION, "??");

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

@@ -13,6 +13,7 @@ import android.widget.TextView;
 
 import net.i2p.android.apps.NewsFetcher;
 import net.i2p.android.router.util.Util;
+import net.i2p.router.RouterContext;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -33,12 +34,16 @@ public class NewsFragment extends I2PFragmentBase {
     @Override
     public void onResume() {
         super.onResume();
-        NewsFetcher nf = NewsFetcher.getInstance();
-        if (nf != null) {
-            // Always update the status
-            TextView tv = (TextView) getActivity().findViewById(R.id.news_status);
-            tv.setText(nf.status().replace(" ", " "));
-            tv.setVisibility(View.VISIBLE);
+        RouterContext ctx = getRouterContext();
+        if (ctx != null) {
+            NewsFetcher nf = (NewsFetcher) ctx.clientAppManager().getRegisteredApp(NewsFetcher.APP_NAME);
+            if (nf != null) {
+                // Always update the status
+                // This is the news last updated/checked text at the bottom
+                TextView tv = (TextView) getActivity().findViewById(R.id.news_status);
+                tv.setText(nf.status().replace(" ", " "));
+                tv.setVisibility(View.VISIBLE);
+            }
         }
 
         // Only update the content if we need to

app/src/main/java/net/i2p/android/router/netdb/NetDbDetailFragment.java

@@ -154,6 +154,8 @@ public class NetDbDetailFragment extends I2PFragmentBase {
             String val = (String)e.getValue();
             addTableRow(table, DataHelper.stripHTML(key), DataHelper.stripHTML(val));
         }
+        // spacer
+        addTableRow(table, "", "");
 
         addresses.addView(table);
     }
@@ -230,9 +232,11 @@ public class NetDbDetailFragment extends I2PFragmentBase {
         TextView tl1, tl2;
 
         row = new TableRow(getActivity());
+        // left top right bottom
         row.setPadding(10, 0, 0, 0);
 
         tl1 = new TextView(getActivity());
+        tl1.setPadding(0, 0, 20, 0);
         tl2 = new TextView(getActivity());
 
         tl1.setText(key);

app/src/main/java/net/i2p/android/router/netdb/NetDbEntryLoader.java

@@ -5,6 +5,7 @@ import android.support.v4.content.AsyncTaskLoader;
 
 import net.i2p.android.router.util.Util;
 import net.i2p.data.Destination;
+import net.i2p.data.Hash;
 import net.i2p.data.LeaseSet;
 import net.i2p.data.router.RouterInfo;
 import net.i2p.router.RouterContext;
@@ -24,14 +25,27 @@ public class NetDbEntryLoader extends AsyncTaskLoader<List<NetDbEntry>> {
         mRouters = routers;
     }
 
+    /** put us on top */
     private static class RouterInfoComparator implements Comparator<RouterInfo> {
+        private final Hash _us;
+
+        public RouterInfoComparator(Hash us) {
+            _us = us;
+        }
+
         public int compare(RouterInfo l, RouterInfo r) {
-            return l.getIdentity().getHash().toBase64().compareTo(r.getIdentity().getHash().toBase64());
+            Hash lh = l.getIdentity().getHash();
+            Hash rh = r.getIdentity().getHash();
+            if (lh.equals(_us))
+                return -1;
+            if (rh.equals(_us))
+                return 1;
+            return lh.toBase64().compareTo(rh.toBase64());
         }
     }
 
     private class LeaseSetComparator implements Comparator<LeaseSet> {
-        private RouterContext mRContext;
+        private final RouterContext mRContext;
 
         public LeaseSetComparator(RouterContext rContext) {
             super();
@@ -53,9 +67,9 @@ public class NetDbEntryLoader extends AsyncTaskLoader<List<NetDbEntry>> {
     public List<NetDbEntry> loadInBackground() {
         List<NetDbEntry> ret = new ArrayList<>();
         RouterContext routerContext = Util.getRouterContext();
-        if (routerContext != null && routerContext.netDb().isInitialized()) {
+        if (routerContext != null && routerContext.netDb().isInitialized() && routerContext.routerHash() != null) {
             if (mRouters) {
-                Set<RouterInfo> routers = new TreeSet<>(new RouterInfoComparator());
+                Set<RouterInfo> routers = new TreeSet<>(new RouterInfoComparator(routerContext.routerHash()));
                 routers.addAll(routerContext.netDb().getRouters());
                 for (RouterInfo ri : routers) {
                     NetDbEntry entry = NetDbEntry.fromRouterInfo(routerContext, ri);

app/src/main/java/net/i2p/android/router/netdb/NetDbStatsLoader.java

@@ -17,7 +17,7 @@ import java.util.Set;
 import java.util.TreeSet;
 
 public class NetDbStatsLoader extends AsyncTaskLoader<List<ObjectCounter<String>>> {
-    private RouterContext mRContext;
+    private final RouterContext mRContext;
     private List<ObjectCounter<String>> mData;
 
     public NetDbStatsLoader(Context context, RouterContext rContext) {
@@ -95,7 +95,7 @@ public class NetDbStatsLoader extends AsyncTaskLoader<List<ObjectCounter<String>
         int rv = 0;
         for (RouterAddress addr : info.getAddresses()) {
             String style = addr.getTransportStyle();
-            if (style.equals("NTCP")) {
+            if (style.equals("NTCP") || style.equals("NTCP2")) {
                 rv |= NTCP;
             } else if (style.equals("SSU")) {
                 if (addr.getOption("iport0") != null)
@@ -108,7 +108,12 @@ public class NetDbStatsLoader extends AsyncTaskLoader<List<ObjectCounter<String>
                 rv |= IPV6;
 
         }
-        return getContext().getString(TNAMES[rv]);
+        int tname = TNAMES[rv];
+        // remap cases with no string to "Hidden or starting up"
+        // so we don't crash NotFoundException
+        if (tname == 0)
+            tname = TNAMES[0];
+        return getContext().getString(tname);
     }
 
     @Override

app/src/main/java/net/i2p/android/router/netdb/NetDbSummaryTableFragment.java

@@ -77,6 +77,7 @@ public class NetDbSummaryTableFragment extends Fragment {
         titleRow.setPadding(10, 0, 0, 0);
 
         tl1 = new TextView(getActivity());
+        tl1.setPadding(0, 0, 20, 0);
         tl1.setTextSize(20);
         tl2 = new TextView(getActivity());
         tl2.setTextSize(20);
@@ -108,6 +109,7 @@ public class NetDbSummaryTableFragment extends Fragment {
         row.setPadding(10, 0, 0, 0);
 
         tl1 = new TextView(getActivity());
+        tl1.setPadding(0, 0, 20, 0);
         tl2 = new TextView(getActivity());
 
         tl1.setText(name);

app/src/main/java/net/i2p/android/router/provider/CacheProvider.java

@@ -2,6 +2,7 @@ package net.i2p.android.router.provider;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.net.Uri;
@@ -18,6 +19,7 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 
 /**
@@ -153,7 +155,7 @@ public class CacheProvider extends ContentProvider {
         // first seg is empty since string starts with /
         String nonce = segs.length > 1 ? segs[1] : null;
         String scheme = segs.length > 2 ? segs[2] : null;
-        String host = segs.length > 3 ? segs[3].toLowerCase() : null;
+        String host = segs.length > 3 ? segs[3].toLowerCase(Locale.US) : null;
         String realPath = segs.length > 4 ? segs[4] : "";
         String query = uri.getEncodedQuery();
         if (query == null) {
@@ -230,10 +232,11 @@ public class CacheProvider extends ContentProvider {
     }
 
     private ParcelFileDescriptor eepFetch(Uri uri) throws FileNotFoundException {
-        AppCache cache = AppCache.getInstance(getContext());
+        Context ctx = getContext();
+        AppCache cache = AppCache.getInstance(ctx);
         OutputStream out;
         try {
-            out = cache.createCacheFile(uri);
+            out = cache.createCacheFile(ctx, uri);
         } catch (IOException ioe) {
             throw new FileNotFoundException(ioe.toString());
         }
@@ -244,7 +247,7 @@ public class CacheProvider extends ContentProvider {
             File file = cache.getCacheFile(uri);
             if (file.length() > 0) {
                 // this call will insert it back to us (don't set as current base)
-                Uri content = cache.addCacheFile(uri, false);
+                Uri content = cache.addCacheFile(ctx, uri, false);
                 return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
             } else {
                  Util.d("CacheProvider Sucess but no data " + uri);
@@ -252,7 +255,7 @@ public class CacheProvider extends ContentProvider {
         } else {
             Util.d("CacheProvider Eepget fail " + uri);
         }
-        AppCache.getInstance().removeCacheFile(uri);
+        cache.removeCacheFile(ctx, uri);
         throw new FileNotFoundException("eepget fail");
     }
 
@@ -319,7 +322,7 @@ public class CacheProvider extends ContentProvider {
             for (String key : toDelete) {
                 edit.remove(key);
             }
-            edit.commit();
+            edit.apply();
         }
     }
 
@@ -355,11 +358,10 @@ public class CacheProvider extends ContentProvider {
         return _sharedPrefs.getString(pref, null);
     }
 
-    /** @return success */
-    private boolean setPref(String pref, String val) {
+    private void setPref(String pref, String val) {
         SharedPreferences.Editor edit = _sharedPrefs.edit();
         edit.putString(pref, val);
-        return edit.commit();
+        edit.apply();
     }
 
     /** @return success */

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

@@ -15,6 +15,11 @@ public class OnBootReceiver extends BroadcastReceiver implements I2PConstants {
 
     @Override
     public void onReceive(Context context, Intent intent) {
+        if (!Intent.ACTION_BOOT_COMPLETED.equals(intent.getAction())) {
+            Util.e("spoofed BOOT_COMPLETED");
+            return;
+        }
+
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean startOnBoot = prefs.getBoolean(PREF_START_ON_BOOT, false);
 

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

@@ -2,7 +2,7 @@ package net.i2p.android.router.service;
 
 import android.content.Context;
 
-import net.i2p.BOB.BOB;
+//import net.i2p.BOB.BOB;
 import net.i2p.I2PAppContext;
 import net.i2p.addressbook.DaemonThread;
 import net.i2p.android.apps.NewsFetcher;
@@ -12,6 +12,7 @@ import net.i2p.i2ptunnel.TunnelControllerGroup;
 import net.i2p.router.Job;
 import net.i2p.router.JobImpl;
 import net.i2p.router.RouterContext;
+import net.i2p.router.startup.RouterAppManager;
 import net.i2p.util.I2PAppThread;
 
 import java.io.IOException;
@@ -37,13 +38,13 @@ import java.io.IOException;
  */
 class LoadClientsJob extends JobImpl {
 
-    private Context mCtx;
-    private Notifications _notif;
+    private final Context mCtx;
+    private final Notifications _notif;
     private DaemonThread _addressbook;
-    private BOB _bob;
+    //private BOB _bob;
 
     /** this is the delay to load (and start) the clients. */
-    private static final long LOAD_DELAY = 90*1000;
+    private static final long LOAD_DELAY = 60*1000;
 
 
     public LoadClientsJob(Context ctx, RouterContext rCtx, Notifications notif) {
@@ -63,20 +64,11 @@ class LoadClientsJob extends JobImpl {
         t.setPriority(Thread.NORM_PRIORITY - 1);
         t.start();
 
-        NewsFetcher fetcher = NewsFetcher.getInstance(mCtx, getContext(), _notif);
-        t = new I2PAppThread(fetcher, "NewsFetcher", true);
-        t.start();
-
-        _addressbook = new DaemonThread(new String[] {"addressbook"});
-        _addressbook.setName("Addressbook");
-        _addressbook.setDaemon(true);
-        _addressbook.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) {}
 
         getContext().addShutdownTask(new ClientShutdownHook());
     }
@@ -90,12 +82,29 @@ class LoadClientsJob extends JobImpl {
         public String getName() { return "Start I2P Tunnel"; }
 
         public void runJob() {
+            while (!getContext().router().isRunning()) {
+                try { Thread.sleep(1000); } catch (InterruptedException ie) { return; }
+                if (!getContext().router().isAlive()) {
+                    Util.e("Router stopped before i2ptunnel could start");
+                    return;
+                }
+            }
             Util.d("Starting i2ptunnel");
-            TunnelControllerGroup tcg = TunnelControllerGroup.getInstance();
+            TunnelControllerGroup tcg = TunnelControllerGroup.getInstance(getContext());
             try {
                 tcg.startup();
                 int sz = tcg.getControllers().size();
                 Util.d("i2ptunnel started " + sz + " clients");
+
+                // no use starting these until i2ptunnel starts
+                RouterContext ctx = getContext();
+                NewsFetcher fetcher = NewsFetcher.getInstance(mCtx, getContext(), _notif);
+                ctx.routerAppManager().addAndStart(fetcher, new String[0]);
+
+                _addressbook = new DaemonThread(new String[] {"addressbook"});
+                _addressbook.setName("Addressbook");
+                _addressbook.setDaemon(true);
+                _addressbook.start();
             } catch (IllegalArgumentException iae) {
                 Util.e("i2ptunnel failed to start", iae);
             }
@@ -109,8 +118,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 (_addressbook != null)
                 _addressbook.halt();
         }

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

@@ -105,7 +105,7 @@ public class RouterService extends Service {
         if(lastState == State.RUNNING || lastState == State.ACTIVE) {
             Intent intent = new Intent(this, RouterService.class);
             intent.putExtra(EXTRA_RESTART, true);
-            onStartCommand(intent, 12345, 67890);
+            onStartCommand(intent, START_FLAG_REDELIVERY | START_FLAG_RETRY, 67890);
         } else if(lastState == State.MANUAL_QUITTING || lastState == State.GRACEFUL_SHUTDOWN) {
             synchronized(_stateLock) {
                 setState(State.MANUAL_QUITTED);
@@ -214,6 +214,7 @@ public class RouterService extends Service {
             // Launch the router!
             // TODO Store this somewhere instead of relying on global context?
             Router r = new Router();
+            r.setUPnPScannerCallback(new SSDPLocker(RouterService.this));
             r.runRouter();
             synchronized(_stateLock) {
                 if(_state != State.STARTING) {
@@ -794,12 +795,12 @@ public class RouterService extends Service {
     }
 
     /**
-     * @return success
+     * Saves state in background thread
      */
-    private boolean saveState() {
+    private void saveState() {
         SharedPreferences prefs = getSharedPreferences(SHARED_PREFS, 0);
         SharedPreferences.Editor edit = prefs.edit();
         edit.putString(LAST_STATE, _state.toString());
-        return edit.commit();
+        edit.apply();
     }
 }

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

@@ -0,0 +1,33 @@
+package net.i2p.android.router.service;
+
+import android.content.Context;
+import android.net.wifi.WifiManager;
+import android.net.wifi.WifiManager.MulticastLock;
+
+import net.i2p.router.transport.UPnPScannerCallback;
+
+/**
+ *  To lock/unlock UPnP, so it works on some phones.
+ *  Many many phones don't require this, but do be safe...
+ *
+ *  @since 0.9.41
+ */
+public class SSDPLocker implements UPnPScannerCallback {
+
+    private final MulticastLock lock;
+
+    public SSDPLocker(Context context) {
+        WifiManager wifi = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+        lock = wifi.createMulticastLock("ssdp");
+        lock.setReferenceCounted(false);
+    }
+
+    public void beforeScan() {
+        lock.acquire();
+    }
+
+    public void afterScan() {
+        if (lock.isHeld())
+            lock.release();
+    }
+}

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

@@ -30,7 +30,6 @@ public class AppCache {
     private static AppCache _instance;
     private static File _cacheDir;
     private static long _totalSize;
-    private static ContentResolver _resolver;
     /** the LRU cache */
     private final Map<Integer, Object> _cache;
 
@@ -62,7 +61,6 @@ public class AppCache {
         _cacheDir = new File(ctx.getCacheDir(), DIR_NAME);
         _cacheDir.mkdir();
         Util.d("AppCache cache dir " + _cacheDir);
-        _resolver = ctx.getContentResolver();
         _cache = new LHM(MAX_FILES);
         initialize();
     }
@@ -72,9 +70,9 @@ public class AppCache {
      *  addCacheFile() or removeCacheFile() after the data is written.
      *  @param key no fragment allowed
      */
-    public OutputStream createCacheFile(Uri key) throws IOException {
+    public OutputStream createCacheFile(Context ctx, Uri key) throws IOException {
         // remove any old file so the total stays correct
-        removeCacheFile(key);
+        removeCacheFile(ctx, key);
         File f = toFile(key);
         f.getParentFile().mkdirs();
         return new FileOutputStream(f);
@@ -88,7 +86,7 @@ public class AppCache {
      *  @param key no fragment allowed
      *  @param setAsCurrentBase tell CacheProvider
      */
-    public Uri addCacheFile(Uri key, boolean setAsCurrentBase) {
+    public Uri addCacheFile(Context ctx, Uri key, boolean setAsCurrentBase) {
         int hash = toHash(key);
         synchronized(_cache) {
             _cache.put(hash, DUMMY);
@@ -96,19 +94,19 @@ public class AppCache {
         // file:/// uri
         //return Uri.fromFile(toFile(hash)).toString();
         // content:// uri
-        return insertContent(key, setAsCurrentBase);
+        return insertContent(ctx, key, setAsCurrentBase);
     }
 
     /**
      *  Remove a previously written file from the cache index and disk.
      *  @param key no fragment allowed
      */
-    public void removeCacheFile(Uri key) {
+    public void removeCacheFile(Context ctx, Uri key) {
         int hash = toHash(key);
         synchronized(_cache) {
             _cache.remove(hash);
         }
-        deleteContent(key);
+        deleteContent(ctx, key);
     }
 
     /**
@@ -118,7 +116,7 @@ public class AppCache {
      *
      *  @param key no fragment allowed
      */
-    public Uri getCacheUri(Uri key) {
+    public Uri getCacheUri(Context ctx, Uri key) {
         int hash = toHash(key);
         // poke the LRU
         Object present;
@@ -126,7 +124,7 @@ public class AppCache {
             present = _cache.get(hash);
         }
         if (present != null)
-            setAsCurrentBase(key);
+            setAsCurrentBase(ctx, key);
         return CacheProvider.getContentUri(key);
     }
 
@@ -242,7 +240,7 @@ public class AppCache {
     /**
      *  @return the uri inserted or null on failure
      */
-    private static Uri insertContent(Uri key, boolean setAsCurrentBase) {
+    private static Uri insertContent(Context ctx, Uri key, boolean setAsCurrentBase) {
         String path = toFile(key).getAbsolutePath();
         ContentValues cv = new ContentValues();
         cv.put(CacheProvider.DATA, path);
@@ -250,8 +248,9 @@ public class AppCache {
             cv.put(CacheProvider.CURRENT_BASE, Boolean.TRUE);
         Uri uri = CacheProvider.getContentUri(key);
         if (uri != null) {
-           _resolver.insert(uri, cv);
-           return uri;
+            ContentResolver resolver = ctx.getContentResolver();
+            resolver.insert(uri, cv);
+            return uri;
         }
         return null;
     }
@@ -259,19 +258,23 @@ public class AppCache {
     /**
      *  Set key as current base. May be content or i2p key.
      */
-    private static void setAsCurrentBase(Uri key) {
+    private static void setAsCurrentBase(Context ctx, Uri key) {
         ContentValues cv = new ContentValues();
         cv.put(CacheProvider.CURRENT_BASE, Boolean.TRUE);
         Uri uri = CacheProvider.getContentUri(key);
-        if (uri != null)
-           _resolver.insert(uri, cv);
+        if (uri != null) {
+            ContentResolver resolver = ctx.getContentResolver();
+            resolver.insert(uri, cv);
+        }
     }
 
     /** ok for now but we will need to store key in the map and delete by integer */
-    private static void deleteContent(Uri key) {
+    private static void deleteContent(Context ctx, Uri key) {
         Uri uri = CacheProvider.getContentUri(key);
-        if (uri != null)
-            _resolver.delete(uri, null, null);
+        if (uri != null) {
+            ContentResolver resolver = ctx.getContentResolver();
+            resolver.delete(uri, null, null);
+        }
     }
 
     /**

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

@@ -32,7 +32,17 @@ public class NamingServiceUtil {
         String kDest = res.getString(R.string.addressbook_add_wizard_k_destination);
 
         String hostName = data.getBundle(kHostName).getString(Page.SIMPLE_DATA_KEY);
-        String host = toASCII(res, hostName); // Already validated, won't throw IAE
+        String host;
+        try {
+            // Already validated, won't throw IAE
+            // ^^^ NOT TRUE ticket #2489 ^^^
+            host = toASCII(res, hostName);
+        } catch (IllegalArgumentException iae) {
+            Toast.makeText(ctx,
+                           iae.getMessage(),
+                           Toast.LENGTH_LONG).show();
+            return false;
+        }
         String displayHost = host.equals(hostName) ? hostName :
                                                      hostName + " (" + host + ')';
 

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

@@ -34,6 +34,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Locale;
 import java.util.Map;
 import java.util.Properties;
 
@@ -185,9 +186,9 @@ public abstract class Util implements I2PConstants {
                     toRemove.setProperty("routerconsole.lang", "");
                     toRemove.setProperty("routerconsole.country", "");
                 } else {
-                    routerProps.setProperty("routerconsole.lang", language[0].toLowerCase());
+                    routerProps.setProperty("routerconsole.lang", language[0].toLowerCase(Locale.US));
                     if (language.length == 2)
-                        routerProps.setProperty("routerconsole.country", language[1].toUpperCase());
+                        routerProps.setProperty("routerconsole.country", language[1].toUpperCase(Locale.US));
                     else
                         toRemove.setProperty("routerconsole.country", "");
                 }
@@ -445,10 +446,15 @@ public abstract class Util implements I2PConstants {
             case IPV4_UNKNOWN_IPV6_OK:
             case IPV4_DISABLED_IPV6_OK:
             case IPV4_SNAT_IPV6_OK:
-                RouterAddress ra = routerInfo.getTargetAddress("NTCP");
-                if (ra == null)
+                List<RouterAddress> ras = routerInfo.getTargetAddresses("NTCP", "NTCP2");
+                if (ras.isEmpty())
                     return new NetStatus(NetStatus.Level.INFO, toStatusString(ctx, status));
-                byte[] ip = ra.getIP();
+                byte[] ip = null;
+                for (RouterAddress ra : ras) {
+                    ip = ra.getIP();
+                    if (ip != null)
+                        break;
+                }
                 if (ip == null)
                     return new NetStatus(NetStatus.Level.ERROR, ctx.getString(R.string.net_status_error_unresolved_tcp));
                 // TODO set IPv6 arg based on configuration?
@@ -462,7 +468,7 @@ public abstract class Util implements I2PConstants {
 
             case REJECT_UNSOLICITED:
             case IPV4_DISABLED_IPV6_FIREWALLED:
-                if (routerInfo.getTargetAddress("NTCP") != null)
+                if (routerInfo.getTargetAddresses("NTCP", "NTCP2").isEmpty())
                     return new NetStatus(NetStatus.Level.WARN, ctx.getString(R.string.net_status_warn_firewalled_inbound_tcp));
                 // fall through...
             case IPV4_FIREWALLED_IPV6_OK:
@@ -483,7 +489,7 @@ public abstract class Util implements I2PConstants {
             case IPV4_UNKNOWN_IPV6_FIREWALLED:
             case IPV4_DISABLED_IPV6_UNKNOWN:
             default:
-                ra = routerInfo.getTargetAddress("SSU");
+                RouterAddress ra = routerInfo.getTargetAddress("SSU");
                 if (ra == null && rCtx.router().getUptime() > 5 * 60 * 1000) {
                     if (rCtx.commSystem().countActivePeers() <= 0)
                         return new NetStatus(NetStatus.Level.ERROR, ctx.getString(R.string.net_status_error_no_active_peers));

app/src/main/java/net/i2p/android/router/web/I2PWebViewClient.java

@@ -28,10 +28,11 @@ import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.Locale;
 
 public class I2PWebViewClient extends WebViewClient {
 
-    private Fragment _parentFrag;
+    private final Fragment _parentFrag;
     private BGLoad _lastTask;
     /** save it here so we can dismiss it in onPageFinished() */
     private ProgressDialog _lastDialog;
@@ -76,7 +77,7 @@ public class I2PWebViewClient extends WebViewClient {
                 fail(view, "Bad URL " + url);
                 return true;
             }
-            s = s.toLowerCase();
+            s = s.toLowerCase(Locale.US);
             if (!(s.equals("http") || s.equals("https") ||
                   s.equals(CONTENT))) {
                 Util.d("Not loading URL " + url);
@@ -93,7 +94,7 @@ public class I2PWebViewClient extends WebViewClient {
                 return true;
             }
 
-            h = h.toLowerCase();
+            h = h.toLowerCase(Locale.US);
             if (h.endsWith(".i2p")) {
                 if (!s.equals("http")) {
                     fail(view, "Bad URL " + url);
@@ -211,7 +212,8 @@ public class I2PWebViewClient extends WebViewClient {
                 //reverse back to a i2p URI so we can delete it from the AppCache
                 uri = CacheProvider.getI2PUri(uri);
                 Util.d("clearing AppCache entry for current page " + uri);
-                AppCache.getInstance(view.getContext()).removeCacheFile(uri);
+                Context ctx = view.getContext();
+                AppCache.getInstance(ctx).removeCacheFile(ctx, uri);
             } catch (FileNotFoundException fnfe) {
                 // this actually only deletes the row in the provider,
                 // not the actual file, but it will be overwritten in the reload.
@@ -315,9 +317,10 @@ public class I2PWebViewClient extends WebViewClient {
         protected Integer doInBackground(String... urls) {
             final String url = urls[0];
             Uri uri = Uri.parse(url);
-            File cacheFile = AppCache.getInstance(_ctx).getCacheFile(uri);
+            final AppCache cache = AppCache.getInstance(_ctx);
+            File cacheFile = cache.getCacheFile(uri);
             if (cacheFile.exists()) {
-                final Uri resUri = AppCache.getInstance(_ctx).getCacheUri(uri);
+                final Uri resUri = cache.getCacheUri(_ctx, uri);
                 Util.d("Loading " + url + " from resource cache " + resUri);
                 _view.post(new Runnable() {
                     @Override
@@ -335,7 +338,7 @@ public class I2PWebViewClient extends WebViewClient {
             //EepGetFetcher fetcher = new EepGetFetcher(url);
             OutputStream out = null;
             try {
-                out = AppCache.getInstance(_ctx).createCacheFile(uri);
+                out = cache.createCacheFile(_ctx, uri);
                 // write error to stream
                 EepGetFetcher fetcher = new EepGetFetcher(url, out, true);
                 fetcher.addStatusListener(this);
@@ -348,11 +351,11 @@ public class I2PWebViewClient extends WebViewClient {
                 if (success) {
                     // store in cache, get content URL, and load that way
                     // Set as current base
-                    final Uri content = AppCache.getInstance(_ctx).addCacheFile(uri, true);
+                    final Uri content = cache.addCacheFile(_ctx, uri, true);
                     if (content != null) {
                         Util.d("Stored cache in " + content);
                     } else {
-                        AppCache.getInstance(_ctx).removeCacheFile(uri);
+                        cache.removeCacheFile(_ctx, uri);
                         Util.d("cache create error");
                         return 0;
                     }
@@ -391,7 +394,7 @@ public class I2PWebViewClient extends WebViewClient {
                               if (fis != null) try { fis.close(); } catch (IOException ioe) {}
                         }
                     }
-                    AppCache.getInstance(_ctx).removeCacheFile(uri);
+                    cache.removeCacheFile(_ctx, uri);
                      Util.d("loading error data URL: " + url);
                     final String finalMsg = msg;
                     _view.post(new Runnable() {
@@ -439,8 +442,9 @@ public class I2PWebViewClient extends WebViewClient {
                 } else {
                     // nothing
                 }
-            } catch (IllegalArgumentException iae) {
+            } catch (RuntimeException iae) {
                 // throws IAE - not attached to window manager - perhaps due to screen rotation?
+                // Also includes android.view.WindowManager$BadTokenException extends RuntimeException
                 Util.e("Error while updating I2PWebViewClient dialog", iae);
             }
         }

app/src/main/java/net/i2p/android/router/web/WebFragment.java

@@ -49,19 +49,21 @@ public class WebFragment extends I2PFragmentBase {
         wv.getSettings().setBuiltInZoomControls(true);
         // http://stackoverflow.com/questions/2369310/webview-double-tap-zoom-not-working-on-a-motorola-droid-a855
         wv.getSettings().setUseWideViewPort(true);
-        _uriStr =  getArguments().getString(HTML_URI);
-        if (_uriStr != null) {
-            Uri uri = Uri.parse(_uriStr);
-            //wv.getSettings().setLoadsImagesAutomatically(true);
-            //wv.loadUrl(uri.toString());
-            // go thru the client so .i2p will work too
-            _wvClient.shouldOverrideUrlLoading(wv, uri.toString());
-        } else {
-            wv.getSettings().setLoadsImagesAutomatically(false);
-            int id = getArguments().getInt(HTML_RESOURCE_ID, 0);
-            // no default, so restart should keep previous view
-            if (id != 0)
-                loadResource(wv, id);
+        if (getArguments() != null) {
+            _uriStr = getArguments().getString(HTML_URI);
+            if (_uriStr != null) {
+                Uri uri = Uri.parse(_uriStr);
+                //wv.getSettings().setLoadsImagesAutomatically(true);
+                //wv.loadUrl(uri.toString());
+                // go thru the client so .i2p will work too
+                _wvClient.shouldOverrideUrlLoading(wv, uri.toString());
+            } else {
+                wv.getSettings().setLoadsImagesAutomatically(false);
+                int id = getArguments().getInt(HTML_RESOURCE_ID, 0);
+                // no default, so restart should keep previous view
+                if (id != 0)
+                    loadResource(wv, id);
+            }
         }
         return v;
     }

app/src/main/java/net/i2p/android/util/AlphanumericHeaderAdapter.java

@@ -7,6 +7,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import java.util.Locale;
+
 import com.eowise.recyclerview.stickyheaders.StickyHeadersAdapter;
 
 import net.i2p.android.router.R;
@@ -49,7 +51,7 @@ public class AlphanumericHeaderAdapter implements StickyHeadersAdapter<Alphanume
 
     @Override
     public void onBindViewHolder(ViewHolder headerViewHolder, int position) {
-        String sortString = mAdapter.getSortString(position).toUpperCase();
+        String sortString = mAdapter.getSortString(position).toUpperCase(Locale.getDefault());
         if (sortString.isEmpty())
             headerViewHolder.itemView.setVisibility(View.GONE);
         else {
@@ -63,7 +65,7 @@ public class AlphanumericHeaderAdapter implements StickyHeadersAdapter<Alphanume
 
     @Override
     public long getHeaderId(int position) {
-        String sortString = mAdapter.getSortString(position).toUpperCase();
+        String sortString = mAdapter.getSortString(position).toUpperCase(Locale.getDefault());
         if (sortString.isEmpty())
             return Integer.MAX_VALUE;
 

app/src/main/java/net/i2p/android/util/MemoryFragmentPagerAdapter.java

@@ -3,19 +3,17 @@ package net.i2p.android.util;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
+import android.util.SparseArray;
 import android.view.ViewGroup;
 
-import java.util.HashMap;
-import java.util.Map;
-
 public abstract class MemoryFragmentPagerAdapter extends FragmentPagerAdapter {
-    private FragmentManager mFragmentManager;
-    private Map<Integer, String> mFragmentTags;
+    private final FragmentManager mFragmentManager;
+    private final SparseArray<String> mFragmentTags;
 
     public MemoryFragmentPagerAdapter(FragmentManager fm) {
         super(fm);
         mFragmentManager = fm;
-        mFragmentTags = new HashMap<>();
+        mFragmentTags = new SparseArray<>();
     }
 
     @Override

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

@@ -30,10 +30,10 @@ import java.util.List;
  * To create an actual wizard model, extend this class and implement {@link #onNewRootPageList()}.
  */
 public abstract class AbstractWizardModel implements ModelCallbacks {
-    protected Context mContext;
+    protected final Context mContext;
 
-    private List<ModelCallbacks> mListeners = new ArrayList<ModelCallbacks>();
-    private PageList mRootPageList;
+    private final List<ModelCallbacks> mListeners = new ArrayList<ModelCallbacks>();
+    private final PageList mRootPageList;
 
     public AbstractWizardModel(Context context) {
         mContext = context;

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

@@ -11,7 +11,7 @@
 </ul>
 
 <h2>Using clients with pre-configured tunnels</h2>
-<p>The app starts an HTTP proxy tunnel at localhost port 4444 and IRC client tunnels at localhost ports 6668 - 6672. The IRC clients are "shared clients" on the same tunnels. Once you see the tunnel icon turn green on the main console (several minutes after startup), you should be able to connect.</p>
+<p>The app starts an HTTP proxy tunnel at 127.0.0.1 port 4444 and IRC client tunnels at 127.0.0.1 ports 6668 - 6672. The IRC clients are "shared clients" on the same tunnels. Once you see the tunnel icon turn green on the main console (several minutes after startup), you should be able to connect.</p>
 
 <h2>What does the clock icon on a yellow background mean?</h2>
 <p>When a tunnel's indicator is yellow with a clock icon, the tunnel is in standby mode. This means that I2P has not built the tunnel yet, but will do so automatically when you start using it. This helps to minimize resource use and conserve battery life.</p>

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

@@ -1,11 +1,11 @@
 <html>
 <head></head>
 <body>
-<h2>How to configure Orweb:</h2>
-<ol>
-    <li>Open Orweb's settings menu.</li>
-    <li>Change the "Proxy Port" to <code>4444</code>.</li>
-    <li>Exit Orweb using the back button, then open it again.</li>
-</ol>
+<h2>Sorry, this browser is unsupported</h2>
+<ul>
+    <li>OrFox has been deprecated by the Guardian Project in favor of Tor
+    Browser for Android. It is no longer supported.
+    </li>
+</ul>
 </body>
-</html>
+</html>

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

@@ -1,17 +1,11 @@
 <html>
 <head></head>
 <body>
-<h2>How to configure Orfox:</h2>
-<ol>
-    <li>Install the ProxyMob add-on. Click <a
-            href="https://guardianproject.info/downloads/proxymob.xpi">HERE</a>, and choose to open
-        the URL in Firefox.
+<h2>Sorry, this browser is unsupported</h2>
+<ul>
+    <li>OrFox has been deprecated by the Guardian Project in favor of Tor
+    Browser for Android. It is no longer supported.
     </li>
-    <li>In the main Firefox menu, click "Tools", then "Add-ons".</li>
-    <li>Click on "Proxy Mobile".</li>
-    <li>Change the value of "HTTP Proxy Port" to <code>4444</code>.</li>
-    <li>Change the value of "HTTPS Proxy Port" to <code>4444</code>.</li>
-    <li>You can now browse I2P eepsites!</li>
-</ol>
+</ul>
 </body>
-</html>
+</html>

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

@@ -9,8 +9,8 @@
 <p>With this app installed, other apps that are designed for I2P will use it automatically.</p>
 
 <h2>Pre-configured HTTP proxy</h2>
-<p>The app starts an HTTP proxy at localhost port 4444. To use it, configure your browser's HTTP proxy setting to use localhost:4444.</p>
+<p>The app starts an HTTP proxy at 127.0.0.1 port 4444. To use it, configure your browser's HTTP proxy setting to use 127.0.0.1:4444.</p>
 <p>The HTTP proxy is tested with the "Orweb" app. It should also work with Firefox 4 Mobile and the ProxyMob Firefox plugin, if you have at least 512 MB of RAM.</p>
 <p>See the "Browser configuration" help page for more info.</p>
 </body>
-</html>
+</html>

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

@@ -0,0 +1,35 @@
+<html>
+<head></head>
+<body>
+<h2>How to configure GNU IceCat:</h2>
+<ol>
+    <li>Click <a href="about:config?filter=network.proxy">HERE</a>, and choose to open the URL in IceCatMobile.</li>
+    <li>Change the value of "network.proxy.type" to <code>1</code>.</li>
+    <li>Change the value of "network.proxy.http" to <code>127.0.0.1</code>.</li>
+    <li>Change the value of "network.proxy.http_port" to <code>4444</code>.</li>
+    <li>Change the value of "network.proxy.ssl" to <code>127.0.0.1</code>.</li>
+    <li>Change the value of "network.proxy.ssl_port" to <code>4444</code>.</li>
+    <li>Change the value of "media.peerconnection.ice.proxy_only" to <code>true</code>.</li>
+    <li>You may also wish to install plugins to help manage your browser's
+    default javascript settings, such as NoScript and/or uMatrix, and use
+    Private Browsing to manage your browser's cache.
+    </li>
+    <li>You can now browse I2P eepsites!</li>
+</ol>
+<h3>Alternate Configuration(Requires Root!)</h3>
+<ol>
+    <li>Install <a href="https://github.com/v1nc/user.js-updater">user.js-updater</a></li>
+    <li>Select IceCatMobile from the list of browsers</li>
+    <li>Paste the following URL where it says "type custom user.js url" <a href="https://github.com/eyedeekay/firefox.profile.i2p/raw/master/firefox.profile.i2p/user.js">https://github.com/eyedeekay/firefox.profile.i2p/raw/master/firefox.profile.i2p/user.js</a></li>
+    <li>Tap "Update"</li>
+    <li>You can now browse I2P eepsites!</li>
+</ol>
+<h3>Experimental Rootless Configuration via Webextension</h3>
+<strong><p>Use at your own risk</p></strong>
+<ol>
+    <li>Open this link in GNU IceCat and get the WebExtension from <a href="https://github.com/eyedeekay/i2psetproxy.js/releases">Github</a></li>
+    <li>Click through the "Blocked Extension" warning</li>
+    <li>You can now browse I2P eepsites!</li>
+</ol>
+</body>
+</html>

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

@@ -0,0 +1,35 @@
+<html>
+<head></head>
+<body>
+<h2>How to configure Fennec Firefox:</h2>
+<ol>
+    <li>Click <a href="about:config?filter=proxy">HERE</a>, and choose to open the URL in Fennec.</li>
+    <li>Change the value of "network.proxy.type" to <code>1</code>.</li>
+    <li>Change the value of "network.proxy.http" to <code>127.0.0.1</code>.</li>
+    <li>Change the value of "network.proxy.http_port" to <code>4444</code>.</li>
+    <li>Change the value of "network.proxy.ssl" to <code>127.0.0.1</code>.</li>
+    <li>Change the value of "network.proxy.ssl_port" to <code>4444</code>.</li>
+    <li>Change the value of "media.peerconnection.ice.proxy_only" to <code>true</code>.</li>
+    <li>You may also wish to install plugins to help manage your browser's
+    default javascript settings, such as NoScript and/or uMatrix, and use
+    Private Browsing to manage your browser's cache.
+    </li>
+    <li>You can now browse I2P eepsites!</li>
+</ol>
+<h3>Alternate Configuration(Requires Root!)</h3>
+<ol>
+    <li>Install <a href="https://github.com/v1nc/user.js-updater">user.js-updater</a></li>
+    <li>Select Fennec from the list of browsers</li>
+    <li>Paste the following URL where it says "type custom user.js url" <a href="https://github.com/eyedeekay/firefox.profile.i2p/raw/master/firefox.profile.i2p/user.js">https://github.com/eyedeekay/firefox.profile.i2p/raw/master/firefox.profile.i2p/user.js</a></li>
+    <li>Tap "Update"</li>
+    <li>You can now browse I2P eepsites!</li>
+</ol>
+<h3>Experimental Rootless Configuration via Webextension</h3>
+<strong><p>Use at your own risk</p></strong>
+<ol>
+    <li>Open this link in Fennec and get the WebExtension from <a href="https://github.com/eyedeekay/i2psetproxy.js/releases">Github</a></li>
+    <li>Click through the "Blocked Extension" warning</li>
+    <li>You can now browse I2P eepsites!</li>
+</ol>
+</body>
+</html>

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

@@ -3,12 +3,32 @@
 <body>
 <h2>How to configure Firefox:</h2>
 <ol>
-    <li>Click <a href="about:config?filter=network.proxy">HERE</a>, and choose to open the URL in Firefox.</li>
+    <li>Click <a href="about:config?filter=proxy">HERE</a>, and choose to open the URL in Firefox.</li>
     <li>Change the value of "network.proxy.type" to <code>1</code>.</li>
     <li>Change the value of "network.proxy.http" to <code>127.0.0.1</code>.</li>
     <li>Change the value of "network.proxy.http_port" to <code>4444</code>.</li>
     <li>Change the value of "network.proxy.ssl" to <code>127.0.0.1</code>.</li>
     <li>Change the value of "network.proxy.ssl_port" to <code>4444</code>.</li>
+    <li>Change the value of "media.peerconnection.ice.proxy_only" to <code>true</code>.</li>
+    <li>You may also wish to install plugins to help manage your browser's
+    default javascript settings, such as NoScript and/or uMatrix, and use
+    Private Browsing to manage your browser's cache.
+    </li>
+    <li>You can now browse I2P eepsites!</li>
+</ol>
+<h3>Alternate Configuration(Requires Root!)</h3>
+<ol>
+    <li>Install <a href="https://github.com/v1nc/user.js-updater">user.js-updater</a></li>
+    <li>Select Firefox from the list of browsers</li>
+    <li>Paste the following URL where it says "type custom user.js url" <a href="https://github.com/eyedeekay/firefox.profile.i2p/raw/master/firefox.profile.i2p/user.js">https://github.com/eyedeekay/firefox.profile.i2p/raw/master/firefox.profile.i2p/user.js</a></li>
+    <li>Tap "Update"</li>
+    <li>You can now browse I2P eepsites!</li>
+</ol>
+<h3>Experimental Rootless Configuration via Webextension</h3>
+<strong><p>Use at your own risk</p></strong>
+<ol>
+    <li>Open this link in Firefox and get the WebExtension from <a href="https://github.com/eyedeekay/i2psetproxy.js/releases">Github</a></li>
+    <li>Click through the "Blocked Extension" warning</li>
     <li>You can now browse I2P eepsites!</li>
 </ol>
 </body>

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

@@ -4,6 +4,6 @@
 <h2>This browser is unknown</h2>
 <p>We have not tested this browser with I2P, so we don't know anything about it.</p>
 <p>But if this browser supports proxies, it will work with I2P.</p>
-<p>Configure this browser's HTTP and HTTPS proxy settings to use <code>localhost:4444</code>.</p>
+<p>Configure this browser's HTTP and HTTPS proxy settings to use <code>127.0.0.1:4444</code>.</p>
 </body>
-</html>
+</html>

app/src/main/res/raw/i2ptunnel_config

@@ -8,7 +8,7 @@ tunnel.0.type=httpclient
 tunnel.0.sharedClient=false
 tunnel.0.interface=127.0.0.1
 tunnel.0.listenPort=4444
-tunnel.0.proxyList=false.i2p
+tunnel.0.proxyList=false.i2p,blue.proxynet.i2p
 tunnel.0.i2cpHost=127.0.0.1
 tunnel.0.i2cpPort=7654
 tunnel.0.option.inbound.nickname=I2P HTTP Proxy
@@ -18,7 +18,7 @@ tunnel.0.option.i2cp.reduceIdleTime=600000
 tunnel.0.option.i2cp.reduceOnIdle=true
 tunnel.0.option.i2cp.reduceQuantity=1
 tunnel.0.option.i2p.streaming.connectDelay=1000
-tunnel.0.option.i2ptunnel.httpclient.SSLOutproxies=false.i2p
+tunnel.0.option.i2ptunnel.httpclient.SSLOutproxies=false.i2p,blue.proxynet.i2p
 tunnel.0.option.inbound.length=2
 tunnel.0.option.inbound.lengthVariance=0
 tunnel.0.option.outbound.length=2
@@ -100,28 +100,3 @@ tunnel.3.option.outbound.length=2
 tunnel.3.option.outbound.lengthVariance=0
 tunnel.3.option.outbound.priority=15
 tunnel.3.startOnLoad=true
-
-# irc
-tunnel.4.name=IRC welterde
-tunnel.4.description=IRC tunnel to welterde's network
-tunnel.4.type=ircclient
-tunnel.4.sharedClient=true
-tunnel.4.interface=127.0.0.1
-tunnel.4.listenPort=6669
-tunnel.4.targetDestination=irc.welterde.i2p
-tunnel.4.i2cpHost=127.0.0.1
-tunnel.4.i2cpPort=7654
-tunnel.4.option.inbound.nickname=shared clients
-tunnel.4.option.outbound.nickname=shared clients
-tunnel.4.option.i2cp.delayOpen=true
-tunnel.4.option.i2cp.reduceIdleTime=600000
-tunnel.4.option.i2cp.reduceOnIdle=true
-tunnel.4.option.i2cp.reduceQuantity=1
-tunnel.4.option.i2p.streaming.connectDelay=1000
-tunnel.4.option.i2p.streaming.maxWindowSize=16
-tunnel.4.option.inbound.length=2
-tunnel.4.option.inbound.lengthVariance=0
-tunnel.4.option.outbound.length=2
-tunnel.4.option.outbound.lengthVariance=0
-tunnel.4.option.outbound.priority=15
-tunnel.4.startOnLoad=true

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

@@ -0,0 +1,126 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="desc_i2p_logo">شعار I2P</string>
+  <string name="choose_language">اختر اللغة</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_logs">السجلات</string>
+  <string name="label_error_logs">سجلات الأخطاء</string>
+  <string name="label_news">الأخبار</string>
+  <string name="label_peers_status">المستخدمين</string>
+  <string name="label_release_notes">ملاحظات الإصدار</string>
+  <string name="label_licenses">الرخص</string>
+  <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_graceful">سيتم إغلاق I2P في %s</string>
+  <string name="button_shutdown_now">اضغط لفترة طويلة لوقفه الآن</string>
+  <string name="button_cancel_graceful">اضغط لفترة طويلة لإلغاء إيقاف التشغيل</string>
+  <string name="no_internet">لا يوجد اتصال متاح بالإنترنت </string>
+  <string name="hidden">مختفي</string>
+  <string name="testing">جاري التجريب</string>
+  <string name="firewalled">ممنوع من الجدار الناري</string>
+  <!--Parameter is a time, e.g. 32s or 2m-->
+  <string name="uptime">مدة الاشتغال</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".-->
+  <string name="char_server_tunnel">S</string>
+  <string name="download">تحميل</string>
+  <string name="upload">رفع</string>
+  <string name="first_start_title">تهانينا على تثبيتِ I2P!</string>
+  <string name="first_start_read">أثناء انتظارك، فضلا اطلع على ملاحظات الإصدار والصفحة الرئيسية</string>
+  <string name="action_search">بحث</string>
+  <string name="action_add">إضافة</string>
+  <string name="action_edit">تحرير</string>
+  <string name="action_delete">حذف</string>
+  <string name="action_reload">إعادة تحميل</string>
+  <string name="action_refresh">تحديث</string>
+  <string name="stats_not_ready">مدير الإحصاءات غير جاهز حاليا. يرجى المحاولة لاحقا</string>
+  <string name="routers">الموجه</string>
+  <string name="country">البلد</string>
+  <string name="transport">نقل</string>
+  <string name="version">إصدار</string>
+  <string name="count">عدد</string>
+  <string name="tname_0">مختفي</string>
+  <string name="menu_settings">الإعدادات</string>
+  <string name="settings_enable">تفعيل</string>
+  <string name="settings_label_bandwidth">سرعة الاتصال</string>
+  <string name="settings_label_network">الشبكة</string>
+  <string name="settings_label_hiddenMode">المشاركة</string>
+  <string name="settings_label_logging">تسجيل</string>
+  <string name="settings_label_default_log_level">نوع السجل</string>
+  <string name="settings_label_appearance">المظهر</string>
+  <string name="settings_label_language">اللغة</string>
+  <string name="settings_default">افتراضي</string>
+  <string name="settings_label_advanced">متقدم</string>
+  <string name="settings_label_transports">نقل</string>
+  <string name="settings_label_expl_length">الطول</string>
+  <string name="settings_summ_expl_lengthVariance">نسبة %s</string>
+  <string name="settings_label_expl_quantity">الكمية</string>
+  <string name="settings_label_expl_backupQuantity">قدر نسخ الاحتياط</string>
+  <string name="menu_about">حول</string>
+  <string name="about_version">الإصدار:</string>
+  <string name="about_project">مركز المشروع:</string>
+  <string name="menu_help">المساعدة</string>
+  <string name="general">عام</string>
+  <string name="addressbook_add_wizard_k_name">الاسم</string>
+  <string name="addressbook_add_wizard_k_destination">اتجاه</string>
+  <string name="i2ptunnel_type_client">مستخدم عادي</string>
+  <string name="i2ptunnel_type_httpclient">HTTP client</string>
+  <string name="i2ptunnel_type_ircclient">IRC برنامج</string>
+  <string name="i2ptunnel_type_server">خادم عادي</string>
+  <string name="i2ptunnel_type_httpserver">HTTP خادم</string>
+  <string name="i2ptunnel_type_sockstunnel">SOCKS 4/4a/5 بروكسي</string>
+  <string name="i2ptunnel_type_socksirctunnel">SOCKS IRC بروكسي دردشة</string>
+  <string name="i2ptunnel_type_connectclient">اتصال/SSL/HTTPS بروكسي</string>
+  <string name="i2ptunnel_type_ircserver">IRC خادم</string>
+  <string name="i2ptunnel_new_tunnel">نفق جديد</string>
+  <string name="i2ptunnel_msg_config_saved">تم حفظ الإعدادات</string>
+  <string name="i2ptunnel_msg_config_save_failed">فشل حفظ الإعدادات</string>
+  <string name="i2ptunnel_msg_tunnel_starting">ابدأ النفق</string>
+  <string name="i2ptunnel_msg_tunnel_stopping">توقيف النفق</string>
+  <string name="i2ptunnel_wizard_k_client_server">المستخدم أو الخادم</string>
+  <string name="i2ptunnel_wizard_k_name">الاسم</string>
+  <string name="i2ptunnel_wizard_k_desc">وصف</string>
+  <string name="i2ptunnel_wizard_k_dest">اتجاه</string>
+  <string name="i2ptunnel_wizard_k_outproxies">بروكسي خارجي</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_view_target">الهدف</string>
+  <string name="i2ptunnel_view_autostart">تشغيل آلي</string>
+  <string name="name">الاسم</string>
+  <string name="description">وصف</string>
+  <string name="auto_start">تشغيل آلي</string>
+  <string name="outproxies">بروكسي خارجي</string>
+  <string name="use_ssl">استعمل SSL</string>
+  <string name="profile">بروفايل</string>
+  <string name="access_control">سيطرة الوصول</string>
+  <string name="disabled">معطل</string>
+  <string name="whitelist">قائمة بيضاء</string>
+  <string name="blacklist">قائمة سوداء</string>
+  <string name="unlimited">غير محدود</string>
+  <string name="tunnel_summ_delay_open">عطل النفق حتى الحاجة اليه</string>
+  <string name="tunnel_summ_reduce_quantity">قلل قدر الأنفاق عند الانتظار</string>
+  <string name="num_minutes">%sدقائق </string>
+  <string name="close_tunnels">قفل النفق عند الانتظار</string>
+  <string name="http_client">HTTP client</string>
+  <string name="username">اسم المستخدم</string>
+  <string name="password">كلمة السر</string>
+  <string name="other">أخرى</string>
+  <string name="custom_options">خيارات خاصة</string>
+  <string name="all">الكل</string>
+  <string name="no_messages">لا رسائل</string>
+</resources>

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

@@ -145,7 +145,6 @@
   <string name="settings_label_transports">Nəqliyyatlar</string>
   <string name="settings_label_maxConns">Maksimum əlaqələr</string>
   <string name="settings_label_i2cp">I2CP interfeysi</string>
-  <string name="settings_desc_i2cp">7654 portunda dinlə</string>
   <string name="settings_label_exploratory_pool">Axtarış hovuzu</string>
   <string name="settings_desc_exploratory_pool">Tunel parametrləri</string>
   <string name="settings_label_expl_inbound">Daxil olan tunellər</string>

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

@@ -132,7 +132,6 @@
   <string name="settings_label_transports">Transports</string>
   <string name="settings_label_maxConns">Màx. connexions</string>
   <string name="settings_label_i2cp">Interfície I2CP</string>
-  <string name="settings_desc_i2cp">Escoltar el port 7654</string>
   <string name="settings_label_exploratory_pool">Piscina exploratòria</string>
   <string name="settings_desc_exploratory_pool">Paràmetres del túnel</string>
   <string name="settings_label_expl_inbound">Túnels d\'entrada</string>
@@ -214,8 +213,10 @@
   <string name="http_client">Client HTTP</string>
   <string name="username">Nom d\'usuari</string>
   <string name="password">Contrasenya</string>
+  <string name="other">Altres</string>
   <string name="signature_type">Tipus de signatura</string>
   <string name="custom_options">Opcions personalitzades</string>
+  <string name="all">Tots</string>
   <string name="no_messages">Sense missatges</string>
   <string name="copy_logs">Copia registres</string>
   <string name="i2p_android_error_logs">Registres d\'error d\'I2P Android</string>

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

@@ -0,0 +1,114 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="desc_i2p_logo">I2P logo</string>
+  <string name="welcome_new_install">Vítejte v I2P! Tato aplikace je ALPHA software a neposkytuje silnou anonymitu. Prosím přečtěte si poznámky k verzi a informace o licenci.</string>
+  <string name="welcome_new_version">Nová verze aktualizována. Prosím přečtěte si poznámky k verzi. Verze:</string>
+  <string name="label_tunnels">Tunely</string>
+  <string name="label_status">Status</string>
+  <string name="label_addresses">Adresy</string>
+  <string name="label_addressbook">Adresář</string>
+  <string name="label_i2ptunnel_client">Tunely klienta</string>
+  <string name="label_i2ptunnel_server">Tunely serveru</string>
+  <string name="label_logs">Záznamy</string>
+  <string name="label_error_logs">Záznamy chyb</string>
+  <string name="label_news">Novinky</string>
+  <string name="label_peers_status">Peery</string>
+  <string name="label_release_notes">Poznámky k verzi</string>
+  <string name="label_licenses">Licence</string>
+  <string name="label_browse">Procházet</string>
+  <string name="label_graphs">Grafy</string>
+  <string name="button_router_off">Dlouze stiskněte pro spuštění I2P</string>
+  <string name="button_router_on">I2P běží (dlouze stiskněte pro zastavení)</string>
+  <string name="hidden">Skryté</string>
+  <!--Parameter is a time, e.g. 32s or 2m-->
+  <!--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".-->
+  <string name="char_server_tunnel">B</string>
+  <string name="download">Stáhnout</string>
+  <string name="upload">Nahrát</string>
+  <string name="first_start_title">Gratulujeme k nainstalování I2P!</string>
+  <string name="first_start_welcome"><b>Vítejte v I2P\'</b>Prosíme<b>buďte trpěliví</b> dokud I2P nenastartuje a najde peery.</string>
+  <string name="first_start_read">Během čekání si prosím přečtěte poznámky k verzi a úvodní stránku.</string>
+  <string name="first_start_faq">Jakmile budete mít klientské tunely, prosíme <b>podívejte se</b> na naše FAQ:</string>
+  <string name="first_start_faq_nonanon">Nebo použijte neanonymní link pokud nechcete čekat na tunely:</string>
+  <string name="first_start_irc">Nasměrujte svého IRC klienta na <b>localhost:6668</b> a pozdravte nás na:</string>
+  <string name="action_search">Hledat</string>
+  <string name="action_add">Přidat</string>
+  <string name="action_edit">Editovat</string>
+  <string name="action_delete">Smazat</string>
+  <string name="action_i2ptunnel_start">Zapnout tunel</string>
+  <string name="action_i2ptunnel_stop">Vypnout tunel</string>
+  <string name="action_i2ptunnel_start_all">Zapnout všechny tunely</string>
+  <string name="action_i2ptunnel_stop_all">Vypnout všechny tunely</string>
+  <string name="action_i2ptunnel_restart_all">Restartovat všechny tunely</string>
+  <string name="action_reload">Načíst znovu</string>
+  <string name="action_refresh">Obnovit</string>
+  <string name="hint_search_addressbook">Prohledat adresář</string>
+  <string name="action_reload_subscriptions">Znovu načíst odběry</string>
+  <string name="router_not_running">Tento router nepracuje</string>
+  <string name="stats_not_ready">Manažer statistik ještě není připraven. Zkuste to prosím později.</string>
+  <string name="no_graphs_configured">Žádné grafy nebyly konfigurovány. Můžete si vybrat převod statistik do grafů v menu nastavení. Jakékoliv změny se projeví po 60 sekundách.</string>
+  <string name="configure_graphs">Konfigurovat grafy</string>
+  <string name="country">Země</string>
+  <string name="version">Verze</string>
+  <string name="netdb_routers_empty">Žádné routery ve vaší NetDB</string>
+  <string name="netdb_leases_empty">Žádné LeaseSets ve vaší NetDB</string>
+  <string name="menu_settings">Nastavení</string>
+  <string name="settings_enable">Zapnout</string>
+  <string name="settings_label_network">Síť</string>
+  <string name="settings_label_appearance">Podoba</string>
+  <string name="settings_label_language">Jazyk</string>
+  <string name="settings_default">Výchozí</string>
+  <string name="settings_label_advanced">Pokročilé</string>
+  <string name="settings_label_expl_length">Délka</string>
+  <string name="settings_summ_expl_lengthVariance">%s</string>
+  <string name="menu_about">O programu</string>
+  <string name="about_version">Version:</string>
+  <string name="menu_help">Pomoc</string>
+  <string name="general">Hlavní</string>
+  <string name="addressbook_add_wizard_k_name">Jméno</string>
+  <string name="addressbook_add_wizard_k_destination">Cíl</string>
+  <string name="i2ptunnel_type_client">Standardní klient</string>
+  <string name="i2ptunnel_type_httpclient">Klient pro HTTP</string>
+  <string name="i2ptunnel_type_ircclient">Klient pro IRC</string>
+  <string name="i2ptunnel_type_server">Standardní server</string>
+  <string name="i2ptunnel_type_httpserver">HTTP server</string>
+  <string name="i2ptunnel_type_sockstunnel">SOCKS 4/4a/5 proxy</string>
+  <string name="i2ptunnel_type_socksirctunnel">SOCKS IRC proxy</string>
+  <string name="i2ptunnel_type_connectclient">CONNECT/SSL/HTTPS proxy</string>
+  <string name="i2ptunnel_type_ircserver">IRC server</string>
+  <string name="i2ptunnel_type_streamrclient">Streamr klient</string>
+  <string name="i2ptunnel_type_streamrserver">Streamr server</string>
+  <string name="i2ptunnel_type_httpbidirserver">HTTP bidir</string>
+  <string name="i2ptunnel_new_tunnel">Nový tunel</string>
+  <string name="i2ptunnel_msg_config_saved">Změny nastavení byly uloženy</string>
+  <string name="i2ptunnel_msg_config_save_failed">Nepodařilo se uložit nastavení</string>
+  <string name="i2ptunnel_msg_tunnel_starting">Startuji tunel</string>
+  <string name="i2ptunnel_msg_tunnel_stopping">Zastavuji tunel</string>
+  <string name="i2ptunnel_wizard_k_name">Jméno</string>
+  <string name="i2ptunnel_wizard_k_desc">Popis</string>
+  <string name="i2ptunnel_wizard_k_dest">Cíl</string>
+  <string name="i2ptunnel_wizard_k_outproxies">Výstupní proxy (Outproxies)</string>
+  <string name="next">Další</string>
+  <string name="prev">Předchozí</string>
+  <string name="finish">Předložit</string>
+  <string name="review">Revidovat</string>
+  <string name="enabled">Povoleno</string>
+  <string name="i2ptunnel_view_target">Cíl</string>
+  <string name="name">Jméno</string>
+  <string name="description">Popis</string>
+  <string name="outproxies">Výstupní proxy (Outproxies)</string>
+  <string name="use_ssl">Použít SSL</string>
+  <string name="access_control">Řízení přístupu</string>
+  <string name="disabled">Vypnuto</string>
+  <string name="whitelist">Seznam povolených (whitelist)</string>
+  <string name="blacklist">Seznam zakázaných (blacklist)</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="all">Vše</string>
+  <string name="no_messages">Žádné zprávy</string>
+</resources>

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

@@ -0,0 +1,94 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="label_tunnels">Tunneler</string>
+  <string name="label_status">Status</string>
+  <string name="label_addressbook">Adressebog</string>
+  <string name="label_logs">Logs</string>
+  <string name="label_news">Nyheder</string>
+  <string name="label_peers_status">Peers</string>
+  <string name="label_release_notes">Udgivelsesnoter</string>
+  <string name="label_browse">Brows</string>
+  <string name="label_graphs">Grafer</string>
+  <string name="hidden">Gemt</string>
+  <string name="testing">Tester</string>
+  <string name="firewalled">Firewalled</string>
+  <string name="symmetric_nat">Symmetric NAT</string>
+  <!--Parameter is a time, e.g. 32s or 2m-->
+  <string name="uptime">Oppetid</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".-->
+  <string name="char_server_tunnel">S</string>
+  <string name="download">Hente</string>
+  <string name="upload">Upload</string>
+  <string name="action_search">Søg</string>
+  <string name="action_add">Tilføje</string>
+  <string name="action_edit">Ændre</string>
+  <string name="action_delete">Slet</string>
+  <string name="action_reload">Genindlæs</string>
+  <string name="action_refresh">Genopfrisk</string>
+  <string name="statistics">Statistik</string>
+  <string name="routers">Routere</string>
+  <string name="leasesets">LeaseSets</string>
+  <string name="country">Land</string>
+  <string name="transport">Transport</string>
+  <string name="version">Version</string>
+  <string name="count">Antal</string>
+  <string name="tname_0">Gemt eller under opstart</string>
+  <string name="menu_settings">Indstillinger</string>
+  <string name="settings_enable">Aktiver</string>
+  <string name="settings_label_bandwidth">Båndbredde</string>
+  <string name="settings_label_network">Netværk</string>
+  <string name="settings_label_logging">Logning</string>
+  <string name="settings_label_default_log_level">Standard log niveau</string>
+  <string name="settings_label_appearance">Udseende</string>
+  <string name="settings_label_language">Sprog</string>
+  <string name="settings_default">Standard</string>
+  <string name="settings_label_advanced">Avanceret</string>
+  <string name="settings_label_transports">Transporter</string>
+  <string name="settings_label_expl_length">Længde</string>
+  <string name="settings_label_expl_quantity">Mængde</string>
+  <string name="settings_label_expl_backupQuantity">Reserve mængde</string>
+  <string name="menu_about">Om</string>
+  <string name="about_version">Version:</string>
+  <string name="menu_help">Hjælp</string>
+  <string name="general">Genarelt </string>
+  <string name="addressbook_add_wizard_k_name">Navn</string>
+  <string name="addressbook_add_wizard_k_destination">Destination</string>
+  <string name="i2ptunnel_type_client">Standard klient</string>
+  <string name="i2ptunnel_type_httpclient">HTTP klient</string>
+  <string name="i2ptunnel_type_ircclient">Klient for IRC</string>
+  <string name="i2ptunnel_type_server">Standard server</string>
+  <string name="i2ptunnel_type_httpserver">HTTP server</string>
+  <string name="i2ptunnel_type_sockstunnel">SOCKS 4/4a/5 proxy</string>
+  <string name="i2ptunnel_type_socksirctunnel">SOCKS IRC proxy</string>
+  <string name="i2ptunnel_type_connectclient">CONNECT/SSL/HTTPS proxy</string>
+  <string name="i2ptunnel_type_ircserver">Server for IRC</string>
+  <string name="i2ptunnel_type_streamrclient">Klient for Streamr</string>
+  <string name="i2ptunnel_type_streamrserver">Server for Streamr</string>
+  <string name="i2ptunnel_type_httpbidirserver">HTTP bidir</string>
+  <string name="i2ptunnel_new_tunnel">Ny Tunnel</string>
+  <string name="i2ptunnel_msg_config_saved">Konfiguration ændringer gemt</string>
+  <string name="i2ptunnel_msg_config_save_failed">Det mislykkedes at gemme konfigurationen</string>
+  <string name="i2ptunnel_msg_tunnel_starting">Starter tunnel</string>
+  <string name="i2ptunnel_msg_tunnel_stopping">Stopper tunnel</string>
+  <string name="i2ptunnel_wizard_k_name">Navn</string>
+  <string name="i2ptunnel_wizard_k_desc">Beskrivelse</string>
+  <string name="i2ptunnel_wizard_k_dest">Destination</string>
+  <string name="next">Næste</string>
+  <string name="prev">Foregående</string>
+  <string name="finish">Indsend</string>
+  <string name="review">Gennemgå</string>
+  <string name="enabled">Aktiveret</string>
+  <string name="i2ptunnel_view_target">Mål</string>
+  <string name="name">Navn</string>
+  <string name="description">Beskrivelse</string>
+  <string name="use_ssl">Brug SSL</string>
+  <string name="access_control">Adgangskontrol</string>
+  <string name="disabled">Deaktiveret</string>
+  <string name="http_client">HTTP klient</string>
+  <string name="username">Brugernavn</string>
+  <string name="password">Adgangskode</string>
+  <string name="other">Andet</string>
+  <string name="all">Alle</string>
+</resources>

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

@@ -10,7 +10,7 @@
   <string name="label_console">Konsole</string>
   <string name="label_addresses">Adressen</string>
   <string name="label_addressbook">Adressbuch</string>
-  <string name="label_i2ptunnel_client">Client Tunnel</string>
+  <string name="label_i2ptunnel_client">Clienttunnel</string>
   <string name="label_i2ptunnel_server">Servertunnel</string>
   <string name="label_logs">Statusberichte</string>
   <string name="label_error_logs">Fehlerprotokolle</string>
@@ -30,7 +30,7 @@
   <string name="testing">Im Test</string>
   <string name="firewalled">Durch Firewall geschützt</string>
   <string name="symmetric_nat">Symmetrisches NAT</string>
-  <string name="net_status_error_i2cp">Klientenmanager I2CP Fehler - bitte Fehlerberichte überprüfen</string>
+  <string name="net_status_error_i2cp">Clientmanager I2CP Fehler - bitte Fehlerberichte überprüfen</string>
   <!--Parameter is a time, e.g. 32s or 2m-->
   <string name="net_status_error_skew">Zeitabweichung von %s</string>
   <string name="net_status_error_unresolved_tcp">Nicht aufgelöste TCP-Adresse</string>
@@ -42,7 +42,7 @@
   <string name="net_status_error_no_active_peers">Keine aktiven Teilnehmer - überprüfen Sie die Netzwerkverbindung und Firewall</string>
   <string name="net_status_error_udp_disabled_tcp_not_set">UDP deaktiviert und eingehender TCP-Host/Port nicht festgelegt</string>
   <string name="net_status_warn_firewalled_udp_disabled">Mit Firewall und deaktiviertem UDP</string>
-  <string name="shared_clients">Mehrere Klienten</string>
+  <string name="shared_clients">Mehrere Clients</string>
   <string name="uptime">Betriebszeit</string>
   <string name="active_peers">Aktive Teilnehmer</string>
   <string name="known_peers">Bekannte Teilnehmer</string>
@@ -58,9 +58,9 @@
   <string name="first_start_title">Herzlichen Glückwunsch, Sie haben I2P installiert!</string>
   <string name="first_start_welcome"><b>Willkommen im I2P</b> Bitte <b>haben Sie Geduld</b>, während I2P startet und Teilnehmer findet.</string>
   <string name="first_start_read">Lesen Sie bitte die Veröffentlichungshinweise und die Startseite während Sie warten.</string>
-  <string name="first_start_faq">Sobald Sie Kliententunnels haben, <b>lesen</b> Sie bitte unsere FAQ:</string>
-  <string name="first_start_faq_nonanon">Oder verwenden Sie unsere nicht-anonymen Links, wenn Sie nicht auf die Tunnel warten wollen.</string>
-  <string name="first_start_irc">Verbinden Sie Ihren IRC-Klienten mit <b>localhost:6668</b> und schauen Sie bei uns vorbei:</string>
+  <string name="first_start_faq">Sobald Sie Clienttunnel haben, <b>lesen</b> Sie bitte unsere FAQ:</string>
+  <string name="first_start_faq_nonanon">Oder verwenden Sie unseren nicht-anonymen Link, wenn Sie nicht auf die Tunnel warten wollen:</string>
+  <string name="first_start_irc">Verbinden Sie Ihren IRC-Client mit <b>localhost:6668</b> und schauen Sie bei uns vorbei:</string>
   <string name="action_search">Suche</string>
   <string name="action_add">Hinzufügen</string>
   <string name="action_edit">Bearbeiten</string>
@@ -102,8 +102,8 @@
   <string name="notification_status_waiting">I2P wartet auf eine Netzwerkverbindung</string>
   <string name="notification_status_starting_after_waiting">Netzwerk verbunden, I2P wird gestartet</string>
   <string name="notification_status_running">I2P läuft</string>
-  <string name="notification_status_client_ready">Client-Tunnel sind bereit</string>
-  <string name="notification_status_client_down">Client-Tunnel sind außer Betrieb</string>
+  <string name="notification_status_client_ready">Clienttunnel sind bereit</string>
+  <string name="notification_status_client_down">Clienttunnel sind außer Betrieb</string>
   <string name="notification_status_graceful">I2P wird in %s gestoppt</string>
   <string name="notification_status_stopping">I2P wird gestoppt</string>
   <string name="notification_status_stopping_after_net">Netzwerk getrennt, I2P wird gestoppt</string>
@@ -112,13 +112,13 @@
   <string name="notification_status_bw">Bandbreite: %1$sB/s eingehend / %2$sB/s ausgehend</string>
   <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">Kliententunnel: %1$d/%2$d</string>
+  <string name="notification_status_client">Clienttunnel: %1$d/%2$d</string>
   <string name="menu_settings">Einstellungen</string>
   <string name="settings_enable">Erlauben</string>
   <string name="settings_desc_subscriptions">Abonnements-URLs</string>
   <string name="settings_label_bandwidth_net">Bandbreite und Netzwerk</string>
-  <string name="settings_label_startOnBoot">Beim booten I2P starten</string>
-  <string name="settings_desc_startOnBoot">Automatisch zu I2P verbinden wenn dieses Android Gerät startet</string>
+  <string name="settings_label_startOnBoot">Beim Booten I2P starten</string>
+  <string name="settings_desc_startOnBoot">Automatisch zu I2P verbinden wenn dieses Android-Gerät startet</string>
   <string name="settings_label_bandwidth">Bandbreite</string>
   <string name="settings_label_bw_inbound">Eingehende Übertragungsgeschwindigkeit</string>
   <string name="settings_desc_bw_inbound">Maximale eingehende Übertragungsgeschwindigkeit</string>
@@ -145,7 +145,7 @@
   <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">Auf Port 7654 lauschen</string>
+  <string name="settings_desc_i2cp">Erlaube anderen Applikationen das Erzeugen von Tunneln (benötigt ein Neustart des Routers)</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>
@@ -186,22 +186,22 @@
   <string name="nsu_iae_cannot_end_with">Hostnamen dürfen nicht auf \"%s\" enden</string>
   <string name="nsu_iae_cannot_contain">Hostnamen dürfen kein \"%s\" beinhalten</string>
   <string name="nsu_iae_requires_conversion">Hostname \"%s\" muss nach ASCII konvertiert werden, aber die Konvertierungsbibliothek ist in deiner Android-Version nicht verfügbar.</string>
-  <string name="i2ptunnel_type_client">Standardklient</string>
-  <string name="i2ptunnel_type_httpclient">HTTP-Klient</string>
-  <string name="i2ptunnel_type_ircclient">IRC-Klient</string>
+  <string name="i2ptunnel_type_client">Standardclient</string>
+  <string name="i2ptunnel_type_httpclient">HTTP-Client</string>
+  <string name="i2ptunnel_type_ircclient">IRC-Client</string>
   <string name="i2ptunnel_type_server">Standard-Server</string>
   <string name="i2ptunnel_type_httpserver">HTTP-Server</string>
   <string name="i2ptunnel_type_sockstunnel">SOCKS-4/4a/5-Proxy</string>
   <string name="i2ptunnel_type_socksirctunnel">SOCKS IRC-Proxy</string>
   <string name="i2ptunnel_type_connectclient">CONNECT/SSL/HTTPS-Proxy</string>
   <string name="i2ptunnel_type_ircserver">IRC-Server</string>
-  <string name="i2ptunnel_type_streamrclient">Streamr-Klient</string>
+  <string name="i2ptunnel_type_streamrclient">Streamr-Client</string>
   <string name="i2ptunnel_type_streamrserver">Streamr-Server</string>
   <string name="i2ptunnel_type_httpbidirserver">HTTP bidirektional</string>
   <string name="install_recommended_app">Empfohlene App installieren?</string>
   <string name="app_needed_for_this_tunnel_type">Sie müssen eine App installieren, um diesen Tunnel nutzen zu können. Möchten Sie die empfohlene App installieren?</string>
   <string name="i2ptunnel_not_initialized">Tunnel sind noch nicht initialisiert. Bitte laden Sie die Seite in zwei Minuten erneut.</string>
-  <string name="no_configured_client_tunnels">Keine konfigurierten Client-Tunnel.</string>
+  <string name="no_configured_client_tunnels">Keine konfigurierten Clienttunnel.</string>
   <string name="no_configured_server_tunnels">Keine konfigurierten Server-Tunnel.</string>
   <string name="i2ptunnel_new_tunnel">Neuer Tunnel</string>
   <string name="i2ptunnel_msg_config_saved">Änderungen gespeichert</string>
@@ -211,8 +211,8 @@
   <string name="i2ptunnel_delete_confirm_message">Tunnel löschen?</string>
   <string name="i2ptunnel_delete_confirm_button">Tunnel löschen</string>
   <string name="i2ptunnel_no_tunnel_details">Tunneldetails konnten nicht geladen werden</string>
-  <string name="i2ptunnel_wizard_k_client_server">Klient oder Server</string>
-  <string name="i2ptunnel_wizard_v_client">Kliententunnel</string>
+  <string name="i2ptunnel_wizard_k_client_server">Client oder Server</string>
+  <string name="i2ptunnel_wizard_v_client">Clienttunnel</string>
   <string name="i2ptunnel_wizard_v_server">Servertunnel</string>
   <string name="i2ptunnel_wizard_k_type">Tunneltyp</string>
   <string name="i2ptunnel_wizard_k_name">Name</string>
@@ -231,12 +231,12 @@
   <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 Klient-Tunnel verbinden soll. Dies kann ein kompletter Base 64 Ziel-Schlüssel oder ein I2P Hostname von Ihrem Adressbuch sein.</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>
   <string name="i2ptunnel_wizard_desc_reachable_on">Dies legt fest, welche Computer oder Smartphones den Tunnel erreichen können.</string>
-  <string name="i2ptunnel_wizard_desc_binding_port">Dies ist der Port, über den der Klient den Tunnel lokal erreichen kann. Das ist auch der Klient-Port des bidirektionalen HTTP-Server-Tunnels.</string>
+  <string name="i2ptunnel_wizard_desc_binding_port">Dies ist der Port, auf dem der Client auf den Tunnel lokal zugreifen kann. Das ist auch der Client-Port des bidirektionalen HTTP-Servertunnels.</string>
   <string name="i2ptunnel_wizard_desc_auto_start">Soll der Tunnel automatisch mit dem Router starten?</string>
   <string name="i2ptunnel_wizard_submit_confirm_message">Tunnel erstellen?</string>
   <string name="i2ptunnel_wizard_submit_confirm_button">Tunnel erstellen</string>
@@ -250,8 +250,8 @@
   <string name="auto_start">Automatischer Start</string>
   <string name="tunnel_summ_auto_start">Tunnel mit dem Router starten.</string>
   <string name="tunnel_cat_ports">Lokale Ports</string>
-  <string name="shared_client">Gemeinsamer Klient</string>
-  <string name="tunnel_summ_shared_client">Benutzt die selbe Destiantion und Tunnel wie andere geteilte Klienten </string>
+  <string name="shared_client">Gemeinsamer Client</string>
+  <string name="tunnel_summ_shared_client">Benutzt dasselbe Ziel und denselben Tunnel wie andere geteilte Clients</string>
   <string name="target_destination">Zielort</string>
   <string name="persistent_key">Persistenter Schlüssel</string>
   <string name="persistent_key_conflict_title">Neue Schlüssel beim erneuten Öffnen deaktivieren?</string>
@@ -259,13 +259,13 @@
   <string name="tunnel_summ_persistent_key">Ziel des Tunnels bei einem Neustart beibehalten</string>
   <string name="reachable_on">Erreichbarkeit ein</string>
   <string name="listen_port">Lauschport</string>
-  <string name="client_ssl">Klient-SSL</string>
-  <string name="tunnel_summ_client_ssl">Klienten müssen SSL zum Verbinden verwenden</string>
+  <string name="client_ssl">Client-SSL</string>
+  <string name="tunnel_summ_client_ssl">Clients müssen mit SSL verbinden</string>
   <string name="outproxies">Ausgangsproxies</string>
   <string name="ssl_outproxies">SSL-Ausgangsproxies</string>
   <string name="irc">IRC</string>
   <string name="enable_dcc">DCC aktivieren</string>
-  <string name="tunnel_summ_enable_dcc">IRC-Klienten die Verwendung von DCC erlauben</string>
+  <string name="tunnel_summ_enable_dcc">IRC-Clients die Verwendung von DCC erlauben</string>
   <string name="website_domain_name">Webseiten-Domainname</string>
   <string name="target_host">Zielhost</string>
   <string name="target_port">Zielport</string>
@@ -289,7 +289,7 @@
   <string name="tunnel_summ_unique_local">Verwenden Sie eindeutige localhost-IPs für jeden Client</string>
   <string name="multihome">Multihome</string>
   <string name="tunnel_summ_multihome">Aktiviere Optimierungen fürs Multihoming</string>
-  <string name="client_connection_limits">Klient-Verbindungsbegrenzungen</string>
+  <string name="client_connection_limits">Client-Verbindungsbegrenzungen</string>
   <string name="connections_per_minute">Verbindungen pro Minute</string>
   <string name="connections_per_hour">Verbindungen pro Stunde</string>
   <string name="connections_per_day">Verbindungen pro Tag</string>
@@ -306,7 +306,7 @@
   <string name="post_limits">POST-Begrenzungen</string>
   <string name="limit_period">Zeitabschnitt begrenzen</string>
   <string name="client_posts_per_period">Client-POSTs pro Zeitabschnitt</string>
-  <string name="client_ban_length">Länge der Bannzeit für Klienten</string>
+  <string name="client_ban_length">Länge der Bannzeit für Clients</string>
   <string name="total_posts_per_period">Gesamte POSTs pro Zeitabschnitt</string>
   <string name="total_ban_length">Totale Bannzeit</string>
   <string name="power_saving">Energie sparen</string>
@@ -321,7 +321,7 @@
   <string name="new_keys_on_reopen">Neue Schlüssel beim erneuten Öffnen</string>
   <string name="new_keys_on_reopen_conflict_title">Permanente Schlüssel deaktivieren?</string>
   <string name="new_keys_on_reopen_conflict_msg">Sie können die Funktion \"Neue Schlüssel beim Start des Tunnels\" nicht nutzen während \"dauerhafter Schlüssel\" aktiviert ist. Möchten Sie \"dauerhafter Schlüssel\" deaktivieren?</string>
-  <string name="http_client">HTTP-Klient</string>
+  <string name="http_client">HTTP-Client</string>
   <string name="tunnel_summ_user_agent">\"Benutzer-Agent\"-Kopfzeile durchleiten</string>
   <string name="tunnel_summ_referer">\"Referer\"-Kopfzeile durchleiten</string>
   <string name="tunnel_summ_accept">\"Accept-*\"-Kopfzeilen durchleiten</string>

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

@@ -0,0 +1,101 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="desc_i2p_logo">I2P λογότυπο</string>
+  <string name="choose_language">Επιλογή  Γλώσσας</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_logs">Εγγραφές</string>
+  <string name="label_error_logs">Λάθη Εγγραφών</string>
+  <string name="label_news">Νέα</string>
+  <string name="label_peers_status">Ομότιμοι</string>
+  <string name="label_release_notes">Σημειώσεις έκδοσης</string>
+  <string name="label_licenses">Αδειες</string>
+  <string name="label_browse">Περιήγηση</string>
+  <string name="label_graphs">Γραφήματα</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_info_disconnected">Αποσυνδέθηκε-ελένξετε την σύνδεση Δικτύου</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".-->
+  <string name="char_server_tunnel">S</string>
+  <string name="download">Κατέβασμα</string>
+  <string name="upload">Ανέβασμα</string>
+  <string name="first_start_title">Συνχαριτήρια για την εγκατάσταση του  I2P!</string>
+  <string name="action_search">Αναζήτηση</string>
+  <string name="action_add">Προσθήκη</string>
+  <string name="action_edit">Επεξεργασία</string>
+  <string name="action_delete">Διαγραφή</string>
+  <string name="action_i2ptunnel_start">Εκκίνηση τούνελ</string>
+  <string name="action_i2ptunnel_stop">Σταματημα τούνελ</string>
+  <string name="action_i2ptunnel_start_all">Εκκίνηση όλων των τούνελ</string>
+  <string name="action_i2ptunnel_stop_all">Σταματημα όλων των τούνελ</string>
+  <string name="action_i2ptunnel_restart_all">Επανεκκίνηση όλων των τούνελ</string>
+  <string name="action_reload">Επαναφόρτωση</string>
+  <string name="action_refresh">Ανανέωση</string>
+  <string name="hint_search_addressbook">Αναζήτηση βιβλίου διευθήνσεων</string>
+  <string name="news_updated">Νέα ανανεώθηκαν</string>
+  <string name="router_not_running">Ο ρούτερ δέν τρέχει.</string>
+  <string name="select_an_address">Επιλέξτε μια διεύθυνση.</string>
+  <string name="statistics">Στατιστικά</string>
+  <string name="routers">Δρομολογητές</string>
+  <string name="countries">Χώρες</string>
+  <string name="country">Χώρα</string>
+  <string name="transport">Transport</string>
+  <string name="versions">Εκδόσεις</string>
+  <string name="version">Εκδοση</string>
+  <string name="count">Υπολογισμός</string>
+  <string name="tname_0">Κρυμμένο κατά την εκκίνηση</string>
+  <string name="menu_settings">Ρυθμίσεις</string>
+  <string name="settings_enable">Ενεργοποίηση </string>
+  <string name="settings_label_bandwidth">Εύρος Ζώνης</string>
+  <string name="settings_label_network">Δίκτυο</string>
+  <string name="settings_label_hiddenMode">Συμμετοχή</string>
+  <string name="settings_label_logging">Συνδέεται </string>
+  <string name="settings_label_appearance">Εμφάνιση</string>
+  <string name="settings_label_language">Γλώσσα</string>
+  <string name="settings_default">Εξ\'ορισμού</string>
+  <string name="settings_label_advanced">Προχωρημένα</string>
+  <string name="settings_label_expl_length">Μήκος</string>
+  <string name="settings_summ_expl_lengthVariance">%s</string>
+  <string name="settings_label_expl_quantity">Ποσότητα</string>
+  <string name="menu_about">Σχετικά με</string>
+  <string name="about_version">Έκδοση</string>
+  <string name="about_project">Project Home:</string>
+  <string name="menu_help">Βοήθεια</string>
+  <string name="general">Γενικά</string>
+  <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="i2ptunnel_type_httpserver">Διακομιστής HTTP</string>
+  <string name="i2ptunnel_new_tunnel">Νέο Τούνελ</string>
+  <string name="i2ptunnel_wizard_k_name">Όνομα</string>
+  <string name="i2ptunnel_wizard_k_desc">Περιγραφή</string>
+  <string name="i2ptunnel_wizard_k_dest">Προορισμός</string>
+  <string name="next">Επόμενο</string>
+  <string name="prev">Προηγούμενο</string>
+  <string name="finish">Υποβολή</string>
+  <string name="review">Ανασκόπηση</string>
+  <string name="enabled">Ενεργοποιημένο</string>
+  <string name="i2ptunnel_view_target">Στόχος</string>
+  <string name="name">Όνομα</string>
+  <string name="description">Περιγραφή</string>
+  <string name="use_ssl">Χρήση SSL</string>
+  <string name="profile">Προφίλ</string>
+  <string name="access_control">Έλεγχος πρόσβασης</string>
+  <string name="disabled">Απενεργοποιημένο</string>
+  <string name="whitelist">Λίστα Επιτρεπόμενων</string>
+  <string name="unlimited">Απεριόριστο</string>
+  <string name="username">Όνομα χρήστη</string>
+  <string name="password">Κωδικός</string>
+  <string name="other">Άλλ</string>
+  <string name="all">Όλοι</string>
+  <string name="no_messages">Κανένα μήνυμα</string>
+  <string name="logs_copied_to_clipboard">Τα αρχεία καταγραφής αντιγράφηκαν στο πρόχειρο</string>
+</resources>

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

@@ -145,7 +145,6 @@
   <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">Escuchar el puerto 7654</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>

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

@@ -0,0 +1,224 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="desc_i2p_logo">لوگو I2P</string>
+  <string name="choose_language">انتخاب زبان</string>
+  <string name="welcome_new_install">به I2P خوش آمدید! این اپلیکیشن برنامه ی 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_logs">گزارش ها</string>
+  <string name="label_error_logs">گزارش خطاها</string>
+  <string name="label_news">اخبار</string>
+  <string name="label_peers_status">همتایان</string>
+  <string name="label_release_notes">توضیحات انتشار</string>
+  <string name="label_licenses">گواهینامه ها</string>
+  <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_graceful">I2P در %s خاموش خواهد شد</string>
+  <string name="no_internet">هیچ اتصال اینترنتی موجود نمی باشد</string>
+  <string name="hidden">پنهان</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>
+  <string name="net_status_error_private_tcp">آدرس TCP خصوصی</string>
+  <string name="shared_clients">کلاینت های به اشتراک گذاشته شده</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".-->
+  <string name="char_server_tunnel">S</string>
+  <string name="download">بارگذاری</string>
+  <string name="upload">آپلود</string>
+  <string name="configure_browser_title">پیکربندی مرورگر؟</string>
+  <string name="first_start_title">تبریک بابت نصب I2P!</string>
+  <string name="action_search">جستجو</string>
+  <string name="action_add">اضافه کردن</string>
+  <string name="action_edit">ویرایش </string>
+  <string name="action_delete">پاک کردن</string>
+  <string name="action_i2ptunnel_start">شروع تونل</string>
+  <string name="action_i2ptunnel_stop">توقف تونل</string>
+  <string name="action_i2ptunnel_start_all">شروع تمام تونل ها</string>
+  <string name="action_i2ptunnel_stop_all">توقف تمام تونل ها</string>
+  <string name="action_i2ptunnel_restart_all">راه اندازی مجدد تمام تونل ها</string>
+  <string name="action_reload">بارگذاری مجدد</string>
+  <string name="action_refresh">تازه کردن</string>
+  <string name="hint_search_addressbook">جستجو دفتر آدرس ها</string>
+  <string name="action_reload_subscriptions">بارگذاری مجدد اشتراک ها</string>
+  <string name="news_last_updated">اخبار آخرین بار %s پیش به روز رسانی شد</string>
+  <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="select_an_address">یک آدرس انتخاب کنید.</string>
+  <string name="configure_graphs">پیکربندی گراف ها</string>
+  <string name="graphs_not_ready">گراف ها هنوز آماده نیستند. لطفا بعدا تلاش کنید.</string>
+  <string name="statistics">آمار</string>
+  <string name="routers">روترها</string>
+  <string name="countries">کشورها</string>
+  <string name="country">کشور</string>
+  <string name="transport">انتقال</string>
+  <string name="versions">نسخه ها</string>
+  <string name="version">نسخه</string>
+  <string name="notification_status_starting">I2P در حال شروع می باشد</string>
+  <string name="notification_status_restarting">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_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_peers">همتایان: %1$d فعال، %2$d شناخته شده</string>
+  <string name="notification_status_client">تونل های کلاینت: %1$d/%2$d</string>
+  <string name="menu_settings">تنظیمات</string>
+  <string name="settings_enable">فعّال</string>
+  <string name="settings_desc_subscriptions">آدرس های اینترنتی اشتراک</string>
+  <string name="settings_label_bandwidth_net">پهنای باند و شبکه</string>
+  <string name="settings_label_startOnBoot">شروع I2P در هنگام بوت</string>
+  <string name="settings_label_bandwidth">پهنای باند</string>
+  <string name="settings_label_bw_inbound">سرعت ورودی</string>
+  <string name="settings_label_bw_outbound">سرعت خروجی</string>
+  <string name="settings_label_network">شبکه</string>
+  <string name="settings_label_hiddenMode">مشارکت</string>
+  <string name="settings_desc_hiddenMode">خاموش کردن حالت پنهان</string>
+  <string name="settings_label_sharePercent">اشتراک گذاری درصد</string>
+  <string name="settings_desc_upnp">باز کردن درگاه های دیوار آتشین به صورت خودکار</string>
+  <string name="settings_label_appearance">ظاهر</string>
+  <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_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_exploratory_pool">پارامتر های تونل</string>
+  <string name="settings_label_expl_length">طول</string>
+  <string name="settings_summ_expl_length">%s واسطه</string>
+  <string name="settings_summ_expl_lengthVariance">%s</string>
+  <string name="settings_label_expl_quantity">تعداد</string>
+  <string name="settings_summ_expl_quantity">%s تونل</string>
+  <string name="settings_summ_expl_backupQuantity">%s تونل</string>
+  <string name="menu_about">درباره</string>
+  <string name="about_version">نسخه:</string>
+  <string name="about_project">خانه پروژه:</string>
+  <string name="about_bugs">باگ ها و پشتیبانی:</string>
+  <string name="about_helpwanted">نیاز به کمک داریم!</string>
+  <string name="about_volunteer">آیا میخواهید کمک کنید تا برنامه را بهبود ببخشید؟ روی انجمن اندروید داوطلب شوید:</string>
+  <string name="menu_help">راهنمایی</string>
+  <string name="general">عمومی</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>
+  <string name="addressbook_add_wizard_k_destination">مقصد</string>
+  <string name="addressbook_add_wizard_desc_name">نام</string>
+  <string name="nsu_iae_cannot_contain">نام میزبان نمی تواند حاوی \"%s\" باشد</string>
+  <string name="i2ptunnel_type_client">کلاینت استاندارد</string>
+  <string name="i2ptunnel_type_httpclient">کلاینت HTTP</string>
+  <string name="i2ptunnel_type_ircclient">کلاینت IRC</string>
+  <string name="i2ptunnel_type_server">سرور استاندارد</string>
+  <string name="i2ptunnel_type_httpserver">سرور HTTP</string>
+  <string name="i2ptunnel_type_ircserver">سرور IRC</string>
+  <string name="i2ptunnel_type_streamrclient">کلاینت Streamr</string>
+  <string name="i2ptunnel_type_streamrserver">سرور Streamr</string>
+  <string name="install_recommended_app">نصب برنامه پیشنهاد شده؟</string>
+  <string name="i2ptunnel_not_initialized">تونل ها فعلا مقداردهی اولیه نشده اند، لطفا در 2 دقیقه دیگر بارگذاری مجدد کنید.</string>
+  <string name="i2ptunnel_new_tunnel">تونل جدید</string>
+  <string name="i2ptunnel_msg_config_saved">تغییرات پیکربندی ذخیره شد</string>
+  <string name="i2ptunnel_msg_config_save_failed">ناموفقیت در ذخیره سازی پیکربندی</string>
+  <string name="i2ptunnel_msg_tunnel_starting">شروع تونل</string>
+  <string name="i2ptunnel_msg_tunnel_stopping">توقف تونل</string>
+  <string name="i2ptunnel_delete_confirm_message">حذف تونل؟</string>
+  <string name="i2ptunnel_delete_confirm_button">حذف تونل</string>
+  <string name="i2ptunnel_wizard_k_client_server">کلاینت یا سرور</string>
+  <string name="i2ptunnel_wizard_v_client">تونل کلاینت</string>
+  <string name="i2ptunnel_wizard_v_server">تونل سرور</string>
+  <string name="i2ptunnel_wizard_k_type">نوع تونل</string>
+  <string name="i2ptunnel_wizard_k_name">نام</string>
+  <string name="i2ptunnel_wizard_k_desc">شرح</string>
+  <string name="i2ptunnel_wizard_k_dest">مقصد</string>
+  <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_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_submit_confirm_message">ایجاد تونل؟</string>
+  <string name="i2ptunnel_wizard_submit_confirm_button">ایجاد تونل</string>
+  <string name="i2ptunnel_view_target">هدف</string>
+  <string name="i2ptunnel_view_access_point">نقطه دسترسی</string>
+  <string name="i2ptunnel_view_autostart">شروع-خودکار</string>
+  <string name="address_copied_to_clipboard">آدرس به کلیپ بورد کپی شد</string>
+  <string name="edit_tunnel">ویرایش تونل</string>
+  <string name="name">نام</string>
+  <string name="description">شرح</string>
+  <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="target_destination">مقصد هدف</string>
+  <string name="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="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="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="unique_local">محل یکتا</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="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="post_limits">محدودیت های POST</string>
+  <string name="limit_period">دوره محدودیت</string>
+  <string name="reduce_quantity">کاهش تعداد</string>
+  <string name="num_minutes">%s دقیقه</string>
+  <string name="new_keys_on_reopen_conflict_title">غیرفعال سازی کلید های مداوم؟</string>
+  <string name="http_client">کلاینت HTTP</string>
+  <string name="jump_url_list">پرش لیست آدرس اینترنتی</string>
+  <string name="proxy_auth">احراز هویت پراکسی</string>
+  <string name="username">نام کاربری</string>
+  <string name="password">رمز عبور</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>
+  <string name="label_browser_configuration">پیکربندی مرورگر</string>
+</resources>

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

@@ -67,13 +67,18 @@
   <string name="action_reload">Lataa uudelleen</string>
   <string name="action_refresh">Virkistä</string>
   <string name="hint_search_addressbook">Etsi osoitekirja</string>
+  <string name="action_reload_subscriptions">Lataa tilaukset uudelleen</string>
   <string name="news_last_updated">Uutisdt päivitetty viimeksi %s sitten</string>
   <string name="news_last_checked">Uutiset viimeksi tarkistettu %s sitten</string>
   <string name="news_updated">Uutiset päivitetty</string>
   <string name="view_news">Napauta viimeisimpien I2P-uutisten katselemiseksi</string>
   <string name="router_not_running">Reititin ei ole käynnissä.</string>
   <string name="router_shutting_down">Reititin sulkeutuu.</string>
+  <string name="stats_not_ready">Tilastointihallinta ei ole vielä valmis. Yritä myöhemmin uudelleen.</string>
   <string name="select_an_address">Valitse osoite.</string>
+  <string name="no_graphs_configured">Yhtään graafista esitystä ei ole asetettu. Voit valita graafisen esityksen tilastot asetukset-valikosta. Kaikki muutokset tulevat voimaan 60 sekunnin jälkeen.</string>
+  <string name="configure_graphs">Aseta graafisia esityksiä</string>
+  <string name="graphs_not_ready">Graafiset esitykset eivät ole vielä valmiina. Yritä myöhemmin uudelleen.</string>
   <string name="statistics">Tilastot</string>
   <string name="routers">Reitittimet</string>
   <string name="countries">Maat</string>
@@ -82,6 +87,7 @@
   <string name="versions">Versiot</string>
   <string name="version">Versio</string>
   <string name="count">Lukumäärä</string>
+  <string name="netdb_routers_empty">Sinun NetDB-verkossa ei ole reitittimiä.</string>
   <string name="notification_status_starting">I2P on käynnistymässä</string>
   <string name="notification_status_restarting">I2P on käynnistymässä uudelleen</string>
   <string name="notification_status_waiting">I2P odottaa verkkoyhteyttä</string>
@@ -109,8 +115,14 @@
   <string name="settings_label_bw_outbound">Lähtönopeus</string>
   <string name="settings_desc_bw_outbound">Enimmäislähtönopeus</string>
   <string name="settings_label_network">Verkko</string>
+  <string name="settings_label_hiddenMode">Osallistuminen</string>
   <string name="settings_desc_hiddenMode">Käännä piilotila pois päältä</string>
+  <string name="settings_label_maxPartTunnels">Niiden tunneleiden enimmäismäärä, joihin osallistutaan</string>
+  <string name="settings_desc_maxPartTunnels">Niiden tunneleiden enimmäismäärä, joihin osallistutaan (oletus=20)</string>
+  <string name="settings_dialog_maxPartTunnels">Niiden tunneleiden enimmäismäärä, joihin osallistutaan</string>
   <string name="settings_label_sharePercent">Jakoprosentti</string>
+  <string name="settings_desc_sharePercent">Jaettavan kaistanleveyden prosenttiosuus (oletus=80)</string>
+  <string name="settings_dialog_sharePercent">Jaettavan kaistanleveyden prosenttiosuus</string>
   <string name="settings_desc_upnp">Avaa palomuuriportit automaattisesti</string>
   <string name="settings_label_logging">Lokit</string>
   <string name="settings_label_default_log_level">Oletus loggaustaso</string>
@@ -119,10 +131,11 @@
   <string name="settings_default">Oletus</string>
   <string name="settings_label_advanced">Lisätietoja</string>
   <string name="settings_label_showStats">Reititintilastot</string>
+  <string name="settings_summ_showStats">Näytä lisätilastoja pääkonsoli-ikkunassa</string>
   <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">Kuuntele portissa 7654</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>
@@ -160,6 +173,7 @@
   <string name="i2ptunnel_type_streamrserver">Streamr-palvelin</string>
   <string name="i2ptunnel_type_httpbidirserver">HTTP bidir</string>
   <string name="install_recommended_app">Asennetaanko suositeltu sovellus?</string>
+  <string name="app_needed_for_this_tunnel_type">Sinun on asennettava sovellus tämän tunnelin käyttämiseksi. Haluaisitko asentaa suositellun sovelluksen?</string>
   <string name="i2ptunnel_not_initialized">Tunneleita ei ole vielä alustettu, lataa uudelleen kahdessa minuutissa.</string>
   <string name="i2ptunnel_new_tunnel">Uusi tunneli</string>
   <string name="i2ptunnel_msg_tunnel_starting">Käynnistetään tunneli</string>
@@ -199,6 +213,7 @@
   <string name="use_ssl">Käytä SSL:ää</string>
   <string name="tunnel_parameters">Tunneliparametrit</string>
   <string name="profile">Profiili</string>
+  <string name="access_control">Käyttöoikeuksien hallinta</string>
   <string name="disabled">Otettu pois käytöstä</string>
   <string name="whitelist">Valkoinen lista</string>
   <string name="blacklist">Musta lista</string>

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

@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">I2P</string>
-  <string name="desc_i2p_logo">Logo I2P</string>
+  <string name="desc_i2p_logo">Logo d’I2P</string>
   <string name="choose_language">Choisir la langue</string>
-  <string name="welcome_new_install">Bienvenue sur I2P ! Cette appli est un logiciel en version ALPHA de développement et n’offre pas un niveau d’anonymat élevé. Veuillez lire les notes de mise à jour et les informations de licence.</string>
-  <string name="welcome_new_version">La nouvelle version est installée. Veuillez lire les notes de mise à jour. Version :</string>
+  <string name="welcome_new_install">Bienvenue sur I2P ! Cette appli est un logiciel en version ALPHA et n’offre pas un niveau d’anonymat élevé. Veuillez lire les notes de mise à jour et les informations de licence.</string>
+  <string name="welcome_new_version">La nouvelle version est installée. Veuillez lire les notes de mise à jour. Version :</string>
   <string name="label_tunnels">Tunnels</string>
   <string name="label_status">État</string>
   <string name="label_console">Console</string>
@@ -26,22 +26,22 @@
   <string name="button_shutdown_now">Appuyer longuement pour arrêter maintenant</string>
   <string name="button_cancel_graceful">Appuyer longuement pour annuler la fermeture</string>
   <string name="no_internet">Aucune connexion Internet n’est disponible</string>
-  <string name="hidden">Caché</string>
-  <string name="testing">En test</string>
-  <string name="firewalled">Derrière un pare-feu</string>
-  <string name="symmetric_nat">Traduction d’adresses réseau symétrique</string>
-  <string name="net_status_error_i2cp">Erreur I2CP du gestionnaire de clients - Vérifier les journaux</string>
+  <string name="hidden">caché</string>
+  <string name="testing">en test</string>
+  <string name="firewalled">derrière un pare-feu</string>
+  <string name="symmetric_nat">traduction d’adresses réseau symétrique</string>
+  <string name="net_status_error_i2cp">Erreur I2CP du gestionnaire de clients — Vérifier les journaux</string>
   <!--Parameter is a time, e.g. 32s or 2m-->
   <string name="net_status_error_skew">Décalage d’horloge de %s</string>
   <string name="net_status_error_unresolved_tcp">Adresse TCP non résolue</string>
   <string name="net_status_error_private_tcp">Adresse TCP privée</string>
-  <string name="net_status_warn_firewalled_inbound_tcp">Derrière un pare-feu avec le TCP entrant activé</string>
-  <string name="net_status_warn_firewalled_floodfill">Derrière un pare-feu et remplissage par diffusion</string>
-  <string name="net_status_info_disconnected">Déconnecté - Vérifier la connexion réseau</string>
-  <string name="net_status_error_udp_port">Le port UDP est utilisé - Le changer dans les paramètres et redémarrer</string>
-  <string name="net_status_error_no_active_peers">Aucun pair actif - Vérifier la connexion au réseau et le pare-feu</string>
+  <string name="net_status_warn_firewalled_inbound_tcp">derrière un pare-feu avec le TCP entrant activé</string>
+  <string name="net_status_warn_firewalled_floodfill">derrière un pare-feu et remplissage par diffusion</string>
+  <string name="net_status_info_disconnected">Déconnecté — Vérifiez la connexion réseau</string>
+  <string name="net_status_error_udp_port">Le port UDP est utilisé — Changez-le dans les paramètres et redémarrer</string>
+  <string name="net_status_error_no_active_peers">Aucun pair actif — Vérifiez la connexion au réseau et le pare-feu</string>
   <string name="net_status_error_udp_disabled_tcp_not_set">L’UDP est désactivé et les port et hôte TCP entrants ne sont pas définis</string>
-  <string name="net_status_warn_firewalled_udp_disabled">Derrière un pare-feu avec UDP désactivé</string>
+  <string name="net_status_warn_firewalled_udp_disabled">derrière un pare-feu avec UDP désactivé</string>
   <string name="shared_clients">Clients partagés</string>
   <string name="uptime">Durée d’activité</string>
   <string name="active_peers">Pairs actifs</string>
@@ -53,14 +53,16 @@
   <string name="no_tunnels_running">Aucun tunnel n’est encore en fonction.</string>
   <string name="download">Téléchargement</string>
   <string name="upload">Téléversement</string>
-  <string name="configure_browser_title">Configurer le navigateur ?</string>
-  <string name="configure_browser_for_i2p">Souhaitez-vous configurer un navigateur pour visualiser les sites I2P ? (vous pouvez aussi le faire plus tard grâce au menu d’aide)</string>
-  <string name="first_start_title">Félicitations pour votre installation d’I2P !</string>
-  <string name="first_start_welcome"><b>Bienvenue sur I2P !</b> Veuillez <b>patienter</b> pendant qu’I2P s’amorce et trouve des pairs.</string>
+  <string name="configure_browser_title">Configurer le navigateur ?</string>
+  <string name="configure_browser_for_i2p">Souhaitez-vous configurer un navigateur pour visualiser les sites I2P ? (Vous pouvez aussi le faire plus tard grâce au menu d’aide.)</string>
+  <string name="configure_no_doze_title">Gérer les optimisations de la pile ?</string>
+  <string name="configure_no_doze">I2P fonctionne mieux s’il fonctionne en permanence. Pour empêcher qu’Android ferme I2P quand il essaie d’économiser l’énergie, vous pouvez ajouter I2P à la liste d’exception de la pile. La fiabilité de l’appli s’en trouvera grandement améliorée.\n\nGarder I2P en fonction en arrière-plan ? (recommandé)</string>
+  <string name="first_start_title">Félicitations pour votre installation d’I2P !</string>
+  <string name="first_start_welcome"><b>Bienvenue sur I2P !</b> Veuillez <b>patienter</b> pendant qu’I2P s’amorce et trouve des pairs.</string>
   <string name="first_start_read">Pendant que vous patientez, veuillez consulter les notes de mise à jour et la page d’accueil.</string>
-  <string name="first_start_faq">Une fois que vous aurez des tunnels client, veuillez <b>consulter</b> notre FAQ :</string>
-  <string name="first_start_faq_nonanon">Ou utilisez ce lien non anonyme si vous ne voulez pas attendre les tunnels :</string>
-  <string name="first_start_irc">Dirigez votre client IRC vers <b>localhost:6668</b> et dites-nous bonjour sur :</string>
+  <string name="first_start_faq">Une fois que vous aurez des tunnels client, veuillez <b>consulter</b> notre FAQ :</string>
+  <string name="first_start_faq_nonanon">Ou utilisez ce lien non anonyme si vous ne voulez pas attendre les tunnels :</string>
+  <string name="first_start_irc">Dirigez votre client IRC vers <b>localhost:6668</b> et dites-nous bonjour sur :</string>
   <string name="action_search">Recherche</string>
   <string name="action_add">Ajouter</string>
   <string name="action_edit">Modifier</string>
@@ -109,10 +111,10 @@
   <string name="notification_status_stopping_after_net">Le réseau est déconnecté, arrêt d’I2P</string>
   <string name="notification_status_shutdown_cancelled">La fermeture a été annulée</string>
   <string name="notification_status_shutting_down">I2P est en cours de fermeture</string>
-  <string name="notification_status_bw">Bande passante : %1$sBps aval / %2$sBps amont</string>
-  <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="notification_status_bw">Bande passante : %1$sBps aval / %2$sBps amont</string>
+  <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="menu_settings">Paramètres</string>
   <string name="settings_enable">Activer</string>
   <string name="settings_desc_subscriptions">URL d’abonnement</string>
@@ -124,7 +126,7 @@
   <string name="settings_desc_bw_inbound">Vitesse entrante maximale</string>
   <string name="settings_label_bw_outbound">Vitesse sortante</string>
   <string name="settings_desc_bw_outbound">Vitesse sortante maximale</string>
-  <string name="settings_label_network">Réseau</string>
+  <string name="settings_label_network">Réseau </string>
   <string name="settings_label_hiddenMode">Participation</string>
   <string name="settings_desc_hiddenMode">Désactiver le mode caché</string>
   <string name="settings_label_maxPartTunnels">Maximum de tunnels participants</string>
@@ -139,13 +141,13 @@
   <string name="settings_label_appearance">Apparence</string>
   <string name="settings_label_language">Langue</string>
   <string name="settings_default">Valeur par défaut</string>
-  <string name="settings_label_advanced">Évolué</string>
+  <string name="settings_label_advanced">Avancé</string>
   <string name="settings_label_showStats">Statistiques du routeur</string>
   <string name="settings_summ_showStats">Afficher les statistiques évoluées dans la console principale</string>
   <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">Écouter sur le port 7654</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_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>
@@ -165,12 +167,12 @@
   <string name="settings_need_transport_enabled">Au moins un transport doit être activé</string>
   <string name="settings_router_restart_required">Veuillez redémarrer I2P afin d’appliquer les changements</string>
   <string name="menu_about">À propos</string>
-  <string name="about_version">Version :</string>
-  <string name="about_project">Page d’accueil du projet :</string>
-  <string name="about_bugs">Bogues et assistance :</string>
-  <string name="about_helpwanted">Aide recherchée !</string>
-  <string name="about_volunteer">Vous souhaitez aider à améliorer l’appli ? Portez-vous volontaire sur le forum Android :</string>
-  <string name="about_donate">Vous souhaitez faire un don d’argent ou en bitcoin pour acheter plus d’appareils Android pour le développement et les tests ? Rendez-vous sur :</string>
+  <string name="about_version">Version :</string>
+  <string name="about_project">Page d’accueil du projet :</string>
+  <string name="about_bugs">Bogues et assistance :</string>
+  <string name="about_helpwanted">Aide recherchée !</string>
+  <string name="about_volunteer">Souhaitez-vous aider à améliorer l’appli ? Portez-vous volontaire sur le forum Android :</string>
+  <string name="about_donate">Souhaitez-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="menu_help">Aide</string>
   <string name="general">Général</string>
   <string name="label_router">Adresses publiques</string>
@@ -181,11 +183,11 @@
   <string name="addressbook_add_wizard_k_destination">Destination</string>
   <string name="addressbook_add_wizard_desc_name">Le nom</string>
   <string name="addressbook_add_wizard_desc_destination">Coller ici le Base64 de la destination. Si avez un gestionnaire de fichiers  d’installé, vous pouvez chercher un fichier texte contenant le Base64.</string>
-  <string name="nsu_iae_illegal_char">Le nom d’hôte « %1$s » contient le caractère illégal %2$s</string>
-  <string name="nsu_iae_cannot_start_with">Le nom d’hôte ne peut pas commencer par « %s »</string>
-  <string name="nsu_iae_cannot_end_with">Le nom d’hôte ne peut pas se terminer par « %s »</string>
-  <string name="nsu_iae_cannot_contain">Le nom d’hôte ne peut pas contenir « %s »</string>
-  <string name="nsu_iae_requires_conversion">Le nom d’hôte « %s » exige une conversion en ASCII, mais la bibliothèque de conversion n’est pas proposée dans cette version d’Android</string>
+  <string name="nsu_iae_illegal_char">Le nom d’hôte « %1$s » contient le caractère illégal %2$s</string>
+  <string name="nsu_iae_cannot_start_with">Le nom d’hôte ne peut pas commencer par « %s »</string>
+  <string name="nsu_iae_cannot_end_with">Le nom d’hôte ne peut pas se terminer par « %s »</string>
+  <string name="nsu_iae_cannot_contain">Le nom d’hôte ne peut pas contenir « %s »</string>
+  <string name="nsu_iae_requires_conversion">Le nom d’hôte « %s » exige une conversion en ASCII, mais la bibliothèque de conversion n’est pas proposée dans cette version d’Android</string>
   <string name="i2ptunnel_type_client">Client normal</string>
   <string name="i2ptunnel_type_httpclient">Client HTTP</string>
   <string name="i2ptunnel_type_ircclient">Client IRC</string>
@@ -198,8 +200,8 @@
   <string name="i2ptunnel_type_streamrclient">Client Streamr</string>
   <string name="i2ptunnel_type_streamrserver">Serveur Streamr</string>
   <string name="i2ptunnel_type_httpbidirserver">Bidir HTTP</string>
-  <string name="install_recommended_app">Installer l’appli recommandée ?</string>
-  <string name="app_needed_for_this_tunnel_type">Vous devez installer une appli pour utiliser ce tunnel. Souhaitez-vous installer l’appli recommandée ?</string>
+  <string name="install_recommended_app">Installer l’appli recommandée ?</string>
+  <string name="app_needed_for_this_tunnel_type">Vous devez installer une appli pour utiliser ce tunnel. Souhaitez-vous installer l’appli recommandée ?</string>
   <string name="i2ptunnel_not_initialized">Les tunnels ne sont pas encore initialisés, veuillez recharger dans deux minutes.</string>
   <string name="no_configured_client_tunnels">Aucun tunnel client n’est configuré.</string>
   <string name="no_configured_server_tunnels">Aucun tunnel serveur n’est configuré.</string>
@@ -208,7 +210,7 @@
   <string name="i2ptunnel_msg_config_save_failed">Échec d’enregistrement de la configuration</string>
   <string name="i2ptunnel_msg_tunnel_starting">Démarrage du tunnel</string>
   <string name="i2ptunnel_msg_tunnel_stopping">Arrêt du tunnel</string>
-  <string name="i2ptunnel_delete_confirm_message">Supprimer le tunnel ?</string>
+  <string name="i2ptunnel_delete_confirm_message">Supprimer le tunnel ?</string>
   <string name="i2ptunnel_delete_confirm_button">Suppression du tunnel</string>
   <string name="i2ptunnel_no_tunnel_details">Impossible de charger les détails du tunnel</string>
   <string name="i2ptunnel_wizard_k_client_server">Client ou serveur</string>
@@ -227,7 +229,7 @@
   <string name="next">Suivant</string>
   <string name="prev">Précédent</string>
   <string name="finish">Envoyer</string>
-  <string name="review">Évaluer</string>
+  <string name="review">Révision</string>
   <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>
@@ -237,8 +239,8 @@
   <string name="i2ptunnel_wizard_desc_target_port">Le port sur lequel le service accepte des connexions.</string>
   <string name="i2ptunnel_wizard_desc_reachable_on">Cela limite quels ordinateurs ou téléphones intelligents peuvent accéder à ce tunnel.</string>
   <string name="i2ptunnel_wizard_desc_binding_port">Le port par lequel l’on accédera localement au tunnel client. C’est aussi le port client pour le tunnel serveur HTTP bidir.</string>
-  <string name="i2ptunnel_wizard_desc_auto_start">Le tunnel devrait-il démarrer automatiquement quand le routeur démarre ?</string>
-  <string name="i2ptunnel_wizard_submit_confirm_message">Créer un tunnel ?</string>
+  <string name="i2ptunnel_wizard_desc_auto_start">Le tunnel devrait-il démarrer automatiquement quand le routeur démarre ?</string>
+  <string name="i2ptunnel_wizard_submit_confirm_message">Créer un tunnel ?</string>
   <string name="i2ptunnel_wizard_submit_confirm_button">Créer un tunnel</string>
   <string name="i2ptunnel_view_target">Cible</string>
   <string name="i2ptunnel_view_access_point">Point d’accès</string>
@@ -254,8 +256,8 @@
   <string name="tunnel_summ_shared_client">Utiliser la même destination et les mêmes tunnels que les autres clients partagés</string>
   <string name="target_destination">Destination cible</string>
   <string name="persistent_key">Clé persistante</string>
-  <string name="persistent_key_conflict_title">Désactiver les nouvelles clés lors d’une réouverture ?</string>
-  <string name="persistent_key_conflict_msg">Vous ne pouvez pas activer les clés persistantes alors que le tunnel est configuré pour générer de nouvelles clés lors d’une réouverture. Voulez-vous désactiver les nouvelles clés lors d’une réouverture ?</string>
+  <string name="persistent_key_conflict_title">Désactiver les nouvelles clés à la réouverture ?</string>
+  <string name="persistent_key_conflict_msg">Vous ne pouvez pas activer les clés persistantes alors que le tunnel est configuré pour générer de nouvelles clés à la réouverture. Voulez-vous désactiver les nouvelles clés à la réouverture ?</string>
   <string name="tunnel_summ_persistent_key">Garder la destination de ce tunnel quand il redémarre</string>
   <string name="reachable_on">Accessible sur</string>
   <string name="listen_port">Port d’écoute</string>
@@ -277,7 +279,7 @@
   <string name="profile_interactive">Connexion interactive</string>
   <string name="delay_connect">Retarder la connexion</string>
   <string name="tunnel_summ_delay_connect">Activer les connexions pour requêtes et réponses</string>
-  <string name="access_control">Contrôle des accès</string>
+  <string name="access_control">Contrôle de l’accès</string>
   <string name="restricted_access">Accès restreint</string>
   <string name="disabled">Désactivé</string>
   <string name="whitelist">Liste blanche</string>
@@ -319,13 +321,13 @@
   <string name="reduced_tunnel_quantity">La quantité de tunnels a été réduite</string>
   <string name="close_tunnels">Fermer les tunnels quand ils sont inactifs</string>
   <string name="new_keys_on_reopen">Nouvelles clés lors d’une réouverture</string>
-  <string name="new_keys_on_reopen_conflict_title">Désactiver les clés persistantes ?</string>
-  <string name="new_keys_on_reopen_conflict_msg">Vous ne pouvez pas activer la génération de nouvelles clés lors d’une réouverture alors que le tunnel est configuré pour utiliser des clés persistantes. Voulez-vous désactiver les clés persistantes ?</string>
+  <string name="new_keys_on_reopen_conflict_title">Désactiver les clés persistantes ?</string>
+  <string name="new_keys_on_reopen_conflict_msg">Vous ne pouvez pas activer la génération de nouvelles clés à la réouverture alors que le tunnel est configuré pour avoir des clés persistantes. Voulez-vous désactiver les clés persistantes ?</string>
   <string name="http_client">Client HTTP</string>
-  <string name="tunnel_summ_user_agent">Passer l’en-tête « agent utilisateur »</string>
-  <string name="tunnel_summ_referer">Passer l’en-tête Référent</string>
-  <string name="tunnel_summ_accept">Passer l’en-tête « Accept-* »</string>
-  <string name="tunnel_summ_allow_ssl">Autoriser SSL vers des adresses I2P</string>
+  <string name="tunnel_summ_user_agent">Passer l’en-tête « agent utilisateur »</string>
+  <string name="tunnel_summ_referer">Passer l’en-tête « Référent »</string>
+  <string name="tunnel_summ_accept">Passer l’en-tête « Accept-* »</string>
+  <string name="tunnel_summ_allow_ssl">Permettre SSL vers des adresses I2P</string>
   <string name="jump_url_list">Liste d’URL de saut</string>
   <string name="proxy_auth">Autorisation du mandataire</string>
   <string name="tunnel_summ_proxy_auth">Exiger une authentification pour utiliser ce mandataire</string>

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

@@ -0,0 +1,117 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="desc_i2p_logo">Logo de I2P</string>
+  <string name="choose_language">Escolle a lingua</string>
+  <string name="welcome_new_install">Benvido/a a I2P! Ista app é software ALPHA e non fornece un anonimato forte. Por favor le as notas da publicación e a información da licenza.</string>
+  <string name="welcome_new_version">Nova versión instalada. Por favor le as notas da edición. Versión: </string>
+  <string name="label_tunnels">Túneles</string>
+  <string name="label_status">Estado</string>
+  <string name="label_console">Consola</string>
+  <string name="label_addresses">Enderezos</string>
+  <string name="label_addressbook">Axenda de Enderezos</string>
+  <string name="label_i2ptunnel_client">Túneles de Cliente</string>
+  <string name="label_i2ptunnel_server">Túneles de Servidor</string>
+  <string name="label_logs">Rexistros (Logs)</string>
+  <string name="label_error_logs">Rexistros (Logs) de Erros</string>
+  <string name="label_news">Noticias</string>
+  <string name="label_peers_status">Pares</string>
+  <string name="label_release_notes">Notas da edición</string>
+  <string name="label_licenses">Licencias</string>
+  <string name="label_browse">Navegar</string>
+  <string name="label_graphs">Gráficas</string>
+  <string name="button_router_off">Pulsación longa para iniciar I2P</string>
+  <string name="button_router_on">I2P está en marcha (pulsación longa para deter)</string>
+  <string name="button_router_graceful">I2P hase deter en %s</string>
+  <string name="button_shutdown_now">Pulsación longa para deter agora</string>
+  <string name="button_cancel_graceful">Pulsación longa para cancelar o apagado</string>
+  <string name="no_internet">Non hai conexión a Internet dispoñible</string>
+  <string name="hidden">Oculto</string>
+  <string name="testing">A probar...</string>
+  <string name="firewalled">Detrás dunha devasa</string>
+  <string name="symmetric_nat">NAT simétrico</string>
+  <string name="net_status_error_i2cp">Erro do xestor de cliente I2CP - Revisa os logues</string>
+  <!--Parameter is a time, e.g. 32s or 2m-->
+  <string name="net_status_error_skew">Desfase do reloxo en %s</string>
+  <string name="net_status_error_unresolved_tcp">Enderezo TCP non resolto</string>
+  <string name="net_status_error_private_tcp">Enderezo TCP privado</string>
+  <string name="net_status_warn_firewalled_inbound_tcp">Detrás dunha devasa con TCP entrante habilitado</string>
+  <string name="net_status_warn_firewalled_floodfill">Detrás dunha devasa e </string>
+  <string name="net_status_info_disconnected">Desconectado - Comprobar conexión á rede</string>
+  <string name="net_status_error_udp_port">Porto UDP en uso - cambiao na configuración e reinicia</string>
+  <string name="net_status_error_no_active_peers">Non hay pares activos - comproba a túa conexión á rede e o teu cortafogos</string>
+  <string name="shared_clients">Clientes compartidos</string>
+  <string name="active_peers">Pares activos</string>
+  <string name="known_peers">Pares coñecidos</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".-->
+  <string name="char_server_tunnel">S</string>
+  <string name="no_tunnels_running">Aínda non hai túneles en marcha.</string>
+  <string name="download">Descargar</string>
+  <string name="upload">Cargar</string>
+  <string name="configure_browser_title">Configurar o navegador?</string>
+  <string name="first_start_title">Parabéns por instalares I2P!</string>
+  <string name="first_start_read">Mentres agardas por favor le as notas do lanzamento</string>
+  <string name="first_start_faq_nonanon">Ou usa ista ligazón non anónima se non queres agardar polos túneles:</string>
+  <string name="action_search">Buscar</string>
+  <string name="action_add">Engadir</string>
+  <string name="action_edit">Editar</string>
+  <string name="action_delete">Borrar</string>
+  <string name="action_i2ptunnel_start">Inicia-lo túnel</string>
+  <string name="action_i2ptunnel_stop">Dete-lo túnel</string>
+  <string name="action_i2ptunnel_start_all">Iniciar tódolos túneles</string>
+  <string name="action_i2ptunnel_stop_all">Deter tódolos túneles</string>
+  <string name="action_i2ptunnel_restart_all">Reiniciar tódolos túneles</string>
+  <string name="action_reload">Recargar</string>
+  <string name="action_refresh">Refrescar</string>
+  <string name="hint_search_addressbook">Buscar na axenda de enderezos</string>
+  <string name="action_reload_subscriptions">Recargar subscripcións</string>
+  <string name="news_last_updated">Novas actualizadas fai %s</string>
+  <string name="news_last_checked">Novas comprobadas fai %s</string>
+  <string name="news_updated">Novas actualizadas</string>
+  <string name="view_news">Preme para ver al últimas novas de I2P</string>
+  <string name="statistics">Estadísticas</string>
+  <string name="countries">Países</string>
+  <string name="country">País</string>
+  <string name="versions">Versións</string>
+  <string name="version">Versión</string>
+  <string name="notification_status_starting">I2P está a se iniciar</string>
+  <string name="notification_status_restarting">I2P está a se reiniciar</string>
+  <string name="notification_status_running">I2P está en funcionamento</string>
+  <string name="notification_status_client_ready">Os túneles de cliente están preparados</string>
+  <string name="menu_settings">Opcións</string>
+  <string name="settings_enable">Activar</string>
+  <string name="settings_label_bandwidth_net">Rede e ancho de banda</string>
+  <string name="settings_label_startOnBoot">Lanzar I2P no inicio</string>
+  <string name="settings_label_bw_inbound">Velocidade entrante</string>
+  <string name="settings_label_network">Rede</string>
+  <string name="settings_label_appearance">Aparencia</string>
+  <string name="settings_label_language">Idioma</string>
+  <string name="settings_default">Predeterminado</string>
+  <string name="settings_label_advanced">Avanzadas</string>
+  <string name="settings_summ_expl_lengthVariance">%s</string>
+  <string name="menu_about">Acerca de</string>
+  <string name="about_version">Versión:</string>
+  <string name="menu_help">Axuda</string>
+  <string name="general">Xeral</string>
+  <string name="addressbook_add_wizard_k_name">Nome</string>
+  <string name="addressbook_add_wizard_k_destination">Destino</string>
+  <string name="i2ptunnel_new_tunnel">Novo Túnel</string>
+  <string name="i2ptunnel_msg_tunnel_starting">Iniciando o túnel</string>
+  <string name="i2ptunnel_msg_tunnel_stopping">Detendo o túnel</string>
+  <string name="i2ptunnel_wizard_k_name">Nome</string>
+  <string name="i2ptunnel_wizard_k_desc">Descrición</string>
+  <string name="i2ptunnel_wizard_k_dest">Destino</string>
+  <string name="next">Seguinte</string>
+  <string name="finish">Enviar</string>
+  <string name="review">Revisión</string>
+  <string name="enabled">Activado</string>
+  <string name="i2ptunnel_view_target">Destino</string>
+  <string name="name">Nome</string>
+  <string name="description">Descrición</string>
+  <string name="disabled">Desactivado</string>
+  <string name="username">Nome de usuario</string>
+  <string name="password">Contrasinal</string>
+  <string name="other">Outra</string>
+</resources>

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

@@ -0,0 +1,204 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="desc_i2p_logo">I2P logo</string>
+  <string name="choose_language">Nyelv választása</string>
+  <string name="welcome_new_install">Üdvözöl az I2P! Ez az alkalmazás egy ALPHA szoftver és nem nyújt erős anonimitást. Kérlek olvasd el a verziókövetési jegyzetet és a licencinformációt.</string>
+  <string name="welcome_new_version">Új verzió telepítve. Kérlek olvasd el a verziókövetési jegyzetet. Verzió:</string>
+  <string name="label_tunnels">Alagutak</string>
+  <string name="label_status">Állapot</string>
+  <string name="label_console">Konzol</string>
+  <string name="label_addresses">Címek</string>
+  <string name="label_addressbook">Címjegyzék</string>
+  <string name="label_i2ptunnel_client">Kliens alagutak</string>
+  <string name="label_i2ptunnel_server">Kiszolgáló alagutak</string>
+  <string name="label_logs">Napló</string>
+  <string name="label_error_logs">Hibanapló</string>
+  <string name="label_news">Hírek</string>
+  <string name="label_peers_status">Peer-ek</string>
+  <string name="label_release_notes">Verziókövetési jegyzet</string>
+  <string name="label_licenses">Licencek</string>
+  <string name="label_browse">Tallóz</string>
+  <string name="label_graphs">Grafikonok</string>
+  <string name="button_router_off">Hosszan nyomja le az I2P elindításához</string>
+  <string name="button_router_on">I2P fut (hosszan nyomja le a megállításhoz)</string>
+  <string name="button_router_graceful">Az I2P bezárul %s másodpercen belül</string>
+  <string name="button_shutdown_now">Hosszan nyomja le az azonnali megállításhoz</string>
+  <string name="button_cancel_graceful">Hosszan nyomja le a bezárás megszakításához</string>
+  <string name="no_internet">Nincs internet kapcsolat</string>
+  <string name="hidden">Rejtett</string>
+  <string name="testing">Tesztelés</string>
+  <string name="firewalled">Tűzfal mögött</string>
+  <string name="symmetric_nat">Szimmetrikus NAT</string>
+  <string name="net_status_error_i2cp">Kliens kezelő I2CP hiba - ellenőrizze a naplót</string>
+  <!--Parameter is a time, e.g. 32s or 2m-->
+  <string name="net_status_error_skew">Óra pontatlansága: %s</string>
+  <string name="net_status_error_unresolved_tcp">Feloldhatatlan TCP cím</string>
+  <string name="net_status_error_private_tcp">Privát TCP cím</string>
+  <string name="net_status_warn_firewalled_inbound_tcp">Tűzfal mögött és bejövő TCP engedélyezve</string>
+  <string name="net_status_warn_firewalled_floodfill">Tűzfal mögött és floodfill</string>
+  <string name="net_status_info_disconnected">Szétkapcsolva - ellenőrizze a hálózati kapcsolatot</string>
+  <string name="net_status_error_udp_port">UDP port már használatban - változtassa meg a beállításokban és indítsa újra</string>
+  <string name="net_status_error_no_active_peers">Nincsenek aktív peerek - ellenőrizze a hálózati kapcsolatot és a tűzfalat</string>
+  <string name="net_status_error_udp_disabled_tcp_not_set">UDP letiltva és a bejövő TCP hoszt/port nincs beállítva</string>
+  <string name="net_status_warn_firewalled_udp_disabled">Tűzfal mögött letiltott UDP-vel</string>
+  <string name="shared_clients">Megosztott kliensek</string>
+  <string name="uptime">Indítás óta eltelt idő</string>
+  <string name="active_peers">Aktív peerek</string>
+  <string name="known_peers">Ismert peerek</string>
+  <!--Character to indicate a client tunnel. Usually first letter of the word "client".-->
+  <string name="char_client_tunnel">M</string>
+  <!--Character to indicate a server tunnel. Usually first letter of the word "server".-->
+  <string name="char_server_tunnel">S</string>
+  <string name="no_tunnels_running">Még nem futnak alagutak.</string>
+  <string name="download">Letöltés</string>
+  <string name="upload">Feltöltés</string>
+  <string name="configure_browser_title">Böngésző beállítása?</string>
+  <string name="configure_browser_for_i2p">Szeretné beállítani a böngészőt az I2P oldalak megjelenítéséhez? (Ezt később is megteheti a “Segítség” menüből.)</string>
+  <string name="first_start_title">Gratulálunk az I2P telepítéséhez!</string>
+  <string name="first_start_welcome"><b>Üdvözli az I2P!</b> Kérem <b>legyen türelemmel</b> amíg az I2P elindul és peer-eket talál.</string>
+  <string name="first_start_read">Amíg várakozik, kérjük olvassa el a kiadási megjegyzéseket és az üdvözlőlapot.</string>
+  <string name="first_start_faq">Kérjük, hogy miután már vannak kliens-alagútjai <b>tekintse meg</b> a GYIK-et is:</string>
+  <string name="first_start_faq_nonanon">Vagy használja ezt a nem-anonim hivatkozást ha nem akar várakozni az alagutakra:</string>
+  <string name="action_search">Keresés</string>
+  <string name="action_add">Hozzáadás</string>
+  <string name="action_edit">Szerkesztés</string>
+  <string name="action_delete">Törlés</string>
+  <string name="action_i2ptunnel_start">Alagút elindítása</string>
+  <string name="action_i2ptunnel_stop">Alagút leállítása</string>
+  <string name="action_i2ptunnel_start_all">Összes alagút elindítása</string>
+  <string name="action_i2ptunnel_stop_all">Összes alagút leállítása</string>
+  <string name="action_i2ptunnel_restart_all">Összes alagút újraindítása</string>
+  <string name="action_reload">Újratöltés</string>
+  <string name="action_refresh">Frissítés</string>
+  <string name="hint_search_addressbook">Keresés a címjegyzékben</string>
+  <string name="action_reload_subscriptions">Feliratkozások újratöltése</string>
+  <string name="router_shutting_down">A router bezárása folyamatban.</string>
+  <string name="statistics">Statisztikák</string>
+  <string name="routers">Routerek</string>
+  <string name="leasesets">LeaseSet-ek</string>
+  <string name="country">Ország</string>
+  <string name="transport">Szállítás</string>
+  <string name="version">Verzió</string>
+  <string name="count">Mennyiség</string>
+  <string name="tname_0">Rejtett vagy indul</string>
+  <string name="notification_status_client_ready">Kliens alagutak készen állnak</string>
+  <string name="notification_status_client_down">Kliens alagutak leálltak</string>
+  <string name="notification_status_graceful">I2P megállítása %s másodperc múlva</string>
+  <string name="notification_status_stopping">I2P megállítása</string>
+  <string name="notification_status_stopping_after_net">Hálózat szétkapcsolva, I2P megáll</string>
+  <string name="notification_status_shutdown_cancelled">Bezárás megszakítva</string>
+  <string name="notification_status_shutting_down">Az I2P bezárás alatt</string>
+  <string name="notification_status_bw">Sávszélesség: %1$sBps le / %2$sBps fel</string>
+  <string name="notification_status_peers">Peer-ek: %1$d aktív, %2$d ismert</string>
+  <string name="notification_status_expl">Felderítő alagutak: %1$d/%2$d</string>
+  <string name="notification_status_client">Kliens alagutak: %1$d/%2$d</string>
+  <string name="menu_settings">Beállítások</string>
+  <string name="settings_enable">Engedélyezés</string>
+  <string name="settings_label_bandwidth">Sávszélesség</string>
+  <string name="settings_label_network">Hálózat</string>
+  <string name="settings_label_maxPartTunnels">Maximális résztvevő alagutak</string>
+  <string name="settings_desc_maxPartTunnels">Alagutak maximális száma amiben részt vesz (alapértelmezés=20)</string>
+  <string name="settings_dialog_maxPartTunnels">Alagutak maximális száma amiben részt vesz</string>
+  <string name="settings_label_logging">Naplózás</string>
+  <string name="settings_label_default_log_level">Alapértelmezett naplózási szint</string>
+  <string name="settings_label_appearance">Megjelenés</string>
+  <string name="settings_label_language">Nyelv</string>
+  <string name="settings_default">Alapértelmezett</string>
+  <string name="settings_label_advanced">Haladó</string>
+  <string name="settings_label_transports">Átvitel</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>
+  <string name="settings_label_expl_length">Hossz</string>
+  <string name="settings_label_expl_quantity">Mennyiség</string>
+  <string name="settings_summ_expl_quantity">%s alagút</string>
+  <string name="settings_desc_expl_quantity">Mennyi alagút</string>
+  <string name="settings_label_expl_backupQuantity">Mentési mennyiség</string>
+  <string name="settings_summ_expl_backupQuantity">%s alagút</string>
+  <string name="settings_desc_expl_backupQuantity">Mennyi tartalék alagút</string>
+  <string name="menu_about">Névjegy</string>
+  <string name="about_version">Verzió:</string>
+  <string name="about_project">A projekt honlapja:</string>
+  <string name="menu_help">Segítség</string>
+  <string name="general">Általános</string>
+  <string name="addressbook_add_wizard_k_name">Név</string>
+  <string name="addressbook_add_wizard_k_destination">Célállomás</string>
+  <string name="i2ptunnel_type_client">Normál kliens</string>
+  <string name="i2ptunnel_type_httpclient">HTTP kliens</string>
+  <string name="i2ptunnel_type_ircclient">IRC kliens</string>
+  <string name="i2ptunnel_type_server">Normál szerver</string>
+  <string name="i2ptunnel_type_httpserver">HTTP szerver</string>
+  <string name="i2ptunnel_type_sockstunnel">SOCKS 4/4a/5 proxy</string>
+  <string name="i2ptunnel_type_socksirctunnel">SOCKS IRC proxy</string>
+  <string name="i2ptunnel_type_connectclient">CONNECT/SSL/HTTPS proxy</string>
+  <string name="i2ptunnel_type_ircserver">IRC szerver</string>
+  <string name="i2ptunnel_type_streamrclient">Streamr kliens</string>
+  <string name="i2ptunnel_type_streamrserver">Streamr szerver</string>
+  <string name="i2ptunnel_type_httpbidirserver">HTTP bidir</string>
+  <string name="install_recommended_app">Ajánlott alkalmazás telepítése?</string>
+  <string name="app_needed_for_this_tunnel_type">Fel kell telepítenie egy alkalmazást az alagút használatához. Szeretné feltelepíteni az ajánlott alkalmazást?</string>
+  <string name="i2ptunnel_not_initialized">Az alagutak még nem lettek előkészítve, próbálja meg két perc múlva újra betölteni.</string>
+  <string name="no_configured_client_tunnels">Nincsenek konfigurált kliens alagutak.</string>
+  <string name="no_configured_server_tunnels">Nincsenek konfigurált kiszolgáló alagutak.</string>
+  <string name="i2ptunnel_new_tunnel">Új Alagút</string>
+  <string name="i2ptunnel_msg_config_saved">A változtatás a beállításokon mentésre kerül</string>
+  <string name="i2ptunnel_msg_config_save_failed">Beállítások mentése sikertelen</string>
+  <string name="i2ptunnel_msg_tunnel_starting">Alagút indítása</string>
+  <string name="i2ptunnel_msg_tunnel_stopping">Alagút leállítása</string>
+  <string name="i2ptunnel_delete_confirm_message">Törli az alagutat?</string>
+  <string name="i2ptunnel_delete_confirm_button">Alagút törlése</string>
+  <string name="i2ptunnel_no_tunnel_details">Alagút részleteit nem lehet betölteni</string>
+  <string name="i2ptunnel_wizard_v_client">Kliens alagút</string>
+  <string name="i2ptunnel_wizard_v_server">Kiszolgáló alagút</string>
+  <string name="i2ptunnel_wizard_k_type">Alagút típusa</string>
+  <string name="i2ptunnel_wizard_k_name">Név</string>
+  <string name="i2ptunnel_wizard_k_desc">Leírás</string>
+  <string name="i2ptunnel_wizard_k_dest">Célállomás</string>
+  <string name="i2ptunnel_wizard_k_outproxies">Kimenő proxyk</string>
+  <string name="i2ptunnel_wizard_k_auto_start">Automatikus indítás</string>
+  <string name="next">Következő</string>
+  <string name="prev">Előző</string>
+  <string name="finish">Elküld</string>
+  <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>
+  <string name="i2ptunnel_wizard_desc_reachable_on">Ez korlátozza mely számítógépek vagy okostelefonok érhetik el ezt az alagutat.</string>
+  <string name="i2ptunnel_wizard_desc_binding_port">Ez az a port amin a kliens alagút helyileg elérhető. Továbbá ez a kliens portja a HTTP bidir kiszolgáló alagútnak.</string>
+  <string name="i2ptunnel_wizard_desc_auto_start">Az alagút is automatikusan elinduljon amikor a router elindul?</string>
+  <string name="i2ptunnel_wizard_submit_confirm_message">Létrehozza az alagutat?</string>
+  <string name="i2ptunnel_wizard_submit_confirm_button">Alagút létrehozása</string>
+  <string name="i2ptunnel_view_target">Cél</string>
+  <string name="edit_tunnel">Alagút szerkesztése</string>
+  <string name="name">Név</string>
+  <string name="description">Leírás</string>
+  <string name="tunnel_summ_auto_start">A router indulásakor az alagút is induljon el.</string>
+  <string name="tunnel_summ_shared_client">Használja ugyanazt a Célállomást és alagutakat mint a többi megosztott kliens</string>
+  <string name="persistent_key_conflict_msg">Nem engedélyezheti az állandó kulcsokat amíg az alagút arra van konfigurálva hogy készítsen új kulcsokat újranyitáskor. Le akarja tiltani az új kulcsok készítését újranyitáskor?</string>
+  <string name="tunnel_summ_persistent_key">Tartsa meg ennek az alagútnak a Célállomását amikor újraindul</string>
+  <string name="outproxies">Kimenő proxyk</string>
+  <string name="enable_dcc">DCC Engedélyezése</string>
+  <string name="use_ssl">SSL használata</string>
+  <string name="tunnel_parameters">Alagút paraméterei</string>
+  <string name="profile">Profil</string>
+  <string name="disabled">Tiltva</string>
+  <string name="whitelist">Engedélyezett-Lista</string>
+  <string name="blacklist">Tiltott-Lista</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 minőség</string>
+  <string name="close_tunnels">Alagutak bezárása üresjárat esetén</string>
+  <string name="new_keys_on_reopen_conflict_msg">Nem engedélyezheti az új kulcsok készítését újranyitáskor amíg az alagút állandó kulcsok használatára van konfigurálva. Le akarja tiltani az állandó kulcsokat?</string>
+  <string name="http_client">HTTP kliens</string>
+  <string name="username">Felhasználónév</string>
+  <string name="password">Jelszó</string>
+  <string name="other">Egyéb</string>
+  <string name="custom_options">Egyéni beállítások</string>
+  <string name="all">Összes</string>
+  <string name="no_messages">Nincs üzenet</string>
+</resources>

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

@@ -145,7 +145,6 @@
   <string name="settings_label_transports">Transport</string>
   <string name="settings_label_maxConns">Maks sambungan</string>
   <string name="settings_label_i2cp">I2CP antarmuka</string>
-  <string name="settings_desc_i2cp">Mendengarkan port 7654</string>
   <string name="settings_label_exploratory_pool">Pool eksplorasi</string>
   <string name="settings_desc_exploratory_pool">Parameter saluran</string>
   <string name="settings_label_expl_inbound">Saluran inbound</string>

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

@@ -145,7 +145,6 @@
   <string name="settings_label_transports">Trasporti</string>
   <string name="settings_label_maxConns">Limite connessioni</string>
   <string name="settings_label_i2cp">Interfaccia I2CP</string>
-  <string name="settings_desc_i2cp">Ascolta sulla porta 7654</string>
   <string name="settings_label_exploratory_pool">Esplorazione pool</string>
   <string name="settings_desc_exploratory_pool">Parametri tunnel</string>
   <string name="settings_label_expl_inbound">Tunnel in ingresso</string>

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

@@ -102,7 +102,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">7654番ポートでリッスン</string>
   <string name="settings_label_exploratory_pool">予備プール</string>
   <string name="settings_desc_exploratory_pool">トンネルパラーメーター</string>
   <string name="settings_label_expl_inbound">受信トンネル</string>

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

@@ -145,7 +145,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">7654 포트로 수신</string>
   <string name="settings_label_exploratory_pool">예비 풀</string>
   <string name="settings_desc_exploratory_pool">터널 파라미터</string>
   <string name="settings_label_expl_inbound">수신 터널</string>

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

@@ -145,7 +145,6 @@
   <string name="settings_label_transports">Overføringer</string>
   <string name="settings_label_maxConns">Maks. tilknytninger</string>
   <string name="settings_label_i2cp">I2CP-grensesnitt</string>
-  <string name="settings_desc_i2cp">Lytt til port 7654</string>
   <string name="settings_label_exploratory_pool">Utforsknings-grunnlag</string>
   <string name="settings_desc_exploratory_pool">Tunnel-dimensjoner</string>
   <string name="settings_label_expl_inbound">Innkommende tunneler</string>

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

@@ -145,7 +145,6 @@
   <string name="settings_label_transports">Transporten</string>
   <string name="settings_label_maxConns">Maximale connecties</string>
   <string name="settings_label_i2cp">I2CP-interface</string>
-  <string name="settings_desc_i2cp">Luister op poort 7654</string>
   <string name="settings_label_exploratory_pool">Verkennende-pool</string>
   <string name="settings_desc_exploratory_pool">Tunnelparameters</string>
   <string name="settings_label_expl_inbound">Inkomende tunnels</string>

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

@@ -145,7 +145,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">Słuchaj na porcie 7654</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>

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

@@ -140,7 +140,6 @@
   <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">Ouvindo na porta 7654</string>
   <string name="settings_desc_exploratory_pool">Parêmetros de tunel</string>
   <string name="settings_label_expl_inbound">Túneis entrantes</string>
   <string name="settings_label_expl_outbound">Tuneis de saída</string>

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

@@ -145,7 +145,6 @@
   <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">Escutar na porta 7654</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>

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

@@ -30,9 +30,17 @@
   <string name="testing">Testare</string>
   <string name="firewalled">Cu Firewall</string>
   <string name="symmetric_nat">NAT simetric</string>
+  <string name="net_status_error_i2cp">Eroare manager I2CP client - verificare jurnalele</string>
   <!--Parameter is a time, e.g. 32s or 2m-->
+  <string name="net_status_error_skew">Decalarea ceasului  %s</string>
+  <string name="net_status_error_unresolved_tcp">Adresa TCP nerezolvată</string>
   <string name="net_status_error_private_tcp">Adrese TCP private</string>
+  <string name="net_status_warn_firewalled_inbound_tcp">Firewalled cu TCP de intrare activat</string>
+  <string name="net_status_warn_firewalled_floodfill">Firewalled și inundare</string>
   <string name="net_status_info_disconnected">Deconectat - verificați conexiunea la rețea</string>
+  <string name="net_status_error_udp_port">Port UDP în utilizare - schimbare în setări și repornire</string>
+  <string name="net_status_error_no_active_peers">Fără colegi activi - verificați conexiunea de rețea și firewallul</string>
+  <string name="net_status_error_udp_disabled_tcp_not_set">UDP dezactivat și gazdă / port TCP de intrare nu este setat</string>
   <string name="net_status_warn_firewalled_udp_disabled">Cu Firewall și UDP dezactivat</string>
   <string name="shared_clients">Clienți partajați</string>
   <string name="uptime">Timpul de funcționare</string>
@@ -48,8 +56,11 @@
   <string name="configure_browser_title">Configurați navigatorul web?</string>
   <string name="configure_browser_for_i2p">Doriți să configurați un navigator web să vizualizați site-uri I2P? (Puteți face acest lucru mai târziu din meniul ajutor.)</string>
   <string name="first_start_title">Felicitari pentru instalarea I2P!</string>
+  <string name="first_start_welcome"><b>Bine ați venit la I2P!</b> Vă rugăm <b>să aveți răbdare</b> în timp ce I2P se lansează și găsește colegii.</string>
   <string name="first_start_read">Cât timp așteptați, citiți notele de lansare și pagina de bun venit.</string>
+  <string name="first_start_faq">După ce aveți tuneluri pentru clienți, <b>consultați</b> întrebările noastre frecvente:</string>
   <string name="first_start_faq_nonanon">Sau utilizați acest link ne-anonim dacă nu doriți să așteptați pentru tuneluri:</string>
+  <string name="first_start_irc">Indicați-vă clientul IRC către <b>localhost:6668</b> și spuneți-ne salut la:</string>
   <string name="action_search">Cauta</string>
   <string name="action_add">Adaugă</string>
   <string name="action_edit">Editeaza</string>
@@ -63,12 +74,17 @@
   <string name="action_refresh">Reâmprospătează</string>
   <string name="hint_search_addressbook">Caută agenda</string>
   <string name="action_reload_subscriptions">Reâncarcă abonamentele</string>
+  <string name="news_last_updated">Știri actualizate ultima dată %s în urmă</string>
+  <string name="news_last_checked">Știri verificate ultima dată %s în urmă</string>
   <string name="news_updated">Știri actualizate</string>
   <string name="view_news">Atinge pentru a vizualiza ultimele știri I2P</string>
   <string name="router_not_running">Ruterul nu rulează.</string>
   <string name="router_shutting_down">Ruterul este închis.</string>
+  <string name="stats_not_ready">Managerul de statistici nu este încă pregătit. Încercați mai târziu.</string>
   <string name="select_an_address">Selectați o adresă.</string>
+  <string name="no_graphs_configured">Nu au fost configurate grafice. Puteți alege statistici pentru a grafica în meniul de setări. Orice modificare va avea efect după 60 de secunde.</string>
   <string name="configure_graphs">Configurează graficele</string>
+  <string name="graphs_not_ready">Graficele nu sunt încă pregătite. Încercați mai târziu.</string>
   <string name="statistics">Statistici</string>
   <string name="routers">Rutere</string>
   <string name="leasesets">LeaseSets</string>
@@ -80,17 +96,29 @@
   <string name="count">Număr</string>
   <string name="tname_0">Ascuns sau pentru pornire</string>
   <string name="netdb_routers_empty">Nu sunt rutere în NetDB.</string>
+  <string name="netdb_leases_empty">Fără seturi de leasing în NetDB.</string>
   <string name="notification_status_starting">I2P este pornit</string>
   <string name="notification_status_restarting">I2P repornește</string>
   <string name="notification_status_waiting">I2P așteaptă pentru o conexiune la rețea</string>
+  <string name="notification_status_starting_after_waiting">Conectat la rețea, I2P se porneste</string>
   <string name="notification_status_running">I2P rulează</string>
+  <string name="notification_status_client_ready">Tunelurile clienților sunt gata</string>
+  <string name="notification_status_client_down">Tunelurile clienților nu lucreaza</string>
+  <string name="notification_status_graceful">Oprirea I2P în %s</string>
+  <string name="notification_status_stopping">Oprirea I2P</string>
+  <string name="notification_status_stopping_after_net">Rețea deconectată, oprind I2P</string>
   <string name="notification_status_shutdown_cancelled">Oprirea anulată</string>
+  <string name="notification_status_shutting_down">I2P se oprește</string>
   <string name="notification_status_bw">Lățime de bandă: %1$sBps desc / %2$sBps în</string>
   <string name="notification_status_peers">Parteneri: %1$d activi, %2$d cunoscuți</string>
+  <string name="notification_status_expl">Tunele exploratorii: %1$d / %2$d</string>
+  <string name="notification_status_client">Tuneluri pentru clienți: %1$d/%2$d</string>
   <string name="menu_settings">Configurări</string>
   <string name="settings_enable">Activează</string>
   <string name="settings_desc_subscriptions">URLs de abonare:</string>
   <string name="settings_label_bandwidth_net">Lățime de bandă și rețea</string>
+  <string name="settings_label_startOnBoot">Porniți I2P  la bootare </string>
+  <string name="settings_desc_startOnBoot">Conectați-vă automat la I2P la pornirea dispozitivului Android</string>
   <string name="settings_label_bandwidth">Lățime de bandă</string>
   <string name="settings_label_bw_inbound">viteza de intrare</string>
   <string name="settings_desc_bw_inbound">Viteza maximă de încărcare:</string>
@@ -113,15 +141,17 @@
   <string name="settings_default">Implicit</string>
   <string name="settings_label_advanced">Avansat</string>
   <string name="settings_label_showStats">Statistici ruter</string>
+  <string name="settings_summ_showStats">Afișează statistici avansate în consola principală</string>
   <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">Asculta pe portul 7654</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>
   <string name="settings_label_expl_outbound">Tunele de iesire</string>
   <string name="settings_label_expl_length">Lungime</string>
+  <string name="settings_summ_expl_length">%shamei</string>
   <string name="settings_desc_expl_length">Cât de multe hamei să utilizeze</string>
   <string name="settings_label_expl_lengthVariance">variație hamei</string>
   <string name="settings_summ_expl_lengthVariance">%s</string>
@@ -132,9 +162,11 @@
   <string name="settings_label_expl_backupQuantity">Cantitatea de rezervă</string>
   <string name="settings_summ_expl_backupQuantity">%s tuneluri</string>
   <string name="settings_desc_expl_backupQuantity">Câți copii de rezervă tunel</string>
+  <string name="settings_need_transport_enabled">Trebuie să aveți cel puțin un transport activat</string>
   <string name="settings_router_restart_required">Reporniți I2P pentru aplicarea modificărilor</string>
   <string name="menu_about">Despre</string>
   <string name="about_version">Versiune:</string>
+  <string name="about_project">Proiect Acasă:</string>
   <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>
@@ -148,6 +180,7 @@
   <string name="addressbook_add_wizard_k_name">Nume</string>
   <string name="addressbook_add_wizard_k_destination">Destinatie</string>
   <string name="addressbook_add_wizard_desc_name">Numele</string>
+  <string name="addressbook_add_wizard_desc_destination">Lipiți B64 din destinație aici. Dacă aveți un Manager de fișiere instalat, puteți căuta un fișier text care conține B64.</string>
   <string name="nsu_iae_illegal_char">Numele gazdă \"%1$s\" conține caractere ilegale %2$s</string>
   <string name="nsu_iae_cannot_start_with">Numele gazdă nu poate începe cu \"%s\"</string>
   <string name="nsu_iae_cannot_end_with">Numele gazdă nu se poate termina cu \"%s\"</string>
@@ -166,7 +199,10 @@
   <string name="i2ptunnel_type_streamrserver">Server streamr</string>
   <string name="i2ptunnel_type_httpbidirserver">HTTP bidir</string>
   <string name="install_recommended_app">Se instalează aplicația recomandată?</string>
+  <string name="app_needed_for_this_tunnel_type">Trebuie să instalați o aplicație pentru a utiliza acest tunel. Doriți să instalați aplicația recomandată?</string>
   <string name="i2ptunnel_not_initialized">Tuneluri încă nu sunt inițializate , vă rugăm să reîncărcați în două minute.</string>
+  <string name="no_configured_client_tunnels">Nu există tuneluri de client configurate.</string>
+  <string name="no_configured_server_tunnels">Nu există tuneluri de server configurate.</string>
   <string name="i2ptunnel_new_tunnel">Tunel nou</string>
   <string name="i2ptunnel_msg_config_saved">Modificările configurării s-au salvat</string>
   <string name="i2ptunnel_msg_config_save_failed">A eșuat salvarea configurării</string>
@@ -174,7 +210,10 @@
   <string name="i2ptunnel_msg_tunnel_stopping">Se oprește tunelul</string>
   <string name="i2ptunnel_delete_confirm_message">Se șterge tunelul?</string>
   <string name="i2ptunnel_delete_confirm_button">Șterge tunelul</string>
+  <string name="i2ptunnel_no_tunnel_details">Nu s-a putut încărca detaliile tunelului</string>
   <string name="i2ptunnel_wizard_k_client_server">Client sau server</string>
+  <string name="i2ptunnel_wizard_v_client">Tunelul clientului</string>
+  <string name="i2ptunnel_wizard_v_server">Tunelul serverului</string>
   <string name="i2ptunnel_wizard_k_type">Tip tunel</string>
   <string name="i2ptunnel_wizard_k_name">Nume</string>
   <string name="i2ptunnel_wizard_k_desc">Descriere</string>
@@ -182,22 +221,29 @@
   <string name="i2ptunnel_wizard_k_outproxies">Outproxy</string>
   <string name="i2ptunnel_wizard_k_target_host">Gazda tinta</string>
   <string name="i2ptunnel_wizard_k_target_port">Port tinta</string>
+  <string name="i2ptunnel_wizard_k_reachable_on">Accesibil pe</string>
+  <string name="i2ptunnel_wizard_k_binding_port">Port de legare</string>
   <string name="i2ptunnel_wizard_k_auto_start">Auto pornire</string>
   <string name="next">Urmatorul</string>
   <string name="prev">Anteriorul</string>
   <string name="finish">Trimite</string>
+  <string name="review">Revizuire</string>
   <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>
   <string name="i2ptunnel_wizard_desc_reachable_on">Aceasta limitează ce computere sau smartphone-uri pot accesa acest tunel.</string>
+  <string name="i2ptunnel_wizard_desc_binding_port">Acesta este portul la care tunelul client va fi accesat local. Acesta este și portul client pentru tunelul serverului bidir HTTP.</string>
   <string name="i2ptunnel_wizard_desc_auto_start">Ar trebui ca tunelul să pornească automat când ruterul pornește?</string>
   <string name="i2ptunnel_wizard_submit_confirm_message">Se creează tunelul?</string>
   <string name="i2ptunnel_wizard_submit_confirm_button">Creare tunel</string>
   <string name="i2ptunnel_view_target">Țintă</string>
   <string name="i2ptunnel_view_access_point">Punct de acces</string>
   <string name="i2ptunnel_view_autostart">Auto pornire</string>
+  <string name="address_copied_to_clipboard">Adresa copiată în clipboard</string>
   <string name="edit_tunnel">Editare tunel</string>
   <string name="name">Nume</string>
   <string name="description">Descriere</string>
@@ -205,54 +251,111 @@
   <string name="tunnel_summ_auto_start">Pornește tunelul când pornește ruterul.</string>
   <string name="tunnel_cat_ports">Porturi locale</string>
   <string name="shared_client">Client partajat</string>
+  <string name="tunnel_summ_shared_client">Utilizați aceeași destinație și tuneluri ca și alți clienți partajați</string>
   <string name="target_destination">Destinație țintă</string>
   <string name="persistent_key">Cheie permanentă</string>
+  <string name="persistent_key_conflict_title">Dezactivați tastele noi la redeschidere?</string>
+  <string name="persistent_key_conflict_msg">Nu puteți activa cheile persistente în timp ce tunelul este configurat pentru a genera noi chei la redeschidere. Doriți să dezactivați tastele noi la redeschidere?</string>
+  <string name="tunnel_summ_persistent_key">Mențineți destinația acestui tunel atunci când repornește</string>
+  <string name="reachable_on">Accesibil pe</string>
+  <string name="listen_port">Asculta  portul</string>
   <string name="client_ssl">Client SSL</string>
   <string name="tunnel_summ_client_ssl">Clienții trebuie să utilizeze SSL pentru conectare</string>
   <string name="outproxies">Outproxy</string>
+  <string name="ssl_outproxies">Procesele SSL</string>
   <string name="irc">IRC</string>
   <string name="enable_dcc">Activează DCC</string>
   <string name="tunnel_summ_enable_dcc">Permite clienților IRC să utilizeze DCC</string>
+  <string name="website_domain_name">Numele domeniului site-ului web</string>
   <string name="target_host">Gazda tinta</string>
   <string name="target_port">Port tinta</string>
   <string name="use_ssl">Utilizează SSL</string>
   <string name="tunnel_summ_use_ssl">Utilizează SSL pentru conectarea la țintă</string>
   <string name="tunnel_parameters">Parametri tunel</string>
   <string name="profile">Profil</string>
+  <string name="profile_bulk">Conexiune în masă (descărcări / site-uri web / BT)</string>
   <string name="profile_interactive">Conexiune interactivă</string>
   <string name="delay_connect">Întârziere conectare</string>
+  <string name="tunnel_summ_delay_connect">Activare pentru conexiuni cerere / răspuns</string>
   <string name="access_control">Control acces</string>
   <string name="restricted_access">Acces restricționat</string>
   <string name="disabled">Dezactivat</string>
   <string name="whitelist">Listă de excepții</string>
   <string name="blacklist">Listă de blocare</string>
   <string name="access_list">Listă de acces</string>
+  <string name="reject_inproxies">Respingeți inproxies</string>
+  <string name="tunnel_summ_reject_inproxies">Permiteți conectarea numai a utilizatorilor I2P</string>
+  <string name="unique_local">Local unic</string>
+  <string name="tunnel_summ_unique_local">Utilizați IP-urile localhost unice pentru fiecare client</string>
+  <string name="multihome">Multihome</string>
+  <string name="tunnel_summ_multihome">Activați optimizări multihoming</string>
+  <string name="client_connection_limits">Limitele de conectare la client</string>
   <string name="connections_per_minute">Conexiuni pe minut</string>
   <string name="connections_per_hour">Conexiuni pe oră</string>
   <string name="connections_per_day">Conexiuni pe zi</string>
+  <string name="total_connection_limits">Limite totale de conexiune</string>
+  <string name="total_connections_per_minute">Total conexiuni pe minut</string>
+  <string name="total_connections_per_hour">Total conexiuni pe oră</string>
+  <string name="total_connections_per_day">Total conexiuni pe zi</string>
+  <string name="max_active_connections">Conexiuni active max</string>
   <string name="num_per_minute">%s pe minut</string>
   <string name="num_per_hour">%s pe oră</string>
   <string name="num_per_day">%s pe zi</string>
   <string name="unlimited">Nelimitat</string>
   <string name="set_zero_for_unlimited">Configurați 0 pentru nelimitat</string>
+  <string name="post_limits">Limitele POSTULUI</string>
+  <string name="limit_period">Perioada de limitare</string>
+  <string name="client_posts_per_period">POST-urile clienților pe perioadă</string>
+  <string name="client_ban_length">Lungimea interzicerii clientului</string>
+  <string name="total_posts_per_period">POST-uri totale pe perioadă</string>
+  <string name="total_ban_length">Lungimea totală a interdicției</string>
+  <string name="power_saving">Economisire de energie</string>
+  <string name="delay_open">Întârziere deschiderii</string>
   <string name="tunnel_summ_delay_open">Întârziere tunelului deschis până este necesar</string>
+  <string name="reduce_quantity">Reduceți cantitatea</string>
   <string name="tunnel_summ_reduce_quantity">Reducerea cantitatii tunelilor atunci când este inactiva</string>
+  <string name="idle_time">Timp inactiv</string>
   <string name="num_minutes">%s minute</string>
+  <string name="reduced_tunnel_quantity">Cantitate redusă de tunel</string>
   <string name="close_tunnels">Inchiderea tunelurilor când e  inactiv</string>
+  <string name="new_keys_on_reopen">Taste noi la redeschidere</string>
+  <string name="new_keys_on_reopen_conflict_title">Dezactivați cheile persistente?</string>
+  <string name="new_keys_on_reopen_conflict_msg">Nu puteți activa noi chei la redeschidere, în timp ce tunelul este configurat să aibă chei persistente. Doriți să dezactivați cheile persistente?</string>
   <string name="http_client">Client HTTP</string>
+  <string name="tunnel_summ_user_agent">Treceți antetul „User-Agent”</string>
+  <string name="tunnel_summ_referer">Treceți antetul „Referer”</string>
+  <string name="tunnel_summ_accept">Treceți antetul „Accept- *”</string>
+  <string name="tunnel_summ_allow_ssl">Permiteți SSL adreselor I2P</string>
+  <string name="jump_url_list">Salt la lista URL</string>
   <string name="proxy_auth">Autorizare proxy</string>
+  <string name="tunnel_summ_proxy_auth">Solicitați o autentificare pentru a utiliza acest proxy</string>
   <string name="username">Nume utilizator</string>
   <string name="password">Parolă</string>
+  <string name="outproxy_auth">Autorizație outproxy</string>
+  <string name="tunnel_summ_outproxy_auth">Datele de conectare necesare pentru outproxy</string>
   <string name="other">Altceva</string>
   <string name="signature_type">Tip semnătură</string>
   <string name="custom_options">Opțiuni personalizate</string>
   <string name="all">Tot</string>
   <string name="no_messages">Fără mesaje</string>
   <string name="no_error_messages">Fără mesaje de eroare</string>
+  <plurals name="log_error_messages">
+    <item quantity="one">Un mesaj de eroare</item>
+    <item quantity="few">%d mesaje de eroare, cele mai noi primele</item>
+    <item quantity="other">%d mesaje de eroare, cele mai noi primele</item>
+  </plurals>
+  <plurals name="log_messages">
+    <item quantity="one">un mesaj</item>
+    <item quantity="few">%d mesaje, cele mai noi mai întâi</item>
+    <item quantity="other">%d mesaje, cele mai noi mai întâi</item>
+  </plurals>
+  <string name="log_entry">Intrare jurnal</string>
   <string name="copy_logs">Copiază jurnale</string>
   <string name="i2p_android_error_logs">Jurnale eroare I2P Android</string>
   <string name="i2p_android_logs">Jurnale I2P Android</string>
   <string name="error_logs_copied_to_clipboard">Jurnalele de eroare sunt copiate în memoria temporară</string>
   <string name="logs_copied_to_clipboard">Jurnalele sunt copiate în memoria temporară</string>
   <string name="label_browser_configuration">Configurare navigator web</string>
+  <string name="no_market_app">Nu a fost găsită nicio aplicație de piață, vă rugăm să instalați manual</string>
+  <string name="unset">Nesetat</string>
 </resources>

app/src/main/res/values-ru/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 работает лучше всего когда постоянно запущен. Для предотвращения закрытия I2P системой вы можете добавить его в список исключения оптимизации. Это существенно увеличит надёжность приложения. Оставить 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>
@@ -145,7 +147,7 @@
   <string name="settings_label_transports">Транспортные протоколы</string>
   <string name="settings_label_maxConns">Максимум соединений</string>
   <string name="settings_label_i2cp">I2CP-интерфейс</string>
-  <string name="settings_desc_i2cp">Слушать на порту 7654</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>

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

@@ -28,6 +28,8 @@
   <string name="char_client_tunnel">C</string>
   <!--Character to indicate a server tunnel. Usually first letter of the word "server".-->
   <string name="char_server_tunnel">S</string>
+  <string name="download">Stiahnuť</string>
+  <string name="upload">Nahrať</string>
   <string name="first_start_title">Gratulácia k nainštalovaniu I2P!</string>
   <string name="first_start_welcome"><b>Vitajte v I2P!</b> Prosím <b>majte trpezlivosť</b>, kým sa I2P nabootuje a nájde peerov.</string>
   <string name="first_start_read">Zatiaľ čo budete čakať, prosím prečítajte si poznámky k vydaniu a úvodnú stránku.</string>
@@ -87,7 +89,6 @@
   <string name="settings_label_transports">Transporty</string>
   <string name="settings_label_maxConns">Maximum pripojení</string>
   <string name="settings_label_i2cp">Rozhranie I2CP</string>
-  <string name="settings_desc_i2cp">Počúvať na porte 7654</string>
   <string name="settings_label_exploratory_pool">Skúšobný pool</string>
   <string name="settings_desc_exploratory_pool">Parametre tunelov</string>
   <string name="settings_label_expl_inbound">Prichádzajúce tunely</string>
@@ -184,6 +185,7 @@
   <string name="use_ssl">Použiť SSL</string>
   <string name="tunnel_parameters">Parametre tunelov</string>
   <string name="profile">Profil</string>
+  <string name="access_control">Riadenie prístupu</string>
   <string name="disabled">Zrušené</string>
   <string name="whitelist">Whitelist</string>
   <string name="blacklist">Blacklist</string>

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

@@ -22,12 +22,14 @@
   <string name="button_router_off">Mbaje tastin për ta filluar I2P\'në</string>
   <string name="button_router_on">I2P është në funkcion (mbaje tastin gjatë për ta ndalur) </string>
   <string name="hidden">Fshehur</string>
+  <string name="testing">Po provohet</string>
   <!--Parameter is a time, e.g. 32s or 2m-->
   <!--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".-->
   <string name="char_server_tunnel">S</string>
   <string name="download">Shkarkim</string>
+  <string name="upload">Ngarkoni</string>
   <string name="first_start_title">Urime që arritët ta instaloni I2P\'në!</string>
   <string name="first_start_welcome">&lt;b&gt;Mirë se vini në I2P!&lt;b&gt; Ju lutem &lt;b&gt;duroni&lt;b&gt; deri sa I2P të boot dhe tåe gjejë peers, </string>
   <string name="first_start_read">Deri sa jeni duke pritur, ju lutem lexoni notat që janë lëshuar dhe vizitoni faqen e mirëseardhjes. </string>
@@ -88,7 +90,6 @@
   <string name="settings_label_transports">Transportimet</string>
   <string name="settings_label_maxConns">Lidhjet maksimale</string>
   <string name="settings_label_i2cp">Ndërfaqja e I2CP\'së</string>
-  <string name="settings_desc_i2cp">Ndëgjo në portalen 7654</string>
   <string name="settings_label_exploratory_pool">Mjet zbulimi</string>
   <string name="settings_desc_exploratory_pool">Parametrat e tunelëve</string>
   <string name="settings_label_expl_inbound">Tunelët në hyrje</string>
@@ -172,6 +173,7 @@
   <string name="i2ptunnel_wizard_desc_auto_start">Të startojë tuneli njëkohësisht me router\'in?</string>
   <string name="i2ptunnel_wizard_submit_confirm_message">Krijo tunel?</string>
   <string name="i2ptunnel_wizard_submit_confirm_button">Krijo tunel</string>
+  <string name="i2ptunnel_view_target">Objektiv</string>
   <string name="i2ptunnel_view_autostart">Autostarto</string>
   <string name="name">Emër</string>
   <string name="description">Përshkrim</string>

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. Var god läs release kommentarerna. Version: </string>
+  <string name="welcome_new_version">Ny version installerad. Vänligen läs versionsanteckningarna. Version: </string>
   <string name="label_tunnels">Tunnlar</string>
   <string name="label_status">Status</string>
   <string name="label_console">Konsoll</string>
@@ -34,7 +34,7 @@ Läs utgåvenoteringar och licens-information.</string>
   <string name="net_status_error_i2cp">Klienthanterare I2CP-fel - kontrollera loggar</string>
   <!--Parameter is a time, e.g. 32s or 2m-->
   <string name="net_status_error_skew">Klockförskjutning på %s</string>
-  <string name="net_status_error_unresolved_tcp">Ej upplöst TCP-adress</string>
+  <string name="net_status_error_unresolved_tcp">Olöst TCP-adress</string>
   <string name="net_status_error_private_tcp">Privat TCP-adress</string>
   <string name="net_status_warn_firewalled_inbound_tcp">Bakom brandvägg med inåtgående TCP aktiverad</string>
   <string name="net_status_warn_firewalled_floodfill">Bakom brandvägg och \'floodfill\'</string>
@@ -146,7 +146,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">Lyssnar på port 7654</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>
@@ -232,7 +231,7 @@ Läs utgåvenoteringar och licens-information.</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">Mata in I2Pdestinationen för den tjänst denna tunnel skall ansluta till. Detta kan vara den fulla 64 destinationsnyckeln, eller ett I2Pvärdnamn från din adressbok.</string>
-  <string name="i2ptunnel_wizard_desc_outproxies">Om du känner till några utproxies för den här typen av tunnel (antingen HTTP eller SOCKS), fyll i dem. Separera flera proxies med kommatecken.</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_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>
@@ -261,7 +260,7 @@ Läs utgåvenoteringar och licens-information.</string>
   <string name="client_ssl">Klient SSL</string>
   <string name="tunnel_summ_client_ssl">Klienter måste använda SSL för att ansluta</string>
   <string name="outproxies">Utproxies</string>
-  <string name="ssl_outproxies">SSL utproxies</string>
+  <string name="ssl_outproxies">SSL utproxier</string>
   <string name="irc">IRC</string>
   <string name="enable_dcc">Aktivera DCC</string>
   <string name="tunnel_summ_enable_dcc">Tillåt IRCklienter att använda DCC</string>

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

@@ -36,7 +36,7 @@
   <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">Gelen TCP güvenlik duvarı etkinleştirilmiş </string>
-  <string name="net_status_warn_firewalled_floodfill">Güvenlik duvarlı ve akış korumalı</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">UPD kapısı 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>
@@ -55,6 +55,8 @@
   <string name="upload">Yükleme</string>
   <string name="configure_browser_title">Tarayıcı ayarlansın mı?</string>
   <string name="configure_browser_for_i2p">I2P sitelerini görüntüleyecek bir tarayıcı ayarlamak ister misiniz? (bu işlemi daha sonra Yardım menüsünden yapabilirsiniz).</string>
+  <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 Yazılımına Hoşgeldiniz</b> Lütfen I2P yüklenip 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>
@@ -144,8 +146,8 @@
   <string name="settings_summ_showStats">Ana konsolda ayrıntılı istatistikler görüntülensin</string>
   <string name="settings_label_transports">Aktarımlar</string>
   <string name="settings_label_maxConns">En fazla bağlantı</string>
-  <string name="settings_label_i2cp">I2CP Arayüzü</string>
-  <string name="settings_desc_i2cp">7654. kapı dinlensin</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_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>
@@ -204,8 +206,8 @@
   <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_msg_config_saved">Ayar değişiklikleri kaydedildi</string>
-  <string name="i2ptunnel_msg_config_save_failed">Ayarlar kaydedilemedi</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>
   <string name="i2ptunnel_msg_tunnel_stopping">Tünel kapatılıyor</string>
   <string name="i2ptunnel_delete_confirm_message">Tüneli sil</string>
@@ -353,7 +355,7 @@
   <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ı ayarları</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>
 </resources>

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

@@ -145,7 +145,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">Прослуховується на порту 7654</string>
   <string name="settings_label_exploratory_pool">Пошуковий пул</string>
   <string name="settings_desc_exploratory_pool">Параметри тунелів</string>
   <string name="settings_label_expl_inbound">Вхідні тунелі</string>
@@ -342,11 +341,13 @@
   <plurals name="log_error_messages">
     <item quantity="one">Одне повідомлення про помилку</item>
     <item quantity="few">%d повідомлень про помилку, спочатку нові</item>
+    <item quantity="many">%d повідомлень про помилки, спочатку нові</item>
     <item quantity="other">%d повідомлень про помилки, спочатку нові</item>
   </plurals>
   <plurals name="log_messages">
     <item quantity="one">Одне повідомлення</item>
     <item quantity="few">%d повідомлень, спочатку нові</item>
+    <item quantity="many">%d повідомлень, спочатку нові</item>
     <item quantity="other">%d повідомлень, спочатку нові</item>
   </plurals>
   <string name="log_entry">Запис у журналі</string>

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

@@ -3,6 +3,8 @@
   <string name="app_name">I2P</string>
   <string name="welcome_new_install">Chào mừng bạn đã sử dụng I2P! Đây là phiên bản ALPHA và có thể vẫn chưa được hoàn thiện đầy đủ các tính năng. Vui lòng đọc các tính năng có trong phần ghi chú về phiên bản cũng như thông tin về giấy phép sử dụng.</string>
   <string name="welcome_new_version">Phiên bản mới đã được cài đặt. Vui lòng đọc kỹ phần chú ý cài đặt. Phiên bản:</string>
+  <string name="label_status">Trạng thái</string>
+  <string name="label_addresses">Địa chỉ</string>
   <string name="label_addressbook">Sổ địa chỉ</string>
   <string name="label_logs">Nhật trình</string>
   <string name="label_error_logs">Nhật trình về lỗi</string>
@@ -10,16 +12,34 @@
   <string name="label_peers_status">Mạng ngang hàng</string>
   <string name="label_release_notes">Ghi chú phát hành</string>
   <string name="label_licenses">Giấy phép</string>
+  <string name="label_browse">Duyệt qua</string>
+  <string name="hidden">Dấu</string>
+  <!--Parameter is a time, e.g. 32s or 2m-->
+  <!--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".-->
+  <string name="char_server_tunnel">S</string>
+  <string name="download">Tải xuống</string>
+  <string name="upload">Tải lên</string>
+  <string name="action_search">Tìm</string>
   <string name="action_add">Thêm vào</string>
+  <string name="action_edit">Chỉnh sửa</string>
+  <string name="action_delete">Xóa</string>
   <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="country">Quốc gia</string>
+  <string name="version">Phiên bản</string>
+  <string name="count">Số lượng</string>
   <string name="menu_settings">Thiết lập</string>
   <string name="settings_enable">Cho phép</string>
   <string name="settings_desc_subscriptions">Đường dẫn đăng ký theo dõi</string>
-  <string name="settings_label_bandwidth">Băng thông và mạng lưới</string>
+  <string name="settings_label_bandwidth_net">Băng thông và mạng lưới</string>
   <string name="settings_label_bw_inbound">Tốc độ hướng vào</string>
   <string name="settings_desc_bw_inbound">Tốc độ hướng vào tối đa</string>
   <string name="settings_label_bw_outbound">Tốc độ hướng ra</string>
   <string name="settings_desc_bw_outbound">Tốc độ hướng ra tối đa</string>
+  <string name="settings_label_network">Mạng lưới</string>
   <string name="settings_label_hiddenMode">Sự tham gia</string>
   <string name="settings_desc_hiddenMode">Tắt chế độ ẩn</string>
   <string name="settings_label_maxPartTunnels">Số đường hầm tối đa liên quan</string>
@@ -29,11 +49,13 @@
   <string name="settings_desc_sharePercent">Phần trăm của lượng băng thông dùng cho chia sẻ (mặc định=80)</string>
   <string name="settings_dialog_sharePercent">Phần trăm của lượng băng thông dùng cho chia sẻ</string>
   <string name="settings_desc_upnp">Tự động mở kết nối ở cổng dữ liệu cho tường lửa</string>
+  <string name="settings_label_appearance">Xuất hiện</string>
+  <string name="settings_label_language">Ngôn ngữ</string>
+  <string name="settings_default">Mặc định</string>
   <string name="settings_label_advanced">Nâng cao</string>
   <string name="settings_label_transports">Giao thông</string>
   <string name="settings_label_maxConns">Số kết nối tối đa</string>
   <string name="settings_label_i2cp">Giao diện I2CP</string>
-  <string name="settings_desc_i2cp">Đón nhận thông tin trên cổng 7654</string>
   <string name="settings_label_exploratory_pool">Công cụ khám phá</string>
   <string name="settings_desc_exploratory_pool">Thông số đường hầm</string>
   <string name="settings_label_expl_inbound">Hướng vào đường hầm</string>
@@ -41,9 +63,63 @@
   <string name="settings_label_expl_length">Độ dài</string>
   <string name="settings_desc_expl_length">Số lượng hop được sử dụng</string>
   <string name="settings_label_expl_lengthVariance">Khoảng chênh lệch hop</string>
+  <string name="settings_summ_expl_lengthVariance">%s</string>
   <string name="settings_desc_expl_lengthVariance">Số lượng hop ngẫu nhiên được thêm vào</string>
   <string name="settings_label_expl_quantity">Số lượng</string>
   <string name="settings_desc_expl_quantity">Số lượng đường hầm</string>
   <string name="settings_label_expl_backupQuantity">Đường hầm dự trữ</string>
   <string name="settings_desc_expl_backupQuantity">Số lượng đường hầm dự phòng</string>
+  <string name="menu_about">Giới thiệu</string>
+  <string name="about_version">Phiên bản:</string>
+  <string name="about_project">Trang chủ dự án:</string>
+  <string name="menu_help">Giúp đỡ</string>
+  <string name="general">Chung</string>
+  <string name="addressbook_add_wizard_k_name">Tên</string>
+  <string name="addressbook_add_wizard_k_destination">Đích đến</string>
+  <string name="i2ptunnel_type_client">Khách thường</string>
+  <string name="i2ptunnel_type_httpclient">Khách HTTP</string>
+  <string name="i2ptunnel_type_ircclient">Khách IRC</string>
+  <string name="i2ptunnel_type_server">Máy chủ thường</string>
+  <string name="i2ptunnel_type_httpserver">Máy chủ HTTP</string>
+  <string name="i2ptunnel_type_sockstunnel">Proxy SOCKS 4/4a/5</string>
+  <string name="i2ptunnel_type_socksirctunnel">Proxy SOCKS IRC</string>
+  <string name="i2ptunnel_type_connectclient">Proxy nối kết/SSL/HTTPS</string>
+  <string name="i2ptunnel_type_ircserver">Máy chủ IRC</string>
+  <string name="i2ptunnel_type_streamrclient">Khách Streamr</string>
+  <string name="i2ptunnel_type_streamrserver">Máy chủ Streamr</string>
+  <string name="i2ptunnel_type_httpbidirserver">HTTP hai chiều</string>
+  <string name="i2ptunnel_new_tunnel">Đường Hầm Mới</string>
+  <string name="i2ptunnel_msg_config_saved">Lưu giữ thay đổi cấu hình</string>
+  <string name="i2ptunnel_msg_config_save_failed">Không lưu cấu hình được</string>
+  <string name="i2ptunnel_msg_tunnel_starting">Bắt đầu đường hầm</string>
+  <string name="i2ptunnel_msg_tunnel_stopping">Ngưng đường hầm</string>
+  <string name="i2ptunnel_wizard_k_name">Tên</string>
+  <string name="i2ptunnel_wizard_k_desc">Mô tả</string>
+  <string name="i2ptunnel_wizard_k_dest">Đích đến</string>
+  <string name="i2ptunnel_wizard_k_outproxies">Proxy ra</string>
+  <string name="i2ptunnel_wizard_k_auto_start">Tự động bắt đầu</string>
+  <string name="next">Kế</string>
+  <string name="prev">Trước</string>
+  <string name="finish">Nạp</string>
+  <string name="review">Duyệt xem</string>
+  <string name="enabled">Được bật lên</string>
+  <string name="i2ptunnel_view_target">Điểm đến</string>
+  <string name="name">Tên</string>
+  <string name="description">Mô tả</string>
+  <string name="outproxies">Proxy ra</string>
+  <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="disabled">Tàn tật</string>
+  <string name="whitelist">Sổ trắng</string>
+  <string name="blacklist">Sổ đen</string>
+  <string name="unlimited">Không giới hạn</string>
+  <string name="tunnel_summ_delay_open">Đợi mở đường hầm cho đến khi yêu cầu</string>
+  <string name="tunnel_summ_reduce_quantity">Giảm số lượng hầm khi rổi</string>
+  <string name="close_tunnels">Đóng đường hầm khi rảnh rổi</string>
+  <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="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

@@ -145,7 +145,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">監聽Port 7654</string>
   <string name="settings_label_exploratory_pool">導坑池</string>
   <string name="settings_desc_exploratory_pool">隧道參數</string>
   <string name="settings_label_expl_inbound">Inbound 隧道</string>
@@ -239,6 +238,7 @@
   <string name="use_ssl">使用 SSL</string>
   <string name="tunnel_parameters">隧道參數</string>
   <string name="profile">個人資料</string>
+  <string name="access_control">存取控制</string>
   <string name="disabled">關閉</string>
   <string name="unlimited">無限制</string>
   <string name="http_client">HTTP 客戶端</string>
@@ -246,4 +246,5 @@
   <string name="password">密碼</string>
   <string name="other">其它</string>
   <string name="all">全部</string>
+  <string name="no_messages">沒有訊息</string>
 </resources>

app/src/main/res/values-zh/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>在 I2P 启动和寻找同伴时，请<b>保持耐心</b>。</string>
   <string name="first_start_read">在您等候时，请阅读发布说明和欢迎页面。</string>
@@ -145,7 +147,7 @@
   <string name="settings_label_transports">传输</string>
   <string name="settings_label_maxConns">最大连接数</string>
   <string name="settings_label_i2cp">I2CP 接口</string>
-  <string name="settings_desc_i2cp">监听端口 7654</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>

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

@@ -31,13 +31,21 @@
     </string-array>
     <string-array name="languages">
         <item>zz</item>
+        <item>ar</item>
         <item>az</item>
-        <item>en</item>
         <item>ca</item>
         <item>zh</item>
+        <item>zh_TW</item>
+        <item>cs</item>
+        <item>da</item>
         <item>de</item>
+        <item>en</item>
         <item>es</item>
+        <item>fi</item>
         <item>fr</item>
+        <item>gl</item>
+        <item>el</item>
+        <item>hu</item>
         <item>in</item>
         <item>it</item>
         <item>ja</item>
@@ -59,13 +67,21 @@
     </string-array>
     <string-array name="language_names">
         <item>@string/settings_default</item>
+        <item>Arabic ﻉﺮﺒﻳﺓ</item>
         <item>Azerbaijani</item>
-        <item>English</item>
         <item>Català</item>
         <item>Chinese 中国的</item>
+        <item>Chinese 中国台湾</item>
+        <item>Czech</item>
+        <item>Dansk</item>
         <item>Deutsch</item>
+        <item>English</item>
         <item>Español</item>
+        <item>Suomi</item>
         <item>Français</item>
+        <item>Galego</item>
+        <item>Greek Ελληνικά</item>
+        <item>Hungarian</item>
         <item>Indonesia</item>
         <item>Italiano</item>
         <item>Japanese 日本語</item>
@@ -98,20 +114,29 @@
         <item>Lightning</item>
     </string-array>
     <string-array name="supported_browsers">
-        <item>info.guardianproject.browser</item>
         <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>Orweb</item>
         <item>Firefox</item>
+        <item>Fennec F-Droid</item>
+        <item>IceCatMobile</item>
     </string-array>
     <string-array name="unsupported_browsers">
         <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>info.guardianproject.browser</item>
         <item>mobi.mgeek.TunnyBrowser</item>
         <item>com.lastpass.lpandroid</item>
         <item>org.mozilla.focus</item>
+        <item>org.mozilla.rocket</item>
+        <item>org.mozilla.klar</item>
+        <item>org.torproject.torbrowser</item>
+        <item>org.torproject.torbrowser_alpha</item>
     </string-array>
     <string-array name="tunnel_profiles">
         <item>bulk</item>

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

@@ -33,6 +33,9 @@
     <!-- net.i2p.util.LogManager -->
     <string name="PROP_DEFAULTLEVEL" translatable="false">logger.defaultLevel</string>
 
+    <!-- net.i2p.router.client.ClientManager -->
+    <string name="PROP_DISABLE_EXTERNAL" translatable="false">i2cp.disableInterface</string>
+
     <!-- Others -->
     <string name="PREF_LANGUAGE" translatable="false">pref_language</string>
-</resources>
+</resources>

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

@@ -67,6 +67,8 @@
 
     <string name="configure_browser_title">Configure browser?</string>
     <string name="configure_browser_for_i2p">Would you like to configure a browser to view I2P sites? (You can also do this later from the help menu.)</string>
+    <string name="configure_no_doze_title">Manage Battery Optimizations?</string>
+    <string name="configure_no_doze">I2P works best if it keeps running. To prevent Android from closing I2P when trying to save power, you can add it to the battery exceptions list. This will substantially improve the reliability of the application.\n\nKeep I2P running in the background? (recommended)</string>
     <string name="first_start_title">Congratulations on getting I2P installed!</string>
     <string name="first_start_welcome"><b>Welcome to I2P!</b> Please <b>have patience</b> as I2P boots up and finds peers.</string>
     <string name="first_start_read">While you are waiting, please read the release notes and welcome page.</string>
@@ -180,7 +182,7 @@
     <string name="settings_label_transports">Transports</string>
     <string name="settings_label_maxConns">Max connections</string>
     <string name="settings_label_i2cp">I2CP interface</string>
-    <string name="settings_desc_i2cp">Listen on port 7654</string>
+    <string name="settings_desc_i2cp">Allow third-party apps to create tunnels (requires router restart)</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>

app/src/main/res/xml/settings_advanced.xml

@@ -13,14 +13,15 @@
     <!--
     i2cp.disableInterface=true
     -->
-    <!-- Hidden because we have the client library now.
+    <!-- Was hidden because we have the client library now.
+         Un-hidden in 0.9.40 because domain sockets don't work for third-party apps.
+        -->
     <CheckBoxPreference
-        android:key="i2cp.disableInterface"
+        android:key="@string/PROP_DISABLE_EXTERNAL"
         android:defaultValue="false"
         android:title="@string/settings_label_i2cp"
         android:summary="@string/settings_desc_i2cp"
         />
-        -->
 
     <Preference
         android:key="preference_category_expl_tunnels"

build.gradle

@@ -1,3 +1,13 @@
+apply plugin: 'signing'
+
+version = "$I2P_VERSION"
+ext.isReleaseVersion = !version.endsWith("SNAPSHOT")
+
+signing {
+     required { isReleaseVersion && gradle.taskGraph.hasTask("uploadArchives") }
+     sign configurations.archives
+ }
+
 buildscript {
     repositories {
         mavenLocal()
@@ -10,6 +20,7 @@ buildscript {
     }
 }
 
+
 allprojects {
     group = GROUP
 

gradle.properties

@@ -1,3 +1,4 @@
+
 GROUP=net.i2p.android
 
 org.gradle.jvmargs=-Xmx1536M
@@ -9,10 +10,10 @@ POM_SCM_DEV_CONNECTION=scm:git:git@github.com:i2p/i2p.android.base.git
 POM_LICENCE_NAME=The Apache Software License, Version 2.0
 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
-POM_DEVELOPER_ID=str4d
-POM_DEVELOPER_NAME=str4d
-POM_DEVELOPER_EMAIL=str4d@i2pmail.org
+POM_DEVELOPER_ID=meeh
+POM_DEVELOPER_NAME=meeh
+POM_DEVELOPER_EMAIL=meeh@i2pmail.org
 
-I2P_VERSION=0.9.39
-ANDROID_BUILD_TARGET_SDK_VERSION=26
+I2P_VERSION=0.9.44
+ANDROID_BUILD_TARGET_SDK_VERSION=28
 ANDROID_BUILD_SDK_VERSION=28

gradle/maven-push.gradle

@@ -108,6 +108,8 @@ afterEvaluate { project ->
     }
 
     task androidJavadocs(type: Javadoc) {
+        // TODO: Fix links to external modules
+        failOnError false
         source = android.sourceSets.main.java.srcDirs
         classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
     }

lib/client/build.gradle

@@ -1,11 +1,15 @@
 apply plugin: 'com.android.library'
 
 version = "$I2P_VERSION"
+repositories {
+    mavenLocal()
+    mavenCentral()
+}
 
 android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION as String)
     defaultConfig {
-        minSdkVersion 9
+        minSdkVersion 14
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
     }
     buildTypes {

lib/client/src/main/jniLibs/build.sh

@@ -2,6 +2,12 @@
 #
 # build GMP and libjbigi.so using the Android tools directly
 #
+# WARNING:
+# BROKEN - not updated for r19 NDK, aarch64, or GMP 6.1.2
+# Use the following in i2p.i2p source core/c/jbigi:
+# TARGET=android BITS=32 mbuild_all.sh
+# TARGET=android BITS=64 mbuild_all.sh
+#
 # TODO: Get more settings from environment variables set in ../custom-rules.xml
 #
 
@@ -71,7 +77,7 @@ JBIGI="$I2PBASE/core/c/jbigi"
 # libcrypto crashes on emulator, don't trust it
 # jbigi about 20-25% slower than java on emulator
 #
-GMPVER=6.0.0
+GMPVER=6.1.2
 GMP="$JBIGI/gmp-$GMPVER"
 
 if [ ! -d "$GMP" ]; then

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 9
+        minSdkVersion 14
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION as String)
     }
     buildTypes {
@@ -25,7 +25,10 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:support-v4:25.3.1'
+    // Android Support Repository dependencies
+    def supportVersion = '28.0.0'
+    implementation "com.android.support:support-v4:$supportVersion"
+    // Testing-only dependencies
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.11.0'
 }