Removed website and FAQ links from nav drawer, added website link to about

res/layout/fragment_about.xml

@@ -19,6 +19,18 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/about_project"
+            android:textStyle="bold" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:text="@string/url_project"
+            android:autoLink="web" />
+
         <TextView
             android:layout_width="match_parent"
             android:layout_height="match_parent"

res/values/arrays.xml

@@ -10,8 +10,6 @@
         <item>NetDB</item>
         <item>@string/label_welcome_page</item>
         <item>@string/label_news</item>
-        <item>@string/label_website_nonanon</item>
-        <item>@string/label_faq_nonanon</item>
     </string-array>
     <string-array name="log_level_list">
         <item>ERROR</item>

res/values/strings.xml

@@ -22,8 +22,6 @@
     <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="label_browse">Browse</string>
     <string name="label_graphs">Graphs</string>
 
@@ -104,13 +102,15 @@
     <string name="settings_desc_expl_backupQuantity">How many tunnel backups</string>
 
     <string name="menu_about">About</string>
-    <string name="about_version">Version</string>
+    <string name="about_version">Version:</string>
-    <string name="about_bugs">Bugs and Support</string>
+    <string name="about_project">Project Home:</string>
-    <string name="url_android_forum">http://zzz.i2p/</string>
+    <string name="url_project" translatable="false">https://geti2p.net/</string>
+    <string name="about_bugs">Bugs and Support:</string>
+    <string name="url_android_forum" translatable="false">http://zzz.i2p/</string>
     <string name="about_helpwanted">Help Wanted!</string>
     <string name="about_volunteer">Want to help make the app better? Volunteer on the Android forum:</string>
     <string name="about_donate">Want to donate money or bitcoins to buy more Android devices for development and testing? Go to:</string>
-    <string name="url_donate">https://geti2p.net/en/donate</string>
+    <string name="url_donate" translatable="false">https://geti2p.net/en/donate</string>
 
     <string name="menu_help">Help</string>
 

src/net/i2p/android/router/I2PActivityBase.java

@@ -5,7 +5,6 @@ import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
-import android.net.Uri;
 import android.os.Bundle;
 import android.os.IBinder;
 import android.support.v4.app.ActionBarDrawerToggle;
@@ -197,16 +196,6 @@ public abstract class I2PActivityBase extends ActionBarActivity implements
                 .addToBackStack(null)
                 .commit();
             break;
-        case 9:
-            Intent website = new Intent(Intent.ACTION_VIEW);
-            website.setData(Uri.parse("http://www.i2p2.de/"));
-            startActivity(website);
-            break;
-        case 10:
-            Intent faq = new Intent(Intent.ACTION_VIEW);
-            faq.setData(Uri.parse("http://www.i2p2.de/faq"));
-            startActivity(faq);
-            break;
         default:
             Intent main = new Intent(I2PActivityBase.this, MainActivity.class);
             startActivity(main);