From 3d0077dedd984fcbb1f01d65a3e4c959fadb5eae Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Wed, 13 Jul 2016 13:51:07 -0500
Subject: [PATCH] Move translation link to settings

---
 .../preferences/BaseBasicPreferences.java     |   3 +-
 src/main/res/values-bg-rBG/strings.xml        |   1 -
 src/main/res/values-de/strings.xml            |   1 -
 src/main/res/values-es/strings.xml            |   1 -
 src/main/res/values-fa/strings.xml            |   1 -
 src/main/res/values-fr/strings.xml            |   1 -
 src/main/res/values-hu/strings.xml            |   1 -
 src/main/res/values-it/strings.xml            |   1 -
 src/main/res/values-iw/strings.xml            |   1 -
 src/main/res/values-ja/strings.xml            |   1 -
 src/main/res/values-ko/strings.xml            |   1 -
 src/main/res/values-nl/strings.xml            |   1 -
 src/main/res/values-pl/strings.xml            |   1 -
 src/main/res/values-pt-rBR/strings.xml        |   1 -
 src/main/res/values-pt/strings.xml            |   1 -
 src/main/res/values-ru/strings.xml            |   1 -
 src/main/res/values-sk/strings.xml            |   1 -
 src/main/res/values-sv/strings.xml            |   1 -
 src/main/res/values-uk/strings.xml            |   1 -
 src/main/res/values/strings.xml               |   3 +-
 src/main/res/xml/preferences.xml              | 102 ++++++++++--------
 src/main/res/xml/preferences_help.xml         |   6 --
 22 files changed, 59 insertions(+), 73 deletions(-)

diff --git a/src/main/java/org/tasks/preferences/BaseBasicPreferences.java b/src/main/java/org/tasks/preferences/BaseBasicPreferences.java
index 4e884b197..1a611fa31 100644
--- a/src/main/java/org/tasks/preferences/BaseBasicPreferences.java
+++ b/src/main/java/org/tasks/preferences/BaseBasicPreferences.java
@@ -8,7 +8,6 @@ import android.os.Bundle;
 import android.preference.Preference;
 import android.text.TextUtils;
 
-import com.google.common.base.Strings;
 import com.jakewharton.processphoenix.ProcessPhoenix;
 import com.todoroo.astrid.activity.TaskListActivity;
 import com.todoroo.astrid.api.Filter;
@@ -129,7 +128,7 @@ public abstract class BaseBasicPreferences extends InjectingPreferenceActivity i
         setupActivity(R.string.notifications, ReminderPreferences.class);
         setupActivity(R.string.EPr_manage_header, OldTaskPreferences.class);
 
