From c60711c60b8269484b7366e51d83a1d92535a856 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Mon, 16 Mar 2015 13:08:09 -0500
Subject: [PATCH] Update vibrate setting

---
 .../astrid/reminders/ReminderPreferences.java |  6 ----
 src/main/res/values-bg-rBG/strings.xml        |  3 --
 src/main/res/values-ca/strings.xml            |  3 --
 src/main/res/values-cs/strings.xml            |  3 --
 src/main/res/values-da/strings.xml            |  1 -
 src/main/res/values-de/strings.xml            |  3 --
 src/main/res/values-es/strings.xml            |  3 --
 src/main/res/values-fr/strings.xml            |  3 --
 src/main/res/values-it/strings.xml            |  3 --
 src/main/res/values-iw/strings.xml            |  3 --
 src/main/res/values-ja/strings.xml            |  3 --
 src/main/res/values-ko/strings.xml            |  3 --
 src/main/res/values-nb/strings.xml            |  3 --
 src/main/res/values-nl/strings.xml            |  3 --
 src/main/res/values-pl/strings.xml            |  3 --
 src/main/res/values-pt-rBR/strings.xml        |  3 --
 src/main/res/values-pt/strings.xml            |  3 --
 src/main/res/values-ru/strings.xml            |  3 --
 src/main/res/values-sl-rSI/strings.xml        |  3 --
 src/main/res/values-sv/strings.xml            |  3 --
 src/main/res/values-tr/strings.xml            |  3 --
 src/main/res/values-uk/strings.xml            |  3 --
 src/main/res/values-zh-rCN/strings.xml        |  3 --
 src/main/res/values-zh-rTW/strings.xml        |  3 --
 src/main/res/values/strings-reminders.xml     |  7 -----
 src/main/res/values/strings.xml               |  1 +
 src/main/res/xml/preferences_reminders.xml    | 28 +++++++++----------
 27 files changed, 15 insertions(+), 94 deletions(-)

diff --git a/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java b/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java
index 683f7a23e..5bf9129cf 100644
--- a/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java
+++ b/src/main/java/com/todoroo/astrid/reminders/ReminderPreferences.java
@@ -90,12 +90,6 @@ public class ReminderPreferences extends TodorooPreferenceActivity {
             } else {
                 preference.setSummary(r.getString(R.string.rmd_EPr_multiple_maxvolume_desc_false));
             }
-        } else if(r.getString(R.string.p_rmd_vibrate).equals(preference.getKey())) {
-            if((Boolean)value) {
-                preference.setSummary(r.getString(R.string.rmd_EPr_vibrate_desc_true));
-            } else {
-                preference.setSummary(r.getString(R.string.rmd_EPr_vibrate_desc_false));
-            }
         }
     }
 }
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index f71011bfd..e572a00ab 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -393,9 +393,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Максимизирай нивото на звука при няколкократни напомняния</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks ще максимизира нивото на звука при няколкократни напомняния</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks ще използва системните настройки за звука</string>
-	<string name="rmd_EPr_vibrate_title">Вибриране при уведомление</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks ще вибрира при изпращане на уведомления</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks няма да вибрира при изпращане на уведомления</string>
 	<string name="rmd_EPr_defaultRemind_title">Случайни напомняния</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Нови задачи няма да имат случайни напомняния</string>
 	<string name="rmd_EPr_defaultRemind_desc">Нови задачи ще напомнят на случаен принцип: %s</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index 0bcb39538..47ad52ce0 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -229,9 +229,6 @@
 	<string name="rmd_EPr_persistent_title">Persistència de Notificació</string>
 	<string name="rmd_EPr_persistent_desc_true">Les notificacions han que ser vistes individualment per ser descartades</string>
 	<string name="rmd_EPr_persistent_desc_false">Les notificacions poden ser descartades amb el botó \"Descarta Tot\"</string>
