From dd8a3440d631605286db7c5e2c3b60144c4a918a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 12 Sep 2015 23:22:29 -0700
Subject: [PATCH] Rework about dialog

* Don't have website link twice
* Add source code link
* Don't have trailing spaces in strings
---
 F-Droid/res/layout/about.xml              | 143 +++++++++++++---------
 F-Droid/res/values-ast/strings.xml        |   1 -
 F-Droid/res/values-bg/strings.xml         |   1 -
 F-Droid/res/values-ca/strings.xml         |   1 -
 F-Droid/res/values-cs/strings.xml         |   1 -
 F-Droid/res/values-de/strings.xml         |   1 -
 F-Droid/res/values-el/strings.xml         |   1 -
 F-Droid/res/values-eo/strings.xml         |   1 -
 F-Droid/res/values-es/strings.xml         |   1 -
 F-Droid/res/values-eu/strings.xml         |   1 -
 F-Droid/res/values-fa/strings.xml         |   1 -
 F-Droid/res/values-fi/strings.xml         |   1 -
 F-Droid/res/values-fr/strings.xml         |   1 -
 F-Droid/res/values-gl/strings.xml         |   1 -
 F-Droid/res/values-he/strings.xml         |   2 -
 F-Droid/res/values-hu/strings.xml         |   1 -
 F-Droid/res/values-it/strings.xml         |   1 -
 F-Droid/res/values-ja/strings.xml         |   1 -
 F-Droid/res/values-ko/strings.xml         |   1 -
 F-Droid/res/values-lt/strings.xml         |   1 -
 F-Droid/res/values-lv/strings.xml         |   1 -
 F-Droid/res/values-nb/strings.xml         |   1 -
 F-Droid/res/values-nl/strings.xml         |   1 -
 F-Droid/res/values-pl/strings.xml         |   1 -
 F-Droid/res/values-pt-rBR/strings.xml     |   1 -
 F-Droid/res/values-ro/strings.xml         |   1 -
 F-Droid/res/values-ru/strings.xml         |   1 -
 F-Droid/res/values-sc/strings.xml         |   1 -
 F-Droid/res/values-sk/strings.xml         |   1 -
 F-Droid/res/values-sl/strings.xml         |   1 -
 F-Droid/res/values-sr/strings.xml         |   1 -
 F-Droid/res/values-sv/strings.xml         |   1 -
 F-Droid/res/values-tr/strings.xml         |   1 -
 F-Droid/res/values-ug/strings.xml         |   1 -
 F-Droid/res/values-uk/strings.xml         |   1 -
 F-Droid/res/values-vi/strings.xml         |   1 -
 F-Droid/res/values-zh-rCN/strings.xml     |   1 -
 F-Droid/res/values-zh-rHK/strings.xml     |   1 -
 F-Droid/res/values/donottranslate.xml     |  41 ++++---
 F-Droid/res/values/strings.xml            |   8 +-
 F-Droid/src/org/fdroid/fdroid/FDroid.java |  16 +--
 41 files changed, 111 insertions(+), 135 deletions(-)

diff --git a/F-Droid/res/layout/about.xml b/F-Droid/res/layout/about.xml
index 671e6153e..6a55dc9d2 100644
--- a/F-Droid/res/layout/about.xml
+++ b/F-Droid/res/layout/about.xml
@@ -1,76 +1,101 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="fill_parent"
-	android:paddingLeft="24dp"
-	android:paddingStart="24dp"
-	android:paddingRight="24dp"
-	android:paddingEnd="24dp"
-	android:paddingTop="20dp"
-	android:baselineAligned="false"
-	android:orientation="vertical">
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:paddingLeft="24dp"
+    android:paddingStart="24dp"
+    android:paddingRight="24dp"
+    android:paddingEnd="24dp"
+    android:paddingTop="20dp"
+    android:baselineAligned="false"
+    android:orientation="vertical">
 
-	<LinearLayout
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:orientation="horizontal">
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal">
 
-		<TextView android:text="@string/about_version"
-			android:textStyle="bold"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content" />
+        <TextView
+            android:text="@string/about_version"
+            android:textStyle="bold"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
-		<TextView android:id="@+id/version"
-			android:paddingLeft="5dp"
-			android:paddingStart="5dp"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content" />
+        <TextView android:id="@+id/version"
+            android:paddingLeft="8sp"
+            android:paddingStart="8sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
-	</LinearLayout>
+    </LinearLayout>
 
-	<LinearLayout android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:orientation="horizontal">
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal">
 
