use table layout for help page

21 files changed, 178 insertions, 202 deletions

diff --git a/main/res/layout/about_help_page.xml b/main/res/layout/about_help_page.xml
index 8985ffa..ed64b92 100644
--- a/main/res/layout/about_help_page.xml
+++ b/main/res/layout/about_help_page.xml
@@ -7,106 +7,178 @@
     android:padding="4dip"
     tools:context=".AboutActivity$HelpViewCreator" >
 
-    <LinearLayout
-        android:layout_width="fill_parent"
+    <TableLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical" >
+        android:paddingLeft="10dp" >
 
-        <TextView
-            android:id="@+id/faq"
+        <TableRow
+            android:id="@+id/tableRow1"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:layout_marginBottom="5dip"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="10dip"
-            android:clickable="true"
-            android:focusable="true"
-            android:linksClickable="false"
-            android:text="@string/faq"
-            android:textColor="?text_color"
-            android:textColorLink="?text_color_link"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/website"
+            android:layout_height="wrap_content" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/faq_title"
+                android:textColor="?text_color"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/faq"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:clickable="true"
+                android:focusable="true"
+                android:linksClickable="false"
+                android:text="@string/faq_link"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+        </TableRow>
+
+        <TableRow
+            android:id="@+id/tableRow2"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:layout_marginBottom="5dip"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="10dip"
-            android:clickable="true"
-            android:focusable="true"
-            android:linksClickable="false"
-            android:text="@string/website"
-            android:textColor="?text_color"
-            android:textColorLink="?text_color_link"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/facebook"
+            android:layout_height="wrap_content" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/website_title"
+                android:textColor="?text_color"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/website"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:clickable="true"
+                android:focusable="true"
+                android:linksClickable="false"
+                android:text="@string/website_link"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+        </TableRow>
+
+        <TableRow
+            android:id="@+id/tableRow3"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:layout_marginBottom="5dip"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="10dip"
-            android:clickable="true"
-            android:focusable="true"
-            android:linksClickable="false"
-            android:text="@string/facebook"
-            android:textColor="?text_color"
-            android:textColorLink="?text_color_link"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/twitter"
+            android:layout_height="wrap_content" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/facebook_title"
+                android:textColor="?text_color"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/facebook"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:clickable="true"
+                android:focusable="true"
+                android:linksClickable="false"
+                android:text="@string/facebook_link"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+        </TableRow>
+
+        <TableRow
+            android:id="@+id/tableRow4"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:layout_marginBottom="5dip"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="10dip"
-            android:clickable="true"
-            android:focusable="true"
-            android:linksClickable="false"
-            android:text="@string/twitter"
-            android:textColor="?text_color"
-            android:textColorLink="?text_color_link"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/support"
+            android:layout_height="wrap_content" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/twitter_title"
+                android:textColor="?text_color"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/twitter"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:clickable="true"
+                android:focusable="true"
+                android:linksClickable="false"
+                android:text="@string/twitter_link"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+        </TableRow>
+
+        <TableRow
+            android:id="@+id/tableRow5"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:layout_marginBottom="5dip"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="10dip"
-            android:clickable="true"
-            android:focusable="true"
-            android:linksClickable="false"
-            android:text="@string/support"
-            android:textColor="?text_color"
-            android:textColorLink="?text_color_link"
-            android:textSize="14sp" />
-
-        <TextView
-            android:id="@+id/market"
+            android:layout_height="wrap_content" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/support_title"
+                android:textColor="?text_color"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/support"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:clickable="true"
+                android:focusable="true"
+                android:linksClickable="false"
+                android:text="@string/support_link"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+        </TableRow>
+
+        <TableRow
+            android:id="@+id/tableRow6"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="left"
-            android:layout_marginBottom="5dip"
-            android:layout_marginLeft="10dip"
-            android:layout_marginRight="10dip"
-            android:clickable="true"
-            android:focusable="true"
-            android:linksClickable="false"
-            android:text="@string/market"
-            android:textColor="?text_color"
-            android:textColorLink="?text_color_link"
-            android:textSize="14sp" />
-    </LinearLayout>
+            android:layout_height="wrap_content" >
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/market_title"
+                android:textColor="?text_color"
+                android:textSize="14sp" />
+
+            <TextView
+                android:id="@+id/market"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="5dip"
+                android:layout_marginLeft="10dip"
+                android:layout_marginRight="10dip"
+                android:clickable="true"
+                android:focusable="true"
+                android:linksClickable="false"
+                android:text="@string/market_link"
+                android:textColor="?text_color"
+                android:textColorLink="?text_color_link"
+                android:textSize="14sp" />
+        </TableRow>
+    </TableLayout>
 
 </ScrollView>
