diff --git a/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java b/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java
index c389697f8..918ed874e 100644
--- a/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java
+++ b/src/main/java/com/todoroo/astrid/ui/DateChangedAlerts.java
@@ -79,7 +79,7 @@ public class DateChangedAlerts {
         d.setContentView(R.layout.astrid_reminder_view);
 
         Button okButton = (Button) d.findViewById(R.id.reminder_complete);
-        okButton.setText(R.string.DLG_ok);
+        okButton.setText(android.R.string.ok);
 
         d.findViewById(R.id.reminder_snooze).setVisibility(View.GONE);
         d.findViewById(R.id.reminder_edit).setVisibility(View.GONE);
@@ -134,7 +134,7 @@ public class DateChangedAlerts {
             });
         }
 
-        okButton.setText(R.string.DLG_ok);
+        okButton.setText(android.R.string.ok);
         undoButton.setText(R.string.DLG_undo);
 
         int titleResource = lastTime ? R.string.repeat_rescheduling_dialog_title_last_time : R.string.repeat_rescheduling_dialog_title;
diff --git a/src/main/res/layout/control_dialog_ok.xml b/src/main/res/layout/control_dialog_ok.xml
index cd4b5e0ff..4333e3d4f 100644
--- a/src/main/res/layout/control_dialog_ok.xml
+++ b/src/main/res/layout/control_dialog_ok.xml
@@ -15,4 +15,4 @@
 	    android:textStyle="bold"
 	    android:textColor="@android:color/black"
 	    android:layout_alignParentBottom="true"
-	    android:text="@string/DLG_ok"/>
+	    android:text="@android:string/ok"/>
diff --git a/src/main/res/layout/gtasks_login_activity.xml b/src/main/res/layout/gtasks_login_activity.xml
index 210a3bf52..dc0af93ff 100644
--- a/src/main/res/layout/gtasks_login_activity.xml
+++ b/src/main/res/layout/gtasks_login_activity.xml
@@ -32,7 +32,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="50dip"
-            android:text="@string/DLG_ok" />
+            android:text="@android:string/ok" />
         
   </LinearLayout>
 
diff --git a/src/main/res/layout/repeat_until_dialog.xml b/src/main/res/layout/repeat_until_dialog.xml
index 1f831b65f..d3409d119 100644
--- a/src/main/res/layout/repeat_until_dialog.xml
+++ b/src/main/res/layout/repeat_until_dialog.xml
@@ -30,13 +30,13 @@
 		        android:layout_width="fill_parent"
 		        android:layout_height="50dip"
 		        android:layout_weight="1"
-		        android:text="@string/DLG_ok"/>
+		        android:text="@android:string/ok"/>
 		    <Button
 		        android:id="@+id/cancel"
 		        android:layout_width="fill_parent"
 		        android:layout_height="50dip"
 		        android:layout_weight="1"
-		        android:text="@string/DLG_cancel"/>
+		        android:text="@android:string/cancel"/>
 		</LinearLayout>
 	</LinearLayout>
 </ScrollView>
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 64a7e49d6..30729913f 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -26,8 +26,6 @@
 	<string name="DLG_upgrading">ترقية المهام...</string>
 	<string name="DLG_hour_minutes">الوقت (ساعة : دقيقة)</string>
 	<string name="DLG_loading">تحميل...</string>
-	<string name="DLG_ok">حسنا</string>
-	<string name="DLG_cancel">الغي</string>
 	<string name="DLG_undo">تراجع</string>
 	<string name="WID_dateButtonUnset">اضغط لتعيين</string>
 	<string name="TLA_no_items">لا يوجد لديك مهام! \n هل تريد أن تضيف شيئا؟</string>
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index 585bf4378..635e65e73 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -37,8 +37,6 @@
 	<string name="DLG_upgrading">Обновяване на твоите задачи...</string>
 	<string name="DLG_hour_minutes">Време (часове: минути)</string>
 	<string name="DLG_loading">Зареждане...</string>
-	<string name="DLG_ok">ОК</string>
-	<string name="DLG_cancel">Отказ</string>
 	<string name="DLG_undo">Върни</string>
 	<string name="WID_dateButtonUnset">Кликнете, за да зададете</string>
 	<string name="TLA_no_items">Вие нямате задачи! \n Искате ли да добавите нещо?</string>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index d46eef905..b7377c400 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -32,8 +32,6 @@
 	<string name="DLG_upgrading">S\'estan actualitzant les vostres tasques...</string>
 	<string name="DLG_hour_minutes">Temps (hores : minuts)</string>
 	<string name="DLG_loading">S\'està carregant…</string>
