From da3893134fa2f3055d9967ca2e6c7048fd56ef6b Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Tue, 8 Dec 2015 10:15:15 -0600
Subject: [PATCH] Resource cleanup

---
 src/googleplay/res/values-v8/bools.xml              | 5 -----
 src/googleplay/res/values-v9/bools.xml              | 4 ----
 src/googleplay/res/values/bools.xml                 | 2 ++
 src/main/java/org/tasks/preferences/DeviceInfo.java | 4 ----
 src/main/res/values-ar/strings.xml                  | 2 --
 src/main/res/values-bg-rBG/strings.xml              | 2 --
 src/main/res/values-ca/strings.xml                  | 2 --
 src/main/res/values-cs/strings.xml                  | 2 --
 src/main/res/values-da/strings.xml                  | 2 --
 src/main/res/values-de/strings.xml                  | 2 --
 src/main/res/values-el/strings.xml                  | 2 --
 src/main/res/values-es/strings.xml                  | 2 --
 src/main/res/values-fr/strings.xml                  | 2 --
 src/main/res/values-it/strings.xml                  | 2 --
 src/main/res/values-iw/strings.xml                  | 2 --
 src/main/res/values-ja/strings.xml                  | 2 --
 src/main/res/values-ko/strings.xml                  | 2 --
 src/main/res/values-nb/strings.xml                  | 2 --
 src/main/res/values-nl/strings.xml                  | 2 --
 src/main/res/values-pl/strings.xml                  | 2 --
 src/main/res/values-pt-rBR/strings.xml              | 2 --
 src/main/res/values-pt/strings.xml                  | 2 --
 src/main/res/values-ru/strings.xml                  | 2 --
 src/main/res/values-sk/strings.xml                  | 2 --
 src/main/res/values-sl-rSI/strings.xml              | 2 --
 src/main/res/values-sv/strings.xml                  | 2 --
 src/main/res/values-th/strings.xml                  | 2 --
 src/main/res/values-tr/strings.xml                  | 2 --
 src/main/res/values-uk/strings.xml                  | 2 --
 src/main/res/values-zh-rCN/strings.xml              | 2 --
 src/main/res/values-zh-rTW/strings.xml              | 2 --
 src/main/res/values/bools.xml                       | 1 -
 src/main/res/values/keys.xml                        | 3 +++
 src/main/res/values/strings-core.xml                | 8 +-------
 34 files changed, 6 insertions(+), 75 deletions(-)
 delete mode 100644 src/googleplay/res/values-v8/bools.xml
 delete mode 100644 src/googleplay/res/values-v9/bools.xml

diff --git a/src/googleplay/res/values-v8/bools.xml b/src/googleplay/res/values-v8/bools.xml
deleted file mode 100644
index b85930031..000000000
--- a/src/googleplay/res/values-v8/bools.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="billing_enabled">true</bool>
-    <bool name="tasker_available">true</bool>
-</resources>
\ No newline at end of file
diff --git a/src/googleplay/res/values-v9/bools.xml b/src/googleplay/res/values-v9/bools.xml
deleted file mode 100644
index 1884a0e5e..000000000
--- a/src/googleplay/res/values-v9/bools.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="location_enabled">true</bool>
-</resources>
\ No newline at end of file
diff --git a/src/googleplay/res/values/bools.xml b/src/googleplay/res/values/bools.xml
index 9f359460c..901af1183 100644
--- a/src/googleplay/res/values/bools.xml
+++ b/src/googleplay/res/values/bools.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <bool name="sync_enabled">true</bool>
+    <bool name="location_enabled">true</bool>
+    <bool name="tasker_available">true</bool>
 </resources>
\ No newline at end of file
diff --git a/src/main/java/org/tasks/preferences/DeviceInfo.java b/src/main/java/org/tasks/preferences/DeviceInfo.java
index 073bd886d..02e5a4d43 100644
--- a/src/main/java/org/tasks/preferences/DeviceInfo.java
+++ b/src/main/java/org/tasks/preferences/DeviceInfo.java
@@ -54,10 +54,6 @@ public class DeviceInfo {
         }}.resolveActivity(context.getPackageManager()) != null;
     }
 