\ No newline at end of file
diff --git a/main/res/values-ca/strings.xml b/main/res/values-ca/strings.xml
index 83555a3..04fb0fe 100644
--- a/main/res/values-ca/strings.xml
+++ b/main/res/values-ca/strings.xml
@@ -1138,13 +1138,7 @@
   <string name="attribute_offset_cache_no">No és un catxé offset</string>
   <string name="quote">Per fer el geocatxing més fàcil, per fer els usuaris més dropos.</string>
   <string name="powered_by">Carnero</string>
-  <string name="support">Suport: <a href="">support@cgeo.org</a></string>
-  <string name="website">Lloc web: <a href=""> cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">Pàgina del c:geo</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">El c:geo a Google Play</a></string>
   <string name="about_twitter">Voleu que <b>el c:geo</b>  publiqui un nou estatus al Twitter cada vegada que registreu un catxé?</string>
-  <string name="faq">PMF: <a href=""> faq.cgeo.org</a></string>
   <string name="status_new_release" tools:ignore="UnusedResources">Nova versió disponible.\nCliqueu per instal·lar-la.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Nova versió nightly build disponible.\nCliqueu per instal·lar-la.</string>
   <string name="status_new_rc" tools:ignore="UnusedResources">Nova versió candidate disponible.\nCliqueu per instal·lar-la.</string>
diff --git a/main/res/values-cs/strings.xml b/main/res/values-cs/strings.xml
index 728b013..066e8d0 100644
--- a/main/res/values-cs/strings.xml
+++ b/main/res/values-cs/strings.xml
@@ -1129,13 +1129,7 @@
   <string name="attribute_offset_cache_no">Není to Offset keš</string>
   <string name="quote">Učinit Geocaching lehčí a uživatele línější.</string>
   <string name="powered_by">carnero</string>
-  <string name="support">Podpora: <a href="">support@cgeo.org</a></string>
-  <string name="website">Stránka: <a href="">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">Stránka c:geo</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">c:geo na Google Play</a></string>
   <string name="about_twitter">Má <b>c:geo</b> publikovat nový status na Twitteru vždy, když zaloguješ keš?</string>
-  <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string>
   <string name="status_new_release" tools:ignore="UnusedResources">Dostupné nové vydání.\nKlepni pro instalaci.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Dostupné nové \"noční sestavení\"\nKlepni pro instalaci.</string>
   <string name="status_new_rc" tools:ignore="UnusedResources">Dostupný nový kandidát na vydání.\nKlepni pro instalaci.</string>
diff --git a/main/res/values-da/strings.xml b/main/res/values-da/strings.xml
index e44c258..31d641c 100644
--- a/main/res/values-da/strings.xml
+++ b/main/res/values-da/strings.xml
@@ -1118,11 +1118,6 @@
   <string name="attribute_offset_cache_yes">Offset-cache</string>
   <string name="attribute_offset_cache_no">Ikke en offset-cache</string>
   <string name="quote">To make geocaching easier, to make users lazier.</string>
-  <string name="support">Support: <a href="mailto:support@cgeo.org">support@cgeo.org</a></string>
-  <string name="website">Hjemmeside: <a href="http://cgeo.org/">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string>
-  <string name="twitter">Twitter: <a href="http://twitter.com/android_gc">@android_GC</a></string>
-  <string name="market">Android: <a href="">c:geo på Google Play</a></string>
   <string name="about_twitter">Skal <b>c:geo</b> sende status til Twitter hver gang du logger en cache?</string>
   <string name="status_new_release" tools:ignore="UnusedResources">Ny udgave er tilgængelig.\nKlik for at installere.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Nyt nightly build af c:geo er tilgængelig.\nKlik for at installere.</string>