-	<string name="DLG_ok">Accepta</string>
-	<string name="DLG_cancel">Cancel·la</string>
 	<string name="DLG_undo">Desfés</string>
 	<string name="WID_dateButtonUnset">Prem per establir</string>
 	<string name="TLA_no_items">No teniu tasques! \n Voleu afegir alguna cosa?</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index bb9e751f6..822cf140e 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -34,7 +34,6 @@
 	<string name="DLG_upgrading">Obnovování vašich úkolů...</string>
 	<string name="DLG_hour_minutes">Čas (hodin : minut)</string>
 	<string name="DLG_loading">Nahrávám...</string>
-	<string name="DLG_cancel">Storno</string>
 	<string name="DLG_undo">Vrátit změny</string>
 	<string name="WID_dateButtonUnset">Klikni pro nastavení</string>
 	<string name="TLA_no_items">Žádné úkoly!</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 6480bf626..56d19932f 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -33,7 +33,6 @@
 	<string name="DLG_upgrading">Ihre Aufgaben werden aktualisiert …</string>
 	<string name="DLG_hour_minutes">Zeit (Stunden : Minuten)</string>
 	<string name="DLG_loading">Ladevorgang…</string>
-	<string name="DLG_cancel">Abbrechen</string>
 	<string name="DLG_undo">Rückgängig</string>
 	<string name="WID_dateButtonUnset">Klicken zur Bestätigung</string>
 	<string name="TLA_no_items">Sie haben keine Aufgaben! \n Möchten Sie welche hinzufügen?</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index c04083f38..b58974cc8 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -36,8 +36,6 @@
 	<string name="DLG_upgrading">Αναβάθμιση των εργασιών σας...</string>
 	<string name="DLG_hour_minutes">Ώρα (ώρες : λεπτά)</string>
 	<string name="DLG_loading">Φόρτωση...</string>
-	<string name="DLG_ok">ΟΚ</string>
-	<string name="DLG_cancel">Ακύρωση</string>
 	<string name="DLG_undo">Αναίρεση</string>
 	<string name="WID_dateButtonUnset">Κλικ για καθορισμό</string>
 	<string name="TLA_no_items">Δεν έχεις εργασίες! \n Θέλεις να προσθέσεις κάτι:</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 136974361..0dbc70b7e 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -34,8 +34,6 @@
 	<string name="DLG_upgrading">Actualizando sus tareas....</string>
 	<string name="DLG_hour_minutes">Tiempo (horas : minutos)</string>
 	<string name="DLG_loading">Cargando...</string>
-	<string name="DLG_ok">Aceptar</string>
-	<string name="DLG_cancel">Cancelar</string>
 	<string name="DLG_undo">Deshacer</string>
 	<string name="WID_dateButtonUnset">Pulsar para establecer</string>
 	<string name="TLA_no_items">No tienes tareas! \n Quieres agregar alguna?</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 1c39d34ba..1201d8208 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -34,7 +34,6 @@
 	<string name="DLG_upgrading">Mise à jour de vos tâches…</string>
 	<string name="DLG_hour_minutes">Temps (heures : minutes)</string>
 	<string name="DLG_loading">Chargement…</string>
-	<string name="DLG_cancel">Annuler</string>
 	<string name="DLG_undo">Annuler Action</string>
 	<string name="WID_dateButtonUnset">Cliquez pour définir</string>
 	<string name="TLA_no_items">Aucune tâche ! \n Voulez-vous en créer une ?</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 2bcf76885..50aa2dda7 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -34,7 +34,6 @@
 	<string name="DLG_upgrading">Aggiornare le attività ...</string>
 	<string name="DLG_hour_minutes">Tempo (ore : minuti)</string>
 	<string name="DLG_loading">Caricamento...</string>
-	<string name="DLG_cancel">Annulla</string>
 	<string name="DLG_undo">Annulla l\'ultima azione</string>
 	<string name="WID_dateButtonUnset">Clicca per Impostare</string>
 	<string name="TLA_no_items">Nessuna Attività!</string>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index eb5a5fd04..b167ec303 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -34,8 +34,6 @@
 	<string name="DLG_upgrading">משדרגת את משימותיך...</string>
 	<string name="DLG_hour_minutes">זמן (שעות : דקות)</string>
 	<string name="DLG_loading">טוענת...</string>