-        requires(R.string.settings_general, atLeastJellybeanMR1(), R.string.p_language);
+        requires(R.string.settings_localization, atLeastJellybeanMR1(), R.string.p_language);
     }
 
     private void setupActivity(int key, final Class<?> target) {
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index 50d09b998..004545c95 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -300,7 +300,6 @@
 	<string name="font_size">Размер на шрифта</string>
 	<string name="customize_edit_screen">Настройване на екрана за редактиране</string>
 	<string name="source_code">Source код</string>
-	<string name="translations">Преводи</string>
 	<string name="report_an_issue">Съобщи за проблем</string>
 	<string name="help_and_feedback">Помощ &amp; Обратна връзка</string>
 	<string name="contact_developer">Свържи се с разработчика</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 9f017e8e8..b5a0ca973 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -292,7 +292,6 @@
 	<string name="font_size">Schriftgröße</string>
 	<string name="customize_edit_screen">Änderungsbildschirm anpassen</string>
 	<string name="source_code">Quelltext</string>
-	<string name="translations">Übersetzungen</string>
 	<string name="report_an_issue">Fehler melden</string>
 	<string name="help_and_feedback">Hilfe &amp; Feedback</string>
 	<string name="contact_developer">Entwickler kontaktieren</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 1502e0d11..4b42aea71 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -296,7 +296,6 @@
 	<string name="font_size">Tamaño de la fuente</string>
 	<string name="customize_edit_screen">Personalizar pantalla de edición</string>
 	<string name="source_code">Código fuente</string>
-	<string name="translations">Traducciones</string>
 	<string name="report_an_issue">Informa de un error</string>
 	<string name="help_and_feedback">Ayuda y valoraciones</string>
 	<string name="contact_developer">Contactar con el desarrollador </string>
diff --git a/src/main/res/values-fa/strings.xml b/src/main/res/values-fa/strings.xml
index 5079039f7..2f3f663a9 100644
--- a/src/main/res/values-fa/strings.xml
+++ b/src/main/res/values-fa/strings.xml
@@ -218,7 +218,6 @@
 	<string name="enabled">فعال شده</string>
 	<string name="font_size">اندازه فونت</string>
 	<string name="source_code">کد مبدا</string>
-	<string name="translations">ترجمه ها</string>
 	<string name="report_an_issue">گزارش یک مطلب</string>
 	<string name="help_and_feedback">کمک و بازخورد</string>
 	<string name="contact_developer">تماس با توسعه دهنده</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index d293423f5..96f085217 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -290,7 +290,6 @@
 	<string name="font_size">Taille de police</string>
 	<string name="customize_edit_screen">Personnaliser l\'écran d\'édition</string>
 	<string name="source_code">Code source</string>
-	<string name="translations">Traductions</string>
 	<string name="report_an_issue">Faire part d\'un problème</string>
 	<string name="help_and_feedback">Aide et retours</string>
 	<string name="contact_developer">Contacter le développeur</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 0328015e2..5a64297f7 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -108,7 +108,6 @@
 	<string name="DLG_error">Upsz, úgy látszik valami hiba történt! Ez történt:\n\n%s</string>
 	<string name="DLG_wait">Kérlek, várj...</string>
 	<string name="source_code">Forráskód</string>
-	<string name="translations">Fordítások</string>
 	<string name="report_an_issue">Probléma bejelentése</string>
 	<string name="help_and_feedback">Súgó és visszajelzés</string>
 	<string name="contact_developer">Kapcsolatfelvétel a fejlesztővel</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 4df5af228..c4cee4333 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -297,7 +297,6 @@
 	<string name="font_size">Dimensione Carattere</string>
 	<string name="customize_edit_screen">Personalizza schermata di modifica</string>
 	<string name="source_code">Codice sorgente</string>
-	<string name="translations">Traduzioni</string>
 	<string name="report_an_issue">Segnala un problema</string>
 	<string name="help_and_feedback">Aiuto &amp; Suggerimenti</string>
 	<string name="contact_developer">Contatta lo sviluppatore</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 4d79759c9..bec2f32f7 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -297,7 +297,6 @@
 	<string name="font_size">גודל גופן</string>
 	<string name="customize_edit_screen">התאם אישית את מסך עריכת משימה</string>
 	<string name="source_code">קוד מקור</string>
-	<string name="translations">תרגום</string>
 	<string name="report_an_issue">דווח/י על בעיה</string>
 	<string name="help_and_feedback">עזרה ומשוב</string>
 	<string name="contact_developer">צור קשר</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 136b506c4..e22b1e1d8 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -298,7 +298,6 @@
 	<string name="font_size">フォントサイズ</string>
 	<string name="customize_edit_screen">編集画面をカスタマイズ</string>
 	<string name="source_code">ソースコード</string>
-	<string name="translations">翻訳</string>
 	<string name="report_an_issue">問題を報告</string>
 	<string name="help_and_feedback">ヘルプ &amp; フィードバック</string>
 	<string name="contact_developer">開発者に連絡</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 9aefde673..37a1816c9 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -300,7 +300,6 @@
 	<string name="font_size">글자 크기</string>
 	<string name="customize_edit_screen">일정 편집화면 레이아웃 설정하기</string>
 	<string name="source_code">소스 코드</string>
-	<string name="translations">번역</string>
 	<string name="report_an_issue">문제점 보고하기</string>
 	<string name="help_and_feedback">도움말 &amp; 피드백</string>
 	<string name="contact_developer">개발자와 연락</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index fb726b296..c34348763 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -295,7 +295,6 @@
 	<string name="font_size">Font grootte</string>
 	<string name="customize_edit_screen">Edit scherm aanpassen</string>
 	<string name="source_code">Bron code</string>
-	<string name="translations">Vertalingen</string>
 	<string name="report_an_issue">Meld een probleem</string>
 	<string name="help_and_feedback">Help &amp; Terugkoppeling</string>
 	<string name="contact_developer">Contact ontwikkelaar</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index d15e794bd..a29562ab0 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -245,7 +245,6 @@
 	<string name="sync_forget_confirm">Wyloguj / wyczyść dane synchronizacji?</string>
 	<string name="vibrations">Wibracje</string>
 	<string name="source_code">Kod źródłowy</string>
-	<string name="translations">Tłumaczenia</string>
 	<string name="report_an_issue">Zgłoś błąd</string>
 	<string name="help_and_feedback">Pomoc i opinia</string>
 	<string name="contact_developer">Skontaktuj się z twórcą</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index fc72fdb4b..09849c265 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -264,7 +264,6 @@
 	<string name="backup_directory">Diretório de backup</string>
 	<string name="customize_edit_screen">Personalizar tela de edição</string>
 	<string name="source_code">Código fonte</string>
-	<string name="translations">Traduções</string>
 	<string name="report_an_issue">Relatar um problema</string>
 	<string name="help_and_feedback">Ajuda e Feedback</string>
 	<string name="contact_developer">Contatar desenvolvedor</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index a9104387d..38dd6aced 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -280,7 +280,6 @@
 	<string name="font_size">Tamanho da letra</string>
 	<string name="customize_edit_screen">Personalizar ecrã de edição</string>
 	<string name="source_code">Código fonte</string>
-	<string name="translations">Traduções</string>
 	<string name="report_an_issue">Reportar um erro</string>
 	<string name="help_and_feedback">Ajuda e comentários</string>
 	<string name="contact_developer">Contacte o programador</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 8d4be95a5..a5611b9ed 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -297,7 +297,6 @@
 	<string name="font_size">Размер шрифта</string>
 	<string name="customize_edit_screen">Порядок полей в задаче...</string>
 	<string name="source_code">Исходный код</string>
-	<string name="translations">Язык интерфейса</string>
 	<string name="report_an_issue">Сообщить о проблеме</string>
 	<string name="help_and_feedback">Помощь и обратная связь</string>
 	<string name="contact_developer">Связь с разработчиком</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 760392af4..43b757a7e 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -274,7 +274,6 @@
 	<string name="font_size">Veľkosť písma</string>
 	<string name="customize_edit_screen">Prispôsobiť zobrazenie úorav</string>
 	<string name="source_code">Zdrojový kód</string>
-	<string name="translations">Preklady</string>
 	<string name="report_an_issue">Nahlásiť problém</string>
 	<string name="help_and_feedback">Pomoc a spätná väzba</string>
 	<string name="contact_developer">Kontaktovať vývojára</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 4ce26d123..1ff27c899 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -296,7 +296,6 @@
 	<string name="font_size">Teckenstorlek</string>
 	<string name="customize_edit_screen">Anpassa redigeringsvyn</string>
 	<string name="source_code">Källkod</string>
-	<string name="translations">Översättningar</string>
 	<string name="report_an_issue">Rapportera ett problem</string>
 	<string name="help_and_feedback">Hjälp &amp; Återkoppling</string>
 	<string name="contact_developer">Kontakta utvecklaren</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 69569a130..a768fdfe9 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -238,7 +238,6 @@
 	<string name="vibrations">Вібрації</string>
 	<string name="backup_directory">Папка резервної копії</string>
 	<string name="source_code">Вихідний код</string>
-	<string name="translations">Переклади</string>
 	<string name="report_an_issue">Повідомити про помилку</string>
 	<string name="help_and_feedback">Допомога і відгуки</string>
 	<string name="contact_developer">Зв\'язатися з розробником</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 4f05ac044..d0e839b81 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -771,7 +771,7 @@ File %1$s contained %2$s.\n\n
     <string name="font_size">Font size</string>
     <string name="customize_edit_screen">Customize edit screen</string>
     <string name="source_code">Source code</string>
-    <string name="translations">Translations</string>
+    <string name="translations">Contribute translations</string>
     <string name="report_an_issue">Report an issue</string>
     <string name="help_and_feedback">Help &amp; Feedback</string>
     <string name="contact_developer">Contact developer</string>
@@ -898,5 +898,6 @@ File %1$s contained %2$s.\n\n
   <string name="restart_required">Tasks must be restarted for change to take effect</string>
   <string name="restart_now">Restart now</string>
   <string name="restart_later">Later</string>
+  <string name="settings_localization">Localization</string>
 
 </resources>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index 841fe5827..d280c68c1 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -17,58 +17,68 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory android:title="@string/settings_general">
+
+        <Preference
+            android:key="@string/EPr_appearance_header"
+            android:title="@string/EPr_appearance_header" />
+
+        <Preference
+            android:key="@string/notifications"
+            android:title="@string/notifications" />
+
+        <Preference android:title="@string/task_defaults">
+            <intent
+                android:targetClass="com.todoroo.astrid.core.DefaultsPreferences"
+                android:targetPackage="org.tasks" />
+        </Preference>
+
+        <Preference android:title="@string/date_shortcuts">
+            <intent
+                android:targetClass="org.tasks.preferences.DateShortcutPreferences"
+                android:targetPackage="org.tasks" />
+        </Preference>
+
+        <Preference
+            android:key="@string/synchronization"
+            android:title="@string/synchronization">
+            <intent
+                android:targetClass="com.todoroo.astrid.gtasks.GtasksPreferences"
+                android:targetPackage="org.tasks" />
+        </Preference>
+
+        <Preference android:title="@string/backup_BPr_header">
+            <intent
+                android:targetClass="org.tasks.preferences.BackupPreferences"
+                android:targetPackage="org.tasks" />
+        </Preference>
+
+        <Preference
+            android:key="@string/EPr_manage_header"
+            android:title="@string/EPr_manage_header" />
+
+        <Preference android:title="@string/miscellaneous">
+            <intent
+                android:targetClass="org.tasks.preferences.MiscellaneousPreferences"
+                android:targetPackage="org.tasks" />
+        </Preference>
+
+    </PreferenceCategory>
+
     <PreferenceCategory
-        android:key="@string/settings_general"
-        android:title="@string/settings_general">
+        android:key="@string/settings_localization"
+        android:title="@string/settings_localization">
 
         <Preference
             android:key="@string/p_language"
             android:title="@string/language" />
 
-    </PreferenceCategory>
+        <Preference android:title="@string/translations">
+            <intent
+                android:action="android.intent.action.VIEW"
+                android:data="http://tasks.org/translations" />
+        </Preference>
 
-    <Preference
-        android:key="@string/EPr_appearance_header"
-        android:title="@string/EPr_appearance_header" />
-
-    <Preference
-        android:key="@string/notifications"
-        android:title="@string/notifications" />
-
-    <Preference android:title="@string/task_defaults">
-        <intent
-            android:targetClass="com.todoroo.astrid.core.DefaultsPreferences"
-            android:targetPackage="org.tasks" />
-    </Preference>
-
-    <Preference android:title="@string/date_shortcuts">
-        <intent
-            android:targetClass="org.tasks.preferences.DateShortcutPreferences"
-            android:targetPackage="org.tasks" />
-    </Preference>
-
-    <Preference
-        android:key="@string/synchronization"
-        android:title="@string/synchronization">
-        <intent
-            android:targetClass="com.todoroo.astrid.gtasks.GtasksPreferences"
-            android:targetPackage="org.tasks" />
-    </Preference>
-
-    <Preference android:title="@string/backup_BPr_header">
-        <intent
-            android:targetClass="org.tasks.preferences.BackupPreferences"
-            android:targetPackage="org.tasks" />
-    </Preference>
-
-    <Preference
-        android:key="@string/EPr_manage_header"
-        android:title="@string/EPr_manage_header" />
-
-    <Preference android:title="@string/miscellaneous">
-        <intent
-            android:targetClass="org.tasks.preferences.MiscellaneousPreferences"
-            android:targetPackage="org.tasks" />
-    </Preference>
+    </PreferenceCategory>
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/main/res/xml/preferences_help.xml b/src/main/res/xml/preferences_help.xml
index d734b5e4e..7300a5bee 100644
--- a/src/main/res/xml/preferences_help.xml
+++ b/src/main/res/xml/preferences_help.xml
@@ -7,12 +7,6 @@
             android:data="https://github.com/tasks/tasks" />
     </Preference>
 
-    <Preference android:title="@string/translations">
-        <intent
-            android:action="android.intent.action.VIEW"
-            android:data="https://github.com/tasks/tasks/wiki/Translations" />
-    </Preference>
-
     <Preference android:title="@string/report_an_issue">
         <intent
             android:action="android.intent.action.VIEW"