diff --git a/main/res/values-de/strings.xml b/main/res/values-de/strings.xml
index df275f1..665ce66 100644
--- a/main/res/values-de/strings.xml
+++ b/main/res/values-de/strings.xml
@@ -1135,13 +1135,7 @@
   <string name="attribute_offset_cache_no">Kein Offset Cache</string>
   <string name="quote">Um Geocachen einfacher zu machen, um es Anwendern bequemer zu machen.</string>
   <string name="powered_by">carnero</string>
-  <string name="support">Support: <a href="">support@cgeo.org</a></string>
-  <string name="website">Webseite: <a href="">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">c:geo page</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">c:geo auf Google Play</a></string>
   <string name="about_twitter">Soll jeder neue Fund auf Twitter veröffentlicht werden, wenn er über <b>c:geo</b> geloggt wird?</string>
-  <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string>
   <string name="status_new_release" tools:ignore="UnusedResources">Neuer Release verfügbar.\nKlicken zum Installieren.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Neuer Nightly Build verfügbar.\nKlicken zum Installieren.</string>
   <string name="status_new_rc" tools:ignore="UnusedResources">Neuer Release Candidate verfügbar.\nKlicken zum Installieren.</string>
diff --git a/main/res/values-es/strings.xml b/main/res/values-es/strings.xml
index 6f64efc..d316f26 100644
--- a/main/res/values-es/strings.xml
+++ b/main/res/values-es/strings.xml
@@ -1125,11 +1125,6 @@
   <string name="attribute_offset_cache_yes">Caché offset</string>
   <string name="attribute_offset_cache_no">No es caché offset</string>
   <string name="quote">Para hacer el geocaching más sencillo, para hacer a los usuarios más vagos.</string>
-  <string name="support">Soporte: <a href="">support@cgeo.org</a></string>
-  <string name="website">Web: <a href="">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">c:geo page</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">c:geo en Google Play</a></string>
   <string name="about_twitter">¿Debe <b>c:geo</b> publicar el nuevo estado en Twitter cuando registras un caché?</string>
   <string name="status_new_release" tools:ignore="UnusedResources">Nueva versión disponible. \nClick para instalar.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Nueva versión nightly build disponible.\nHaz clic para instalar.</string>
diff --git a/main/res/values-fr/strings.xml b/main/res/values-fr/strings.xml
index 41e1341..5b2bf8f 100644
--- a/main/res/values-fr/strings.xml
+++ b/main/res/values-fr/strings.xml
@@ -1136,13 +1136,7 @@
   <string name="attribute_offset_cache_no">Pas de cache relative</string>
   <string name="quote">Pour faciliter le géocaching.</string>
   <string name="powered_by">carnero</string>
-  <string name="support">support: <a href="">support@cgeo.org</a></string>
-  <string name="website">site: <a href="">cgeo.org</a></string>
-  <string name="facebook">facebook: <a href="">page c:geo</a></string>
-  <string name="twitter">twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">c:geo sur Google Play</a></string>
   <string name="about_twitter">Voulez-vous publier un nouveau statut sur Twitter à chaque nouvelle cache découverte sous <b>c:geo</b>?</string>
-  <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string>
   <string name="status_new_release" tools:ignore="UnusedResources">Nouvelle version disponible.\nCliquer pour installer.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Nouvelle version de test disponible.\nCliquer pour installer.</string>
   <string name="status_new_rc" tools:ignore="UnusedResources">Nouvelle version candidate disponible.\nCliquer pour installer.</string>
diff --git a/main/res/values-hu/strings.xml b/main/res/values-hu/strings.xml
index dc98879..a8c4fb0 100644
--- a/main/res/values-hu/strings.xml
+++ b/main/res/values-hu/strings.xml
@@ -1141,13 +1141,7 @@
   <string name="attribute_offset_cache_no">Nem offset láda</string>
   <string name="quote">Az egyszerűbb ládázásért, a lustább játékosokért.</string>
   <string name="powered_by">carnero</string>