-	<string name="DLG_ok">אישור</string>
-	<string name="DLG_cancel">בטל</string>
 	<string name="DLG_undo">בטל פעולה אחרונה</string>
 	<string name="WID_dateButtonUnset">הקלק כדי לקבוע</string>
 	<string name="TLA_no_items">אין לך משימות!\n הֲתִּרְצֶה להוסיף משימה?</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 5914e3a19..99ced81cd 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -34,7 +34,6 @@
 	<string name="DLG_upgrading">タスクを更新しています</string>
 	<string name="DLG_hour_minutes">時間 (時:分)</string>
 	<string name="DLG_loading">読み込んでいます・・・</string>
-	<string name="DLG_cancel">取り消す</string>
 	<string name="DLG_undo">動作を取り消す</string>
 	<string name="WID_dateButtonUnset">入力する</string>
 	<string name="TLA_no_items">タスクなし</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 4dcf9252f..50511aa13 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -37,8 +37,6 @@
 	<string name="DLG_upgrading">일정 업그레이드 중...</string>
 	<string name="DLG_hour_minutes">시간 (시 : 분)</string>
 	<string name="DLG_loading">불러오는 중...</string>
-	<string name="DLG_ok">확인</string>
-	<string name="DLG_cancel">취소</string>
 	<string name="DLG_undo">실행 취소</string>
 	<string name="WID_dateButtonUnset">누르세요</string>
 	<string name="TLA_no_items">일정이 없네요!\n추가할까요?</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 2084e8e92..9870f477f 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -34,7 +34,6 @@
 	<string name="DLG_upgrading">Taken bijwerken...</string>
 	<string name="DLG_hour_minutes">Tijd (uren : minuten)</string>
 	<string name="DLG_loading">Laden…</string>
-	<string name="DLG_cancel">Annuleren</string>
 	<string name="DLG_undo">Ongedaan Maken</string>
 	<string name="WID_dateButtonUnset">Klikken om in te stellen</string>
 	<string name="TLA_no_items">U heeft geen taken! \n Taak toevoegen?</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index dd8d2130c..85112660d 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -34,7 +34,6 @@
 	<string name="DLG_upgrading">Uaktualniam Twoje zadania...</string>
 	<string name="DLG_hour_minutes">Czas (godziny : minuty)</string>
 	<string name="DLG_loading">Ładowanie...</string>
-	<string name="DLG_cancel">Anuluj</string>
 	<string name="DLG_undo">Cofnij</string>
 	<string name="WID_dateButtonUnset">Kliknij, aby ustawić</string>
 	<string name="TLA_no_items">Brak zadań!</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index b56f4a194..e29235159 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -33,8 +33,6 @@
 	<string name="DLG_upgrading">Atualizando suas tarefas...</string>
 	<string name="DLG_hour_minutes">Horário (horas:minutos)</string>
 	<string name="DLG_loading">Carregando...</string>
-	<string name="DLG_ok">Ok</string>
-	<string name="DLG_cancel">Cancelar</string>
 	<string name="DLG_undo">Desfazer</string>
 	<string name="WID_dateButtonUnset">Toque para definir</string>
 	<string name="TLA_no_items">Você não tem tarefas! \n Deseja inserir alguma?</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 1c427058d..c176a1da9 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -36,7 +36,6 @@
 	<string name="DLG_upgrading">Atualização de tarefas...</string>
 	<string name="DLG_hour_minutes">Tempo (horas:minutos)</string>
 	<string name="DLG_loading">Carregando...</string>
-	<string name="DLG_cancel">Cancelar</string>
 	<string name="DLG_undo">Anular</string>
 	<string name="WID_dateButtonUnset">Clique para definir</string>
 	<string name="TLA_no_items">Não existem tarefas!\nQuer adicionar uma?</string>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 94299998b..736f015d8 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -34,8 +34,6 @@
 	<string name="DLG_upgrading">Обновление ваших задач…</string>
 	<string name="DLG_hour_minutes">Время (час : мин)</string>
 	<string name="DLG_loading">Загрузка...</string>
-	<string name="DLG_ok">ОК</string>
-	<string name="DLG_cancel">Отмена</string>
 	<string name="DLG_undo">Отмена</string>
 	<string name="WID_dateButtonUnset">Нажмите для установки</string>
 	<string name="TLA_no_items">Нет задач! \n Добавить?</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 69673d816..2a0e2dee9 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -34,7 +34,6 @@
 	<string name="DLG_upgrading">Aktualizácia tvojich úloh...</string>
 	<string name="DLG_hour_minutes">Čas (hodiny : minúty)</string>
 	<string name="DLG_loading">Načítavanie...</string>
