From 45a609cc80c797a870e32c8b5612cf5402dba519 Mon Sep 17 00:00:00 2001
From: Alex Baker <baker.alex@gmail.com>
Date: Fri, 10 Apr 2015 15:33:14 -0500
Subject: [PATCH] Remove unused resources

---
 scripts/find-unused-drawables.sh              |   6 +--
 scripts/find-unused-layouts.sh                |   6 +--
 .../res/drawable-hdpi/ic_action_discard.png   | Bin 454 -> 0 bytes
 .../res/drawable-xhdpi/ic_action_discard.png  | Bin 552 -> 0 bytes
 .../res/drawable-xxhdpi/ic_action_discard.png | Bin 781 -> 0 bytes
 .../res/drawable/filter_selected_icon.png     | Bin 328 -> 0 bytes
 .../drawable/filter_selected_icon_black.png   | Bin 892 -> 0 bytes
 src/main/res/drawable/ic_action_discard.png   | Bin 333 -> 0 bytes
 src/main/res/layout/date_time_dialog.xml      |  39 ------------------
 src/main/res/values-ar/strings.xml            |   1 -
 src/main/res/values-bg-rBG/strings.xml        |  15 -------
 src/main/res/values-ca/strings.xml            |   2 -
 src/main/res/values-cs/strings.xml            |  15 -------
 src/main/res/values-da/strings.xml            |   4 --
 src/main/res/values-de/strings.xml            |  15 -------
 src/main/res/values-el/strings.xml            |  15 -------
 src/main/res/values-es/strings.xml            |  15 -------
 src/main/res/values-fi/strings.xml            |   1 -
 src/main/res/values-fr/strings.xml            |  15 -------
 src/main/res/values-it/strings.xml            |   5 ---
 src/main/res/values-iw/strings.xml            |  15 -------
 src/main/res/values-ja/strings.xml            |  15 -------
 src/main/res/values-ko/strings.xml            |  15 -------
 src/main/res/values-nb/strings.xml            |   5 ---
 src/main/res/values-nl/strings.xml            |  15 -------
 src/main/res/values-pl/strings.xml            |  15 -------
 src/main/res/values-pt-rBR/strings.xml        |  15 -------
 src/main/res/values-pt/strings.xml            |  15 -------
 src/main/res/values-ru/strings.xml            |  15 -------
 src/main/res/values-sk/strings.xml            |   8 ----
 src/main/res/values-sl-rSI/strings.xml        |  15 -------
 src/main/res/values-sv/strings.xml            |  15 -------
 src/main/res/values-tr/strings.xml            |  13 ------
 src/main/res/values-uk/strings.xml            |  15 -------
 src/main/res/values-zh-rCN/strings.xml        |  13 ------
 src/main/res/values-zh-rTW/strings.xml        |  15 -------
 src/main/res/values/attrs.xml                 |  13 +++---
 src/main/res/values/keys.xml                  |  13 ------
 src/main/res/values/strings-core.xml          |   3 --
 src/main/res/values/strings-defaults.xml      |   3 --
 src/main/res/values/strings-reminders.xml     |  19 ---------
 src/main/res/values/strings-repeat.xml        |  10 -----
 src/main/res/values/styles.xml                |   4 --
 43 files changed, 7 insertions(+), 431 deletions(-)
 delete mode 100644 src/main/res/drawable-hdpi/ic_action_discard.png
 delete mode 100644 src/main/res/drawable-xhdpi/ic_action_discard.png
 delete mode 100644 src/main/res/drawable-xxhdpi/ic_action_discard.png
 delete mode 100644 src/main/res/drawable/filter_selected_icon.png
 delete mode 100644 src/main/res/drawable/filter_selected_icon_black.png
 delete mode 100644 src/main/res/drawable/ic_action_discard.png
 delete mode 100644 src/main/res/layout/date_time_dialog.xml

diff --git a/scripts/find-unused-drawables.sh b/scripts/find-unused-drawables.sh
index c7aab9c0b..986316d62 100755
--- a/scripts/find-unused-drawables.sh
+++ b/scripts/find-unused-drawables.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 for DIR in $(ls -d src/main/res/drawable*); do
-    for file in $(ls -l ${DIR} | /usr/bin/awk '{ print $9}' | /usr/bin/sed 's/\..\+//g'); do
-        if [ ! -f ${DIR}/${file} ]; then
-            echo "ignoring ${file}"
-            continue
-        fi;
+    for file in $(ls -l ${DIR} | awk '{ print $9}' | sed 's/\..\+//g'); do
         filename=`basename ${file}`
         filename=${filename%%.*}
         git grep -q ${filename} .
diff --git a/scripts/find-unused-layouts.sh b/scripts/find-unused-layouts.sh
index c81b19ce2..6d92ee939 100755
--- a/scripts/find-unused-layouts.sh
+++ b/scripts/find-unused-layouts.sh
@@ -1,10 +1,6 @@
 #!/bin/bash
 for DIR in $(ls -d src/main/res/layout*); do
-    for file in $(ls -l ${DIR} | /usr/bin/awk '{ print $9}' | /usr/bin/sed 's/\..\+//g'); do
-        if [ ! -f ${DIR}/${file} ]; then
-            echo -e "ignored ${DIR}/${file}"
-            continue
-        fi;
+    for file in $(ls -l ${DIR} | awk '{ print $9}' | sed 's/\..\+//g'); do
         filename=`basename ${file}`
         filename=${filename%.*}
         git grep -q ${filename} .