-  <string name="support">Támogatás: <a href="">support@cgeo.org</a></string>
-  <string name="website">Weboldal: <a href="">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">c:geo page</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Androidra: <a href="">c:geo a Google Play-en</a></string>
   <string name="about_twitter">Akarod, hogy a <b>c:geo</b> új bejegyzést írjon a Twitter-re, amikor megtalálsz egy ládát?</string>
-  <string name="faq">GYIK: <a href="">faq.cgeo.org</a></string>
   <string name="status_new_release" tools:ignore="UnusedResources">Új kiadás jelent meg.\nKattints a telepítéshez.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Új napi frissítés jelent meg.\nKattints a telepítéshez.</string>
   <string name="status_new_rc" tools:ignore="UnusedResources">Új kiadás előtti verzió jelent meg.\nKattints a telepítéshez.</string>
diff --git a/main/res/values-it/strings.xml b/main/res/values-it/strings.xml
index 73c02d7..58f6c90 100644
--- a/main/res/values-it/strings.xml
+++ b/main/res/values-it/strings.xml
@@ -1128,13 +1128,7 @@
   <string name="attribute_offset_cache_no">Non è un offset cache</string>
   <string name="quote">Per rendere il geocaching più facile e gli utenti più pigri.</string>
   <string name="powered_by">carnero</string>
-  <string name="support">Supporto: <a href="">support@cgeo.org</a></string>
-  <string name="website">Sito: <a href="">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">Pagina c:geo</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">c:geo su Google Play</a></string>
   <string name="about_twitter">Può <b>c:geo</b> pubblicare su Twitter ogni volta che logghi un cache?</string>
-  <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string>
   <string name="status_new_release" tools:ignore="UnusedResources">Una nuova versione è disponibile.\nClicca per installarla.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Una nuova versione nightly è disponibile.\nClicca per installarla.</string>
   <string name="status_new_rc" tools:ignore="UnusedResources">Una nuova release candidate è disponibile.\nClicca per installarla.</string>
diff --git a/main/res/values-ja/strings.xml b/main/res/values-ja/strings.xml
index e88c35a..2a52220 100644
--- a/main/res/values-ja/strings.xml
+++ b/main/res/values-ja/strings.xml
@@ -992,11 +992,6 @@ Google翻訳アプリで各言語の辞書をダウンロードしておけば�
   <string name="attribute_geotour_no">ジオツアーの一部ではない</string>
   <string name="quote">To make geocaching easier, to make users lazier.</string>
   <string name="powered_by">carnero</string>
-  <string name="support">サポート: <a href="">support@cgeo.org</a></string>
-  <string name="website">Webサイト: <a href="">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">c:geo page</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">Google Playのc:geo</a></string>
   <string name="about_twitter">キャッシュのログを書いたら<b>c:geo</b>にTwitterでつぶやいてほしい?</string>
   <string name="status_new_release" tools:ignore="UnusedResources">新しいバージョンがあります。\nクリックしてインストールしてください。</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">新しいナイトリービルドがあります。\nクリックしてインストールしてください。</string>
diff --git a/main/res/values-lt/strings.xml b/main/res/values-lt/strings.xml
index a326429..a35b4c2 100644
--- a/main/res/values-lt/strings.xml
+++ b/main/res/values-lt/strings.xml
@@ -1127,11 +1127,6 @@
   <string name="attribute_offset_cache_yes">Offset cache</string>
   <string name="attribute_offset_cache_no">No offset cache</string>
   <string name="quote">To make geocaching easier, to make users lazier.</string>
-  <string name="support">Palaikymas: <a href="">support@cgeo.org</a></string>
-  <string name="website">Tinklapis: <a href="">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">c:geo page</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">c:geo on Google Play</a></string>
   <string name="about_twitter">Kaskart registruojant slėptuvę <b>c:geo</b> paskelbs nauja statusą Twitter paskyroje.</string>
   <string name="status_new_release" tools:ignore="UnusedResources">Galima nauja versija. \nPaspauskite čia ir įdiekite.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Galima nauja naktinė versija.\nPaspauskite čia ir įdiekite.</string>