-		<TextView android:id="@+id/site"
-			android:text="@string/about_site"
-			android:textStyle="bold"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content" />
+        <TextView
+            android:text="@string/about_site"
+            android:textStyle="bold"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
-		<TextView android:id="@+id/sitec"
-			android:text="@string/about_sitec"
-			android:paddingLeft="5dp"
-			android:paddingStart="5dp"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content" />
+        <TextView
+            android:text="@string/site_link"
+            android:paddingLeft="8sp"
+            android:paddingStart="8sp"
+            android:autoLink="web"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
-	</LinearLayout>
+    </LinearLayout>
 
-	<LinearLayout
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent"
-		android:orientation="horizontal">
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal">
 
-		<TextView android:id="@+id/mail"
-			android:text="@string/about_mail"
-			android:textStyle="bold"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content" />
+        <TextView
+            android:text="@string/about_source"
+            android:textStyle="bold"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
-		<TextView android:id="@+id/mailc"
-			android:text="@string/about_mailc"
-			android:paddingLeft="5dp"
-			android:paddingStart="5dp"
-			android:autoLink="email"
-			android:layout_width="wrap_content"
-			android:layout_height="wrap_content" />
+        <TextView
+            android:text="@string/source_link"
+            android:paddingLeft="8sp"
+            android:paddingStart="8sp"
+            android:autoLink="web"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
 
-	</LinearLayout>
+    </LinearLayout>
 
-	<TextView android:text="@string/about_desc"
-		android:paddingTop="5dp"
-		android:layout_width="fill_parent"
-		android:layout_height="fill_parent" />
+    <LinearLayout
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal">
+
+        <TextView
+            android:text="@string/about_mail"
+            android:textStyle="bold"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+        <TextView
+            android:text="@string/team_email"
+            android:paddingLeft="8sp"
+            android:paddingStart="8sp"
+            android:autoLink="email"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" />
+
+    </LinearLayout>
+
+    <TextView
+        android:text="@string/about_desc"
+        android:paddingTop="12dp"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent" />
 
 </LinearLayout>
diff --git a/F-Droid/res/values-ast/strings.xml b/F-Droid/res/values-ast/strings.xml
index 54fd7cf82..d524a8138 100644
--- a/F-Droid/res/values-ast/strings.xml
+++ b/F-Droid/res/values-ast/strings.xml
@@ -38,7 +38,6 @@ Llanzáu baxo la llicencia GNU GPLv3.</string>
   <string name="about_site">Sitiu web:</string>
   <string name="about_mail">Corréu:</string>
   <string name="about_version">Versión:</string>
-  <string name="about_website">Sitiu web</string>
   <string name="inst">Instaláu</string>
   <string name="not_inst">Non instaláu</string>
   <string name="inst_known_source">Instaláu (dende %s)</string>
diff --git a/F-Droid/res/values-bg/strings.xml b/F-Droid/res/values-bg/strings.xml
index 7bcd66c28..779965b94 100644
--- a/F-Droid/res/values-bg/strings.xml
+++ b/F-Droid/res/values-bg/strings.xml
@@ -37,7 +37,6 @@
   <string name="about_site">Уебсайт:</string>
   <string name="about_mail">Имейл:</string>
   <string name="about_version">Версия:</string>
-  <string name="about_website">Уебсайт</string>
   <string name="inst">Инсталирана</string>
   <string name="not_inst">Неинсталирана</string>
   <string name="inst_known_source">Инсталирана (от %s)</string>
diff --git a/F-Droid/res/values-ca/strings.xml b/F-Droid/res/values-ca/strings.xml
index f72cdbbd6..e2e7b27a9 100644
--- a/F-Droid/res/values-ca/strings.xml
+++ b/F-Droid/res/values-ca/strings.xml
@@ -37,7 +37,6 @@ Publicat amb la llicència GNU GPL v3.</string>
   <string name="about_site">Pàgina web:</string>
   <string name="about_mail">Correu:</string>
   <string name="about_version">Versió:</string>
-  <string name="about_website">Pàgina web</string>
   <string name="inst">Instal·lat</string>
   <string name="not_inst">No està instal·lat</string>
   <string name="inst_known_source">Instal·lat (des de %s)</string>
diff --git a/F-Droid/res/values-cs/strings.xml b/F-Droid/res/values-cs/strings.xml
index cc6ca901e..a5e42172e 100644
--- a/F-Droid/res/values-cs/strings.xml
+++ b/F-Droid/res/values-cs/strings.xml
@@ -34,7 +34,6 @@ Uvolněno pod GPLv3 licencí.</string>
   <string name="about_site">"Webová stránka: "</string>
   <string name="about_mail">"Email: "</string>
   <string name="about_version">"Verze: "</string>