-    public boolean supportsBilling() {
-        return context.getResources().getBoolean(R.bool.billing_enabled) && isPlayStoreAvailable();
-    }
-
     public boolean supportsLocationServices() {
         return context.getResources().getBoolean(R.bool.location_enabled);
     }
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 702a4f958..73fba2040 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -14,9 +14,7 @@
 	<string name="export_toast_no_tasks">لا يوجد مهام للتصدير.</string>
 	<string name="import_summary_title"> إستعادة المُلخَّص</string>
 	<string name="read_permission_label">إذن المهام</string>
-	<string name="read_permission_desc">قراءة المهام، عرض فلتر المهمه</string>
 	<string name="write_permission_label">أخذ التصاريح</string>
-	<string name="write_permission_desc">إنشاء مهمه جديدة، تعديل مهمة مُنشأه</string>
 	<string name="DLG_delete_this_task_question">حذف هذه المهمه؟</string>
 	<string name="DLG_upgrading">ترقية المهام...</string>
 	<string name="DLG_hour_minutes">الوقت (ساعة : دقيقة)</string>
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index 9574c4553..db6491129 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -28,9 +28,7 @@
 	<string name="DLG_error_sdcard_general">SD картата не може да бъде достъпена!</string>
 	<string name="import_file_prompt">Изберете файл за възстановяване</string>
 	<string name="read_permission_label">Tasks Разрешение</string>
-	<string name="read_permission_desc">прочети задачи, покажи филтрите на задачата</string>
 	<string name="write_permission_label">Tasks Разрешение</string>
-	<string name="write_permission_desc">създаване на нови задачи, редактиране на съществуващи задачи</string>
 	<string name="DLG_delete_this_task_question">Изтриване на тази задача?</string>
 	<string name="DLG_upgrading">Обновяване на твоите задачи...</string>
 	<string name="DLG_hour_minutes">Време (часове: минути)</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 634524f32..75d77c4d8 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -19,9 +19,7 @@
 	<string name="DLG_error_sdcard_general">No s\'ha pogut accedir a la targeta SD.</string>
 	<string name="import_file_prompt">Tria un fitxer per restaurar</string>
 	<string name="read_permission_label">Permís de l\'Tasks</string>
-	<string name="read_permission_desc">llegir tasques, mostrar filtres de tasques</string>
 	<string name="write_permission_label">Permís de l\'Tasks</string>
-	<string name="write_permission_desc">crear noves tasques, editar tasques existents</string>
 	<string name="DLG_delete_this_task_question">Voleu suprimir aquesta tasca?</string>
 	<string name="DLG_upgrading">S\'estan actualitzant les vostres tasques...</string>
 	<string name="DLG_hour_minutes">Temps (hores : minuts)</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 1b37f204d..0819db297 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -21,9 +21,7 @@
 	<string name="DLG_error_sdcard_general">Chyba v přístupu k SD kartě!</string>
 	<string name="import_file_prompt">Zvolte soubor k obnově</string>
 	<string name="read_permission_label">Tasks Práva</string>
-	<string name="read_permission_desc">zobrazit úkoly, zobrazit filtry úkolů</string>
 	<string name="write_permission_label">Tasks Práva</string>
-	<string name="write_permission_desc">vytvořit nové úkoly, upravit existující úkoly</string>
 	<string name="DLG_delete_this_task_question">Smazat tento úkol?</string>
 	<string name="DLG_upgrading">Obnovování vašich úkolů...</string>
 	<string name="DLG_hour_minutes">Čas (hodin : minut)</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 24f4d25f0..6faa3c10d 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -21,9 +21,7 @@
 	<string name="DLG_error_sdcard_general">Kan ikke få adgang til dig SD-kort!</string>
 	<string name="import_file_prompt">Vælg en fil for at gendanne</string>
 	<string name="read_permission_label">Tasks Tilladelser</string>
-	<string name="read_permission_desc">læs opgaver, vis opgavefiltre</string>
 	<string name="write_permission_label">Tasks Tilladelser</string>