diff --git a/main/res/values-nb/strings.xml b/main/res/values-nb/strings.xml
index 4c55e8b..1243470 100644
--- a/main/res/values-nb/strings.xml
+++ b/main/res/values-nb/strings.xml
@@ -1124,11 +1124,6 @@
   <string name="attribute_offset_cache_no">Ikke offset-cache</string>
   <string name="quote">For å gjøre geocaching enklere og brukerne latere.</string>
   <string name="powered_by">carnero</string>
-  <string name="support">e-post adresse: <a href="mailto:support@cgeo.org">support@cgeo.org</a></string>
-  <string name="website">web-side: <a href="http://cgeo.org/">cgeo.org</a></string>
-  <string name="facebook">facebook: <a href="http://www.facebook.com/pages/cgeo/297269860090">c:geo page</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">c:geo i Google Play</a></string>
   <string name="about_twitter">Ønsker du at <b>c:geo</b> skal poste en status på Twitter hver gang du logger ett funn via <b>c:geo</b>?</string>
   <string name="status_new_release" tools:ignore="UnusedResources">Ny versjon tilgjengelig. \nKlikk for å installere.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Ny \"nightly build\" er tilgjengelig.\nKlikk for å installere.</string>
diff --git a/main/res/values-nl/strings.xml b/main/res/values-nl/strings.xml
index bcf8c74..e5303cb 100644
--- a/main/res/values-nl/strings.xml
+++ b/main/res/values-nl/strings.xml
@@ -1133,13 +1133,7 @@
   <string name="attribute_offset_cache_no">Geen offset cache</string>
   <string name="quote">Om geocaching makkelijker en gebruikers luier te maken.</string>
   <string name="powered_by">carnero</string>
-  <string name="support">Support: <a href="">support@cgeo.org</a></string>
-  <string name="website">Website: <a href="">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">c:geo page</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">c:geo op Google Play</a></string>
   <string name="about_twitter">Moet <b>c:geo</b> elke cache vondst publiceren naar Twitter?</string>
-  <string name="faq">FAQ: <a href=""> faq.cgeo.org</a></string>
   <string name="status_new_release" tools:ignore="UnusedResources">Nieuwe release beschikbaar.\nTik om te installeren.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Nieuwe nightly-release beschikbaar.\nTik om te installeren.</string>
   <string name="status_new_rc" tools:ignore="UnusedResources">Nieuwe release-candidaad beschikbaar.\nTik om te installeren.</string>
diff --git a/main/res/values-pl/strings.xml b/main/res/values-pl/strings.xml
index 4cd8bb8..2aeb9aa 100644
--- a/main/res/values-pl/strings.xml
+++ b/main/res/values-pl/strings.xml
@@ -1127,13 +1127,7 @@
   <string name="attribute_offset_cache_no">Nie jest to skrzynka Offset</string>
   <string name="quote">Aby uczynić geocaching prostszym, a użytkowników bardziej leniwymi.</string>
   <string name="powered_by">carnero</string>
-  <string name="support">Wsparcie: <a href="">support@cgeo.org</a></string>
-  <string name="website">Website: <a href="">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">c:geo strona</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">c:geo w Google Play</a></string>
   <string name="about_twitter">Czy chczesz aby <b>c:geo</b> publikował nowy status na Twitter za każdym razem kiedy znajdziesz skrzynkę?</string>
-  <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string>
   <string name="status_new_release" tools:ignore="UnusedResources">Dostępna nowa wersja.\nKliknij aby zainstalować.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Dostępna nowa codzienna wersja.\nKliknij aby zainstalować.</string>
   <string name="status_new_rc" tools:ignore="UnusedResources">Dostępny nowy kandydat na nową wersję.\nKliknij aby zainstalować.</string>
diff --git a/main/res/values-pt/strings.xml b/main/res/values-pt/strings.xml
index 9848860..0bec864 100644
--- a/main/res/values-pt/strings.xml
+++ b/main/res/values-pt/strings.xml
@@ -1131,13 +1131,7 @@
   <string name="attribute_offset_cache_no">Cache sem offset de translação</string>
   <string name="quote">Para tornar o geocaching mais fácil, para tornar os utilizadores mais preguiçosos.</string>
   <string name="powered_by">carnero</string>