-  <string name="about_website">Webová stránka</string>
   <string name="inst">Je nainstalováno</string>
   <string name="not_inst">Není nainstalováno</string>
   <string name="added_on">Přidáno %s</string>
diff --git a/F-Droid/res/values-de/strings.xml b/F-Droid/res/values-de/strings.xml
index 9ac936825..630ed62f7 100644
--- a/F-Droid/res/values-de/strings.xml
+++ b/F-Droid/res/values-de/strings.xml
@@ -38,7 +38,6 @@ Veröffentlicht unter der GNU GPLv3 Lizenz.</string>
   <string name="about_site">Internetseite:</string>
   <string name="about_mail">E-Mail:</string>
   <string name="about_version">Version:</string>
-  <string name="about_website">Internetseite</string>
   <string name="inst">Installiert</string>
   <string name="not_inst">Nicht installiert</string>
   <string name="inst_known_source">Installiert (aus %s)</string>
diff --git a/F-Droid/res/values-el/strings.xml b/F-Droid/res/values-el/strings.xml
index 32681231e..6ccb4f3db 100644
--- a/F-Droid/res/values-el/strings.xml
+++ b/F-Droid/res/values-el/strings.xml
@@ -32,7 +32,6 @@
   <string name="about_site">Ιστοσελίδα:</string>
   <string name="about_mail">Ηλ. ταχυδρομείο:</string>
   <string name="about_version">Έκδοση:</string>
-  <string name="about_website">Ιστοσελίδα</string>
   <string name="inst">Εγκατεστημένο</string>
   <string name="not_inst">Δεν είναι εγκατεστημένο</string>
   <string name="added_on">Προστέθηκε στις %s</string>
diff --git a/F-Droid/res/values-eo/strings.xml b/F-Droid/res/values-eo/strings.xml
index d85cecb0d..4f1150df1 100644
--- a/F-Droid/res/values-eo/strings.xml
+++ b/F-Droid/res/values-eo/strings.xml
@@ -17,7 +17,6 @@
   <string name="about_site">Retejo:</string>
   <string name="about_mail">Retpoŝto:</string>
   <string name="about_version">Versio:</string>
-  <string name="about_website">Retejo</string>
   <string name="inst">Instalita</string>
   <string name="not_inst">Ne instalita</string>
   <string name="inst_known_source">Instalita (de %s)</string>
diff --git a/F-Droid/res/values-es/strings.xml b/F-Droid/res/values-es/strings.xml
index dd3bc3142..9d863baee 100644
--- a/F-Droid/res/values-es/strings.xml
+++ b/F-Droid/res/values-es/strings.xml
@@ -38,7 +38,6 @@ Publicado bajo la licencia GNU GPLv3.</string>
   <string name="about_site">Página web:</string>
   <string name="about_mail">Correo electrónico:</string>
   <string name="about_version">Versión:</string>
-  <string name="about_website">Página web</string>
   <string name="inst">Instalado</string>
   <string name="not_inst">No instalado</string>
   <string name="inst_known_source">Instalado (desde %s)</string>
diff --git a/F-Droid/res/values-eu/strings.xml b/F-Droid/res/values-eu/strings.xml
index bd853e549..d7ffa2937 100644
--- a/F-Droid/res/values-eu/strings.xml
+++ b/F-Droid/res/values-eu/strings.xml
@@ -26,7 +26,6 @@ GNU GPLv3 lizentziapean argitaratua.</string>
   <string name="about_site">Webgunea:</string>
   <string name="about_mail">E-posta:</string>
   <string name="about_version">Bertsioa:</string>
-  <string name="about_website">Webgunea</string>
   <string name="inst">Instalatuta</string>
   <string name="not_inst">Instalatu gabea</string>
   <string name="added_on">%s(e)an gehitua</string>
diff --git a/F-Droid/res/values-fa/strings.xml b/F-Droid/res/values-fa/strings.xml
index f97cebdaa..eaaca9db9 100644
--- a/F-Droid/res/values-fa/strings.xml
+++ b/F-Droid/res/values-fa/strings.xml
@@ -19,7 +19,6 @@
   <string name="no_such_app">چنین برنامه‌ای یافت نشد</string>
   <string name="about_title">دربارهٔ F-Droid</string>
   <string name="about_mail">رایانامه:</string>
-  <string name="about_website">وب‌گاه</string>
   <string name="inst">نصب‌شده</string>
   <string name="not_inst">نصب‌نشده</string>
   <string name="added_on">به %s افزوده شد</string>