-	<string name="DLG_cancel">Zrušiť</string>
 	<string name="DLG_undo">Späť</string>
 	<string name="WID_dateButtonUnset">Klikni pre nastavenie</string>
 	<string name="TLA_no_items">Nemáš žiadne úlohy! \n Chceš niečo pridať?</string>
diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml
index efeb47925..c7cc5e074 100644
--- a/src/main/res/values-sl-rSI/strings.xml
+++ b/src/main/res/values-sl-rSI/strings.xml
@@ -37,8 +37,6 @@
 	<string name="DLG_upgrading">Nadgrajujem tvoje opravke...</string>
 	<string name="DLG_hour_minutes">Čas (ure : minute)</string>
 	<string name="DLG_loading">Nalagam...</string>
-	<string name="DLG_ok">V redu</string>
-	<string name="DLG_cancel">Prekliči</string>
 	<string name="DLG_undo">Razveljavi</string>
 	<string name="WID_dateButtonUnset">Klikni za nastavitev</string>
 	<string name="TLA_no_items">Nimate zabeleženih opravkov!\n Dodava kakega?</string>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 3dc2c2458..43ec14a9b 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -34,7 +34,6 @@
 	<string name="DLG_upgrading">Uppgraderar dina uppgifter...</string>
 	<string name="DLG_hour_minutes">Tid (timmar : minuter)</string>
 	<string name="DLG_loading">Laddar...</string>
-	<string name="DLG_cancel">Avbryt</string>
 	<string name="DLG_undo">Ångra</string>
 	<string name="WID_dateButtonUnset">Klicka för att ställa</string>
 	<string name="TLA_no_items">Du har inga uppgifter!\n Vill du lägga till någonting?</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 9ec9473c2..c2ca2bd79 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -34,8 +34,6 @@
 	<string name="DLG_upgrading">Görevleriniz güncelleniyor...</string>
 	<string name="DLG_hour_minutes">Zaman (saat : dakika)</string>
 	<string name="DLG_loading">Yükleniyor...</string>
-	<string name="DLG_ok">Tamam</string>
-	<string name="DLG_cancel">Vazgeç</string>
 	<string name="DLG_undo">Geri al</string>
 	<string name="WID_dateButtonUnset">Ayar İçin Dokun</string>
 	<string name="TLA_no_items">Hiç göreviniz yok! \n Bir şeyler eklemek nasıl olur?</string>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 1f21a9eaa..4238a949a 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -37,8 +37,6 @@
 	<string name="DLG_upgrading">Оновлення ваших завдань...</string>
 	<string name="DLG_hour_minutes">Час (години : хвилини)</string>
 	<string name="DLG_loading">Завантаження...</string>
-	<string name="DLG_ok">Так</string>
-	<string name="DLG_cancel">Відміна</string>
 	<string name="DLG_undo">Відмінити</string>
 	<string name="WID_dateButtonUnset">Натисніть для установки</string>
 	<string name="TLA_no_items">У Вас немає завдань! \n Бажаєте щось додати?</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 353686c0a..0c438f038 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -34,8 +34,6 @@
 	<string name="DLG_upgrading">升级您的任务...</string>
 	<string name="DLG_hour_minutes">时间（小时:分钟）</string>
 	<string name="DLG_loading">载入中...</string>
-	<string name="DLG_ok">确定(O)</string>
-	<string name="DLG_cancel">取消</string>
 	<string name="DLG_undo">撤消</string>
 	<string name="WID_dateButtonUnset">点选</string>
 	<string name="TLA_no_items">你没有任务</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 12e7b75dc..691ba50bf 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -34,8 +34,6 @@
 	<string name="DLG_upgrading">升級您的工作...</string>
 	<string name="DLG_hour_minutes">時間 (小時:分鐘)</string>
 	<string name="DLG_loading">載入中...</string>
-	<string name="DLG_ok">確定(O)</string>
-	<string name="DLG_cancel">取消</string>
 	<string name="DLG_undo">撤消</string>
 	<string name="WID_dateButtonUnset">點選</string>
 	<string name="TLA_no_items">無工作!</string>
diff --git a/src/main/res/values/strings-core.xml b/src/main/res/values/strings-core.xml
index 9954636aa..ec703042b 100644
--- a/src/main/res/values/strings-core.xml
+++ b/src/main/res/values/strings-core.xml
@@ -33,11 +33,6 @@
   <string name="DLG_loading">Loading...</string>
   
   <!-- Dialog - dismiss -->
-
-  <!-- slide 20d -->
-  <string name="DLG_ok">OK</string>
-  <!-- slide 36g -->
-  <string name="DLG_cancel">Cancel</string>
   
   <string name="DLG_undo">Undo</string>