-  <string name="support">Suporte: <a href="">support@cgeo.org</a></string>
-  <string name="website">Site na internet: <a href="">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">página do c:geo</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">c:geo no Google Play</a></string>
   <string name="about_twitter">O <b>c:geo</b> deve publicar no Twitter de cada vez que uma cache foi registrada?</string>
-  <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string>
   <string name="status_new_release" tools:ignore="UnusedResources">Nova versão disponível.\nClique para instalar.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Nova \'nightly build\' disponível.\nClique para instalar.</string>
   <string name="status_new_rc" tools:ignore="UnusedResources">Nova \'release candidate\' disponível .\nClique para instalar.</string>
diff --git a/main/res/values-ro/strings.xml b/main/res/values-ro/strings.xml
index 64dfdb5..51e1208 100644
--- a/main/res/values-ro/strings.xml
+++ b/main/res/values-ro/strings.xml
@@ -1132,13 +1132,7 @@
   <string name="attribute_offset_cache_no">Nu este geocutie decalată</string>
   <string name="quote">Pentru geocaching mai uşor, pentru căutători mai leneşi.</string>
   <string name="powered_by">carnero</string>
-  <string name="support">Suport: <a href="">support@cgeo.org</a></string>
-  <string name="website">Site: <a href="">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">pagina c:geo</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">c:geo pe Google Play</a></string>
   <string name="about_twitter">Ar trebui ca <b>c:geo</b> să publice un statut nou pe Twitter de fiecare dată când scrii o însemnare pentru o geocutie?</string>
-  <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string>
   <string name="status_new_release" tools:ignore="UnusedResources">A apărut o versiune nouă.\nApasă aici pentru a instala.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">A apărut o nouă versiune zilnică.\nApasă aici pentru a instala.</string>
   <string name="status_new_rc" tools:ignore="UnusedResources">A apărut o un candidat pentru o versiune nouă.\nApasă aici pentru a instala.</string>
diff --git a/main/res/values-sk/strings.xml b/main/res/values-sk/strings.xml
index db0e1fc..d138241 100644
--- a/main/res/values-sk/strings.xml
+++ b/main/res/values-sk/strings.xml
@@ -1135,13 +1135,7 @@
   <string name="attribute_offset_cache_no">Nie je offset cache</string>
   <string name="quote">Pre jednoduchšie hľadanie skrýš a používateľov lenivších.</string>
   <string name="powered_by">carnero</string>
-  <string name="support">Podpora: <a href="">support@cgeo.org</a></string>
-  <string name="website">Web: <a href="">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">c:geo page</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href=""> c:geo na Google Play</a></string>
   <string name="about_twitter">Chcete, aby <b>c:geo</b> napísalo na váš Twitter vždy, keď zapíšete nájdenie skrýše?</string>
-  <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string>
   <string name="status_new_release" tools:ignore="UnusedResources">Je dostupné nové vydanie.\nKliknite pre inštaláciu.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Je dostupná nová nočná zostava.\nKliknite pre inštaláciu.</string>
   <string name="status_new_rc" tools:ignore="UnusedResources">Je dostupná nová verzia „release candidate“.\nKliknite pre inštaláciu.</string>
diff --git a/main/res/values-sl/strings.xml b/main/res/values-sl/strings.xml
index 71816d7..0d20fae 100644
--- a/main/res/values-sl/strings.xml
+++ b/main/res/values-sl/strings.xml
@@ -1110,13 +1110,7 @@
   <string name="attribute_offset_cache_no">Ni Offset zaklad</string>
   <string name="quote">Za lažji geocaching in bolj lene zakladolovce.</string>
   <string name="powered_by">carnero</string>
-  <string name="support">Podpora: <a href="">support@cgeo.org</a></string>
-  <string name="website">Spletna stran: <a href="">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">c:geo stran</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">c:geo na Google Play</a></string>
   <string name="about_twitter">Naj <b>c:geo</b> objavi nov status na Twitter, ko objavite nov zapis pri zakladu?</string>