-	<string name="rmd_EPr_vibrate_title">Vibrar amb les Alertes</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks vibrarà quan enviï notificacions</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks no vibrarà quan enviï notificacions</string>
 	<string name="rmd_EPr_defaultRemind_title">Notificacions al Atzar</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Les tasques noves no mostraran notificacions a l\'atzar</string>
 	<string name="rmd_EPr_defaultRemind_desc">Les tasques noves notificaràn al atzar: %s</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 0460467f7..a0b161b70 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -377,9 +377,6 @@
 	<string name="rmd_EPr_persistent_desc_false">Upozornění mohou být smazána s tlačítkem \"Smazat vše\"</string>
 	<string name="rmd_EPr_multiple_maxvolume_title">Nejvyšší hlasitost pro opakované zvonění upomínky</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Úkoly budou pro hlasitost používat nastavení systému</string>
-	<string name="rmd_EPr_vibrate_title">Vibruj při upozornění</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks bude vibrovat při odesílání upozornění</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks nebude vibrovat při odesílání upozornění</string>
 	<string name="rmd_EPr_defaultRemind_title">Náhodná upozornění</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Nové úkoly nebudou mít náhodné upozornění</string>
 	<string name="rmd_EPr_defaultRemind_desc">Na nové úkoly bude upozorňováno náhodně: %s</string>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 5e1e718c3..57d750a56 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -196,7 +196,6 @@
 	<string name="rmd_EPr_quiet_hours_desc_none">Stille timer er deaktiveret</string>
 	<string name="rmd_EPr_quiet_hours_end_title">Stille timer slut</string>
 	<string name="rmd_EPr_persistent_desc_true">Påmindelser skal vises individuelt for at blive ryddet</string>
-	<string name="rmd_EPr_vibrate_title">Vibrer ved påmindelse</string>
 	<string name="rmd_EPr_defaultRemind_title">Tilfældige påmindelser</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Nye opgaver vil ikke have tilfældige påmindelser</string>
 	<string name="rmd_EPr_defaultRemind_desc">Nye opgaver vil blive påmindet tilfældigt: %s</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index b75ddb097..dc8adf55b 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -385,9 +385,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Maximale Lautstärke für mehrfachläutende Erinnerungen</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks wird die Lautstärke für mehrfachläutende Erinnerungen maximalisieren</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks wird die Systemeinstellungen für die Lautstärke benutzen</string>
-	<string name="rmd_EPr_vibrate_title">Vibrieren beim Alarm</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks wird beim Senden von Benachrichtigungen vibrieren</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks wird beim Senden von Erinnerungen nicht vibrieren</string>
 	<string name="rmd_EPr_defaultRemind_title">Zufällige Erinnerungen</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Neue Aufgaben sollen keine zufälligen Erinnerungen haben</string>
 	<string name="rmd_EPr_defaultRemind_desc">Neue Aufgaben werden zufällig erinnern: %s</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index a6c098897..28ae55a34 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -387,9 +387,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Máximo volumen para recordatorios con tonos múltiples</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks fijará el volumen máximo para avisos con tonos múltiples</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks usará la configuración del sistema para el volumen</string>
-	<string name="rmd_EPr_vibrate_title">Vibrar en alerta</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks vibrará cuando envíe notificaciones</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks no vibrará al enviar notificaciones</string>
 	<string name="rmd_EPr_defaultRemind_title">Recordatorios aleatorios</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Las nuevas tareas no tendrán recordatorios al azar</string>
 	<string name="rmd_EPr_defaultRemind_desc">Las nuevas tareas tendrán recordatorios al azar: %s</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 247614d2c..b18e21454 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -386,9 +386,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Volume maximum pour les rappels multi sonneries</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks va maximiser le volume de multiples anneaux rappels</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks utilisera les réglages du système pour le volume</string>
-	<string name="rmd_EPr_vibrate_title">Vibre lors d\'une alerte</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks vibrera lors de l\'envoi de notifications</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks ne vibrera pas lors de l\'envoi de notifications</string>
 	<string name="rmd_EPr_defaultRemind_title">Rappels aléatoires</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Les nouvelles tâches n\'auront pas de rappels aléatoires</string>
 	<string name="rmd_EPr_defaultRemind_desc">Les nouvelles tâches rappèleront aléatoirement : %s</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 5116046cf..47feb2527 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -345,9 +345,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
 	<string name="rmd_EPr_multiple_maxvolume_title">Volume massimo per promemoria \"ring-multipli\"</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks metterà il volume al massimo per i promemoria \"ring-multipli\"</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks userà le impostazioni di sistema per il volume</string>