diff --git a/F-Droid/res/values-fi/strings.xml b/F-Droid/res/values-fi/strings.xml
index ca734b630..8ee45a731 100644
--- a/F-Droid/res/values-fi/strings.xml
+++ b/F-Droid/res/values-fi/strings.xml
@@ -39,7 +39,6 @@ käyttöehtojen mukaisesti.</string>
   <string name="about_site">Verkkosivu:</string>
   <string name="about_mail">Sähköposti:</string>
   <string name="about_version">Versio:</string>
-  <string name="about_website">Verkkosivu</string>
   <string name="inst">Asennettu</string>
   <string name="not_inst">Ei asennettu</string>
   <string name="inst_unknown_source">Asennettu (tuntemattomasta lähteestä)</string>
diff --git a/F-Droid/res/values-fr/strings.xml b/F-Droid/res/values-fr/strings.xml
index cba5c5d00..26ce8e655 100644
--- a/F-Droid/res/values-fr/strings.xml
+++ b/F-Droid/res/values-fr/strings.xml
@@ -38,7 +38,6 @@ Publiée sous licence GNU GPLv3.</string>
   <string name="about_site">Site web :</string>
   <string name="about_mail">Courriel :</string>
   <string name="about_version">Version :</string>
-  <string name="about_website">Site web</string>
   <string name="inst">Installée</string>
   <string name="not_inst">Non installée</string>
   <string name="inst_known_source">Installé (depuis %s)</string>
diff --git a/F-Droid/res/values-gl/strings.xml b/F-Droid/res/values-gl/strings.xml
index 5f9ed167e..dff0dbb34 100644
--- a/F-Droid/res/values-gl/strings.xml
+++ b/F-Droid/res/values-gl/strings.xml
@@ -24,7 +24,6 @@ Publicado con licenza GNU GPLv3.</string>
   <string name="about_site">Sitio web:</string>
   <string name="about_mail">Correo:</string>
   <string name="about_version">Versión:</string>
-  <string name="about_website">Sitio web</string>
   <string name="inst">Instalada</string>
   <string name="not_inst">Non instalada</string>
   <string name="added_on">Engadida a %s</string>
diff --git a/F-Droid/res/values-he/strings.xml b/F-Droid/res/values-he/strings.xml
index 71013f487..c1aa8bd18 100644
--- a/F-Droid/res/values-he/strings.xml
+++ b/F-Droid/res/values-he/strings.xml
@@ -41,8 +41,6 @@
     <string name="about_site">אתר רשת: </string>
     <string name="about_mail">דוא״ל: </string>
     <string name="about_version">גרסא: </string>
-    <string name="about_website">אתר רשת</string>
-
     <string name="inst">מותקנת</string>
     <string name="not_inst">לא מותקנת</string>
     <string name="inst_known_source">מותקנת (מתוך %s)</string>
diff --git a/F-Droid/res/values-hu/strings.xml b/F-Droid/res/values-hu/strings.xml
index 6df09d29d..875271dbd 100644
--- a/F-Droid/res/values-hu/strings.xml
+++ b/F-Droid/res/values-hu/strings.xml
@@ -32,7 +32,6 @@ Honosítás: gidano | sympda.info\"</string>
   <string name="about_site">Weboldal:</string>
   <string name="about_mail">Email:</string>
   <string name="about_version">Verzió:</string>
-  <string name="about_website">Weboldal</string>
   <string name="inst">Telepítve</string>
   <string name="not_inst">Nincs telepítve</string>
   <string name="added_on">Hozzáadva %s</string>
diff --git a/F-Droid/res/values-it/strings.xml b/F-Droid/res/values-it/strings.xml
index d8a0eaba4..8587546fe 100644
--- a/F-Droid/res/values-it/strings.xml
+++ b/F-Droid/res/values-it/strings.xml
@@ -38,7 +38,6 @@ Rilasciato sotto licenza GNU GPLv3.</string>
   <string name="about_site">Sito Web:</string>
   <string name="about_mail">Email:</string>
   <string name="about_version">Versione:</string>
-  <string name="about_website">Sito Web</string>
   <string name="inst">Installato</string>
   <string name="not_inst">Non installato</string>
   <string name="added_on">Aggiunto il %s</string>
diff --git a/F-Droid/res/values-ja/strings.xml b/F-Droid/res/values-ja/strings.xml
index 280cd2b2b..ece02077b 100644
--- a/F-Droid/res/values-ja/strings.xml
+++ b/F-Droid/res/values-ja/strings.xml
@@ -37,7 +37,6 @@
   <string name="about_site">Webｻｲﾄ:</string>
   <string name="about_mail">電子ﾒｰﾙ:</string>
   <string name="about_version">ﾊﾞｰｼﾞｮﾝ:</string>