-	<string name="write_permission_desc">opret nye opgaver, rediger eksisterende opgaver</string>
 	<string name="DLG_delete_this_task_question">Slet denne opgave?</string>
 	<string name="DLG_upgrading">Opgraderer dine opgaver...</string>
 	<string name="DLG_hour_minutes">Tid (timer : minutter)</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 355ea83ba..ebcf927bc 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -21,9 +21,7 @@
 	<string name="DLG_error_sdcard_general">Auf die SD-Karte konnte nicht zugegriffen werden!</string>
 	<string name="import_file_prompt">Wählen Sie eine Datei zum Wiederherstellen</string>
 	<string name="read_permission_label">Tasks Zugriffsrechte</string>
-	<string name="read_permission_desc">Aufgaben lesen, Aufgabenfilter anzeigen</string>
 	<string name="write_permission_label">Tasks Zugriffsrechte</string>
-	<string name="write_permission_desc">Aufgaben erstellen, existierende Aufgaben bearbeiten</string>
 	<string name="DLG_delete_this_task_question">Diese Aufgabe löschen?</string>
 	<string name="DLG_upgrading">Ihre Aufgaben werden aktualisiert …</string>
 	<string name="DLG_hour_minutes">Zeit (Stunden : Minuten)</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 4b69831c2..27a0b19fe 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -23,9 +23,7 @@
 	<string name="DLG_error_sdcard_general">Δεν υπάρχει πρόσβαση στην SD κάρτα!</string>
 	<string name="import_file_prompt">Επιλογή αρχείου για επαναφορά</string>
 	<string name="read_permission_label">Άδεια εργασιών</string>
-	<string name="read_permission_desc">Διάβασμα εργασιών, εμφάνιση φίλτρων εργασιών</string>
 	<string name="write_permission_label">Άδεια Εργασιών</string>
-	<string name="write_permission_desc">δημιουργία νέων εργασιών, επεξεργασία εργασιών</string>
 	<string name="DLG_delete_this_task_question">Διαγραφή εργασίας;</string>
 	<string name="DLG_upgrading">Αναβάθμιση των εργασιών σας...</string>
 	<string name="DLG_hour_minutes">Ώρα (ώρες : λεπτά)</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 7d88058db..84f1572d8 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -23,9 +23,7 @@
 	<string name="DLG_error_sdcard_general">¡No se pudo acceder a su tarjeta de memoria SD!</string>
 	<string name="import_file_prompt">Selecciona un archivo a restaurar</string>
 	<string name="read_permission_label">Permisos de Tasks</string>
-	<string name="read_permission_desc">leer tareas, mostrar filtros de tareas</string>
 	<string name="write_permission_label">Permisos de Tasks</string>
-	<string name="write_permission_desc">crear nuevas tareas, editar tareas existentes</string>
 	<string name="DLG_delete_this_task_question">¿Borrar esta tarea?</string>
 	<string name="DLG_upgrading">Actualizando sus tareas....</string>
 	<string name="DLG_hour_minutes">Tiempo (horas : minutos)</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index da0d996be..4d610d2e6 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -24,9 +24,7 @@
 	<string name="DLG_error_sdcard_general">Impossible d\'accéder à la carte SD !</string>
 	<string name="import_file_prompt">Choisissez un fichier à restaurer</string>
 	<string name="read_permission_label">Permission d\'Tasks</string>
-	<string name="read_permission_desc">lire les tâches, afficher les filtres de tâches</string>
 	<string name="write_permission_label">Permission d\'Tasks</string>
-	<string name="write_permission_desc">créer de nouvelles tâches, modifier les tâches existantes</string>
 	<string name="DLG_delete_this_task_question">Supprimer cette tâche ?</string>
 	<string name="DLG_upgrading">Mise à jour de vos tâches…</string>
 	<string name="DLG_hour_minutes">Temps (heures : minutes)</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index bd5db5ff0..fc0066176 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -25,9 +25,7 @@
 	<string name="DLG_error_sdcard_general">Impossibile accedere alla scheda SD!</string>
 	<string name="import_file_prompt">Seleziona un file da ripristinare</string>
 	<string name="read_permission_label">Permessi Tasks</string>
-	<string name="read_permission_desc">vedere i compiti, mostrare i filtri</string>
 	<string name="write_permission_label">Permessi Tasks</string>