-	<string name="rmd_EPr_vibrate_title">Vibrazione telefono</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks vibrerà durante l\'invio di notifiche</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks non vibrerà durante l\'invio di notifiche</string>
 	<string name="rmd_EPr_defaultRemind_title">Promemoria Casuali</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Le nuove attività non avranno promemoria casuali</string>
 	<string name="rmd_EPr_defaultRemind_desc">Le nuove attività saranno ricordate a caso: %s</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 34d6ae920..66b752c26 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -384,9 +384,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">עוצמת קול מירבית לתזכורות מרובות צילצולים</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">אסטריד תשתמש בעוצמת קול מירבית לתזכורות רבות צלצולים</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">אסטריד תשתמש בהגדרת המערכת לקביעת עוצמת הצליל</string>
-	<string name="rmd_EPr_vibrate_title">רטט בזמן אתראה</string>
-	<string name="rmd_EPr_vibrate_desc_true">אסטריד תצרף רטט להתראות</string>
-	<string name="rmd_EPr_vibrate_desc_false">אסטריד לא תצרף רטט להתראות</string>
 	<string name="rmd_EPr_defaultRemind_title">תזכורות אקראיות</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">משימות חדשות לא תכלנה תזכורות אקראיות</string>
 	<string name="rmd_EPr_defaultRemind_desc">משימות חדשות יתזכרו אותך אקראית: %s</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 03a2b08ad..1bfe6816e 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -391,9 +391,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">複数の通知音の最大音量</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks は複数の通知音の最大音量です</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks はシステム設定の音量を使用します</string>
-	<string name="rmd_EPr_vibrate_title">アラート時に振動する</string>
-	<string name="rmd_EPr_vibrate_desc_true">通知するときに振動します</string>
-	<string name="rmd_EPr_vibrate_desc_false">通知するときに振動しません</string>
 	<string name="rmd_EPr_defaultRemind_title">ランダムな通知</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">新規タスクにランダムな通知を設定しません</string>
 	<string name="rmd_EPr_defaultRemind_desc">新規タスクにランダムな通知を設定します:%s</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 32679503d..de62fa515 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -392,9 +392,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">다중-링 알림의 최대 볼륨</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">아스트리드는 다중-링 알림을 최대 볼륨으로 출력합니다</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">아스트리드에서 소리 크기는 시스템 설정을 따릅니다.</string>
-	<string name="rmd_EPr_vibrate_title">알림시 진동</string>
-	<string name="rmd_EPr_vibrate_desc_true">알림시 진동합니다.</string>
-	<string name="rmd_EPr_vibrate_desc_false">알림시 진동하지 않습니다.</string>
 	<string name="rmd_EPr_defaultRemind_title">랜덤 알림</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">새 일정은 무작위로 알리지 않습니다</string>
 	<string name="rmd_EPr_defaultRemind_desc">새 일정을 무작위로 알려 줍니다: %s</string>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index ed1e883e2..8940ff726 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -182,9 +182,6 @@
 	<string name="rmd_EPr_persistent_title">Påminnelse intensitet</string>
 	<string name="rmd_EPr_persistent_desc_true">Varsler må ses individuelt for å kunne fjernes</string>
 	<string name="rmd_EPr_persistent_desc_false">Varsler kan slettes ved \"Slett alt\"-knappen</string>
-	<string name="rmd_EPr_vibrate_title">Vibrer ved varsel</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks vil vibrere ved varsler</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks vil ikke vibrere ved varsler</string>
 	<string name="rmd_EPr_defaultRemind_title">Tilfeldige påminnelser</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Nye oppgaver skal ikke påminnes tifeldig</string>
 	<string name="rmd_EPr_defaultRemind_desc">Nye oppgaver påminnes tilfeldig: %s</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index fc2e32fa2..e1061514a 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -388,9 +388,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Max. volume voor multiple-ring herinneringen</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks zal het volume voor multi-ring herinneringen maximaliseren</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks zal de systeem-instellingen voor het volume gebruiken</string>