-  <string name="about_website">Webｻｲﾄ</string>
   <string name="inst">入手済</string>
   <string name="not_inst">未ｲﾝｽﾄｰﾙ</string>
   <string name="inst_known_source">ｲﾝｽﾄｰﾙ済 (%s から)</string>
diff --git a/F-Droid/res/values-ko/strings.xml b/F-Droid/res/values-ko/strings.xml
index 066933c26..0f55842f0 100644
--- a/F-Droid/res/values-ko/strings.xml
+++ b/F-Droid/res/values-ko/strings.xml
@@ -38,7 +38,6 @@ GNU GPLv3 라이센스 하에 배포됩니다.</string>
   <string name="about_site">웹사이트:</string>
   <string name="about_mail">이메일:</string>
   <string name="about_version">버전:</string>
-  <string name="about_website">웹사이트</string>
   <string name="inst">설치됨</string>
   <string name="not_inst">설치되지 않음</string>
   <string name="inst_known_source">설치됨 (%s (으)로부터)</string>
diff --git a/F-Droid/res/values-lt/strings.xml b/F-Droid/res/values-lt/strings.xml
index 2ba2aa0a5..0d93a4b02 100644
--- a/F-Droid/res/values-lt/strings.xml
+++ b/F-Droid/res/values-lt/strings.xml
@@ -18,7 +18,6 @@
   <string name="about_site">Svetainė:</string>
   <string name="about_mail">El. paštas:</string>
   <string name="about_version">Versija:</string>
-  <string name="about_website">Svetainė</string>
   <string name="inst">Įdiegta</string>
   <string name="not_inst">Neįdiegta</string>
   <string name="added_on">Išleista %s</string>
diff --git a/F-Droid/res/values-lv/strings.xml b/F-Droid/res/values-lv/strings.xml
index 54bdc5799..7954729cf 100644
--- a/F-Droid/res/values-lv/strings.xml
+++ b/F-Droid/res/values-lv/strings.xml
@@ -30,7 +30,6 @@ Izlaists zem GNU GPLv3 licenzes</string>
   <string name="about_site">Mājaslapa:</string>
   <string name="about_mail">Epasts:</string>
   <string name="about_version">Versija:</string>
-  <string name="about_website">Mājaslapa:</string>
   <string name="inst">Intstalēts</string>
   <string name="not_inst">Nav instalēts</string>
   <string name="inst_known_source">Instalēts (no %s)</string>
diff --git a/F-Droid/res/values-nb/strings.xml b/F-Droid/res/values-nb/strings.xml
index 0da1b8199..e45bb5a12 100644
--- a/F-Droid/res/values-nb/strings.xml
+++ b/F-Droid/res/values-nb/strings.xml
@@ -38,7 +38,6 @@ Lisensiert GNU GPLv3.</string>
   <string name="about_site">Nettside:</string>
   <string name="about_mail">E-post:</string>
   <string name="about_version">Versjon:</string>
-  <string name="about_website">Nettside</string>
   <string name="inst">Installert</string>
   <string name="not_inst">Ikke installert</string>
   <string name="inst_known_source">Installert (fra %s)</string>
diff --git a/F-Droid/res/values-nl/strings.xml b/F-Droid/res/values-nl/strings.xml
index 6dc7322e8..55af77980 100644
--- a/F-Droid/res/values-nl/strings.xml
+++ b/F-Droid/res/values-nl/strings.xml
@@ -38,7 +38,6 @@ Uitgegeven onder de GNU GPLv3 licentie</string>
   <string name="about_site">Website:</string>
   <string name="about_mail">E-mail:</string>
   <string name="about_version">Versie:</string>
-  <string name="about_website">Website</string>
   <string name="inst">Geïnstalleerd</string>
   <string name="not_inst">Niet geïnstalleerd</string>
   <string name="inst_known_source">Geïnstalleerd (van %s)</string>
diff --git a/F-Droid/res/values-pl/strings.xml b/F-Droid/res/values-pl/strings.xml
index ea18dd146..84d912e6b 100644
--- a/F-Droid/res/values-pl/strings.xml
+++ b/F-Droid/res/values-pl/strings.xml
@@ -24,7 +24,6 @@
   <string name="about_title">O F-Droid</string>
   <string name="about_site">Strona internetowa:</string>
   <string name="about_version">Wersja:</string>
-  <string name="about_website">Strona internetowa</string>
   <string name="not_inst">Niezainstalowane</string>
   <string name="added_on">Dodano %s</string>
   <string name="ok">OK</string>
