New translations

merge of '73d2724826ecdabe3e124af9e485c44fe7188117'
and '977f74485a75e34e7488c13e06849f6dfb5d2d2a'
2013-10-15 19:52:39 +00:00 · 2013-08-12 01:44:37 +00:00 · 2013-08-12 01:44:31 +00:00 · 2013-08-11 14:50:01 +00:00 · 2013-08-11 13:58:21 +00:00 · 2013-08-11 13:58:05 +00:00
35 changed files with 954 additions and 218 deletions
--- a/.classpath
+++ b/.classpath
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_sdk"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2p_router"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/i2ptunnel"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/BOB"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/addressbook"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
--- a/.mtn-ignore
+++ b/.mtn-ignore
@@ -22,3 +22,11 @@ _jsp\.java$
 ~$
 /build/
 /classes/
+
+# Android-specific ignores
+^bin
+^gen
+^routerjars/bin
+^routerjars/gen
+AndroidManifest.xml
+local.properties
--- a/.project
+++ b/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>I2P_Android</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
--- a/.tx/config
+++ b/.tx/config
@@ -0,0 +1,11 @@
+[main]
+host = https://www.transifex.com
+lang_map = ru_RU: ru, sv_SE: sv, tr_TR: tr, zh_CN: zh
+
+[I2P.android]
+file_filter = res/values-<lang>/strings.xml
+source_file = res/values/strings.xml
+source_lang = en
+type = ANDROID
+minimum_perc = 50
+
--- a/AndroidManifest.xml.in
+++ b/AndroidManifest.xml.in
@@ -8,9 +8,11 @@
    <uses-permission android:name="android.permission.INTERNET" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

-    <uses-sdk android:minSdkVersion="8" />
+    <uses-sdk android:minSdkVersion="8"
+              android:targetSdkVersion="18" />

    <application android:label="@string/app_name"
+               android:theme="@style/Theme.AppCompat"
               android:icon="@drawable/ic_launcher_itoopie" >
        <service android:name=".service.RouterService"
                  android:label="@string/app_name"
@@ -20,7 +22,6 @@
        <activity android:name=".activity.MainActivity"
                  android:label="@string/app_name"
                  android:icon="@drawable/ic_launcher_itoopie"
-                  android.theme="@android:style/Theme.NoTitleBar"
                  android:launchMode="singleTop" >
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
@@ -29,21 +30,17 @@
        </activity>
        <activity android:name=".activity.NewsActivity"
                  android:label="I2P News"
-                  android:configChanges="orientation|keyboardHidden"
-                  android.theme="@android:style/Theme.NoTitleBar" >
+                  android:configChanges="orientation|keyboardHidden" >
        </activity>
        <activity android:name=".activity.TextResourceActivity"
-                  android:label="I2P Information"
-                  android.theme="@android:style/Theme.NoTitleBar" >
+                  android:label="I2P Information" >
        </activity>
        <activity android:name=".activity.LicenseActivity"
-                  android:label="I2P License Information"
-                  android.theme="@android:style/Theme.NoTitleBar" >
+                  android:label="I2P License Information" >
        </activity>
        <activity android:name=".activity.WebActivity"
                  android:label="I2P Web Browser"
-                  android:configChanges="orientation|keyboardHidden"
-                  android.theme="@android:style/Theme.NoTitleBar" >
+                  android:configChanges="orientation|keyboardHidden" >
            <intent-filter>
                <action android:name="android.intent.action.VIEW" />
                <category android:name="android.intent.category.DEFAULT" />
@@ -53,27 +50,22 @@
        </activity>
        <activity android:name=".activity.SettingsActivity"
                  android:label="I2P Settings"
-                  android.theme="@android:style/Theme.NoTitleBar"
                  android:launchMode="singleTop" >
        </activity>
        <activity android:name=".activity.AddressbookSettingsActivity"
                  android:label="I2P Addressbook Settings"
-                  android.theme="@android:style/Theme.NoTitleBar"
                  android:launchMode="singleTop" >
        </activity>
        <activity android:name=".activity.AddressbookActivity"
-                  android:label="I2P Address Book"
-                  android.theme="@android:style/Theme.NoTitleBar"
+                  android:label="Addressbook"
                  android:launchMode="singleTop" >
        </activity>
        <activity android:name=".activity.LogActivity"
-                  android:label="I2P Logs"
-                  android.theme="@android:style/Theme.NoTitleBar" >
+                  android:label="I2P Logs" >
        </activity>
        <activity android:name=".activity.PeersActivity"
                  android:label="I2P Peers and Transport Status"
                  android:configChanges="orientation|keyboardHidden"
-                  android.theme="@android:style/Theme.NoTitleBar"
                  android:launchMode="singleTop" >
        </activity>
    </application>
--- a/README.txt
+++ b/README.txt
@@ -29,11 +29,15 @@ Instructions:

 # now go to the available packages tab, check the box and click refresh,
 # and download an SDK Platform
-# Since I2P is configured to run on 2.2 or higher
-# (API 8) download at least that one. Otherwise you must change the
-# target in project.properties from android-8 to andriod-x
+# Since I2P is targeted at 4.3 (API 18)
+# download at least that one. Otherwise you must change the
+# target in project.properties from android-18 to andriod-x
 # where x is the API version.

+# I2P is configured to run on 2.2 (API 8) or higher using the
+# Android Support Library, so download that as well
+# (it's under "Extras"). 
+
 # To run the debugger (ddms) you also need to download the
 # "Android SDK Platform-Tools" package from the GUI updater.

@@ -42,11 +46,18 @@ Instructions:
 # sdk.dir=/path/to/your/android-sdk-linux
 # Copy this file to the routerjars/ directory, it is needed in both places.

+# If your SDK is not in ../android-sdk-linux/ then you must
+# override the location of the Android Support Library. Add
+# the following line to local.properties
+# do NOT use an absolute path
+# android.library.reference.2=path/to/your/android-sdk-linux/extras/android/support/v7/appcompat
+# Don't add it to the local.properties in the routerjars/ directory.
+
 # DO NOT create a new project or anything. It's all set up right here for you.

-# Create the android 2.2 (API 8) virtual device
+# Create the android 4.3 (API 18) virtual device
 # (don't make a custom hardware profile)
-../android-sdk-linux/tools/android create avd --name i2p --target 8
+../android-sdk-linux/tools/android create avd --name i2p --target 18

 # then run the emulator:
 #  This may take a LONG time the first time (half an hour or more)...
--- a/ant.properties
+++ b/ant.properties
@@ -1,5 +1,4 @@
 application-package=net.i2p.router
 key.store=${user.home}/.android/${application-package}.keystore
 key.alias=${application-package}
-android.library.reference.1=./routerjars
 key.store.password=android
--- a/custom_rules.xml
+++ b/custom_rules.xml
@@ -40,16 +40,21 @@
                major = values[0];
                minor = "0";
                release = "0";
+                point = "";
                if(dots > 0) {
                    minor = values[1];
                    if(dots > 1) {
                        release = values[2];
+                        if (dots > 2) {
+                            point = "." + values[3];
+                        }
                    }
                }
-                project.setNewProperty("CORE", major + "." + minor +"." + release);
+                project.setNewProperty("CORE", major + "." + minor + "." + release + point);
                project.setNewProperty("CORE.major", major);
                project.setNewProperty("CORE.minor", minor);
                project.setNewProperty("CORE.release", release);
+                project.setNewProperty("CORE.point", point);

            ]]>
    </scriptdef>
@@ -71,17 +76,19 @@
            <attribute name="major"/>
            <attribute name="minor"/>
            <attribute name="release"/>