diff --git a/src/main/res/drawable-hdpi/ic_action_discard.png b/src/main/res/drawable-hdpi/ic_action_discard.png
deleted file mode 100644
index 9c717dd323c2d11f5a111f4a5e6d19a4870d4779..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 454
zcmV;%0XhDOP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzXh}ptRCwC#S+Nd+Fc3xKB5PM&aV6ms
zT%G*~{=?OOaCY`LNSM3AC@ZX9lOr((O|5rriT9EV2`Sfm<@K%yNg@yk1R=4YbXF9F
zf{Xezrm89(B>@ONhf8TOv;h()s(F`$i?JmhXN47$G|v<F%p2NMPsBoCO6MT4WHtoe
zY-SZz7J?v+mNV3}32p<HT0Y)ASp%lwtu<Z<V756jtf(P#1tK+f7Al$Kpe)lcTN(|5
zza(%0>ltF{(YLoOlw$_UP`}Dy(;Cxwyr^B`pgzo{m`*>Tg<$)jx`RM7V=?%1t;9R9
z159dGvc+OFeCcD25*!QQ4dvwZD3RhG$mW!Vqz=SD;LZ@s-6w&Lfj}n`5&|<KFfhb2
zcq8E2{&Dz}Js<=E5}-WO_aO+hgalfVP~h`W7lOdmrGuJ)Mqf_&xv9r*q&aqFHs43b
wHq-=O|5_9mT-tnX(y4zf2?PQ`9C!#Y052w5OuX+CZ2$lO07*qoM6N<$g2(f=ApigX

diff --git a/src/main/res/drawable-xhdpi/ic_action_discard.png b/src/main/res/drawable-xhdpi/ic_action_discard.png
deleted file mode 100644
index db69d6c25478faddd522c43927c39e699eb4951d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 552
zcmV+@0@wYCP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz%1J~)RCwC#T0Kw0KnzV$7g)<k)^sG&
zO=V?;m6<=p%nB<jtjwJvr6XO_v00N9TXIAgC~EQfjQXB*$`GAwzdL{2`LYZE00000
z;7BpC5E4STqffr)w3n)?n%KHc4U8}7bA7<n8yb(X^*eFAJI^eHOpT4|ep%Hk8VgH>
ztO?kVU$1w#%iMaKd2@jeYk}4~fLED)`y!>^M@@rd;7n3pE{4tyNP$DV*o?lM5*u=%
z)*S(2G^e^!42}sVpr-MzLB>SE_*==@Dey)lyrvF<sf<^V?YR&-$~5>d31}1Q-+Cb6
zfyOd{@k^2IqYjV)=aR-;@_(*ua3l2qSBoo({+;{#03wA+IF;JqeDtgMVaoWNu$3*|
zTigo(3afoDD;`@;&aylnhWH%6Am!STziOQDh9mM2SB6si$?IuwCZlvvDWVVp0fq!v
zR)j4GfD3>C5P%o}0^kB500cN9U~8y%=aB%*AlSeKKmZ7EM?i0=ckhk>%d2ZmS#SXm
zpo`i-=h`y?&)N6(mNwQRLk&@SgCPWNl9bt3Z$M+!YYKkqUFhhKrRA+KcXYUWT<o#Z
qT<<r#9##SX000000Dr)z00RKL{%Oj{JWdh-0000<MNUMnLSTZGr0wef

diff --git a/src/main/res/drawable-xxhdpi/ic_action_discard.png b/src/main/res/drawable-xxhdpi/ic_action_discard.png
deleted file mode 100644
index b522daffec1ab6e1f2eb0cd500830d9666f51bc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 781
zcmV+o1M>WdP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!uSrBfRCwC#oxe`QFc61R{tR>tQ$^RZ
zR_X*Jtjx@;9eEKL`v$xN1B|dxiM3f1sS91p00Vd6N})oaR;hh9-zQn_fD-3^_MOj8
zOqKxv000000001h7h0AZHy8|h4P2%gkH>QaSk3TVsfJSW1}>+@ABhNs#b@0z+A+=>
zGQQH5a$$7@SQVhx@bz*8fFIe3q@ACBe1*Tiu-xlo6rfrqh)NKDmg+Qy2TRojy~ff|
zVgLdVgrmVFXnU!+A2XS7&9H~A-b4V^AYM9wCR$5iFaMnYV(hj{w6t_LkaVppjMjzk
zb)%L?!}naz?i=?CI)%OSwRY6<)Z>Q+dipveW3=fJ;bRsQqwzD>=3xrc&=`&Ht?lFi
zBw`2vi3>1`*gmrq1kiQ-d4$Gabq~UBBIa@dO~Q^c`x_<N>mOY*Hcvu;A2Q;;k!6Sl
zi=~KX-)~O@UyO5t=&0DQ39>0+idy}my*>2nD%M}j%9mVL+l`#RdUM@%sF7oy2mmCE
zR~IBM<yxwHDG%1%f^&DrQck38m%i@ndrMM%_?Z@Y;Kj_NbW=ZXzPc7$^4e^y8$$Sy
zd&1r2hZe)slc1{M`yIFrU<#|7^6f0{Wo%PR5nxDwA_AKfi~vReAOHdYL6{&62!H^9
z00__+Wdt@UQx+hG*Hh*x3jhd!01!}sDgv8S$qHck;G|G(#03!p5CHy}0G8j=oFM=L
z00JNY5Cez-2!IR11pxveK;ujd+hdZv0Pee7i<|RBh;N2Nxu7d!B4}GiA#S`K;-=H-
z^sUqBJju`Z?CaaD-9U!d&6is#H=#C*EF4v!--GEP9(sO+ukXS>&xMfk7<!k^+))MY
z><B%;HD4<0CRX(_vG%V_OrI6;i$H$`c>n+a00000004mRd<ZZA1fa4fA5SoX00000
LNkvXXu0mjf?T}B+

diff --git a/src/main/res/drawable/filter_selected_icon.png b/src/main/res/drawable/filter_selected_icon.png
deleted file mode 100644
index e90f6312a2272dbd304d94c8a8f1792ac138cb6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 328
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?7!3HF=7hLlMQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS>Jie7oTIEGZ*O8WEvzdiF&h7^vOGvqriH$-&AFwbbLcwEnM
z!*89UZUFN=ri~_+Y%TxY8SD#YOv-3r6sT{OGLTgB>tbBw@P{SqK&Zkqm8$|~3U)lE
z3{Qk~Qz|8#Wjm5TN*J+g${1aI>eymyGUY$RMr|?Xq6s`VI?f6ST<lo#f?43Tl4e1Z
z6dx16BPaKCMIH~%=k_KaR2m{!JK`OW{&V0>Igrl5FA(o!^g=~yKWqE}<zkVEIc{vn
z7o41<;hd28LHJ}te!yW#55pElsa694KOd{4BZ2dL*dFye#5nsD9`fjQ%KRX~B#^-H
YR?aQuPvjm&psyJ`UHx3vIVCg!0LDIWZvX%Q

diff --git a/src/main/res/drawable/filter_selected_icon_black.png b/src/main/res/drawable/filter_selected_icon_black.png
deleted file mode 100644
index 4618874329baf505435c13585ee146fc721bc05c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 892
zcmeAS@N?(olHy`uVBq!ia0vp^f<P?7!3HF=7hLlMQk(@Ik;M!Q+`=Ht$S`Y;1Oo$;
zTxLi_NrbPDRdRl=USdjqQmS4>ZUIm=1A|S46_A;mT9T+xk(-lOY*k^a1Xf`MWP^nD
zl@!2AO0sR0B76fBob!uP6-@L@^bC~jxD*r=Y>HCStb$zJpxS{vTcwPWk^(Dz{qpj1
zy>er{{GxPyLrY6beFGzXBO_g)3f<z$ypqHU-MnIDh#@d@TvCgZi!uvJGV}8kK;|YU
z<(HP&Dk*_1f&+*<Q<CBK6qFX_fNe=h)=$kz%}vcKDb_dCGt`G04%BOtl5AC6nv|8A
zTmp7C+&HiYoD$RZk%VpZF;&~>gIt8<LYR860Z8J6Tn-FxxYP5Bq45EX8U2dH0-&=E
zP@N4_ZRK2)npl!w6q28xW9JBpJ_XO*#Prml)WnoZ8+~*Y(7?j(UWh0#zU;VwI$?2d
z#}%+=VF&{QBa5etV~9oX+AD@$%#I=q7tGmM90iz~5<~@996zu*9k^yTb*;b$4l}2`
z3D>-rd}3%y(5_%moT`wqS%GEWS&ig7N8Y?@*DU*Y-+Xs{y1Hx2{$o+MrGveqHJ5&#
z5)|%YBKIPp>40x^%9KX&H`^H5Bsu1|wJbXzxQeG||1)WZ+cVN02uk+~ta)t4EXud<
zY4Jt7bJG;AyUMqjRvzDZ+IY?tkr<H!DF>C-bu9{)5j$CTjM@LiHKm;uK@P!h68O(o
z=C%Dhbp7lJH94*qb?>USZ25R}@%OH&rwiN9d3juH{?4@G!tYY<D<xGC3eBP40)PE+
uDc=86B44oZr*fq5R*%aWwHkk|KQY>F=UL#ZxH<)tKRjLiT-G@yGywpos4AfV

diff --git a/src/main/res/drawable/ic_action_discard.png b/src/main/res/drawable/ic_action_discard.png
deleted file mode 100644
index 9dfb7cc2c0414c9bd4203cc7ea39d31f8431ad0f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 333
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWw1G?>$`{Ln>}1B}lL;%Nk5tb@0ZG2r&=I2NUj9e|vK?f60vF
zPHl@1H$?FE|4ECoW?-wDcw<vQ`$V1@8U+W+cP(K|m{ZKC>7B8mxkk&!;dHb@9nX>N
z4L>XvnmGE1Y+*7K=bR_hmK5OhmGP02*W!lmCV^**+@yB6HZtc0E|qC`R{O<7q31{)
z_fd^Z28sXuD}$mKWfMHLZI4W2=5$~d_UPb?a4em3i*=&Z*4IpGZH#Qr#~AOQF!(KP
zD*K^@huucfmw7SYf@RDnR!+#{U7b@gXGYOnnXgYwPG4Pcbpyw&E7Ad>JZqZr4SSjb
d9hew63>ac_jO4A4-U4}@!PC{xWt~$(698OZd+h)K

diff --git a/src/main/res/layout/date_time_dialog.xml b/src/main/res/layout/date_time_dialog.xml
deleted file mode 100644
index a5b4b2d3c..000000000
--- a/src/main/res/layout/date_time_dialog.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-** Copyright (c) 2012 Todoroo Inc
-**
-** See the file "LICENSE" for the full license governing this code. 
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
-     <LinearLayout
-         android:layout_width="fill_parent"
-         android:layout_height="wrap_content"
-         android:orientation="vertical">
-		<com.todoroo.astrid.ui.DateAndTimePicker
-			android:id="@+id/date_and_time"
-			android:layout_width="fill_parent"
-			android:layout_height="fill_parent"
-			android:orientation="vertical"/>
-		<LinearLayout
-		    android:layout_width="fill_parent"
-		    android:layout_height="wrap_content"
-		    android:paddingLeft="7dip"
-		    android:paddingRight="7dip"
-		    android:orientation="horizontal">
-		    <Button
-		        android:id="@+id/ok"
-		        android:layout_width="fill_parent"
-		        android:layout_height="50dip"
-		        android:layout_weight="1"
-		        android:text="@string/DLG_ok"/>
-		    <Button
-		        android:id="@+id/cancel"
-		        android:layout_width="fill_parent"
-		        android:layout_height="50dip"
-		        android:layout_weight="1"
-		        android:text="@string/DLG_cancel"/>
-		</LinearLayout>
-	</LinearLayout>
-</ScrollView>
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 8df7e60d2..d0772ec4a 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -45,7 +45,6 @@
 	<string name="TEA_hideUntil_label">إخفاء حتى...</string>
 	<string name="TEA_note_label">وصف</string>
 	<string name="TEA_notes_empty">وصف...</string>
-	<string name="TEA_notes_hint">ادخل وصف المهمة</string>
 	<string name="TEA_estimatedDuration_label">كم من الوقت ستأخذ؟</string>
 	<string name="TEA_menu_save">حفظ التغيرات</string>
 	<string name="TEA_tab_activity">نشاط</string>
diff --git a/src/main/res/values-bg-rBG/strings.xml b/src/main/res/values-bg-rBG/strings.xml
index 042a68915..229f49a69 100644
--- a/src/main/res/values-bg-rBG/strings.xml
+++ b/src/main/res/values-bg-rBG/strings.xml
@@ -96,7 +96,6 @@
 	<string name="TEA_hideUntil_display">Скрий до %s</string>
 	<string name="TEA_note_label">Описание</string>
 	<string name="TEA_notes_empty">Описание...</string>
-	<string name="TEA_notes_hint">Въведете описание на задачата...</string>
 	<string name="TEA_estimatedDuration_label">Колко време ще отнеме?</string>
 	<string name="TEA_elapsedDuration_label">Време, което вече е отделено</string>
 	<string name="TEA_menu_save">Запази промените</string>
@@ -214,7 +213,6 @@
 данни (Настройки-&gt;Синхронизиране и резервни копия-&gt;Управление на стари задачи-&gt;Изчисти всички данни) 
 и да възстановите вашите задачи от резервно копие Настройки-&gt;Синхронизиране и резервни копия-&gt;Импортиране на задачи) в Tasks.</string>
 	<string name="market_unavailable">За съжаление маркет не е достъпен за вашата система.</string>
-	<string name="EPr_defaults_header">Нови задачи - настройки по подразбиране</string>
 	<string name="task_defaults">Настройки по подразбиране</string>
 	<string name="EPr_default_urgency_title">Краен срок по подразбиране</string>
 	<string name="EPr_default_importance_title">Приоритет по подразбиране</string>
@@ -323,11 +321,6 @@
 	<string name="file_dir_dialog_ok">Използвай тази директория</string>
 	<string name="file_dir_dialog_default">Възстанови по подразбиране</string>
 	<string name="premium_speech_bubble_2">Поръчай една година и спести 25%!</string>
-	<string name="TEA_reminders_group_label">Настройки на напомняне</string>
-	<string name="TEA_reminder_label">Напомни ми</string>
-	<string name="TEA_reminder_due">Когато задачата е към крайния срок</string>
-	<string name="TEA_reminder_overdue">Когато задачата е просрочена</string>
-	<string name="TEA_reminder_randomly">Случайно веднъж</string>
 	<string name="ring_once">Звънене веднъж</string>
 	<string name="ring_five_times">Звънене пет пъти</string>
 	<string name="ring_nonstop">Звънене без спиране</string>
@@ -367,14 +360,6 @@
 	<string name="repeat_interval_prompt">Интервал на повторение</string>
 	<string name="repeat_never">Без повторение</string>
 	<string name="repeat_dont">Не повтаряй</string>
-	<string-array name="repeat_interval_short">
-		<item>д</item>
-		<item>сд</item>
-		<item>мс</item>
-		<item>час</item>
-		<item>мин</item>
-		<item>г</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>Ден(дни)</item>
 		<item>Седмица(и)</item>
diff --git a/src/main/res/values-ca/strings.xml b/src/main/res/values-ca/strings.xml
index a18a13cf4..67e647ced 100644
--- a/src/main/res/values-ca/strings.xml
+++ b/src/main/res/values-ca/strings.xml
@@ -88,7 +88,6 @@
 	<string name="TEA_deadline_hint">Establir data de venciment</string>
 	<string name="TEA_hideUntil_label">Mostra la tasca</string>
 	<string name="TEA_note_label">Notes</string>
-	<string name="TEA_notes_hint">Introdueix notes a la tasca...</string>
 	<string name="TEA_estimatedDuration_label">Quant temps us portarà?</string>
 	<string name="TEA_elapsedDuration_label">Temps que ja s\'ha invertit en la Tasca</string>
 	<string name="TEA_menu_save">Desa els canvis</string>
@@ -197,7 +196,6 @@
 	<string name="gtasks_GTA_clear_completed">Neteja les tasques completades</string>
 	<string name="gtasks_GLA_authenticating">S\'està autenticant...</string>
 	<string name="locale_notification">Té $NUM coincidència: $FILTER</string>
-	<string name="TEA_reminders_group_label">Recordatoris</string>
 	<string name="rmd_NoA_filter">¡Recordatori!</string>
 	<string name="rmd_NoA_done">Acabat</string>
 	<string name="rmd_NoA_snooze">Adorm</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 20d3ebab8..17e21e3d7 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -91,7 +91,6 @@
 	<string name="TEA_hideUntil_display">Skrýt až do %s</string>
 	<string name="TEA_note_label">Poznámky</string>
 	<string name="TEA_notes_empty">Popis ...</string>
-	<string name="TEA_notes_hint">Poznámky k úkolu...</string>
 	<string name="TEA_estimatedDuration_label">Kolik času asi zabere?</string>
 	<string name="TEA_elapsedDuration_label">Jak dlouho už na úkolu pracujete</string>
 	<string name="TEA_menu_save">Uložit změny</string>
@@ -200,7 +199,6 @@
 	<string name="DB_corrupted_title">Poškozená databáze</string>
 	<string name="DB_corrupted_body">OJ! Může být poškozená databáze. Zobrazuje-li se tato chyba znovu,  vymaž všechny údaje v (Nastavení-&gt;Synchronizace a zálohy-&gt;Správa starých úkolů-&gt;Vymazat vše) a obnov své úkoly ze zálohy (Nastavení-&gt;Synchronizace a zálohy-&gt;Zálohy-&gt;Import úkolů) v úkolech.</string>
 	<string name="market_unavailable">Bohužel na trhu není k dispozici pro váš systém.</string>
-	<string name="EPr_defaults_header">Nastavení nového úkolu</string>
 	<string name="EPr_default_urgency_title">Výchozí termín dokončení</string>
 	<string name="EPr_default_importance_title">Výchozí důležitost</string>
 	<string name="EPr_default_hideUntil_title">Výchozí Skrýt do</string>
@@ -308,11 +306,6 @@
 	<string name="file_dir_dialog_ok">Použít tento adresář</string>
 	<string name="file_dir_dialog_default">Obnovit výchozí nastavení</string>
 	<string name="premium_speech_bubble_2">Objednejte na rok a ušetříte 25%!</string>
-	<string name="TEA_reminders_group_label">Nastavení upomínek</string>
-	<string name="TEA_reminder_label">Upozorni mě...</string>
-	<string name="TEA_reminder_due">Při termínu</string>
-	<string name="TEA_reminder_overdue">Úkol po termínu</string>
-	<string name="TEA_reminder_randomly">Jednou náhodně</string>
 	<string-array name="TEA_reminder_random">
 		<item>hodina</item>
 		<item>den</item>
@@ -348,14 +341,6 @@
 	<string name="repeat_interval_prompt">Opakovací interval</string>
 	<string name="repeat_never">Bez opakování</string>
 	<string name="repeat_dont">Neopakujte</string>
-	<string-array name="repeat_interval_short">
-		<item>d</item>
-		<item>td</item>
-		<item>měs</item>
-		<item>h</item>
-		<item>min</item>
-		<item>rok</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>Dnů</item>
 		<item>Týdnů</item>
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index b09dde849..6b7e7f6d4 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -70,7 +70,6 @@
 	<string name="TEA_hideUntil_label">Skjul indtil</string>
 	<string name="TEA_hideUntil_display">Skjul indtil %s</string>
 	<string name="TEA_note_label">Noter</string>
-	<string name="TEA_notes_hint">Indtast opgavenoter...</string>
 	<string name="TEA_estimatedDuration_label">Hvor lang tid tager det?</string>
 	<string name="TEA_elapsedDuration_label">Tid allerede brugt på denne opgave</string>
 	<string name="TEA_menu_save">Gem ændringer</string>
@@ -106,7 +105,6 @@
       If you see this error regularly, we suggest you clear all
       data (Settings-&gt;Sync and backup-&gt;Manage old tasks-&gt;Clear all data) and restore
       your tasks from a backup (Settings-&gt;Sync and backup-&gt;Backup-&gt;Import tasks) in Tasks.</string>
-	<string name="EPr_defaults_header">Standard for nye opgaver</string>
 	<string name="EPr_default_urgency_title">Standard Deadline</string>
 	<string name="EPr_default_importance_title">Standard Vigtighed</string>
 	<string name="EPr_default_hideUntil_title">Standard Skjul Indtil</string>
@@ -161,8 +159,6 @@
 	<string name="gtasks_FEx_title">Google Opgaver: %s</string>
 	<string name="gtasks_GPr_header">Google Tasks (beta!)</string>
 	<string name="locale_notification">Du har $NUM der matcher: $FILTER</string>
-	<string name="TEA_reminder_due">når deadline er nået</string>
-	<string name="TEA_reminder_overdue">når deadline er overskredet</string>
 	<string-array name="TEA_reminder_random">
 		<item>en time</item>
 		<item>en dag</item>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index f0c620f98..37046cf6d 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -91,7 +91,6 @@
 	<string name="TEA_hideUntil_display">Verbergen bis %s</string>
 	<string name="TEA_note_label">Beschreibung</string>
 	<string name="TEA_notes_empty">Beschreibung ...</string>
-	<string name="TEA_notes_hint">Aufgabenbeschreibung eingeben ...</string>
 	<string name="TEA_estimatedDuration_label">Wie lange wird es dauern?</string>
 	<string name="TEA_elapsedDuration_label">Zeit, die schon für die Aufgabe gebraucht wurde</string>
 	<string name="TEA_menu_save">Änderungen speichern</string>
@@ -207,7 +206,6 @@
 	<string name="DB_corrupted_title">Fehler in der Datenbank</string>
 	<string name="DB_corrupted_body">Oh-oh! Sieht aus aIs könnte deine Datenbank beschädigt sein. Falls Du diesen Fehler regelmäßig siehst, empfehlen wir, alle Daten zu löschen (Einstellungen-&gt;Synchronisation-&gt;Alte Aufgaben verwalten-&gt;Alle Daten löschen) und deine Aufgaben aus einem Backup in Tasks wiederherzustellen (Einstellungen-&gt;Synchronisation-&gt;Backups-&gt;-Backups verwalten&gt;Aufgaben importieren).</string>
 	<string name="market_unavailable">Leider ist der Market nicht für dein System verfügbar.</string>
-	<string name="EPr_defaults_header">Standardeinstellungen für neue Aufgaben</string>
 	<string name="task_defaults">Aufgabenstandards</string>
 	<string name="EPr_default_urgency_title">Standard Dringlichkeit</string>
 	<string name="EPr_default_importance_title">Standard Priorität</string>
@@ -316,11 +314,6 @@
 	<string name="file_dir_dialog_ok">Dieses Verzeichnis verwenden</string>
 	<string name="file_dir_dialog_default">Auf Standardeinstellungen zurücksetzen</string>
 	<string name="premium_speech_bubble_2">Bestelle für ein ganzes Jahr und spare 25%!</string>
-	<string name="TEA_reminders_group_label">Erinnerungs-Einstellungen</string>
-	<string name="TEA_reminder_label">Erinnere mich:</string>
-	<string name="TEA_reminder_due">Wenn Aufgabe fällig ist</string>
-	<string name="TEA_reminder_overdue">Wenn Aufgabe überfällig ist</string>
-	<string name="TEA_reminder_randomly">Einmal zufällig</string>
 	<string-array name="TEA_reminder_random">
 		<item>einer Stunde</item>
 		<item>einem Tag</item>
@@ -357,14 +350,6 @@
 	<string name="repeat_interval_prompt">Wiederholungsintervall</string>
 	<string name="repeat_never">Nicht wiederholen</string>
 	<string name="repeat_dont">Nicht wiederholen</string>
-	<string-array name="repeat_interval_short">
-		<item>t</item>
-		<item>w</item>
-		<item>M</item>
-		<item>Std</item>
-		<item>Min</item>
-		<item>Jahr</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>Tag(e)</item>
 		<item>Woche(n)</item>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 542b7190e..85f289cf9 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -91,7 +91,6 @@
 	<string name="TEA_hideUntil_display">Απόκρυψη μέχρι %s</string>
 	<string name="TEA_note_label">Περιγραφή</string>
 	<string name="TEA_notes_empty">Περιγραφή...</string>
-	<string name="TEA_notes_hint">Εισάγετε περιγραφή εργασίας...</string>
 	<string name="TEA_estimatedDuration_label">Πόσο θα διαρκέσει?</string>
 	<string name="TEA_elapsedDuration_label">Χρόνος που ήδη πέρασε</string>
 	<string name="TEA_menu_save">Αποθήκευση αλλαγών</string>
@@ -207,7 +206,6 @@
 δεδομένων (Ρυθμίσεις-&gt; Sync και Backup-&gt; Διαχείριση παλιά tasks-&gt; Διαγραφή όλων των δεδομένων) και να αποκαταστήσει
 καθηκόντων σας από ένα αντίγραφο ασφαλείας (Ρυθμίσεις-&gt; Sync και Backup-&gt; Backup-&gt; Εισαγωγή εργασίες) στις εργασίες.</string>
 	<string name="market_unavailable">Δυστυχώς το market δεν είναι διαθέσιμο για το λειτουργικό σου.</string>
-	<string name="EPr_defaults_header">Προκαθορισμένα στοιχεία νέας εργασίας</string>
 	<string name="EPr_default_urgency_title">Προκαθοσρισμένη προθεσμία</string>
 	<string name="EPr_default_importance_title">Προκαθορισμένη προτεραιότητα</string>
 	<string name="EPr_default_hideUntil_title">Προκαθορισμένη απόκρυψη μέχρι</string>
@@ -313,11 +311,6 @@
 	<string name="file_dir_dialog_ok">Χρήση αυτού του φακέλου</string>
 	<string name="file_dir_dialog_default">Επαναφορά προεπιλογών</string>
 	<string name="premium_speech_bubble_2">Παραγγείλετε ένα χρόνο και εξοικονομήστε 25%!</string>
-	<string name="TEA_reminders_group_label">Ρυθμίσεις υπενθυμίσεων</string>
-	<string name="TEA_reminder_label">Υπενθύμισε μου </string>
-	<string name="TEA_reminder_due">Πότε λήγει η εργασία</string>
-	<string name="TEA_reminder_overdue">Όταν η εργασία είναι καθυστερούμενη</string>
-	<string name="TEA_reminder_randomly">Τυχαία μια φορά</string>
 	<string-array name="TEA_reminder_random">
 		<item>μια ώρα</item>
 		<item>μια μέρα</item>
@@ -353,14 +346,6 @@
 	<string name="repeat_interval_prompt">Διάστημα επανάληψης</string>
 	<string name="repeat_never">Μή επαναλαμβανόμενα</string>
 	<string name="repeat_dont">Να μήν επαναληφθεί</string>
-	<string-array name="repeat_interval_short">
-		<item>η</item>
-		<item>εβ</item>
-		<item>μή</item>
-		<item>ώρ</item>
-		<item>λεπ</item>
-		<item>έτ</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>Μέρα(ες)</item>
 		<item>Εβδομαδα(ές)</item>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 6034bdc33..fb522053b 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -93,7 +93,6 @@
 	<string name="TEA_hideUntil_display">Ocultar hasta %s</string>
 	<string name="TEA_note_label">Descripción</string>
 	<string name="TEA_notes_empty">Descripción...</string>
-	<string name="TEA_notes_hint">Introducir descripción de la tarea...</string>
 	<string name="TEA_estimatedDuration_label">¿Cuanto tiempo llevará?</string>
 	<string name="TEA_elapsedDuration_label">Tiempo ya empleado en la tarea</string>
 	<string name="TEA_menu_save">Guardar cambios</string>
@@ -205,7 +204,6 @@
 	<string name="DB_corrupted_title">Base de datos corrupta</string>
 	<string name="DB_corrupted_body">\"¡Oh-oh! Es posible que tu base de datos esté corrupta. Si ves éste error con frecuencia, te sugerimos que limpies toda la información  (Configuración-&gt;Sincronización y respaldos-&gt;Administrar tareas pasadas-&gt;Limpiar toda la información) y recuperar tus tareas de un respaldo (Configuración-&gt;Sincronización y respaldos-&gt;Respaldos-&gt;Importar tareas) en Tasks.\"</string>
 	<string name="market_unavailable">Desafortunadamente el Market no está disponible para tu sistema</string>
-	<string name="EPr_defaults_header">Configuración por defecto de nuevas tareas.</string>
 	<string name="EPr_default_urgency_title">Fecha límite por defecto</string>
 	<string name="EPr_default_importance_title">Prioridad predeterminada</string>
 	<string name="EPr_default_hideUntil_title">Ocultar por defecto hasta</string>
@@ -313,11 +311,6 @@
 	<string name="file_dir_dialog_ok">Usar este directorio</string>
 	<string name="file_dir_dialog_default">Restaurar a valores por defecto</string>
 	<string name="premium_speech_bubble_2">¡Ordena un año y ahorra un 25%%!</string>
-	<string name="TEA_reminders_group_label">Recordar configuración</string>
-	<string name="TEA_reminder_label">Recordarme:</string>
-	<string name="TEA_reminder_due">Cuando la tarea es finalizada</string>
-	<string name="TEA_reminder_overdue">Cuando la tarea está retrasada</string>
-	<string name="TEA_reminder_randomly">Aleatorio, una sola vez</string>
 	<string-array name="TEA_reminder_random">
 		<item>una hora</item>
 		<item>un día</item>
@@ -354,14 +347,6 @@
 	<string name="repeat_interval_prompt">Intervalo de repetición</string>
 	<string name="repeat_never">Sin repetir</string>
 	<string name="repeat_dont">No repetir</string>
-	<string-array name="repeat_interval_short">
-		<item>d</item>
-		<item>sem</item>
-		<item>mes</item>
-		<item>h</item>
-		<item>min</item>
-		<item>año</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>Día(s)</item>
 		<item>Semana(s)</item>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index f84905794..ec1937f23 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -34,7 +34,6 @@
 	<string name="TEA_hideUntil_display">Piilota kunnes %s</string>
 	<string name="TEA_note_label">Kuvaus</string>
 	<string name="TEA_notes_empty">Kuvaus...</string>
-	<string name="TEA_notes_hint">Syöta tehtävän kuvaus...</string>
 	<string name="TEA_estimatedDuration_label">Kuinka pitkään se kestää?</string>
 	<string name="TEA_elapsedDuration_label">Aika on jo käytetty</string>
 	<string name="TEA_menu_save">Tallenna muutokset</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index e1839bb81..8e5be36a1 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -90,7 +90,6 @@
 	<string name="TEA_deadline_hint">Définir une date d\'échéance</string>
 	<string name="TEA_hideUntil_label">Masquer jusqu\'à</string>
 	<string name="TEA_hideUntil_display">Masquer jusqu\'à %s</string>
-	<string name="TEA_notes_hint">Décrire la tâche</string>
 	<string name="TEA_estimatedDuration_label">Combien de temps cela va-t-il prendre ?</string>
 	<string name="TEA_elapsedDuration_label">Temps déjà passé sur la tâche</string>
 	<string name="TEA_menu_save">Sauvegarder les modifications</string>
@@ -202,7 +201,6 @@
 	<string name="DB_corrupted_title">Base de donnée corrompue</string>
 	<string name="DB_corrupted_body">Oh oh ! On dirait que vous avez une base de données corrompues. Si vous voyez souvent cette erreur, nous vous suggérons d\'effacer toutes vos données (Paramètres-&gt;Synchronisation et sauvegarde-&gt;Gérer les anciennes tâches-&gt;Effacer toutes les données) et restaurer vos tâches d\'une sauvegarde (Paramètres-&gt;Synchronisation et sauvegarde-&gt;Sauvegarde-&gt;Importer des tâches) dans Tasks</string>
 	<string name="market_unavailable">Malheureusement le Play Store n\'est pas disponible sur votre système</string>
-	<string name="EPr_defaults_header">Valeurs par défaut pour une nouvelle tâche</string>
 	<string name="EPr_default_urgency_title">Échéance par défaut</string>
 	<string name="EPr_default_importance_title">Priorité par défaut</string>
 	<string name="EPr_default_hideUntil_title">Masquer par défaut jusqu\'à</string>
@@ -312,11 +310,6 @@
 	<string name="file_dir_dialog_ok">Utiliser ce dossier</string>
 	<string name="file_dir_dialog_default">Rétablir les valeurs par défaut</string>
 	<string name="premium_speech_bubble_2">Commandez pour un an et économisez 25%%!</string>
-	<string name="TEA_reminders_group_label">Paramètres de rappel</string>
-	<string name="TEA_reminder_label">Rappelle-moi</string>
-	<string name="TEA_reminder_due">... lorsque la tâche est échue</string>
-	<string name="TEA_reminder_overdue">... lorsque la tâche est en retard</string>
-	<string name="TEA_reminder_randomly">Une fois aléatoirement</string>
 	<string-array name="TEA_reminder_random">
 		<item>Une heure</item>
 		<item>Un jour</item>
@@ -353,14 +346,6 @@
 	<string name="repeat_interval_prompt">Interval de répétition</string>
 	<string name="repeat_never">Une fois seulement</string>
 	<string name="repeat_dont">Ne pas répéter</string>
-	<string-array name="repeat_interval_short">
-		<item>j</item>
-		<item>sem</item>
-		<item>mo</item>
-		<item>h</item>
-		<item>min</item>
-		<item>an</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>Jour(s)</item>
 		<item>Semaine(s)</item>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 75fbbb738..61683ed09 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -182,7 +182,6 @@
 	<string name="DB_corrupted_body">Oh, oh! Pare che tu abbia un database danneggiato.
 Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dati (Impostazioni-&gt;Sincronizzazione e backup-&gt;Gestire tutti i dati-&gt;Cancellare tutti i dati) e ripristinare i tuoi task da un backup in Tasks (Impostazioni-&gt;Sincronizzazione e backup-&gt;Backup-&gt;Importa task).</string>
 	<string name="market_unavailable">Sfortunatamente il market non è disponibile sul tuo sistema.</string>
-	<string name="EPr_defaults_header">Nuove impostazioni predefinite attività</string>
 	<string name="EPr_default_urgency_title">Urgenza Predefinita</string>
 	<string name="EPr_default_hideUntil_title">Nascondi Fino Predefinito</string>
 	<string name="EPr_default_reminders_title">Promemoria predefiniti</string>
@@ -285,10 +284,6 @@ Se visualizzi questo errore più volte, ti consigliamo di cancellare tutti i dat
 	<string name="file_dir_dialog_ok">Utilizza questa directory</string>
 	<string name="file_dir_dialog_default">Ripristino impostazioni iniziali</string>
 	<string name="premium_speech_bubble_2">Sottoscrivi 1 anno e risparmia il 25%%!</string>
-	<string name="TEA_reminder_label">Ricordamelo:</string>
-	<string name="TEA_reminder_due">Alla scadenza dell\'attività</string>
-	<string name="TEA_reminder_overdue">Quando l\'attività è in ritardo</string>
-	<string name="TEA_reminder_randomly">In modo casuale</string>
 	<string-array name="TEA_reminder_random">
 		<item>an hour</item>
 		<item>ogni giorno</item>
diff --git a/src/main/res/values-iw/strings.xml b/src/main/res/values-iw/strings.xml
index 84d31e62c..872f3f074 100644
--- a/src/main/res/values-iw/strings.xml
+++ b/src/main/res/values-iw/strings.xml
@@ -92,7 +92,6 @@
 	<string name="TEA_hideUntil_display">הסתר עד %s</string>
 	<string name="TEA_note_label">תיאור</string>
 	<string name="TEA_notes_empty">תיאור</string>
-	<string name="TEA_notes_hint">הזן את תיאור המשימה...</string>
 	<string name="TEA_estimatedDuration_label">כמה זמן תיקח המשימה?</string>
 	<string name="TEA_elapsedDuration_label">זמן שכבר הושקע במשימה</string>
 	<string name="TEA_menu_save">שמירת השינויים</string>
@@ -204,7 +203,6 @@
 (הגדרות-&gt;סינכרון וגיבוי-&gt;ניהול משימות ישנות-&gt;הסרת כל הנתונים) ושחזר את המשימות
 מגיבוי (הגדרות-&gt;סנכרון וגיבוי-&gt;גיבוי-&gt;יבא משימות).</string>
 	<string name="market_unavailable">לרוע המזל חנות היישומים אינה זמינה</string>
-	<string name="EPr_defaults_header">ברירות המחדל למשימה חדשה</string>
 	<string name="EPr_default_urgency_title">דחיפות ברירת המחדל</string>
 	<string name="EPr_default_importance_title">עדיפות מחדל</string>
 	<string name="EPr_default_hideUntil_title">ברירת מחדל לזמן הסתרה</string>
@@ -314,11 +312,6 @@
 	<string name="file_dir_dialog_ok">השתמש בתיקיה זו</string>
 	<string name="file_dir_dialog_default">אפס לברירת מחדל</string>
 	<string name="premium_speech_bubble_2">הזמן לשנה וחסוך !25%%</string>
-	<string name="TEA_reminders_group_label">הגדרות תזכורת</string>
-	<string name="TEA_reminder_label">הזכירי לי:</string>
-	<string name="TEA_reminder_due">כאשר הגיע מועד היעד</string>
-	<string name="TEA_reminder_overdue">כשעבר מועד היעד</string>
-	<string name="TEA_reminder_randomly">אקראי יחיד</string>
 	<string-array name="TEA_reminder_random">
 		<item>שעה</item>
 		<item>יום</item>
@@ -354,14 +347,6 @@
 	<string name="repeat_every">כל %d</string>
 	<string name="repeat_interval_prompt">אינטרוול חזרות</string>
 	<string name="repeat_dont">ללא חזרות</string>
-	<string-array name="repeat_interval_short">
-		<item>יום</item>
-		<item>שב\'</item>
-		<item>חד\'</item>
-		<item>שע\'</item>
-		<item>דק\'</item>
-		<item>שנ\'</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>יום/ימים</item>
 		<item>שבוע/(ות)</item>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 418c4c0ab..d9e58ca71 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -92,7 +92,6 @@
 	<string name="TEA_hideUntil_display">%s まで表示しない</string>
 	<string name="TEA_note_label">概要</string>
 	<string name="TEA_notes_empty">概要...</string>
-	<string name="TEA_notes_hint">タスクの概要を入力...</string>
 	<string name="TEA_estimatedDuration_label">所要時間は?</string>
 	<string name="TEA_elapsedDuration_label">既にタスクに費やした時間</string>
 	<string name="TEA_menu_save">変更の保存</string>
@@ -211,7 +210,6 @@
 (設定-&gt;同期およびバックアップ-&gt;古いタスクの管理-&gt;全てのデータをクリア) し,
 バックアップからタスクを復元 (設定-&gt;同期およびバックアップ-&gt;バックアップ-&gt;タスクをインポート) することを推奨します.</string>
 	<string name="market_unavailable">残念ながらあなたのシステムで Google Play は利用できません.</string>
-	<string name="EPr_defaults_header">タスクのデフォルト設定</string>
 	<string name="task_defaults">タスクのデフォルト</string>
 	<string name="EPr_default_urgency_title">期限</string>
 	<string name="EPr_default_importance_title">標準の優先順位</string>
@@ -321,11 +319,6 @@
 	<string name="file_dir_dialog_ok">このディレクトリを使用</string>
 	<string name="file_dir_dialog_default">デフォルトにリセット</string>
 	<string name="premium_speech_bubble_2">1 年注文すると 25% 節約できます!</string>
-	<string name="TEA_reminders_group_label">通知の設定</string>
-	<string name="TEA_reminder_label">通知するのは...</string>
-	<string name="TEA_reminder_due">何時がタスクの期限ですか？</string>
-	<string name="TEA_reminder_overdue">何時タスクが期限切れになりますか？</string>
-	<string name="TEA_reminder_randomly">ランダムに1回</string>
 	<string name="ring_once">1回通知音を鳴らす</string>
 	<string name="ring_five_times">5回通知音を鳴らす</string>
 	<string name="ring_nonstop">通知音を鳴らし続ける</string>
@@ -365,14 +358,6 @@
 	<string name="repeat_interval_prompt">繰り返し間隔</string>
 	<string name="repeat_never">繰り返しなし</string>
 	<string name="repeat_dont">繰り返ししない</string>
-	<string-array name="repeat_interval_short">
-		<item>日</item>
-		<item>週</item>
-		<item>月</item>
-		<item>時間</item>
-		<item>分</item>
-		<item>年</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>日毎</item>
 		<item>週毎</item>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 40297a9ce..cff85036a 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -95,7 +95,6 @@
 	<string name="TEA_hideUntil_display">%s 까지 숨기기</string>
 	<string name="TEA_note_label">설명</string>
 	<string name="TEA_notes_empty">설명</string>
-	<string name="TEA_notes_hint">일정 내용을 입력하세요</string>
 	<string name="TEA_estimatedDuration_label">일정 완료 예상 시간은?</string>
 	<string name="TEA_elapsedDuration_label">일정에 이미 소모한 시간</string>
 	<string name="TEA_menu_save">변경사항 저장</string>
@@ -210,7 +209,6 @@
 아스트리드의 백업에서 당신의 일정을 복구하시기 바랍니다. 
 (설정-&gt;동기화 &amp; 백업-&gt;백업-&gt;일정 불러오기)</string>
 	<string name="market_unavailable">이 기기에서 마켓을 사용할 수 없습니다.</string>
-	<string name="EPr_defaults_header">새 일정 기본값</string>
 	<string name="EPr_default_urgency_title">기본 중요도</string>
 	<string name="EPr_default_importance_title">기본 우선순위</string>
 	<string name="EPr_default_hideUntil_title">기본 숨기기 기간:</string>
@@ -320,11 +318,6 @@
 	<string name="file_dir_dialog_ok">이 디렉토리 사용</string>
 	<string name="file_dir_dialog_default">기본값으로 초기화</string>
 	<string name="premium_speech_bubble_2">1년 사용권 구매시 25%% 할인!</string>
-	<string name="TEA_reminders_group_label">알림 설정</string>
-	<string name="TEA_reminder_label">알려주세요:</string>
-	<string name="TEA_reminder_due">일정 마감일에</string>
-	<string name="TEA_reminder_overdue">일정 마감일이 지났을 때</string>
-	<string name="TEA_reminder_randomly">무작위로 한 번</string>
 	<string-array name="TEA_reminder_random">
 		<item>한 시간</item>
 		<item>하루</item>
@@ -361,14 +354,6 @@
 	<string name="repeat_interval_prompt">반복 주기</string>
 	<string name="repeat_never">반복하지 않기</string>
 	<string name="repeat_dont">반복하지 않기</string>
-	<string-array name="repeat_interval_short">
-		<item>일</item>
-		<item>주</item>
-		<item>월</item>
-		<item>시간</item>
-		<item>분</item>
-		<item>년</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>일마다</item>
 		<item>주마다</item>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 1c82ffc0e..94c763fbc 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -63,7 +63,6 @@
 	<string name="TEA_hideUntil_label">Skjul frem til</string>
 	<string name="TEA_hideUntil_display">Skjul frem til: %s</string>
 	<string name="TEA_note_label">Notater</string>
-	<string name="TEA_notes_hint">Legg inn oppgavenotater...</string>
 	<string name="TEA_estimatedDuration_label">Hvor lang tid vil det ta?</string>
 	<string name="TEA_elapsedDuration_label">Tid brukt på oppgaven til nå</string>
 	<string name="TEA_menu_save">Lagre endringer</string>
@@ -99,7 +98,6 @@
       If you see this error regularly, we suggest you clear all
       data (Settings-&gt;Sync and backup-&gt;Manage old tasks-&gt;Clear all data) and restore
       your tasks from a backup (Settings-&gt;Sync and backup-&gt;Backup-&gt;Import tasks) in Tasks.</string>
-	<string name="EPr_defaults_header">Standardinnstillinger for nye oppgaver</string>
 	<string name="EPr_default_urgency_title">Standardfrist</string>
 	<string name="EPr_default_importance_title">Standardviktighet</string>
 	<string name="EPr_default_hideUntil_title">Standard skjul frem til</string>
@@ -153,9 +151,6 @@
 	<string name="locale_notification">Du har $NUM som matcher: $FILTER</string>
 	<string name="file_browser_up">Opp</string>
 	<string name="file_browser_title">Velg en fil</string>
-	<string name="TEA_reminder_label">Minn meg på...</string>
-	<string name="TEA_reminder_due">...når oppgaven forfaller</string>
-	<string name="TEA_reminder_overdue">... når oppgaven har forfalt</string>
 	<string name="rmd_NoA_filter">Påminnelse!</string>
 	<string name="rmd_NoA_done">Allerede utført!</string>
 	<string name="rmd_NoA_snooze">Slumre</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 29725d778..1a472d970 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -92,7 +92,6 @@
 	<string name="TEA_hideUntil_display">Verberg tot %s</string>
 	<string name="TEA_note_label">Omschrijving</string>
 	<string name="TEA_notes_empty">Omschrijving...</string>
-	<string name="TEA_notes_hint">Voer taakomschrijving in</string>
 	<string name="TEA_estimatedDuration_label">Tijdsduur</string>
 	<string name="TEA_elapsedDuration_label">Bestede tijd tot nu toe</string>
 	<string name="TEA_menu_save">Wijzigingen opslaan</string>
@@ -205,7 +204,6 @@
 	<string name="DB_corrupted_title">Database Corrupt</string>
 	<string name="DB_corrupted_body">Oh oh! Het lijkt erop dat je een corrupte database hebt. Als je deze error vaker ziet raden we je aan alle data te verwijderen (Instellingen-&gt;Beheer Alle Taken-&gt;Wis alle data) en je taken uit een backup te herstellen (Instellingen-&gt;Backup-&gt;Importeer Taken) in Tasks.</string>
 	<string name="market_unavailable">Helaas is de Android Market niet beschikbaar voor jouw systeem.</string>
-	<string name="EPr_defaults_header">Basisinstellingen nieuwe taak</string>
 	<string name="EPr_default_urgency_title">Standaard prioriteit</string>
 	<string name="EPr_default_importance_title">Standaard prioriteit</string>
 	<string name="EPr_default_hideUntil_title">Standaard verbergen tot</string>
@@ -315,11 +313,6 @@
 	<string name="file_dir_dialog_ok">Gebruik deze directory.</string>
 	<string name="file_dir_dialog_default">Stel opnieuw in naar standaardinstellingen</string>
 	<string name="premium_speech_bubble_2">Bestel voor een jaar en bespaar 25%%!</string>
-	<string name="TEA_reminders_group_label">Instellingen herinneringen</string>
-	<string name="TEA_reminder_label">Herinneren:</string>
-	<string name="TEA_reminder_due">op einddatum taak</string>
-	<string name="TEA_reminder_overdue">op of na einddatum taak</string>
-	<string name="TEA_reminder_randomly">Willekeurig eenmalig</string>
 	<string-array name="TEA_reminder_random">
 		<item>een uur</item>
 		<item>een dag</item>
@@ -356,14 +349,6 @@
 	<string name="repeat_interval_prompt">Herhaal interval</string>
 	<string name="repeat_never">Niet herhalend</string>
 	<string name="repeat_dont">Niet herhalen</string>
-	<string-array name="repeat_interval_short">
-		<item>d</item>
-		<item>wk</item>
-		<item>ma</item>
-		<item>u</item>
-		<item>min</item>
-		<item>jr</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>Dag(en)</item>
 		<item>week/weken</item>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 2fe5446f6..ec0f967c2 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -92,7 +92,6 @@
 	<string name="TEA_hideUntil_display">Ukryj do %s</string>
 	<string name="TEA_note_label">Opis</string>
 	<string name="TEA_notes_empty">Opis...</string>
-	<string name="TEA_notes_hint">Podaj opis zadania...</string>
 	<string name="TEA_estimatedDuration_label">Jak długo to zajmie?</string>
 	<string name="TEA_elapsedDuration_label">Czas dotychczas spędzony nad tym zadaniem</string>
 	<string name="TEA_menu_save">Zapisz zmiany</string>
@@ -207,7 +206,6 @@ Jeśli widzisz ten błąd często, sugerujemy wyczyszczenie
 wszystkich danych (Settings-&gt;Sync and backup-&gt;Manage old tasks-&gt;Clear all data)
 i odzyskanie zadań z kopi zapasowej (Settings-&gt;Sync and backup-&gt;Backup-&gt;Import tasks) Tasks.</string>
 	<string name="market_unavailable">Niestety sklep nie jest dostępny dla twojego systemu.</string>
-	<string name="EPr_defaults_header">Nowe zadanie (domyślnie)</string>
 	<string name="EPr_default_urgency_title">Termin końcowy (domyślnie)</string>
 	<string name="EPr_default_importance_title">Domyślny priorytet</string>
 	<string name="EPr_default_hideUntil_title">Ukrywanie zadania (domyślnie)</string>
@@ -317,11 +315,6 @@ i odzyskanie zadań z kopi zapasowej (Settings-&gt;Sync and backup-&gt;Backup-&g
 	<string name="file_dir_dialog_ok">Użycie tego katalogu</string>
 	<string name="file_dir_dialog_default">Przywróć ustawienia domyślne</string>
 	<string name="premium_speech_bubble_2">Zamów na rok i oszczędź 25%%!</string>
-	<string name="TEA_reminders_group_label">Ustawienia przypomnień</string>
-	<string name="TEA_reminder_label">Przypomnij mi:</string>
-	<string name="TEA_reminder_due">W terminie</string>
-	<string name="TEA_reminder_overdue">Gdy zadanie jest zaległe</string>
-	<string name="TEA_reminder_randomly">Losowo raz</string>
 	<string-array name="TEA_reminder_random">
 		<item>na godzinę</item>
 		<item>dziennie</item>
@@ -358,14 +351,6 @@ i odzyskanie zadań z kopi zapasowej (Settings-&gt;Sync and backup-&gt;Backup-&g
 	<string name="repeat_interval_prompt">Odstęp powtarzania</string>
 	<string name="repeat_never">Jednorazowo</string>
 	<string name="repeat_dont">Nie powtarzaj</string>
-	<string-array name="repeat_interval_short">
-		<item>d</item>
-		<item>tn</item>
-		<item>m-ąc</item>
-		<item>godz</item>
-		<item>min.</item>
-		<item>rok</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>Dzień/Dni</item>
 		<item>Tydzień/Tygodni(e)</item>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index e26c79a30..46c8d96b8 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -92,7 +92,6 @@
 	<string name="TEA_hideUntil_display">Esconder até %s</string>
 	<string name="TEA_note_label">Descrição</string>
 	<string name="TEA_notes_empty">Descrição...</string>
-	<string name="TEA_notes_hint">Insira a descrição da tarefa...</string>
 	<string name="TEA_estimatedDuration_label">Quanto tempo isto vai levar?</string>
 	<string name="TEA_elapsedDuration_label">Tempo já gasto na tarefa</string>
 	<string name="TEA_menu_save">Salvar alterações</string>
@@ -204,7 +203,6 @@
 	<string name="DB_corrupted_title">Banco de Dados Corrompido</string>
 	<string name="DB_corrupted_body">Uh oh! Parece que você possui banco de dados corrompido. Se você vê esse erro regularmente, nós sugerimos que você limpe todos os dados (Configurações-&gt; Sincronização e backup-&gt; Manutenção de tarefas antigas-&gt; Limpar todos os dados) e restaurar suas tarefas através do backup no Tasks (Configurações-&gt; Sincronização e backup-&gt; Backup-&gt; Importar tarefas).</string>
 	<string name="market_unavailable">Infelizmente o market está indisponível para o seu sistema.</string>
-	<string name="EPr_defaults_header">Padrão para novas tarefas</string>
 	<string name="EPr_default_urgency_title">Urgência</string>
 	<string name="EPr_default_importance_title">Prioridade padrão</string>
 	<string name="EPr_default_hideUntil_title">Ocultar até</string>
@@ -314,11 +312,6 @@
 	<string name="file_dir_dialog_ok">Usar este diretório</string>
 	<string name="file_dir_dialog_default">Restaurar padrões</string>
 	<string name="premium_speech_bubble_2">Contrate um ano e tenha 25%% de desconto</string>
-	<string name="TEA_reminders_group_label">Lembrar configurações</string>
-	<string name="TEA_reminder_label">Lembre me:</string>
-	<string name="TEA_reminder_due">no dia que a tarefa vencer</string>
-	<string name="TEA_reminder_overdue">quando a tarefa estiver atrasada</string>
-	<string name="TEA_reminder_randomly">Aleatoriamente uma vez</string>
 	<string-array name="TEA_reminder_random">
 		<item>por hora</item>
 		<item>por dia</item>
@@ -355,14 +348,6 @@
 	<string name="repeat_interval_prompt">Intervalo de repetição</string>
 	<string name="repeat_never">Não repetir</string>
 	<string name="repeat_dont">Não repetir</string>
-	<string-array name="repeat_interval_short">
-		<item>d</item>
-		<item>sem</item>
-		<item>mo</item>
-		<item>hr</item>
-		<item>min</item>
-		<item>ano</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>Dia(s)</item>
 		<item>Semana(s)</item>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 2863983e7..4194c0823 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -93,7 +93,6 @@
 	<string name="TEA_hideUntil_display">Ocultar até %s</string>
 	<string name="TEA_note_label">Descrição</string>
 	<string name="TEA_notes_empty">Descrição...</string>
-	<string name="TEA_notes_hint">Introduzir descrição da tarefa...</string>
 	<string name="TEA_estimatedDuration_label">Quanto tempo irá durar?</string>
 	<string name="TEA_elapsedDuration_label">Tempo já gasto</string>
 	<string name="TEA_menu_save">Gravar alterações</string>
@@ -208,7 +207,6 @@ Se este erro ocorrer repetidamente sugerimos a eliminação dos dados em
 Definições-&gt;Sincronização e backup-&gt;Gerir tarefas antigas-&gt;Limpar todos os dados e o restauro
 das tarefas através de um backup em Definições-&gt;Sincronização e backup-&gt;Backup-&gt;Importar tarefas.</string>
 	<string name="market_unavailable">Infelizmente, a loja Google não está instalada no seu sistema.</string>
-	<string name="EPr_defaults_header">Predefinições das novas tarefas</string>
 	<string name="EPr_default_urgency_title">Prazo predefinido</string>
 	<string name="EPr_default_importance_title">Prioridade predefinida</string>
 	<string name="EPr_default_hideUntil_title">Predefinição de ocultar até</string>
@@ -318,11 +316,6 @@ das tarefas através de um backup em Definições-&gt;Sincronização e backup-&
 	<string name="file_dir_dialog_ok">Usar este diretório</string>
 	<string name="file_dir_dialog_default">Restaurar definições originais</string>
 	<string name="premium_speech_bubble_2">Compre por um ano e poupe 25%!</string>
-	<string name="TEA_reminders_group_label">Definições do lembrete</string>
-	<string name="TEA_reminder_label">Lembrar-me</string>
-	<string name="TEA_reminder_due">Na data limite</string>
-	<string name="TEA_reminder_overdue">Se data limite ultrapassada</string>
-	<string name="TEA_reminder_randomly">Uma vez aleatória</string>
 	<string-array name="TEA_reminder_random">
 		<item>uma hora</item>
 		<item>um dia</item>
@@ -358,14 +351,6 @@ das tarefas através de um backup em Definições-&gt;Sincronização e backup-&
 	<string name="repeat_interval_prompt">Intervalo de repetição</string>
 	<string name="repeat_never">Não repete</string>
 	<string name="repeat_dont">Não repete</string>
-	<string-array name="repeat_interval_short">
-		<item>d</item>
-		<item>sem</item>
-		<item>mês</item>
-		<item>hr</item>
-		<item>min</item>
-		<item>a</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>Dia(s)</item>
 		<item>Semana(s)</item>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 607926b0a..be6a25852 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -93,7 +93,6 @@
 	<string name="TEA_hideUntil_display">Скрыть до %s</string>
 	<string name="TEA_note_label">Описание</string>
 	<string name="TEA_notes_empty">Описание...</string>
-	<string name="TEA_notes_hint">Введите описание задачи...</string>
 	<string name="TEA_estimatedDuration_label">Как долго это продлится?</string>
 	<string name="TEA_elapsedDuration_label">Время уже потраченное на задачу</string>
 	<string name="TEA_menu_save">Сохранить изменения</string>
@@ -210,7 +209,6 @@
 все данные (Параметры-&gt;Синхронизация-&gt;Управление старыми задачами-&gt;Очистить все данные) и восстановить
 задачи из резервной копии (Параметры-&gt;Синхронизация-&gt;Резервные копии-&gt;Импортировать задачи)</string>
 	<string name="market_unavailable">К сожалению, этот магазин недоступен для вашей системы.</string>
-	<string name="EPr_defaults_header">Параметры по умолчанию для новых задач</string>
 	<string name="task_defaults">Параметры по умолчанию</string>
 	<string name="EPr_default_urgency_title">Актуальность по умолчанию</string>
 	<string name="EPr_default_importance_title">Приоритет по умолчанию</string>
@@ -320,11 +318,6 @@
 	<string name="file_dir_dialog_ok">Использовать эту папку</string>
 	<string name="file_dir_dialog_default">Сбросить настройки</string>
 	<string name="premium_speech_bubble_2">Подпишитесь на год и сэкономьте 25%%!</string>
-	<string name="TEA_reminders_group_label">Настройки напоминаний</string>
-	<string name="TEA_reminder_label">Напомнить мне</string>
-	<string name="TEA_reminder_due">При наступлении срока выполнения задания</string>
-	<string name="TEA_reminder_overdue">Когда задание просрочено</string>
-	<string name="TEA_reminder_randomly">Случайно один раз</string>
 	<string-array name="TEA_reminder_random">
 		<item>час</item>
 		<item>день</item>
@@ -361,14 +354,6 @@
 	<string name="repeat_interval_prompt">Интервал повтора</string>
 	<string name="repeat_never">Без повторений</string>
 	<string name="repeat_dont">Не повторять</string>
-	<string-array name="repeat_interval_short">
-		<item>д.</item>
-		<item>нед.</item>
-		<item>мес.</item>
-		<item>ч</item>
-		<item>мин</item>
-		<item>г.</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>День(дней)</item>
 		<item>Неделя(ль)</item>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index d5af9d04b..e17496647 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -166,14 +166,6 @@
 	<string name="repeat_interval_prompt">Interval opakovania</string>
 	<string name="repeat_never">Neopakovať</string>
 	<string name="repeat_dont">Neopakovať</string>
-	<string-array name="repeat_interval_short">
-		<item>d</item>
-		<item>týžd.</item>
-		<item>mes.</item>
-		<item>hod.</item>
-		<item>min.</item>
-		<item>r</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>Deň</item>
 		<item>Týždeň</item>
diff --git a/src/main/res/values-sl-rSI/strings.xml b/src/main/res/values-sl-rSI/strings.xml
index 3fed2ff19..6158b0594 100644
--- a/src/main/res/values-sl-rSI/strings.xml
+++ b/src/main/res/values-sl-rSI/strings.xml
@@ -96,7 +96,6 @@
 	<string name="TEA_hideUntil_display">Skrij do %s</string>
 	<string name="TEA_note_label">Opis</string>
 	<string name="TEA_notes_empty">Opis...</string>
-	<string name="TEA_notes_hint">Vnesi opis opravka...</string>
 	<string name="TEA_estimatedDuration_label">Kako dolgo bo trajalo?</string>
 	<string name="TEA_elapsedDuration_label">Porabljen čas</string>
 	<string name="TEA_menu_save">Shrani spremembe</string>
@@ -208,7 +207,6 @@
 	<string name="DB_corrupted_title">Okvarjena baza podatkov</string>
 	<string name="DB_corrupted_body">O, ne! Zdi se, da imate okvarjeno bazo podatkov. Če se ta napaka pogosto pojavlja, vam predlagamo, da zbrišete vse podatke (Nastavitve-&gt;Usklajevanje in varnostna kopija-&gt; Upravljanje s preteklimi opravki-&gt;Zbriši vse podatke) in obnovite svoje opravke s pomočjo varnostne kopije aplikacije Opravki. (Nastavitve-&gt;Usklajevanje in varnostna kopija-&gt;Varnostna kopija-&gt;Uvozi opravke)</string>
 	<string name="market_unavailable">Žal trg ne podpira vašega sistema.</string>
-	<string name="EPr_defaults_header">Privzete nastavitve novih opravkov</string>
 	<string name="EPr_default_urgency_title">Privzeta dospelost</string>
 	<string name="EPr_default_importance_title">Privzeta dospelost</string>
 	<string name="EPr_default_hideUntil_title">Privzeto skrij do</string>
@@ -318,11 +316,6 @@
 	<string name="file_dir_dialog_ok">Uporabi to mapo</string>
 	<string name="file_dir_dialog_default">Ponastavi na privzeto</string>
 	<string name="premium_speech_bubble_2">Enoletna naročnina prihrani 25%!</string>
-	<string name="TEA_reminders_group_label">Nastavitve opomnika</string>
-	<string name="TEA_reminder_label">Opomni me</string>
-	<string name="TEA_reminder_due">Ko opravek dospe</string>
-	<string name="TEA_reminder_overdue">Po dospelosti opravka</string>
-	<string name="TEA_reminder_randomly">Naključno enkrat</string>
 	<string-array name="TEA_reminder_random">
 		<item>na uro</item>
 		<item>dan</item>
@@ -359,14 +352,6 @@
 	<string name="repeat_interval_prompt">Pogostost ponovitev</string>
 	<string name="repeat_never">Brez ponovitev</string>
 	<string name="repeat_dont">Ne ponovi</string>
-	<string-array name="repeat_interval_short">
-		<item>d</item>
-		<item>t</item>
-		<item>me</item>
-		<item>u</item>
-		<item>min</item>
-		<item>l</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>Dan/dni</item>
 		<item>V tednih</item>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index fef4bfa33..eea54790d 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -92,7 +92,6 @@
 	<string name="TEA_hideUntil_display">Dölj tills %s</string>
 	<string name="TEA_note_label">Beskrivning</string>
 	<string name="TEA_notes_empty">Beskrivning</string>
-	<string name="TEA_notes_hint">Ange uppgiftsbeskrivning...</string>
 	<string name="TEA_estimatedDuration_label">Hur lång tid kommer det att ta?</string>
 	<string name="TEA_elapsedDuration_label">Tid redan spenderad på uppgiften</string>
 	<string name="TEA_menu_save">Spara ändringar</string>
@@ -203,7 +202,6 @@ Om du ser detta felmeddelande ofta, föreslår vi att du tömmer all data
 och återställer dina aktuella uppgifter från en backup
 (Inställningar-&gt;Synkronisering och backup-&gt;Backup-&gt;Viktiga uppgifter) i Tasks.</string>
 	<string name="market_unavailable">Tyvärr är inte denna funktion tillgänglig där du befinner dig.</string>
-	<string name="EPr_defaults_header">Standardinställningar för nya uppgifter</string>
 	<string name="EPr_default_urgency_title">Standardfrist</string>
 	<string name="EPr_default_importance_title">Standard prioritet</string>
 	<string name="EPr_default_hideUntil_title">Standard Dölj tills</string>
@@ -311,11 +309,6 @@ och återställer dina aktuella uppgifter från en backup
 	<string name="file_dir_dialog_ok">Använd denna mapp</string>
 	<string name="file_dir_dialog_default">Återställ till standard</string>
 	<string name="premium_speech_bubble_2">Beställ för helår och spara 25%!</string>
-	<string name="TEA_reminders_group_label">Påminnelseinställningar</string>
-	<string name="TEA_reminder_label">Påminn mig:</string>
-	<string name="TEA_reminder_due">...när uppgiften förfaller</string>
-	<string name="TEA_reminder_overdue">...när uppgiften har förfallit</string>
-	<string name="TEA_reminder_randomly">En gång slumpmässigt</string>
 	<string-array name="TEA_reminder_random">
 		<item>en timme</item>
 		<item>ett dygn</item>
@@ -352,14 +345,6 @@ och återställer dina aktuella uppgifter från en backup
 	<string name="repeat_interval_prompt">Upprepningsintervall</string>
 	<string name="repeat_never">Inte upprepande</string>
 	<string name="repeat_dont">Upprepa inte</string>
-	<string-array name="repeat_interval_short">
-		<item>d</item>
-		<item>v</item>
-		<item>mån</item>
-		<item>tim</item>
-		<item>min</item>
-		<item>år</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>Dag(ar)</item>
 		<item>Vecka (veckor)</item>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 2688fe38b..051929c2f 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -184,7 +184,6 @@
       data (Settings-&gt;Sync and backup-&gt;Manage old tasks-&gt;Clear all data) and restore
       your tasks from a backup (Settings-&gt;Sync and backup-&gt;Backup-&gt;Import tasks) in Tasks.</string>
 	<string name="market_unavailable">Ne yazık ki market sisteminiz için kullanılabilir değil.</string>
-	<string name="EPr_defaults_header">Yeni Görev Öntanımlıları</string>
 	<string name="EPr_default_urgency_title">Öntanımlı Aciliyet</string>
 	<string name="EPr_default_hideUntil_title">Öntanımlı Gizlenme</string>
 	<string name="EPr_default_reminders_title">Öntanımlı Hatırlatmalar</string>
@@ -288,10 +287,6 @@
 	<string name="file_dir_dialog_ok">Bu dizini kullan</string>
 	<string name="file_dir_dialog_default">Öntanımlı değere dön</string>
 	<string name="premium_speech_bubble_2">Bir yıllık satın alın ve %%25 kâr yapın!</string>
-	<string name="TEA_reminder_label">Bana Hatırlat:</string>
-	<string name="TEA_reminder_due">Görev son tarihinde</string>
-	<string name="TEA_reminder_overdue">Görev son tarihi aşıldığında</string>
-	<string name="TEA_reminder_randomly">Bir kere gelişigüzel</string>
 	<string-array name="TEA_reminder_random">
 		<item>bir saat</item>
 		<item>bir gün</item>
@@ -327,14 +322,6 @@
 	<string name="repeat_every">Her %d</string>
 	<string name="repeat_interval_prompt">Yineleme Aralığı</string>
 	<string name="repeat_dont">Yineleme Yapma</string>
-	<string-array name="repeat_interval_short">
-		<item>gün</item>
-		<item>hafta</item>
-		<item>ay</item>
-		<item>sa</item>
-		<item>dk</item>
-		<item>yıl</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>Gün</item>
 		<item>Hafta</item>
diff --git a/src/main/res/values-uk/strings.xml b/src/main/res/values-uk/strings.xml
index 34042e359..ab1106380 100644
--- a/src/main/res/values-uk/strings.xml
+++ b/src/main/res/values-uk/strings.xml
@@ -95,7 +95,6 @@
 	<string name="TEA_hideUntil_display">Приховати до %s</string>
 	<string name="TEA_note_label">Опис</string>
 	<string name="TEA_notes_empty">Опис</string>
-	<string name="TEA_notes_hint">Ввести опис завдання...</string>
 	<string name="TEA_estimatedDuration_label">Як довго це триватиме?</string>
 	<string name="TEA_elapsedDuration_label">Час вже потрачео</string>
 	<string name="TEA_menu_save">Зберегти зміни</string>
@@ -212,7 +211,6 @@
  Очистити всі дані) і відновити завдання з резервно
 ї копії (Параметри-&gt; Синхронізація-&gt; Резервні копії-&gt; Імпортувати задачі)</string>
 	<string name="market_unavailable">Нажаль магазин недоступний для вашої системи.</string>
-	<string name="EPr_defaults_header">Параметри по замовчуванню для нових завдань</string>
 	<string name="EPr_default_urgency_title">Актуальність по замовчуванню</string>
 	<string name="EPr_default_importance_title">Пріоритет по замовчуванню</string>
 	<string name="EPr_default_hideUntil_title">Термін приховування за замовчуванням</string>
@@ -320,11 +318,6 @@
 	<string name="file_dir_dialog_ok">Використовувати цю папку</string>
 	<string name="file_dir_dialog_default">Скинути налаштування за замовчуванням</string>
 	<string name="premium_speech_bubble_2">Підпишіться на рік і заощаджуйте 25%%!</string>
-	<string name="TEA_reminders_group_label">Налаштування нагадувань</string>
-	<string name="TEA_reminder_label">Нагадати мені</string>
-	<string name="TEA_reminder_due">Коли настане термін виконання завдання</string>
-	<string name="TEA_reminder_overdue">Коли завдання прострочено</string>
-	<string name="TEA_reminder_randomly">Випадково раз</string>
 	<string-array name="TEA_reminder_random">
 		<item>година</item>
 		<item>дня</item>
@@ -361,14 +354,6 @@
 	<string name="repeat_interval_prompt">Інтервал повторення</string>
 	<string name="repeat_never">Не повторювати</string>
 	<string name="repeat_dont">Не повторювати</string>
-	<string-array name="repeat_interval_short">
-		<item>д.</item>
-		<item>тиж.</item>
-		<item>м.</item>
-		<item>год.</item>
-		<item>хв.</item>
-		<item>р.</item>
-	</string-array>
 	<string-array name="repeat_until_shortcuts">
 		<item>Forever</item>
 		<item>Specific Day</item>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 526637100..01354b4bf 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -164,7 +164,6 @@
 	<string name="DB_corrupted_title">数据库已经受损</string>
 	<string name="DB_corrupted_body">啊喔！您有一个毁损的资料库。如果您经常看见这个错误出现，我们建议您清除所有数据（在设置-&gt;同步和备份-&amp;gt；管理旧任务-&gt;清楚所有数据）并在清单小助理备份中重新存入您的任务（设置-&gt;同步和备份-&gt;备份-&gt;导入任务）</string>
 	<string name="market_unavailable">非常抱歉，我们的软件无法在您的系统中成功运行。</string>
-	<string name="EPr_defaults_header">新任务默认设置</string>
 	<string name="EPr_default_urgency_title">默认截止期</string>
 	<string name="EPr_default_hideUntil_title">默认隐藏直到</string>
 	<string name="EPr_default_reminders_title">默认提醒</string>
@@ -266,10 +265,6 @@
 	<string name="file_dir_dialog_ok">使用此目录</string>
 	<string name="file_dir_dialog_default">重设为默认值</string>
 	<string name="premium_speech_bubble_2">购买一年的服务并且得到25%%的折扣</string>
-	<string name="TEA_reminder_label">提醒我：</string>
-	<string name="TEA_reminder_due">当任务到期时</string>
-	<string name="TEA_reminder_overdue">当任务过期时</string>
-	<string name="TEA_reminder_randomly">随机一次</string>
 	<string-array name="TEA_reminder_random">
 		<item>一个小时</item>
 		<item>一天</item>
@@ -305,14 +300,6 @@
 	<string name="repeat_every">每 %d</string>
 	<string name="repeat_interval_prompt">重复间隔</string>
 	<string name="repeat_dont">不重复</string>
-	<string-array name="repeat_interval_short">
-		<item>日</item>
-		<item>周</item>
-		<item>月</item>
-		<item>时</item>
-		<item>分</item>
-		<item>年</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>日</item>
 		<item>星期</item>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 492ffcff9..b946fea9e 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -91,7 +91,6 @@
 	<string name="TEA_hideUntil_display">隱藏直到 %s</string>
 	<string name="TEA_note_label">描述</string>
 	<string name="TEA_notes_empty">描述...</string>
-	<string name="TEA_notes_hint">輸入工作描述...</string>
 	<string name="TEA_estimatedDuration_label">要花多久時間?</string>
 	<string name="TEA_elapsedDuration_label">已經用掉的時間</string>
 	<string name="TEA_menu_save">儲存變更</string>
@@ -194,7 +193,6 @@
 	<string name="DB_corrupted_title">數據庫已經受損</string>
 	<string name="DB_corrupted_body">啊喔！您有一個毀損的資料庫。如果您經常看見這個錯誤出現，我們建議您清除所有數據（在設置-&gt;同步和備份-&amp;gt；管理舊任務工作-&gt;清楚所有數據）並在Tasks備份中重新存入您的任務工作（設置-&gt;同步和備份-&gt;備份-&gt;導入任務工作）</string>
 	<string name="market_unavailable">非常抱歉，我們的軟件無法在您的系統中成功運行。</string>
-	<string name="EPr_defaults_header">工作預設值</string>
 	<string name="EPr_default_urgency_title">預設嚴重性</string>
 	<string name="EPr_default_importance_title">預設優先權</string>
 	<string name="EPr_default_hideUntil_title">預設隱藏直到...</string>
@@ -301,11 +299,6 @@
 	<string name="file_dir_dialog_ok">使用此目錄</string>
 	<string name="file_dir_dialog_default">重設為默認值</string>
 	<string name="premium_speech_bubble_2">購買一年的服務並且得到25%%的折扣</string>
-	<string name="TEA_reminders_group_label">提醒設置</string>
-	<string name="TEA_reminder_label">提醒我：</string>
-	<string name="TEA_reminder_due">當任務工作到期時</string>
-	<string name="TEA_reminder_overdue">當任務工作過期時</string>
-	<string name="TEA_reminder_randomly">隨機一次</string>
 	<string-array name="TEA_reminder_random">
 		<item>一個小時</item>
 		<item>一天</item>
@@ -341,14 +334,6 @@
 	<string name="repeat_every">每 %d</string>
 	<string name="repeat_interval_prompt">重複間隔</string>
 	<string name="repeat_dont">不重複</string>
-	<string-array name="repeat_interval_short">
-		<item>日</item>
-		<item>週</item>
-		<item>月</item>
-		<item>時</item>
-		<item>分</item>
-		<item>年</item>
-	</string-array>
 	<string-array name="repeat_interval">
 		<item>日</item>
 		<item>星期</item>
diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 588d3f690..03775a813 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -26,12 +26,9 @@
   <attr name="asThemeTextColor" format="color"/>
   <attr name="asEditTextBackground" format="reference"/>
   <attr name="asAbBackgroundColor" format="color"/>
-    <attr name="floatingActionButtonStroke" format="color"/>
-  <attr name="asFilterSelectedIcon" format="reference"/>
   <attr name="asTaskRowSelector" format="reference" />
     <attr name="ic_action_add" format="reference" />
     <attr name="ic_action_new_attachment" format="reference"/>
-    <attr name="ic_action_discard" format="reference"/>
     <attr name="ic_action_save" format="reference"/>
     <attr name="ic_action_cancel" format="reference"/>
     <attr name="ic_action_camera" format="reference"/>
@@ -56,12 +53,12 @@
     <attr name="fab_background_pressed" format="color" />
     <attr name="fab_plus" format="color" />
 
-    <declare-styleable name="DateAndTimePicker">
-      <attr name="shortcutLabels" format="reference"/>
+  <declare-styleable name="DateAndTimePicker">
+    <attr name="shortcutLabels" format="reference" />
   </declare-styleable>
 
-    <declare-styleable name="TimePreference">
-        <attr name="summary" format="string"/>
-    </declare-styleable>
+  <declare-styleable name="TimePreference">
+    <attr name="summary" format="string" />
+  </declare-styleable>
 
 </resources>
diff --git a/src/main/res/values/keys.xml b/src/main/res/values/keys.xml
index 9e26b02a1..b026792ad 100644
--- a/src/main/res/values/keys.xml
+++ b/src/main/res/values/keys.xml
@@ -21,21 +21,9 @@
   <!-- hour to end quiet hours (non-inclusive) -->
   <string name="p_rmd_quietEnd">notif_qend_new</string>
 
-  <!-- Whether or not the user has migrated (automatically) to the new reminder prefs -->
-  <string name="p_rmd_hasMigrated">has_migrated_rmd</string>
-
   <!-- reminder time when task doesn't have a due time (hour of day) -->
   <string name="p_rmd_time">reminder_time_new</string>
 
-  <!-- OLD Quiet hours settings -->
-    <!-- reminder time when task doesn't have a due time (hour of day) -->
-    <string name="p_rmd_time_old">reminder_time</string>
-    <!-- hour to start quiet hours (inclusive) -->
-    <string name="p_rmd_quietStart_old">notif_qstart</string>
-    <!-- hour to end quiet hours (non-inclusive) -->
-    <string name="p_rmd_quietEnd_old">notif_qend</string>
-  <!-- END OF OLD Quiet hours settings -->
-
   <!-- whether "clear all notifications" clears astrid notifications -->
   <string name="p_rmd_persistent">notif_annoy</string>
   
@@ -90,7 +78,6 @@
 
   <string name="p_fontSize">font_size</string>
 
-  <string name="p_voicePrefSection">voicePrefSection</string>
   <string name="p_voiceRemindersEnabled">voiceRemindersEnabled</string>
 
   <string-array name="EPr_font_size">
diff --git a/src/main/res/values/strings-core.xml b/src/main/res/values/strings-core.xml
index 8864a1255..1c5251306 100644
--- a/src/main/res/values/strings-core.xml
+++ b/src/main/res/values/strings-core.xml
@@ -209,9 +209,6 @@
   <!-- slide 16c: Task note label -->
   <string name="TEA_notes_empty">Description...</string>
   
-  <!-- Task note hint -->
-  <string name="TEA_notes_hint">Enter task description...</string>
-  
   <!-- Estimated time label -->
   <string name="TEA_estimatedDuration_label">How long will it take?</string>
   
diff --git a/src/main/res/values/strings-defaults.xml b/src/main/res/values/strings-defaults.xml
index 5ce1be631..587cf0f44 100644
--- a/src/main/res/values/strings-defaults.xml
+++ b/src/main/res/values/strings-defaults.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <!-- slide 32g: Preference Category: Defaults Title -->
-  <string name="EPr_defaults_header">New task defaults</string>
-
     <string name="task_defaults">Task defaults</string>
   <!-- slide 41f:  Preference: Default Urgency Title -->
   <string name="EPr_default_urgency_title">Default deadline</string>
diff --git a/src/main/res/values/strings-reminders.xml b/src/main/res/values/strings-reminders.xml
index 260da6f1a..f32b5dd42 100644
--- a/src/main/res/values/strings-reminders.xml
+++ b/src/main/res/values/strings-reminders.xml
@@ -1,25 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <!-- Resources for built-in reminders plug-in -->
-    
-  <!-- =============================================== task edit activity == -->
-
-  <!-- Task Edit: Reminder group label -->  
-  <string name="TEA_reminders_group_label">Reminder settings</string>
-
-  <!-- Task Edit: Reminder header label -->  
-  <string name="TEA_reminder_label">Remind me</string>
-
-  <!-- Task Edit: Reminder @ deadline -->  
-  <string name="TEA_reminder_due">When task is due</string>
-
-  <!-- Task Edit: Reminder after deadline -->  
-  <string name="TEA_reminder_overdue">When task is overdue</string>
-
-  <!-- Task Edit: Reminder at random times (%s => time plural)-->
-  <string name="TEA_reminder_randomly">Randomly once</string>
-
   <!--  slide 45a: Task Edit: Reminder mode: ring once -->
   <string name="ring_once">Ring once</string>
 
diff --git a/src/main/res/values/strings-repeat.xml b/src/main/res/values/strings-repeat.xml
index 94b4c8542..58a56134b 100644
--- a/src/main/res/values/strings-repeat.xml
+++ b/src/main/res/values/strings-repeat.xml
@@ -17,16 +17,6 @@
   <!-- slide 20f-->
   <string name="repeat_dont">Don\'t repeat</string>
       
-  <string-array name="repeat_interval_short">
-    <!-- repeat interval (days,weeks,months,hours,minutes,years) -->
-    <item>d</item>
-    <item>wk</item>
-    <item>mo</item>
-    <item>hr</item>
-    <item>min</item>
-    <item>yr</item>
-  </string-array>
-  
   <string-array name="repeat_interval">
     <!-- slide 20e: repeat interval (days,weeks,months,hours,minutes,years) -->
     <item>Day(s)</item>
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index c56fe85e2..b93faf7f7 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -17,7 +17,6 @@
 
         <item name="ic_action_add">@drawable/ic_action_add_light</item>
         <item name="ic_action_new_attachment">@drawable/ic_action_attachment_2</item>
-        <item name="ic_action_discard">@drawable/ic_action_discard</item>
         <item name="ic_action_save">@drawable/ic_action_save</item>
         <item name="ic_action_cancel">@drawable/ic_action_cancel</item>
         <item name="ic_action_camera">@drawable/ic_action_camera</item>
@@ -47,12 +46,10 @@
         <item name="asDueDateColor">#878787</item>
         <item name="asListDividerColor">#dddddd</item>
         <item name="asEditRowBackground">@drawable/task_edit_background_white</item>
-        <item name="asFilterSelectedIcon">@drawable/filter_selected_icon_black</item>
         <item name="asFilterRowSelected">@drawable/filter_row_selector</item>
         <item name="asTaskRowSelector">@drawable/task_row_bg_white</item>
         <item name="asThemeTextColor">@color/dark_blue_theme_color</item>
         <item name="asAbBackgroundColor">#607d8b</item>
-        <item name="floatingActionButtonStroke">@android:color/transparent</item>
         <item name="importance_background_selected">@drawable/importance_background_selected</item>
         <item name="task_edit_divider">@color/task_edit_divider</item>
         <item name="drawer_text">@android:color/black</item>
@@ -87,7 +84,6 @@
         <item name="asTextColorHint">@android:color/darker_gray</item>
         <item name="asTextColorInverse">@android:color/black</item>
         <item name="asAbBackgroundColor">@android:color/black</item>
-        <item name="floatingActionButtonStroke">@android:color/white</item>
         <item name="drawer_text">@android:color/white</item>
         <item name="ic_action_settings">@drawable/ic_action_gear_white</item>
         <item name="asFilterRowSelected">@drawable/filter_row_selector_dark</item>