diff --git a/F-Droid/res/values-pt-rBR/strings.xml b/F-Droid/res/values-pt-rBR/strings.xml
index 350a27ae0..eb8d15e1e 100644
--- a/F-Droid/res/values-pt-rBR/strings.xml
+++ b/F-Droid/res/values-pt-rBR/strings.xml
@@ -38,7 +38,6 @@ Lançado sob a licença GNU GPLv3.</string>
   <string name="about_site">Página web:</string>
   <string name="about_mail">E-mail:</string>
   <string name="about_version">Versão:</string>
-  <string name="about_website">Página web</string>
   <string name="inst">Instalado</string>
   <string name="not_inst">Não Instalado</string>
   <string name="inst_known_source">Instalado (a partir de %s)</string>
diff --git a/F-Droid/res/values-ro/strings.xml b/F-Droid/res/values-ro/strings.xml
index eafb54f85..d2ef9748c 100644
--- a/F-Droid/res/values-ro/strings.xml
+++ b/F-Droid/res/values-ro/strings.xml
@@ -17,7 +17,6 @@ Distribuit sub licenta GNU GPLv3.</string>
   <string name="about_site">Website</string>
   <string name="about_mail">Email</string>
   <string name="about_version">Versiune</string>
-  <string name="about_website">Website</string>
   <string name="inst">Instalat</string>
   <string name="not_inst">Nu este instalat</string>
   <string name="ok">Aplica</string>
diff --git a/F-Droid/res/values-ru/strings.xml b/F-Droid/res/values-ru/strings.xml
index bc0423790..085e39585 100644
--- a/F-Droid/res/values-ru/strings.xml
+++ b/F-Droid/res/values-ru/strings.xml
@@ -40,7 +40,6 @@
   <string name="about_site">Сайт:</string>
   <string name="about_mail">E-mail:</string>
   <string name="about_version">Версия:</string>
-  <string name="about_website">Сайт</string>
   <string name="inst">Установлено</string>
   <string name="not_inst">Не установлено</string>
   <string name="inst_known_source">Установлено (из %s)</string>
diff --git a/F-Droid/res/values-sc/strings.xml b/F-Droid/res/values-sc/strings.xml
index 3eaa7ef9a..175c5a822 100644
--- a/F-Droid/res/values-sc/strings.xml
+++ b/F-Droid/res/values-sc/strings.xml
@@ -39,7 +39,6 @@ Intregadu cun sa litzèntzia
   <string name="about_site">Giassu/situ web:</string>
   <string name="about_mail">E-lìtera:</string>
   <string name="about_version">Versione:</string>
-  <string name="about_website">Giassu/situ web</string>
   <string name="inst">Installada</string>
   <string name="not_inst">Non installada</string>
   <string name="inst_known_source">Installada (dae %s)</string>
diff --git a/F-Droid/res/values-sk/strings.xml b/F-Droid/res/values-sk/strings.xml
index 4714b673b..431d37ebd 100644
--- a/F-Droid/res/values-sk/strings.xml
+++ b/F-Droid/res/values-sk/strings.xml
@@ -39,7 +39,6 @@ Vydaný pod licenciou
   <string name="about_site">Webstránka:</string>
   <string name="about_mail">Email:</string>
   <string name="about_version">Verzia:</string>
-  <string name="about_website">Webstránka</string>
   <string name="inst">Nainštalované</string>
   <string name="not_inst">Nie je nainštalované</string>
   <string name="inst_known_source">Nainštalované (z %s)</string>
diff --git a/F-Droid/res/values-sl/strings.xml b/F-Droid/res/values-sl/strings.xml
index b20856584..c81aa3d64 100644
--- a/F-Droid/res/values-sl/strings.xml
+++ b/F-Droid/res/values-sl/strings.xml
@@ -14,7 +14,6 @@ Izdan z licenco GNU GPLv3.</string>
   <string name="about_site">Spletna stran:</string>
   <string name="about_mail">E-pošta:</string>
   <string name="about_version">Različica:</string>
-  <string name="about_website">Spletišče</string>
   <string name="inst">Nameščeno</string>
   <string name="not_inst">Ni nameščeno</string>
   <string name="ok">V redu</string>
diff --git a/F-Droid/res/values-sr/strings.xml b/F-Droid/res/values-sr/strings.xml
index e0b8ea0d2..9c148134e 100644
--- a/F-Droid/res/values-sr/strings.xml
+++ b/F-Droid/res/values-sr/strings.xml
@@ -37,7 +37,6 @@
   <string name="about_site">Вебсајт:</string>
   <string name="about_mail">Е-адреса:</string>
   <string name="about_version">Издање:</string>
-  <string name="about_website">Вебсајт</string>
   <string name="inst">Инсталирано</string>
   <string name="not_inst">Није инсталирано</string>
   <string name="inst_known_source">Инсталирано (са %s)</string>