-  <string name="faq">Pogosto zastavljena vprašanja: <a href="">faq.cgeo.org</a></string>
   <string name="status_new_release" tools:ignore="UnusedResources">Na voljo je nova različica.\nKliknite za namestitev.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Na voljo je nova dnevna različica.\nKliknite za namestitev.</string>
   <string name="status_new_rc" tools:ignore="UnusedResources">Na voljo je nova preizkusna različica.\nKliknite za namestitev.</string>
diff --git a/main/res/values-sv/strings.xml b/main/res/values-sv/strings.xml
index 684d7cf..a2cefcd 100644
--- a/main/res/values-sv/strings.xml
+++ b/main/res/values-sv/strings.xml
@@ -1137,13 +1137,7 @@
   <string name="attribute_offset_cache_no">Ingen offset cache</string>
   <string name="quote">To make geocaching easier, to make users lazier.</string>
   <string name="powered_by">carnero</string>
-  <string name="support">Support: <a href="">support@cgeo.org</a></string>
-  <string name="website">Hemsida: <a href="">cgeo.org</a></string>
-  <string name="facebook">Facebook: <a href="">c:geo</a></string>
-  <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-  <string name="market">Android: <a href="">c:geo på Google Play</a></string>
   <string name="about_twitter">Ska <b>c:geo</b> publicera ny status på Twitter varje gång en cache loggas?</string>
-  <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string>
   <string name="status_new_release" tools:ignore="UnusedResources">Ny officiell version finns tillgänglig.\nKlicka för att installera.</string>
   <string name="status_new_nightly" tools:ignore="UnusedResources">Nytt nattligt bygge finns tillgängligt.\nKlicka för att installera.</string>
   <string name="status_new_rc" tools:ignore="UnusedResources">Ny kandidat till officiellt bygge finns tillgängligt.\nKlicka för att installera.</string>
diff --git a/main/res/values/strings.xml b/main/res/values/strings.xml
index 2b23b08..42a461f 100644
--- a/main/res/values/strings.xml
+++ b/main/res/values/strings.xml
@@ -1236,13 +1236,15 @@
     <string name="quote">To make geocaching easier, to make users lazier.</string>
     <string name="powered_by">carnero</string>
     <!-- Note: Links here are just for appearance. See AboutActivity to make changes -->
-    <string name="support">Support: <a href="">support@cgeo.org</a></string>
-    <string name="website">Website: <a href="">cgeo.org</a></string>
-    <string name="facebook">Facebook: <a href="">c:geo page</a></string>
-    <string name="twitter">Twitter: <a href="">@android_GC</a></string>
-    <string name="market">Android: <a href="">c:geo on Google Play</a></string>
+    <string name="support_title">Support</string>
+    <string name="website_title">Website</string>
+    <string name="facebook_title">Facebook</string>
+    <string name="facebook_link"><a href="">c:geo page</a></string>
+    <string name="twitter_title">Twitter</string>
+    <string name="market_title">Google Play</string>
+    <string name="market_link"><a href="">c:geo on Google Play</a></string>
     <string name="about_twitter">Should <b>c:geo</b> publish a new status on Twitter every time you log a cache?</string>
-    <string name="faq">FAQ: <a href="">faq.cgeo.org</a></string>
+    <string name="faq_title">FAQ</string>
     
     <!-- status (used via string based resource loading) -->
     <string name="status_new_release" tools:ignore="UnusedResources">New release available.\nClick to install.</string>
diff --git a/main/res/values/strings_not_translatable.xml b/main/res/values/strings_not_translatable.xml
index 35fef08..d699f62 100644
--- a/main/res/values/strings_not_translatable.xml
+++ b/main/res/values/strings_not_translatable.xml
@@ -90,5 +90,10 @@
 
     <string name="caches_map_mapswithme" translatable="false">Maps.me</string>
     <string name="cache_menu_mapswithme" translatable="false">Maps.me</string>
+    <string name="faq_link"><a href="">faq.cgeo.org</a></string>
+    <string name="website_link"><a href="">cgeo.org</a></string>
+    <string name="twitter_link"><a href="">@android_GC</a></string>
+    <string name="support_link"><a href="">support@cgeo.org</a></string>
+    
 
 </resources>