-	<string name="write_permission_desc">crea nuove attività, modifica le attività esistenti</string>
 	<string name="DLG_delete_this_task_question">Eliminare questa attività?</string>
 	<string name="DLG_upgrading">Aggiornare le attività ...</string>
 	<string name="DLG_hour_minutes">Tempo (ore : minuti)</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index e7c423be0..866dc0bcf 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -21,9 +21,7 @@
 	<string name="DLG_error_sdcard_general">לא ניתן לגשת לכרטיס ה־SD שלך!</string>
 	<string name="import_file_prompt">נא לבחור קובץ לשחזור</string>
 	<string name="read_permission_label">הרשאות אסטריד</string>
-	<string name="read_permission_desc">קריאת משימות, הצגת מַסְנְנֵי משימות</string>
 	<string name="write_permission_label">הרשאות אסטריד</string>
-	<string name="write_permission_desc">יצירת משימות חדשות, עריכת משימות קיימות.</string>
 	<string name="DLG_delete_this_task_question">למחוק משימה זו?</string>
 	<string name="DLG_upgrading">משדרגת את משימותיך...</string>
 	<string name="DLG_hour_minutes">זמן (שעות : דקות)</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index e1e7d3d7a..f37178215 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -25,9 +25,7 @@
 	<string name="DLG_error_sdcard_general">SDカードにアクセスできません</string>
 	<string name="import_file_prompt">復元に使うファイルを選択してください</string>
 	<string name="read_permission_label">タスクの読み込み</string>
-	<string name="read_permission_desc">タスクの読み込みとフィルタの表示</string>
 	<string name="write_permission_label">タスクの読み込み</string>
-	<string name="write_permission_desc">タスクの作成、編集</string>
 	<string name="DLG_delete_this_task_question">このタスクを削除しますか?</string>
 	<string name="DLG_upgrading">タスクを更新しています</string>
 	<string name="DLG_hour_minutes">時間 (時:分)</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 89d20e769..581dad5d6 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -28,9 +28,7 @@
 	<string name="DLG_error_sdcard_general">SD 카드에 접근할 수 없습니다!</string>
 	<string name="import_file_prompt">복원할 파일을 선택하세요</string>
 	<string name="read_permission_label">Tasks 권한</string>
-	<string name="read_permission_desc">일정 읽기, 일정 필터 보기</string>
 	<string name="write_permission_label">Tasks 권한</string>
-	<string name="write_permission_desc">새 일정 생성하기, 기존 일정 편집하기</string>
 	<string name="DLG_delete_this_task_question">이 일정을 삭제할까요?</string>
 	<string name="DLG_upgrading">일정 업그레이드 중...</string>
 	<string name="DLG_hour_minutes">시간 (시 : 분)</string>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index c3cc51d91..4bf8100bd 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -17,9 +17,7 @@
 	<string name="DLG_error_sdcard_general">Ditt SD-kort er ikke tilgjengelig!</string>
 	<string name="import_file_prompt">Velg fil å gjenopprette</string>
 	<string name="read_permission_label">Tasks Tillatelse</string>
-	<string name="read_permission_desc">les oppgaver, vis oppgavefiltre</string>
 	<string name="write_permission_label">Tasks Tillatelse</string>
-	<string name="write_permission_desc">opprett nye oppgaver, rediger eksisterende oppgaver</string>
 	<string name="DLG_delete_this_task_question">Slett denne oppgaven?</string>
 	<string name="DLG_upgrading">Oppgraderer oppgavene dine...</string>
 	<string name="DLG_hour_minutes">Tid (timer : minutter)</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 68e6f46be..783502504 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -25,9 +25,7 @@
 	<string name="DLG_error_sdcard_general">Toegang tot SD-kaart geweigerd!</string>
 	<string name="import_file_prompt">Selecteer een back-up om te herstellen</string>
 	<string name="read_permission_label">Taak toestemmingen</string>
-	<string name="read_permission_desc">taken lezen, taakfilters weergeven</string>
 	<string name="write_permission_label">Taak toestemmingen</string>