diff --git a/F-Droid/res/values-sv/strings.xml b/F-Droid/res/values-sv/strings.xml
index 7cf74b7d1..2f8932ee5 100644
--- a/F-Droid/res/values-sv/strings.xml
+++ b/F-Droid/res/values-sv/strings.xml
@@ -38,7 +38,6 @@ Släppt under licensen GNU GPLv3.</string>
   <string name="about_site">Webbplats:</string>
   <string name="about_mail">E-post:</string>
   <string name="about_version">Version:</string>
-  <string name="about_website">Webbplats</string>
   <string name="inst">Installerad</string>
   <string name="not_inst">Inte installerad</string>
   <string name="inst_known_source">Installerad (från %s)</string>
diff --git a/F-Droid/res/values-tr/strings.xml b/F-Droid/res/values-tr/strings.xml
index 0e82872d9..d46171670 100644
--- a/F-Droid/res/values-tr/strings.xml
+++ b/F-Droid/res/values-tr/strings.xml
@@ -38,7 +38,6 @@ GNU GPLv3 lisansı kapsamında yayınlanmıştır.</string>
   <string name="about_site">Ağ sitesi:</string>
   <string name="about_mail">E-posta:</string>
   <string name="about_version">Sürüm:</string>
-  <string name="about_website">Ağ sitesi</string>
   <string name="inst">Kurulu</string>
   <string name="not_inst">Kurulu değil</string>
   <string name="inst_known_source">Kuruldu (şuradan: %s)</string>
diff --git a/F-Droid/res/values-ug/strings.xml b/F-Droid/res/values-ug/strings.xml
index dfa8bdf8f..a17b02e3e 100644
--- a/F-Droid/res/values-ug/strings.xml
+++ b/F-Droid/res/values-ug/strings.xml
@@ -24,7 +24,6 @@
   <string name="about_site">تور تۇرا:</string>
   <string name="about_mail">تورخەت:</string>
   <string name="about_version">نەشرى:</string>
-  <string name="about_website">تورتۇرا</string>
   <string name="inst">ئورنىتىلغان</string>
   <string name="not_inst">ئورنىتىلمىغان</string>
   <string name="added_on">%s دا قوشۇلغان</string>
diff --git a/F-Droid/res/values-uk/strings.xml b/F-Droid/res/values-uk/strings.xml
index 9d4c63bf0..55b3d9b38 100644
--- a/F-Droid/res/values-uk/strings.xml
+++ b/F-Droid/res/values-uk/strings.xml
@@ -14,7 +14,6 @@
   <string name="about_site">Сайт:</string>
   <string name="about_mail">Пошта:</string>
   <string name="about_version">Версія:</string>
-  <string name="about_website">Сайт</string>
   <string name="inst">Встановлено</string>
   <string name="not_inst">Не встановлено</string>
   <string name="ok">Гаразд</string>
diff --git a/F-Droid/res/values-vi/strings.xml b/F-Droid/res/values-vi/strings.xml
index cdedeef47..ed9f53f59 100644
--- a/F-Droid/res/values-vi/strings.xml
+++ b/F-Droid/res/values-vi/strings.xml
@@ -36,7 +36,6 @@
   <string name="about_site">Trang web:</string>
   <string name="about_mail">Email:</string>
   <string name="about_version">Phiên bản:</string>
-  <string name="about_website">Trang web</string>
   <string name="inst">Đã cài đặt</string>
   <string name="not_inst">Chưa cài đặt</string>
   <string name="inst_known_source">Đã cài đặt (từ %s)</string>
diff --git a/F-Droid/res/values-zh-rCN/strings.xml b/F-Droid/res/values-zh-rCN/strings.xml
index bb14cb1b5..e7a282c46 100644
--- a/F-Droid/res/values-zh-rCN/strings.xml
+++ b/F-Droid/res/values-zh-rCN/strings.xml
@@ -34,7 +34,6 @@
   <string name="about_site">网站：</string>
   <string name="about_mail">Email:</string>
   <string name="about_version">版本：</string>
-  <string name="about_website">网站</string>
   <string name="inst">已安装</string>
   <string name="not_inst">未安装</string>
   <string name="added_on">添加于 %s</string>
diff --git a/F-Droid/res/values-zh-rHK/strings.xml b/F-Droid/res/values-zh-rHK/strings.xml
index 551a4b450..a784792e6 100644
--- a/F-Droid/res/values-zh-rHK/strings.xml
+++ b/F-Droid/res/values-zh-rHK/strings.xml
@@ -34,7 +34,6 @@
   <string name="about_site">網站：</string>
   <string name="about_mail">電郵：</string>
   <string name="about_version">版本：</string>