-	<string name="rmd_EPr_vibrate_title">Trillen bij herinnering</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks laat telefoon trillen bij herinnering</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks laat telefoon niet trillen bij herinnering</string>
 	<string name="rmd_EPr_defaultRemind_title">Willekeurige herinneringen</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Nieuwe taken hebben geen willekeurige herinneringen</string>
 	<string name="rmd_EPr_defaultRemind_desc">Nieuwe taken willekeurig herinneren: %s</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index f1699cac3..c60040d44 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -391,9 +391,6 @@ i odzyskanie zadań z kopi zapasowej (Settings-&gt;Sync and backup-&gt;Backup-&g
 	<string name="rmd_EPr_multiple_maxvolume_title">Maksymalna głośność dla wielu dzwonków przypomnień</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks ustawi maksymalną głośność dla wielu dzwonków przypomnień</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks będzie korzystał z systemowego ustawienia głośności</string>
-	<string name="rmd_EPr_vibrate_title">Ostrzeżenie wibracyjne</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks powiadomi wibracjami podczas wysyłania powiadomienia</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks nie będzie powiadamiał wibracjami podczas wysyłania powiadomienia</string>
 	<string name="rmd_EPr_defaultRemind_title">Losowe przypomnienia</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Nowe zadania nie będą miały losowych przypomnień</string>
 	<string name="rmd_EPr_defaultRemind_desc">Nowe zadania będą przypominane losowo: %s</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 8aaaf276c..030735cec 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -385,9 +385,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Volume máximo para lembretes com múltiplos sons</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks irá aumentar o volume para alertas com múltiplos sons</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks usará os ajustes de sistema para o volume</string>
-	<string name="rmd_EPr_vibrate_title">Vibração de alerta</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks irá vibrar quando enviar notificações</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks não irá vibrar quando enviar notificações</string>
 	<string name="rmd_EPr_defaultRemind_title">Lembretes aleatórios</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Novas tarefas não terão lembretes aleatórios</string>
 	<string name="rmd_EPr_defaultRemind_desc">Novas tarefas irão lembrar aleatoriamente: %s</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index bfd7db7f8..edf36876d 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -391,9 +391,6 @@ das tarefas através de um backup em Definições-&gt;Sincronização e backup-&
 	<string name="rmd_EPr_multiple_maxvolume_title">Volume máximo para lembretes com vários toques</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">O Tasks irá amplificar o volume para lembretes com vários toques</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">O Tasks irá utilizar as definições do sistema para o volume</string>
-	<string name="rmd_EPr_vibrate_title">Vibrar no alerta</string>
-	<string name="rmd_EPr_vibrate_desc_true">O Tasks vibrará ao enviar notificações</string>
-	<string name="rmd_EPr_vibrate_desc_false">O Tasks não vibrará ao enviar notificações</string>
 	<string name="rmd_EPr_defaultRemind_title">Lembretes aleatórios</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">As novas tarefas não terão lembretes aleatórios</string>
 	<string name="rmd_EPr_defaultRemind_desc">As novas tarefas terão lembretes aleatórios: %s</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 9472aa0aa..3482e6efc 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -392,9 +392,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Максимальная громкость для многоразовых напоминаний</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks будет максимизировать громкость для многоразовых напоминаний</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks будет использовать системные настройки громкости</string>
-	<string name="rmd_EPr_vibrate_title">Будильник с вибрацией</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks будет вызывать вибрацию при уведомлении</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks не будет вызывать вибрацию при уведомлениях</string>
 	<string name="rmd_EPr_defaultRemind_title">Случайные напоминания</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">У новых задач не будет случайных напоминаний</string>
 	<string name="rmd_EPr_defaultRemind_desc">Случайно напоминать о новых задачах %s</string>
diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml
index 8d8fae661..c1c2354ae 100644
--- a/src/main/res/values-sl-rSI/strings.xml
+++ b/src/main/res/values-sl-rSI/strings.xml
@@ -389,9 +389,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Največja jakost zvoka opomnikov z večkratnim zvonenjem</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Aplikacija Opravki bo izvajala opomnike z večkratnim zvonenjem pri polni jakosti zvoka.</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Aplikacija Opravki bo uporabljala sistemske nastavitve jakosti zvoka</string>
-	<string name="rmd_EPr_vibrate_title">Vibriraj ob opozorilih</string>
-	<string name="rmd_EPr_vibrate_desc_true">Aplikacija Opravki bo vibrirala ob pošiljanju obvestil</string>
-	<string name="rmd_EPr_vibrate_desc_false">Aplikacija Opravki ne bo vibrirala ob pošiljanju obvestil</string>
 	<string name="rmd_EPr_defaultRemind_title">Naključni opomniki</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Novi opravki bodo brez naključnih opomnikov</string>
 	<string name="rmd_EPr_defaultRemind_desc">Nova opravila bodo opominjala naključno: %s</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 49df2c51b..559f0fb5d 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -379,9 +379,6 @@ och återställer dina aktuella uppgifter från en backup
 	<string name="rmd_EPr_multiple_maxvolume_title">Maxvolym för flera ringande påminnelser</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks sätter volymen på max för flera ringande påminnelser</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks använder systeminställningen för volym</string>
-	<string name="rmd_EPr_vibrate_title">Vibrera vid varsel</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks kommer att vibrera vid varsel</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks kommer inte att vibrera vid varsel</string>
 	<string name="rmd_EPr_defaultRemind_title">Tillfälliga påminnelser</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Nya uppgifter påminns ej slumpmässigt</string>
 	<string name="rmd_EPr_defaultRemind_desc">Nya uppgifter påminns tillfälligtvis: %s</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index e30a762df..807fafe74 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -347,9 +347,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Çoklu çalan hatırlatmalar için en yüksek ses seviyesi</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Çoklu çalan hatırlatmalar için Tasks ses seviyesini en yükseğe çıkaracaktır</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks ses için sistem ayarlarını kullanacak</string>
-	<string name="rmd_EPr_vibrate_title">Uyarı esnasında titreşim</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks bildirimleri gönderirken titreyecek</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks bildirimleri gönderirken titremeyecek</string>
 	<string name="rmd_EPr_defaultRemind_title">Rastgele Hatırlatmalar</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">Yeni görev rastgele hatırlatmayacak</string>
 	<string name="rmd_EPr_defaultRemind_desc">Yeni görevler rastgele hatırlatacak: %s</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 57fe3a7a3..db2ab52f0 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -392,9 +392,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">Максимальна гучність для багаторазових нагадувань</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks буде максимізувати гучність для багаторазових нагадувань</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks буде використовувати системні налаштування гучності</string>
-	<string name="rmd_EPr_vibrate_title">Будильник з вібрацією</string>
-	<string name="rmd_EPr_vibrate_desc_true">Tasks буде вібувати при сповіщені</string>
-	<string name="rmd_EPr_vibrate_desc_false">Tasks не буде вібувати при сповіщені</string>
 	<string name="rmd_EPr_defaultRemind_title">Випадкові нагадування</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">У нових завдань не буде випадкових нагадувань</string>
 	<string name="rmd_EPr_defaultRemind_desc">Випадково нагадувати про нові завдання: %s</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 13d658ffc..92a541b3b 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -325,9 +325,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">多重提醒最大音量</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">清单小助理将会以最大音量进行多重提醒</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">清单小助理使用系统音量设置</string>
-	<string name="rmd_EPr_vibrate_title">震动提醒</string>
-	<string name="rmd_EPr_vibrate_desc_true">传送通知时会震动</string>
-	<string name="rmd_EPr_vibrate_desc_false">传送通知震动关闭</string>
 	<string name="rmd_EPr_defaultRemind_title">随机提醒</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">新任务不使用随机提醒</string>
 	<string name="rmd_EPr_defaultRemind_desc">任务将随机提醒: %s</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index e78a23bfd..c2ce8c1b5 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -365,9 +365,6 @@
 	<string name="rmd_EPr_multiple_maxvolume_title">多重提醒最大音量</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_true">Tasks將會以最大音量進行多重提醒</string>
 	<string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks使用系統音量設置</string>
-	<string name="rmd_EPr_vibrate_title">震動提醒</string>
-	<string name="rmd_EPr_vibrate_desc_true">傳送通知時會震動</string>
-	<string name="rmd_EPr_vibrate_desc_false">傳送通知震動關閉</string>
 	<string name="rmd_EPr_defaultRemind_title">隨機提醒</string>
 	<string name="rmd_EPr_defaultRemind_desc_disabled">隨機提醒功能關閉</string>
 	<string name="rmd_EPr_defaultRemind_desc">工作將隨機提醒: %s</string>
diff --git a/src/main/res/values/strings-reminders.xml b/src/main/res/values/strings-reminders.xml
index 8369ad087..1d389e8df 100644
--- a/src/main/res/values/strings-reminders.xml
+++ b/src/main/res/values/strings-reminders.xml
@@ -103,13 +103,6 @@
   <!-- Reminder Preference: Max Volume for Multiple-Ring reminders Description (false) -->
   <string name="rmd_EPr_multiple_maxvolume_desc_false">Tasks will use the system setting for the volume</string>
 
-  <!-- Reminder Preference: Vibrate Title -->
-  <string name="rmd_EPr_vibrate_title">Vibrate on alert</string>
-  <!-- Reminder Preference: Vibrate Description (true) -->
-  <string name="rmd_EPr_vibrate_desc_true">Tasks will vibrate when sending notifications</string>
-  <!-- Reminder Preference: Vibrate Description (false) -->
-  <string name="rmd_EPr_vibrate_desc_false">Tasks will not vibrate when sending notifications</string>
-
   <!-- slide 44g: Reminder Preference: Default Reminders Title -->
   <string name="rmd_EPr_defaultRemind_title">Random reminders</string>
   <!-- Reminder Preference: Default Reminders Setting (disabled) -->
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index daffe9cf6..074c0afd7 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -120,6 +120,7 @@
     <string name="notifications">Notifications</string>
     <string name="silent">Silent</string>
     <string name="sound">Sound</string>
+    <string name="vibrate">Vibrate</string>
 
     <string-array name="sync_SPr_interval_entries">
         <!-- sync_SPr_interval_entries: Synchronization Intervals -->
diff --git a/src/main/res/xml/preferences_reminders.xml b/src/main/res/xml/preferences_reminders.xml
index 99cfcbaa2..11a893385 100644
--- a/src/main/res/xml/preferences_reminders.xml
+++ b/src/main/res/xml/preferences_reminders.xml
@@ -17,6 +17,20 @@
         android:showDefault="true"
         android:showSilent="true"
         android:title="@string/sound" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:dependency="@string/p_rmd_enabled"
+        android:key="@string/p_rmd_vibrate"
+        android:title="@string/vibrate" />
+    <com.todoroo.astrid.ui.MultilineCheckboxPreference
+        android:dependency="@string/p_rmd_enabled"
+        android:key="@string/p_rmd_persistent"
+        android:title="@string/rmd_EPr_persistent_title" />
+    <org.tasks.ui.TimePreference
+        android:defaultValue="@integer/default_remind_time"
+        android:dependency="@string/p_rmd_enabled"
+        android:key="@string/p_rmd_time"
+        android:title="@string/rmd_EPr_rmd_time_title" />
     <CheckBoxPreference
         android:defaultValue="false"
         android:dependency="@string/p_rmd_enabled"
@@ -32,24 +46,10 @@
         android:dependency="@string/p_rmd_enable_quiet"
         android:key="@string/p_rmd_quietEnd"
         android:title="@string/rmd_EPr_quiet_hours_end_title" />
-    <org.tasks.ui.TimePreference
-        android:defaultValue="@integer/default_remind_time"
-        android:dependency="@string/p_rmd_enabled"
-        android:key="@string/p_rmd_time"
-        android:title="@string/rmd_EPr_rmd_time_title" />
-    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-        android:dependency="@string/p_rmd_enabled"
-        android:key="@string/p_rmd_persistent"
-        android:title="@string/rmd_EPr_persistent_title" />
     <com.todoroo.astrid.ui.MultilineCheckboxPreference
         android:defaultValue="false"
         android:dependency="@string/p_rmd_enabled"
         android:key="@string/p_rmd_maxvolume"
         android:title="@string/rmd_EPr_multiple_maxvolume_title" />
-    <com.todoroo.astrid.ui.MultilineCheckboxPreference
-        android:defaultValue="true"
-        android:dependency="@string/p_rmd_enabled"
-        android:key="@string/p_rmd_vibrate"
-        android:title="@string/rmd_EPr_vibrate_title" />
 
 </PreferenceScreen>