-	<string name="write_permission_desc">nieuwe taken maken, bestaande wijzigen</string>
 	<string name="DLG_delete_this_task_question">Taak verwijderen?</string>
 	<string name="DLG_upgrading">Taken bijwerken...</string>
 	<string name="DLG_hour_minutes">Tijd (uren : minuten)</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 3e8dae71d..97b596dbc 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -21,9 +21,7 @@
 	<string name="DLG_error_sdcard_general">Brak dostępu do Twojej karty SD!</string>
 	<string name="import_file_prompt">Wskaż plik do przywrócenia</string>
 	<string name="read_permission_label">Uprawnienia Tasks</string>
-	<string name="read_permission_desc">odczytuj zadania, pokaż filtr zadań</string>
 	<string name="write_permission_label">Zezwolenia Tasks</string>
-	<string name="write_permission_desc">twórz nowe zadania, edytuj bieżące zadania</string>
 	<string name="DLG_delete_this_task_question">Usunąć to zadanie?</string>
 	<string name="DLG_upgrading">Uaktualniam Twoje zadania...</string>
 	<string name="DLG_hour_minutes">Czas (godziny : minuty)</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 8f0f621c4..f4e605684 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -20,9 +20,7 @@
 	<string name="DLG_error_sdcard_general">Não foi possível acessar seu cartão SD!</string>
 	<string name="import_file_prompt">Selecione um arquivo para ser restaurado</string>
 	<string name="read_permission_label">Permissões do Tasks</string>
-	<string name="read_permission_desc">ler tarefas, exibir filtros das tarefas</string>
 	<string name="write_permission_label">Permissões do Tasks</string>
-	<string name="write_permission_desc">criar novas tarefas, editar tarefas existentes</string>
 	<string name="DLG_delete_this_task_question">Excluir esta tarefa?</string>
 	<string name="DLG_upgrading">Atualizando suas tarefas...</string>
 	<string name="DLG_hour_minutes">Horário (horas:minutos)</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index a3221f6e0..9e0bafe6d 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -26,9 +26,7 @@
 	<string name="DLG_error_sdcard_general">Não é possível aceder ao seu cartão SD!</string>
 	<string name="import_file_prompt">Selecione o ficheiro a restaurar</string>
 	<string name="read_permission_label">Permissões do Tasks</string>
-	<string name="read_permission_desc">ler tarefas, mostrar filtros de tarefas</string>
 	<string name="write_permission_label">Permissões do Tasks</string>
-	<string name="write_permission_desc">criar novas tarefas, editar tarefas existentes</string>
 	<string name="DLG_delete_this_task_question">Remover esta tarefa?</string>
 	<string name="DLG_upgrading">Atualização de tarefas...</string>
 	<string name="DLG_hour_minutes">Tempo (horas:minutos)</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 3fcca8b4a..7605d3b2a 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -25,9 +25,7 @@
 	<string name="DLG_error_sdcard_general">Нет доступа к карте памяти!</string>
 	<string name="import_file_prompt">Выберите файл для восстановления</string>
 	<string name="read_permission_label">Право Tasks</string>
-	<string name="read_permission_desc">чтение и отображение фильтров задач</string>
 	<string name="write_permission_label">Право Tasks</string>
-	<string name="write_permission_desc">создание новых и редактирование существующих задач</string>
 	<string name="DLG_delete_this_task_question">Удалить эту задачу?</string>
 	<string name="DLG_upgrading">Обновление ваших задач…</string>
 	<string name="DLG_hour_minutes">Время (час : мин)</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index e584733c8..1bebc24fb 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -23,9 +23,7 @@
 	<string name="DLG_error_sdcard_general">Chyba v prístupe k SD karte!</string>
 	<string name="import_file_prompt">Vybrať súbor k obnove</string>
 	<string name="read_permission_label">Tasks povolenia</string>
-	<string name="read_permission_desc">zobraziť úlohy, zobraziť filtre úloh</string>
 	<string name="write_permission_label">Tasks povolenia</string>