-  <string name="about_website">網站</string>
   <string name="inst">已安裝</string>
   <string name="not_inst">沒有安裝</string>
   <string name="inst_known_source">已安裝 (來自 %s)</string>
diff --git a/F-Droid/res/values/donottranslate.xml b/F-Droid/res/values/donottranslate.xml
index 14d46ee29..11672d356 100644
--- a/F-Droid/res/values/donottranslate.xml
+++ b/F-Droid/res/values/donottranslate.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-	<string name="about_sitec">https://f-droid.org</string>
-	<string name="about_mailc">team@f-droid.org</string>
+    <string name="site_link">https://f-droid.org</string>
+    <string name="source_link">https://gitlab.com/fdroid/fdroidclient</string>
+    <string name="team_email">team@f-droid.org</string>
 
-	<string name="menu_bitcoin">Bitcoin</string>
-	<string name="menu_litecoin">Litecoin</string>
-	<string name="menu_dogecoin">Dogecoin</string>
-	<string name="menu_flattr">Flattr</string>
+    <string name="menu_bitcoin">Bitcoin</string>
+    <string name="menu_litecoin">Litecoin</string>
+    <string name="menu_dogecoin">Dogecoin</string>
+    <string name="menu_flattr">Flattr</string>
 
-	<string name="https">https://</string>
+    <string name="https">https://</string>
 
-	<string-array name="updateIntervalValues">
-		<item>0</item>
-		<item>1</item>
-		<item>4</item>
-		<item>12</item>
-		<item>24</item>
-		<item>168</item>
-		<item>336</item>
-	</string-array>
+    <string-array name="updateIntervalValues">
+        <item>0</item>
+        <item>1</item>
+        <item>4</item>
+        <item>12</item>
+        <item>24</item>
+        <item>168</item>
+        <item>336</item>
+    </string-array>
 
-	<string-array name="themeValues">
-		<item>light</item>
-		<item>dark</item>
-	</string-array>
+    <string-array name="themeValues">
+        <item>light</item>
+        <item>dark</item>
+    </string-array>
 
     <string-array name="languageValues">
         <item></item>
diff --git a/F-Droid/res/values/strings.xml b/F-Droid/res/values/strings.xml
index c7f0a625c..54d3706e1 100644
--- a/F-Droid/res/values/strings.xml
+++ b/F-Droid/res/values/strings.xml
@@ -41,12 +41,12 @@
 	<string name="no_such_app">No such app found.</string>
 
 	<string name="about_title">About F-Droid</string>
+	<string name="about_version">Version:</string>
+	<string name="about_site">Website:</string>
+	<string name="about_source">Source:</string>
+	<string name="about_mail">E-Mail:</string>
 	<string name="about_desc">Originally based on Aptoide.\nReleased under the
 		GNU GPLv3 license.</string>
-	<string name="about_site">Website: </string>
-	<string name="about_mail">Email: </string>
-	<string name="about_version">Version: </string>
-	<string name="about_website">Website</string>
 
 	<string name="incompatible">Incompatible</string>
 	<string name="inst">Installed</string>
diff --git a/F-Droid/src/org/fdroid/fdroid/FDroid.java b/F-Droid/src/org/fdroid/fdroid/FDroid.java
index 22b5184b9..29433b605 100644
--- a/F-Droid/src/org/fdroid/fdroid/FDroid.java
+++ b/F-Droid/src/org/fdroid/fdroid/FDroid.java
@@ -286,24 +286,12 @@ public class FDroid extends ActionBarActivity {
             }
             ((TextView) view.findViewById(R.id.version)).setText(versionName);
 
-            AlertDialog.Builder builder = new AlertDialog.Builder(this).setView(view);
-            final AlertDialog alrt = builder.create();
+            AlertDialog alrt = new AlertDialog.Builder(this).setView(view).create();
             alrt.setTitle(R.string.about_title);
-            alrt.setButton(AlertDialog.BUTTON_NEUTRAL,
-                    getString(R.string.about_website),
-                    new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog,
-                                int whichButton) {
-                            Uri uri = Uri.parse("https://f-droid.org");
-                            startActivity(new Intent(Intent.ACTION_VIEW, uri));
-                        }
-                    });
             alrt.setButton(AlertDialog.BUTTON_NEGATIVE, getString(R.string.ok),
                     new DialogInterface.OnClickListener() {
                         @Override
-                        public void onClick(DialogInterface dialog,
-                                int whichButton) {
+                        public void onClick(DialogInterface dialog, int whichButton) {
                         }
                     });
             alrt.show();