+            <attribute name="point"/>
            <attribute name="routerbuild"/>
            <attribute name="androidbuild"/>
            <attribute name="sdk"/>
            <![CDATA[
                Major = attributes.get("major") + ".";
                Minor = attributes.get("minor") + ".";
-                Release = attributes.get("release") +"-";
+                Release = attributes.get("release");
+                Point = attributes.get("point") + "-";
                Routerbuild = attributes.get("routerbuild") +"_b";
                Androidbuild = attributes.get("androidbuild") +"-API";
                SDK = attributes.get("sdk");
-                project.setNewProperty(attributes.get("prefix") + ".full", Major + Minor + Release + Routerbuild + Androidbuild + SDK);
+                project.setNewProperty(attributes.get("prefix") + ".full", Major + Minor + Release + Point + Routerbuild + Androidbuild + SDK);
                /*
                * Android version code is an integer.
                * So we have 31 bits.
@@ -95,6 +102,8 @@
                * beware of that if you release multiple builds using the
                * same ROUTERBUILD, or clear it if you update ROUTERBUILD
                * Subtract 1 from ANDROIDBUILD since it starts at 1 after distclean.
+                *
+                * WARNING - 4th core field ("point") is ignored. Be sure to increment android build number.
                */
                iMajor = ((parseInt(Major) % 16) << 27);
                iMinor = ((parseInt(Minor) % 256) << 19);
@@ -323,11 +332,14 @@
    <normalizeitem name="buildversion" value="${buildversionfile}" />
    <echo message="buildversion `${buildversion}`" />

+   <!--
    <split value="${target}" sep="-" prefix="gettarget"/>
+   -->
+    <property name="gettarget.1" value="${minSdkVersion}" />
    <echo message="API${gettarget.1}" />
    <!-- generate the version infos that we will want to see -->
    <generateversions prefix="zap" major="${CORE.major}"
-        minor="${CORE.minor}" release="${CORE.release}"
+        minor="${CORE.minor}" release="${CORE.release}"  point="${CORE.point}"
        routerbuild="${ROUTERBUILD}" androidbuild="${buildversion}"
        sdk="${gettarget.1}"/>

--- a/project.properties
+++ b/project.properties
@@ -8,4 +8,13 @@
 # project structure.

 # Project target.
-target=android-8
+target=android-18
+# Must match that in AndroidManifest.xml.in
+minSdkVersion=8
+# I2P router libs
+android.library.reference.1=./routerjars
+# Android Support Library
+# If the relative path differs in your local environment,
+# override this in the base local.properties
+# (not routerjars/local.properties)
+android.library.reference.2=../android-sdk-linux/extras/android/support/v7/appcompat
--- a/res/drawable-hdpi/ic_content_new.png
+++ b/res/drawable-hdpi/ic_content_new.png
--- a/res/drawable-mdpi/ic_content_new.png
+++ b/res/drawable-mdpi/ic_content_new.png
--- a/res/drawable-xhdpi/ic_content_new.png
+++ b/res/drawable-xhdpi/ic_content_new.png
--- a/res/layout/activity_addressbook.xml
+++ b/res/layout/activity_addressbook.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/addressbook_list"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" >
+    
+
+</ListView>
--- a/res/layout/activity_addressbook_settings.xml
+++ b/res/layout/activity_addressbook_settings.xml
@@ -8,7 +8,7 @@
    >
    <LinearLayout
        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
        android:orientation="vertical" >

        <TextView
@@ -18,36 +18,30 @@
            android:text="Addressbook Settings"
            android:textAppearance="?android:attr/textAppearanceLarge" />

-        <FrameLayout
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Subscriptions"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
+
+        <EditText
+            android:id="@+id/subscriptions_content"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:ems="10"
+            android:inputType="textMultiLine"
+            android:maxLines="@integer/min_lines"
+            android:minLines="@integer/min_lines" >
+
+            <requestFocus />
+        </EditText>
+
+        <Button
+            android:id="@+id/button_save_subscriptions"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-
-            <TextView
-                android:id="@+id/textView2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Subscriptions"
-                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-            <EditText
-                android:id="@+id/subscriptions_content"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:ems="10"
-                android:inputType="textMultiLine"
-                android:maxLines="@integer/min_lines"
-                android:minLines="@integer/min_lines" >
-
-                <requestFocus />
-            </EditText>
-
-            <Button
-                android:id="@+id/button_save_subscriptions"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Save subscriptions.txt" />
-
-        </FrameLayout>
+            android:layout_height="wrap_content"
+            android:text="Save subscriptions.txt" />

    </LinearLayout>

--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -6,7 +6,7 @@
    android:padding="10px"
    android:scrollbarStyle="outsideInset"
    >
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
@@ -21,7 +21,7 @@
        android:id="@+id/textView4"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:text="Statistics"
+        android:text="@string/label_statistics"
        android:textAppearance="?android:attr/textAppearanceLarge" />

    <TextView
@@ -33,21 +33,21 @@
        android:id="@+id/textView1"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:text="Main Controls"
+        android:text="@string/label_main_controls"
        android:textAppearance="?android:attr/textAppearanceLarge" />

    <Button
        android:id="@+id/router_start_button"
        android:layout_width="match_parent"
        android:layout_height="68dp"
-        android:text="Start Router"
+        android:text="@string/action_router_start"
        android:drawableLeft="@drawable/start_router_icon" />

    <Button
        android:id="@+id/router_quit_button"
        android:layout_width="match_parent"
        android:layout_height="68dp"
-        android:text="Stop Router"
+        android:text="@string/action_router_stop"
        android:drawableLeft="@drawable/stop_router_icon" />
 <!--
 <Button
@@ -62,91 +62,91 @@
    android:id="@+id/textView2"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
-    android:text="I2P Tools"
+    android:text="@string/label_tools"
    android:textAppearance="?android:attr/textAppearanceMedium" />

 <Button
    android:id="@+id/addressbook_button"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:text="Address Book"
+    android:text="@string/label_addressbook"
    android:drawableLeft="@drawable/addressbook_icon" />

 <Button
    android:id="@+id/logs_button"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:text="Logs"
+    android:text="@string/label_logs"
    android:drawableLeft="@drawable/log_icon" />

 <Button
    android:id="@+id/error_button"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:text="Error Logs"
+    android:text="@string/label_error_logs"
    android:drawableLeft="@drawable/error_log_icon" />

 <Button
    android:id="@+id/peers_button"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:text="Peers"
+    android:text="@string/label_peers_status"
    android:drawableLeft="@drawable/peers_icon" />

 <TextView
    android:id="@+id/textView3"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
-    android:text="Information and pages"
+    android:text="@string/label_info_and_pages"
    android:textAppearance="?android:attr/textAppearanceMedium" />

 <Button
    android:id="@+id/welcome_button"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:text="Welcome\nPage"
+    android:text="@string/label_welcome_page"
    android:drawableLeft="@drawable/information_icon" />

 <Button
    android:id="@+id/news_button"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:text="News"
+    android:text="@string/label_news"
    android:drawableLeft="@drawable/information_icon" />

 <Button
    android:id="@+id/releasenotes_button"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:text="Release Notes"
+    android:text="@string/label_release_notes"
    android:drawableLeft="@drawable/information_icon" />

 <Button
    android:id="@+id/licenses_button"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:text="Licenses"
+    android:text="@string/label_licenses"
    android:drawableLeft="@drawable/information_icon" />

 <TextView
    android:id="@+id/textView5"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
-    android:text="Non Anonymous Information"
+    android:text="@string/label_nonanon_info"
    android:textAppearance="?android:attr/textAppearanceMedium" />

 <Button
    android:id="@+id/website_button"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:text="Web Site (non-anon)"
+    android:text="@string/label_website_nonanon"
    android:drawableLeft="@drawable/nonanon_info_icon" />

 <Button
    android:id="@+id/faq_button"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
-    android:text="FAQ (non-anon)"
+    android:text="@string/label_faq_nonanon"
    android:drawableLeft="@drawable/nonanon_info_icon" />

 </LinearLayout>
--- a/res/layout/news.xml
+++ b/res/layout/news.xml
@@ -3,14 +3,13 @@
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
-    android:padding="10px"
+    android:padding="10dp"
    >
 <TextView
    android:id="@+id/news_status"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
-    android:layout_centerHorizontal="true"
-    android:text="Latest I2P News"
+    android:text="@string/label_news_status"
    />
 <WebView
    android:id="@+id/news_webview"
--- a/res/layout/peers.xml
+++ b/res/layout/peers.xml
@@ -4,14 +4,13 @@
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:layout_margin="2dp"
-    android:padding="10px"
+    android:padding="10dp"
    >
 <TextView
    android:id="@+id/peers_status"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
-    android:layout_centerHorizontal="true"
-    android:text="Peers"
+    android:text="@string/label_peers_status"
    />
 <WebView
    android:id="@+id/peers_webview"
--- a/res/layout/text_resource.xml
+++ b/res/layout/text_resource.xml
@@ -3,14 +3,15 @@
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
-    android:padding="10px"
+    android:padding="10dp"
    >
 <TextView
    android:id="@+id/text_resource_text"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
    android:scrollbars="vertical"
-    android:text="Release Notes"
+    android:text="@string/label_release_notes"
+    android:textColor="@android:color/secondary_text_dark"
    />
 </LinearLayout>

--- a/res/layout/web.xml
+++ b/res/layout/web.xml
@@ -3,14 +3,13 @@
    android:orientation="vertical"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
-    android:padding="10px"
+    android:padding="10dp"
    >
 <TextView
    android:id="@+id/browser_status"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
-    android:layout_centerHorizontal="true"
-    android:text="Latest I2P News"
+    android:text="@string/label_news_status"
    />
 <WebView
    android:id="@+id/browser_webview"
--- a/res/menu/activity_addressbook_actions.xml
+++ b/res/menu/activity_addressbook_actions.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:i2pandroid="http://schemas.android.com/apk/res-auto" >
+    <!-- Add, should appear as action buttons --><!--
+    <item android:id="@+id/action_add_to_addressbook"
+          android:title="@string/action_add"
+          android:icon="@drawable/ic_content_new"
+          i2pandroid:showAsAction="ifRoom" />-->
+    <!-- Settings, should always be in the overflow -->
+    <item android:id="@+id/action_addressbook_settings"
+          android:title="@string/menu_settings"
+          i2pandroid:showAsAction="never" /></menu>
--- a/res/menu/menu1.xml
+++ b/res/menu/menu1.xml
@@ -1,25 +1,25 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:title="Start Router"
+    <item android:title="@string/action_router_start"
          android:id="@+id/menu_start"
          android:icon="@drawable/ic_menu_play_clip" >
    </item>
-    <item android:title="Stop Router"
+    <item android:title="@string/action_router_stop"
          android:id="@+id/menu_stop"
          android:icon="@android:drawable/ic_menu_close_clear_cancel" >
    </item>
-    <item android:title="Address Book"
+    <item android:title="@string/label_addressbook"
          android:id="@+id/menu_addressbook"
          android:icon="@drawable/ic_menu_friendslist" >
    </item>
-    <item android:title="Reload"
+    <item android:title="@string/action_reload"
          android:id="@+id/menu_reload"
          android:icon="@drawable/ic_menu_refresh" >
    </item>
-    <item android:title="I2P Home"
+    <item android:title="@string/label_home"
          android:id="@+id/menu_home"
          android:icon="@drawable/ic_menu_home" >
    </item>
-    <item android:title="Settings"
+    <item android:title="@string/menu_settings"
          android:id="@+id/menu_settings"
          android:icon="@android:drawable/ic_menu_preferences" >
    </item>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="welcome_new_install">¡Bienvenido a I2P! Esta aplicación es un software ALFA y no proporciona un fuerte anonimato. Por favor, lea las notas de veriones y la información sobre la licencia.</string>
+  <string name="welcome_new_version">Nueva versión instalada. Por favor lea las notas de versiones. Versión:</string>
+  <string name="label_home">Inicio de I2P</string>
+  <string name="label_statistics">Estadísticas</string>
+  <string name="label_main_controls">Controles Principales</string>
+  <string name="label_tools">Herramientas de I2P</string>
+  <string name="label_addressbook">Libreta de direcciones</string>
+  <string name="label_logs">Registros</string>
+  <string name="label_error_logs">Registros de Errores</string>
+  <string name="label_info_and_pages">Información y páginas</string>
+  <string name="label_welcome_page">Página de Bienvenida</string>
+  <string name="label_news">Noticias</string>
+  <string name="label_news_status">Últimas noticias sobre I2P</string>
+  <string name="label_peers_status">Pares</string>
+  <string name="label_release_notes">Notas de Versiones</string>
+  <string name="label_licenses">Licencias</string>
+  <string name="label_nonanon_info">Información no anónima</string>
+  <string name="label_website_nonanon">Página web (no anónima)</string>
+  <string name="label_faq_nonanon">FAQ (no anónimo)</string>
+  <string name="action_add">Añadir</string>
+  <string name="action_router_start">Iniciar el Ruter</string>
+  <string name="action_router_stop">Apagar el Ruter</string>
+  <string name="action_reload">Recargar</string>
+  <string name="menu_settings">Preferencias</string>
+  <string name="settings_enable">Activar</string>
+  <string name="settings_label_subscriptions">Librete de direcciones I2P</string>
+  <string name="settings_desc_subscriptions">URLs de subscripción</string>
+  <string name="settings_label_bandwidth">Red y ancho de banda</string>
+  <string name="settings_label_bw_inbound">Velocidad de entrada</string>
+  <string name="settings_desc_bw_inbound">Velocidad máxima de entrada</string>
+  <string name="settings_label_bw_outbound">Velocidad de salida</string>
+  <string name="settings_desc_bw_outbound">Velocidad máxima de salida</string>
+  <string name="settings_label_hiddenMode">Participación</string>
+  <string name="settings_desc_hiddenMode">Desactivar modo oculto</string>
+  <string name="settings_label_maxPartTunnels">Máximo número de túneles participantes</string>
+  <string name="settings_desc_maxPartTunnels">Máximo núemero de túneles en los que participar (por defecto=20)</string>
+  <string name="settings_dialog_maxPartTunnels">Máximo número de túneles en los que participar</string>
+  <string name="settings_label_sharePercent">Porcentaje de participación</string>
+  <string name="settings_desc_sharePercent">Porcentaje y ancho de banda a compartir (por defecto=80)</string>
+  <string name="settings_dialog_sharePercent">Procentaje del ancho de banda a compartir</string>
+  <string name="settings_desc_upnp">Abrir los puertos del cortafuegos automáticamente</string>
+  <string name="settings_label_advanced">Avanzado</string>
+  <string name="settings_label_transports">Trnasportes</string>
+  <string name="settings_label_maxConns">Máximo número de conexiones</string>
+  <string name="settings_label_i2cp">Interfaz de I2CP</string>
+  <string name="settings_desc_i2cp">Escuchar en el puerto 7654</string>
+  <string name="settings_label_exploratory_pool">Grupo exploratiorio</string>
+  <string name="settings_desc_exploratory_pool">Parámetros del Túnel</string>
+  <string name="settings_label_expl_inbound">Túneles de entrada</string>
+  <string name="settings_label_expl_outbound">Túneles de salida</string>
+  <string name="settings_label_expl_length">Tamaño</string>
+  <string name="settings_desc_expl_length">Cuantos saltos usar</string>
+  <string name="settings_label_expl_lengthVariance">Variación del salto</string>
+  <string name="settings_desc_expl_lengthVariance">Cuántos saltos se añadirán aleatoriamente.</string>
+  <string name="settings_label_expl_quantity">Cantidad</string>
+  <string name="settings_desc_expl_quantity">Cuantos túneles</string>
+  <string name="settings_label_expl_backupQuantity">Cantidad de respaldos</string>
+  <string name="settings_desc_expl_backupQuantity">Cuantos túneles de respaldo</string>
+</resources>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="welcome_new_install">Bienvenue sur I2P ! Cette application est un logiciel en version ALPHA, et elle ne prévoit pas un fort anonymat. Veuillez lire les notes de version et les informations de licence.</string>
+  <string name="welcome_new_version">Nouvelle version installée. Veuillez lire les notes de version. Version :</string>
+  <string name="label_home">I2P maison</string>
+  <string name="label_statistics">Statistiques</string>
+  <string name="label_main_controls">Commandes principales</string>
+  <string name="label_tools">Outils I2P</string>
+  <string name="label_addressbook">Carnet d\'adresses</string>
+  <string name="label_logs">Logs</string>
+  <string name="label_error_logs">Logs d\'erreurs</string>
+  <string name="label_info_and_pages">Information et pages</string>
+  <string name="label_welcome_page">Page d\'accueil</string>
+  <string name="label_news">Nouvelles</string>
+  <string name="label_news_status">Nouvelles récentes de I2P</string>
+  <string name="label_peers_status">Pairs</string>
+  <string name="label_release_notes">Notes de version</string>
+  <string name="label_licenses">Licences</string>
+  <string name="label_nonanon_info">Information non anonyme</string>
+  <string name="label_website_nonanon">Site Web (non-anon)</string>
+  <string name="label_faq_nonanon">FAQ (non-anon)</string>
+  <string name="action_add">Ajouter</string>
+  <string name="action_router_start">Démarrer routeur</string>
+  <string name="action_router_stop">Arrêter routeur</string>
+  <string name="action_reload">Recharger</string>
+  <string name="menu_settings">Réglages</string>
+  <string name="settings_enable">Activer</string>
+  <string name="settings_label_subscriptions">Carnet d\'adresses I2P</string>
+  <string name="settings_desc_subscriptions">URLs d\'abonnement</string>
+  <string name="settings_label_bandwidth">Bande passante et réseau</string>
+  <string name="settings_label_bw_inbound">Vitesse entrante</string>
+  <string name="settings_desc_bw_inbound">Vitesse entrante maximum</string>
+  <string name="settings_label_bw_outbound">Vitesse sortante</string>
+  <string name="settings_desc_bw_outbound">Vitesse sortante maximum</string>
+  <string name="settings_label_hiddenMode">Participation</string>
+  <string name="settings_desc_hiddenMode">Désactiver le mode caché</string>
+  <string name="settings_label_maxPartTunnels">Tunnels participants max</string>
+  <string name="settings_desc_maxPartTunnels">Maximum de tunnels auquels participer (défaut=20)</string>
+  <string name="settings_dialog_maxPartTunnels">Maximum de tunnels auquels participer</string>
+  <string name="settings_label_sharePercent">Pourcentage partagé</string>
+  <string name="settings_desc_sharePercent">Pourcentage de bande passante à partager (défaut=80)</string>
+  <string name="settings_dialog_sharePercent">Pourcentage de bande passante à partager</string>
+  <string name="settings_desc_upnp">Ouvrir automatiquement les ports du pare-feu</string>
+  <string name="settings_label_advanced">Avancé</string>
+  <string name="settings_label_transports">Transports</string>
+  <string name="settings_label_maxConns">Connexions max</string>
+  <string name="settings_label_i2cp">Interface I2CP</string>
+  <string name="settings_desc_i2cp">Écoute sur le port 7654</string>
+  <string name="settings_label_exploratory_pool">Pool exploratoire</string>
+  <string name="settings_desc_exploratory_pool">Paramètres du tunnel</string>
+  <string name="settings_label_expl_inbound">Tunnels entrants</string>
+  <string name="settings_label_expl_outbound">Tunnels sortants</string>
+  <string name="settings_label_expl_length">Longueur</string>
+  <string name="settings_desc_expl_length">Combien de sauts utiliser</string>
+  <string name="settings_label_expl_lengthVariance">Variance de saut</string>
+  <string name="settings_desc_expl_lengthVariance">Combien de sauts ajouter au hasard</string>
+  <string name="settings_label_expl_quantity">Quantité</string>
+  <string name="settings_desc_expl_quantity">Combien de tunnels</string>
+  <string name="settings_label_expl_backupQuantity">Quantité secours</string>
+  <string name="settings_desc_expl_backupQuantity">Combien de tunnels de secours</string>
+</resources>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="label_home">I2P Home</string>
+  <string name="label_statistics">Statistiche</string>
+  <string name="label_main_controls">Controlli principali</string>
+  <string name="label_tools">I2P Tools</string>
+  <string name="label_addressbook">Rubrica</string>
+  <string name="label_logs">Logs</string>
+  <string name="label_error_logs">Log errori</string>
+  <string name="label_info_and_pages">Informazioni e pagine</string>
+  <string name="label_welcome_page">Pagina di benvenuto</string>
+  <string name="label_news">News</string>
+  <string name="label_news_status">Ultime news I2P</string>
+  <string name="label_peers_status">Peers</string>
+  <string name="label_release_notes">Note di rilascio</string>
+  <string name="label_licenses">Licenze</string>
+  <string name="label_nonanon_info">Informazioni non anonime</string>
+  <string name="label_website_nonanon">Sito (non-anon)</string>
+  <string name="label_faq_nonanon">FAQ (non-anon)</string>
+  <string name="action_add">Aggiungi</string>
+  <string name="action_router_start">Start Router</string>
+  <string name="action_router_stop">Stop Router</string>
+  <string name="action_reload">Ricarica</string>
+  <string name="menu_settings">Impostazioni</string>
+  <string name="settings_enable">Attiva</string>
+  <string name="settings_label_subscriptions">Rubrica I2P</string>
+  <string name="settings_desc_subscriptions">URL sottoscrizioni</string>
+  <string name="settings_label_bandwidth">Banda e rete</string>
+  <string name="settings_label_bw_inbound">Velocità in entrata</string>
+  <string name="settings_desc_bw_inbound">Velocità massima in entrata</string>
+  <string name="settings_label_bw_outbound">Velocità in uscita</string>
+  <string name="settings_desc_bw_outbound">Velocità massima in uscita</string>
+</resources>
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -0,0 +1,34 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="welcome_new_install">Bem-vindo ao I2P! Este aplicativo é um software ALPHA e não proporciona um forte anonimato. Por favor, leia as notas de lançamento e informações de licença.</string>
+  <string name="welcome_new_version">Nova versão instalada. Por favor, leias as notas de lançamento. Versão:</string>
+  <string name="label_home">Início I2P</string>
+  <string name="label_statistics">Estastísticas</string>
+  <string name="label_main_controls">Controles Principais</string>
+  <string name="label_tools">Ferramentas I2P</string>
+  <string name="label_addressbook">Endereços</string>
+  <string name="label_logs">Registros</string>
+  <string name="label_error_logs">Registros de Erros</string>
+  <string name="label_info_and_pages">Informação e páginas</string>
+  <string name="label_welcome_page">Página de boas vindas</string>
+  <string name="label_news">Notícias</string>
+  <string name="label_news_status">Últimas Notícias do I2P</string>
+  <string name="label_peers_status">Pares</string>
+  <string name="label_release_notes">Notas da Versão</string>
+  <string name="label_licenses">Licenças</string>
+  <string name="label_nonanon_info">Informação não anônima</string>
+  <string name="label_website_nonanon">Site (não anônimo)</string>
+  <string name="label_faq_nonanon">FAQ (não anônimo)</string>
+  <string name="action_add">Adicionar</string>
+  <string name="action_router_start">Iniciar Roteador</string>
+  <string name="action_router_stop">Parar Roteador</string>
+  <string name="action_reload">Recarregar</string>
+  <string name="menu_settings">Configurações</string>
+  <string name="settings_enable">Habilitar</string>
+  <string name="settings_label_subscriptions">Endereços I2P</string>
+  <string name="settings_desc_subscriptions">Subscrição de URLs</string>
+  <string name="settings_label_hiddenMode">Participação</string>
+  <string name="settings_label_advanced">Avançado</string>
+  <string name="settings_desc_i2cp">Escutando na porta 7654</string>
+</resources>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="welcome_new_install">Добро пожаловать в I2P! Это приложение является альфа-версией и оно не обеспечивает сильной анонимности. Пожалуйста, прочтите примечания к выпуску и информацию о лицензии.</string>
+  <string name="welcome_new_version">Новая версия установлена. Пожалуйста, прочтите примечания к выпуску. Версия:</string>
+  <string name="label_home">Домашняя страница I2P</string>
+  <string name="label_statistics">Статистика</string>
+  <string name="label_main_controls">Основные средства управления</string>
+  <string name="label_tools">Инструменты I2P</string>
+  <string name="label_addressbook">Адресная книга</string>
+  <string name="label_logs">Журналы</string>
+  <string name="label_error_logs">Журнал ошибок</string>
+  <string name="label_info_and_pages">Информация и страницы</string>
+  <string name="label_welcome_page">Начальная страница</string>
+  <string name="label_news">Новости</string>
+  <string name="label_news_status">Последние новости I2P</string>
+  <string name="label_peers_status">Пиры</string>
+  <string name="label_release_notes">Примечания к выпуску</string>
+  <string name="label_licenses">Лицензии</string>
+  <string name="label_nonanon_info">Не анонимная информация</string>
+  <string name="label_website_nonanon">Веб Сайт (не анонимно)</string>
+  <string name="label_faq_nonanon">FAQ (не анонимно)</string>
+  <string name="action_add">Добавить</string>
+  <string name="action_router_start">Запустить маршрутизатор</string>
+  <string name="action_router_stop">Остановить маршрутизатор</string>
+  <string name="action_reload">Перезагрузить</string>
+  <string name="menu_settings">Настройки</string>
+  <string name="settings_enable">Включить</string>
+  <string name="settings_label_subscriptions">Адресная книга I2P</string>
+  <string name="settings_desc_subscriptions">Подписки на URL</string>
+  <string name="settings_label_bandwidth">Пропускная способность и сети</string>
+  <string name="settings_label_bw_inbound">Входящая скорость</string>
+  <string name="settings_desc_bw_inbound">Максимальная входящая скорость</string>
+  <string name="settings_label_bw_outbound">Исходящая скорость</string>
+  <string name="settings_desc_bw_outbound">Максимальная исходящая скорость</string>
+  <string name="settings_label_hiddenMode">Транзит</string>
+  <string name="settings_desc_hiddenMode">Выключить скрытый режим</string>
+  <string name="settings_label_maxPartTunnels">Максимальное количество транзитных туннелей</string>
+  <string name="settings_desc_maxPartTunnels">Максимальное количество участвующих туннелей (по умолчанию = 20)</string>
+  <string name="settings_dialog_maxPartTunnels">Максимальное количество участвующих туннелей</string>
+  <string name="settings_label_sharePercent">Процент транзитного трафика</string>
+  <string name="settings_desc_sharePercent">Процент пропускной способности на раздачу (по умолчанию = 80)</string>
+  <string name="settings_dialog_sharePercent">Процент пропускной способности на раздачу</string>
+  <string name="settings_desc_upnp">Автооткрытие портов брандмауэра</string>
+  <string name="settings_label_advanced">Расширенные</string>
+  <string name="settings_label_transports">Транспортные протоколы</string>
+  <string name="settings_label_maxConns">Максимум соединений</string>
+  <string name="settings_label_i2cp">I2CP-интерфейс</string>
+  <string name="settings_desc_i2cp">Слушать на порту 7654</string>
+  <string name="settings_label_exploratory_pool">Зондирующий пул</string>
+  <string name="settings_desc_exploratory_pool">Параметры тоннелей</string>
+  <string name="settings_label_expl_inbound">Входящие туннели</string>
+  <string name="settings_label_expl_outbound">Исходящие туннели</string>
+  <string name="settings_label_expl_length">Длина</string>
+  <string name="settings_desc_expl_length">Сколько хопов использовать</string>
+  <string name="settings_label_expl_lengthVariance">Хоп разброс</string>
+  <string name="settings_desc_expl_lengthVariance">Сколько хопов добавлять случайно</string>
+  <string name="settings_label_expl_quantity">Количество</string>
+  <string name="settings_desc_expl_quantity">Сколько туннелей</string>
+  <string name="settings_label_expl_backupQuantity">Резервное количество</string>
+  <string name="settings_desc_expl_backupQuantity"> Сколько туннелей резервировать</string>
+</resources>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="welcome_new_install">Välkommen till I2P! Denhär appen är ALFA-mjukvara och erbjuder inte stark anonymitet.\nVar god läs release kommentarerna och licens-information.</string>
+  <string name="welcome_new_version">Ny version installerad. Var god läs release kommentarerna. Version: </string>
+  <string name="label_home">I2P Hem</string>
+  <string name="label_statistics">Statistik</string>
+  <string name="label_main_controls">Huvudinställningar</string>
+  <string name="label_tools">I2P Verktyg</string>
+  <string name="label_addressbook">Adressbok</string>
+  <string name="label_logs">Loggar</string>
+  <string name="label_error_logs">Felloggar</string>
+  <string name="label_info_and_pages">Information och sidor</string>
+  <string name="label_welcome_page">Välkomstsida</string>
+  <string name="label_news">Nyheter</string>
+  <string name="label_news_status">Senaste I2P nyheterna</string>
+  <string name="label_peers_status">Peers</string>
+  <string name="label_release_notes">Releasekommentarer</string>
+  <string name="label_licenses">Licenser</string>
+  <string name="label_nonanon_info">Icke-anonym Information</string>
+  <string name="label_website_nonanon">Webb-sida (ej-anonym)</string>
+  <string name="label_faq_nonanon">FAQ (ej-anonym)</string>
+  <string name="action_add">Lägg till</string>
+  <string name="action_router_start">Starta Router</string>
+  <string name="action_router_stop">Stanna Router</string>
+  <string name="action_reload">Läs om</string>
+  <string name="menu_settings">Inställningar</string>
+  <string name="settings_enable">Aktivera</string>
+  <string name="settings_label_subscriptions">I2P Adressbok</string>
+  <string name="settings_desc_subscriptions">Prenumerations URL</string>
+  <string name="settings_label_bandwidth">Bandbredd och nätverk</string>
+  <string name="settings_label_bw_inbound">Inåtgående hastighet</string>
+  <string name="settings_desc_bw_inbound">Maximal inåtgående hastighet</string>
+  <string name="settings_label_bw_outbound">Utgående hastighet</string>
+  <string name="settings_desc_bw_outbound">Maximal utgående hastighet</string>
+  <string name="settings_label_hiddenMode">Deltagande</string>
+  <string name="settings_desc_hiddenMode">Slå av gömt läge</string>
+  <string name="settings_label_maxPartTunnels">Max deltagande tunnlar</string>
+  <string name="settings_desc_maxPartTunnels">Max tunnlar at delta i (standard=20)</string>
+  <string name="settings_dialog_maxPartTunnels">Max tunnlar att delta i</string>
+  <string name="settings_label_sharePercent">Delningsprocent</string>
+  <string name="settings_desc_sharePercent">Procent av bandbredd att dela (standard=80)</string>
+  <string name="settings_dialog_sharePercent">Procent av bandbredd at dela</string>
+  <string name="settings_desc_upnp">Öppna portar i brandvägg automatiskt</string>
+  <string name="settings_label_advanced">Avancerat</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>
+  <string name="settings_label_expl_outbound">Utåtgående tunnlar</string>
+  <string name="settings_label_expl_length">Längd</string>
+  <string name="settings_desc_expl_length">Hur många hopp vi använder</string>
+  <string name="settings_label_expl_lengthVariance">Hopp variation</string>
+  <string name="settings_desc_expl_lengthVariance">Hur många hopp vi slumpmässigt lägger till</string>
+  <string name="settings_label_expl_quantity">Kvantitet</string>
+  <string name="settings_desc_expl_quantity">Hur många tunnlar</string>
+  <string name="settings_label_expl_backupQuantity">Backup kvantitet</string>
+  <string name="settings_desc_expl_backupQuantity">Hur många reservtunnlar</string>
+</resources>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="welcome_new_install">I2P dünyasına hoş geldiniz. Bu uygulama henüz ALPHA geliştirme düzeyindedir ve yaygın olarak herkese açılmamıştır. Lütfen notları ve lisans bilgilerini okuyun.</string>
+  <string name="welcome_new_version">Yeni sürüm yüklendi. Lütfen yayım notlarını okuyun. Sürüm:</string>
+  <string name="label_home">I2P Anasayfası</string>
+  <string name="label_statistics">İstatistikler</string>
+  <string name="label_main_controls">Temel Denetimler</string>
+  <string name="label_tools">I2P Araçları</string>
+  <string name="label_addressbook">Adres defteri</string>
+  <string name="label_logs">Günlükler</string>
+  <string name="label_error_logs">Hata Günlükleri</string>
+  <string name="label_info_and_pages">Bilgiler ve sayfalar</string>
+  <string name="label_welcome_page">Karşılama Sayfası</string>
+  <string name="label_news">Haberler</string>
+  <string name="label_news_status">Son I2P Haberleri</string>
+  <string name="label_peers_status">Eşler</string>
+  <string name="label_release_notes">Yayım Notları</string>
+  <string name="label_licenses">Lisanslar</string>
+  <string name="label_nonanon_info">Herkese Açık Olmayan Bilgiler</string>
+  <string name="label_website_nonanon">Web Sitesi (herkese açık değil)</string>
+  <string name="label_faq_nonanon">SSS (herkese açık değil)</string>
+  <string name="action_add">Ekleyin</string>
+  <string name="action_router_start">Yönelticiyi Başlatın</string>
+  <string name="action_router_stop">Yönelticiyi Durdurun</string>
+  <string name="action_reload">Yeniden Yükleyin</string>
+  <string name="menu_settings">Ayarlar</string>
+  <string name="settings_enable">Etkinleştirin</string>
+  <string name="settings_label_subscriptions">I2P Adres Defteri</string>
+  <string name="settings_desc_subscriptions">Abonelik İnternet Adresleri</string>
+  <string name="settings_label_bandwidth">Bant genişliği ve ağ</string>
+  <string name="settings_label_bw_inbound">Geliş hızı</string>
+  <string name="settings_desc_bw_inbound">En fazla geliş hızı</string>
+  <string name="settings_label_bw_outbound">Gidiş hızı</string>
+  <string name="settings_desc_bw_outbound">En fazla gidiş hızı</string>
+  <string name="settings_label_hiddenMode">Katılım</string>
+  <string name="settings_desc_hiddenMode">Gizli kipi kapatın</string>
+  <string name="settings_label_maxPartTunnels">Katılınacak en fazla tünel sayısı </string>
+  <string name="settings_desc_maxPartTunnels">Katılınacak en fazla tünel sayısı (varsayılan=20)</string>
+  <string name="settings_dialog_maxPartTunnels">Katılınacak en fazla tünel sayısı </string>
+  <string name="settings_label_sharePercent">Paylaşım yüzdei</string>
+  <string name="settings_desc_sharePercent">Paylaşılan bant genişliği yüzdesi (varsayılan=80)</string>
+  <string name="settings_dialog_sharePercent">Paylaşılacak bant genişliği yüzdesi</string>
+  <string name="settings_desc_upnp">Güvenlik duvarı kapıları kendiliğinden açılsın</string>
+  <string name="settings_label_advanced">Gelişmiş</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_exploratory_pool">Keşif havuzu</string>
+  <string name="settings_desc_exploratory_pool">Tunel ayarları</string>
+  <string name="settings_label_expl_inbound">Gelen tüneller</string>
+  <string name="settings_label_expl_outbound">Giden tüneller</string>
+  <string name="settings_label_expl_length">Uzunluk</string>
+  <string name="settings_desc_expl_length">Kullanılacak sıçrama sayısı</string>
+  <string name="settings_label_expl_lengthVariance">Sıçrama çeşitliliği</string>
+  <string name="settings_desc_expl_lengthVariance">Rastgele eklenecek sıçrama sayısı</string>
+  <string name="settings_label_expl_quantity">Nicelik</string>
+  <string name="settings_desc_expl_quantity">Tünel sayısı</string>
+  <string name="settings_label_expl_backupQuantity">Yedek niceliği</string>
+  <string name="settings_desc_expl_backupQuantity">Tünel yedeği sayısı</string>
+</resources>
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <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_home">Trang chủ I2P</string>
+  <string name="label_statistics">Thống kê</string>
+  <string name="label_main_controls">Điều khiển chính</string>
+  <string name="label_tools">Công cụ I2P</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>
+  <string name="label_info_and_pages">Tin tức và trang tin</string>
+  <string name="label_welcome_page">Trang chào mừng</string>
+  <string name="label_news">Tin tức</string>
+  <string name="label_news_status">Thông tin mới nhất về I2P</string>
+  <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_nonanon_info">Thông tin không được ẩn danh</string>
+  <string name="label_website_nonanon">Website (trang chính)</string>
+  <string name="label_faq_nonanon">Các câu hỏi thường gặp (chính)</string>
+  <string name="action_add">Thêm vào</string>
+  <string name="action_router_start">Bắt đầu định tuyến</string>
+  <string name="action_router_stop">Dừng lại định tuyến</string>
+  <string name="action_reload">Tải lại</string>
+  <string name="menu_settings">Thiết lập</string>
+  <string name="settings_enable">Cho phép</string>
+  <string name="settings_label_subscriptions">Sổ địa chỉ I2P</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_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_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>
+  <string name="settings_desc_maxPartTunnels">Số đường hầm tối đa tham gia vào (mặc định là=20)</string>
+  <string name="settings_dialog_maxPartTunnels">Số đường hầm tối đa có liên quan</string>
+  <string name="settings_label_sharePercent">Chia tỉ lệ phần trăm</string>
+  <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_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>
+  <string name="settings_label_expl_outbound">Hướng đi ra đường hầm</string>
+  <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_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>
+</resources>
--- a/res/values-zh/strings.xml
+++ b/res/values-zh/strings.xml
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">I2P</string>
+  <string name="welcome_new_install">欢迎来到 I2P ! 此程序为 Alpha 版的测试程序，不提供很强的匿名性。请阅读版本发布说明和许可证信息。</string>
+  <string name="welcome_new_version">新版本已安装，请阅读版本说明。版本：</string>
+  <string name="label_home">I2P 主页</string>
+  <string name="label_statistics">统计</string>
+  <string name="label_main_controls">主要控制项</string>
+  <string name="label_tools">I2P 工具</string>
+  <string name="label_addressbook">地址簿</string>
+  <string name="label_logs">日志</string>
+  <string name="label_error_logs">错误日志</string>
+  <string name="label_info_and_pages">信息及页面</string>
+  <string name="label_welcome_page">欢迎页面</string>
+  <string name="label_news">新闻</string>
+  <string name="label_news_status">I2P 最新消息</string>
+  <string name="label_peers_status">节点</string>
+  <string name="label_release_notes">版本说明</string>
+  <string name="label_licenses">许可证</string>
+  <string name="label_nonanon_info">非匿名信息</string>
+  <string name="label_website_nonanon">网站(公网)</string>
+  <string name="label_faq_nonanon">FAQ(公网)</string>
+  <string name="action_add">添加</string>
+  <string name="action_router_start">启动路由器</string>
+  <string name="action_router_stop">关闭路由器</string>
+  <string name="action_reload">重新载入</string>
+  <string name="menu_settings">设置</string>
+  <string name="settings_enable">启用</string>
+  <string name="settings_label_subscriptions">I2P 地址簿</string>
+  <string name="settings_desc_subscriptions">订阅链接</string>
+  <string name="settings_label_bandwidth">带宽和网络</string>
+  <string name="settings_label_bw_inbound">入站速度</string>
+  <string name="settings_desc_bw_inbound">最大入站速度</string>
+  <string name="settings_label_bw_outbound">出站速度</string>
+  <string name="settings_desc_bw_outbound">最大出站速度</string>
+  <string name="settings_label_hiddenMode">参与</string>
+  <string name="settings_desc_hiddenMode">关闭隐藏模式</string>
+  <string name="settings_label_maxPartTunnels">最大参与隧道数</string>
+  <string name="settings_desc_maxPartTunnels">参与贡献的最大隧道数量(默认=20)</string>
+  <string name="settings_dialog_maxPartTunnels">参与的最大隧道数量</string>
+  <string name="settings_label_sharePercent">共享比例</string>
+  <string name="settings_desc_sharePercent">共享带宽的最大比例(默认=80%)</string>
+  <string name="settings_dialog_sharePercent">共享的带宽比例</string>
+  <string name="settings_desc_upnp">自动打开防火墙端口</string>
+  <string name="settings_label_advanced">高级</string>
+  <string name="settings_label_transports">传输</string>
+  <string name="settings_label_maxConns">最大连接数</string>
+  <string name="settings_label_i2cp">I2CP 接口</string>
+  <string name="settings_desc_i2cp">监听端口 7654</string>
+  <string name="settings_label_exploratory_pool">探索隧道池</string>
+  <string name="settings_desc_exploratory_pool">隧道参数</string>
+  <string name="settings_label_expl_inbound">入站隧道</string>
+  <string name="settings_label_expl_outbound">出站隧道</string>
+  <string name="settings_label_expl_length">长度</string>
+  <string name="settings_desc_expl_length">使用跳点数量</string>
+  <string name="settings_label_expl_lengthVariance">跳数变化量</string>
+  <string name="settings_desc_expl_lengthVariance">随机添加的跳点数量</string>
+  <string name="settings_label_expl_quantity">数量</string>
+  <string name="settings_desc_expl_quantity">隧道数量</string>
+  <string name="settings_label_expl_backupQuantity">备用数量</string>
+  <string name="settings_desc_expl_backupQuantity">备用隧道数量</string>
+</resources>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4,7 +4,64 @@
    <string name="app_name">I2P</string>
    <string name="welcome_new_install">Welcome to I2P! This app is ALPHA software and it does not provide strong anonymity. Please read the release notes and license information.</string>
    <string name="welcome_new_version">New version installed. Please read the release notes. Version:</string>
-    <string name="settings_label_subscriptions">I2P Addressbook Settings</string>
+
+    <string name="label_home">I2P Home</string>
+    <string name="label_statistics">Statistics</string>
+    <string name="label_main_controls">Main Controls</string>
+    <string name="label_tools">I2P Tools</string>
+    <string name="label_addressbook">Addressbook</string>
+    <string name="label_logs">Logs</string>
+    <string name="label_error_logs">Error Logs</string>
+    <string name="label_info_and_pages">Information and pages</string>
+    <string name="label_welcome_page">Welcome Page</string>
+    <string name="label_news">News</string>
+    <string name="label_news_status">Latest I2P News</string>
+    <string name="label_peers_status">Peers</string>
+    <string name="label_release_notes">Release Notes</string>
+    <string name="label_licenses">Licenses</string>
+    <string name="label_nonanon_info">Non Anonymous Information</string>
+    <string name="label_website_nonanon">Web Site (non-anon)</string>
+    <string name="label_faq_nonanon">FAQ (non-anon)</string>
+
+    <string name="action_add">Add</string>
+    <string name="action_router_start">Start Router</string>
+    <string name="action_router_stop">Stop Router</string>
+    <string name="action_reload">Reload</string>
+
    <string name="menu_settings">Settings</string>
+    <string name="settings_enable">Enable</string>
+    <string name="settings_label_subscriptions">I2P Addressbook</string>
+    <string name="settings_desc_subscriptions">Subscription URLs</string>
+    <string name="settings_label_bandwidth">Bandwidth and network</string>
+    <string name="settings_label_bw_inbound">Inbound speed</string>
+    <string name="settings_desc_bw_inbound">Maximum inbound speed</string>
+    <string name="settings_label_bw_outbound">Outbound speed</string>
+    <string name="settings_desc_bw_outbound">Maximum outbound speed</string>
+    <string name="settings_label_hiddenMode">Participation</string>
+    <string name="settings_desc_hiddenMode">Turn off hidden mode</string>
+    <string name="settings_label_maxPartTunnels">Max participating tunnels</string>
+    <string name="settings_desc_maxPartTunnels">Maximum tunnels to participate in (default=20)</string>
+    <string name="settings_dialog_maxPartTunnels">Maximum tunnels to participate in</string>
+    <string name="settings_label_sharePercent">Share percentage</string>
+    <string name="settings_desc_sharePercent">Percentage of bandwidth to share (default=80)</string>
+    <string name="settings_dialog_sharePercent">Percentage of bandwidth to share</string>
+    <string name="settings_desc_upnp">Open firewall ports automatically</string>
+    <string name="settings_label_advanced">Advanced</string>
+    <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_label_exploratory_pool">Exploratory pool</string>
+    <string name="settings_desc_exploratory_pool">Tunnel parameters</string>
+    <string name="settings_label_expl_inbound">Inbound tunnels</string>
+    <string name="settings_label_expl_outbound">Outbound tunnels</string>
+    <string name="settings_label_expl_length">Length</string>
+    <string name="settings_desc_expl_length">How many hops to use</string>
+    <string name="settings_label_expl_lengthVariance">Hop variance</string>
+    <string name="settings_desc_expl_lengthVariance">How many hops to randomly add</string>
+    <string name="settings_label_expl_quantity">Quantity</string>
+    <string name="settings_desc_expl_quantity">How many tunnels</string>
+    <string name="settings_label_expl_backupQuantity">Backup quantity</string>
+    <string name="settings_desc_expl_backupQuantity">How many tunnel backups</string>

 </resources>
--- a/res/xml/settings1.xml
+++ b/res/xml/settings1.xml
@@ -1,9 +1,10 @@
-    <PreferenceScreen
+<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:key="settings1">

    <Preference
        android:title="@string/settings_label_subscriptions"
+        android:summary="@string/settings_desc_subscriptions"
        android:key="addressbook_preferences">

        <intent android:targetPackage="net.i2p.android.router" android:targetClass="net.i2p.android.router.activity.AddressbookSettingsActivity" />
@@ -12,13 +13,11 @@

    <!--
    Keys and the default values from current installation:
-    i2cp.disableInterface=true
    -->
-    <CheckBoxPreference
-        android:key="i2cp.disableInterface"
-        android:defaultValue="false"
-        android:title="Disable i2cp interface"
-        />
+
+    <PreferenceCategory
+        android:key="settings_bandwidth"
+        android:title="@string/settings_label_bandwidth">
    <!--
    i2np.bandwidth.inboundKBytesPerSecond=100
    -->
@@ -26,8 +25,8 @@
        android:key="i2np.bandwidth.inboundKBytesPerSecond"
        android:defaultValue="100"
        android:max="1000"
-        android:title="Inbound speed"
-        android:summary="Maximum inbound speed"
+        android:title="@string/settings_label_bw_inbound"
+        android:summary="@string/settings_desc_bw_inbound"
        android:dialogMessage="Maximum inbound speed"
        android:text=" KBytes/sec"
        />
@@ -38,84 +37,26 @@
        android:key="i2np.bandwidth.outboundKBytesPerSecond"
        android:defaultValue="100"
        android:max="1000"
-        android:title="Outbound speed"
-        android:summary="Maximum outbound speed"
+        android:title="@string/settings_label_bw_outbound"
+        android:summary="@string/settings_desc_bw_outbound"
        android:dialogMessage="Maximum outbound speed"
        android:text=" KBytes/sec"
        />
-
-    <CheckBoxPreference
-        android:key="i2np.ntcp.enable"
-        android:defaultValue="true"
-        android:title="Enable NTCP"
-        />
-
-    <!--
-    i2np.udp.enable=false
-    I might hide this one...
-    -->
-    <CheckBoxPreference
-        android:key="i2np.udp.enable"
-        android:defaultValue="true"
-        android:title="Enable UDP"
-        android:summary="DO NOT DISABLE THIS"
-        />
-
-    <!--
-    i2np.ntcp.maxConnections=24
-    -->
-    <com.hlidskialf.android.preference.SeekBarPreference
-        android:key="i2np.ntcp.maxConnections"
-        android:defaultValue="32"
-        android:max="250"
-        android:title="Max NTCP connections"
-        android:summary="Maximum NTCP connections allowed (default=32)"
-        android:dialogMessage="Maximum NTCP connections"
-        android:text=" connections"
-        android:dependency="i2np.ntcp.enable"
-        android:shouldDisableView="true"
-        />
-    <!--
-    i2np.udp.maxConnections=12
-    -->
-    <com.hlidskialf.android.preference.SeekBarPreference
-        android:key="i2np.udp.maxConnections"
-        android:defaultValue="32"
-        android:max="500"
-        android:title="Max UDP connections"
-        android:summary="Maximum UDP connections allowed"
-        android:dialogMessage="Maximum UDP connections"
-        android:text=" connections"
-        android:dependency="i2np.udp.enable"
-        android:shouldDisableView="true"
-        />
-    <!--
-    i2np.upnp.enable=false
-    -->
-    <CheckBoxPreference
-        android:key="i2np.upnp.enable"
-        android:defaultValue="true"
-        android:title="Enable UPNP"
-        />
-
-
-
    <CheckBoxPreference
        android:key="router.hiddenMode"
        android:defaultValue="false"
-        android:title="Enable Participation"
-        android:summary="Enabling this option turns off hidden mode"
+        android:title="@string/settings_label_hiddenMode"
+        android:summary="@string/settings_desc_hiddenMode"
        />
    <!--
-
    router.maxParticipatingTunnels=0
    -->
    <com.hlidskialf.android.preference.SeekBarPreference
        android:key="router.maxParticipatingTunnels"
        android:defaultValue="20"
        android:max="500"
-        android:title="Max Participating Tunnels"
-        android:summary="Maximum tunnels to participate in (default=20)"
+        android:title="@string/settings_label_maxPartTunnels"
+        android:summary="@string/settings_desc_maxPartTunnels"
        android:dialogMessage="Maximum tunnels to participate in"
        android:text=" Tunnels"
        android:dependency="router.hiddenMode"
@@ -127,102 +68,211 @@
        android:key="router.sharePercentage"
        android:defaultValue="80"
        android:max="100"
-        android:title="Share Percentage"
-        android:summary="Percentage of bandwith to share (default=80)"
-        android:dialogMessage="Percentage of bandwith to share"
+        android:title="@string/settings_label_sharePercent"
+        android:summary="@string/settings_desc_sharePercent"
+        android:dialogMessage="Percentage of bandwidth to share"
        android:text="%"
        android:dependency="router.hiddenMode"
        android:shouldDisableView="true"
        />

    <!--
+    i2np.upnp.enable=false
+    -->
+    <CheckBoxPreference
+        android:key="i2np.upnp.enable"
+        android:defaultValue="true"
+        android:title="UPnP"
+        android:summary="@string/settings_desc_upnp"
+        />
+    </PreferenceCategory>
+
+
+
+    <PreferenceCategory
+        android:key="settings_advanced"
+        android:title="@string/settings_label_advanced">
+
+    <PreferenceScreen
+        android:key="settings_transports"
+        android:title="@string/settings_label_transports">
+
+    <PreferenceCategory
+        android:key="settings_ntcp"
+        android:title="NTCP">
+    <CheckBoxPreference
+        android:key="i2np.ntcp.enable"
+        android:defaultValue="true"
+        android:title="@string/settings_enable"
+        />
+    <!--
+    i2np.ntcp.maxConnections=24
+    -->
+    <com.hlidskialf.android.preference.SeekBarPreference
+        android:key="i2np.ntcp.maxConnections"
+        android:defaultValue="32"
+        android:max="250"
+        android:title="@string/settings_label_maxConns"
+        android:summary="Maximum NTCP connections allowed (default=32)"
+        android:dialogMessage="Maximum NTCP connections"
+        android:text=" connections"
+        android:dependency="i2np.ntcp.enable"
+        android:shouldDisableView="true"
+        />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="settings_udp"
+        android:title="UDP">
+    <!--
+    i2np.udp.enable=false
+    I might hide this one...
+    -->
+    <CheckBoxPreference
+        android:key="i2np.udp.enable"
+        android:defaultValue="true"
+        android:title="@string/settings_enable"
+        android:summary="DO NOT DISABLE THIS"
+        />
+
+    <!--
+    i2np.udp.maxConnections=12
+    -->
+    <com.hlidskialf.android.preference.SeekBarPreference
+        android:key="i2np.udp.maxConnections"
+        android:defaultValue="32"
+        android:max="500"
+        android:title="@string/settings_label_maxConns"
+        android:summary="Maximum UDP connections allowed"
+        android:dialogMessage="Maximum UDP connections"
+        android:text=" connections"
+        android:dependency="i2np.udp.enable"
+        android:shouldDisableView="true"
+        />
+    </PreferenceCategory>
+    </PreferenceScreen>
+
+    <!--
+    i2cp.disableInterface=true
+    -->
+    <CheckBoxPreference
+        android:key="i2cp.disableInterface"
+        android:defaultValue="false"
+        android:title="@string/settings_label_i2cp"
+        android:summary="@string/settings_desc_i2cp"
+        />
+
+    <PreferenceScreen
+        android:key="settings_exploratory_pool"
+        android:title="@string/settings_label_exploratory_pool"
+        android:summary="@string/settings_desc_exploratory_pool">
+
+    <PreferenceCategory
+        android:key="settings_expl_inbound"
+        android:title="@string/settings_label_expl_inbound">
+    <!--
    router.inboundPool.length=1
-    router.outboundPool.length=1
    -->
    <ListPreference
        android:key="router.inboundPool.length"
        android:entries="@array/setting0to3"
        android:entryValues="@array/setting0to3"
-        android:title="inbound length"
-        android:summary="How many hops for inbound tunnel"
-        android:defaultValue="2"
-    />
-
-    <ListPreference
-        android:key="router.outboundPool.length"
-        android:entries="@array/setting0to3"
-        android:entryValues="@array/setting0to3"
-        android:title="outbound length"
-        android:summary="How many hops for outbound tunnel"
+        android:title="@string/settings_label_expl_length"
+        android:summary="@string/settings_desc_expl_length"
        android:defaultValue="2"
    />

    <!--
    router.inboundPool.lengthVariance=1
-    router.outboundPool.lengthVariance=1
    -->
    <ListPreference
        android:key="router.inboundPool.lengthVariance"
        android:entries="@array/setting2to2"
        android:entryValues="@array/setting2to2"
-        android:title="inbound hop variance"
-        android:summary="How many hops to randomly add to inbound tunnels"
-        android:defaultValue="0"
-    />
-
-    <ListPreference
-        android:key="router.outboundPool.lengthVariance"
-        android:entries="@array/setting2to2"
-        android:entryValues="@array/setting2to2"
-        android:title="outbound hop variance"
-        android:summary="How many hops to randomly add to outbound tunnels"
+        android:title="@string/settings_label_expl_lengthVariance"
+        android:summary="@string/settings_desc_expl_lengthVariance"
        android:defaultValue="0"
    />


    <!--
    router.inboundPool.quantity=2
-    router.outboundPool.quantity=2
    -->
    <ListPreference
        android:key="router.inboundPool.quantity"
        android:entries="@array/setting0to3"
        android:entryValues="@array/setting0to3"
-        android:title="inbound quantity"
-        android:summary="How many inbound tunnels"
-        android:defaultValue="2"
-    />
-
-    <ListPreference
-        android:key="router.outboundPool.quantity"
-        android:entries="@array/setting0to3"
-        android:entryValues="@array/setting0to3"
-        android:title="outbound quantity"
-        android:summary="How many outbound tunnels"
+        android:title="@string/settings_label_expl_quantity"
+        android:summary="@string/settings_desc_expl_quantity"
        android:defaultValue="2"
    />

    <!--
    router.inboundPool.backupQuantity=0
-    router.outboundPool.backupQuantity=0
    -->
    <ListPreference
        android:key="router.inboundPool.backupQuantity"
        android:entries="@array/setting0to3"
        android:entryValues="@array/setting0to3"
-        android:title="inbound backup quantity"
-        android:summary="How many inbound tunnel backups"
+        android:title="@string/settings_label_expl_backupQuantity"
+        android:summary="@string/settings_desc_expl_backupQuantity"
+        android:defaultValue="0"
+    />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="settings_expl_outbound"
+        android:title="@string/settings_label_expl_outbound">
+    <!--
+    router.outboundPool.length=1
+    -->
+    <ListPreference
+        android:key="router.outboundPool.length"
+        android:entries="@array/setting0to3"
+        android:entryValues="@array/setting0to3"
+        android:title="@string/settings_label_expl_length"
+        android:summary="@string/settings_desc_expl_length"
+        android:defaultValue="2"
+    />
+
+    <!--
+    router.outboundPool.lengthVariance=1
+    -->
+    <ListPreference
+        android:key="router.outboundPool.lengthVariance"
+        android:entries="@array/setting2to2"
+        android:entryValues="@array/setting2to2"
+        android:title="@string/settings_label_expl_lengthVariance"
+        android:summary="@string/settings_desc_expl_lengthVariance"
        android:defaultValue="0"
    />

+    <!--
+    router.outboundPool.quantity=2
+    -->
+    <ListPreference
+        android:key="router.outboundPool.quantity"
+        android:entries="@array/setting0to3"
+        android:entryValues="@array/setting0to3"
+        android:title="@string/settings_label_expl_quantity"
+        android:summary="@string/settings_desc_expl_quantity"
+        android:defaultValue="2"
+    />
+
+    <!--
+    router.outboundPool.backupQuantity=0
+    -->
    <ListPreference
        android:key="router.outboundPool.backupQuantity"
        android:entries="@array/setting0to3"
        android:entryValues="@array/setting0to3"
-        android:title="outbound backup quantity"
-        android:summary="How many outbound tunnel backups"
+        android:title="@string/settings_label_expl_backupQuantity"
+        android:summary="@string/settings_desc_expl_backupQuantity"
        android:defaultValue="0"
    />
+    </PreferenceCategory>
+    </PreferenceScreen>
+    </PreferenceCategory>


    <!--
--- a/routerjars/project.properties
+++ b/routerjars/project.properties
@@ -8,5 +8,5 @@
 # project structure.

 # Project target.
-target=android-8
+target=android-18
 android.library=true
--- a/src/net/i2p/android/router/activity/AddressbookActivity.java
+++ b/src/net/i2p/android/router/activity/AddressbookActivity.java
@@ -1,9 +1,12 @@
 package net.i2p.android.router.activity;

-import android.app.ListActivity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
@@ -18,11 +21,12 @@ import net.i2p.I2PAppContext;
 import net.i2p.android.router.R;
 import net.i2p.client.naming.NamingService;

-public class AddressbookActivity extends ListActivity {
+public class AddressbookActivity extends ActionBarActivity {

    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_addressbook);

        // Grab context if router has started, otherwise create new
        // FIXME dup contexts, locking, ...
@@ -49,14 +53,14 @@ public class AddressbookActivity extends ListActivity {
            tv.setText("1 host in address book.");
        else
            tv.setText("No hosts in address book, or your router is not up.");
-        ListView lv = getListView();
+        ListView lv = (ListView) findViewById(R.id.addressbook_list);
        lv.addHeaderView(tv, "", false);
        lv.setTextFilterEnabled(sz > 1);

        // set the list
        List<String> nameList = new ArrayList<String>(names);
        Collections.sort(nameList);
-        setListAdapter(new ArrayAdapter<String>(this, R.layout.addressbook_list_item, nameList));
+        lv.setAdapter(new ArrayAdapter<String>(this, R.layout.addressbook_list_item, nameList));

        // set the callback
        lv.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@@ -68,4 +72,26 @@ public class AddressbookActivity extends ListActivity {
            }
        });
    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+    	MenuInflater inflater = getMenuInflater();
+    	inflater.inflate(R.menu.activity_addressbook_actions, menu);
+    	return super.onCreateOptionsMenu(menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle presses on the action bar items
+        switch (item.getItemId()) {
+            //case R.id.action_add_to_addressbook:
+            //    return true;
+            case R.id.action_addressbook_settings:
+                Intent intent = new Intent(this, AddressbookSettingsActivity.class);
+                startActivity(intent);
+                return true;
+            default:
+                return super.onOptionsItemSelected(item);
+        }
+    }
 }
--- a/src/net/i2p/android/router/activity/I2PActivityBase.java
+++ b/src/net/i2p/android/router/activity/I2PActivityBase.java
@@ -1,12 +1,12 @@
 package net.i2p.android.router.activity;

-import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.support.v7.app.ActionBarActivity;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -23,7 +23,7 @@ import net.i2p.router.peermanager.ProfileOrganizer;
 import net.i2p.router.transport.FIFOBandwidthLimiter;
 import net.i2p.stat.StatManager;

-public abstract class I2PActivityBase extends Activity {
+public abstract class I2PActivityBase extends ActionBarActivity {
    protected String _myDir;
    protected boolean _isBound;
    protected boolean _triedBind;
Author	SHA1	Message	Date
str4d	788445f6ce	New translations	2013-10-15 19:52:39 +00:00
str4d	e4c9095626	merge of '73d2724826ecdabe3e124af9e485c44fe7188117' and '977f74485a75e34e7488c13e06849f6dfb5d2d2a'	2013-08-12 01:44:37 +00:00
str4d	dd90ea9874	Put full strings in android:dialogMessage for SeekBarPreference The SeekBarPreference class needs fixing to follow resource references.	2013-08-12 01:44:31 +00:00
zzz	53c7770e4e	- Handle 4-digit core version - Set API in version string to min version	2013-08-11 14:50:01 +00:00
str4d	21274f0335	Added es translation	2013-08-11 13:58:21 +00:00
str4d	4ccf3e713d	tr-rTR -> tr to support other regions as well	2013-08-11 13:58:05 +00:00
str4d	48f84f1a1b	Added tr_TR translations	2013-08-10 01:19:45 +00:00
str4d	eb4ae2c66d	Set minimum percentage, add language code mapping for tr_TR	2013-08-10 01:06:37 +00:00
str4d	6d340dc056	Added Transifex config	2013-08-09 06:22:47 +00:00
str4d	f312b7c6f1	Extracted more strings	2013-08-09 03:24:15 +00:00
str4d	a42bd73de3	Comment out add button in AddressbookActivity	2013-08-08 14:24:59 +00:00
str4d	4424392bdc	Comment out add button until it does something	2013-08-08 14:17:11 +00:00
str4d	bfe71213f8	Extracted more strings	2013-08-08 14:07:34 +00:00
str4d	cd2a12c8ed	Use dp instead of px, removed invalid property (for LinearLayout)	2013-08-08 13:45:50 +00:00
str4d	4ca2ed756f	Updated README.txt	2013-08-08 13:30:54 +00:00
str4d	a4abfd8fb8	Updated support library path to match README.txt	2013-08-08 13:30:41 +00:00
str4d	9d754c29ae	Moved ic_content_new.png to proper folder	2013-08-08 13:05:17 +00:00
str4d	0101e63bce	Updated .mtn-ignore	2013-08-08 03:33:40 +00:00
str4d	75fe8bfbe0	Removed another old import	2013-08-08 03:23:16 +00:00
str4d	806f6edbf1	Removed old import	2013-08-08 03:07:16 +00:00
str4d	767ff4f3d2	Merged methods	2013-08-08 02:55:52 +00:00
str4d	07fafb03b6	Added ActionBar to Addressbook, placeholder add action	2013-08-08 02:52:02 +00:00
str4d	e98f86b29a	Updated .mtn-ignore	2013-08-08 02:33:07 +00:00
str4d	18bc4f141d	Setup for ActionBar using appcompat support library The path in project.properties will require local overriding. I tried directly referencing the SDK with ${sdk.dir} but the build fails with an absolute path to a library.	2013-08-07 13:07:49 +00:00
str4d	a3792bad7a	Set target SDK to 18	2013-08-07 12:37:34 +00:00
str4d	745bd3fa94	Set target SDK to 18	2013-08-07 12:00:15 +00:00
str4d	97692a4635	Use color style instead of explicit color	2013-08-07 03:35:06 +00:00
str4d	3fe7575dab	Removed FrameLayout	2013-08-06 05:41:23 +00:00
str4d	a7fc5090f3	Simplified settings layout, pulled strings into resource file	2013-08-05 14:41:08 +00:00
str4d	6154f64120	Set text resource color to stop color-change on touch	2013-08-05 12:52:13 +00:00
str4d	0e5ca23732	Fixed bug in main.xml	2013-08-04 04:34:17 +00:00
str4d	c47e7dab31	Added Eclipse project files To satisfy dependencies, import the following other projects from i2p.i2p into the same Eclipse workspace as i2p.android.base: i2p_sdk - core/java/ i2p_router - router/java/ i2ptunnel - apps/i2ptunnel/java/ BOB - apps/BOB/ addressbook - apps/addressbook/ jetty - apps/jetty/ ministreaming - apps/ministreaming/java/	2013-08-04 04:33:56 +00:00