-	<string name="write_permission_desc">Vytvoriť nové úlohy, upraviť existujúce úlohy</string>
 	<string name="DLG_delete_this_task_question">Vymazať túto úlohu?</string>
 	<string name="DLG_upgrading">Aktualizácia tvojich úloh...</string>
 	<string name="DLG_hour_minutes">Čas (hodiny : minúty)</string>
diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml
index d9fb29e9b..e7333325d 100644
--- a/src/main/res/values-sl-rSI/strings.xml
+++ b/src/main/res/values-sl-rSI/strings.xml
@@ -24,9 +24,7 @@
 	<string name="DLG_error_sdcard_general">Tvoja SD kartica ni dostopna.</string>
 	<string name="import_file_prompt">Izberi datoteko za obnovo</string>
 	<string name="read_permission_label">Dovoljenje Opravkom</string>
-	<string name="read_permission_desc">preberi opravke, prikaži filtre opravka</string>
 	<string name="write_permission_label">Dovoljenje Opravkom</string>
-	<string name="write_permission_desc">ustvari nove opravke, uredi obstoječe opravke</string>
 	<string name="DLG_delete_this_task_question">Zbrišem ta opravek?</string>
 	<string name="DLG_upgrading">Nadgrajujem tvoje opravke...</string>
 	<string name="DLG_hour_minutes">Čas (ure : minute)</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index a40fbe0cb..528394982 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -21,9 +21,7 @@
 	<string name="DLG_error_sdcard_general">SD-kort ej tillgängligt!</string>
 	<string name="import_file_prompt">Välj en fil att återställa</string>
 	<string name="read_permission_label">Tasks Tillstånd</string>
-	<string name="read_permission_desc">läs uppgifter, visa uppgiftsfilter</string>
 	<string name="write_permission_label">Tasks Tillstånd</string>
-	<string name="write_permission_desc">skapa nya uppgifter, redigera existerande uppgifter</string>
 	<string name="DLG_delete_this_task_question">Radera denna uppgift?</string>
 	<string name="DLG_upgrading">Uppgraderar dina uppgifter...</string>
 	<string name="DLG_hour_minutes">Tid (timmar : minuter)</string>
diff --git a/src/main/res/values-th/strings.xml b/src/main/res/values-th/strings.xml
index 31b3dddfe..3140f7e18 100644
--- a/src/main/res/values-th/strings.xml
+++ b/src/main/res/values-th/strings.xml
@@ -12,8 +12,6 @@
 	<string name="import_progress_read">กำลังอ่านแผนงาน %d...</string>
 	<string name="DLG_error_sdcard">ไม่สามารถเข้าถึงแฟ้ม: %s</string>
 	<string name="DLG_error_sdcard_general">ไม่สามารถเข้าถึง SD Card ได้!</string>
-	<string name="read_permission_desc">อ่านแผนงาน, แสดงตัวกรองแผนงาน</string>
-	<string name="write_permission_desc">สร้างแผนงานใหม่, แก้ไขแผนงานเดิม</string>
 	<string name="DLG_delete_this_task_question">ลบงานนี้?</string>
 	<string name="DLG_hour_minutes">เวลา (ชั่วโมง : นาที)</string>
 	<string name="WID_dateButtonUnset">คลิก เพื่อตั้งค่า</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index bed68f92a..74bcc6d3a 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -21,9 +21,7 @@
 	<string name="DLG_error_sdcard_general">Hafıza kartına erişemiyorum!</string>
 	<string name="import_file_prompt">Geri Alınacak Bir Dosya Seçin</string>
 	<string name="read_permission_label">Tasks İzni</string>
-	<string name="read_permission_desc">görevlere gözat, görev süzgeçlerini görüntüle</string>
 	<string name="write_permission_label">Tasks İzni</string>
-	<string name="write_permission_desc">yeni görevler oluştur, mevcut görevleri düzenle</string>
 	<string name="DLG_delete_this_task_question">Bu görev silinsin mi?</string>
 	<string name="DLG_upgrading">Görevleriniz güncelleniyor...</string>
 	<string name="DLG_hour_minutes">Zaman (saat : dakika)</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 9d4800893..528c9b32a 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -24,9 +24,7 @@
 	<string name="DLG_error_sdcard_general">Немає доступу до карти SD!</string>
 	<string name="import_file_prompt">Виберіть файл для відновлення</string>
 	<string name="read_permission_label">Дозволи Tasks</string>
-	<string name="read_permission_desc">читання і відображення фільтрів завдань</string>
 	<string name="write_permission_label">Дозволи Tasks</string>
-	<string name="write_permission_desc">створення нових завдань, редагування існуючих завдань</string>
 	<string name="DLG_delete_this_task_question">Видалити цю задачу?</string>
 	<string name="DLG_upgrading">Оновлення ваших завдань...</string>
 	<string name="DLG_hour_minutes">Час (години : хвилини)</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 8f76c667b..b15cdf89e 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -21,9 +21,7 @@
 	<string name="DLG_error_sdcard_general">无法访问您的 SD 卡！</string>
 	<string name="import_file_prompt">选取要还原的文件</string>
 	<string name="read_permission_label">清单小助理权限</string>
-	<string name="read_permission_desc">读取任务，显示任务过滤器</string>
 	<string name="write_permission_label">清单小助理权限</string>
-	<string name="write_permission_desc">创建新任务，修改现有任务</string>
 	<string name="DLG_delete_this_task_question">确认删除？</string>
 	<string name="DLG_upgrading">升级您的任务...</string>
 	<string name="DLG_hour_minutes">时间（小时:分钟）</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 906019828..062f209e3 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -21,9 +21,7 @@
 	<string name="DLG_error_sdcard_general">無法存取您的SD卡!</string>
 	<string name="import_file_prompt">選取欲還原的檔案</string>
 	<string name="read_permission_label">Tasks 權限</string>
-	<string name="read_permission_desc">讀取工作, 顯示工作篩選</string>
 	<string name="write_permission_label">Tasks 權限</string>
-	<string name="write_permission_desc">建立新工作, 修改現行工作</string>
 	<string name="DLG_delete_this_task_question">確認刪除?</string>
 	<string name="DLG_upgrading">升級您的工作...</string>
 	<string name="DLG_hour_minutes">時間 (小時:分鐘)</string>
diff --git a/src/main/res/values/bools.xml b/src/main/res/values/bools.xml
index b963eda96..1d4f5342a 100644
--- a/src/main/res/values/bools.xml
+++ b/src/main/res/values/bools.xml
@@ -3,7 +3,6 @@
     <bool name="two_pane_layout">false</bool>
     <bool name="at_most_honeycomb">true</bool>
     <bool name="at_least_honeycomb_mr1">false</bool>
-    <bool name="billing_enabled">false</bool>
     <bool name="sync_enabled">false</bool>
     <bool name="location_enabled">false</bool>
     <bool name="tasker_available">false</bool>
diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml
index d468ca8ad..4d9f64f4c 100644
--- a/src/main/res/values/keys.xml
+++ b/src/main/res/values/keys.xml
@@ -15,6 +15,9 @@
   <string name="p_date_shortcut_evening">date_shortcut_evening</string>
   <string name="p_date_shortcut_night">date_shortcut_night</string>
 
+  <string name="write_permission_desc">create new tasks, edit existing tasks</string>
+  <string name="read_permission_desc">read tasks, display task filters</string>
+
   <!-- ======================================================== REMINDERS == -->
 
     <string name="p_attachment_dir">custom_files_dir</string>
diff --git a/src/main/res/values/strings-core.xml b/src/main/res/values/strings-core.xml
index 703364923..78f39912a 100644
--- a/src/main/res/values/strings-core.xml
+++ b/src/main/res/values/strings-core.xml
@@ -6,15 +6,9 @@
   <!-- permission title for READ_TASKS -->
   <string name="read_permission_label">Tasks Permission</string>
   
-  <!-- permission description for READ_TASKS -->
-  <string name="read_permission_desc">read tasks, display task filters</string>
-  
   <!-- permission title for READ_TASKS -->
   <string name="write_permission_label">Tasks Permission</string>
-  
-  <!-- permission description for READ_TASKS -->
-  <string name="write_permission_desc">create new tasks, edit existing tasks</string>
-  
+
   <!-- ================================================== Generic Dialogs == -->
     
   <!-- question for deleting tasks -->